From 41b8e6a4fba2c856e7c16f379f41478503357e4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marta=20Marczykowska-G=C3=B3recka?=
 <marta.maria.gorecka@gmail.com>
Date: Mon, 8 Jan 2018 03:01:02 +0100
Subject: [PATCH] Replaced 'VM' with 'Qube'

Renamed 'VM' to 'Qube' in the user interface for Qube Manager.
---
 qubesmanager/qube_manager.py | 80 ++++++++++++++++++------------------
 ui/qubemanager.ui            | 75 ++++++++++++++++++---------------
 2 files changed, 83 insertions(+), 72 deletions(-)

diff --git a/qubesmanager/qube_manager.py b/qubesmanager/qube_manager.py
index fe73b84..cfa0127 100755
--- a/qubesmanager/qube_manager.py
+++ b/qubesmanager/qube_manager.py
@@ -184,9 +184,9 @@ class VmShutdownMonitor(QtCore.QObject):
                 and vm_start_time < self.shutdown_started:
             if self.timeout_reached():
                 reply = QtGui.QMessageBox.question(
-                    None, self.tr("VM Shutdown"),
+                    None, self.tr("Qube Shutdown"),
                     self.tr(
-                        "The VM <b>'{0}'</b> hasn't shutdown within the last "
+                        "The Qube <b>'{0}'</b> hasn't shutdown within the last "
                         "{1} seconds, do you want to kill it?<br>").format(
                         vm.name, self.shutdown_time / 1000),
                     self.tr("Kill it!"),
@@ -602,20 +602,20 @@ class VmManagerWindow(ui_qubemanager.Ui_VmManagerWindow, QtGui.QMainWindow):
             if dependent_vms > 0:
                 QtGui.QMessageBox.warning(
                     None, self.tr("Warning!"),
-                    self.tr("This Template VM cannot be removed, "
-                            "because there is at least one AppVM that is based "
+                    self.tr("This Template Qube cannot be removed, "
+                            "because there is at least one Qube that is based "
                             "on it.<br><small>If you want to remove this "
-                            "Template VM and all the AppVMs based on it, you "
-                            "should first remove each individual AppVM that "
+                            "Template Qube and all the Qubes based on it, you "
+                            "should first remove each individual Qube that "
                             "uses this template.</small>"))
                 return
 
         (requested_name, ok) = QtGui.QInputDialog.getText(
-            None, self.tr("VM Removal Confirmation"),
-            self.tr("Are you sure you want to remove the VM <b>'{0}'</b>?<br> "
-                    "All data on this VM's private storage will be lost!"
-                    "<br><br>Type the name of the VM (<b>{1}</b>) below to "
-                    "confirm:").format(vm.name, vm.name))
+            None, self.tr("Qube Removal Confirmation"),
+            self.tr("Are you sure you want to remove the Qube <b>'{0}'</b>"
+                    "?<br> All data on this Qube's private storage will be "
+                    "lost!<br><br>Type the name of the Qube (<b>{1}</b>) below "
+                    "to confirm:").format(vm.name, vm.name))
 
         if not ok:
             # user clicked cancel
@@ -625,7 +625,7 @@ class VmManagerWindow(ui_qubemanager.Ui_VmManagerWindow, QtGui.QMainWindow):
             # name did not match
             QtGui.QMessageBox.warning(
                 None,
-                self.tr("VM removal confirmation failed"),
+                self.tr("Qube removal confirmation failed"),
                 self.tr(
                     "Entered name did not match! Not removing "
                     "{0}.").format(vm.name))
@@ -640,7 +640,8 @@ class VmManagerWindow(ui_qubemanager.Ui_VmManagerWindow, QtGui.QMainWindow):
             thread.start()
 
             progress = QtGui.QProgressDialog(
-                self.tr("Removing VM: <b>{0}</b>...").format(vm.name), "", 0, 0)
+                self.tr(
+                    "Removing Qube: <b>{0}</b>...").format(vm.name), "", 0, 0)
             progress.setCancelButton(None)
             progress.setModal(True)
             progress.show()
@@ -654,7 +655,7 @@ class VmManagerWindow(ui_qubemanager.Ui_VmManagerWindow, QtGui.QMainWindow):
             if t_monitor.success:
                 pass
             else:
-                QtGui.QMessageBox.warning(None, self.tr("Error removing VM!"),
+                QtGui.QMessageBox.warning(None, self.tr("Error removing Qube!"),
                                           self.tr("ERROR: {0}").format(
                                               t_monitor.error_msg))
 
@@ -680,8 +681,8 @@ class VmManagerWindow(ui_qubemanager.Ui_VmManagerWindow, QtGui.QMainWindow):
             name_number += 1
 
         (clone_name, ok) = QtGui.QInputDialog.getText(
-            self, self.tr('Qubes clone VM'),
-            self.tr('Enter name for VM <b>{}</b> clone:').format(vm.name),
+            self, self.tr('Qubes clone Qube'),
+            self.tr('Enter name for Qube <b>{}</b> clone:').format(vm.name),
             text=(name_format % name_number))
         if not ok or clone_name == "":
             return
@@ -694,7 +695,7 @@ class VmManagerWindow(ui_qubemanager.Ui_VmManagerWindow, QtGui.QMainWindow):
         thread.start()
 
         progress = QtGui.QProgressDialog(
-            self.tr("Cloning VM <b>{0}</b> to <b>{1}</b>...").format(
+            self.tr("Cloning Qube <b>{0}</b> to <b>{1}</b>...").format(
                 vm.name, clone_name), "", 0, 0)
         progress.setCancelButton(None)
         progress.setModal(True)
@@ -709,7 +710,7 @@ class VmManagerWindow(ui_qubemanager.Ui_VmManagerWindow, QtGui.QMainWindow):
         if not t_monitor.success:
             QtGui.QMessageBox.warning(
                 None,
-                self.tr("Error while cloning VM"),
+                self.tr("Error while cloning Qube"),
                 self.tr("Exception while cloning:<br>{0}").format(
                     t_monitor.error_msg))
 
@@ -735,8 +736,9 @@ class VmManagerWindow(ui_qubemanager.Ui_VmManagerWindow, QtGui.QMainWindow):
             try:
                 vm.unpause()
             except Exception as ex:
-                QtGui.QMessageBox.warning(None, self.tr("Error unpausing VM!"),
-                                          self.tr("ERROR: {0}").format(ex))
+                QtGui.QMessageBox.warning(
+                    None, self.tr("Error unpausing Qube!"),
+                    self.tr("ERROR: {0}").format(ex))
             return
 
         self.start_vm(vm)
@@ -758,7 +760,7 @@ class VmManagerWindow(ui_qubemanager.Ui_VmManagerWindow, QtGui.QMainWindow):
         if not t_monitor.success:
             self.set_error(
                 vm.qid,
-                self.tr("Error starting VM: %s") % t_monitor.error_msg)
+                self.tr("Error starting Qube: %s") % t_monitor.error_msg)
 
         self.update_table()
 
@@ -789,7 +791,7 @@ class VmManagerWindow(ui_qubemanager.Ui_VmManagerWindow, QtGui.QMainWindow):
         except Exception as ex:
             QtGui.QMessageBox.warning(
                 None,
-                self.tr("Error pausing VM!"),
+                self.tr("Error pausing Qube!"),
                 self.tr("ERROR: {0}").format(ex))
             return
 
@@ -800,10 +802,10 @@ class VmManagerWindow(ui_qubemanager.Ui_VmManagerWindow, QtGui.QMainWindow):
         assert vm.is_running()
 
         reply = QtGui.QMessageBox.question(
-            None, self.tr("VM Shutdown Confirmation"),
-            self.tr("Are you sure you want to power down the VM"
+            None, self.tr("Qube Shutdown Confirmation"),
+            self.tr("Are you sure you want to power down the Qube"
                     " <b>'{0}'</b>?<br><small>This will shutdown all the "
-                    "running applications within this VM.</small>").format(
+                    "running applications within this Qube.</small>").format(
                 vm.name), QtGui.QMessageBox.Yes | QtGui.QMessageBox.Cancel)
 
         self.qt_app.processEvents()
@@ -820,7 +822,7 @@ class VmManagerWindow(ui_qubemanager.Ui_VmManagerWindow, QtGui.QMainWindow):
         except Exception as ex:
             QtGui.QMessageBox.warning(
                 None,
-                self.tr("Error shutting down VM!"),
+                self.tr("Error shutting down Qube!"),
                 self.tr("ERROR: {0}").format(ex))
             return
 
@@ -838,10 +840,10 @@ class VmManagerWindow(ui_qubemanager.Ui_VmManagerWindow, QtGui.QMainWindow):
         assert vm.is_running()
 
         reply = QtGui.QMessageBox.question(
-            None, self.tr("VM Restart Confirmation"),
-            self.tr("Are you sure you want to restart the VM <b>'{0}'</b>?<br>"
-                    "<small>This will shutdown all the running applications "
-                    "within this VM.</small>").format(vm.name),
+            None, self.tr("Qube Restart Confirmation"),
+            self.tr("Are you sure you want to restart the Qube <b>'{0}'</b>?"
+                    "<br><small>This will shutdown all the running "
+                    "applications within this Qube.</small>").format(vm.name),
             QtGui.QMessageBox.Yes | QtGui.QMessageBox.Cancel)
 
         self.qt_app.processEvents()
@@ -858,10 +860,10 @@ class VmManagerWindow(ui_qubemanager.Ui_VmManagerWindow, QtGui.QMainWindow):
         assert vm.is_running() or vm.is_paused()
 
         reply = QtGui.QMessageBox.question(
-            None, self.tr("VM Kill Confirmation"),
-            self.tr("Are you sure you want to kill the VM <b>'{0}'</b>?<br>"
+            None, self.tr("Qube Kill Confirmation"),
+            self.tr("Are you sure you want to kill the Qube <b>'{0}'</b>?<br>"
                     "<small>This will end <b>(not shutdown!)</b> all the "
-                    "running applications within this VM.</small>").format(
+                    "running applications within this Qube.</small>").format(
                 vm.name),
             QtGui.QMessageBox.Yes | QtGui.QMessageBox.Cancel,
             QtGui.QMessageBox.Cancel)
@@ -873,7 +875,7 @@ class VmManagerWindow(ui_qubemanager.Ui_VmManagerWindow, QtGui.QMainWindow):
                 vm.force_shutdown()
             except Exception as ex:
                 QtGui.QMessageBox.critical(
-                    None, self.tr("Error while killing VM!"),
+                    None, self.tr("Error while killing Qube!"),
                     self.tr(
                         "<b>An exception ocurred while killing {0}.</b><br>"
                         "ERROR: {1}").format(vm.name, ex))
@@ -909,10 +911,10 @@ class VmManagerWindow(ui_qubemanager.Ui_VmManagerWindow, QtGui.QMainWindow):
 
         if not vm.is_running():
             reply = QtGui.QMessageBox.question(
-                None, self.tr("VM Update Confirmation"),
+                None, self.tr("Qube Update Confirmation"),
                 self.tr(
-                    "<b>{0}</b><br>The VM has to be running to be updated.<br>"
-                    "Do you want to start it?<br>").format(vm.name),
+                    "<b>{0}</b><br>The Qube has to be running to be updated."
+                    "<br>Do you want to start it?<br>").format(vm.name),
                 QtGui.QMessageBox.Yes | QtGui.QMessageBox.Cancel)
             if reply != QtGui.QMessageBox.Yes:
                 return
@@ -943,7 +945,7 @@ class VmManagerWindow(ui_qubemanager.Ui_VmManagerWindow, QtGui.QMainWindow):
             if not t_monitor.success:
                 QtGui.QMessageBox.warning(
                     None,
-                    self.tr("Error VM update!"),
+                    self.tr("Error on Qube update!"),
                     self.tr("ERROR: {0}").format(t_monitor.error_msg))
 
         self.update_table()
@@ -1204,7 +1206,7 @@ def main():
     qt_app = QtGui.QApplication(sys.argv)
     qt_app.setOrganizationName("The Qubes Project")
     qt_app.setOrganizationDomain("http://qubes-os.org")
-    qt_app.setApplicationName("Qubes VM Manager")
+    qt_app.setApplicationName("Qube Manager")
     qt_app.setWindowIcon(QtGui.QIcon.fromTheme("qubes-manager"))
 
     sys.excepthook = handle_exception
diff --git a/ui/qubemanager.ui b/ui/qubemanager.ui
index 7107bf3..150dafb 100644
--- a/ui/qubemanager.ui
+++ b/ui/qubemanager.ui
@@ -20,7 +20,7 @@
    <enum>Qt::DefaultContextMenu</enum>
   </property>
   <property name="windowTitle">
-   <string>Qubes VM Manager</string>
+   <string>Qube Manager</string>
   </property>
   <property name="windowIcon">
    <iconset theme="qubes-manager">
@@ -284,7 +284,7 @@
    </widget>
    <widget class="QMenu" name="menu_vm">
     <property name="title">
-     <string>V&amp;M</string>
+     <string>&amp;Qube</string>
     </property>
     <widget class="QMenu" name="logs_menu">
      <property name="title">
@@ -380,10 +380,10 @@
      <normaloff>:/createvm.png</normaloff>:/createvm.png</iconset>
    </property>
    <property name="text">
-    <string>Create &amp;New VM</string>
+    <string>Create &amp;New Qube</string>
    </property>
    <property name="toolTip">
-    <string>Create a new VM</string>
+    <string>Create a new Qube</string>
    </property>
   </action>
   <action name="action_removevm">
@@ -395,10 +395,10 @@
      <normaloff>:/removevm.png</normaloff>:/removevm.png</iconset>
    </property>
    <property name="text">
-    <string>&amp;Delete VM</string>
+    <string>&amp;Delete Qube</string>
    </property>
    <property name="toolTip">
-    <string>Remove an existing VM (must be stopped first)</string>
+    <string>Remove an existing Qube (must be stopped first)</string>
    </property>
   </action>
   <action name="action_resumevm">
@@ -410,10 +410,10 @@
      <normaloff>:/resumevm.png</normaloff>:/resumevm.png</iconset>
    </property>
    <property name="text">
-    <string>Start/Resume V&amp;M</string>
+    <string>Start/Resu&amp;me Qube</string>
    </property>
    <property name="toolTip">
-    <string>Start/Resume selected VM</string>
+    <string>Start/Resume selected Qube</string>
    </property>
   </action>
   <action name="action_pausevm">
@@ -425,10 +425,10 @@
      <normaloff>:/pausevm.png</normaloff>:/pausevm.png</iconset>
    </property>
    <property name="text">
-    <string>&amp;Pause VM</string>
+    <string>&amp;Pause Qube</string>
    </property>
    <property name="toolTip">
-    <string>Pause selected VM</string>
+    <string>Pause selected Qube</string>
    </property>
   </action>
   <action name="action_shutdownvm">
@@ -440,10 +440,10 @@
      <normaloff>:/shutdownvm.png</normaloff>:/shutdownvm.png</iconset>
    </property>
    <property name="text">
-    <string>&amp;Shutdown VM</string>
+    <string>&amp;Shutdown Qube</string>
    </property>
    <property name="toolTip">
-    <string>Shutdown selected VM</string>
+    <string>Shutdown selected Qube</string>
    </property>
   </action>
   <action name="action_restartvm">
@@ -455,10 +455,10 @@
      <normaloff>:/restartvm.png</normaloff>:/restartvm.png</iconset>
    </property>
    <property name="text">
-    <string>Restar&amp;t VM</string>
+    <string>Restar&amp;t Qube</string>
    </property>
    <property name="toolTip">
-    <string>Restart selected VM</string>
+    <string>Restart selected Qube</string>
    </property>
   </action>
   <action name="action_appmenus">
@@ -473,7 +473,7 @@
     <string>Add/remove app s&amp;hortcuts</string>
    </property>
    <property name="toolTip">
-    <string>Add/remove app shortcuts for this VM</string>
+    <string>Add/remove app shortcuts for this Qube</string>
    </property>
   </action>
   <action name="action_updatevm">
@@ -485,10 +485,10 @@
      <normaloff>:/updateable.png</normaloff>:/updateable.png</iconset>
    </property>
    <property name="text">
-    <string>&amp;Update VM</string>
+    <string>&amp;Update Qube</string>
    </property>
    <property name="toolTip">
-    <string>Update VM system</string>
+    <string>Update Qube system</string>
    </property>
   </action>
   <action name="action_editfwrules">
@@ -497,10 +497,10 @@
      <normaloff>:/firewall.png</normaloff>:/firewall.png</iconset>
    </property>
    <property name="text">
-    <string>Edit VM &amp;firewall rules</string>
+    <string>Edit Qube &amp;firewall rules</string>
    </property>
    <property name="toolTip">
-    <string>Edit VM firewall rules</string>
+    <string>Edit Qube firewall rules</string>
    </property>
   </action>
   <action name="action_showgraphs">
@@ -556,10 +556,10 @@
      <normaloff>:/settings.png</normaloff>:/settings.png</iconset>
    </property>
    <property name="text">
-    <string>VM s&amp;ettings</string>
+    <string>Qube s&amp;ettings</string>
    </property>
    <property name="toolTip">
-    <string>VM Settings</string>
+    <string>Qube Settings</string>
    </property>
   </action>
   <action name="action_restore">
@@ -568,7 +568,10 @@
      <normaloff>:/restore.png</normaloff>:/restore.png</iconset>
    </property>
    <property name="text">
-    <string>&amp;Restore VMs from backup</string>
+    <string>&amp;Restore Qubes from backup</string>
+   </property>
+   <property name="toolTip">
+    <string>Restore Qubes from backup</string>
    </property>
   </action>
   <action name="action_backup">
@@ -577,7 +580,10 @@
      <normaloff>:/backup.png</normaloff>:/backup.png</iconset>
    </property>
    <property name="text">
-    <string>&amp;Backup VMs</string>
+    <string>&amp;Backup Qubes</string>
+   </property>
+   <property name="toolTip">
+    <string>Backup Qubes</string>
    </property>
   </action>
   <action name="action_global_settings">
@@ -618,10 +624,10 @@
      <normaloff>:/killvm.png</normaloff>:/killvm.png</iconset>
    </property>
    <property name="text">
-    <string>&amp;Kill VM</string>
+    <string>&amp;Kill Qube</string>
    </property>
    <property name="toolTip">
-    <string>Kill selected VM</string>
+    <string>Kill selected Qube</string>
    </property>
   </action>
   <action name="action_set_keyboard_layout">
@@ -633,7 +639,7 @@
     <string>Set keyboard la&amp;yout</string>
    </property>
    <property name="toolTip">
-    <string>Set keyboard layout per VM</string>
+    <string>Set keyboard layout per Qube</string>
    </property>
   </action>
   <action name="action_vm_type">
@@ -647,7 +653,7 @@
     <string>T&amp;ype</string>
    </property>
    <property name="toolTip">
-    <string>VM Type</string>
+    <string>Qube Type</string>
    </property>
   </action>
   <action name="action_label">
@@ -724,10 +730,10 @@
      <normaloff>:/run-command.png</normaloff>:/run-command.png</iconset>
    </property>
    <property name="text">
-    <string>&amp;Run command in VM</string>
+    <string>&amp;Run command in Qube</string>
    </property>
    <property name="toolTip">
-    <string>Run command in the specified VM</string>
+    <string>Run command in the specified Qube</string>
    </property>
   </action>
   <action name="action_clonevm">
@@ -739,7 +745,10 @@
      <normaloff>:/templatevm.png</normaloff>:/templatevm.png</iconset>
    </property>
    <property name="text">
-    <string>&amp;Clone VM</string>
+    <string>&amp;Clone Qube</string>
+   </property>
+   <property name="toolTip">
+    <string>Clone Qube</string>
    </property>
   </action>
   <action name="action_internal">
@@ -753,7 +762,7 @@
     <string>Inte&amp;rnal</string>
    </property>
    <property name="toolTip">
-    <string>Is an internal VM</string>
+    <string>Is an internal Qube</string>
    </property>
   </action>
   <action name="action_startvm_tools_install">
@@ -765,10 +774,10 @@
      <normaloff>:/resumevm.png</normaloff>:/resumevm.png</iconset>
    </property>
    <property name="text">
-    <string>Start VM for Window Tools installation</string>
+    <string>Start Qube for Window Tools installation</string>
    </property>
    <property name="toolTip">
-    <string>Start VM for Window Tools installation</string>
+    <string>Start Qube for Window Tools installation</string>
    </property>
   </action>
   <action name="action_ip">