[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91
Maximiliano Curia
maxy at moszumanska.debian.org
Sat May 28 00:14:56 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=1c19d3c
The following commit has been merged in the master branch:
commit 1c19d3c603cc5c4bb4b8ae56d5be6b02e97af8d2
Author: Aleix Pol <aleixpol at kde.org>
Date: Tue Oct 28 17:09:27 2014 +0100
KIcon -> QIcon
---
CMakeLists.txt | 5 +++++
abstract-contact-delegate.cpp | 2 +-
account-button.cpp | 30 +++++++++++++++---------------
contact-delegate-compact.cpp | 4 ++--
contact-delegate.cpp | 2 +-
contact-list-widget.cpp | 6 +++---
context-menu.cpp | 24 ++++++++++++------------
dialogs/custom-presence-dialog.cpp | 12 ++++++------
filter-bar.cpp | 2 +-
global-presence-chooser.cpp | 6 +++---
main-widget.cpp | 32 ++++++++++++++++----------------
main-widget.h | 4 ++--
tooltips/persontooltip.cpp | 4 ++--
13 files changed, 69 insertions(+), 64 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 17b21ae..dc09ff6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,6 +23,11 @@ find_package (KF5People 0.5)
include(KDEInstallDirs)
include(KDECMakeSettings)
include(KDECompilerSettings)
+include(FeatureSummary)
+
+set_package_properties(KF5People PROPERTIES DESCRIPTION "KDE Contacts aggregation"
+ TYPE OPTIONAL
+)
feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/abstract-contact-delegate.cpp b/abstract-contact-delegate.cpp
index 1d8f770..64b0b4f 100644
--- a/abstract-contact-delegate.cpp
+++ b/abstract-contact-delegate.cpp
@@ -129,7 +129,7 @@ void AbstractContactDelegate::paintHeader(QPainter *painter, const QStyleOptionV
if (index.data(KTp::RowTypeRole).toInt() == KTp::AccountRowType) {
//draw the icon with some opacity
painter->setOpacity(GROUP_ICON_OPACITY);
- painter->drawPixmap(groupIconRect, KIcon(index.data(Qt::DecorationRole).value<QIcon>()).pixmap(ACCOUNT_ICON_SIZE));
+ painter->drawPixmap(groupIconRect, index.data(Qt::DecorationRole).value<QIcon>().pixmap(ACCOUNT_ICON_SIZE));
painter->setOpacity(1.0);
} else {
groupIconRect.setWidth(0);
diff --git a/account-button.cpp b/account-button.cpp
index a69de76..6b87a73 100644
--- a/account-button.cpp
+++ b/account-button.cpp
@@ -50,7 +50,6 @@ AccountButton::AccountButton(const Tp::AccountPtr &account, QWidget* parent)
QString iconPath = m_account->iconName();
- setIcon(KIcon(iconPath));
if (!m_account->isValid()) {
//we paint a warning symbol in the right-bottom corner
QPixmap errorPixmap = KIconLoader::global()->loadIcon("dialog-error", KIconLoader::NoGroup, 16);
@@ -58,8 +57,9 @@ AccountButton::AccountButton(const Tp::AccountPtr &account, QWidget* parent)
QPainter painter(&pixmap);
painter.drawPixmap(15, 15, 16, 16, errorPixmap);
- setIcon(KIcon(pixmap));
- }
+ setIcon(QIcon(pixmap));
+ } else
+ setIcon(QIcon(iconPath));
setMaximumWidth(24);
@@ -70,14 +70,14 @@ AccountButton::AccountButton(const Tp::AccountPtr &account, QWidget* parent)
QActionGroup *presenceActions = new QActionGroup(this);
presenceActions->setExclusive(true);
- KAction *onlineAction = new KAction(KIcon("user-online"), i18nc("@action:inmenu This is an IM user status", "Available"), this);
- KAction *awayAction = new KAction(KIcon("user-away"), i18nc("@action:inmenu This is an IM user status", "Away"), this);
- KAction *brbAction = new KAction(KIcon("user-away"), i18nc("@action:inmenu This is an IM user status", "Be right back"), this);
- KAction *busyAction = new KAction(KIcon("user-busy"), i18nc("@action:inmenu This is an IM user status", "Busy"), this);
- KAction *dndAction = new KAction(KIcon("user-busy"), i18nc("@action:inmenu This is an IM user status", "Do not disturb"), this);
- KAction *xaAction = new KAction(KIcon("user-away-extended"), i18nc("@action:inmenu This is an IM user status", "Extended Away"), this);
- KAction *invisibleAction = new KAction(KIcon("user-invisible"), i18nc("@action:inmenu This is an IM user status", "Invisible"), this);
- m_offlineAction = new KAction(KIcon("user-offline"), i18nc("@action:inmenu This is an IM user status", "Offline"), this);
+ KAction *onlineAction = new KAction(QIcon::fromTheme("user-online"), i18nc("@action:inmenu This is an IM user status", "Available"), this);
+ KAction *awayAction = new KAction(QIcon::fromTheme("user-away"), i18nc("@action:inmenu This is an IM user status", "Away"), this);
+ KAction *brbAction = new KAction(QIcon::fromTheme("user-away"), i18nc("@action:inmenu This is an IM user status", "Be right back"), this);
+ KAction *busyAction = new KAction(QIcon::fromTheme("user-busy"), i18nc("@action:inmenu This is an IM user status", "Busy"), this);
+ KAction *dndAction = new KAction(QIcon::fromTheme("user-busy"), i18nc("@action:inmenu This is an IM user status", "Do not disturb"), this);
+ KAction *xaAction = new KAction(QIcon::fromTheme("user-away-extended"), i18nc("@action:inmenu This is an IM user status", "Extended Away"), this);
+ KAction *invisibleAction = new KAction(QIcon::fromTheme("user-invisible"), i18nc("@action:inmenu This is an IM user status", "Invisible"), this);
+ m_offlineAction = new KAction(QIcon::fromTheme("user-offline"), i18nc("@action:inmenu This is an IM user status", "Offline"), this);
m_presenceMessageWidget = new KLineEdit(this);
m_presenceMessageWidget->setClearButtonShown(true);
@@ -125,7 +125,7 @@ AccountButton::AccountButton(const Tp::AccountPtr &account, QWidget* parent)
QFontMetrics titleFontMetrics(titleFont);
QString accountName = titleFontMetrics.elidedText(m_account->displayName(), Qt::ElideMiddle, presenceMenu->width());
- presenceMenu->addTitle(KIcon(), accountName, presenceMenu->actions().first());
+ presenceMenu->addTitle(QIcon(), accountName, presenceMenu->actions().first());
setMenu(presenceMenu);
@@ -226,9 +226,9 @@ void AccountButton::presenceChanged(const Tp::Presence &presence)
QPixmap pixmap = icon().pixmap(32, 32);
QPainter painter(&pixmap);
- KIcon(action->icon()).paint(&painter, 15, 15, 16, 16);
+ action->icon().paint(&painter, 15, 15, 16, 16);
- setIcon(KIcon(pixmap));
+ setIcon(QIcon(pixmap));
}
QAction *AccountButton::actionForPresence(const Tp::Presence &presence) const
@@ -296,7 +296,7 @@ void AccountButton::resetMenuFormatting()
void AccountButton::updateIcon(const QString &iconPath)
{
- setIcon(KIcon(iconPath));
+ setIcon(QIcon(iconPath));
}
#include "account-button.moc"
diff --git a/contact-delegate-compact.cpp b/contact-delegate-compact.cpp
index 2c825f7..d70853a 100644
--- a/contact-delegate-compact.cpp
+++ b/contact-delegate-compact.cpp
@@ -80,7 +80,7 @@ void ContactDelegateCompact::paintContact(QPainter *painter, const QStyleOptionV
// This value is used to set the correct width for the username and the presence message.
int rightIconsWidth = m_presenceIconSize + m_spacing;
- QPixmap icon = KIcon(index.data(KTp::ContactPresenceIconRole).toString()).pixmap(KIconLoader::SizeSmallMedium);
+ QPixmap icon = QIcon::fromTheme(index.data(KTp::ContactPresenceIconRole).toString()).pixmap(KIconLoader::SizeSmallMedium);
QRect statusIconRect = optV4.rect;
@@ -107,7 +107,7 @@ void ContactDelegateCompact::paintContact(QPainter *painter, const QStyleOptionV
if (account && isSubcontact) {
rightIconsWidth += m_clientTypeIconSize + m_spacing;
- const QPixmap accountIcon = KIcon(account->iconName()).pixmap(m_clientTypeIconSize);
+ const QPixmap accountIcon = QIcon::fromTheme(account->iconName()).pixmap(m_clientTypeIconSize);
QRect accountIconRect = optV4.rect;
accountIconRect.setSize(QSize(m_clientTypeIconSize, m_clientTypeIconSize));
accountIconRect.moveTo(QPoint(optV4.rect.right() - rightIconsWidth,
diff --git a/contact-delegate.cpp b/contact-delegate.cpp
index a71feba..e7de812 100644
--- a/contact-delegate.cpp
+++ b/contact-delegate.cpp
@@ -101,7 +101,7 @@ void ContactDelegate::paintContact(QPainter *painter, const QStyleOptionViewItem
// This value is used to set the correct width for the username and the presence message.
int rightIconsWidth = m_presenceIconSize + m_spacing;
- QPixmap icon = KIcon(index.data(KTp::ContactPresenceIconRole).toString()).pixmap(KIconLoader::SizeSmallMedium);
+ QPixmap icon = QIcon::fromTheme(index.data(KTp::ContactPresenceIconRole).toString()).pixmap(KIconLoader::SizeSmallMedium);
QRect statusIconRect = optV4.rect;
statusIconRect.setSize(QSize(m_presenceIconSize, m_presenceIconSize));
diff --git a/contact-list-widget.cpp b/contact-list-widget.cpp
index d79085e..b659ae5 100644
--- a/contact-list-widget.cpp
+++ b/contact-list-widget.cpp
@@ -829,15 +829,15 @@ void ContactListWidget::dropEvent(QDropEvent *event)
KMenu menu;
QString seq = QKeySequence(Qt::ShiftModifier).toString();
seq.chop(1);
- QAction *move = menu.addAction(KIcon("go-jump"), i18n("&Move here") + QLatin1Char(' ') + seq);
+ QAction *move = menu.addAction(QIcon::fromTheme("go-jump"), i18n("&Move here") + QLatin1Char(' ') + seq);
seq = QKeySequence(Qt::ControlModifier).toString();
seq.chop(1);
- QAction *copy = menu.addAction(KIcon("edit-copy"), i18n("&Copy here") + QLatin1Char(' ') + seq);
+ QAction *copy = menu.addAction(QIcon::fromTheme("edit-copy"), i18n("&Copy here") + QLatin1Char(' ') + seq);
menu.addSeparator();
seq = QKeySequence(Qt::Key_Escape).toString();
- menu.addAction(KIcon("process-stop"), i18n("C&ancel") + QLatin1Char(' ') + seq);
+ menu.addAction(QIcon::fromTheme("process-stop"), i18n("C&ancel") + QLatin1Char(' ') + seq);
QAction *result = menu.exec(mapToGlobal(event->pos()));
diff --git a/context-menu.cpp b/context-menu.cpp
index 00795d7..586d645 100644
--- a/context-menu.cpp
+++ b/context-menu.cpp
@@ -114,7 +114,7 @@ KMenu* ContextMenu::contactContextMenu(const QModelIndex &index)
} else {
//must be a QAction because menu->addAction returns QAction, breaks compilation otherwise
action = menu->addAction(i18n("Start Chat..."));
- action->setIcon(KIcon("text-x-generic"));
+ action->setIcon(QIcon::fromTheme("text-x-generic"));
action->setDisabled(true);
connect(action, SIGNAL(triggered(bool)),
SLOT(onStartTextChatTriggered()));
@@ -124,7 +124,7 @@ KMenu* ContextMenu::contactContextMenu(const QModelIndex &index)
}
action = menu->addAction(i18n("Start Audio Call..."));
- action->setIcon(KIcon("audio-headset"));
+ action->setIcon(QIcon::fromTheme("audio-headset"));
action->setDisabled(true);
connect(action, SIGNAL(triggered(bool)),
SLOT(onStartAudioChatTriggered()));
@@ -134,7 +134,7 @@ KMenu* ContextMenu::contactContextMenu(const QModelIndex &index)
}
action = menu->addAction(i18n("Start Video Call..."));
- action->setIcon(KIcon("camera-web"));
+ action->setIcon(QIcon::fromTheme("camera-web"));
action->setDisabled(true);
connect(action, SIGNAL(triggered(bool)),
SLOT(onStartVideoChatTriggered()));
@@ -144,7 +144,7 @@ KMenu* ContextMenu::contactContextMenu(const QModelIndex &index)
}
action = menu->addAction(i18n("Send File..."));
- action->setIcon(KIcon("mail-attachment"));
+ action->setIcon(QIcon::fromTheme("mail-attachment"));
action->setDisabled(true);
connect(action, SIGNAL(triggered(bool)),
SLOT(onStartFileTransferTriggered()));
@@ -154,7 +154,7 @@ KMenu* ContextMenu::contactContextMenu(const QModelIndex &index)
}
action = menu->addAction(i18n("Share my desktop..."));
- action->setIcon(KIcon("krfb"));
+ action->setIcon(QIcon::fromTheme("krfb"));
action->setDisabled(true);
connect(action, SIGNAL(triggered(bool)),
SLOT(onStartDesktopSharingTriggered()));
@@ -164,7 +164,7 @@ KMenu* ContextMenu::contactContextMenu(const QModelIndex &index)
}
action = menu->addAction(i18n("Open Log Viewer..."));
- action->setIcon(KIcon("documentation"));
+ action->setIcon(QIcon::fromTheme("documentation"));
action->setDisabled(true);
connect(action, SIGNAL(triggered(bool)),
SLOT(onOpenLogViewerTriggered()));
@@ -176,7 +176,7 @@ KMenu* ContextMenu::contactContextMenu(const QModelIndex &index)
}
menu->addSeparator();
- action = menu->addAction(KIcon("dialog-information"), i18n("Configure Notifications..."));
+ action = menu->addAction(QIcon::fromTheme("dialog-information"), i18n("Configure Notifications..."));
action->setEnabled(true);
connect(action, SIGNAL(triggered()),
SLOT(onNotificationConfigureTriggered()));
@@ -213,7 +213,7 @@ KMenu* ContextMenu::contactContextMenu(const QModelIndex &index)
if (m_mainWidget->d_ptr->model->groupMode() == KTp::ContactsModel::GroupGrouping) {
// remove contact from group action, must be QAction because menu->addAction returns QAction
- QAction *groupRemoveAction = menu->addAction(KIcon(), i18n("Remove Contact From This Group"));
+ QAction *groupRemoveAction = menu->addAction(QIcon(), i18n("Remove Contact From This Group"));
connect(groupRemoveAction, SIGNAL(triggered(bool)), this, SLOT(onRemoveContactFromGroupTriggered()));
if (accountConnection->actualFeatures().contains(Tp::Connection::FeatureRosterGroups)) {
@@ -280,13 +280,13 @@ KMenu* ContextMenu::contactContextMenu(const QModelIndex &index)
// remove contact action, must be QAction because that's what menu->addAction returns
//TODO find an "if canRemove"
- QAction *removeAction = menu->addAction(KIcon("list-remove-user"), i18n("Remove Contact"));
+ QAction *removeAction = menu->addAction(QIcon::fromTheme("list-remove-user"), i18n("Remove Contact"));
connect(removeAction, SIGNAL(triggered(bool)), this, SLOT(onDeleteContactTriggered()));
menu->addSeparator();
action = menu->addAction(i18n("Show Info..."));
- action->setIcon(KIcon(""));
+ action->setIcon(QIcon::fromTheme(""));
connect(action, SIGNAL(triggered()), SLOT(onShowInfoTriggered()));
return menu;
@@ -307,13 +307,13 @@ KMenu* ContextMenu::groupContextMenu(const QModelIndex &index)
//must be QAction, because menu->addAction returns QAction, otherwise compilation dies horribly
QAction *action = menu->addAction(i18n("Rename Group..."));
- action->setIcon(KIcon("edit-rename"));
+ action->setIcon(QIcon::fromTheme("edit-rename"));
connect(action, SIGNAL(triggered(bool)),
this, SLOT(onRenameGroupTriggered()));
action = menu->addAction(i18n("Delete Group"));
- action->setIcon(KIcon("edit-delete"));
+ action->setIcon(QIcon::fromTheme("edit-delete"));
connect(action, SIGNAL(triggered(bool)),
this, SLOT(onDeleteGroupTriggered()));
diff --git a/dialogs/custom-presence-dialog.cpp b/dialogs/custom-presence-dialog.cpp
index 26f49b1..1d05cf9 100644
--- a/dialogs/custom-presence-dialog.cpp
+++ b/dialogs/custom-presence-dialog.cpp
@@ -87,10 +87,10 @@ void CustomPresenceDialog::setupDialog()
m_statusMessage = new KComboBox(true, mainDialogWidget);
- m_statusMessage->addItem(KIcon("user-online"), i18n("Set custom available message..."), qVariantFromValue<KTp::Presence>(Tp::Presence::available()));
- m_statusMessage->addItem(KIcon("user-busy"), i18n("Set custom busy message..."), qVariantFromValue<KTp::Presence>(Tp::Presence::busy()));
- m_statusMessage->addItem(KIcon("user-away"), i18n("Set custom away message..."), qVariantFromValue<KTp::Presence>(Tp::Presence::away()));
- m_statusMessage->addItem(KIcon("user-away-extended"), i18n("Set custom extended away message..."), qVariantFromValue<KTp::Presence>(Tp::Presence::xa()));
+ m_statusMessage->addItem(QIcon::fromTheme("user-online"), i18n("Set custom available message..."), qVariantFromValue<KTp::Presence>(Tp::Presence::available()));
+ m_statusMessage->addItem(QIcon::fromTheme("user-busy"), i18n("Set custom busy message..."), qVariantFromValue<KTp::Presence>(Tp::Presence::busy()));
+ m_statusMessage->addItem(QIcon::fromTheme("user-away"), i18n("Set custom away message..."), qVariantFromValue<KTp::Presence>(Tp::Presence::away()));
+ m_statusMessage->addItem(QIcon::fromTheme("user-away-extended"), i18n("Set custom extended away message..."), qVariantFromValue<KTp::Presence>(Tp::Presence::xa()));
m_statusMessage->setAutoCompletion(false);
m_statusMessage->show();
@@ -100,8 +100,8 @@ void CustomPresenceDialog::setupDialog()
connect(m_statusMessage, SIGNAL(editTextChanged(QString)),
this, SLOT(presenceMessageTextChanged(QString)));
- m_addStatus = new QPushButton(KIcon("list-add"), i18n("Add Presence"), mainDialogWidget);
- m_removeStatus = new QPushButton(KIcon("list-remove"), i18n("Remove Presence"), mainDialogWidget);
+ m_addStatus = new QPushButton(QIcon::fromTheme("list-add"), i18n("Add Presence"), mainDialogWidget);
+ m_removeStatus = new QPushButton(QIcon::fromTheme("list-remove"), i18n("Remove Presence"), mainDialogWidget);
m_removeStatus->setEnabled(false);
//this triggers the presenceMessageTextChanged() slot and disables the m_addStatus button
diff --git a/filter-bar.cpp b/filter-bar.cpp
index dd57421..6ae98df 100644
--- a/filter-bar.cpp
+++ b/filter-bar.cpp
@@ -35,7 +35,7 @@ FilterBar::FilterBar(QWidget* parent) :
// Create close button
QToolButton *closeButton = new QToolButton(this);
closeButton->setAutoRaise(true);
- closeButton->setIcon(KIcon("dialog-close"));
+ closeButton->setIcon(QIcon::fromTheme("dialog-close"));
closeButton->setToolTip(i18nc("@info:tooltip", "Hide Filter Bar"));
connect(closeButton, SIGNAL(clicked()), this, SIGNAL(closeRequest()));
diff --git a/global-presence-chooser.cpp b/global-presence-chooser.cpp
index e64c76a..1605486 100644
--- a/global-presence-chooser.cpp
+++ b/global-presence-chooser.cpp
@@ -98,14 +98,14 @@ QVariant PresenceModelExtended::data(const QModelIndex &index, int role) const
case Qt::DisplayRole:
return i18n("Configure Custom Presences...");
case Qt::DecorationRole:
- return KIcon("configure");
+ return QIcon::fromTheme("configure");
}
} else if (index.row() == rowCount() - 2) {
switch (role) {
case Qt::DisplayRole:
return i18n("Now listening to...");
case Qt::DecorationRole:
- return KIcon("speaker");
+ return QIcon::fromTheme("speaker");
}
} else if (m_temporaryPresence.isValid() && index.row() == rowCount() - 3) {
switch (role) {
@@ -187,7 +187,7 @@ GlobalPresenceChooser::GlobalPresenceChooser(QWidget *parent) :
m_busyOverlay->setSequence(KPixmapSequence("process-working", KIconLoader::SizeMedium));
setEditable(false);
- m_changePresenceMessageButton->setIcon(KIcon("document-edit"));
+ m_changePresenceMessageButton->setIcon(QIcon::fromTheme("document-edit"));
m_changePresenceMessageButton->setFlat(true);
m_changePresenceMessageButton->setToolTip(i18n("Click to change your presence message"));
diff --git a/main-widget.cpp b/main-widget.cpp
index 491f05a..d7d31d4 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -307,8 +307,8 @@ void MainWidget::closeEvent(QCloseEvent* e)
i18n("You do not have any other presence controls active (a Presence widget for example).
"
"Do you want to stay online or would you rather go offline?"),
i18n("No Other Presence Controls Found"),
- KGuiItem(i18n("Stay Online"), KIcon("user-online")),
- KGuiItem(i18n("Go Offline"), KIcon("user-offline")),
+ KGuiItem(i18n("Stay Online"), QIcon::fromTheme("user-online")),
+ KGuiItem(i18n("Go Offline"), QIcon::fromTheme("user-offline")),
KStandardGuiItem::cancel(),
QString("dont_check_for_plasmoid"))) {
@@ -477,7 +477,7 @@ void MainWidget::setupToolBar()
m_toolBar->addWidget(toolBarSpacer);
QToolButton *settingsButton = new QToolButton(this);
- settingsButton->setIcon(KIcon("configure"));
+ settingsButton->setIcon(QIcon::fromTheme("configure"));
settingsButton->setPopupMode(QToolButton::InstantPopup);
KMenu *settingsButtonMenu = new KMenu(settingsButton);
@@ -556,14 +556,14 @@ void MainWidget::setupTelepathy()
this, SLOT(onAccountManagerReady(Tp::PendingOperation*)));
}
-KAction *MainWidget::createAction(const QString &text, QObject *signalReceiver, const char *slot, const KIcon &icon = KIcon())
+KAction *MainWidget::createAction(const QString &text, QObject *signalReceiver, const char *slot, const QIcon &icon = QIcon())
{
KAction *action = new KAction(icon, text, this);
connect(action, SIGNAL(triggered(bool)), signalReceiver, slot);
return action;
}
-KAction *MainWidget::createAction(const QString& text, QObject *signalReceiver, const char* slot, bool isChecked, const KIcon& icon = KIcon())
+KAction *MainWidget::createAction(const QString& text, QObject *signalReceiver, const char* slot, bool isChecked, const QIcon &icon = QIcon())
{
KAction *action = createAction(text, signalReceiver, slot, icon);
action->setCheckable(true);
@@ -580,21 +580,21 @@ void MainWidget::setupActions(const KConfigGroup& guiConfigGroup)
m_quitAction->setMenuRole(QAction::QuitRole);
m_joinChatRoom = createAction(i18n("Join Chat Room..."), this, SLOT(onJoinChatRoomRequested()));
- m_joinChatRoom->setIcon(KIcon("im-irc"));
+ m_joinChatRoom->setIcon(QIcon::fromTheme("im-irc"));
m_makeCall = createAction(i18n("Make a Call..."), this, SLOT(onMakeCallRequested()));
m_mergeContacts = createAction(i18n("Merge Contacts..."), this, SLOT(onMergeContactsDialogRequested()));
- m_addContactAction = createAction(i18n("Add New Contacts..."), this, SLOT(onAddContactRequest()), KIcon("list-add-user"));
+ m_addContactAction = createAction(i18n("Add New Contacts..."), this, SLOT(onAddContactRequest()), QIcon::fromTheme("list-add-user"));
m_searchContactAction = createAction(i18n("Find Contact"), this, SLOT(toggleSearchWidget(bool)),
- guiConfigGroup.readEntry("pin_filterbar", true), KIcon("edit-find"));
+ guiConfigGroup.readEntry("pin_filterbar", true), QIcon::fromTheme("edit-find"));
m_searchContactAction->setShortcuts(KStandardShortcut::find());
- m_startChatAction = createAction(i18n("Start a chat..."), this, SLOT(onStartChatRequest()), KIcon("telepathy-kde"));
+ m_startChatAction = createAction(i18n("Start a chat..."), this, SLOT(onStartChatRequest()), QIcon::fromTheme("telepathy-kde"));
// Dual actions
m_metacontactToggleAction = new KDualAction(i18n("Split Selected Contacts"),
i18n("Merge Selected Contacts"),
this);
- m_metacontactToggleAction->setActiveIcon(KIcon("user-group-new"));
- m_metacontactToggleAction->setInactiveIcon(KIcon("user-group-delete"));
+ m_metacontactToggleAction->setActiveIcon(QIcon::fromTheme("user-group-new"));
+ m_metacontactToggleAction->setInactiveIcon(QIcon::fromTheme("user-group-delete"));
m_metacontactToggleAction->setActive(true);
m_metacontactToggleAction->setDisabled(true);
m_metacontactToggleAction->setAutoToggle(false);
@@ -616,8 +616,8 @@ void MainWidget::setupActions(const KConfigGroup& guiConfigGroup)
m_showOfflineAction = new KDualAction(i18n("Show Offline Contacts"),
i18n("Hide Offline Contacts"),
this);
- m_showOfflineAction->setActiveIcon(KIcon("show-offline"));
- m_showOfflineAction->setInactiveIcon(KIcon("show-offline"));
+ m_showOfflineAction->setActiveIcon(QIcon::fromTheme("show-offline"));
+ m_showOfflineAction->setInactiveIcon(QIcon::fromTheme("show-offline"));
m_showOfflineAction->setCheckable(true);
m_showOfflineAction->setChecked(false);
m_showOfflineAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_S));
@@ -625,8 +625,8 @@ void MainWidget::setupActions(const KConfigGroup& guiConfigGroup)
m_sortByPresenceAction = new KDualAction(i18n("Sort by Presence"),
i18n("Sort by Name"),
this);
- m_sortByPresenceAction->setActiveIcon(KIcon("sort-presence"));
- m_sortByPresenceAction->setInactiveIcon(KIcon("sort-name"));
+ m_sortByPresenceAction->setActiveIcon(QIcon::fromTheme("sort-presence"));
+ m_sortByPresenceAction->setInactiveIcon(QIcon::fromTheme("sort-name"));
// Setup contact list appearance
m_contactListTypeGroup = new QActionGroup(this);
@@ -763,7 +763,7 @@ void MainWidget::onModelInitialized(bool success)
m_messageWidget->setMessageType(KMessageWidget::Warning);
m_messageWidget->setText(i18n("Some data sources failed to initialize properly, your contact list might be incomplete."));
#if KDE_IS_VERSION(4, 11, 0)
- m_messageWidget->setIcon(KIcon::fromTheme(QLatin1String("dialog-warning")));
+ m_messageWidget->setIcon(QIcon::fromTheme(QLatin1String("dialog-warning")));
#endif
m_messageWidget->animatedShow();
}
diff --git a/main-widget.h b/main-widget.h
index e64a103..0710119 100644
--- a/main-widget.h
+++ b/main-widget.h
@@ -103,8 +103,8 @@ private:
///Was moved to telepathy-kded-module
//void handleConnectionError(const Tp::AccountPtr &account); /** handle connection errors for given account. This method provides visual notification */
void closeEvent(QCloseEvent *e);
- KAction *createAction(const QString& text, QObject *signalReceiver, const char* slot, const KIcon& icon);
- KAction *createAction(const QString& text, QObject *signalReceiver, const char* slot, bool isChecked, const KIcon& icon);
+ KAction *createAction(const QString& text, QObject *signalReceiver, const char* slot, const QIcon& icon);
+ KAction *createAction(const QString& text, QObject *signalReceiver, const char* slot, bool isChecked, const QIcon& icon);
void setupActions(const KConfigGroup&);
void setupGlobalMenu();
void setupToolBar();
diff --git a/tooltips/persontooltip.cpp b/tooltips/persontooltip.cpp
index 39a49a9..f086c8b 100644
--- a/tooltips/persontooltip.cpp
+++ b/tooltips/persontooltip.cpp
@@ -64,7 +64,7 @@ PersonToolTip::PersonToolTip(const QModelIndex &index) :
int smallIconSize = KIconLoader::global()->currentSize(KIconLoader::Small);
- ui->presenceIcon->setPixmap(KIcon(index.data(KTp::ContactPresenceIconRole).toString()).pixmap(smallIconSize, smallIconSize));
+ ui->presenceIcon->setPixmap(QIcon::fromTheme(index.data(KTp::ContactPresenceIconRole).toString()).pixmap(smallIconSize, smallIconSize));
ui->presenceLabel->setText(index.data(KTp::ContactPresenceNameRole).toString());
ui->presenceMessageLabel->setText(getTextWithHyperlinks(index.data(KTp::ContactPresenceMessageRole).toString()));
@@ -84,7 +84,7 @@ PersonToolTip::PersonToolTip(const QModelIndex &index) :
{
QModelIndex i = v.value<QModelIndex>();
QLabel *contactPresenceLabel = new QLabel(ui->contactsWidget);
- KIcon presenceIcon = KIcon(i.data(KTp::ContactPresenceIconRole).toString());
+ QIcon presenceIcon = QIcon::fromTheme(i.data(KTp::ContactPresenceIconRole).toString());
contactPresenceLabel->setPixmap(presenceIcon.pixmap(KIconLoader::SizeSmall, KIconLoader::SizeSmall));
QLabel *contactIdLabel = new QLabel(ui->contactsWidget);
--
ktp-contact-list packaging
More information about the pkg-kde-commits
mailing list