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

Fixed #145 and some other stuff, can delete inoreader accounts for example.

Browse Source
This commit is contained in:
Martin Rotter 2017-10-11 11:47:52 +02:00
parent ac536476ae
commit c759c0d6fd
13 changed files with 286 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
resources/text/CHANGELOG
View File

@ -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.

20
src/core/feedsmodel.cpp
View File

@ -41,7 +41,7 @@
#include <algorithm>
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<RootItem*>& 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();

26
src/core/feedsmodel.h
View File

@ -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<QString> m_headerData;
QList<QString> 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

27
src/core/messagesmodel.cpp
View File

@ -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();

5
src/core/messagesmodel.h
View File

@ -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)

15
src/gui/settings/settingsfeedsmessages.cpp
View File

@ -49,6 +49,10 @@ SettingsFeedsMessages::SettingsFeedsMessages(Settings* settings, QWidget* parent
this, &SettingsFeedsMessages::dirtifySettings);
connect(m_ui->m_spinHeightImageAttachments, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged),
this, &SettingsFeedsMessages::dirtifySettings);
connect(m_ui->m_spinHeightRowsMessages, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged),
this, &SettingsFeedsMessages::dirtifySettings);
connect(m_ui->m_spinHeightRowsFeeds, static_cast<void (QSpinBox::*)(int)>(&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<void (QSpinBox::*)(int)>(&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();
}

229
src/gui/settings/settingsfeedsmessages.ui
View File

@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>700</width>
<height>201</height>
<width>550</width>
<height>270</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
@ -32,81 +32,127 @@
<attribute name="title">
<string>Feeds &amp;&amp; categories</string>
</attribute>
<layout class="QFormLayout" name="formLayout_10">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<item row="0" column="0" colspan="2">
<layout class="QFormLayout" name="formLayout_2">
<item row="0" column="0">
<widget class="QCheckBox" name="m_checkUpdateAllFeedsOnStartup">
<property name="text">
<string>Update all feed on application startup</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QCheckBox" name="m_checkAutoUpdate">
<item row="1" column="0">
<widget class="QCheckBox" name="m_checkAutoUpdateNotification">
<property name="text">
<string>Auto-update all feeds every</string>
<string>Enable &quot;auto-update started&quot; notification</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="TimeSpinBox" name="m_spinAutoUpdateInterval">
<property name="enabled">
<bool>false</bool>
</property>
<property name="readOnly">
<bool>false</bool>
</property>
<property name="accelerated">
<bool>true</bool>
</property>
</widget>
<item row="2" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_6">
<item>
<widget class="QCheckBox" name="m_checkAutoUpdate">
<property name="text">
<string>Auto-update all feeds every</string>
</property>
</widget>
</item>
<item>
<widget class="TimeSpinBox" name="m_spinAutoUpdateInterval">
<property name="enabled">
<bool>false</bool>
</property>
<property name="readOnly">
<bool>false</bool>
</property>
<property name="accelerated">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Feed connection timeout</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QSpinBox" name="m_spinFeedUpdateTimeout">
<property name="toolTip">
<string>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.</string>
</property>
<property name="suffix">
<string> ms</string>
</property>
<property name="minimum">
<number>100</number>
</property>
<property name="maximum">
<number>120000</number>
</property>
<property name="singleStep">
<number>100</number>
</property>
</widget>
<layout class="QHBoxLayout" name="horizontalLayout_7">
<item>
<widget class="QLabel" name="label_3">
<property name="text">
<string>Feed connection timeout</string>
</property>
<property name="buddy">
<cstring>m_spinFeedUpdateTimeout</cstring>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="m_spinFeedUpdateTimeout">
<property name="toolTip">
<string>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.</string>
</property>
<property name="suffix">
<string> ms</string>
</property>
<property name="minimum">
<number>100</number>
</property>
<property name="maximum">
<number>120000</number>
</property>
<property name="singleStep">
<number>100</number>
</property>
</widget>
</item>
</layout>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_8">
<property name="text">
<string>Message count format in feed list</string>
</property>
</widget>
<layout class="QHBoxLayout" name="horizontalLayout_9">
<item>
<widget class="QLabel" name="label_6">
<property name="text">
<string>Height or rows in feed list (-1 = default height)</string>
</property>
<property name="buddy">
<cstring>m_spinHeightRowsFeeds</cstring>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="m_spinHeightRowsFeeds">
<property name="minimum">
<number>-1</number>
</property>
<property name="maximum">
<number>100</number>
</property>
</widget>
</item>
</layout>
</item>
<item row="4" column="1">
<widget class="QComboBox" name="m_cmbCountsFeedList">
<property name="toolTip">
<string notr="true"/>
</property>
<property name="editable">
<bool>true</bool>
</property>
</widget>
<item row="5" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_8">
<item>
<widget class="QLabel" name="label_8">
<property name="text">
<string>Message count format in feed list</string>
</property>
<property name="buddy">
<cstring>m_cmbCountsFeedList</cstring>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="m_cmbCountsFeedList">
<property name="toolTip">
<string notr="true"/>
</property>
<property name="editable">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</item>
<item row="5" column="0" colspan="2">
<item row="6" column="0" colspan="2">
<widget class="QLabel" name="label_9">
<property name="font">
<font>
@ -124,13 +170,6 @@
</property>
</widget>
</item>
<item row="1" column="0" colspan="2">
<widget class="QCheckBox" name="m_checkAutoUpdateNotification">
<property name="text">
<string>Enable &quot;auto-update started&quot; notification</string>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="m_tabMessages">
@ -152,13 +191,16 @@
</property>
</widget>
</item>
<item row="2" column="0">
<item row="3" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>Height of image attachments</string>
</property>
<property name="buddy">
<cstring>m_spinHeightImageAttachments</cstring>
</property>
</widget>
</item>
<item>
@ -173,7 +215,7 @@
</item>
</layout>
</item>
<item row="3" column="0">
<item row="4" column="0">
<widget class="QCheckBox" name="m_checkMessagesDateTimeFormat">
<property name="text">
<string>Use custom date/time format (overrides format loaded from active localization)</string>
@ -186,10 +228,10 @@
</property>
</widget>
</item>
<item row="3" column="1">
<item row="4" column="1">
<widget class="QComboBox" name="m_cmbMessagesDateTimeFormat"/>
</item>
<item row="4" column="0" colspan="2">
<item row="5" column="0" colspan="2">
<widget class="QGroupBox" name="groupBox_4">
<property name="title">
<string>Internal message browser fonts</string>
@ -225,6 +267,30 @@
</layout>
</widget>
</item>
<item row="2" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<widget class="QLabel" name="label_2">
<property name="text">
<string>Height or rows in message list (-1 = default height)</string>
</property>
<property name="buddy">
<cstring>m_spinHeightRowsMessages</cstring>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="m_spinHeightRowsMessages">
<property name="minimum">
<number>-1</number>
</property>
<property name="maximum">
<number>100</number>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</widget>
@ -238,6 +304,25 @@
<header>timespinbox.h</header>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>m_tabFeedsMessages</tabstop>
<tabstop>m_checkUpdateAllFeedsOnStartup</tabstop>
<tabstop>m_checkAutoUpdateNotification</tabstop>
<tabstop>m_checkAutoUpdate</tabstop>
<tabstop>m_spinAutoUpdateInterval</tabstop>
<tabstop>m_spinFeedUpdateTimeout</tabstop>
<tabstop>m_spinHeightRowsFeeds</tabstop>
<tabstop>m_cmbCountsFeedList</tabstop>
<tabstop>m_checkRemoveReadMessagesOnExit</tabstop>
<tabstop>m_checkKeppMessagesInTheMiddle</tabstop>
<tabstop>m_spinHeightRowsMessages</tabstop>
<tabstop>m_spinHeightImageAttachments</tabstop>
<tabstop>m_checkMessagesDateTimeFormat</tabstop>
<tabstop>m_cmbMessagesDateTimeFormat</tabstop>
<tabstop>m_btnChangeMessagesFont</tabstop>
<tabstop>m_spinHeightRowsMessages_3</tabstop>
<tabstop>m_spinHeightRowsMessages_2</tabstop>
</tabstops>
<resources/>
<connections/>
</ui>

9
src/miscellaneous/databasequeries.cpp
View File

@ -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;

1
src/miscellaneous/databasequeries.h
View File

@ -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<ServiceRoot*> getInoreaderAccounts(QSqlDatabase db, bool* ok = nullptr);

8
src/miscellaneous/settings.cpp
View File

@ -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";

8
src/miscellaneous/settings.h
View File

@ -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;

15
src/services/inoreader/inoreaderserviceroot.cpp
View File

@ -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;
}
}

2
src/services/inoreader/inoreaderserviceroot.h
View File

@ -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);