From c759c0d6fd5aefe2f8b73eed1a2ee95f45a2414c Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Wed, 11 Oct 2017 11:47:52 +0200 Subject: [PATCH] Fixed #145 and some other stuff, can delete inoreader accounts for example. --- resources/text/CHANGELOG | 1 + src/core/feedsmodel.cpp | 20 +- src/core/feedsmodel.h | 26 +- src/core/messagesmodel.cpp | 27 ++- src/core/messagesmodel.h | 5 + src/gui/settings/settingsfeedsmessages.cpp | 15 ++ src/gui/settings/settingsfeedsmessages.ui | 229 ++++++++++++------ src/miscellaneous/databasequeries.cpp | 9 + src/miscellaneous/databasequeries.h | 1 + src/miscellaneous/settings.cpp | 8 + src/miscellaneous/settings.h | 8 + .../inoreader/inoreaderserviceroot.cpp | 15 ++ src/services/inoreader/inoreaderserviceroot.h | 2 + 13 files changed, 286 insertions(+), 80 deletions(-) diff --git a/resources/text/CHANGELOG b/resources/text/CHANGELOG index 024ff7a37..7f84f5b94 100644 --- a/resources/text/CHANGELOG +++ b/resources/text/CHANGELOG @@ -2,6 +2,7 @@ ————— Added: +▪ Font size of message/feed list can now be changed. (#145) ▪ Inoreader plugin can mark messages starred. ▪ All cached online service data are synchronously saved when any feed is updated. diff --git a/src/core/feedsmodel.cpp b/src/core/feedsmodel.cpp index f1791267f..ca167d218 100755 --- a/src/core/feedsmodel.cpp +++ b/src/core/feedsmodel.cpp @@ -41,7 +41,7 @@ #include -FeedsModel::FeedsModel(QObject* parent) : QAbstractItemModel(parent) { +FeedsModel::FeedsModel(QObject* parent) : QAbstractItemModel(parent), m_itemHeight(-1) { setObjectName(QSL("FeedsModel")); // Create root item. @@ -56,9 +56,11 @@ FeedsModel::FeedsModel(QObject* parent) : QAbstractItemModel(parent) { // : Title text in the feed list header. m_headerData << tr("Title"); - m_tooltipData << /*: Feed list header "titles" column tooltip.*/ tr("Titles of feeds/categories.") << + m_tooltipData + << /*: Feed list header "titles" column tooltip.*/ tr("Titles of feeds/categories.") + << /*: Feed list header "counts" column tooltip.*/ tr("Counts of unread/all mesages."); - /*: Feed list header "counts" column tooltip.*/ tr("Counts of unread/all mesages."); + updateItemHeight(); } FeedsModel::~FeedsModel() { @@ -476,6 +478,18 @@ void FeedsModel::onItemDataChanged(const QList& items) { notifyWithCounts(); } +int FeedsModel::itemHeight() const { + return m_itemHeight; +} + +void FeedsModel::setItemHeight(int item_height) { + m_itemHeight = item_height; +} + +void FeedsModel::updateItemHeight() { + m_itemHeight = qApp->settings()->value(GROUP(GUI), SETTING(GUI::HeightRowFeeds)).toInt(); +} + void FeedsModel::reloadWholeLayout() { emit layoutAboutToBeChanged(); emit layoutChanged(); diff --git a/src/core/feedsmodel.h b/src/core/feedsmodel.h index f34c3a784..8ac49282c 100755 --- a/src/core/feedsmodel.h +++ b/src/core/feedsmodel.h @@ -37,10 +37,7 @@ class FeedsModel : public QAbstractItemModel { virtual ~FeedsModel(); // Model implementation. - inline QVariant data(const QModelIndex& index, int role) const { - // Return data according to item. - return itemForIndex(index)->data(index.column(), role); - } + QVariant data(const QModelIndex& index, int role) const; // Drag & drop. QMimeData* mimeData(const QModelIndexList& indexes) const; @@ -105,6 +102,10 @@ class FeedsModel : public QAbstractItemModel { // Access to root item. RootItem* rootItem() const; + int itemHeight() const; + void setItemHeight(int item_height); + void updateItemHeight(); + public slots: void loadActivatedServiceAccounts(); @@ -172,10 +173,27 @@ class FeedsModel : public QAbstractItemModel { private: RootItem* m_rootItem; + int m_itemHeight; QList m_headerData; QList m_tooltipData; QIcon m_countsIcon; }; +inline QVariant FeedsModel::data(const QModelIndex& index, int role) const { + switch (role) { + case Qt::SizeHintRole: { + if (m_itemHeight > 0) { + return QSize(-1, m_itemHeight); + } + else { + return QVariant(); + } + } + + default: + return itemForIndex(index)->data(index.column(), role);; + } +} + #endif // FEEDSMODEL_H diff --git a/src/core/messagesmodel.cpp b/src/core/messagesmodel.cpp index 9e358c305..e0e66d05a 100755 --- a/src/core/messagesmodel.cpp +++ b/src/core/messagesmodel.cpp @@ -32,11 +32,12 @@ MessagesModel::MessagesModel(QObject* parent) : QSqlQueryModel(parent), MessagesModelSqlLayer(), - m_cache(new MessagesModelCache(this)), m_messageHighlighter(NoHighlighting), m_customDateFormat(QString()) { + m_cache(new MessagesModelCache(this)), m_messageHighlighter(NoHighlighting), m_customDateFormat(QString()), m_itemHeight(-1) { setupFonts(); setupIcons(); setupHeaderData(); updateDateFormat(); + updateItemHeight(); loadMessages(nullptr); } @@ -50,6 +51,18 @@ void MessagesModel::setupIcons() { m_unreadIcon = qApp->icons()->fromTheme(QSL("mail-mark-unread")); } +int MessagesModel::itemHeight() const { + return m_itemHeight; +} + +void MessagesModel::setItemHeight(int item_height) { + m_itemHeight = item_height; +} + +void MessagesModel::updateItemHeight() { + m_itemHeight = qApp->settings()->value(GROUP(GUI), SETTING(GUI::HeightRowMessages)).toInt(); +} + void MessagesModel::repopulate() { m_cache->clear(); setQuery(selectStatement(), m_db); @@ -286,6 +299,18 @@ QVariant MessagesModel::data(const QModelIndex& idx, int role) const { return QVariant(); } + case Qt::SizeHintRole: { + if (m_itemHeight > 0) { + QSize siz = QSqlQueryModel::data(idx, Qt::SizeHintRole).toSize(); + + siz.setHeight(m_itemHeight); + return siz; + } + else { + return QVariant(); + } + } + case Qt::DecorationRole: { const int index_column = idx.column(); diff --git a/src/core/messagesmodel.h b/src/core/messagesmodel.h index 279b0ab04..d5075a3cc 100755 --- a/src/core/messagesmodel.h +++ b/src/core/messagesmodel.h @@ -85,6 +85,10 @@ class MessagesModel : public QSqlQueryModel, public MessagesModelSqlLayer { // Loads messages of given feeds. void loadMessages(RootItem* item); + int itemHeight() const; + void setItemHeight(int item_height); + void updateItemHeight(); + public slots: // NOTE: These methods DO NOT actually change data in the DB, just in the model. @@ -112,6 +116,7 @@ class MessagesModel : public QSqlQueryModel, public MessagesModelSqlLayer { QIcon m_favoriteIcon; QIcon m_readIcon; QIcon m_unreadIcon; + int m_itemHeight; }; Q_DECLARE_METATYPE(MessagesModel::MessageHighlighter) diff --git a/src/gui/settings/settingsfeedsmessages.cpp b/src/gui/settings/settingsfeedsmessages.cpp index a711bcc91..fe4071665 100755 --- a/src/gui/settings/settingsfeedsmessages.cpp +++ b/src/gui/settings/settingsfeedsmessages.cpp @@ -49,6 +49,10 @@ SettingsFeedsMessages::SettingsFeedsMessages(Settings* settings, QWidget* parent this, &SettingsFeedsMessages::dirtifySettings); connect(m_ui->m_spinHeightImageAttachments, static_cast(&QSpinBox::valueChanged), this, &SettingsFeedsMessages::dirtifySettings); + connect(m_ui->m_spinHeightRowsMessages, static_cast(&QSpinBox::valueChanged), + this, &SettingsFeedsMessages::dirtifySettings); + connect(m_ui->m_spinHeightRowsFeeds, static_cast(&QSpinBox::valueChanged), + this, &SettingsFeedsMessages::dirtifySettings); connect(m_ui->m_checkAutoUpdate, &QCheckBox::toggled, m_ui->m_spinAutoUpdateInterval, &TimeSpinBox::setEnabled); connect(m_ui->m_spinFeedUpdateTimeout, static_cast(&QSpinBox::valueChanged), this, &SettingsFeedsMessages::dirtifySettings); @@ -103,6 +107,9 @@ void SettingsFeedsMessages::changeMessagesFont() { void SettingsFeedsMessages::loadSettings() { onBeginLoadSettings(); + m_ui->m_spinHeightRowsMessages->setValue(settings()->value(GROUP(GUI), SETTING(GUI::HeightRowMessages)).toInt()); + m_ui->m_spinHeightRowsFeeds->setValue(settings()->value(GROUP(GUI), SETTING(GUI::HeightRowFeeds)).toInt()); + m_ui->m_checkAutoUpdateNotification->setChecked(settings()->value(GROUP(Feeds), SETTING(Feeds::EnableAutoUpdateNotification)).toBool()); m_ui->m_checkKeppMessagesInTheMiddle->setChecked(settings()->value(GROUP(Messages), SETTING(Messages::KeepCursorInCenter)).toBool()); m_ui->m_checkRemoveReadMessagesOnExit->setChecked(settings()->value(GROUP(Messages), SETTING(Messages::ClearReadOnExit)).toBool()); @@ -133,6 +140,10 @@ void SettingsFeedsMessages::loadSettings() { void SettingsFeedsMessages::saveSettings() { onBeginSaveSettings(); + + settings()->setValue(GROUP(GUI), GUI::HeightRowMessages, m_ui->m_spinHeightRowsMessages->value()); + settings()->setValue(GROUP(GUI), GUI::HeightRowFeeds, m_ui->m_spinHeightRowsFeeds->value()); + settings()->setValue(GROUP(Feeds), Feeds::EnableAutoUpdateNotification, m_ui->m_checkAutoUpdateNotification->isChecked()); settings()->setValue(GROUP(Messages), Messages::KeepCursorInCenter, m_ui->m_checkKeppMessagesInTheMiddle->isChecked()); settings()->setValue(GROUP(Messages), Messages::ClearReadOnExit, m_ui->m_checkRemoveReadMessagesOnExit->isChecked()); @@ -150,8 +161,12 @@ void SettingsFeedsMessages::saveSettings() { settings()->setValue(GROUP(Messages), Messages::PreviewerFontStandard, m_ui->m_lblMessagesFont->font().toString()); qApp->mainForm()->tabWidget()->feedMessageViewer()->loadMessageViewerFonts(); qApp->feedReader()->updateAutoUpdateStatus(); + + qApp->feedReader()->feedsModel()->updateItemHeight(); qApp->feedReader()->feedsModel()->reloadWholeLayout(); + qApp->feedReader()->messagesModel()->updateDateFormat(); + qApp->feedReader()->messagesModel()->updateItemHeight(); qApp->feedReader()->messagesModel()->reloadWholeLayout(); onEndSaveSettings(); } diff --git a/src/gui/settings/settingsfeedsmessages.ui b/src/gui/settings/settingsfeedsmessages.ui index af729193a..68ba6e17d 100755 --- a/src/gui/settings/settingsfeedsmessages.ui +++ b/src/gui/settings/settingsfeedsmessages.ui @@ -6,8 +6,8 @@ 0 0 - 700 - 201 + 550 + 270 @@ -32,81 +32,127 @@ Feeds && categories - - - QFormLayout::AllNonFixedFieldsGrow - - + + Update all feed on application startup - - + + - Auto-update all feeds every + Enable "auto-update started" notification - - - - false - - - false - - - true - - + + + + + + Auto-update all feeds every + + + + + + + false + + + false + + + true + + + + - - - Feed connection timeout - - - - - - - Connection timeout is time interval which is reserved for downloading new messages for the feed. If this time interval elapses, then download process is aborted. - - - ms - - - 100 - - - 120000 - - - 100 - - + + + + + Feed connection timeout + + + m_spinFeedUpdateTimeout + + + + + + + Connection timeout is time interval which is reserved for downloading new messages for the feed. If this time interval elapses, then download process is aborted. + + + ms + + + 100 + + + 120000 + + + 100 + + + + - - - Message count format in feed list - - + + + + + Height or rows in feed list (-1 = default height) + + + m_spinHeightRowsFeeds + + + + + + + -1 + + + 100 + + + + - - - - - - - true - - + + + + + + Message count format in feed list + + + m_cmbCountsFeedList + + + + + + + + + + true + + + + - + @@ -124,13 +170,6 @@ - - - - Enable "auto-update started" notification - - - @@ -152,13 +191,16 @@ - + Height of image attachments + + m_spinHeightImageAttachments + @@ -173,7 +215,7 @@ - + Use custom date/time format (overrides format loaded from active localization) @@ -186,10 +228,10 @@ - + - + Internal message browser fonts @@ -225,6 +267,30 @@ + + + + + + Height or rows in message list (-1 = default height) + + + m_spinHeightRowsMessages + + + + + + + -1 + + + 100 + + + + + @@ -238,6 +304,25 @@
timespinbox.h
+ + m_tabFeedsMessages + m_checkUpdateAllFeedsOnStartup + m_checkAutoUpdateNotification + m_checkAutoUpdate + m_spinAutoUpdateInterval + m_spinFeedUpdateTimeout + m_spinHeightRowsFeeds + m_cmbCountsFeedList + m_checkRemoveReadMessagesOnExit + m_checkKeppMessagesInTheMiddle + m_spinHeightRowsMessages + m_spinHeightImageAttachments + m_checkMessagesDateTimeFormat + m_cmbMessagesDateTimeFormat + m_btnChangeMessagesFont + m_spinHeightRowsMessages_3 + m_spinHeightRowsMessages_2 + diff --git a/src/miscellaneous/databasequeries.cpp b/src/miscellaneous/databasequeries.cpp index 31a500970..4ce0ea468 100755 --- a/src/miscellaneous/databasequeries.cpp +++ b/src/miscellaneous/databasequeries.cpp @@ -1490,6 +1490,15 @@ Assignment DatabaseQueries::getCategories(QSqlDatabase db, int account_id, bool* return categories; } +bool DatabaseQueries::deleteInoreaderAccount(QSqlDatabase db, int account_id) { + QSqlQuery q(db); + + q.setForwardOnly(true); + q.prepare(QSL("DELETE FROM InoreaderAccounts WHERE id = :id;")); + q.bindValue(QSL(":id"), account_id); + return q.exec(); +} + #if defined(USE_WEBENGINE) Assignment DatabaseQueries::getInoreaderFeeds(QSqlDatabase db, int account_id, bool* ok) { Assignment feeds; diff --git a/src/miscellaneous/databasequeries.h b/src/miscellaneous/databasequeries.h index b3c688a60..d7a1a716d 100755 --- a/src/miscellaneous/databasequeries.h +++ b/src/miscellaneous/databasequeries.h @@ -80,6 +80,7 @@ class DatabaseQueries { // Inoreader account. #if defined(USE_WEBENGINE) + static bool deleteInoreaderAccount(QSqlDatabase db, int account_id); static Assignment getInoreaderFeeds(QSqlDatabase db, int account_id, bool* ok = nullptr); static bool storeNewInoreaderTokens(QSqlDatabase db, const QString& refresh_token, int account_id); static QList getInoreaderAccounts(QSqlDatabase db, bool* ok = nullptr); diff --git a/src/miscellaneous/settings.cpp b/src/miscellaneous/settings.cpp index a725c9e36..6534a699c 100755 --- a/src/miscellaneous/settings.cpp +++ b/src/miscellaneous/settings.cpp @@ -115,6 +115,14 @@ DKEY GUI::ToolbarStyle = "toolbar_style"; DVALUE(Qt::ToolButtonStyle) GUI::ToolbarStyleDef = Qt::ToolButtonIconOnly; +DKEY GUI::HeightRowMessages = "height_row_messages"; + +DVALUE(int) GUI::HeightRowMessagesDef = -1; + +DKEY GUI::HeightRowFeeds = "height_row_feeds"; + +DVALUE(int) GUI::HeightRowFeedsDef = -1; + DKEY GUI::FeedsToolbarActions = "feeds_toolbar"; DVALUE(char*) GUI::FeedsToolbarActionsDef = "m_actionUpdateAllItems,m_actionStopRunningItemsUpdate,m_actionMarkAllItemsRead"; diff --git a/src/miscellaneous/settings.h b/src/miscellaneous/settings.h index 3868ad97c..095c0001d 100755 --- a/src/miscellaneous/settings.h +++ b/src/miscellaneous/settings.h @@ -217,6 +217,14 @@ namespace GUI { VALUE(int) DefaultSortColumnFeedsDef; + KEY HeightRowMessages; + + VALUE(int) HeightRowMessagesDef; + + KEY HeightRowFeeds; + + VALUE(int) HeightRowFeedsDef; + KEY DefaultSortOrderFeeds; VALUE(Qt::SortOrder) DefaultSortOrderFeedsDef; diff --git a/src/services/inoreader/inoreaderserviceroot.cpp b/src/services/inoreader/inoreaderserviceroot.cpp index 0796accfe..715750932 100755 --- a/src/services/inoreader/inoreaderserviceroot.cpp +++ b/src/services/inoreader/inoreaderserviceroot.cpp @@ -200,3 +200,18 @@ void InoreaderServiceRoot::saveAllCachedData(bool async) { } } } + +bool InoreaderServiceRoot::canBeDeleted() const { + return true; +} + +bool InoreaderServiceRoot::deleteViaGui() { + QSqlDatabase database = qApp->database()->connection(metaObject()->className(), DatabaseFactory::FromSettings); + + if (DatabaseQueries::deleteInoreaderAccount(database, accountId())) { + return ServiceRoot::deleteViaGui(); + } + else { + return false; + } +} diff --git a/src/services/inoreader/inoreaderserviceroot.h b/src/services/inoreader/inoreaderserviceroot.h index 2b411c321..e51f9309b 100755 --- a/src/services/inoreader/inoreaderserviceroot.h +++ b/src/services/inoreader/inoreaderserviceroot.h @@ -39,6 +39,8 @@ class InoreaderServiceRoot : public ServiceRoot, public CacheForServiceRoot { bool canBeEdited() const; bool editViaGui(); + bool canBeDeleted() const; + bool deleteViaGui(); bool supportsFeedAdding() const; bool supportsCategoryAdding() const; void start(bool freshly_activated);