added feedorder Option to Settings Page, fixes and closes #28
This commit is contained in:
parent
a9fe58d107
commit
004d1a6e6d
4 changed files with 24 additions and 7 deletions
|
|
@ -146,7 +146,7 @@ Page {
|
|||
|
||||
function showFeedItems() {
|
||||
var ttrss = rootWindow.getTTRSS();
|
||||
var feeditems = ttrss.getFeedItems(feedId);
|
||||
var feeditems = ttrss.getFeedItems(feedId, settings.feeditemsOrder === 1);
|
||||
var showAll = ttrss.getShowAll();
|
||||
itemListModel.clear();
|
||||
|
||||
|
|
|
|||
|
|
@ -47,11 +47,11 @@ Page {
|
|||
onButtonClicked: settings.whiteTheme = index === 1
|
||||
}
|
||||
|
||||
// SettingsButtonRow {
|
||||
// text: qsTr("Order")
|
||||
// checkedButtonIndex: 0//settings.feeditemsorder
|
||||
// buttonsText: [qsTr("Newest First"), qsTr("Oldest First")]
|
||||
// onButtonClicked: console.log(index)
|
||||
// }
|
||||
SettingsButtonRow {
|
||||
text: qsTr("Order")
|
||||
checkedButtonIndex: settings.feeditemsOrder
|
||||
buttonsText: [qsTr("Newest First"), qsTr("Oldest First")]
|
||||
onButtonClicked: settings.feeditemsOrder = index
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -62,6 +62,14 @@ void Settings::setWhiteTheme(bool whiteTheme) {
|
|||
}
|
||||
}
|
||||
|
||||
void Settings::setFeeditemsOrder(int feeditemsOrder) {
|
||||
if (_feeditemsOrder != feeditemsOrder) {
|
||||
_feeditemsOrder = feeditemsOrder;
|
||||
m_settings->setValue("feeditemsOrder", _feeditemsOrder);
|
||||
emit feeditemsOrderChanged();
|
||||
}
|
||||
}
|
||||
|
||||
Settings::Settings(QObject *parent) : QObject(parent), m_settings(new QSettings(this)) {
|
||||
_servername = m_settings->value("servername", "http://").toString();
|
||||
_username = m_settings->value("username", "").toString();
|
||||
|
|
@ -69,4 +77,5 @@ Settings::Settings(QObject *parent) : QObject(parent), m_settings(new QSettings(
|
|||
_autologin = m_settings->value("autologin", false).toBool();
|
||||
|
||||
_whiteTheme = m_settings->value("whiteTheme", true).toBool();
|
||||
_feeditemsOrder = m_settings->value("feeditemsOrder", 0).toInt();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@ class Settings : public QObject
|
|||
Q_PROPERTY(bool autologin READ hasAutologin WRITE setAutologin NOTIFY autologinChanged)
|
||||
|
||||
Q_PROPERTY(bool whiteTheme READ isWhiteTheme WRITE setWhiteTheme NOTIFY whiteThemeChanged)
|
||||
Q_PROPERTY(int feeditemsOrder READ feeditemsOrder WRITE setFeeditemsOrder NOTIFY feeditemsOrderChanged)
|
||||
public:
|
||||
static Settings *instance();
|
||||
|
||||
|
|
@ -49,6 +50,11 @@ public:
|
|||
}
|
||||
void setWhiteTheme(bool whiteTheme);
|
||||
|
||||
bool feeditemsOrder() const {
|
||||
return this->_feeditemsOrder;
|
||||
}
|
||||
void setFeeditemsOrder(int feeditemsOrder);
|
||||
|
||||
signals:
|
||||
void servernameChanged();
|
||||
void usernameChanged();
|
||||
|
|
@ -56,6 +62,7 @@ signals:
|
|||
void autologinChanged();
|
||||
|
||||
void whiteThemeChanged();
|
||||
void feeditemsOrderChanged();
|
||||
|
||||
private:
|
||||
static QScopedPointer<Settings> m_instance;
|
||||
|
|
@ -71,5 +78,6 @@ private:
|
|||
bool _autologin;
|
||||
|
||||
bool _whiteTheme;
|
||||
int _feeditemsOrder;
|
||||
};
|
||||
#endif // SETTINGS_HH
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue