Cmd+M minimizes main window on Mac OS X (Closes #928216)

(cherry picked from commit dd7e515f9c)
This commit is contained in:
Christophe Dumez 2012-02-07 19:48:25 +02:00
parent 6dab35cb8e
commit 1b29b148d8
3 changed files with 17 additions and 1 deletions

View file

@ -196,6 +196,7 @@ MainWindow::MainWindow(QWidget *parent, QStringList torrentCmdLine) : QMainWindo
connect(actionIncreasePriority, SIGNAL(triggered()), transferList, SLOT(increasePrioSelectedTorrents()));
connect(actionDecreasePriority, SIGNAL(triggered()), transferList, SLOT(decreasePrioSelectedTorrents()));
connect(actionToggleVisibility, SIGNAL(triggered()), this, SLOT(toggleVisibility()));
connect(actionMinimize, SIGNAL(triggered()), SLOT(minimizeWindow()));
m_pwr = new PowerManagement(this);
preventTimer = new QTimer(this);
@ -549,6 +550,10 @@ void MainWindow::createKeyboardShortcuts() {
actionPause_All->setShortcut(QKeySequence(QString::fromUtf8("Ctrl+Shift+P")));
actionDecreasePriority->setShortcut(QKeySequence(QString::fromUtf8("Ctrl+-")));
actionIncreasePriority->setShortcut(QKeySequence(QString::fromUtf8("Ctrl++")));
#ifdef Q_WS_MAC
actionMinimize->setShortcut(QKeySequence(QString::fromUtf8("Ctrl+M")));
addAction(actionMinimize);
#endif
}
// Keyboard shortcuts slots
@ -1332,6 +1337,11 @@ void MainWindow::showConnectionSettings()
options->showConnectionTab();
}
void MainWindow::minimizeWindow()
{
setWindowState(windowState() ^ Qt::WindowMinimized);
}
void MainWindow::on_actionExecution_Logs_triggered(bool checked)
{
if(checked) {

View file

@ -110,6 +110,7 @@ protected slots:
bool unlockUI();
void notifyOfUpdate(QString);
void showConnectionSettings();
void minimizeWindow();
// Keyboard shortcuts
void createKeyboardShortcuts();
void displayTransferTab() const;

View file

@ -29,7 +29,7 @@
<x>0</x>
<y>0</y>
<width>914</width>
<height>25</height>
<height>22</height>
</rect>
</property>
<widget class="QMenu" name="menu_Edit">
@ -370,6 +370,11 @@
<string>Show</string>
</property>
</action>
<action name="actionMinimize">
<property name="text">
<string notr="true">Minimize</string>
</property>
</action>
</widget>
<resources>
<include location="icons.qrc"/>