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

List only compatible templates

Browse Source
This commit is contained in:
Marek Marczykowski-Górecki 2013-11-21 04:17:59 +01:00
parent 4a7f3caee9
commit 9c1e2f496c
2 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
qubesmanager/create_new_vm.py
View File

@ -29,6 +29,7 @@ from PyQt4.QtGui import *
from qubes.qubes import QubesVmCollection from qubes.qubes import QubesVmCollection
from qubes.qubes import QubesVmLabels from qubes.qubes import QubesVmLabels
from qubes.qubes import QubesException from qubes.qubes import QubesException
from qubes.qubes import QubesVm,QubesHVm
import qubesmanager.resources_rc import qubesmanager.resources_rc
@ -72,8 +73,25 @@ class NewVmDlg (QDialog, Ui_NewVMDlg):
self.vmlabel.insertItem(i, label.name) self.vmlabel.insertItem(i, label.name)
self.vmlabel.setItemIcon (i, QIcon(label.icon_path)) self.vmlabel.setItemIcon (i, QIcon(label.icon_path))
self.template_vm_list = [vm for vm in self.qvm_collection.values() if not vm.internal and vm.is_template()] self.fill_template_list()
self.vmname.setValidator(QRegExpValidator(QRegExp("[a-zA-Z0-9-]*", Qt.CaseInsensitive), None))
self.vmname.selectAll()
self.vmname.setFocus()
def fill_template_list(self):
def filter_template(vm):
if vm.internal:
return False
if not vm.is_template():
return False
if self.hvm_radio.isChecked():
return QubesHVm.is_template_compatible(vm)
else:
return QubesVm.is_template_compatible(vm)
self.template_vm_list = filter(filter_template, self.qvm_collection.values())
self.template_name.clear()
default_index = 0 default_index = 0
for (i, vm) in enumerate(self.template_vm_list): for (i, vm) in enumerate(self.template_vm_list):
if vm is self.qvm_collection.get_default_template(): if vm is self.qvm_collection.get_default_template():
@ -83,10 +101,6 @@ class NewVmDlg (QDialog, Ui_NewVMDlg):
self.template_name.insertItem(i, vm.name) self.template_name.insertItem(i, vm.name)
self.template_name.setCurrentIndex(default_index) self.template_name.setCurrentIndex(default_index)
self.vmname.setValidator(QRegExpValidator(QRegExp("[a-zA-Z0-9-]*", Qt.CaseInsensitive), None))
self.vmname.selectAll()
self.vmname.setFocus()
def on_appvm_radio_toggled(self, checked): def on_appvm_radio_toggled(self, checked):
if checked: if checked:
self.template_name.setEnabled(True) self.template_name.setEnabled(True)

6
qubesmanager/settings.py
View File

@ -230,7 +230,10 @@ class VMSettingsWindow(Ui_SettingsDialog, QDialog):
template_vm_list = [vm for vm in self.qvm_collection.values() if not vm.internal and vm.is_template()] template_vm_list = [vm for vm in self.qvm_collection.values() if not vm.internal and vm.is_template()]
self.template_idx = -1 self.template_idx = -1
for (i, vm) in enumerate(template_vm_list): i = 0
for vm in template_vm_list:
if not self.vm.is_template_compatible(vm):
continue
text = vm.name text = vm.name
if vm is self.qvm_collection.get_default_template(): if vm is self.qvm_collection.get_default_template():
text += " (default)" text += " (default)"
@ -238,6 +241,7 @@ class VMSettingsWindow(Ui_SettingsDialog, QDialog):
self.template_idx = i self.template_idx = i
text += " (current)" text += " (current)"
self.template_name.insertItem(i, text) self.template_name.insertItem(i, text)
i += 1
self.template_name.setCurrentIndex(self.template_idx) self.template_name.setCurrentIndex(self.template_idx)
else: else:
self.template_name.setEnabled(False) self.template_name.setEnabled(False)