diff --git a/resources/scripts/7za b/resources/scripts/7za index 47f412575..9c10723bf 160000 --- a/resources/scripts/7za +++ b/resources/scripts/7za @@ -1 +1 @@ -Subproject commit 47f4125753452eff8800dbd6600c5a05540b15d9 +Subproject commit 9c10723bfbaf6cb85107d6ee16e0324e9e487749 diff --git a/src/librssguard/gui/dialogs/formaddaccount.cpp b/src/librssguard/gui/dialogs/formaddaccount.cpp index 66d6782a0..4143e612c 100644 --- a/src/librssguard/gui/dialogs/formaddaccount.cpp +++ b/src/librssguard/gui/dialogs/formaddaccount.cpp @@ -23,6 +23,7 @@ FormAddAccount::FormAddAccount(const QList& entry_points, Fe connect(m_ui->m_listEntryPoints, &QListWidget::itemDoubleClicked, this, &FormAddAccount::addSelectedAccount); connect(m_ui->m_buttonBox, &QDialogButtonBox::accepted, this, &FormAddAccount::addSelectedAccount); + connect(m_ui->m_listEntryPoints, &QListWidget::currentRowChanged, this, &FormAddAccount::showAccountDetails); loadEntryPoints(); } @@ -44,6 +45,14 @@ void FormAddAccount::addSelectedAccount() { } } +void FormAddAccount::showAccountDetails() { + ServiceEntryPoint* point = selectedEntryPoint(); + + if (point != nullptr) { + m_ui->m_lblDetails->setText(point->description()); + } +} + ServiceEntryPoint* FormAddAccount::selectedEntryPoint() const { return m_entryPoints.at(m_ui->m_listEntryPoints->currentRow()); } diff --git a/src/librssguard/gui/dialogs/formaddaccount.h b/src/librssguard/gui/dialogs/formaddaccount.h index bbe421c4a..b7a0e2b45 100644 --- a/src/librssguard/gui/dialogs/formaddaccount.h +++ b/src/librssguard/gui/dialogs/formaddaccount.h @@ -19,6 +19,7 @@ class FormAddAccount : public QDialog { private slots: void addSelectedAccount(); + void showAccountDetails(); private: ServiceEntryPoint* selectedEntryPoint() const; @@ -27,7 +28,6 @@ class FormAddAccount : public QDialog { QScopedPointer m_ui; FeedsModel* m_model; - QList m_entryPoints; }; diff --git a/src/librssguard/gui/dialogs/formaddaccount.ui b/src/librssguard/gui/dialogs/formaddaccount.ui index a94c53b07..21249540b 100644 --- a/src/librssguard/gui/dialogs/formaddaccount.ui +++ b/src/librssguard/gui/dialogs/formaddaccount.ui @@ -6,15 +6,28 @@ 0 0 - 421 - 272 + 405 + 354 Add new account - + + + + + 0 + 1 + + + + QListView::Adjust + + + + Qt::Horizontal @@ -24,22 +37,22 @@ - - - - - 0 - 1 - - + + - 320 - 0 + 0 + 30 - - QListView::Adjust + + Qt::MarkdownText + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true diff --git a/src/librssguard/services/abstract/accountcheckmodel.h b/src/librssguard/services/abstract/accountcheckmodel.h index 8c84d1ac1..7765db901 100644 --- a/src/librssguard/services/abstract/accountcheckmodel.h +++ b/src/librssguard/services/abstract/accountcheckmodel.h @@ -17,13 +17,13 @@ class AccountCheckModel : public QAbstractItemModel { explicit AccountCheckModel(QObject* parent = nullptr); virtual ~AccountCheckModel() = default; - QModelIndex index(int row, int column, const QModelIndex& parent) const; - QModelIndex parent(const QModelIndex& child) const; - int rowCount(const QModelIndex& parent) const; - int columnCount(const QModelIndex& parent) const; - QVariant data(const QModelIndex& index, int role) const; - bool setData(const QModelIndex& index, const QVariant& value, int role); - Qt::ItemFlags flags(const QModelIndex& index) const; + virtual QModelIndex index(int row, int column, const QModelIndex& parent) const; + virtual QModelIndex parent(const QModelIndex& child) const; + virtual int rowCount(const QModelIndex& parent) const; + virtual int columnCount(const QModelIndex& parent) const; + virtual QVariant data(const QModelIndex& index, int role) const; + virtual bool setData(const QModelIndex& index, const QVariant& value, int role); + virtual Qt::ItemFlags flags(const QModelIndex& index) const; QList checkedItems() const; @@ -39,7 +39,6 @@ class AccountCheckModel : public QAbstractItemModel { // Root item manipulators. RootItem* rootItem() const; - void setRootItem(RootItem* root_item, bool delete_previous_root = true, bool with_layout_change = false); public slots: diff --git a/src/librssguard/services/abstract/category.h b/src/librssguard/services/abstract/category.h index dabc46727..7376d540a 100644 --- a/src/librssguard/services/abstract/category.h +++ b/src/librssguard/services/abstract/category.h @@ -12,9 +12,9 @@ class Category : public RootItem { explicit Category(RootItem* parent = nullptr); explicit Category(const Category& other); - void updateCounts(bool including_total_count); - bool cleanMessages(bool clean_read_only); - bool markAsReadUnread(ReadStatus status); + virtual void updateCounts(bool including_total_count); + virtual bool cleanMessages(bool clean_read_only); + virtual bool markAsReadUnread(ReadStatus status); }; #endif // CATEGORY_H diff --git a/src/librssguard/services/abstract/feed.h b/src/librssguard/services/abstract/feed.h index 169dee343..b64895da4 100644 --- a/src/librssguard/services/abstract/feed.h +++ b/src/librssguard/services/abstract/feed.h @@ -48,15 +48,13 @@ class Feed : public RootItem { virtual int countOfUnreadMessages() const; virtual QVariantHash customDatabaseData() const; virtual void setCustomDatabaseData(const QVariantHash& data); + virtual bool canBeEdited() const; + virtual bool editViaGui(); + virtual QVariant data(int column, int role) const; void setCountOfAllMessages(int count_all_messages); void setCountOfUnreadMessages(int count_unread_messages); - bool canBeEdited() const; - bool editViaGui(); - - QVariant data(int column, int role) const; - int autoUpdateInitialInterval() const; void setAutoUpdateInitialInterval(int auto_update_interval); diff --git a/src/librssguard/services/abstract/importantnode.h b/src/librssguard/services/abstract/importantnode.h index 2b11dd6f1..c8cff710e 100755 --- a/src/librssguard/services/abstract/importantnode.h +++ b/src/librssguard/services/abstract/importantnode.h @@ -12,12 +12,12 @@ class ImportantNode : public RootItem { explicit ImportantNode(RootItem* parent_item = nullptr); virtual ~ImportantNode() = default; - QList undeletedMessages() const; - bool cleanMessages(bool clean_read_only); - void updateCounts(bool including_total_count); - bool markAsReadUnread(ReadStatus status); - int countOfUnreadMessages() const; - int countOfAllMessages() const; + virtual QList undeletedMessages() const; + virtual bool cleanMessages(bool clean_read_only); + virtual void updateCounts(bool including_total_count); + virtual bool markAsReadUnread(ReadStatus status); + virtual int countOfUnreadMessages() const; + virtual int countOfAllMessages() const; private: int m_totalCount{}; diff --git a/src/librssguard/services/abstract/label.h b/src/librssguard/services/abstract/label.h index aa80d44d9..3f0f993c4 100755 --- a/src/librssguard/services/abstract/label.h +++ b/src/librssguard/services/abstract/label.h @@ -33,6 +33,8 @@ class RSSGUARD_DLLSPEC Label : public RootItem { virtual bool deleteViaGui(); virtual void updateCounts(bool including_total_count); virtual QList undeletedMessages() const; + + public: static QIcon generateIcon(const QColor& color); public slots: diff --git a/src/librssguard/services/abstract/recyclebin.h b/src/librssguard/services/abstract/recyclebin.h index b1b42b8f8..17228fc9f 100644 --- a/src/librssguard/services/abstract/recyclebin.h +++ b/src/librssguard/services/abstract/recyclebin.h @@ -12,18 +12,14 @@ class RecycleBin : public RootItem { explicit RecycleBin(RootItem* parent_item = nullptr); virtual ~RecycleBin() = default; - QString additionalTooltip() const; - - QList contextMenuFeedsList(); - QList undeletedMessages() const; - - bool markAsReadUnread(ReadStatus status); - bool cleanMessages(bool clear_only_read); - - int countOfUnreadMessages() const; - int countOfAllMessages() const; - - void updateCounts(bool update_total_count); + virtual QString additionalTooltip() const; + virtual QList contextMenuFeedsList(); + virtual QList undeletedMessages() const; + virtual bool markAsReadUnread(ReadStatus status); + virtual bool cleanMessages(bool clear_only_read); + virtual int countOfUnreadMessages() const; + virtual int countOfAllMessages() const; + virtual void updateCounts(bool update_total_count); public slots: virtual bool empty();