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

Merge remote-tracking branch 'origin/pr/223'

Browse Source 
* origin/pr/223:
  Fixed Apply behavior for VM Settings
This commit is contained in:
Marek Marczykowski-Górecki 2020-01-16 04:39:39 +01:00
commit 848277ae4b
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
qubesmanager/settings.py
View File

@ -270,6 +270,15 @@ class VMSettingsWindow(ui_settingsdlg.Ui_SettingsDialog, QtWidgets.QDialog):
def apply(self): def apply(self):
self.save_changes() self.save_changes()
# these signals must be disconnected to avoid unintended behavior
# on refreshing the drop-downs
self.netVM.currentIndexChanged.disconnect()
self.kernel.currentIndexChanged.disconnect()
self.default_dispvm.currentIndexChanged.disconnect()
self.__init_basic_tab__()
self.__init_advanced_tab__()
def save_and_apply(self): def save_and_apply(self):
self.save_changes() self.save_changes()
self.done(0) self.done(0)

5
qubesmanager/utils.py
View File

@ -45,6 +45,11 @@ def prepare_choice(widget, holder, propname, choice, default,
allow_none=False, transform=None): allow_none=False, transform=None):
# for newly created vms, set propname to None # for newly created vms, set propname to None
# clear the widget, so that prepare_choice functions can be used
# to refresh widget values
while widget.count() > 0:
widget.removeItem(0)
debug( debug(
'prepare_choice(widget={widget!r}, ' 'prepare_choice(widget={widget!r}, '
'holder={holder!r}, ' 'holder={holder!r}, '