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

settings: services

Browse Source
This commit is contained in:
Wojtek Porczyk 2017-07-12 14:52:05 +02:00
parent e78ede26f1
commit c32391a030
1 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
qubesmanager/settings.py
View File

@ -414,7 +414,7 @@ class VMSettingsWindow(Ui_SettingsDialog, QDialog):
self.include_in_balancing.setEnabled(not self.vm.hvm) self.include_in_balancing.setEnabled(not self.vm.hvm)
self.include_in_balancing.setChecked(not self.vm.hvm self.include_in_balancing.setChecked(not self.vm.hvm
and self.vm.features.get('services/meminfo-writer', True)) and self.vm.features.get('services.meminfo-writer', True))
self.max_mem_size.setEnabled(self.include_in_balancing.isChecked()) self.max_mem_size.setEnabled(self.include_in_balancing.isChecked())
try: try:
@ -666,23 +666,25 @@ class VMSettingsWindow(Ui_SettingsDialog, QDialog):
######## services tab ######## services tab
def __init_services_tab__(self): def __init_services_tab__(self):
for srv in self.vm.services: self.new_srv_dict = {}
item = QListWidgetItem(srv) for feature in self.vm.features:
if self.vm.services[srv] == True: if not feature.startswith('service.'):
item.setCheckState(QtCore.Qt.Checked) continue
else: service = feature[len('service.'):]
item.setCheckState(QtCore.Qt.Unchecked) item = QListWidgetItem(service)
item.setCheckState(QtCore.Qt.Checked
if self.vm.features[feature] else QtCore.Qt.Unchecked)
self.services_list.addItem(item) self.services_list.addItem(item)
self.new_srv_dict[service] = self.vm.features[feature]
self.connect(self.services_list, SIGNAL("itemClicked(QListWidgetItem *)"), self.services_item_clicked) self.connect(self.services_list, SIGNAL("itemClicked(QListWidgetItem *)"), self.services_item_clicked)
self.new_srv_dict = copy.copy(self.vm.services)
def __add_service__(self): def __add_service__(self):
srv = str(self.service_line_edit.text()).strip() srv = str(self.service_line_edit.text()).strip()
if srv != "": if srv != "":
if srv in self.new_srv_dict: if srv in self.new_srv_dict:
QMessageBox.information(None, "", QMessageBox.information(None, '',
self.tr("Service already on the list!")) self.tr('Service already on the list!'))
else: else:
item = QListWidgetItem(srv) item = QListWidgetItem(srv)
item.setCheckState(QtCore.Qt.Checked) item.setCheckState(QtCore.Qt.Checked)
@ -696,8 +698,8 @@ class VMSettingsWindow(Ui_SettingsDialog, QDialog):
return return
if str(item.text()) == 'meminfo-writer': if str(item.text()) == 'meminfo-writer':
QMessageBox.information(None, QMessageBox.information(None,
self.tr("Service can not be removed"), self.tr('Service can not be removed'),
self.tr("Service meminfo-writer can not be removed from the list.")) self.tr('Service meminfo-writer can not be removed from the list.'))
return return
row = self.services_list.currentRow() row = self.services_list.currentRow()
@ -719,21 +721,30 @@ class VMSettingsWindow(Ui_SettingsDialog, QDialog):
msg = [] msg = []
try: try:
for r in range (self.services_list.count()): for r in range(self.services_list.count()):
item = self.services_list.item(r) item = self.services_list.item(r)
self.new_srv_dict[str(item.text())] = (item.checkState() == QtCore.Qt.Checked) self.new_srv_dict[str(item.text())] = (item.checkState() == QtCore.Qt.Checked)
balancing_was_checked = (self.vm.services['meminfo-writer']==True) balancing_was_checked = self.vm.features.get('service.meminfo-writer', True)
balancing_is_checked = self.include_in_balancing.isChecked() balancing_is_checked = self.include_in_balancing.isChecked()
meminfo_writer_checked = (self.new_srv_dict['meminfo-writer'] == True) meminfo_writer_checked = self.new_srv_dict.get('meminfo-writer', True)
if balancing_is_checked != meminfo_writer_checked: if balancing_is_checked != meminfo_writer_checked:
if balancing_is_checked != balancing_was_checked: if balancing_is_checked != balancing_was_checked:
self.new_srv_dict['meminfo-writer'] = balancing_is_checked self.new_srv_dict['meminfo-writer'] = balancing_is_checked
if self.new_srv_dict != self.vm.services: for service, v in self.new_srv_dict.items():
self.vm.services = self.new_srv_dict feature = 'service.' + service
self.anything_changed = True if v != self.vm.features.get(feature, object()):
self.vm.features[feature] = v
self.anything_changed = True
for feature in self.vm.features:
if not feature.startswith('service.'):
continue
service = feature[len('service.'):]
if service not in self.new_srv_dict:
del self.vm.features[feature]
except Exception as ex: except Exception as ex:
msg.append(str(ex)) msg.append(str(ex))