Qubes/manager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Minor changes as requested

Browse Source 
Minor changes as requested by @marmarek
This commit is contained in:
Marta Marczykowska-Górecka 2018-07-20 17:48:39 +02:00
parent 027abd8ac3
commit 5e52b16fd3
No known key found for this signature in database
GPG Key ID: 9A752C30B26FD04B
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qubesmanager/qube_manager.py
View File

@ -704,7 +704,7 @@ class VmManagerWindow(ui_qubemanager.Ui_VmManagerWindow, QtGui.QMainWindow):
self.tr("This qube cannot be removed. It is used as:" self.tr("This qube cannot be removed. It is used as:"
" <br> {} <small>If you want to remove this qube, " " <br> {} <small>If you want to remove this qube, "
"you should remove or change settings of each qube " "you should remove or change settings of each qube "
"or setting that uses it.</small>".format(list_text))) "or setting that uses it.</small>").format(list_text))
info_dialog.setModal(False) info_dialog.setModal(False)
info_dialog.show() info_dialog.show()
self.qt_app.processEvents() self.qt_app.processEvents()

12
qubesmanager/settings.py
View File

@ -495,7 +495,7 @@ class VMSettingsWindow(ui_settingsdlg.Ui_SettingsDialog, QtGui.QDialog):
else: else:
setattr(holder, prop, new_vm) setattr(holder, prop, new_vm)
except qubesadmin.exc.QubesException as qex: except qubesadmin.exc.QubesException as qex:
failed_props += (holder, prop) failed_props += [(holder, prop)]
if not failed_props: if not failed_props:
del self.vm.app.domains[self.vm.name] del self.vm.app.domains[self.vm.name]
@ -509,8 +509,8 @@ class VMSettingsWindow(ui_settingsdlg.Ui_SettingsDialog, QtGui.QDialog):
"name. The system has now both {} and {} qubes. " "name. The system has now both {} and {} qubes. "
"To resolve this, please check and change the " "To resolve this, please check and change the "
"following properties and remove the qube {} " "following properties and remove the qube {} "
"manually.<br> ".format( "manually.<br> ").format(
self.vm.name, name, self.vm.name) + list_text)) self.vm.name, name, self.vm.name) + list_text)
except qubesadmin.exc.QubesException as qex: except qubesadmin.exc.QubesException as qex:
t_monitor.set_error_msg(str(qex)) t_monitor.set_error_msg(str(qex))
@ -534,8 +534,8 @@ class VMSettingsWindow(ui_settingsdlg.Ui_SettingsDialog, QtGui.QDialog):
self.tr( self.tr(
"The following qubes using this qube as a template are " "The following qubes using this qube as a template are "
"running: <br> {}. <br> In order to rename this qube, you " "running: <br> {}. <br> In order to rename this qube, you "
"must first shut them down.".format( "must first shut them down.").format(
", ".join(running_dependencies)))) ", ".join(running_dependencies)))
return return
new_vm_name, ok = QtGui.QInputDialog.getText( new_vm_name, ok = QtGui.QInputDialog.getText(
@ -570,7 +570,7 @@ class VMSettingsWindow(ui_settingsdlg.Ui_SettingsDialog, QtGui.QDialog):
self.tr("This qube cannot be removed. It is used as:" self.tr("This qube cannot be removed. It is used as:"
" <br> {} <small>If you want to remove this qube, " " <br> {} <small>If you want to remove this qube, "
"you should remove or change settings of each qube " "you should remove or change settings of each qube "
"or setting that uses it.</small>".format(list_text))) "or setting that uses it.</small>").format(list_text))
return return