Merge remote-tracking branch 'qubesos/pr/75'

qubesmanager/qube_manager.py

@@ -1016,6 +1016,11 @@ class VmManagerWindow(ui_qubemanager.Ui_VmManagerWindow, QtGui.QMainWindow):
         backup_window = backup.BackupVMsWindow(self.qt_app, self.qubes_app)
         backup_window.exec_()
 
+    # noinspection PyArgumentList
+    @QtCore.pyqtSlot(name='on_action_exit_triggered')
+    def action_exit_triggered(self):
+        self.close()
+
     def showhide_menubar(self, checked):
         self.menubar.setVisible(checked)
         if not checked:

ui/qubemanager.ui

@@ -244,7 +244,7 @@
      <x>0</x>
      <y>0</y>
      <width>1100</width>
-     <height>23</height>
+     <height>46</height>
     </rect>
    </property>
    <property name="contextMenuPolicy">
@@ -258,6 +258,7 @@
     <addaction name="action_show_network"/>
     <addaction name="action_backup"/>
     <addaction name="action_restore"/>
+    <addaction name="action_exit"/>
    </widget>
    <widget class="QMenu" name="menu_view">
     <property name="title">
@@ -839,6 +840,11 @@
     <string>Refresh qube list</string>
    </property>
   </action>
+  <action name="action_exit">
+   <property name="text">
+    <string>&amp;Exit Qube Manager</string>
+   </property>
+  </action>
  </widget>
  <resources>
   <include location="../resources.qrc"/>