mirror of
https://github.com/virt-manager/virt-manager.git
synced 2024-10-27 01:55:20 +03:00
prefs: Remove distinction between local and remote sound
Remote sound works fine these days. If people want to turn the preference off, they probably want to do it in all cases, and can 'customize before install' to alter the rest.
This commit is contained in:
Cole Robinson
parent
f84ccc0cf9
commit
2f09a3665c
@ -162,28 +162,21 @@
|
||||
</key>
|
||||
</schema>
|
||||
|
||||
<schema id="org.virt-manager.virt-manager.details" path="/org/virt-manager/virt-manager/details/">
|
||||
|
||||
<schema id="org.virt-manager.virt-manager.details"
|
||||
path="/org/virt-manager/virt-manager/details/">
|
||||
<key name="show-toolbar" type="b">
|
||||
<default>true</default>
|
||||
<summary>Whether to show VM button toolbar in Details display</summary>
|
||||
<description>Whether to show toolbar containing Virtual Machine action buttons (such as Run, Pause, Shutdown) in the details display</description>
|
||||
</key>
|
||||
|
||||
</schema>
|
||||
|
||||
<schema id="org.virt-manager.virt-manager.new-vm" path="/org/virt-manager/virt-manager/new-vm/">
|
||||
|
||||
<key name="local-sound" type="b">
|
||||
<schema id="org.virt-manager.virt-manager.new-vm"
|
||||
path="/org/virt-manager/virt-manager/new-vm/">
|
||||
<key name="add-sound" type="b">
|
||||
<default>true</default>
|
||||
<summary>Install sound device for local VM</summary>
|
||||
<description>Whether to install a sound device for local VMs or not</description>
|
||||
</key>
|
||||
|
||||
<key name="remote-sound" type="b">
|
||||
<default>false</default>
|
||||
<summary>Install sound device for remote VM</summary>
|
||||
<description>Whether to install a sound device for remote VMs or not</description>
|
||||
<summary>Install sound device for new Vms</summary>
|
||||
<description>Whether to install a sound device for new VMs</description>
|
||||
</key>
|
||||
|
||||
<key name="graphics-type" type="s">
|
||||
|
||||
@ -500,40 +500,6 @@
|
||||
<object class="GtkVBox" id="vbox4">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<child>
|
||||
<object class="GtkCheckButton" id="prefs-sound-local">
|
||||
<property name="label" translatable="yes">_Local virtual machine</property>
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="receives_default">False</property>
|
||||
<property name="use_underline">True</property>
|
||||
<property name="xalign">0.5</property>
|
||||
<property name="draw_indicator">True</property>
|
||||
<signal name="toggled" handler="on_prefs_sound_local_toggled" swapped="no"/>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">True</property>
|
||||
<property name="fill">True</property>
|
||||
<property name="position">0</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkCheckButton" id="prefs-sound-remote">
|
||||
<property name="label" translatable="yes">_Remote virtual machine</property>
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="receives_default">False</property>
|
||||
<property name="use_underline">True</property>
|
||||
<property name="xalign">0.5</property>
|
||||
<property name="draw_indicator">True</property>
|
||||
<signal name="toggled" handler="on_prefs_sound_remote_toggled" swapped="no"/>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">True</property>
|
||||
<property name="fill">True</property>
|
||||
<property name="position">1</property>
|
||||
</packing>
|
||||
</child>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
@ -542,20 +508,12 @@
|
||||
<property name="bottom_attach">2</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkLabel" id="label16">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="xalign">0</property>
|
||||
<property name="label" translatable="yes">Install Audio Device:</property>
|
||||
</object>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkLabel" id="label162">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="xalign">0</property>
|
||||
<property name="label" translatable="yes">Install Graphics:</property>
|
||||
<property name="label" translatable="yes">Graphics type:</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="top_attach">2</property>
|
||||
@ -617,6 +575,45 @@
|
||||
<property name="x_padding">5</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkBox" id="box1">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="spacing">6</property>
|
||||
<child>
|
||||
<object class="GtkLabel" id="label7">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="xalign">0</property>
|
||||
<property name="label" translatable="yes">Install _audio device:</property>
|
||||
<property name="use_underline">True</property>
|
||||
<property name="mnemonic_widget">prefs-new-vm-sound</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">True</property>
|
||||
<property name="position">0</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkCheckButton" id="prefs-new-vm-sound">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="receives_default">False</property>
|
||||
<property name="use_underline">True</property>
|
||||
<property name="use_stock">True</property>
|
||||
<property name="xalign">0</property>
|
||||
<property name="draw_indicator">True</property>
|
||||
<signal name="toggled" handler="on_prefs_new_vm_sound_toggled" swapped="no"/>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">True</property>
|
||||
<property name="position">1</property>
|
||||
</packing>
|
||||
</child>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
|
||||
@ -407,15 +407,10 @@ class vmmConfig(object):
|
||||
self.conf.set("/details/window_height", h)
|
||||
|
||||
# Create sound device for default guest
|
||||
def get_local_sound(self):
|
||||
return self.conf.get("/new-vm/local-sound")
|
||||
def get_remote_sound(self):
|
||||
return self.conf.get("/new-vm/remote-sound")
|
||||
|
||||
def set_local_sound(self, state):
|
||||
self.conf.set("/new-vm/local-sound", state)
|
||||
def set_remote_sound(self, state):
|
||||
self.conf.set("/new-vm/remote-sound", state)
|
||||
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):
|
||||
ret = self.conf.get("/new-vm/graphics-type")
|
||||
|
||||
@ -1044,11 +1044,6 @@ class vmmCreate(vmmGObjectUI):
|
||||
|
||||
return net_type, net_src, macaddr.strip()
|
||||
|
||||
def get_config_sound(self):
|
||||
if self.conn.is_remote():
|
||||
return self.config.get_remote_sound()
|
||||
return self.config.get_local_sound()
|
||||
|
||||
def get_config_graphics_type(self):
|
||||
return self.config.get_graphics_type()
|
||||
|
||||
@ -1442,7 +1437,8 @@ class vmmCreate(vmmGObjectUI):
|
||||
return virtinst.VirtualVideoDevice(conn=guest.conn)
|
||||
|
||||
def get_sound_device(self, guest):
|
||||
if not self.get_config_sound() or guest.installer.is_container():
|
||||
if (not self.config.get_new_vm_sound() or
|
||||
guest.installer.is_container()):
|
||||
return
|
||||
return virtinst.VirtualAudio(conn=guest.conn)
|
||||
|
||||
@ -1827,22 +1823,6 @@ class vmmCreate(vmmGObjectUI):
|
||||
|
||||
self.rebuild_guest()
|
||||
guest = self.guest
|
||||
disks = guest.get_devices("disk")
|
||||
disk = disks and disks[0]
|
||||
|
||||
logging.debug("Creating a VM %s" % guest.name +
|
||||
"\n Type: %s,%s" % (guest.type,
|
||||
guest.installer.os_type) +
|
||||
"\n UUID: %s" % guest.uuid +
|
||||
"\n Install Source: %s" % guest.location +
|
||||
"\n OS: %s:%s" % (guest.os_type, guest.os_variant) +
|
||||
"\n Kernel args: %s" % guest.extraargs +
|
||||
"\n Memory: %s" % guest.memory +
|
||||
"\n Max Memory: %s" % guest.maxmemory +
|
||||
"\n # VCPUs: %s" % str(guest.vcpus) +
|
||||
"\n Filesize: %s" % (disk and disk.size) or "None" +
|
||||
"\n Disk image: %s" % (disk and disk.path) or "None" +
|
||||
"\n Audio?: %s" % str(self.get_config_sound()))
|
||||
|
||||
# Start the install
|
||||
self.failed_guest = None
|
||||
|
||||
@ -39,8 +39,7 @@ class vmmPreferences(vmmGObjectUI):
|
||||
self.refresh_update_interval()
|
||||
self.refresh_console_accels()
|
||||
self.refresh_console_scaling()
|
||||
self.refresh_sound_local()
|
||||
self.refresh_sound_remote()
|
||||
self.refresh_new_vm_sound()
|
||||
self.refresh_graphics_type()
|
||||
self.refresh_storage_format()
|
||||
self.refresh_disk_poll()
|
||||
@ -61,8 +60,7 @@ class vmmPreferences(vmmGObjectUI):
|
||||
"on_prefs_console_scaling_changed": self.change_console_scaling,
|
||||
"on_prefs_close_clicked": self.close,
|
||||
"on_vmm_preferences_delete_event": self.close,
|
||||
"on_prefs_sound_local_toggled": self.change_local_sound,
|
||||
"on_prefs_sound_remote_toggled": self.change_remote_sound,
|
||||
"on_prefs_new_vm_sound_toggled": self.change_new_vm_sound,
|
||||
"on_prefs_stats_enable_disk_toggled": self.change_disk_poll,
|
||||
"on_prefs_stats_enable_net_toggled": self.change_net_poll,
|
||||
"on_prefs_confirm_forcepoweroff_toggled": self.change_confirm_forcepoweroff,
|
||||
@ -112,12 +110,9 @@ class vmmPreferences(vmmGObjectUI):
|
||||
val = 0
|
||||
self.widget("prefs-console-scaling").set_active(val)
|
||||
|
||||
def refresh_sound_local(self):
|
||||
self.widget("prefs-sound-local").set_active(
|
||||
self.config.get_local_sound())
|
||||
def refresh_sound_remote(self):
|
||||
self.widget("prefs-sound-remote").set_active(
|
||||
self.config.get_remote_sound())
|
||||
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")
|
||||
model = combo.get_model()
|
||||
@ -263,10 +258,8 @@ class vmmPreferences(vmmGObjectUI):
|
||||
def change_console_scaling(self, box):
|
||||
self.config.set_console_scaling(box.get_active())
|
||||
|
||||
def change_local_sound(self, src):
|
||||
self.config.set_local_sound(src.get_active())
|
||||
def change_remote_sound(self, src):
|
||||
self.config.set_remote_sound(src.get_active())
|
||||
def change_new_vm_sound(self, src):
|
||||
self.config.set_new_vm_sound(src.get_active())
|
||||
|
||||
def change_disk_poll(self, src):
|
||||
self.config.set_stats_enable_disk_poll(src.get_active())
|
||||
|
||||
Loading…
Reference in New Issue
Block a user