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

Fixed error in setting Clockvm to None in Global Settings

Browse Source 
Replaced old, manual vm list with a nicer, less disgusting
utils.prepare_vm_choice approach.
This commit is contained in:
Marta Marczykowska-Górecka 2018-01-25 22:25:58 +01:00
parent c1e9074cb9
commit 29a56d9c88
No known key found for this signature in database
GPG Key ID: 9A752C30B26FD04B
1 changed files with 10 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
qubesmanager/global_settings.py
View File

@ -60,29 +60,20 @@ class GlobalSettingsWindow(ui_globalsettingsdlg.Ui_GlobalSettings,
self.__init_updates__() self.__init_updates__()
def __init_system_defaults__(self): def __init_system_defaults__(self):
# updatevm and clockvm
all_vms = [vm for vm in self.qvm_collection.domains all_vms = [vm for vm in self.qvm_collection.domains
if (not vm.features.get('internal', False)) and vm.qid != 0] if (not vm.features.get('internal', False)) and vm.qid != 0]
# set up updatevm choice
self.update_vm_vmlist, self.update_vm_vmidx = utils.prepare_vm_choice( self.update_vm_vmlist, self.update_vm_vmidx = utils.prepare_vm_choice(
self.update_vm_combo, self.qvm_collection, 'updatevm', self.update_vm_combo, self.qvm_collection, 'updatevm',
None, allow_none=True None, allow_none=True
) )
# clockvm # set up clockvm choice
self.clockvm_idx = -1 self.clock_vm_vmlist, self.clock_vm_vmidx = utils.prepare_vm_choice(
self.clock_vm_combo, self.qvm_collection, 'clockvm',
current_clock_vm = self.qvm_collection.clockvm None, allow_none=True
for (i, vm) in enumerate(all_vms): )
text = vm.name
if vm is current_clock_vm:
self.clockvm_idx = i
text += self.tr(" (current)")
self.clock_vm_combo.insertItem(i, text)
self.clock_vm_combo.insertItem(len(all_vms), "none")
if current_clock_vm is None:
self.clockvm_idx = len(all_vms)
self.clock_vm_combo.setCurrentIndex(self.clockvm_idx)
# default netvm # default netvm
netvms = [vm for vm in all_vms netvms = [vm for vm in all_vms
@ -114,17 +105,13 @@ class GlobalSettingsWindow(ui_globalsettingsdlg.Ui_GlobalSettings,
self.default_template_combo.setCurrentIndex(self.template_idx) self.default_template_combo.setCurrentIndex(self.template_idx)
def __apply_system_defaults__(self): def __apply_system_defaults__(self):
#upatevm # upatevm
self.qvm_collection.updatevm = \ self.qvm_collection.updatevm = \
self.update_vm_vmlist[self.update_vm_combo.currentIndex()] self.update_vm_vmlist[self.update_vm_combo.currentIndex()]
#clockvm # clockvm
if self.clock_vm_combo.currentIndex() != self.clockvm_idx: self.qvm_collection.clockvm = \
clockvm_name = str(self.clock_vm_combo.currentText()) self.clock_vm_vmlist[self.clock_vm_combo.currentIndex()]
clockvm_name = clockvm_name.split(' ')[0]
clockvm = self.qvm_collection.domains[clockvm_name]
self.qvm_collection.clockvm = clockvm
#default netvm #default netvm
if self.default_netvm_combo.currentIndex() != self.netvm_idx: if self.default_netvm_combo.currentIndex() != self.netvm_idx: