From 6590233b7eed2404a0f1a481f2c893d8d9648270 Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Fri, 15 Apr 2011 14:43:52 -0400 Subject: [PATCH] prefs: Remove console popup option This was originally requested when the console window didn't have option to start/stop a VM (see https://bugzilla.redhat.com/show_bug.cgi?id=211385). That hasn't been valid for a long time. The option was pretty unclear in the prefs dialog anyways, and had weird behavior like 'open the domain for all running vms when we start virt-manager' Just always use the current default of opening the console for VMs that we create with New VM. --- src/virt-manager.schemas.in | 13 ------- src/virtManager/config.py | 14 -------- src/virtManager/create.py | 22 ++++++------ src/virtManager/manager.py | 24 +------------ src/virtManager/preferences.py | 9 ----- src/vmm-preferences.glade | 66 ++++++---------------------------- 6 files changed, 23 insertions(+), 125 deletions(-) diff --git a/src/virt-manager.schemas.in b/src/virt-manager.schemas.in index afa32d57d..ea5e0528f 100644 --- a/src/virt-manager.schemas.in +++ b/src/virt-manager.schemas.in @@ -104,19 +104,6 @@ - - /schemas/apps/::PACKAGE::/console/popup - /apps/::PACKAGE::/console/popup - ::PACKAGE:: - int - 1 - - - When to pop up a console for a guest - Whether to pop up a console for a guest. 0 = never, 1 = only on creation of a new guest, 2 = On creation of any guest - - - /schemas/apps/::PACKAGE::/console/enable-accels /apps/::PACKAGE::/console/enable-accels diff --git a/src/virtManager/config.py b/src/virtManager/config.py index a5d763082..81022275b 100644 --- a/src/virtManager/config.py +++ b/src/virtManager/config.py @@ -36,10 +36,6 @@ except Exception, _spice_error: from virtManager.keyring import vmmKeyring from virtManager.secret import vmmSecret -CONSOLE_POPUP_NEVER = 0 -CONSOLE_POPUP_NEW_ONLY = 1 -CONSOLE_POPUP_ALWAYS = 2 - CONSOLE_KEYGRAB_NEVER = 0 CONSOLE_KEYGRAB_FULLSCREEN = 1 CONSOLE_KEYGRAB_MOUSEOVER = 2 @@ -464,16 +460,6 @@ class vmmConfig(object): cb, userdata) # VM Console preferences - def on_console_popup_changed(self, callback): - return self.conf.notify_add(self.conf_dir + "/console/popup", callback) - def get_console_popup(self): - console_pref = self.conf.get_int(self.conf_dir + "/console/popup") - if console_pref == None: - console_pref = 0 - return console_pref - def set_console_popup(self, pref): - self.conf.set_int(self.conf_dir + "/console/popup", pref) - def on_console_accels_changed(self, callback): return self.conf.notify_add(self.conf_dir + "/console/enable-accels", callback) def get_console_accels(self): diff --git a/src/virtManager/create.py b/src/virtManager/create.py index c81434606..98e072cce 100644 --- a/src/virtManager/create.py +++ b/src/virtManager/create.py @@ -1649,19 +1649,19 @@ class vmmCreate(vmmGObjectUI): self.failed_guest = self.guest return - vm = self.conn.get_vm(guest.uuid) - - if self.config.get_console_popup() == 1: - # user has requested console on new created vms only - gtype = vm.get_graphics_console()[0] - if gtype in self.config.embeddable_graphics(): - self.emit("action-show-console", self.conn.get_uri(), - guest.uuid) - else: - self.emit("action-show-terminal", self.conn.get_uri(), - guest.uuid) self.close() + # Launch details dialog for new VM + vm = self.conn.get_vm(guest.uuid) + gtype = vm.get_graphics_console()[0] + if gtype in self.config.embeddable_graphics(): + self.emit("action-show-console", self.conn.get_uri(), + guest.uuid) + elif vm.get_connection().is_remote(): + self.emit("action-show-terminal", self.conn.get_uri(), + guest.uuid) + + def do_install(self, asyncjob, guest): meter = vmmCreateMeter(asyncjob) diff --git a/src/virtManager/manager.py b/src/virtManager/manager.py index 7df045b45..f69040ec4 100644 --- a/src/virtManager/manager.py +++ b/src/virtManager/manager.py @@ -23,8 +23,6 @@ import gtk import logging -import libvirt - import virtManager.config as cfg import virtManager.uihelpers as uihelpers from virtManager.connection import vmmConnection @@ -904,33 +902,13 @@ class vmmManager(vmmGObjectUI): # State/UI updating methods # ############################# - def _vm_started(self, vm): - connection = vm.get_connection() - uri = connection.get_uri() - vmuuid = vm.get_uuid() - - logging.debug("VM %s started" % vm.get_name()) - - if (self.config.get_console_popup() != 2 or - vm.is_management_domain()): - return - - # user has requested consoles on all vms - gtype = vm.get_graphics_console()[0] - if gtype in self.config.embeddable_graphics(): - self.emit("action-show-console", uri, vmuuid) - elif not connection.is_remote(): - self.emit("action-show-terminal", uri, vmuuid) - def vm_status_changed(self, vm, oldstatus, newstatus): ignore = newstatus + ignore = oldstatus parent = self.rows[vm.get_connection().get_uri()].iter vmlist = self.window.get_widget("vm-list") model = vmlist.get_model() - if vm.is_active() and oldstatus is libvirt.VIR_DOMAIN_SHUTOFF: - self._vm_started(vm) - missing = True for row in range(model.iter_n_children(parent)): _iter = model.iter_nth_child(parent, row) diff --git a/src/virtManager/preferences.py b/src/virtManager/preferences.py index 7a1769184..b34439f0f 100644 --- a/src/virtManager/preferences.py +++ b/src/virtManager/preferences.py @@ -36,7 +36,6 @@ class vmmPreferences(vmmGObjectUI): vmmGObjectUI.__init__(self, "vmm-preferences.glade", "vmm-preferences") self.add_gconf_handle(self.config.on_view_system_tray_changed(self.refresh_view_system_tray)) - self.add_gconf_handle(self.config.on_console_popup_changed(self.refresh_console_popup)) self.add_gconf_handle(self.config.on_console_accels_changed(self.refresh_console_accels)) self.add_gconf_handle(self.config.on_console_scaling_changed(self.refresh_console_scaling)) self.add_gconf_handle(self.config.on_stats_update_interval_changed(self.refresh_update_interval)) @@ -56,7 +55,6 @@ class vmmPreferences(vmmGObjectUI): self.refresh_view_system_tray() self.refresh_update_interval() self.refresh_history_length() - self.refresh_console_popup() self.refresh_console_accels() self.refresh_console_scaling() self.refresh_sound_local() @@ -75,7 +73,6 @@ class vmmPreferences(vmmGObjectUI): "on_prefs_system_tray_toggled" : self.change_view_system_tray, "on_prefs_stats_update_interval_changed": self.change_update_interval, "on_prefs_stats_history_length_changed": self.change_history_length, - "on_prefs_console_popup_changed": self.change_console_popup, "on_prefs_console_accels_toggled": self.change_console_accels, "on_prefs_console_scaling_changed": self.change_console_scaling, "on_prefs_close_clicked": self.close, @@ -124,10 +121,6 @@ class vmmPreferences(vmmGObjectUI): self.window.get_widget("prefs-stats-history-len").set_value( self.config.get_stats_history_length()) - def refresh_console_popup(self, ignore1=None, ignore2=None, - ignore3=None, ignore4=None): - self.window.get_widget("prefs-console-popup").set_active( - self.config.get_console_popup()) def refresh_console_accels(self, ignore1=None, ignore2=None, ignore3=None, ignore4=None): self.window.get_widget("prefs-console-accels").set_active( @@ -268,8 +261,6 @@ class vmmPreferences(vmmGObjectUI): def change_history_length(self, src): self.config.set_stats_history_length(src.get_value_as_int()) - def change_console_popup(self, box): - self.config.set_console_popup(box.get_active()) def change_console_accels(self, src): self.config.set_console_accels(src.get_active()) def change_console_scaling(self, box): diff --git a/src/vmm-preferences.glade b/src/vmm-preferences.glade index 2f1f096b2..bfd319d63 100644 --- a/src/vmm-preferences.glade +++ b/src/vmm-preferences.glade @@ -322,7 +322,7 @@ True - 6 + 4 3 @@ -333,8 +333,8 @@ Always - 3 - 4 + 1 + 2 5 @@ -346,33 +346,6 @@ Always True prefs-console-scaling - - 2 - 3 - - - - - True - Never -For all new domains -For all domains - - - - 1 - 2 - 5 - - - - - True - 0 - Automatically _open consoles: - True - prefs-console-popup - @@ -414,8 +387,8 @@ For all domains - 4 - 5 + 2 + 3 @@ -448,8 +421,8 @@ For all domains - 5 - 6 + 3 + 4 @@ -536,48 +509,31 @@ For all domains Install Audio Device: - True - Install Graphics: - False - False - GTK_JUSTIFY_LEFT - False - False 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 + Install Graphics: - 0 - 1 2 3 - fill + GTK_FILL True - VNC + VNC Spice - 0 - 1 3 4 + GTK_FILL 5 - fill