summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2015-08-27 09:08:35 +0200
committerMontel Laurent <[email protected]>2015-08-27 09:08:35 +0200
commit65e510e903150dc3fbe06715f228b8c94b63d1a2 (patch)
treea0cb804328f2a12799b339126a024db3eb9e02e6
parenta6f4194c6c8fd7a2ac007adc781b214d796a9c49 (diff)
Fix icon in hdpi mode
-rw-r--r--calendarsupport/kcalmodel.cpp10
-rw-r--r--calendarviews/todo/todomodel.cpp2
-rw-r--r--kmail/dialog/kmknotify.cpp2
-rw-r--r--korgac/alarmdialog.cpp4
-rw-r--r--libkdepim/progresswidget/progressdialog.cpp2
-rw-r--r--libksieve/ksieveui/managesievescriptsdialog.cpp2
-rw-r--r--libksieve/ksieveui/widgets/sievetreewidgetitem.cpp2
-rw-r--r--messagelist/core/widgets/quicksearchline.cpp18
8 files changed, 21 insertions, 21 deletions
diff --git a/calendarsupport/kcalmodel.cpp b/calendarsupport/kcalmodel.cpp
index 16b5fea..e24188d 100644
--- a/calendarsupport/kcalmodel.cpp
+++ b/calendarsupport/kcalmodel.cpp
@@ -32,7 +32,7 @@
#include <KLocalizedString>
#include <QPixmap>
-
+#include <QIcon>
using namespace CalendarSupport;
class Q_DECL_HIDDEN KCalModel::Private
@@ -145,13 +145,13 @@ QVariant KCalModel::data(const QModelIndex &index, int role) const
case Qt::DecorationRole:
if (index.column() == 0) {
if (incidence->type() == KCalCore::Incidence::TypeTodo) {
- return SmallIcon(QStringLiteral("view-pim-tasks"));
+ return QIcon::fromTheme(QStringLiteral("view-pim-tasks"));
} else if (incidence->type() == KCalCore::Incidence::TypeJournal) {
- return SmallIcon(QStringLiteral("view-pim-journal"));
+ return QIcon::fromTheme(QStringLiteral("view-pim-journal"));
} else if (incidence->type() == KCalCore::Incidence::TypeEvent) {
- return SmallIcon(QStringLiteral("view-calendar"));
+ return QIcon::fromTheme(QStringLiteral("view-calendar"));
} else {
- return SmallIcon(QStringLiteral("network-wired"));
+ return QIcon::fromTheme(QStringLiteral("network-wired"));
}
}
break;
diff --git a/calendarviews/todo/todomodel.cpp b/calendarviews/todo/todomodel.cpp
index e083bd3..3db8c50 100644
--- a/calendarviews/todo/todomodel.cpp
+++ b/calendarviews/todo/todomodel.cpp
@@ -365,7 +365,7 @@ QVariant TodoModel::data(const QModelIndex &index, int role) const
// the checkbox ( which increments the next occurrence date ).
if (role == Qt::DecorationRole && index.column() == SummaryColumn) {
if (todo->recurs()) {
- return QVariant(QIcon(SmallIcon(QStringLiteral("task-recurring"))));
+ return QVariant(QIcon(QIcon::fromTheme(QStringLiteral("task-recurring"))));
}
}
diff --git a/kmail/dialog/kmknotify.cpp b/kmail/dialog/kmknotify.cpp
index 79254d9..5387826 100644
--- a/kmail/dialog/kmknotify.cpp
+++ b/kmail/dialog/kmknotify.cpp
@@ -138,7 +138,7 @@ void KMKnotify::initCombobox()
KConfigGroup globalConfig(&config, QStringLiteral("Global"));
const QString icon = globalConfig.readEntry(QStringLiteral("IconName"), QStringLiteral("misc"));
const QString description = globalConfig.readEntry(QStringLiteral("Comment"), appname);
- m_comboNotify->addItem(SmallIcon(icon), description, appname);
+ m_comboNotify->addItem(QIcon::fromTheme(icon), description, appname);
}
}
}
diff --git a/korgac/alarmdialog.cpp b/korgac/alarmdialog.cpp
index ca8635a..98fbcdb 100644
--- a/korgac/alarmdialog.cpp
+++ b/korgac/alarmdialog.cpp
@@ -340,9 +340,9 @@ void AlarmDialog::addIncidence(const Akonadi::Item &incidenceitem,
displayStr);
if (incidence->type() == Incidence::TypeEvent) {
- item->setIcon(0, SmallIcon(QStringLiteral("view-calendar-day")));
+ item->setIcon(0, QIcon::fromTheme(QStringLiteral("view-calendar-day")));
} else if (incidence->type() == Incidence::TypeTodo) {
- item->setIcon(0, SmallIcon(QStringLiteral("view-calendar-tasks")));
+ item->setIcon(0, QIcon::fromTheme(QStringLiteral("view-calendar-tasks")));
}
item->mHappening = dateTime;
diff --git a/libkdepim/progresswidget/progressdialog.cpp b/libkdepim/progresswidget/progressdialog.cpp
index a3f0201..b5691c8 100644
--- a/libkdepim/progresswidget/progressdialog.cpp
+++ b/libkdepim/progresswidget/progressdialog.cpp
@@ -171,7 +171,7 @@ TransactionItem::TransactionItem(QWidget *parent,
h->layout()->addWidget(mProgress);
if (item->canBeCanceled()) {
- mCancelButton = new QPushButton(SmallIcon(QStringLiteral("dialog-cancel")), QString(), h);
+ mCancelButton = new QPushButton(QIcon::fromTheme(QStringLiteral("dialog-cancel")), QString(), h);
hHBoxLayout->addWidget(mCancelButton);
mCancelButton->setToolTip(i18n("Cancel this operation."));
connect(mCancelButton, SIGNAL(clicked()),
diff --git a/libksieve/ksieveui/managesievescriptsdialog.cpp b/libksieve/ksieveui/managesievescriptsdialog.cpp
index 0b14c91..e2f1e46 100644
--- a/libksieve/ksieveui/managesievescriptsdialog.cpp
+++ b/libksieve/ksieveui/managesievescriptsdialog.cpp
@@ -67,7 +67,7 @@ bool CustomManageSieveWidget::refreshList()
QString serverName = type.name();
last = new SieveTreeWidgetItem(treeView(), last);
- last->setIcon(0, SmallIcon(QStringLiteral("network-server")));
+ last->setIcon(0, QIcon::fromTheme(QStringLiteral("network-server")));
const QUrl u = KSieveUi::Util::findSieveUrlForAccount(type.identifier());
if (u.isEmpty()) {
diff --git a/libksieve/ksieveui/widgets/sievetreewidgetitem.cpp b/libksieve/ksieveui/widgets/sievetreewidgetitem.cpp
index ba52eb0..cd99e92 100644
--- a/libksieve/ksieveui/widgets/sievetreewidgetitem.cpp
+++ b/libksieve/ksieveui/widgets/sievetreewidgetitem.cpp
@@ -90,6 +90,6 @@ void SieveTreeWidgetItem::setProgressAnimation(const QPixmap &pix)
void SieveTreeWidgetItem::setDefaultIcon()
{
- setIcon(0, SmallIcon(QStringLiteral("network-server")));
+ setIcon(0, QIcon::fromTheme(QStringLiteral("network-server")));
}
diff --git a/messagelist/core/widgets/quicksearchline.cpp b/messagelist/core/widgets/quicksearchline.cpp
index d3e8cda..e092c83 100644
--- a/messagelist/core/widgets/quicksearchline.cpp
+++ b/messagelist/core/widgets/quicksearchline.cpp
@@ -366,21 +366,21 @@ void QuickSearchLine::initializeStatusSearchButton(QLayout *quickSearchButtonLay
mFilterStatusMapper = new QSignalMapper(this);
connect(mFilterStatusMapper, static_cast<void (QSignalMapper::*)(int)>(&QSignalMapper::mapped), this, &QuickSearchLine::statusButtonsClicked);
- createQuickSearchButton(SmallIcon(QStringLiteral("mail-unread")), i18nc("@action:inmenu Status of a message", "Unread"), Akonadi::MessageStatus::statusUnread().toQInt32(), quickSearchButtonLayout);
+ createQuickSearchButton(QIcon::fromTheme(QStringLiteral("mail-unread")), i18nc("@action:inmenu Status of a message", "Unread"), Akonadi::MessageStatus::statusUnread().toQInt32(), quickSearchButtonLayout);
- createQuickSearchButton(SmallIcon(QStringLiteral("mail-replied")),
+ createQuickSearchButton(QIcon::fromTheme(QStringLiteral("mail-replied")),
i18nc("@action:inmenu Status of a message", "Replied"),
Akonadi::MessageStatus::statusReplied().toQInt32(), quickSearchButtonLayout);
- createQuickSearchButton(SmallIcon(QStringLiteral("mail-forwarded")),
+ createQuickSearchButton(QIcon::fromTheme(QStringLiteral("mail-forwarded")),
i18nc("@action:inmenu Status of a message", "Forwarded"),
Akonadi::MessageStatus::statusForwarded().toQInt32(), quickSearchButtonLayout);
- createQuickSearchButton(SmallIcon(QStringLiteral("emblem-important")),
+ createQuickSearchButton(QIcon::fromTheme(QStringLiteral("emblem-important")),
i18nc("@action:inmenu Status of a message", "Important"),
Akonadi::MessageStatus::statusImportant().toQInt32(), quickSearchButtonLayout);
- createQuickSearchButton(SmallIcon(QStringLiteral("mail-task")),
+ createQuickSearchButton(QIcon::fromTheme(QStringLiteral("mail-task")),
i18nc("@action:inmenu Status of a message", "Action Item"),
Akonadi::MessageStatus::statusToAct().toQInt32(), quickSearchButtonLayout);
@@ -392,19 +392,19 @@ void QuickSearchLine::initializeStatusSearchButton(QLayout *quickSearchButtonLay
i18nc("@action:inmenu Status of a message", "Ignored"),
Akonadi::MessageStatus::statusIgnored().toQInt32(), quickSearchButtonLayout);
- createQuickSearchButton(SmallIcon(QStringLiteral("mail-attachment")),
+ createQuickSearchButton(QIcon::fromTheme(QStringLiteral("mail-attachment")),
i18nc("@action:inmenu Status of a message", "Has Attachment"),
Akonadi::MessageStatus::statusHasAttachment().toQInt32(), quickSearchButtonLayout);
- createQuickSearchButton(SmallIcon(QStringLiteral("mail-invitation")),
+ createQuickSearchButton(QIcon::fromTheme(QStringLiteral("mail-invitation")),
i18nc("@action:inmenu Status of a message", "Has Invitation"),
Akonadi::MessageStatus::statusHasInvitation().toQInt32(), quickSearchButtonLayout);
- createQuickSearchButton(SmallIcon(QStringLiteral("mail-mark-junk")),
+ createQuickSearchButton(QIcon::fromTheme(QStringLiteral("mail-mark-junk")),
i18nc("@action:inmenu Status of a message", "Spam"),
Akonadi::MessageStatus::statusSpam().toQInt32(), quickSearchButtonLayout);
- createQuickSearchButton(SmallIcon(QStringLiteral("mail-mark-notjunk")),
+ createQuickSearchButton(QIcon::fromTheme(QStringLiteral("mail-mark-notjunk")),
i18nc("@action:inmenu Status of a message", "Ham"),
Akonadi::MessageStatus::statusHam().toQInt32(), quickSearchButtonLayout);
}