diff --git a/resources/graphics/icons/mini-kfaenza/help-about.png b/resources/graphics/icons/mini-kfaenza/application-about.png similarity index 100% rename from resources/graphics/icons/mini-kfaenza/help-about.png rename to resources/graphics/icons/mini-kfaenza/application-about.png diff --git a/resources/graphics/icons/mini-kfaenza/preferences-system.png b/resources/graphics/icons/mini-kfaenza/application-settings.png similarity index 100% rename from resources/graphics/icons/mini-kfaenza/preferences-system.png rename to resources/graphics/icons/mini-kfaenza/application-settings.png diff --git a/resources/graphics/icons/mini-kfaenza/dialog-cancel.png b/resources/graphics/icons/mini-kfaenza/dialog-cancel.png new file mode 100644 index 000000000..8614a885d Binary files /dev/null and b/resources/graphics/icons/mini-kfaenza/dialog-cancel.png differ diff --git a/resources/graphics/icons/mini-kfaenza/dialog-information.png b/resources/graphics/icons/mini-kfaenza/dialog-information.png new file mode 100644 index 000000000..38f3e9953 Binary files /dev/null and b/resources/graphics/icons/mini-kfaenza/dialog-information.png differ diff --git a/resources/graphics/icons/mini-kfaenza/insert-image.png b/resources/graphics/icons/mini-kfaenza/edit-copy-image.png similarity index 100% rename from resources/graphics/icons/mini-kfaenza/insert-image.png rename to resources/graphics/icons/mini-kfaenza/edit-copy-image.png diff --git a/resources/graphics/icons/mini-kfaenza/document-revert.png b/resources/graphics/icons/mini-kfaenza/edit-revert.png similarity index 100% rename from resources/graphics/icons/mini-kfaenza/document-revert.png rename to resources/graphics/icons/mini-kfaenza/edit-revert.png diff --git a/resources/graphics/icons/mini-kfaenza/folder-black.png b/resources/graphics/icons/mini-kfaenza/folder-category.png similarity index 100% rename from resources/graphics/icons/mini-kfaenza/folder-black.png rename to resources/graphics/icons/mini-kfaenza/folder-category.png diff --git a/resources/graphics/icons/mini-kfaenza/application-rss+xml.png b/resources/graphics/icons/mini-kfaenza/folder-feed.png similarity index 100% rename from resources/graphics/icons/mini-kfaenza/application-rss+xml.png rename to resources/graphics/icons/mini-kfaenza/folder-feed.png diff --git a/resources/graphics/icons/mini-kfaenza/folder-red.png b/resources/graphics/icons/mini-kfaenza/folder-root.png similarity index 100% rename from resources/graphics/icons/mini-kfaenza/folder-red.png rename to resources/graphics/icons/mini-kfaenza/folder-root.png diff --git a/resources/graphics/icons/mini-kfaenza/view-refresh.png b/resources/graphics/icons/mini-kfaenza/go-refresh.png similarity index 100% rename from resources/graphics/icons/mini-kfaenza/view-refresh.png rename to resources/graphics/icons/mini-kfaenza/go-refresh.png diff --git a/resources/graphics/icons/mini-kfaenza/process-stop.png b/resources/graphics/icons/mini-kfaenza/go-stop.png similarity index 100% rename from resources/graphics/icons/mini-kfaenza/process-stop.png rename to resources/graphics/icons/mini-kfaenza/go-stop.png diff --git a/resources/graphics/icons/mini-kfaenza/image-x-generic.png b/resources/graphics/icons/mini-kfaenza/image-generic.png similarity index 100% rename from resources/graphics/icons/mini-kfaenza/image-x-generic.png rename to resources/graphics/icons/mini-kfaenza/image-generic.png diff --git a/resources/graphics/icons/mini-kfaenza/gnome-other.png b/resources/graphics/icons/mini-kfaenza/item-edit.png similarity index 100% rename from resources/graphics/icons/mini-kfaenza/gnome-other.png rename to resources/graphics/icons/mini-kfaenza/item-edit.png diff --git a/resources/graphics/icons/mini-kfaenza/document-new.png b/resources/graphics/icons/mini-kfaenza/item-new.png similarity index 100% rename from resources/graphics/icons/mini-kfaenza/document-new.png rename to resources/graphics/icons/mini-kfaenza/item-new.png diff --git a/resources/graphics/icons/mini-kfaenza/document-multiple.png b/resources/graphics/icons/mini-kfaenza/item-newspaper.png similarity index 100% rename from resources/graphics/icons/mini-kfaenza/document-multiple.png rename to resources/graphics/icons/mini-kfaenza/item-newspaper.png diff --git a/resources/graphics/icons/mini-kfaenza/document-open.png b/resources/graphics/icons/mini-kfaenza/item-open.png similarity index 100% rename from resources/graphics/icons/mini-kfaenza/document-open.png rename to resources/graphics/icons/mini-kfaenza/item-open.png diff --git a/resources/graphics/icons/mini-kfaenza/item-remove.png b/resources/graphics/icons/mini-kfaenza/item-remove.png new file mode 100644 index 000000000..8614a885d Binary files /dev/null and b/resources/graphics/icons/mini-kfaenza/item-remove.png differ diff --git a/resources/graphics/icons/mini-kfaenza/document-save-as.png b/resources/graphics/icons/mini-kfaenza/item-update-all.png similarity index 100% rename from resources/graphics/icons/mini-kfaenza/document-save-as.png rename to resources/graphics/icons/mini-kfaenza/item-update-all.png diff --git a/resources/graphics/icons/mini-kfaenza/document-save.png b/resources/graphics/icons/mini-kfaenza/item-update-selected.png similarity index 100% rename from resources/graphics/icons/mini-kfaenza/document-save.png rename to resources/graphics/icons/mini-kfaenza/item-update-selected.png diff --git a/resources/graphics/icons/mini-kfaenza/list-current.png b/resources/graphics/icons/mini-kfaenza/list-current.png new file mode 100644 index 000000000..b5e2d50c0 Binary files /dev/null and b/resources/graphics/icons/mini-kfaenza/list-current.png differ diff --git a/resources/graphics/icons/mini-kfaenza/favorites.png b/resources/graphics/icons/mini-kfaenza/mail-mark-favorite.png similarity index 100% rename from resources/graphics/icons/mini-kfaenza/favorites.png rename to resources/graphics/icons/mini-kfaenza/mail-mark-favorite.png diff --git a/resources/graphics/icons/mini-kfaenza/mail-mark-important.png b/resources/graphics/icons/mini-kfaenza/mail-mark-important.png deleted file mode 100644 index a5f4dab8d..000000000 Binary files a/resources/graphics/icons/mini-kfaenza/mail-mark-important.png and /dev/null differ diff --git a/resources/graphics/icons/mini-kfaenza/mail-mark-not-junk.png b/resources/graphics/icons/mini-kfaenza/mail-mark-not-junk.png deleted file mode 100644 index f69caafba..000000000 Binary files a/resources/graphics/icons/mini-kfaenza/mail-mark-not-junk.png and /dev/null differ diff --git a/resources/graphics/icons/mini-kfaenza/mail-mark-read.png b/resources/graphics/icons/mini-kfaenza/mail-mark-read.png index be49000b0..f69caafba 100644 Binary files a/resources/graphics/icons/mini-kfaenza/mail-mark-read.png and b/resources/graphics/icons/mini-kfaenza/mail-mark-read.png differ diff --git a/resources/graphics/icons/mini-kfaenza/mail-mark-unread.png b/resources/graphics/icons/mini-kfaenza/mail-mark-unread.png index 32563c623..a5f4dab8d 100644 Binary files a/resources/graphics/icons/mini-kfaenza/mail-mark-unread.png and b/resources/graphics/icons/mini-kfaenza/mail-mark-unread.png differ diff --git a/resources/graphics/icons/mini-kfaenza/mail-mark-junk.png b/resources/graphics/icons/mini-kfaenza/mail-remove.png similarity index 100% rename from resources/graphics/icons/mini-kfaenza/mail-mark-junk.png rename to resources/graphics/icons/mini-kfaenza/mail-remove.png diff --git a/resources/graphics/icons/mini-kfaenza/zoom-fit-best.png b/resources/graphics/icons/mini-kfaenza/zoom-fit-best.png deleted file mode 100644 index 27be2f9f7..000000000 Binary files a/resources/graphics/icons/mini-kfaenza/zoom-fit-best.png and /dev/null differ diff --git a/src/core/feedsmodel.cpp b/src/core/feedsmodel.cpp index dc3d25e86..055972245 100644 --- a/src/core/feedsmodel.cpp +++ b/src/core/feedsmodel.cpp @@ -22,8 +22,8 @@ FeedsModel::FeedsModel(QObject *parent) : QAbstractItemModel(parent) { m_rootItem = new FeedsModelRootItem(); m_rootItem->setId(NO_PARENT_CATEGORY); m_rootItem->setTitle(tr("root")); - m_rootItem->setIcon(IconThemeFactory::instance()->fromTheme("folder-red")); - m_countsIcon = IconThemeFactory::instance()->fromTheme("mail-mark-important"); + m_rootItem->setIcon(IconThemeFactory::instance()->fromTheme("folder-root")); + m_countsIcon = IconThemeFactory::instance()->fromTheme("mail-mark-unread"); m_headerData << tr("Title"); m_tooltipData << tr("Titles of feeds/categories.") << tr("Counts of unread/all meesages."); diff --git a/src/core/messagesmodel.cpp b/src/core/messagesmodel.cpp index 087cf2975..9d64d8a28 100644 --- a/src/core/messagesmodel.cpp +++ b/src/core/messagesmodel.cpp @@ -36,9 +36,9 @@ MessagesModel::~MessagesModel() { void MessagesModel::setupIcons() { - m_favoriteIcon = IconThemeFactory::instance()->fromTheme("favorites"); - m_readIcon = IconThemeFactory::instance()->fromTheme("mail-mark-not-junk"); - m_unreadIcon = IconThemeFactory::instance()->fromTheme("mail-mark-important"); + m_favoriteIcon = IconThemeFactory::instance()->fromTheme("mail-mark-favorite"); + m_readIcon = IconThemeFactory::instance()->fromTheme("mail-mark-read"); + m_unreadIcon = IconThemeFactory::instance()->fromTheme("mail-mark-unread"); } void MessagesModel::fetchAll() { diff --git a/src/gui/formabout.cpp b/src/gui/formabout.cpp index 5f904f672..68905b0a0 100644 --- a/src/gui/formabout.cpp +++ b/src/gui/formabout.cpp @@ -15,7 +15,7 @@ FormAbout::FormAbout(QWidget *parent) : QDialog(parent), m_ui(new Ui::FormAbout) // Set flags and attributes. setWindowFlags(Qt::MSWindowsFixedSizeDialogHint | Qt::Dialog); - setWindowIcon(IconThemeFactory::instance()->fromTheme("help-about")); + setWindowIcon(IconThemeFactory::instance()->fromTheme("application-about")); #if !defined(Q_OS_WIN) MessageBox::iconify(m_ui->m_buttonBox); diff --git a/src/gui/formmain.cpp b/src/gui/formmain.cpp index 86de5332c..92a9d3fd3 100755 --- a/src/gui/formmain.cpp +++ b/src/gui/formmain.cpp @@ -201,9 +201,9 @@ bool FormMain::event(QEvent *event) { void FormMain::setupIcons() { // Setup icons of this main window. - m_ui->m_actionSettings->setIcon(IconThemeFactory::instance()->fromTheme("preferences-system")); + m_ui->m_actionSettings->setIcon(IconThemeFactory::instance()->fromTheme("application-settings")); m_ui->m_actionQuit->setIcon(IconThemeFactory::instance()->fromTheme("application-exit")); - m_ui->m_actionAboutGuard->setIcon(IconThemeFactory::instance()->fromTheme("help-about")); + m_ui->m_actionAboutGuard->setIcon(IconThemeFactory::instance()->fromTheme("application-about")); m_ui->m_actionImport->setIcon(IconThemeFactory::instance()->fromTheme("document-import")); m_ui->m_actionExport->setIcon(IconThemeFactory::instance()->fromTheme("document-export")); m_ui->m_actionFullscreen->setIcon(IconThemeFactory::instance()->fromTheme("view-fullscreen")); @@ -212,28 +212,28 @@ void FormMain::setupIcons() { m_ui->m_actionAddBrowser->setIcon(IconThemeFactory::instance()->fromTheme("list-add")); m_ui->m_actionCloseCurrentTab->setIcon(IconThemeFactory::instance()->fromTheme("list-remove")); m_ui->m_actionCloseAllTabs->setIcon(IconThemeFactory::instance()->fromTheme("list-remove")); - m_ui->m_menuCurrentTab->setIcon(IconThemeFactory::instance()->fromTheme("go-home")); + m_ui->m_menuCurrentTab->setIcon(IconThemeFactory::instance()->fromTheme("list-current")); // Feeds/messages. - m_ui->m_menuAddItem->setIcon(IconThemeFactory::instance()->fromTheme("document-new")); - m_ui->m_actionUpdateAllFeeds->setIcon(IconThemeFactory::instance()->fromTheme("document-save-as")); - m_ui->m_actionUpdateSelectedFeedsCategories->setIcon(IconThemeFactory::instance()->fromTheme("document-save")); - m_ui->m_actionClearFeeds->setIcon(IconThemeFactory::instance()->fromTheme("mail-mark-junk")); - m_ui->m_actionDeleteSelectedFeedCategory->setIcon(IconThemeFactory::instance()->fromTheme("edit-delete")); - m_ui->m_actionDeleteSelectedMessages->setIcon(IconThemeFactory::instance()->fromTheme("mail-mark-junk")); - m_ui->m_actionAddStandardCategory->setIcon(IconThemeFactory::instance()->fromTheme("document-new")); - m_ui->m_actionAddStandardFeed->setIcon(IconThemeFactory::instance()->fromTheme("document-new")); - m_ui->m_actionEditSelectedFeedCategory->setIcon(IconThemeFactory::instance()->fromTheme("gnome-other")); - m_ui->m_actionMarkAllFeedsRead->setIcon(IconThemeFactory::instance()->fromTheme("mail-mark-not-junk")); - m_ui->m_actionMarkSelectedFeedsAsRead->setIcon(IconThemeFactory::instance()->fromTheme("mail-mark-not-junk")); - m_ui->m_actionMarkSelectedFeedsAsUnread->setIcon(IconThemeFactory::instance()->fromTheme("mail-mark-important")); - m_ui->m_actionMarkSelectedMessagesAsRead->setIcon(IconThemeFactory::instance()->fromTheme("mail-mark-not-junk")); - m_ui->m_actionMarkSelectedMessagesAsUnread->setIcon(IconThemeFactory::instance()->fromTheme("mail-mark-important")); - m_ui->m_actionSwitchImportanceOfSelectedMessages->setIcon(IconThemeFactory::instance()->fromTheme("favorites")); - m_ui->m_actionOpenSelectedSourceArticlesInternally->setIcon(IconThemeFactory::instance()->fromTheme("document-open")); - m_ui->m_actionOpenSelectedSourceArticlesExternally->setIcon(IconThemeFactory::instance()->fromTheme("document-open")); - m_ui->m_actionOpenSelectedMessagesInternally->setIcon(IconThemeFactory::instance()->fromTheme("document-open")); - m_ui->m_actionViewSelectedItemsNewspaperMode->setIcon(IconThemeFactory::instance()->fromTheme("document-multiple")); + m_ui->m_menuAddItem->setIcon(IconThemeFactory::instance()->fromTheme("item-new")); + m_ui->m_actionUpdateAllFeeds->setIcon(IconThemeFactory::instance()->fromTheme("item-update-all")); + m_ui->m_actionUpdateSelectedFeedsCategories->setIcon(IconThemeFactory::instance()->fromTheme("item-update-selected")); + m_ui->m_actionClearFeeds->setIcon(IconThemeFactory::instance()->fromTheme("mail-remove")); + m_ui->m_actionDeleteSelectedFeedCategory->setIcon(IconThemeFactory::instance()->fromTheme("item-remove")); + m_ui->m_actionDeleteSelectedMessages->setIcon(IconThemeFactory::instance()->fromTheme("mail-remove")); + m_ui->m_actionAddStandardCategory->setIcon(IconThemeFactory::instance()->fromTheme("item-new")); + m_ui->m_actionAddStandardFeed->setIcon(IconThemeFactory::instance()->fromTheme("item-new")); + m_ui->m_actionEditSelectedFeedCategory->setIcon(IconThemeFactory::instance()->fromTheme("item-edit")); + m_ui->m_actionMarkAllFeedsRead->setIcon(IconThemeFactory::instance()->fromTheme("mail-mark-read")); + m_ui->m_actionMarkSelectedFeedsAsRead->setIcon(IconThemeFactory::instance()->fromTheme("mail-mark-read")); + m_ui->m_actionMarkSelectedFeedsAsUnread->setIcon(IconThemeFactory::instance()->fromTheme("mail-mark-unread")); + m_ui->m_actionMarkSelectedMessagesAsRead->setIcon(IconThemeFactory::instance()->fromTheme("mail-mark-read")); + m_ui->m_actionMarkSelectedMessagesAsUnread->setIcon(IconThemeFactory::instance()->fromTheme("mail-mark-unread")); + m_ui->m_actionSwitchImportanceOfSelectedMessages->setIcon(IconThemeFactory::instance()->fromTheme("mail-mark-favorite")); + m_ui->m_actionOpenSelectedSourceArticlesInternally->setIcon(IconThemeFactory::instance()->fromTheme("item-open")); + m_ui->m_actionOpenSelectedSourceArticlesExternally->setIcon(IconThemeFactory::instance()->fromTheme("item-open")); + m_ui->m_actionOpenSelectedMessagesInternally->setIcon(IconThemeFactory::instance()->fromTheme("item-open")); + m_ui->m_actionViewSelectedItemsNewspaperMode->setIcon(IconThemeFactory::instance()->fromTheme("item-newspaper")); // Setup icons for underlying components: opened web browsers... foreach (WebBrowser *browser, WebBrowser::runningWebBrowsers()) { diff --git a/src/gui/formsettings.cpp b/src/gui/formsettings.cpp index 6a840cfee..a93d87d06 100755 --- a/src/gui/formsettings.cpp +++ b/src/gui/formsettings.cpp @@ -28,7 +28,7 @@ FormSettings::FormSettings(QWidget *parent) : QDialog(parent), m_ui(new Ui::Form // Set flags and attributes. setWindowFlags(Qt::MSWindowsFixedSizeDialogHint | Qt::Dialog); - setWindowIcon(IconThemeFactory::instance()->fromTheme("preferences-system")); + setWindowIcon(IconThemeFactory::instance()->fromTheme("application-settings")); #if !defined(Q_OS_WIN) MessageBox::iconify(m_ui->m_buttonBox); diff --git a/src/gui/formstandardcategorydetails.cpp b/src/gui/formstandardcategorydetails.cpp index 4a5b0ae63..1e2094724 100644 --- a/src/gui/formstandardcategorydetails.cpp +++ b/src/gui/formstandardcategorydetails.cpp @@ -145,7 +145,7 @@ void FormStandardCategoryDetails::onLoadIconFromFile() { QFileDialog dialog(this, tr("Select icon file for the category"), QDir::homePath(), tr("Images (*.bmp *.jpg *.jpeg *.png *.svg *.tga)")); dialog.setFileMode(QFileDialog::ExistingFile); - dialog.setWindowIcon(IconThemeFactory::instance()->fromTheme("image-x-generic")); + dialog.setWindowIcon(IconThemeFactory::instance()->fromTheme("image-generic")); dialog.setOptions(QFileDialog::DontUseNativeDialog | QFileDialog::ReadOnly); dialog.setViewMode(QFileDialog::Detail); dialog.setLabelText(QFileDialog::Accept, tr("Select icon")); @@ -160,7 +160,7 @@ void FormStandardCategoryDetails::onLoadIconFromFile() { } void FormStandardCategoryDetails::onUseDefaultIcon() { - m_ui->m_btnIcon->setIcon(IconThemeFactory::instance()->fromTheme("folder-black")); + m_ui->m_btnIcon->setIcon(IconThemeFactory::instance()->fromTheme("folder-category")); } void FormStandardCategoryDetails::initialize() { @@ -176,7 +176,7 @@ void FormStandardCategoryDetails::initialize() { // Set flags and attributes. setWindowFlags(Qt::MSWindowsFixedSizeDialogHint | Qt::Dialog); - setWindowIcon(IconThemeFactory::instance()->fromTheme("document-new")); + setWindowIcon(IconThemeFactory::instance()->fromTheme("item-new")); // Setup button box. m_ui->m_buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false); @@ -187,13 +187,13 @@ void FormStandardCategoryDetails::initialize() { // Setup menu & actions for icon selection. m_iconMenu = new QMenu(tr("Icon selection"), this); - m_actionLoadIconFromFile = new QAction(IconThemeFactory::instance()->fromTheme("image-x-generic"), + m_actionLoadIconFromFile = new QAction(IconThemeFactory::instance()->fromTheme("image-generic"), tr("Load icon from file..."), this); - m_actionNoIcon = new QAction(IconThemeFactory::instance()->fromTheme("edit-delete"), + m_actionNoIcon = new QAction(IconThemeFactory::instance()->fromTheme("dialog-cancel"), tr("Do not use icon"), this); - m_actionUseDefaultIcon = new QAction(IconThemeFactory::instance()->fromTheme("folder-black"), + m_actionUseDefaultIcon = new QAction(IconThemeFactory::instance()->fromTheme("folder-category"), tr("Use default icon"), this); m_iconMenu->addAction(m_actionLoadIconFromFile); diff --git a/src/gui/formstandardfeeddetails.cpp b/src/gui/formstandardfeeddetails.cpp index 44f4dfecc..f7cb34487 100644 --- a/src/gui/formstandardfeeddetails.cpp +++ b/src/gui/formstandardfeeddetails.cpp @@ -150,7 +150,7 @@ void FormStandardFeedDetails::onLoadIconFromFile() { QFileDialog dialog(this, tr("Select icon file for the feed"), QDir::homePath(), tr("Images (*.bmp *.jpg *.jpeg *.png *.svg *.tga)")); dialog.setFileMode(QFileDialog::ExistingFile); - dialog.setWindowIcon(IconThemeFactory::instance()->fromTheme("image-x-generic")); + dialog.setWindowIcon(IconThemeFactory::instance()->fromTheme("image-generic")); dialog.setOptions(QFileDialog::DontUseNativeDialog | QFileDialog::ReadOnly); dialog.setViewMode(QFileDialog::Detail); dialog.setLabelText(QFileDialog::Accept, tr("Select icon")); @@ -165,7 +165,7 @@ void FormStandardFeedDetails::onLoadIconFromFile() { } void FormStandardFeedDetails::onUseDefaultIcon() { - m_ui->m_btnIcon->setIcon(IconThemeFactory::instance()->fromTheme("application-rss+xml")); + m_ui->m_btnIcon->setIcon(IconThemeFactory::instance()->fromTheme("folder-feed")); } void FormStandardFeedDetails::apply() { @@ -254,7 +254,7 @@ void FormStandardFeedDetails::initialize() { // Set flags and attributes. setWindowFlags(Qt::MSWindowsFixedSizeDialogHint | Qt::Dialog); - setWindowIcon(IconThemeFactory::instance()->fromTheme("document-new")); + setWindowIcon(IconThemeFactory::instance()->fromTheme("item-new")); // Setup button box. m_ui->m_buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false); @@ -299,13 +299,13 @@ void FormStandardFeedDetails::initialize() { // Setup menu & actions for icon selection. m_iconMenu = new QMenu(tr("Icon selection"), this); - m_actionLoadIconFromFile = new QAction(IconThemeFactory::instance()->fromTheme("image-x-generic"), + m_actionLoadIconFromFile = new QAction(IconThemeFactory::instance()->fromTheme("image-generic"), tr("Load icon from file..."), this); - m_actionNoIcon = new QAction(IconThemeFactory::instance()->fromTheme("edit-delete"), + m_actionNoIcon = new QAction(IconThemeFactory::instance()->fromTheme("dialog-cancel"), tr("Do not use icon"), this); - m_actionUseDefaultIcon = new QAction(IconThemeFactory::instance()->fromTheme("application-rss+xml"), + m_actionUseDefaultIcon = new QAction(IconThemeFactory::instance()->fromTheme("folder-feed"), tr("Use default icon"), this); m_iconMenu->addAction(m_actionLoadIconFromFile); diff --git a/src/gui/lineeditwithstatus.cpp b/src/gui/lineeditwithstatus.cpp index 97e5fb9f9..c5bc84cb0 100644 --- a/src/gui/lineeditwithstatus.cpp +++ b/src/gui/lineeditwithstatus.cpp @@ -13,7 +13,7 @@ LineEditWithStatus::LineEditWithStatus(QWidget *parent) m_txtInput = new BaseLineEdit(this); m_btnStatus = new PlainToolButton(this); - m_iconInformation = IconThemeFactory::instance()->fromTheme("help-about"); + m_iconInformation = IconThemeFactory::instance()->fromTheme("dialog-information"); m_iconWarning = IconThemeFactory::instance()->fromTheme("dialog-warning"); m_iconError = IconThemeFactory::instance()->fromTheme("dialog-error"); m_iconOk = IconThemeFactory::instance()->fromTheme("dialog-yes"); diff --git a/src/gui/messagebox.cpp b/src/gui/messagebox.cpp index d2c3fbd73..babe08c63 100644 --- a/src/gui/messagebox.cpp +++ b/src/gui/messagebox.cpp @@ -38,7 +38,7 @@ QIcon MessageBox::iconForRole(QDialogButtonBox::StandardButton button) { case QMessageBox::Cancel: case QMessageBox::Close: - return IconThemeFactory::instance()->fromTheme("edit-delete"); + return IconThemeFactory::instance()->fromTheme("dialog-cancel"); case QMessageBox::Yes: case QMessageBox::YesToAll: @@ -49,7 +49,7 @@ QIcon MessageBox::iconForRole(QDialogButtonBox::StandardButton button) { return IconThemeFactory::instance()->fromTheme("dialog-no"); case QMessageBox::Help: - return IconThemeFactory::instance()->fromTheme("dialog-information"); + return IconThemeFactory::instance()->fromTheme("dialog-question"); default: return QIcon(); @@ -59,7 +59,7 @@ QIcon MessageBox::iconForRole(QDialogButtonBox::StandardButton button) { QIcon MessageBox::iconForStatus(QMessageBox::Icon status) { switch (status) { case QMessageBox::Information: - return IconThemeFactory::instance()->fromTheme("help-about"); + return IconThemeFactory::instance()->fromTheme("dialog-information"); case QMessageBox::Warning: return IconThemeFactory::instance()->fromTheme("dialog-warning"); diff --git a/src/gui/shortcutcatcher.cpp b/src/gui/shortcutcatcher.cpp index 4f335d2cf..57b27ea07 100644 --- a/src/gui/shortcutcatcher.cpp +++ b/src/gui/shortcutcatcher.cpp @@ -44,7 +44,7 @@ ShortcutCatcher::ShortcutCatcher(QWidget *parent) // Create clear button. m_clearButton = new QToolButton(this); - m_clearButton->setIcon(IconThemeFactory::instance()->fromTheme("document-revert")); + m_clearButton->setIcon(IconThemeFactory::instance()->fromTheme("edit-revert")); m_clearButton->setFocusPolicy(Qt::NoFocus); m_clearButton->setToolTip(tr("Reset shortcut.")); diff --git a/src/gui/tabwidget.cpp b/src/gui/tabwidget.cpp index 73b490cc0..ac897cbb3 100644 --- a/src/gui/tabwidget.cpp +++ b/src/gui/tabwidget.cpp @@ -70,7 +70,7 @@ void TabWidget::setupIcons() { for (int index = 0; index < count(); index++) { // Index 0 usually contains widget which displays feeds & messages. if (tabBar()->tabType(index) == TabBar::FeedReader) { - setTabIcon(index, IconThemeFactory::instance()->fromTheme("application-rss+xml")); + setTabIcon(index, IconThemeFactory::instance()->fromTheme("folder-feed")); } // Other indexes probably contain WebBrowsers. else { diff --git a/src/gui/webbrowser.cpp b/src/gui/webbrowser.cpp index c721807e2..0ce4e73c5 100644 --- a/src/gui/webbrowser.cpp +++ b/src/gui/webbrowser.cpp @@ -182,7 +182,7 @@ void WebBrowser::navigateToMessages(const QList &messages) { m_webView->setHtml(layout_wrapper, QUrl(INTERNAL_URL_NEWSPAPER)); emit iconChanged(m_index, - IconThemeFactory::instance()->fromTheme("document-multiple")); + IconThemeFactory::instance()->fromTheme("item-newspaper")); } void WebBrowser::updateZoomGui() { @@ -227,11 +227,10 @@ WebBrowser::~WebBrowser() { } void WebBrowser::setupIcons() { - m_actionZoom->setIcon(IconThemeFactory::instance()->fromTheme("zoom-fit-best")); m_actionBack->setIcon(IconThemeFactory::instance()->fromTheme("go-previous")); m_actionForward->setIcon(IconThemeFactory::instance()->fromTheme("go-next")); - m_actionReload->setIcon(IconThemeFactory::instance()->fromTheme("view-refresh")); - m_actionStop->setIcon(IconThemeFactory::instance()->fromTheme("process-stop")); + m_actionReload->setIcon(IconThemeFactory::instance()->fromTheme("go-refresh")); + m_actionStop->setIcon(IconThemeFactory::instance()->fromTheme("go-stop")); m_webView->setupIcons(); } diff --git a/src/gui/webview.cpp b/src/gui/webview.cpp index 5c14b1eb8..7dfa827bb 100644 --- a/src/gui/webview.cpp +++ b/src/gui/webview.cpp @@ -55,9 +55,9 @@ void WebView::createConnections() { } void WebView::setupIcons() { - m_actionReload->setIcon(IconThemeFactory::instance()->fromTheme("view-refresh")); + m_actionReload->setIcon(IconThemeFactory::instance()->fromTheme("go-refresh")); m_actionCopyLink->setIcon(IconThemeFactory::instance()->fromTheme("edit-copy")); - m_actionCopyImage->setIcon(IconThemeFactory::instance()->fromTheme("insert-image")); + m_actionCopyImage->setIcon(IconThemeFactory::instance()->fromTheme("edit-copy-image")); #if QT_VERSION >= 0x040800 m_actionCopyImageUrl->setIcon(IconThemeFactory::instance()->fromTheme("edit-copy")); @@ -65,7 +65,7 @@ void WebView::setupIcons() { m_actionOpenLinkThisTab->setIcon(IconThemeFactory::instance()->fromTheme("text-html")); m_actionOpenLinkNewTab->setIcon(IconThemeFactory::instance()->fromTheme("text-html")); - m_actionOpenImageNewTab->setIcon(IconThemeFactory::instance()->fromTheme("insert-image")); + m_actionOpenImageNewTab->setIcon(IconThemeFactory::instance()->fromTheme("edit-copy-image")); } void WebView::initializeActions() { @@ -130,7 +130,7 @@ void WebView::popupContextMenu(const QPoint &pos) { QMenu link_submenu(tr("Hyperlink"), this); QWebHitTestResult hit_result = page()->mainFrame()->hitTestContent(pos); - image_submenu.setIcon(IconThemeFactory::instance()->fromTheme("image-x-generic")); + image_submenu.setIcon(IconThemeFactory::instance()->fromTheme("image-generic")); link_submenu.setIcon(IconThemeFactory::instance()->fromTheme("text-html")); // Assemble the menu from actions.