From 6a88f92fd0837de5e41e3627b4857cb0b4b42caa Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Sat, 19 Sep 2020 17:36:33 -0400 Subject: [PATCH] preferences: Unconditionally add VM sound devices This is another preference that was added before anyone ever asked for it. I'm fine with suggesting users remove the device manually if they don't want it Signed-off-by: Cole Robinson --- .../org.virt-manager.virt-manager.gschema.xml | 6 --- tests/uitests/test_prefs.py | 1 - ui/preferences.ui | 42 +++---------------- virtManager/config.py | 5 --- virtManager/createvm.py | 1 - virtManager/preferences.py | 7 ---- 6 files changed, 6 insertions(+), 56 deletions(-) diff --git a/data/org.virt-manager.virt-manager.gschema.xml b/data/org.virt-manager.virt-manager.gschema.xml index b662682d..81b2ee46 100644 --- a/data/org.virt-manager.virt-manager.gschema.xml +++ b/data/org.virt-manager.virt-manager.gschema.xml @@ -247,12 +247,6 @@ - - true - Install sound device for new Vms - Whether to install a sound device for new VMs - - 'system' Install selected graphics type for new VM diff --git a/tests/uitests/test_prefs.py b/tests/uitests/test_prefs.py index da6801b1..1e78b90b 100644 --- a/tests/uitests/test_prefs.py +++ b/tests/uitests/test_prefs.py @@ -40,7 +40,6 @@ def testPrefsAll(app): win.find("New VM", "page tab").click() tab = newvmtab tab.check_onscreen() - tab.find("Add sound device", "check box").click() tab.combo_select("CPU default:", "Copy host") tab.combo_select("Storage format:", "Raw") tab.combo_select("Graphics type", "VNC") diff --git a/ui/preferences.ui b/ui/preferences.ui index 3becf081..bfb25107 100644 --- a/ui/preferences.ui +++ b/ui/preferences.ui @@ -425,7 +425,7 @@ 0 - 1 + 0 @@ -440,7 +440,7 @@ 0 - 2 + 1 @@ -451,7 +451,7 @@ 1 - 1 + 0 @@ -463,37 +463,7 @@ 1 - 2 - - - - - True - True - False - start - True - True - True - - - - 1 - 0 - - - - - True - False - start - _Add sound device: - True - prefs-new-vm-sound - - - 0 - 0 + 1 @@ -510,7 +480,7 @@ identical CPUs in order to migrate the VM. 0 - 3 + 2 @@ -521,7 +491,7 @@ identical CPUs in order to migrate the VM. 1 - 3 + 2 diff --git a/virtManager/config.py b/virtManager/config.py index b78630d8..328ce1f9 100644 --- a/virtManager/config.py +++ b/virtManager/config.py @@ -501,11 +501,6 @@ class vmmConfig(object): self.conf.set("/details/show-toolbar", state) # New VM preferences - def get_new_vm_sound(self): - return self.conf.get("/new-vm/add-sound") - def set_new_vm_sound(self, state): - self.conf.set("/new-vm/add-sound", state) - def get_graphics_type(self, raw=False): ret = self.conf.get("/new-vm/graphics-type") if ret not in ["system", "vnc", "spice"]: diff --git a/virtManager/createvm.py b/virtManager/createvm.py index da0524dd..1d8d1dfb 100644 --- a/virtManager/createvm.py +++ b/virtManager/createvm.py @@ -1424,7 +1424,6 @@ class vmmCreateVM(vmmGObjectUI): gdata = _GuestData(self.conn.get_backend(), self._capsinfo) gdata.default_graphics_type = self.config.get_graphics_type() - gdata.skip_default_sound = not self.config.get_new_vm_sound() gdata.x86_cpu_default = self.config.get_default_cpu_setting() return gdata diff --git a/virtManager/preferences.py b/virtManager/preferences.py index c0d4cda5..39bdabc2 100644 --- a/virtManager/preferences.py +++ b/virtManager/preferences.py @@ -43,7 +43,6 @@ class vmmPreferences(vmmGObjectUI): self.refresh_console_resizeguest() self.refresh_console_autoredir() self.refresh_console_autoconnect() - self.refresh_new_vm_sound() self.refresh_graphics_type() self.refresh_storage_format() self.refresh_cpu_default() @@ -71,7 +70,6 @@ class vmmPreferences(vmmGObjectUI): "on_prefs_console_resizeguest_changed": self.change_console_resizeguest, "on_prefs_console_autoredir_changed": self.change_console_autoredir, "on_prefs_console_autoconnect_toggled": self.change_console_autoconnect, - "on_prefs_new_vm_sound_toggled": self.change_new_vm_sound, "on_prefs_graphics_type_changed": self.change_graphics_type, "on_prefs_storage_format_changed": self.change_storage_format, "on_prefs_cpu_default_changed": self.change_cpu_default, @@ -224,9 +222,6 @@ class vmmPreferences(vmmGObjectUI): val = self.config.get_console_autoconnect() self.widget("prefs-console-autoconnect").set_active(val) - def refresh_new_vm_sound(self): - self.widget("prefs-new-vm-sound").set_active( - self.config.get_new_vm_sound()) def refresh_graphics_type(self): combo = self.widget("prefs-graphics-type") gtype = self.config.get_graphics_type(raw=True) @@ -370,8 +365,6 @@ class vmmPreferences(vmmGObjectUI): def change_console_autoconnect(self, src): self.config.set_console_autoconnect(bool(src.get_active())) - def change_new_vm_sound(self, src): - self.config.set_new_vm_sound(src.get_active()) def change_graphics_type(self, src): val = uiutil.get_list_selection(src) self.config.set_graphics_type(val)