Merge pull request #6056 from okeatime/resume_pause

Make resume/pause menu items clickable. Closes #6040
This commit is contained in:
sledgehammer999 2016-12-16 14:59:08 +02:00 committed by GitHub
commit d330ae2421
2 changed files with 13 additions and 17 deletions

View file

@ -174,12 +174,6 @@ MainWindow::MainWindow(QWidget *parent)
m_ui->menuAutoShutdownOnDownloadsCompletion->setIcon(GuiIconProvider::instance()->getIcon("application-exit"));
m_ui->actionManageCookies->setIcon(GuiIconProvider::instance()->getIcon("preferences-web-browser-cookies"));
QMenu *startAllMenu = new QMenu(this);
startAllMenu->addAction(m_ui->actionStartAll);
m_ui->actionStart->setMenu(startAllMenu);
QMenu *pauseAllMenu = new QMenu(this);
pauseAllMenu->addAction(m_ui->actionPauseAll);
m_ui->actionPause->setMenu(pauseAllMenu);
QMenu *lockMenu = new QMenu(this);
QAction *defineUiLockPasswdAct = lockMenu->addAction(tr("&Set Password"));
connect(defineUiLockPasswdAct, SIGNAL(triggered()), this, SLOT(defineUILockPassword()));

View file

@ -35,7 +35,7 @@
<x>0</x>
<y>0</y>
<width>914</width>
<height>21</height>
<height>22</height>
</rect>
</property>
<widget class="QMenu" name="menuEdit">
@ -44,6 +44,8 @@
</property>
<addaction name="actionStart"/>
<addaction name="actionPause"/>
<addaction name="actionStartAll"/>
<addaction name="actionPauseAll"/>
<addaction name="separator"/>
<addaction name="actionDelete"/>
<addaction name="actionTopPriority"/>
@ -191,6 +193,16 @@
<string>&amp;Pause</string>
</property>
</action>
<action name="actionStartAll">
<property name="text">
<string>R&amp;esume All</string>
</property>
</action>
<action name="actionPauseAll">
<property name="text">
<string>P&amp;ause All</string>
</property>
</action>
<action name="actionDelete">
<property name="text">
<string>&amp;Delete</string>
@ -334,16 +346,6 @@
<string>If you like qBittorrent, please donate!</string>
</property>
</action>
<action name="actionStartAll">
<property name="text">
<string>R&amp;esume All</string>
</property>
</action>
<action name="actionPauseAll">
<property name="text">
<string>P&amp;ause All</string>
</property>
</action>
<action name="actionAutoExit">
<property name="checkable">
<bool>true</bool>