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

Merge branch 'master' of git://git.qubes-os.org/marmarek/qubes-manager

Browse Source
This commit is contained in:
Joanna Rutkowska 2012-08-23 11:34:25 +02:00
commit 643bb93aeb
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
qubesmanager/create_new_vm.py
View File

@ -56,7 +56,7 @@ class NewVmDlg (QDialog, Ui_NewVMDlg):
# Instead we lock for writing in the actual worker thread # Instead we lock for writing in the actual worker thread
try: try:
from qubes.qubes import QubesHVM from qubes.qubes import QubesHVm
except ImportError: except ImportError:
pass pass
else: else:
@ -83,6 +83,7 @@ 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.selectAll()
self.vmname.setFocus() self.vmname.setFocus()

1
qubesmanager/settings.py
View File

@ -189,6 +189,7 @@ class VMSettingsWindow(Ui_SettingsDialog, QDialog):
def __init_basic_tab__(self): def __init_basic_tab__(self):
self.vmname.setText(self.vm.name) self.vmname.setText(self.vm.name)
self.vmname.setValidator(QRegExpValidator(QRegExp("[a-zA-Z0-9-]*", Qt.CaseInsensitive), None))
#self.qvm_collection.lock_db_for_reading() #self.qvm_collection.lock_db_for_reading()
#self.qvm_collection.load() #self.qvm_collection.load()