diff --git a/src/virtManager/addhardware.py b/src/virtManager/addhardware.py index c1da790bf..1ff732bc7 100644 --- a/src/virtManager/addhardware.py +++ b/src/virtManager/addhardware.py @@ -120,7 +120,7 @@ class vmmAddHardware(vmmGObjectUI): "char_telnet_focus_in": (self.update_doc, "protocol"), "char_name_focus_in": (self.update_doc, "target_name"), }) - util.bind_escape_key_close(self) + self.bind_escape_key_close() # XXX: Help docs useless/out of date self.window.get_widget("create-help").hide() diff --git a/src/virtManager/baseclass.py b/src/virtManager/baseclass.py index 32c252a83..ca4cc0699 100644 --- a/src/virtManager/baseclass.py +++ b/src/virtManager/baseclass.py @@ -189,3 +189,10 @@ class vmmGObjectUI(vmmGObject): self.topwin = None self.gladefile = None self.err = None + + def bind_escape_key_close(self): + def close_on_escape(src_ignore, event): + if gtk.gdk.keyval_name(event.keyval) == "Escape": + self.close() + + self.topwin.connect("key-press-event", close_on_escape) diff --git a/src/virtManager/clone.py b/src/virtManager/clone.py index db1242373..626580f2d 100644 --- a/src/virtManager/clone.py +++ b/src/virtManager/clone.py @@ -115,7 +115,7 @@ class vmmCloneVM(vmmGObjectUI): "on_clone_ok_clicked" : self.finish, "on_clone_help_clicked" : self.show_help, }) - util.bind_escape_key_close(self) + self.bind_escape_key_close() # XXX: Help docs useless/out of date self.window.get_widget("clone-help").hide() diff --git a/src/virtManager/create.py b/src/virtManager/create.py index ea63f7a38..6bbe23d96 100644 --- a/src/virtManager/create.py +++ b/src/virtManager/create.py @@ -135,7 +135,7 @@ class vmmCreate(vmmGObjectUI): "on_config_hv_changed": self.hv_changed, "on_config_arch_changed": self.arch_changed, }) - util.bind_escape_key_close(self) + self.bind_escape_key_close() self.set_initial_state() diff --git a/src/virtManager/createinterface.py b/src/virtManager/createinterface.py index 32e2d60f7..25f1d3a9e 100644 --- a/src/virtManager/createinterface.py +++ b/src/virtManager/createinterface.py @@ -130,7 +130,7 @@ class vmmCreateInterface(vmmGObjectUI): "on_ip_config_button_clicked": self.show_ip_config, "on_vlan_tag_changed": self.update_interface_name, }) - util.bind_escape_key_close(self) + self.bind_escape_key_close() self.set_initial_state() diff --git a/src/virtManager/createnet.py b/src/virtManager/createnet.py index 358da6429..a3253b465 100644 --- a/src/virtManager/createnet.py +++ b/src/virtManager/createnet.py @@ -23,7 +23,6 @@ import gtk import logging import re -import virtManager.util as util from virtManager.IPy import IP from virtManager.network import vmmNetwork from virtManager.baseclass import vmmGObjectUI @@ -61,7 +60,7 @@ class vmmCreateNetwork(vmmGObjectUI): "on_net_dhcp_end_changed": self.change_dhcp_end, "on_create_help_clicked": self.show_help, }) - util.bind_escape_key_close(self) + self.bind_escape_key_close() # XXX: Help docs useless/out of date self.window.get_widget("create-help").hide() diff --git a/src/virtManager/createpool.py b/src/virtManager/createpool.py index dd0e3b301..034f321d7 100644 --- a/src/virtManager/createpool.py +++ b/src/virtManager/createpool.py @@ -93,7 +93,7 @@ class vmmCreatePool(vmmGObjectUI): "pool-info2"), "on_pool_build_focus_in_event": (self.update_build_doc) }) - util.bind_escape_key_close(self) + self.bind_escape_key_close() # XXX: Help docs useless/out of date self.window.get_widget("pool-help").hide() diff --git a/src/virtManager/createvol.py b/src/virtManager/createvol.py index ac2947422..0d308642c 100644 --- a/src/virtManager/createvol.py +++ b/src/virtManager/createvol.py @@ -55,7 +55,7 @@ class vmmCreateVolume(vmmGObjectUI): "on_vol_allocation_value_changed" : self.vol_allocation_changed, "on_vol_capacity_value_changed" : self.vol_capacity_changed, }) - util.bind_escape_key_close(self) + self.bind_escape_key_close() format_list = self.window.get_widget("vol-format") format_model = gtk.ListStore(str, str) diff --git a/src/virtManager/delete.py b/src/virtManager/delete.py index 739eaffc4..87e4b6805 100644 --- a/src/virtManager/delete.py +++ b/src/virtManager/delete.py @@ -56,7 +56,7 @@ class vmmDeleteDialog(vmmGObjectUI): "on_delete_ok_clicked" : self.finish, "on_delete_remove_storage_toggled" : self.toggle_remove_storage, }) - util.bind_escape_key_close(self) + self.bind_escape_key_close() image = gtk.image_new_from_icon_name("vm_delete_wizard", gtk.ICON_SIZE_DIALOG) diff --git a/src/virtManager/migrate.py b/src/virtManager/migrate.py index 157d990e4..48cbc0afa 100644 --- a/src/virtManager/migrate.py +++ b/src/virtManager/migrate.py @@ -70,7 +70,7 @@ class vmmMigrateDialog(vmmGObjectUI): "on_migrate_set_port_toggled" : self.toggle_set_port, "on_migrate_set_maxdowntime_toggled" : self.toggle_set_maxdowntime, }) - util.bind_escape_key_close(self) + self.bind_escape_key_close() blue = gtk.gdk.color_parse("#0072A8") self.window.get_widget("migrate-header").modify_bg(gtk.STATE_NORMAL, diff --git a/src/virtManager/preferences.py b/src/virtManager/preferences.py index b34439f0f..da9282750 100644 --- a/src/virtManager/preferences.py +++ b/src/virtManager/preferences.py @@ -90,7 +90,7 @@ class vmmPreferences(vmmGObjectUI): "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) + self.bind_escape_key_close() # XXX: Help docs useless/out of date self.window.get_widget("prefs-help").hide() diff --git a/src/virtManager/storagebrowse.py b/src/virtManager/storagebrowse.py index 82b42d0c4..565fbba0e 100644 --- a/src/virtManager/storagebrowse.py +++ b/src/virtManager/storagebrowse.py @@ -64,7 +64,7 @@ class vmmStorageBrowser(vmmGObjectUI): "on_choose_volume_clicked" : self.finish, "on_vol_list_row_activated" : self.finish, }) - util.bind_escape_key_close(self) + self.bind_escape_key_close() finish_img = gtk.image_new_from_stock(gtk.STOCK_NEW, gtk.ICON_SIZE_BUTTON) diff --git a/src/virtManager/util.py b/src/virtManager/util.py index 6b338ce0f..c23f0b680 100644 --- a/src/virtManager/util.py +++ b/src/virtManager/util.py @@ -315,13 +315,6 @@ def uuidstr(rawuuid): uuid.append('-') return "".join(uuid) -def bind_escape_key_close(vmmobj): - def close_on_escape(src_ignore, event): - if gtk.gdk.keyval_name(event.keyval) == "Escape": - vmmobj.close() - - vmmobj.topwin.connect("key-press-event", close_on_escape) - def safe_set_prop(self, prop, value): """ Make sure a gtk property is supported, and set to value