Add graphic type in preference dialog for new VM

This commit is contained in:
Marc-André Lureau 2011-03-18 13:59:14 +01:00 committed by Cole Robinson
parent f25c3b13e6
commit 771387052e
5 changed files with 89 additions and 1 deletions

View File

@ -195,6 +195,19 @@
</locale>
</schema>
<schema>
<key>/schemas/apps/::PACKAGE::/new-vm/graphics-type</key>
<applyto>/apps/::PACKAGE::/new-vm/graphics-type</applyto>
<owner>::PACKAGE::</owner>
<type>string</type>
<default>vnc</default>
<locale name="C">
<short>Install selected graphics type for new VM</short>
<long>Install selected graphics type for new VM. vnc or spice</long>
</locale>
</schema>
<schema>
<key>/schemas/apps/::PACKAGE::/system-tray</key>
<applyto>/apps/::PACKAGE::/system-tray</applyto>

View File

@ -508,6 +508,18 @@ class vmmConfig(object):
def on_sound_remote_changed(self, cb, data=None):
self.conf.notify_add(self.conf_dir + "/new-vm/remote-sound", cb, data)
def get_graphics_type(self):
ret = self.conf.get_string(self.conf_dir + "/new-vm/graphics_type")
if ret == None:
ret = "vnc"
return ret
def set_graphics_type(self, gtype):
self.conf.set_string(self.conf_dir + "/new-vm/graphics_type",
gtype.lower())
def on_graphics_type_changed(self, cb, data=None):
self.conf.notify_add(self.conf_dir + "/new-vm/graphics_type",
cb, data)
# URL/Media path history
def _url_add_helper(self, gconf_path, url):

View File

@ -901,6 +901,9 @@ class vmmCreate(vmmGObjectUI):
return self.config.get_remote_sound()
return self.config.get_local_sound()
def get_config_graphics_type(self):
return self.config.get_graphics_type()
def get_config_customize(self):
return self.window.get_widget("summary-customize").get_active()
@ -1193,8 +1196,9 @@ class vmmCreate(vmmGObjectUI):
# Set up graphics device
try:
gtype = self.get_config_graphics_type()
guest.add_device(virtinst.VirtualGraphics(
type=virtinst.VirtualGraphics.TYPE_VNC,
type=gtype,
conn=guest.conn))
guest.add_device(virtinst.VirtualVideoDevice(conn=guest.conn))
except Exception, e:

View File

@ -43,6 +43,7 @@ class vmmPreferences(vmmGObjectUI):
self.config.on_stats_history_length_changed(self.refresh_history_length)
self.config.on_sound_local_changed(self.refresh_sound_local)
self.config.on_sound_remote_changed(self.refresh_sound_remote)
self.config.on_graphics_type_changed(self.refresh_graphics_type)
self.config.on_stats_enable_disk_poll_changed(self.refresh_disk_poll)
self.config.on_stats_enable_net_poll_changed(self.refresh_net_poll)
@ -60,6 +61,7 @@ class vmmPreferences(vmmGObjectUI):
self.refresh_console_scaling()
self.refresh_sound_local()
self.refresh_sound_remote()
self.refresh_graphics_type()
self.refresh_disk_poll()
self.refresh_net_poll()
self.refresh_grabkeys_combination()
@ -89,6 +91,7 @@ class vmmPreferences(vmmGObjectUI):
"on_prefs_confirm_removedev_toggled": self.change_confirm_removedev,
"on_prefs_confirm_interface_toggled": self.change_confirm_interface,
"on_prefs_btn_keys_define_clicked": self.change_grab_keys,
"on_prefs_graphics_type_changed": self.change_graphics_type,
})
util.bind_escape_key_close(self)
@ -143,6 +146,11 @@ class vmmPreferences(vmmGObjectUI):
ignore4=None):
self.window.get_widget("prefs-sound-remote").set_active(
self.config.get_remote_sound())
def refresh_graphics_type(self, ignore1=None, ignore2=None, ignore=None,
ignore4=None):
active = {"vnc": 0,
"spice": 1}[self.config.get_graphics_type()]
self.window.get_widget("prefs-graphics-type").set_active(active)
def refresh_disk_poll(self, ignore1=None, ignore2=None, ignore3=None,
ignore4=None):
@ -271,6 +279,13 @@ class vmmPreferences(vmmGObjectUI):
def change_confirm_interface(self, src):
self.config.set_confirm_interface(src.get_active())
def change_graphics_type(self, src):
gtype = 'vnc'
idx = src.get_active()
if idx >= 0:
gtype = src.get_model()[idx][0]
self.config.set_graphics_type(gtype)
def show_help(self, src_ignore):
# From the Preferences window, show the help document from
# the Preferences page

View File

@ -536,6 +536,50 @@ For all domains</property>
<property name="label" translatable="yes">Install Audio Device:</property>
</widget>
</child>
<child>
<widget class="GtkLabel" id="label162">
<property name="visible">True</property>
<property name="label" translatable="yes">Install Graphics:</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">0</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
<property name="right_attach">1</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkComboBox" id="prefs-graphics-type">
<property name="visible">True</property>
<property name="items" translatable="no">VNC
Spice</property>
<signal name="changed" handler="on_prefs_graphics_type_changed"/>
</widget>
<packing>
<property name="left_attach">0</property>
<property name="right_attach">1</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="x_padding">5</property>
<property name="x_options">fill</property>
</packing>
</child>
</widget>
</child>
</widget>