From 29886acc01001ed99ea12a8ae95b4522ce47730e Mon Sep 17 00:00:00 2001 From: Christophe Dumez Date: Mon, 29 Dec 2008 20:01:03 +0000 Subject: [PATCH] - Putting back priority buttons in toolBar --- src/GUI.cpp | 16 +++++++++++++++- src/GUI.h | 2 ++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/GUI.cpp b/src/GUI.cpp index 0072b1af9..6a8b75e55 100644 --- a/src/GUI.cpp +++ b/src/GUI.cpp @@ -110,6 +110,10 @@ GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent), dis actionSet_global_upload_limit->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/seeding.png"))); actionSet_global_download_limit->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/downloading.png"))); actionDocumentation->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/qb_question.png"))); + prioSeparator = toolBar->insertSeparator(actionDecreasePriority); + prioSeparator2 = menu_Edit->insertSeparator(actionDecreasePriority); + prioSeparator->setVisible(false); + prioSeparator2->setVisible(false); actionDelete_Permanently->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/delete_perm.png"))); actionTorrent_Properties->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/properties.png"))); actionCreate_torrent->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/new.png"))); @@ -1063,6 +1067,11 @@ void GUI::configureSession(bool deleteOptions) { if(options->isQueueingSystemEnabled()) { if(!BTSession->isQueueingEnabled()) { downloadingTorrentTab->hidePriorityColumn(false); + actionDecreasePriority->setVisible(true); + actionIncreasePriority->setVisible(true); + prioSeparator->setVisible(true); + prioSeparator2->setVisible(true); + toolBar->layout()->setSpacing(7); } int max_torrents = options->getMaxActiveTorrents(); int max_uploads = options->getMaxActiveUploads(); @@ -1079,6 +1088,10 @@ void GUI::configureSession(bool deleteOptions) { sessionSettings.active_limit = -1; BTSession->setQueueingEnabled(false); downloadingTorrentTab->hidePriorityColumn(true); + actionIncreasePriority->setVisible(false); + prioSeparator->setVisible(false); + prioSeparator2->setVisible(false); + toolBar->layout()->setSpacing(7); } } BTSession->setSessionSettings(sessionSettings); @@ -1247,7 +1260,8 @@ void GUI::on_actionPause_All_triggered() { } void GUI::on_actionIncreasePriority_triggered() { - Q_ASSERT(tabs->currentIndex() == 0); + if(tabs->currentIndex() != 0) + return; QStringList hashes = downloadingTorrentTab->getSelectedTorrents(); foreach(QString hash, hashes) { BTSession->increaseDlTorrentPriority(hash); diff --git a/src/GUI.h b/src/GUI.h index 44db357d3..23395396f 100644 --- a/src/GUI.h +++ b/src/GUI.h @@ -90,6 +90,8 @@ class GUI : public QMainWindow, private Ui::MainWindow{ QShortcut *switchDownShortcut; QShortcut *switchUpShortcut; QShortcut *switchRSSShortcut; + QAction *prioSeparator; + QAction *prioSeparator2; // Search SearchEngine *searchEngine; // RSS