From aa807c9f5356aa7ff2c8392934ae10eaebe09525 Mon Sep 17 00:00:00 2001 From: sniperbeamer Date: Sun, 3 Jan 2010 18:07:29 +0000 Subject: [PATCH] Add Cmd-M shortcut on Mac OS to minimize window (Bug: #2827152) git-svn-id: https://svn.code.sf.net/p/keepassx/code/trunk@355 b624d157-de02-0410-bad0-e51aec6abb33 --- src/forms/MainWindow.ui | 5 +++++ src/mainwindow.cpp | 9 +++++++++ 2 files changed, 14 insertions(+) diff --git a/src/forms/MainWindow.ui b/src/forms/MainWindow.ui index 0929484..891aac2 100644 --- a/src/forms/MainWindow.ui +++ b/src/forms/MainWindow.ui @@ -583,6 +583,11 @@ Sort groups + + + &Minimize Window + + diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index abe46b6..4b699e4 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -185,6 +185,9 @@ void KeepassMainWindow::setupConnections(){ connect(ViewToolButtonSize22Action,SIGNAL(toggled(bool)), this, SLOT(OnViewToolbarIconSize22(bool))); connect(ViewToolButtonSize28Action,SIGNAL(toggled(bool)), this, SLOT(OnViewToolbarIconSize28(bool))); connect(ViewShowStatusbarAction,SIGNAL(toggled(bool)),statusBar(),SLOT(setVisible(bool))); +#ifdef Q_WS_MAC + connect(ViewMinimizeAction, SIGNAL(triggered()), SLOT(showMinimized())); +#endif connect(ExtrasSettingsAction,SIGNAL(triggered(bool)),this,SLOT(OnExtrasSettings())); connect(ExtrasPasswordGenAction,SIGNAL(triggered(bool)),this,SLOT(OnExtrasPasswordGen())); @@ -322,6 +325,11 @@ void KeepassMainWindow::setupMenus(){ case 22: ViewToolButtonSize22Action->setChecked(true); break; case 28: ViewToolButtonSize28Action->setChecked(true); break; } + +#ifdef Q_WS_MAC + ViewMenu->addSeparator(); + ViewMenu->addAction(ViewMinimizeAction); +#endif SysTrayMenu = new QMenu(APP_DISPLAY_NAME,this); SysTrayMenu->addAction(FileUnLockWorkspaceAction); @@ -372,6 +380,7 @@ void KeepassMainWindow::setupMenus(){ #ifdef Q_WS_MAC FileSaveAsAction->setShortcut(tr("Shift+Ctrl+S")); EditGroupSearchAction->setShortcut(tr("Shift+Ctrl+F")); + ViewMinimizeAction->setShortcut(tr("Ctrl+M")); #endif //ExtrasTrashCanAction->setVisible(false); //TODO For KP 2.x only