FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed a couple of icons and other things.

Browse Source
This commit is contained in:
Martin Rotter 2013-12-23 21:15:01 +01:00
parent 0b0451abbf
commit e3892cdf99
8 changed files with 51 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/feedsmodelstandardcategory.cpp
View File

@ -2,6 +2,7 @@
#include "core/defs.h" #include "core/defs.h"
#include "core/textfactory.h" #include "core/textfactory.h"
#include "gui/iconthemefactory.h"
#include "gui/iconfactory.h" #include "gui/iconfactory.h"
#include <QVariant> #include <QVariant>
@ -67,9 +68,14 @@ QVariant FeedsModelStandardCategory::data(int column, int role) const {
} }
case Qt::DecorationRole: case Qt::DecorationRole:
return column == FDS_MODEL_TITLE_INDEX ? if (column == FDS_MODEL_TITLE_INDEX) {
m_icon : return m_icon.isNull() ?
QVariant(); IconThemeFactory::getInstance()->fromTheme("folder-cyan") :
m_icon;
}
else {
return QVariant();
}
case Qt::TextAlignmentRole: case Qt::TextAlignmentRole:
if (column == FDS_MODEL_COUNTS_INDEX) { if (column == FDS_MODEL_COUNTS_INDEX) {

11
src/core/feedsmodelstandardfeed.cpp
View File

@ -103,9 +103,14 @@ QVariant FeedsModelStandardFeed::data(int column, int role) const {
} }
case Qt::DecorationRole: case Qt::DecorationRole:
return column == FDS_MODEL_TITLE_INDEX ? if (column == FDS_MODEL_TITLE_INDEX) {
m_icon : return m_icon.isNull() ?
QVariant(); IconThemeFactory::getInstance()->fromTheme("application-rss+xml") :
m_icon;
}
else {
return QVariant();
}
case Qt::ToolTipRole: case Qt::ToolTipRole:
if (column == FDS_MODEL_TITLE_INDEX) { if (column == FDS_MODEL_TITLE_INDEX) {

6
src/core/messagesmodel.cpp
View File

@ -38,9 +38,9 @@ bool MessagesModel::submitAll() {
} }
void MessagesModel::setupIcons() { void MessagesModel::setupIcons() {
m_favoriteIcon = IconThemeFactory::getInstance()->fromTheme("mail-mark-important"); m_favoriteIcon = IconThemeFactory::getInstance()->fromTheme("favorites");
m_readIcon = IconThemeFactory::getInstance()->fromTheme("mail-mark-read"); m_readIcon = IconThemeFactory::getInstance()->fromTheme("mail-mark-not-junk");
m_unreadIcon = IconThemeFactory::getInstance()->fromTheme("mail-mark-unread"); m_unreadIcon = IconThemeFactory::getInstance()->fromTheme("mail-mark-important");
} }
void MessagesModel::fetchAll() { void MessagesModel::fetchAll() {

6
src/core/messagesmodel.h
View File

@ -36,9 +36,6 @@ class MessagesModel : public QSqlTableModel {
Qt::ItemFlags flags(const QModelIndex &index) const; Qt::ItemFlags flags(const QModelIndex &index) const;
public: public:
// Sets up all icons which are used directly by this model.
void setupIcons();
// Returns message at given index. // Returns message at given index.
Message messageAt(int row_index) const; Message messageAt(int row_index) const;
int messageId(int row_index) const; int messageId(int row_index) const;
@ -95,6 +92,9 @@ class MessagesModel : public QSqlTableModel {
// Creates "normal" and "bold" fonts. // Creates "normal" and "bold" fonts.
void setupFonts(); void setupFonts();
// Sets up all icons which are used directly by this model.
void setupIcons();
private: private:
QList<int> m_currentFeeds; QList<int> m_currentFeeds;
QList<QString> m_headerData; QList<QString> m_headerData;

6
src/gui/feedmessageviewer.cpp
View File

@ -82,6 +82,8 @@ void FeedMessageViewer::loadSize() {
settings->value(APP_CFG_GUI, settings->value(APP_CFG_GUI,
KEY_MESSAGES_VIEW + QString::number(MSG_DB_DUPDATED_INDEX), KEY_MESSAGES_VIEW + QString::number(MSG_DB_DUPDATED_INDEX),
default_msg_section_size).toInt()); default_msg_section_size).toInt());
// TODO: Perhaps make toolbar icon size changeable,
// this concerns toolbars of web browsers too.
} }
void FeedMessageViewer::quitDownloader() { void FeedMessageViewer::quitDownloader() {
@ -201,14 +203,14 @@ void FeedMessageViewer::initializeViews() {
// Setup splitters. // Setup splitters.
m_messageSplitter->setHandleWidth(1); m_messageSplitter->setHandleWidth(1);
m_messageSplitter->setOpaqueResize(false);
m_messageSplitter->setChildrenCollapsible(false); m_messageSplitter->setChildrenCollapsible(false);
m_messageSplitter->setStretchFactor(0, 1);
m_messageSplitter->addWidget(m_messagesView); m_messageSplitter->addWidget(m_messagesView);
m_messageSplitter->addWidget(m_messagesBrowser); m_messageSplitter->addWidget(m_messagesBrowser);
m_feedSplitter->setHandleWidth(1); m_feedSplitter->setHandleWidth(1);
m_feedSplitter->setOpaqueResize(false);
m_feedSplitter->setChildrenCollapsible(false); m_feedSplitter->setChildrenCollapsible(false);
m_feedSplitter->setStretchFactor(0, 1);
m_feedSplitter->addWidget(m_feedsView); m_feedSplitter->addWidget(m_feedsView);
m_feedSplitter->addWidget(m_messageSplitter); m_feedSplitter->addWidget(m_messageSplitter);

18
src/gui/formmain.cpp
View File

@ -215,8 +215,8 @@ void FormMain::setupIcons() {
m_ui->m_menuCurrentTab->setIcon(IconThemeFactory::getInstance()->fromTheme("go-home")); m_ui->m_menuCurrentTab->setIcon(IconThemeFactory::getInstance()->fromTheme("go-home"));
// Feeds/messages. // Feeds/messages.
m_ui->m_actionUpdateAllFeeds->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("view-refresh")); m_ui->m_actionUpdateSelectedFeeds->setIcon(IconThemeFactory::getInstance()->fromTheme("document-save"));
m_ui->m_actionDeleteAllMessages->setIcon(IconThemeFactory::getInstance()->fromTheme("edit-delete")); m_ui->m_actionDeleteAllMessages->setIcon(IconThemeFactory::getInstance()->fromTheme("edit-delete"));
m_ui->m_actionDeleteSelectedFeeds->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_actionAddNewCategory->setIcon(IconThemeFactory::getInstance()->fromTheme("document-new"));
m_ui->m_actionAddNewFeed->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_actionEditSelectedFeed->setIcon(IconThemeFactory::getInstance()->fromTheme("gnome-other"));
m_ui->m_actionMarkAllMessagesAsRead->setIcon(IconThemeFactory::getInstance()->fromTheme("mail-mark-read")); m_ui->m_actionMarkAllMessagesAsRead->setIcon(IconThemeFactory::getInstance()->fromTheme("mail-mark-not-junk"));
m_ui->m_actionMarkAllMessagesAsUnread->setIcon(IconThemeFactory::getInstance()->fromTheme("mail-mark-unread")); m_ui->m_actionMarkAllMessagesAsUnread->setIcon(IconThemeFactory::getInstance()->fromTheme("mail-mark-important"));
m_ui->m_actionMarkFeedsAsRead->setIcon(IconThemeFactory::getInstance()->fromTheme("mail-mark-read")); m_ui->m_actionMarkFeedsAsRead->setIcon(IconThemeFactory::getInstance()->fromTheme("mail-mark-not-junk"));
m_ui->m_actionMarkSelectedMessagesAsRead->setIcon(IconThemeFactory::getInstance()->fromTheme("mail-mark-read")); m_ui->m_actionMarkSelectedMessagesAsRead->setIcon(IconThemeFactory::getInstance()->fromTheme("mail-mark-not-junk"));
m_ui->m_actionMarkSelectedMessagesAsUnread->setIcon(IconThemeFactory::getInstance()->fromTheme("mail-mark-unread")); m_ui->m_actionMarkSelectedMessagesAsUnread->setIcon(IconThemeFactory::getInstance()->fromTheme("mail-mark-important"));
m_ui->m_actionSwitchImportanceOfSelectedMessages->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_actionOpenSelectedSourceArticlesInternally->setIcon(IconThemeFactory::getInstance()->fromTheme("document-open"));
m_ui->m_actionOpenSelectedSourceArticlesExternally->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")); m_ui->m_actionOpenSelectedMessagesInternally->setIcon(IconThemeFactory::getInstance()->fromTheme("document-open"));

6
src/gui/formmain.ui
View File

@ -6,7 +6,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>800</width> <width>979</width>
<height>600</height> <height>600</height>
</rect> </rect>
</property> </property>
@ -47,8 +47,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>800</width> <width>979</width>
<height>21</height> <height>19</height>
</rect> </rect>
</property> </property>
<widget class="QMenu" name="m_menuFile"> <widget class="QMenu" name="m_menuFile">

96
src/gui/formsettings.ui
View File

@ -21,16 +21,7 @@
</property> </property>
<widget class="QWidget" name="m_pageGeneral"> <widget class="QWidget" name="m_pageGeneral">
<layout class="QFormLayout" name="formLayout_5"> <layout class="QFormLayout" name="formLayout_5">
<property name="leftMargin"> <property name="margin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item row="0" column="0"> <item row="0" column="0">
@ -44,16 +35,7 @@
</widget> </widget>
<widget class="QWidget" name="m_pageShortcuts"> <widget class="QWidget" name="m_pageShortcuts">
<layout class="QHBoxLayout" name="horizontalLayout_3"> <layout class="QHBoxLayout" name="horizontalLayout_3">
<property name="leftMargin"> <property name="margin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
@ -69,21 +51,12 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>100</width> <width>576</width>
<height>30</height> <height>373</height>
</rect> </rect>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout_4"> <layout class="QHBoxLayout" name="horizontalLayout_4">
<property name="leftMargin"> <property name="margin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
@ -97,16 +70,7 @@
</widget> </widget>
<widget class="QWidget" name="m_pageUi"> <widget class="QWidget" name="m_pageUi">
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<property name="leftMargin"> <property name="margin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
@ -122,16 +86,7 @@
<string>Icons &amp;&amp; skins</string> <string>Icons &amp;&amp; skins</string>
</attribute> </attribute>
<layout class="QHBoxLayout" name="horizontalLayout_8"> <layout class="QHBoxLayout" name="horizontalLayout_8">
<property name="leftMargin"> <property name="margin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
@ -147,8 +102,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>195</width> <width>568</width>
<height>238</height> <height>344</height>
</rect> </rect>
</property> </property>
<layout class="QFormLayout" name="formLayout"> <layout class="QFormLayout" name="formLayout">
@ -364,16 +319,7 @@
</widget> </widget>
<widget class="QWidget" name="m_pageLanguages"> <widget class="QWidget" name="m_pageLanguages">
<layout class="QHBoxLayout" name="horizontalLayout_2"> <layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="leftMargin"> <property name="margin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
@ -402,16 +348,7 @@
</widget> </widget>
<widget class="QWidget" name="m_pageProxy"> <widget class="QWidget" name="m_pageProxy">
<layout class="QHBoxLayout" name="horizontalLayout_5"> <layout class="QHBoxLayout" name="horizontalLayout_5">
<property name="leftMargin"> <property name="margin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
@ -640,16 +577,7 @@
</widget> </widget>
<widget class="QWidget" name="m_pageFeedsMessages"> <widget class="QWidget" name="m_pageFeedsMessages">
<layout class="QHBoxLayout" name="horizontalLayout_9"> <layout class="QHBoxLayout" name="horizontalLayout_9">
<property name="leftMargin"> <property name="margin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item> <item>