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

qubesmanager/create_new_vm.py

@@ -56,7 +56,7 @@ class NewVmDlg (QDialog, Ui_NewVMDlg):
         # Instead we lock for writing in the actual worker thread
 
         try:
-            from qubes.qubes import QubesHVM
+            from qubes.qubes import QubesHVm
         except ImportError:
             pass
         else: 
@@ -83,6 +83,7 @@ class NewVmDlg (QDialog, Ui_NewVMDlg):
                 self.template_name.insertItem(i, vm.name)
         self.template_name.setCurrentIndex(default_index)
 
+        self.vmname.setValidator(QRegExpValidator(QRegExp("[a-zA-Z0-9-]*", Qt.CaseInsensitive), None))
         self.vmname.selectAll()
         self.vmname.setFocus()
 

qubesmanager/settings.py

@@ -189,6 +189,7 @@ class VMSettingsWindow(Ui_SettingsDialog, QDialog):
 
     def __init_basic_tab__(self):
         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.load()