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

De-uglify kernel selection in Global Settings

Browse Source 
Replaced kernel selection with utils.prepare_kernel; also added option
to utils.prepare_choice to treat empty string as None (applicable to
kernels).
This commit is contained in:
Marta Marczykowska-Górecka 2018-01-25 23:33:51 +01:00
parent 4882013a32
commit 0700275586
No known key found for this signature in database
GPG Key ID: 9A752C30B26FD04B
2 changed files with 8 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
qubesmanager/global_settings.py
View File

@ -108,31 +108,16 @@ class GlobalSettingsWindow(ui_globalsettingsdlg.Ui_GlobalSettings,
self.default_template_vmlist[ self.default_template_vmlist[
self.default_template_combo.currentIndex()] self.default_template_combo.currentIndex()]
def __init_kernel_defaults__(self): def __init_kernel_defaults__(self):
kernel_list = [] self.kernels_list, self.kernels_idx = utils.prepare_kernel_choice(
# TODO system_path["qubes_kernels_base_dir"] self.default_kernel_combo, self.qvm_collection, 'default_kernel',
# idea: qubes.pools['linux-kernel'].volumes None,
for k in os.listdir('/var/lib/qubes/vm-kernels'): allow_none=True
kernel_list.append(k) )
self.kernel_idx = 0
for (i, k) in enumerate(kernel_list):
text = k
if k == self.qvm_collection.default_kernel:
text += self.tr(" (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): def __apply_kernel_defaults__(self):
if self.default_kernel_combo.currentIndex() != self.kernel_idx: self.qvm_collection.default_kernel = \
kernel = str(self.default_kernel_combo.currentText()) self.kernels_list[self.default_kernel_combo.currentIndex()]
kernel = kernel.split(' ')[0]
self.qvm_collection.default_kernel = kernel
def __init_mem_defaults__(self): def __init_mem_defaults__(self):
#qmemman settings #qmemman settings

2
qubesmanager/utils.py
View File

@ -33,7 +33,7 @@ def _filter_internal(vm):
def prepare_choice(widget, holder, propname, choice, default, def prepare_choice(widget, holder, propname, choice, default,
filter_function=None, *, filter_function=None, *,
icon_getter=None, allow_internal=None, allow_default=False, icon_getter=None, allow_internal=None, allow_default=False,
allow_none=False, transform=None): allow_none=False, transform=None, empty_string_is_none=True):
# for newly created vms, set propname to None # for newly created vms, set propname to None