Move bind_escape_key_close helper to baseclass

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()

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)

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()

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()
 

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()
 

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()

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()

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)

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)

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,

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()

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)

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