Renamed 'VM' to 'qube' everywhere in manager
At least I hope it's everywhere. Note: AppVM and NetVM nomenclature have been kept as before.
This commit is contained in:
Marta Marczykowska-Górecka
parent
80aa99b3af
commit
3a60f9146a
@ -153,8 +153,8 @@ class QubesBlockDevicesManager():
|
||||
serves_for.append((self.attached_devs[d]['dev'], self.attached_devs[d]['attached_to']['vm']))
|
||||
|
||||
if len(serves_for) > 0:
|
||||
msg = "VM <b>" + vm.name + "</b> attaches block devices to other VMs: "
|
||||
msg = "Qube <b>" + vm.name + "</b> attaches block devices to other qubes: "
|
||||
msg += ', '.join(["<b>"+v.name+"</b>("+d+")" for (d,v) in serves_for ])
|
||||
msg += ".<br><br> Shutting the VM down will dettach the devices from them."
|
||||
msg += ".<br><br> Shutting the qube down will dettach the devices from them."
|
||||
|
||||
QMessageBox.warning (None, "Warning!", msg)
|
||||
|
||||
@ -83,8 +83,8 @@ class NewVmDlg(QtGui.QDialog, Ui_NewVMDlg):
|
||||
# Order of types is important and used elsewhere; if it's changed
|
||||
# check for changes needed in self.type_change and TODO
|
||||
type_list = [self.tr("AppVM"),
|
||||
self.tr("Standalone VM based on a template"),
|
||||
self.tr("Standalone VM not based on a template")]
|
||||
self.tr("Standalone qube based on a template"),
|
||||
self.tr("Standalone qube not based on a template")]
|
||||
self.vm_type.addItems(type_list)
|
||||
|
||||
self.vm_type.currentIndexChanged.connect(self.type_change)
|
||||
|
||||
@ -250,11 +250,11 @@ class VMSettingsWindow(ui_settingsdlg.Ui_SettingsDialog, QtGui.QDialog):
|
||||
QtGui.QMessageBox.warning(
|
||||
None,
|
||||
self.tr("Qube configuration problem!"),
|
||||
self.tr("The '{vm}' AppVM is network connected to "
|
||||
self.tr("The '{vm}' qube is network connected to "
|
||||
"'{netvm}', which does not support firewall!<br/>"
|
||||
"You may edit the '{vm}' VM firewall rules, but these "
|
||||
"will not take any effect until you connect it to "
|
||||
"a working Firewall VM.").format(
|
||||
"You may edit the '{vm}' qube firewall rules, but "
|
||||
"these will not take any effect until you connect it "
|
||||
"to a working Firewall qube.").format(
|
||||
vm=self.vm.name, netvm=netvm.name))
|
||||
|
||||
def current_tab_changed(self, idx):
|
||||
@ -287,7 +287,7 @@ class VMSettingsWindow(ui_settingsdlg.Ui_SettingsDialog, QtGui.QDialog):
|
||||
|
||||
if self.vm.is_running():
|
||||
self.delete_vm_button.setText(
|
||||
self.tr('Delete VM (cannot delete a running VM)'))
|
||||
self.tr('Delete qube (cannot delete a running qube)'))
|
||||
|
||||
if self.vm.qid == 0:
|
||||
self.vmlabel.setVisible(False)
|
||||
@ -482,7 +482,7 @@ class VMSettingsWindow(ui_settingsdlg.Ui_SettingsDialog, QtGui.QDialog):
|
||||
|
||||
new_vm_name, ok = QtGui.QInputDialog.getText(
|
||||
self,
|
||||
self.tr('Rename VM'),
|
||||
self.tr('Rename qube'),
|
||||
self.tr('New name: (WARNING: all other changes will be discarded)'))
|
||||
|
||||
if ok:
|
||||
@ -504,11 +504,11 @@ class VMSettingsWindow(ui_settingsdlg.Ui_SettingsDialog, QtGui.QDialog):
|
||||
|
||||
answer, ok = QtGui.QInputDialog.getText(
|
||||
self,
|
||||
self.tr('Delete VM'),
|
||||
self.tr('Are you absolutely sure you want to delete this VM? '
|
||||
'<br/> All VM settings and data will be irrevocably'
|
||||
self.tr('Delete qube'),
|
||||
self.tr('Are you absolutely sure you want to delete this qube? '
|
||||
'<br/> All qube settings and data will be irrevocably'
|
||||
' deleted. <br/> If you are sure, please enter this '
|
||||
'VM\'s name below.'))
|
||||
'qube\'s name below.'))
|
||||
|
||||
if ok and answer == self.vm.name:
|
||||
self._run_in_thread(self._remove_vm)
|
||||
@ -518,7 +518,7 @@ class VMSettingsWindow(ui_settingsdlg.Ui_SettingsDialog, QtGui.QDialog):
|
||||
QtGui.QMessageBox.warning(
|
||||
None,
|
||||
self.tr("Removal cancelled"),
|
||||
self.tr("The VM will not be removed."))
|
||||
self.tr("The qube will not be removed."))
|
||||
|
||||
def _clone_vm(self, t_monitor, name):
|
||||
try:
|
||||
@ -535,15 +535,15 @@ class VMSettingsWindow(ui_settingsdlg.Ui_SettingsDialog, QtGui.QDialog):
|
||||
|
||||
cloned_vm_name, ok = QtGui.QInputDialog.getText(
|
||||
self,
|
||||
self.tr('Clone VM'),
|
||||
self.tr('Name for the cloned VM:'))
|
||||
self.tr('Clone qube'),
|
||||
self.tr('Name for the cloned qube:'))
|
||||
|
||||
if ok:
|
||||
self._run_in_thread(self._clone_vm, cloned_vm_name)
|
||||
QtGui.QMessageBox.warning(
|
||||
None,
|
||||
self.tr("Success"),
|
||||
self.tr("The VM was cloned successfully."))
|
||||
self.tr("The qube was cloned successfully."))
|
||||
|
||||
######### advanced tab
|
||||
|
||||
@ -1120,7 +1120,7 @@ def main(args=None):
|
||||
qapp = QtGui.QApplication(sys.argv)
|
||||
qapp.setOrganizationName('Invisible Things Lab')
|
||||
qapp.setOrganizationDomain("https://www.qubes-os.org/")
|
||||
qapp.setApplicationName("Qubes VM Settings")
|
||||
qapp.setApplicationName("Qube Settings")
|
||||
|
||||
if not utils.is_debug():
|
||||
sys.excepthook = handle_exception
|
||||
|
||||
@ -404,17 +404,17 @@ class VmUpdateInfoWidget(QtGui.QWidget):
|
||||
icon_path = ":/update-recommended.png"
|
||||
tooltip_text = self.tr("Updates pending!")
|
||||
elif state == "outdated":
|
||||
label_text = "<font color=\"red\">VM outdated</font>"
|
||||
label_text = "<font color=\"red\">Qube outdated</font>"
|
||||
icon_path = ":/outdated.png"
|
||||
tooltip_text = self.tr(
|
||||
"The VM must be restarted for its filesystem to reflect the "
|
||||
"The qube must be restarted for its filesystem to reflect the "
|
||||
"template's recent committed changes.")
|
||||
elif state == "to-be-outdated":
|
||||
label_text = "<font color=\"#800000\">TemplateVM running</font>"
|
||||
label_text = "<font color=\"#800000\">Template running</font>"
|
||||
icon_path = ":/to-be-outdated.png"
|
||||
tooltip_text = self.tr(
|
||||
"The TemplateVM must be stopped before changes from its "
|
||||
"current session can be picked up by this VM.")
|
||||
"The Template must be stopped before changes from its "
|
||||
"current session can be picked up by this qube.")
|
||||
else:
|
||||
label_text = ""
|
||||
icon_path = None
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>Qubes Backup VMs</string>
|
||||
<string>Qubes OS - Backup qubes</string>
|
||||
</property>
|
||||
<property name="locale">
|
||||
<locale language="English" country="UnitedStates"/>
|
||||
@ -26,7 +26,7 @@
|
||||
<item row="0" column="0">
|
||||
<widget class="QLabel" name="label_4">
|
||||
<property name="text">
|
||||
<string>Select VMs to backup:</string>
|
||||
<string>Select qubes to backup:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
@ -173,14 +173,14 @@
|
||||
<item row="1" column="0">
|
||||
<widget class="QLabel" name="label_5">
|
||||
<property name="text">
|
||||
<string>Target AppVM:</string>
|
||||
<string>Target qube:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="0">
|
||||
<widget class="QLabel" name="label_2">
|
||||
<property name="text">
|
||||
<string>Backup directory or VM command:</string>
|
||||
<string>Backup directory or command:</string>
|
||||
</property>
|
||||
<property name="wordWrap">
|
||||
<bool>true</bool>
|
||||
@ -286,7 +286,7 @@
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>NOTE: Only running VMs are listed.</string>
|
||||
<string>NOTE: Only running qubes are listed.</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
@ -316,7 +316,7 @@
|
||||
<string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
|
||||
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
|
||||
p, li { white-space: pre-wrap; }
|
||||
</style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;">
|
||||
</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;">
|
||||
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;"><br /></p></body></html></string>
|
||||
</property>
|
||||
</widget>
|
||||
|
||||
@ -115,7 +115,7 @@
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Minimal VM's memory:</string>
|
||||
<string>Minimal qube memory:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
@ -211,7 +211,7 @@
|
||||
<string>Unknown current state</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Check for VM updates</string>
|
||||
<string>Check for qube updates</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
||||
@ -121,7 +121,7 @@
|
||||
<item row="0" column="1" colspan="2">
|
||||
<widget class="QLineEdit" name="name">
|
||||
<property name="text">
|
||||
<string>my-new-vm</string>
|
||||
<string>my-new-qube</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
||||
@ -182,7 +182,7 @@
|
||||
<string>Name</string>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>VM name</string>
|
||||
<string>Qube name</string>
|
||||
</property>
|
||||
</column>
|
||||
<column>
|
||||
@ -198,7 +198,7 @@
|
||||
<string>Template</string>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>VM's template</string>
|
||||
<string>Qube template</string>
|
||||
</property>
|
||||
</column>
|
||||
<column>
|
||||
@ -206,7 +206,7 @@
|
||||
<string>NetVM</string>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>VM's netVM</string>
|
||||
<string>Qube netVM</string>
|
||||
</property>
|
||||
</column>
|
||||
<column>
|
||||
@ -244,7 +244,7 @@
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>769</width>
|
||||
<height>28</height>
|
||||
<height>23</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="contextMenuPolicy">
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>Qubes Restore VMs</string>
|
||||
<string>Qubes OS - Restore qubes</string>
|
||||
</property>
|
||||
<property name="locale">
|
||||
<locale language="English" country="UnitedStates"/>
|
||||
@ -129,7 +129,7 @@
|
||||
<item row="0" column="0">
|
||||
<widget class="QLabel" name="label_3">
|
||||
<property name="text">
|
||||
<string>AppVM:</string>
|
||||
<string>Qube:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
@ -183,7 +183,7 @@
|
||||
<item>
|
||||
<widget class="QGroupBox" name="select_vms_groupbox">
|
||||
<property name="title">
|
||||
<string>VMs to restore</string>
|
||||
<string>Qubes to restore</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="select_vms_layout"/>
|
||||
</widget>
|
||||
@ -214,7 +214,7 @@
|
||||
<string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
|
||||
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
|
||||
p, li { white-space: pre-wrap; }
|
||||
</style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;">
|
||||
</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;">
|
||||
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;"><br /></p></body></html></string>
|
||||
</property>
|
||||
</widget>
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>813</width>
|
||||
<width>904</width>
|
||||
<height>573</height>
|
||||
</rect>
|
||||
</property>
|
||||
@ -258,7 +258,7 @@
|
||||
<item row="4" column="0">
|
||||
<widget class="QLabel" name="label_5">
|
||||
<property name="text">
|
||||
<string><html><head/><body><p><span style=" color:#ff0000;">* </span><span style=" color:#000000;">Cannot be changed while the VM is running</span></p></body></html></string>
|
||||
<string><html><head/><body><p><span style=" color:#ff0000;">* </span><span style=" color:#000000;">Cannot be changed while the qube is running</span></p></body></html></string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
@ -357,7 +357,7 @@
|
||||
<item>
|
||||
<widget class="QCheckBox" name="autostart_vm">
|
||||
<property name="text">
|
||||
<string>Start VM automatically on boot</string>
|
||||
<string>Start qube automatically on boot</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
@ -382,14 +382,14 @@ border-style: solid;
|
||||
border-width: 1px;</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Delete VM</string>
|
||||
<string>Delete qube</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="5" column="1">
|
||||
<widget class="QPushButton" name="clone_vm_button">
|
||||
<property name="text">
|
||||
<string>Clone VM</string>
|
||||
<string>Clone qube</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
@ -1196,7 +1196,7 @@ border-width: 1px;</string>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>To modify PCI devices you have to turn off the VM.</string>
|
||||
<string>To modify PCI devices you have to turn off the qube.</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
@ -1210,7 +1210,7 @@ border-width: 1px;</string>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Currently PVH VMs don't support PCI passthrough. Select another virtualization mode if you want to add PCI devices</string>
|
||||
<string>Currently PVH qubes don't support PCI passthrough. Select another virtualization mode if you want to add PCI devices</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user