make the close button an application shortcut, raise window for osx terminal

This commit is contained in:
Damien Elmes 2010-07-11 17:13:43 +09:00
parent a2713450a7
commit 75fb9a111e
2 changed files with 8 additions and 2 deletions

View file

@ -78,6 +78,9 @@ class AnkiQt(QMainWindow):
ui.splash.update() ui.splash.update()
self.setupErrorHandler() self.setupErrorHandler()
self.setupMisc() self.setupMisc()
# activate & raise is useful when run from the command line on osx
self.activateWindow()
self.raise_()
self.loadPlugins() self.loadPlugins()
self.setupAutoUpdate() self.setupAutoUpdate()
self.rebuildPluginsMenu() self.rebuildPluginsMenu()
@ -2833,7 +2836,7 @@ Consider backing up your media directory first."""))
self.setUnifiedTitleAndToolBarOnMac(True) self.setUnifiedTitleAndToolBarOnMac(True)
self.mainWin.actionMarkCard.setShortcut(_("Alt+m")) self.mainWin.actionMarkCard.setShortcut(_("Alt+m"))
self.mainWin.verticalLayout_14.setContentsMargins(2,2,2,2) self.mainWin.verticalLayout_14.setContentsMargins(2,2,2,2)
# mac users expect a minimum option # mac users expect a minimize option
self.minimizeShortcut = QShortcut("Ctrl+m", self) self.minimizeShortcut = QShortcut("Ctrl+m", self)
self.connect(self.minimizeShortcut, SIGNAL("activated()"), self.connect(self.minimizeShortcut, SIGNAL("activated()"),
self.onMacMinimize) self.onMacMinimize)

View file

@ -2716,7 +2716,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>617</width> <width>617</width>
<height>26</height> <height>20</height>
</rect> </rect>
</property> </property>
<widget class="QMenu" name="menuHelp"> <widget class="QMenu" name="menuHelp">
@ -2941,6 +2941,9 @@
<property name="shortcut"> <property name="shortcut">
<string>Ctrl+W</string> <string>Ctrl+W</string>
</property> </property>
<property name="shortcutContext">
<enum>Qt::ApplicationShortcut</enum>
</property>
</action> </action>
<action name="actionSave"> <action name="actionSave">
<property name="icon"> <property name="icon">