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

ankiqt/ui/main.py

@@ -78,6 +78,9 @@ class AnkiQt(QMainWindow):
             ui.splash.update()
             self.setupErrorHandler()
             self.setupMisc()
+            # activate & raise is useful when run from the command line on osx
+            self.activateWindow()
+            self.raise_()
             self.loadPlugins()
             self.setupAutoUpdate()
             self.rebuildPluginsMenu()
@@ -2833,7 +2836,7 @@ Consider backing up your media directory first."""))
             self.setUnifiedTitleAndToolBarOnMac(True)
             self.mainWin.actionMarkCard.setShortcut(_("Alt+m"))
             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.connect(self.minimizeShortcut, SIGNAL("activated()"),
                          self.onMacMinimize)

designer/main.ui

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