From 98a4b8c199befe613c288f64decab0c79fdd15c7 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Sun, 14 Jun 2015 20:05:58 +0800 Subject: [PATCH 1/4] Move statistics from Tools to View Reorder & add separators in Help menu Rename `Auto-Shutdown on downloads completion` to `When downloads done` Capitalize menu items, modify accelerator --- src/gui/mainwindow.cpp | 4 +-- src/gui/mainwindow.ui | 76 ++++++++++++++++++++++-------------------- 2 files changed, 42 insertions(+), 38 deletions(-) diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index 0d7ef161e..70d2a7be6 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -162,9 +162,9 @@ MainWindow::MainWindow(QWidget *parent) pauseAllMenu->addAction(actionPause_All); actionPause->setMenu(pauseAllMenu); QMenu *lockMenu = new QMenu(this); - QAction *defineUiLockPasswdAct = lockMenu->addAction(tr("Set the password...")); + QAction *defineUiLockPasswdAct = lockMenu->addAction(tr("&Set Password")); connect(defineUiLockPasswdAct, SIGNAL(triggered()), this, SLOT(defineUILockPassword())); - QAction *clearUiLockPasswdAct = lockMenu->addAction(tr("Clear the password")); + QAction *clearUiLockPasswdAct = lockMenu->addAction(tr("&Clear Password")); connect(clearUiLockPasswdAct, SIGNAL(triggered()), this, SLOT(clearUILockPassword())); actionLock_qBittorrent->setMenu(lockMenu); diff --git a/src/gui/mainwindow.ui b/src/gui/mainwindow.ui index fb5b2aa2f..7e2f88154 100644 --- a/src/gui/mainwindow.ui +++ b/src/gui/mainwindow.ui @@ -50,11 +50,13 @@ &Help - - - + + + + + @@ -63,7 +65,7 @@ - Auto-Shutdown on downloads completion + &When Downloads Done @@ -72,7 +74,6 @@ - @@ -85,6 +86,7 @@ + @@ -98,6 +100,8 @@ + + @@ -151,7 +155,7 @@ - Exit + E&xit Exit @@ -213,22 +217,22 @@ - Torrent &creator + Torrent &Creator - Report a &bug + Report a &Bug - Set upload limit... + Set Upload Limit... - Set download limit... + Set Download Limit... @@ -238,17 +242,17 @@ - Set global download limit... + Set Global Download Limit... - Set global upload limit... + Set Global Upload Limit... - Minimum priority + Minimum Priority true @@ -256,7 +260,7 @@ - Top priority + Top Priority true @@ -264,7 +268,7 @@ - Decrease priority + Decrease Priority true @@ -272,7 +276,7 @@ - Increase priority + Increase Priority true @@ -283,10 +287,10 @@ true - Alternative speed limits + Alternative Speed Limits - Alternative speed limits + Alternative Speed Limits @@ -294,10 +298,10 @@ true - Top &tool bar + &Top Toolbar - Display top tool bar + Display Top Toolbar @@ -305,10 +309,10 @@ true - &Speed in title bar + S&peed in Title Bar - Show transfer speed in title bar + Show Transfer Speed in Title Bar @@ -316,7 +320,7 @@ true - &RSS reader + &RSS Reader @@ -324,12 +328,12 @@ true - Search &engine + Search &Engine - Lock qBittorrent + L&ock qBittorrent Lock qBittorrent @@ -343,15 +347,15 @@ - Import existing torrent... + &Import Existing Torrent... - Import torrent... + Import Torrent... - Donate money + Do&nate! If you like qBittorrent, please donate! @@ -383,7 +387,7 @@ true - Exit qBittorrent + &Exit qBittorrent @@ -391,7 +395,7 @@ true - Suspend system + &Suspend System @@ -399,7 +403,7 @@ true - Hibernate system + &Hibernate System @@ -407,7 +411,7 @@ true - Shutdown system + S&hutdown System @@ -415,7 +419,7 @@ true - Disabled + &Disabled @@ -430,15 +434,15 @@ - Statistics + &Statistics - Check for updates + Check for Updates - Check for program updates + Check for Program Updates From ca70f2ce5c39a2199be641916326e0aa9cb3b912 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Sun, 14 Jun 2015 20:07:10 +0800 Subject: [PATCH 2/4] Rename "Execution Log" to "Log". Rename "When Downloads Done" to "On Downloads Done". --- src/gui/mainwindow.ui | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/mainwindow.ui b/src/gui/mainwindow.ui index 7e2f88154..953456baa 100644 --- a/src/gui/mainwindow.ui +++ b/src/gui/mainwindow.ui @@ -65,7 +65,7 @@ - &When Downloads Done + On Downloads &Done @@ -376,7 +376,7 @@ true - Execution &Log + &Log Execution Log From 429dad3f701df3b3f9988f009d840667dc8b2747 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Sun, 14 Jun 2015 20:08:47 +0800 Subject: [PATCH 3/4] Remove menu items: "Visit Website" and "Report a Bug". Many issues opened on github should be asked on forum first, and the links are already present in "About" window. --- src/gui/mainwindow.cpp | 11 ----------- src/gui/mainwindow.h | 2 -- src/gui/mainwindow.ui | 17 ----------------- 3 files changed, 30 deletions(-) diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index 70d2a7be6..950195986 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -137,7 +137,6 @@ MainWindow::MainWindow(QWidget *parent) actionCreate_torrent->setIcon(IconProvider::instance()->getIcon("document-edit")); actionAbout->setIcon(IconProvider::instance()->getIcon("help-about")); actionStatistics->setIcon(IconProvider::instance()->getIcon("view-statistics")); - actionBugReport->setIcon(IconProvider::instance()->getIcon("tools-report-bug")); actionDecreasePriority->setIcon(IconProvider::instance()->getIcon("go-down")); actionBottomPriority->setIcon(IconProvider::instance()->getIcon("go-bottom")); actionDelete->setIcon(IconProvider::instance()->getIcon("list-remove")); @@ -546,21 +545,11 @@ void MainWindow::updateNbTorrents() tabs->setTabText(0, tr("Transfers (%1)").arg(transferList->getSourceModel()->rowCount())); } -void MainWindow::on_actionWebsite_triggered() const -{ - QDesktopServices::openUrl(QUrl(QString::fromUtf8("http://www.qbittorrent.org"))); -} - void MainWindow::on_actionDocumentation_triggered() const { QDesktopServices::openUrl(QUrl(QString::fromUtf8("http://doc.qbittorrent.org"))); } -void MainWindow::on_actionBugReport_triggered() const -{ - QDesktopServices::openUrl(QUrl(QString::fromUtf8("http://bugs.qbittorrent.org"))); -} - void MainWindow::tab_changed(int new_tab) { Q_UNUSED(new_tab); diff --git a/src/gui/mainwindow.h b/src/gui/mainwindow.h index c3ebdd3a9..65f9352f7 100644 --- a/src/gui/mainwindow.h +++ b/src/gui/mainwindow.h @@ -94,8 +94,6 @@ protected slots: void on_actionAbout_triggered(); void on_actionStatistics_triggered(); void on_actionCreate_torrent_triggered(); - void on_actionWebsite_triggered() const; - void on_actionBugReport_triggered() const; void balloonClicked(); void writeSettings(); void readSettings(); diff --git a/src/gui/mainwindow.ui b/src/gui/mainwindow.ui index 953456baa..c9ea159ce 100644 --- a/src/gui/mainwindow.ui +++ b/src/gui/mainwindow.ui @@ -51,9 +51,6 @@ &Help - - - @@ -198,15 +195,6 @@ Delete - - - - :/icons/skin/qbittorrent32.png:/icons/skin/qbittorrent32.png - - - Visit &Website - - Add Torrent &Link... @@ -220,11 +208,6 @@ Torrent &Creator - - - Report a &Bug - - Set Upload Limit... From bd7fd47d9fc13b607658ae44d3769c4ec02c7988 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Sun, 14 Jun 2015 20:09:39 +0800 Subject: [PATCH 4/4] Resave in Qt Designer --- src/gui/mainwindow.ui | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/gui/mainwindow.ui b/src/gui/mainwindow.ui index c9ea159ce..2552039f3 100644 --- a/src/gui/mainwindow.ui +++ b/src/gui/mainwindow.ui @@ -29,7 +29,7 @@ 0 0 914 - 22 + 20 @@ -40,7 +40,6 @@ - @@ -132,7 +131,6 @@ - @@ -318,12 +316,12 @@ L&ock qBittorrent - - Lock qBittorrent - Lock + + Lock qBittorrent + Ctrl+L