diff --git a/globalsettingsdlg.ui b/globalsettingsdlg.ui
index 8718e50..3c195a7 100644
--- a/globalsettingsdlg.ui
+++ b/globalsettingsdlg.ui
@@ -17,7 +17,7 @@
-
- false
+ true
System defaults
@@ -37,7 +37,7 @@
-
-
+
-
@@ -47,7 +47,7 @@
-
-
+
-
@@ -57,7 +57,7 @@
-
-
+
-
@@ -73,7 +73,7 @@
-
-
+
@@ -81,81 +81,78 @@
-
- false
+ true
Default memory settings
-
-
-
- 11
- 26
- 134
- 16
-
-
-
- Minimal VM's memory:
-
-
-
-
-
- 11
- 57
- 139
- 16
-
-
-
- dom0 memory margin:
-
-
-
-
-
- 156
- 26
- 121
- 25
-
-
-
- MB
-
-
- 999999999
-
-
- 10
-
-
-
-
-
- 156
- 57
- 121
- 25
-
-
-
- MB
-
-
- 999999999
-
-
- 50
-
-
+
+
-
+
+
+ false
+
+
+ Minimal VM's memory:
+
+
+
+ -
+
+
+ false
+
+
+ MB
+
+
+ 999999999
+
+
+ 10
+
+
+
+ -
+
+
+ false
+
+
+ dom0 memory margin:
+
+
+
+ -
+
+
+ false
+
+
+ MB
+
+
+ 999999999
+
+
+ 50
+
+
+
+ -
+
+
+ Keep dispVM in memory
+
+
+
+
-
- false
+ true
Kernel
@@ -169,7 +166,7 @@
-
-
+
diff --git a/qubesmanager/global_settings.py b/qubesmanager/global_settings.py
index 340210b..f47c805 100644
--- a/qubesmanager/global_settings.py
+++ b/qubesmanager/global_settings.py
@@ -30,6 +30,7 @@ from qubes.qubes import QubesVmCollection
from qubes.qubes import QubesException
from qubes.qubes import QubesDaemonPidfile
from qubes.qubes import QubesHost
+from qubes.qubes import qubes_kernels_base_dir
import qubesmanager.resources_rc
@@ -42,18 +43,183 @@ from operator import itemgetter
from ui_globalsettingsdlg import *
+dont_keep_dvm_in_memory_path = '/var/lib/qubes/dvmdata/dont_use_shm'
+
+
class GlobalSettingsWindow(Ui_GlobalSettings, QDialog):
- def __init__(self, parent=None):
+ def __init__(self, app, qvm_collection, parent=None):
super(GlobalSettingsWindow, self).__init__(parent)
+ self.app = app
+ self.qvm_collection = qvm_collection
+
self.setupUi(self)
+
+ self.connect(self.buttonBox, SIGNAL("accepted()"), self.save_and_apply)
+ self.connect(self.buttonBox, SIGNAL("rejected()"), self.reject)
+
+ self.__init_system_defaults__()
+ self.__init_kernel_defaults__()
+ self.__init_mem_defaults__()
+
+
+ def __init_system_defaults__(self):
+ #updatevm and clockvm
+ all_vms = [vm for vm in self.qvm_collection.values() if not vm.internal]
+ self.updatevm_idx = -1
+
+ current_update_vm = self.qvm_collection.get_updatevm_vm()
+ for (i, vm) in enumerate(all_vms):
+ text = vm.name
+ if vm is current_update_vm:
+ self.updatevm_idx = i
+ text += " (current)"
+ self.update_vm_combo.insertItem(i, text)
+ self.update_vm_combo.insertItem(len(all_vms), "none")
+ if current_update_vm is None:
+ self.updatevm_idx = len(all_vms)
+ self.update_vm_combo.setCurrentIndex(self.updatevm_idx)
+
+ #clockvm
+ self.clockvm_idx = -1
+
+ current_clock_vm = self.qvm_collection.get_clockvm_vm()
+ for (i, vm) in enumerate(all_vms):
+ text = vm.name
+ if vm is current_clock_vm:
+ self.clockvm_idx = i
+ text += " (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
+ netvms = [vm for vm in all_vms if vm.is_netvm()]
+ self.netvm_idx = -1
+
+ current_netvm = self.qvm_collection.get_default_netvm()
+ for (i, vm) in enumerate(netvms):
+ text = vm.name
+ if vm is current_netvm:
+ self.netvm_idx = i
+ text += " (current)"
+ self.default_netvm_combo.insertItem(i, text)
+ if current_netvm is not None:
+ self.default_netvm_combo.setCurrentIndex(self.netvm_idx)
+
+ #default template
+ templates = [vm for vm in all_vms if vm.is_template()]
+ self.template_idx = -1
+
+ current_template = self.qvm_collection.get_default_template()
+ for (i, vm) in enumerate(templates):
+ text = vm.name
+ if vm is current_template:
+ self.template_idx = i
+ text += " (current)"
+ self.default_template_combo.insertItem(i, text)
+ if current_template is not None:
+ self.default_template_combo.setCurrentIndex(self.template_idx)
+
+ def __apply_system_defaults__(self):
+ #upatevm
+ if self.update_vm_combo.currentIndex() != self.updatevm_idx:
+ updatevm_name = self.update_vm_combo.currentText()
+ updatevm_name = updatevm_name.split(' ')[0]
+ updatevm = self.qvm_collection.get_vm_by_name(updatevm_name)
+
+ self.qvm_collection.set_updatevm_vm(updatevm)
+ self.anything_changed = True
+
+ #clockvm
+ if self.clock_vm_combo.currentIndex() != self.clockvm_idx:
+ clockvm_name = self.clock_vm_combo.currentText()
+ clockvm_name = clockvm_name.split(' ')[0]
+ clockvm = self.qvm_collection.get_vm_by_name(clockvm_name)
+
+ self.qvm_collection.set_clockvm_vm(clockvm)
+ self.anything_changed = True
+
+ #default netvm
+ if self.default_netvm_combo.currentIndex() != self.netvm_idx:
+ name = self.default_netvm_combo.currentText()
+ name = name.split(' ')[0]
+ vm = self.qvm_collection.get_vm_by_name(name)
+
+ self.qvm_collection.set_default_netvm(vm)
+ self.anything_changed = True
+
+ #default template
+ if self.default_template_combo.currentIndex() != self.template_idx:
+ name = self.default_template_combo.currentText()
+ name = name.split(' ')[0]
+ vm = self.qvm_collection.get_vm_by_name(name)
+
+ self.qvm_collection.set_default_template(vm)
+ self.anything_changed = True
+
+
+ def __init_kernel_defaults__(self):
+ kernel_list = []
+ for k in os.listdir(qubes_kernels_base_dir):
+ kernel_list.append(k)
+
+ self.kernel_idx = 0
+
+ for (i, k) in enumerate(kernel_list):
+ text = k
+ if k == self.qvm_collection.get_default_kernel():
+ text += " (current)"
+ self.kernel_idx = i
+ self.default_kernel_combo.insertItem(i,text)
+ self.default_kernel_combo.setCurrentIndex(self.kernel_idx)
+
+ def __apply_kernel_defaults__(self):
+ if self.default_kernel_combo.currentIndex() != self.kernel_idx:
+ kernel = self.default_kernel_combo.currentText()
+ kernel = kernel.split(' ')[0]
+
+ self.qvm_collection.set_default_kernel(kernel)
+ self.anything_changed = True
+
+
+ def __init_mem_defaults__(self):
+
+ #keep dispvm in memory
+ exists = os.path.exists(dont_keep_dvm_in_memory_path)
+ self.dispvm_in_memory.setChecked( not exists)
+
+
+ def __apply_mem_defaults__(self):
+
+ #keep dispvm in memory
+ was_checked = not os.path.exists(dont_keep_dvm_in_memory_path)
+ if was_checked != self.dispvm_in_memory.isChecked():
+ if was_checked:
+ #touch file
+ open(dont_keep_dvm_in_memory_path, 'w').close()
+ else:
+ #rm file
+ os.remove(dont_keep_dvm_in_memory_path)
+ self.anything_changed = True
def reject(self):
self.done(0)
def save_and_apply(self):
- pass
+ self.qvm_collection.lock_db_for_writing()
+
+ self.anything_changed = False
+ self.__apply_system_defaults__()
+ self.__apply_kernel_defaults__()
+ self.__apply_mem_defaults__()
+
+ if self.anything_changed == True:
+ self.qvm_collection.save()
+ self.qvm_collection.unlock_db()
# Bases on the original code by:
# Copyright (c) 2002-2007 Pascal Varet
diff --git a/qubesmanager/main.py b/qubesmanager/main.py
index 36b711c..9778907 100755
--- a/qubesmanager/main.py
+++ b/qubesmanager/main.py
@@ -1119,7 +1119,7 @@ class VmManagerWindow(Ui_VmManagerWindow, QMainWindow):
@pyqtSlot(name='on_action_global_settings_triggered')
def action_global_settings_triggered(self):
- global_settings_window = GlobalSettingsWindow()
+ global_settings_window = GlobalSettingsWindow(app, self.qvm_collection)
global_settings_window.exec_()