github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-08-20 21:33:27 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #5928 from Chocobo1/rss-view

Browse source 
Change RSS view layout to horizontal
This commit is contained in:
sledgehammer999 2016-12-07 01:44:56 +02:00 • committed by GitHub
commit 49ed0765e1
4 changed files with 39 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/base/preferences.cpp
View file

@ -1284,7 +1284,7 @@ void Preferences::setRssOpenFolders(const QStringList &folders)
setValue("Rss/open_folders", folders); setValue("Rss/open_folders", folders);
} }
QByteArray Preferences::getRssHSplitterState() const QByteArray Preferences::getRssSideSplitterState() const
{ {
#ifdef QBT_USES_QT5 #ifdef QBT_USES_QT5
return value("Rss/qt5/splitter_h").toByteArray(); return value("Rss/qt5/splitter_h").toByteArray();
@ -1293,7 +1293,7 @@ QByteArray Preferences::getRssHSplitterState() const
#endif #endif
} }
void Preferences::setRssHSplitterState(const QByteArray &state) void Preferences::setRssSideSplitterState(const QByteArray &state)
{ {
#ifdef QBT_USES_QT5 #ifdef QBT_USES_QT5
setValue("Rss/qt5/splitter_h", state); setValue("Rss/qt5/splitter_h", state);
@ -1302,21 +1302,21 @@ void Preferences::setRssHSplitterState(const QByteArray &state)
#endif #endif
} }
QByteArray Preferences::getRssVSplitterState() const QByteArray Preferences::getRssMainSplitterState() const
{ {
#ifdef QBT_USES_QT5 #ifdef QBT_USES_QT5
return value("Rss/qt5/splitter_v").toByteArray(); return value("Rss/qt5/splitterMain").toByteArray();
#else #else
return value("Rss/splitter_v").toByteArray(); return value("Rss/splitterMain").toByteArray();
#endif #endif
} }
void Preferences::setRssVSplitterState(const QByteArray &state) void Preferences::setRssMainSplitterState(const QByteArray &state)
{ {
#ifdef QBT_USES_QT5 #ifdef QBT_USES_QT5
setValue("Rss/qt5/splitter_v", state); setValue("Rss/qt5/splitterMain", state);
#else #else
setValue("Rss/splitter_v", state); setValue("Rss/splitterMain", state);
#endif #endif
} }

8
src/base/preferences.h
View file

@ -300,10 +300,10 @@ public:
void setRssHSplitterSizes(const QByteArray &sizes); void setRssHSplitterSizes(const QByteArray &sizes);
QStringList getRssOpenFolders() const; QStringList getRssOpenFolders() const;
void setRssOpenFolders(const QStringList &folders); void setRssOpenFolders(const QStringList &folders);
QByteArray getRssHSplitterState() const; QByteArray getRssSideSplitterState() const;
void setRssHSplitterState(const QByteArray &state); void setRssSideSplitterState(const QByteArray &state);
QByteArray getRssVSplitterState() const; QByteArray getRssMainSplitterState() const;
void setRssVSplitterState(const QByteArray &state); void setRssMainSplitterState(const QByteArray &state);
QString getSearchColsWidth() const; QString getSearchColsWidth() const;
void setSearchColsWidth(const QString &width); void setSearchColsWidth(const QString &width);
QStringList getSearchEngDisabled() const; QStringList getSearchEngDisabled() const;

18
src/gui/rss/rss.ui
View file

@ -73,7 +73,13 @@
</layout> </layout>
</item> </item>
<item> <item>
<widget class="QSplitter" name="splitter_h"> <widget class="QSplitter" name="splitterSide">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
@ -93,9 +99,15 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QSplitter" name="splitter_v"> <widget class="QSplitter" name="splitterMain">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<widget class="QListWidget" name="listArticles"> <widget class="QListWidget" name="listArticles">
<property name="contextMenuPolicy"> <property name="contextMenuPolicy">

24
src/gui/rss/rss_imp.cpp
View file

@ -603,20 +603,20 @@ void RSSImp::saveSlidersPosition()
{ {
// Remember sliders positions // Remember sliders positions
Preferences* const pref = Preferences::instance(); Preferences* const pref = Preferences::instance();
pref->setRssHSplitterState(splitter_h->saveState()); pref->setRssSideSplitterState(splitterSide->saveState());
pref->setRssVSplitterState(splitter_v->saveState()); pref->setRssMainSplitterState(splitterMain->saveState());
qDebug("Splitters position saved"); qDebug("Splitters position saved");
} }
void RSSImp::restoreSlidersPosition() void RSSImp::restoreSlidersPosition()
{ {
const Preferences* const pref = Preferences::instance(); const Preferences* const pref = Preferences::instance();
const QByteArray pos_h = pref->getRssHSplitterState(); const QByteArray stateSide = pref->getRssSideSplitterState();
if (!pos_h.isEmpty()) if (!stateSide.isEmpty())
splitter_h->restoreState(pos_h); splitterSide->restoreState(stateSide);
const QByteArray pos_v = pref->getRssVSplitterState(); const QByteArray stateMain = pref->getRssMainSplitterState();
if (!pos_v.isEmpty()) if (!stateMain.isEmpty())
splitter_v->restoreState(pos_v); splitterMain->restoreState(stateMain);
} }
void RSSImp::updateItemsInfos(const QList<QTreeWidgetItem*>& items) void RSSImp::updateItemsInfos(const QList<QTreeWidgetItem*>& items)
@ -704,8 +704,8 @@ RSSImp::RSSImp(QWidget *parent):
rssDownloaderBtn->setIcon(GuiIconProvider::instance()->getIcon("download")); rssDownloaderBtn->setIcon(GuiIconProvider::instance()->getIcon("download"));
settingsButton->setIcon(GuiIconProvider::instance()->getIcon("preferences-system")); settingsButton->setIcon(GuiIconProvider::instance()->getIcon("preferences-system"));
m_feedList = new FeedListWidget(splitter_h, m_rssManager); m_feedList = new FeedListWidget(splitterSide, m_rssManager);
splitter_h->insertWidget(0, m_feedList); splitterSide->insertWidget(0, m_feedList);
editHotkey = new QShortcut(QKeySequence("F2"), m_feedList, 0, 0, Qt::WidgetShortcut); editHotkey = new QShortcut(QKeySequence("F2"), m_feedList, 0, 0, Qt::WidgetShortcut);
connect(editHotkey, SIGNAL(activated()), SLOT(renameSelectedRssFile())); connect(editHotkey, SIGNAL(activated()), SLOT(renameSelectedRssFile()));
connect(m_feedList, SIGNAL(doubleClicked(QModelIndex)), SLOT(renameSelectedRssFile())); connect(m_feedList, SIGNAL(doubleClicked(QModelIndex)), SLOT(renameSelectedRssFile()));
@ -747,8 +747,8 @@ RSSImp::RSSImp(QWidget *parent):
// Restore sliders position // Restore sliders position
restoreSlidersPosition(); restoreSlidersPosition();
// Bind saveSliders slots // Bind saveSliders slots
connect(splitter_v, SIGNAL(splitterMoved(int, int)), this, SLOT(saveSlidersPosition())); connect(splitterMain, SIGNAL(splitterMoved(int, int)), this, SLOT(saveSlidersPosition()));
connect(splitter_h, SIGNAL(splitterMoved(int, int)), this, SLOT(saveSlidersPosition())); connect(splitterSide, SIGNAL(splitterMoved(int, int)), this, SLOT(saveSlidersPosition()));
qDebug("RSSImp constructed"); qDebug("RSSImp constructed");
} }