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

better add acc dialog

Browse Source
This commit is contained in:
Martin Rotter 2021-03-12 20:14:05 +01:00 committed by Martin Rotter
parent da25498e51
commit a3e2e8fa77
10 changed files with 68 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/scripts/7za

@ -1 +1 @@
Subproject commit 47f4125753452eff8800dbd6600c5a05540b15d9
Subproject commit 9c10723bfbaf6cb85107d6ee16e0324e9e487749

9
src/librssguard/gui/dialogs/formaddaccount.cpp
View File

@ -23,6 +23,7 @@ FormAddAccount::FormAddAccount(const QList<ServiceEntryPoint*>& 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());
}

2
src/librssguard/gui/dialogs/formaddaccount.h
View File

@ -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<Ui::FormAddAccount> m_ui;
FeedsModel* m_model;
QList<ServiceEntryPoint*> m_entryPoints;
};

43
src/librssguard/gui/dialogs/formaddaccount.ui
View File

@ -6,15 +6,28 @@
<rect>
<x>0</x>
<y>0</y>
<width>421</width>
<height>272</height>
<width>405</width>
<height>354</height>
</rect>
</property>
<property name="windowTitle">
<string>Add new account</string>
</property>
<layout class="QFormLayout" name="formLayout_2">
<item row="1" column="0" colspan="2">
<item row="0" column="0" colspan="2">
<widget class="QListWidget" name="m_listEntryPoints">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>1</verstretch>
</sizepolicy>
</property>
<property name="resizeMode">
<enum>QListView::Adjust</enum>
</property>
</widget>
</item>
<item row="2" column="0" colspan="2">
<widget class="QDialogButtonBox" name="m_buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
@ -24,22 +37,22 @@
</property>
</widget>
</item>
<item row="0" column="0" colspan="2">
<widget class="QListWidget" name="m_listEntryPoints">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>1</verstretch>
</sizepolicy>
</property>
<item row="1" column="0" colspan="2">
<widget class="QLabel" name="m_lblDetails">
<property name="minimumSize">
<size>
<width>320</width>
<height>0</height>
<width>0</width>
<height>30</height>
</size>
</property>
<property name="resizeMode">
<enum>QListView::Adjust</enum>
<property name="textFormat">
<enum>Qt::MarkdownText</enum>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>

15
src/librssguard/services/abstract/accountcheckmodel.h
View File

@ -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<RootItem*> 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:

6
src/librssguard/services/abstract/category.h
View File

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

8
src/librssguard/services/abstract/feed.h
View File

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

12
src/librssguard/services/abstract/importantnode.h
View File

@ -12,12 +12,12 @@ class ImportantNode : public RootItem {
explicit ImportantNode(RootItem* parent_item = nullptr);
virtual ~ImportantNode() = default;
QList<Message> 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<Message> 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{};

2
src/librssguard/services/abstract/label.h
View File

@ -33,6 +33,8 @@ class RSSGUARD_DLLSPEC Label : public RootItem {
virtual bool deleteViaGui();
virtual void updateCounts(bool including_total_count);
virtual QList<Message> undeletedMessages() const;
public:
static QIcon generateIcon(const QColor& color);
public slots:

20
src/librssguard/services/abstract/recyclebin.h
View File

@ -12,18 +12,14 @@ class RecycleBin : public RootItem {
explicit RecycleBin(RootItem* parent_item = nullptr);
virtual ~RecycleBin() = default;
QString additionalTooltip() const;
QList<QAction*> contextMenuFeedsList();
QList<Message> 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<QAction*> contextMenuFeedsList();
virtual QList<Message> 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();