syncfront/krfb
1
0
Fork 0
mirror of https://github.com/KDE/krfb synced 2026-07-01 15:31:19 -07:00
Code Issues Packages Projects Releases Wiki Activity

Port from KIcon to QIcon.

Browse Source
This commit is contained in:
Jeremy Whiting
2015-09-11 12:32:54 -06:00
parent 535e474cbd
commit a45aa4a16b
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
krfb/connectiondialog.cpp
View File

@@ -21,7 +21,7 @@
#include "connectiondialog.h"
#include <KIcon>
#include <QIcon>
#include <KLocale>
#include <KStandardGuiItem>
@@ -41,7 +41,7 @@ ConnectionDialog<UI>::ConnectionDialog(QWidget *parent)
m_connectWidget = new QWidget(this);
m_ui.setupUi(m_connectWidget);
m_ui.pixmapLabel->setPixmap(KIcon("krfb").pixmap(128));
m_ui.pixmapLabel->setPixmap(QIcon::fromTheme("krfb").pixmap(128));
KGuiItem accept = KStandardGuiItem::ok();
accept.setText(i18n("Accept Connection"));

10
krfb/mainwindow.cpp
View File

@@ -15,7 +15,7 @@
#include "ui_configsecurity.h"
#include <KConfigDialog>
#include <KIcon>
#include <QIcon>
#include <KLocale>
#include <KMessageBox>
#include <KStandardAction>
@@ -66,7 +66,7 @@ MainWindow::MainWindow(QWidget *parent)
QWidget *mainWidget = new QWidget;
m_ui.setupUi(mainWidget);
m_ui.krfbIconLabel->setPixmap(KIcon("krfb").pixmap(128));
m_ui.krfbIconLabel->setPixmap(QIcon::fromTheme("krfb").pixmap(128));
m_ui.enableUnattendedCheckBox->setChecked(
InvitationsRfbServer::instance->allowUnattendedAccess());
@@ -146,7 +146,7 @@ void MainWindow::editPassword()
{
if(m_passwordEditable) {
m_passwordEditable = false;
m_ui.passwordEditButton->setIcon(KIcon("document-properties"));
m_ui.passwordEditButton->setIcon(QIcon::fromTheme("document-properties"));
m_ui.passwordGridLayout->removeWidget(m_passwordLineEdit);
InvitationsRfbServer::instance->setDesktopPassword(
m_passwordLineEdit->text());
@@ -155,7 +155,7 @@ void MainWindow::editPassword()
m_passwordLineEdit->setVisible(false);
} else {
m_passwordEditable = true;
m_ui.passwordEditButton->setIcon(KIcon("document-save"));
m_ui.passwordEditButton->setIcon(QIcon::fromTheme("document-save"));
m_ui.passwordGridLayout->addWidget(m_passwordLineEdit,0,0);
m_passwordLineEdit->setText(
InvitationsRfbServer::instance->desktopPassword());
@@ -187,7 +187,7 @@ void MainWindow::toggleDesktopSharing(bool enable)
if(m_passwordEditable) {
m_passwordEditable = false;
m_passwordLineEdit->setVisible(false);
m_ui.passwordEditButton->setIcon(KIcon("document-properties"));
m_ui.passwordEditButton->setIcon(QIcon::fromTheme("document-properties"));
}
}
}

6
krfb/trayicon.cpp
View File

@@ -26,7 +26,7 @@
#include <KActionCollection>
#include <KDialog>
#include <KGlobal>
#include <KIcon>
#include <QIcon>
#include <KLocale>
#include <QMenu>
#include <KStandardAction>
@@ -94,7 +94,7 @@ ClientActions::~ClientActions()
TrayIcon::TrayIcon(QWidget *mainWindow)
: KStatusNotifierItem(mainWindow)
{
setIconByPixmap(KIcon("krfb").pixmap(22, 22, KIcon::Disabled));
setIconByPixmap(QIcon::fromTheme("krfb").pixmap(22, 22, QIcon::Disabled));
setToolTipTitle(i18n("Desktop Sharing - disconnected"));
setCategory(KStatusNotifierItem::ApplicationStatus);
@@ -127,7 +127,7 @@ void TrayIcon::onClientDisconnected(RfbClient* client)
delete actions;
if (m_clientActions.isEmpty()) {
setIconByPixmap(KIcon("krfb").pixmap(22, 22, KIcon::Disabled));
setIconByPixmap(QIcon::fromTheme("krfb").pixmap(22, 22, QIcon::Disabled));
setToolTipTitle(i18n("Desktop Sharing - disconnected"));
setStatus(KStatusNotifierItem::Passive);
} else if (m_clientActions.size() == 1) { //clients number dropped back to 1