From 7d34a89efdeb5c9bad758b5c9639d55640ad5c35 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Thu, 10 Nov 2016 20:52:40 +0800 Subject: [PATCH 1/3] Change RSS view layout to horizontal. Closes #5920. Thanks Bhaalspawn for the idea. --- src/gui/rss/rss.ui | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/gui/rss/rss.ui b/src/gui/rss/rss.ui index c9315d357..cd673b6a0 100644 --- a/src/gui/rss/rss.ui +++ b/src/gui/rss/rss.ui @@ -74,6 +74,12 @@ + + + 0 + 0 + + Qt::Horizontal @@ -94,8 +100,14 @@ + + + 0 + 0 + + - Qt::Vertical + Qt::Horizontal From 6b835f53ce9ee4c4eded4e057289a0c9bace5e30 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Fri, 11 Nov 2016 00:16:51 +0800 Subject: [PATCH 2/3] Use new key for storing RSS splitter_v value. So that old value won't override the RSS layout. --- src/base/preferences.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/base/preferences.cpp b/src/base/preferences.cpp index ad6123598..4c0bfcb89 100644 --- a/src/base/preferences.cpp +++ b/src/base/preferences.cpp @@ -1305,18 +1305,18 @@ void Preferences::setRssHSplitterState(const QByteArray &state) QByteArray Preferences::getRssVSplitterState() const { #ifdef QBT_USES_QT5 - return value("Rss/qt5/splitter_v").toByteArray(); + return value("Rss/qt5/splitterV").toByteArray(); #else - return value("Rss/splitter_v").toByteArray(); + return value("Rss/splitterV").toByteArray(); #endif } void Preferences::setRssVSplitterState(const QByteArray &state) { #ifdef QBT_USES_QT5 - setValue("Rss/qt5/splitter_v", state); + setValue("Rss/qt5/splitterV", state); #else - setValue("Rss/splitter_v", state); + setValue("Rss/splitterV", state); #endif } From a415f14fac09331240f017bc0cffc3aa11aa1d3b Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Thu, 17 Nov 2016 11:11:48 +0800 Subject: [PATCH 3/3] Rename splitter names --- src/base/preferences.cpp | 16 ++++++++-------- src/base/preferences.h | 8 ++++---- src/gui/rss/rss.ui | 4 ++-- src/gui/rss/rss_imp.cpp | 24 ++++++++++++------------ 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/base/preferences.cpp b/src/base/preferences.cpp index 4c0bfcb89..28184ea95 100644 --- a/src/base/preferences.cpp +++ b/src/base/preferences.cpp @@ -1284,7 +1284,7 @@ void Preferences::setRssOpenFolders(const QStringList &folders) setValue("Rss/open_folders", folders); } -QByteArray Preferences::getRssHSplitterState() const +QByteArray Preferences::getRssSideSplitterState() const { #ifdef QBT_USES_QT5 return value("Rss/qt5/splitter_h").toByteArray(); @@ -1293,7 +1293,7 @@ QByteArray Preferences::getRssHSplitterState() const #endif } -void Preferences::setRssHSplitterState(const QByteArray &state) +void Preferences::setRssSideSplitterState(const QByteArray &state) { #ifdef QBT_USES_QT5 setValue("Rss/qt5/splitter_h", state); @@ -1302,21 +1302,21 @@ void Preferences::setRssHSplitterState(const QByteArray &state) #endif } -QByteArray Preferences::getRssVSplitterState() const +QByteArray Preferences::getRssMainSplitterState() const { #ifdef QBT_USES_QT5 - return value("Rss/qt5/splitterV").toByteArray(); + return value("Rss/qt5/splitterMain").toByteArray(); #else - return value("Rss/splitterV").toByteArray(); + return value("Rss/splitterMain").toByteArray(); #endif } -void Preferences::setRssVSplitterState(const QByteArray &state) +void Preferences::setRssMainSplitterState(const QByteArray &state) { #ifdef QBT_USES_QT5 - setValue("Rss/qt5/splitterV", state); + setValue("Rss/qt5/splitterMain", state); #else - setValue("Rss/splitterV", state); + setValue("Rss/splitterMain", state); #endif } diff --git a/src/base/preferences.h b/src/base/preferences.h index d5780ea6b..f6ca325a5 100644 --- a/src/base/preferences.h +++ b/src/base/preferences.h @@ -300,10 +300,10 @@ public: void setRssHSplitterSizes(const QByteArray &sizes); QStringList getRssOpenFolders() const; void setRssOpenFolders(const QStringList &folders); - QByteArray getRssHSplitterState() const; - void setRssHSplitterState(const QByteArray &state); - QByteArray getRssVSplitterState() const; - void setRssVSplitterState(const QByteArray &state); + QByteArray getRssSideSplitterState() const; + void setRssSideSplitterState(const QByteArray &state); + QByteArray getRssMainSplitterState() const; + void setRssMainSplitterState(const QByteArray &state); QString getSearchColsWidth() const; void setSearchColsWidth(const QString &width); QStringList getSearchEngDisabled() const; diff --git a/src/gui/rss/rss.ui b/src/gui/rss/rss.ui index cd673b6a0..649a8586a 100644 --- a/src/gui/rss/rss.ui +++ b/src/gui/rss/rss.ui @@ -73,7 +73,7 @@ - + 0 @@ -99,7 +99,7 @@ - + 0 diff --git a/src/gui/rss/rss_imp.cpp b/src/gui/rss/rss_imp.cpp index 3581cfd6a..909b6432a 100644 --- a/src/gui/rss/rss_imp.cpp +++ b/src/gui/rss/rss_imp.cpp @@ -603,20 +603,20 @@ void RSSImp::saveSlidersPosition() { // Remember sliders positions Preferences* const pref = Preferences::instance(); - pref->setRssHSplitterState(splitter_h->saveState()); - pref->setRssVSplitterState(splitter_v->saveState()); + pref->setRssSideSplitterState(splitterSide->saveState()); + pref->setRssMainSplitterState(splitterMain->saveState()); qDebug("Splitters position saved"); } void RSSImp::restoreSlidersPosition() { const Preferences* const pref = Preferences::instance(); - const QByteArray pos_h = pref->getRssHSplitterState(); - if (!pos_h.isEmpty()) - splitter_h->restoreState(pos_h); - const QByteArray pos_v = pref->getRssVSplitterState(); - if (!pos_v.isEmpty()) - splitter_v->restoreState(pos_v); + const QByteArray stateSide = pref->getRssSideSplitterState(); + if (!stateSide.isEmpty()) + splitterSide->restoreState(stateSide); + const QByteArray stateMain = pref->getRssMainSplitterState(); + if (!stateMain.isEmpty()) + splitterMain->restoreState(stateMain); } void RSSImp::updateItemsInfos(const QList& items) @@ -704,8 +704,8 @@ RSSImp::RSSImp(QWidget *parent): rssDownloaderBtn->setIcon(GuiIconProvider::instance()->getIcon("download")); settingsButton->setIcon(GuiIconProvider::instance()->getIcon("preferences-system")); - m_feedList = new FeedListWidget(splitter_h, m_rssManager); - splitter_h->insertWidget(0, m_feedList); + m_feedList = new FeedListWidget(splitterSide, m_rssManager); + splitterSide->insertWidget(0, m_feedList); editHotkey = new QShortcut(QKeySequence("F2"), m_feedList, 0, 0, Qt::WidgetShortcut); connect(editHotkey, SIGNAL(activated()), SLOT(renameSelectedRssFile())); connect(m_feedList, SIGNAL(doubleClicked(QModelIndex)), SLOT(renameSelectedRssFile())); @@ -747,8 +747,8 @@ RSSImp::RSSImp(QWidget *parent): // Restore sliders position restoreSlidersPosition(); // Bind saveSliders slots - connect(splitter_v, SIGNAL(splitterMoved(int, int)), this, SLOT(saveSlidersPosition())); - connect(splitter_h, SIGNAL(splitterMoved(int, int)), this, SLOT(saveSlidersPosition())); + connect(splitterMain, SIGNAL(splitterMoved(int, int)), this, SLOT(saveSlidersPosition())); + connect(splitterSide, SIGNAL(splitterMoved(int, int)), this, SLOT(saveSlidersPosition())); qDebug("RSSImp constructed"); }