From e3892cdf99174f93dffd10374c7341b8a7a33894 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Mon, 23 Dec 2013 21:15:01 +0100 Subject: [PATCH] Changed a couple of icons and other things. --- src/core/feedsmodelstandardcategory.cpp | 12 +++- src/core/feedsmodelstandardfeed.cpp | 11 ++- src/core/messagesmodel.cpp | 6 +- src/core/messagesmodel.h | 6 +- src/gui/feedmessageviewer.cpp | 6 +- src/gui/formmain.cpp | 18 ++--- src/gui/formmain.ui | 6 +- src/gui/formsettings.ui | 96 ++++--------------------- 8 files changed, 51 insertions(+), 110 deletions(-) diff --git a/src/core/feedsmodelstandardcategory.cpp b/src/core/feedsmodelstandardcategory.cpp index 46dd4b7fa..6d9651d19 100755 --- a/src/core/feedsmodelstandardcategory.cpp +++ b/src/core/feedsmodelstandardcategory.cpp @@ -2,6 +2,7 @@ #include "core/defs.h" #include "core/textfactory.h" +#include "gui/iconthemefactory.h" #include "gui/iconfactory.h" #include @@ -67,9 +68,14 @@ QVariant FeedsModelStandardCategory::data(int column, int role) const { } case Qt::DecorationRole: - return column == FDS_MODEL_TITLE_INDEX ? - m_icon : - QVariant(); + if (column == FDS_MODEL_TITLE_INDEX) { + return m_icon.isNull() ? + IconThemeFactory::getInstance()->fromTheme("folder-cyan") : + m_icon; + } + else { + return QVariant(); + } case Qt::TextAlignmentRole: if (column == FDS_MODEL_COUNTS_INDEX) { diff --git a/src/core/feedsmodelstandardfeed.cpp b/src/core/feedsmodelstandardfeed.cpp index 194f7cb68..0e7fecdc3 100755 --- a/src/core/feedsmodelstandardfeed.cpp +++ b/src/core/feedsmodelstandardfeed.cpp @@ -103,9 +103,14 @@ QVariant FeedsModelStandardFeed::data(int column, int role) const { } case Qt::DecorationRole: - return column == FDS_MODEL_TITLE_INDEX ? - m_icon : - QVariant(); + if (column == FDS_MODEL_TITLE_INDEX) { + return m_icon.isNull() ? + IconThemeFactory::getInstance()->fromTheme("application-rss+xml") : + m_icon; + } + else { + return QVariant(); + } case Qt::ToolTipRole: if (column == FDS_MODEL_TITLE_INDEX) { diff --git a/src/core/messagesmodel.cpp b/src/core/messagesmodel.cpp index 5b043b888..70e497d67 100644 --- a/src/core/messagesmodel.cpp +++ b/src/core/messagesmodel.cpp @@ -38,9 +38,9 @@ bool MessagesModel::submitAll() { } void MessagesModel::setupIcons() { - m_favoriteIcon = IconThemeFactory::getInstance()->fromTheme("mail-mark-important"); - m_readIcon = IconThemeFactory::getInstance()->fromTheme("mail-mark-read"); - m_unreadIcon = IconThemeFactory::getInstance()->fromTheme("mail-mark-unread"); + m_favoriteIcon = IconThemeFactory::getInstance()->fromTheme("favorites"); + m_readIcon = IconThemeFactory::getInstance()->fromTheme("mail-mark-not-junk"); + m_unreadIcon = IconThemeFactory::getInstance()->fromTheme("mail-mark-important"); } void MessagesModel::fetchAll() { diff --git a/src/core/messagesmodel.h b/src/core/messagesmodel.h index e6273a4a3..f473bffb7 100644 --- a/src/core/messagesmodel.h +++ b/src/core/messagesmodel.h @@ -36,9 +36,6 @@ class MessagesModel : public QSqlTableModel { Qt::ItemFlags flags(const QModelIndex &index) const; public: - // Sets up all icons which are used directly by this model. - void setupIcons(); - // Returns message at given index. Message messageAt(int row_index) const; int messageId(int row_index) const; @@ -95,6 +92,9 @@ class MessagesModel : public QSqlTableModel { // Creates "normal" and "bold" fonts. void setupFonts(); + // Sets up all icons which are used directly by this model. + void setupIcons(); + private: QList m_currentFeeds; QList m_headerData; diff --git a/src/gui/feedmessageviewer.cpp b/src/gui/feedmessageviewer.cpp index 3a4938b35..d5be4a976 100644 --- a/src/gui/feedmessageviewer.cpp +++ b/src/gui/feedmessageviewer.cpp @@ -82,6 +82,8 @@ void FeedMessageViewer::loadSize() { settings->value(APP_CFG_GUI, KEY_MESSAGES_VIEW + QString::number(MSG_DB_DUPDATED_INDEX), default_msg_section_size).toInt()); + // TODO: Perhaps make toolbar icon size changeable, + // this concerns toolbars of web browsers too. } void FeedMessageViewer::quitDownloader() { @@ -201,14 +203,14 @@ void FeedMessageViewer::initializeViews() { // Setup splitters. m_messageSplitter->setHandleWidth(1); + m_messageSplitter->setOpaqueResize(false); m_messageSplitter->setChildrenCollapsible(false); - m_messageSplitter->setStretchFactor(0, 1); m_messageSplitter->addWidget(m_messagesView); m_messageSplitter->addWidget(m_messagesBrowser); m_feedSplitter->setHandleWidth(1); + m_feedSplitter->setOpaqueResize(false); m_feedSplitter->setChildrenCollapsible(false); - m_feedSplitter->setStretchFactor(0, 1); m_feedSplitter->addWidget(m_feedsView); m_feedSplitter->addWidget(m_messageSplitter); diff --git a/src/gui/formmain.cpp b/src/gui/formmain.cpp index 6805ae808..2a9c28864 100755 --- a/src/gui/formmain.cpp +++ b/src/gui/formmain.cpp @@ -215,8 +215,8 @@ void FormMain::setupIcons() { m_ui->m_menuCurrentTab->setIcon(IconThemeFactory::getInstance()->fromTheme("go-home")); // Feeds/messages. - m_ui->m_actionUpdateAllFeeds->setIcon(IconThemeFactory::getInstance()->fromTheme("view-refresh")); - m_ui->m_actionUpdateSelectedFeeds->setIcon(IconThemeFactory::getInstance()->fromTheme("view-refresh")); + m_ui->m_actionUpdateAllFeeds->setIcon(IconThemeFactory::getInstance()->fromTheme("document-save-as")); + m_ui->m_actionUpdateSelectedFeeds->setIcon(IconThemeFactory::getInstance()->fromTheme("document-save")); m_ui->m_actionDeleteAllMessages->setIcon(IconThemeFactory::getInstance()->fromTheme("edit-delete")); m_ui->m_actionDeleteSelectedFeeds->setIcon(IconThemeFactory::getInstance()->fromTheme("edit-delete")); @@ -224,13 +224,13 @@ void FormMain::setupIcons() { m_ui->m_actionAddNewCategory->setIcon(IconThemeFactory::getInstance()->fromTheme("document-new")); m_ui->m_actionAddNewFeed->setIcon(IconThemeFactory::getInstance()->fromTheme("document-new")); - m_ui->m_actionEditSelectedFeed->setIcon(IconThemeFactory::getInstance()->fromTheme("document-properties")); - m_ui->m_actionMarkAllMessagesAsRead->setIcon(IconThemeFactory::getInstance()->fromTheme("mail-mark-read")); - m_ui->m_actionMarkAllMessagesAsUnread->setIcon(IconThemeFactory::getInstance()->fromTheme("mail-mark-unread")); - m_ui->m_actionMarkFeedsAsRead->setIcon(IconThemeFactory::getInstance()->fromTheme("mail-mark-read")); - m_ui->m_actionMarkSelectedMessagesAsRead->setIcon(IconThemeFactory::getInstance()->fromTheme("mail-mark-read")); - m_ui->m_actionMarkSelectedMessagesAsUnread->setIcon(IconThemeFactory::getInstance()->fromTheme("mail-mark-unread")); - m_ui->m_actionSwitchImportanceOfSelectedMessages->setIcon(IconThemeFactory::getInstance()->fromTheme("mail-mark-important")); + m_ui->m_actionEditSelectedFeed->setIcon(IconThemeFactory::getInstance()->fromTheme("gnome-other")); + m_ui->m_actionMarkAllMessagesAsRead->setIcon(IconThemeFactory::getInstance()->fromTheme("mail-mark-not-junk")); + m_ui->m_actionMarkAllMessagesAsUnread->setIcon(IconThemeFactory::getInstance()->fromTheme("mail-mark-important")); + m_ui->m_actionMarkFeedsAsRead->setIcon(IconThemeFactory::getInstance()->fromTheme("mail-mark-not-junk")); + m_ui->m_actionMarkSelectedMessagesAsRead->setIcon(IconThemeFactory::getInstance()->fromTheme("mail-mark-not-junk")); + m_ui->m_actionMarkSelectedMessagesAsUnread->setIcon(IconThemeFactory::getInstance()->fromTheme("mail-mark-important")); + m_ui->m_actionSwitchImportanceOfSelectedMessages->setIcon(IconThemeFactory::getInstance()->fromTheme("favorites")); m_ui->m_actionOpenSelectedSourceArticlesInternally->setIcon(IconThemeFactory::getInstance()->fromTheme("document-open")); m_ui->m_actionOpenSelectedSourceArticlesExternally->setIcon(IconThemeFactory::getInstance()->fromTheme("document-open")); m_ui->m_actionOpenSelectedMessagesInternally->setIcon(IconThemeFactory::getInstance()->fromTheme("document-open")); diff --git a/src/gui/formmain.ui b/src/gui/formmain.ui index 32564427a..d67cce2b0 100644 --- a/src/gui/formmain.ui +++ b/src/gui/formmain.ui @@ -6,7 +6,7 @@ 0 0 - 800 + 979 600 @@ -47,8 +47,8 @@ 0 0 - 800 - 21 + 979 + 19 diff --git a/src/gui/formsettings.ui b/src/gui/formsettings.ui index 79ca42dfc..079030707 100644 --- a/src/gui/formsettings.ui +++ b/src/gui/formsettings.ui @@ -21,16 +21,7 @@ - - 0 - - - 0 - - - 0 - - + 0 @@ -44,16 +35,7 @@ - - 0 - - - 0 - - - 0 - - + 0 @@ -69,21 +51,12 @@ 0 0 - 100 - 30 + 576 + 373 - - 0 - - - 0 - - - 0 - - + 0 @@ -97,16 +70,7 @@ - - 0 - - - 0 - - - 0 - - + 0 @@ -122,16 +86,7 @@ Icons && skins - - 0 - - - 0 - - - 0 - - + 0 @@ -147,8 +102,8 @@ 0 0 - 195 - 238 + 568 + 344 @@ -364,16 +319,7 @@ - - 0 - - - 0 - - - 0 - - + 0 @@ -402,16 +348,7 @@ - - 0 - - - 0 - - - 0 - - + 0 @@ -640,16 +577,7 @@ - - 0 - - - 0 - - - 0 - - + 0