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
This commit is contained in:
Chocobo1 2015-04-08 13:27:46 +08:00
parent 8897001567
commit b4a855f4c1
2 changed files with 44 additions and 40 deletions

View File

@ -158,9 +158,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);

View File

@ -50,11 +50,13 @@
<property name="title">
<string>&amp;Help</string>
</property>
<addaction name="actionBugReport"/>
<addaction name="actionWebsite"/>
<addaction name="actionDocumentation"/>
<addaction name="actionDonate_money"/>
<addaction name="actionWebsite"/>
<addaction name="actionBugReport"/>
<addaction name="separator"/>
<addaction name="actionCheck_for_updates"/>
<addaction name="separator"/>
<addaction name="actionDonate_money"/>
<addaction name="actionAbout"/>
</widget>
<widget class="QMenu" name="menu_Options">
@ -63,7 +65,7 @@
</property>
<widget class="QMenu" name="menuAuto_Shutdown_on_downloads_completion">
<property name="title">
<string>Auto-Shutdown on downloads completion</string>
<string>&amp;When Downloads Done</string>
</property>
<addaction name="actionAutoShutdown_Disabled"/>
<addaction name="actionAutoExit_qBittorrent"/>
@ -72,7 +74,6 @@
<addaction name="actionAutoShutdown_system"/>
</widget>
<addaction name="actionCreate_torrent"/>
<addaction name="actionStatistics"/>
<addaction name="separator"/>
<addaction name="actionOptions"/>
<addaction name="separator"/>
@ -85,6 +86,7 @@
<addaction name="actionOpen"/>
<addaction name="actionDownload_from_URL"/>
<addaction name="action_Import_Torrent"/>
<addaction name="separator"/>
<addaction name="actionExit"/>
</widget>
<widget class="QMenu" name="menuView">
@ -98,6 +100,8 @@
<addaction name="actionRSS_Reader"/>
<addaction name="actionExecution_Logs"/>
<addaction name="separator"/>
<addaction name="actionStatistics"/>
<addaction name="separator"/>
<addaction name="actionLock_qBittorrent"/>
</widget>
<addaction name="menu_File"/>
@ -143,7 +147,7 @@
<widget class="QStatusBar" name="statusBar"/>
<action name="actionOpen">
<property name="text">
<string>&amp;Add torrent file...</string>
<string>&amp;Add Torrent File...</string>
</property>
<property name="iconText">
<string>Open</string>
@ -151,7 +155,7 @@
</action>
<action name="actionExit">
<property name="text">
<string>Exit</string>
<string>E&amp;xit</string>
</property>
<property name="toolTip">
<string>Exit</string>
@ -205,7 +209,7 @@
</action>
<action name="actionDownload_from_URL">
<property name="text">
<string>Add &amp;link to torrent...</string>
<string>Add Torrent &amp;Link...</string>
</property>
<property name="iconText">
<string>Open URL</string>
@ -213,22 +217,22 @@
</action>
<action name="actionCreate_torrent">
<property name="text">
<string>Torrent &amp;creator</string>
<string>Torrent &amp;Creator</string>
</property>
</action>
<action name="actionBugReport">
<property name="text">
<string>Report a &amp;bug</string>
<string>Report a &amp;Bug</string>
</property>
</action>
<action name="actionSet_upload_limit">
<property name="text">
<string>Set upload limit...</string>
<string>Set Upload Limit...</string>
</property>
</action>
<action name="actionSet_download_limit">
<property name="text">
<string>Set download limit...</string>
<string>Set Download Limit...</string>
</property>
</action>
<action name="actionDocumentation">
@ -238,17 +242,17 @@
</action>
<action name="actionSet_global_download_limit">
<property name="text">
<string>Set global download limit...</string>
<string>Set Global Download Limit...</string>
</property>
</action>
<action name="actionSet_global_upload_limit">
<property name="text">
<string>Set global upload limit...</string>
<string>Set Global Upload Limit...</string>
</property>
</action>
<action name="actionBottomPriority">
<property name="text">
<string>Minimum priority</string>
<string>Minimum Priority</string>
</property>
<property name="visible">
<bool>true</bool>
@ -256,7 +260,7 @@
</action>
<action name="actionTopPriority">
<property name="text">
<string>Top priority</string>
<string>Top Priority</string>
</property>
<property name="visible">
<bool>true</bool>
@ -264,7 +268,7 @@
</action>
<action name="actionDecreasePriority">
<property name="text">
<string>Decrease priority</string>
<string>Decrease Priority</string>
</property>
<property name="visible">
<bool>true</bool>
@ -272,7 +276,7 @@
</action>
<action name="actionIncreasePriority">
<property name="text">
<string>Increase priority</string>
<string>Increase Priority</string>
</property>
<property name="visible">
<bool>true</bool>
@ -283,10 +287,10 @@
<bool>true</bool>
</property>
<property name="text">
<string>Alternative speed limits</string>
<string>Alternative Speed Limits</string>
</property>
<property name="toolTip">
<string>Alternative speed limits</string>
<string>Alternative Speed Limits</string>
</property>
</action>
<action name="actionTop_tool_bar">
@ -294,10 +298,10 @@
<bool>true</bool>
</property>
<property name="text">
<string>Top &amp;tool bar</string>
<string>&amp;Top Toolbar</string>
</property>
<property name="toolTip">
<string>Display top tool bar</string>
<string>Display Top Toolbar</string>
</property>
</action>
<action name="actionSpeed_in_title_bar">
@ -305,10 +309,10 @@
<bool>true</bool>
</property>
<property name="text">
<string>&amp;Speed in title bar</string>
<string>S&amp;peed in Title Bar</string>
</property>
<property name="toolTip">
<string>Show transfer speed in title bar</string>
<string>Show Transfer Speed in Title Bar</string>
</property>
</action>
<action name="actionRSS_Reader">
@ -316,7 +320,7 @@
<bool>true</bool>
</property>
<property name="text">
<string>&amp;RSS reader</string>
<string>&amp;RSS Reader</string>
</property>
</action>
<action name="actionSearch_engine">
@ -324,12 +328,12 @@
<bool>true</bool>
</property>
<property name="text">
<string>Search &amp;engine</string>
<string>Search &amp;Engine</string>
</property>
</action>
<action name="actionLock_qBittorrent">
<property name="text">
<string>Lock qBittorrent</string>
<string>L&amp;ock qBittorrent</string>
</property>
<property name="toolTip">
<string>Lock qBittorrent</string>
@ -343,15 +347,15 @@
</action>
<action name="action_Import_Torrent">
<property name="text">
<string>Import existing torrent...</string>
<string>&amp;Import Existing Torrent...</string>
</property>
<property name="toolTip">
<string>Import torrent...</string>
<string>Import Torrent...</string>
</property>
</action>
<action name="actionDonate_money">
<property name="text">
<string>Donate money</string>
<string>Do&amp;nate!</string>
</property>
<property name="toolTip">
<string>If you like qBittorrent, please donate!</string>
@ -383,7 +387,7 @@
<bool>true</bool>
</property>
<property name="text">
<string>Exit qBittorrent</string>
<string>&amp;Exit qBittorrent</string>
</property>
</action>
<action name="actionAutoSuspend_system">
@ -391,7 +395,7 @@
<bool>true</bool>
</property>
<property name="text">
<string>Suspend system</string>
<string>&amp;Suspend System</string>
</property>
</action>
<action name="actionAutoHibernate_system">
@ -399,7 +403,7 @@
<bool>true</bool>
</property>
<property name="text">
<string>Hibernate system</string>
<string>&amp;Hibernate System</string>
</property>
</action>
<action name="actionAutoShutdown_system">
@ -407,7 +411,7 @@
<bool>true</bool>
</property>
<property name="text">
<string>Shutdown system</string>
<string>S&amp;hutdown System</string>
</property>
</action>
<action name="actionAutoShutdown_Disabled">
@ -415,7 +419,7 @@
<bool>true</bool>
</property>
<property name="text">
<string>Disabled</string>
<string>&amp;Disabled</string>
</property>
</action>
<action name="actionToggleVisibility">
@ -430,15 +434,15 @@
</action>
<action name="actionStatistics">
<property name="text">
<string>Statistics</string>
<string>&amp;Statistics</string>
</property>
</action>
<action name="actionCheck_for_updates">
<property name="text">
<string>Check for updates</string>
<string>Check for Updates</string>
</property>
<property name="toolTip">
<string>Check for program updates</string>
<string>Check for Program Updates</string>
</property>
</action>
</widget>