Changeset 316c9b7f0eaaf164ab678550cbab314c7e8fccee

Timestamp:

06/19/08 01:18:54 (4 years ago)

Author:

Lincoln de Sousa <lincoln@…>

Children:

76d7eb54cb4594aab8771bbd2c22ae361a50ca98

Parents:

1504958463fcadd570c9117ca26b4c4a1aa1d8ad

git-committer:

Lincoln de Sousa <lincoln@…> (06/19/08 01:18:54)

Message:

adding close_tab keybinding and unbinding accels when cleaning in preferences.

Files:

• src/guake.py (modified) (3 diffs)

src/guake.py

@@ -439 +439 @@
         else:
             # ungrabing local keys
-            if accel:
+            if accel != 'disabled':
                 keynum, mask = gtk.accelerator_parse(accel)
                 self.guake.accel_group.disconnect_key(keynum, mask)
@@ -450 +450 @@
         giter = model.get_iter(path)
         gconf_path = model.get_value(giter, 0)
+        accel = self.client.get_string(gconf_path)
         model.set_value(giter, 2, KeyEntry(0, 0, 0))
+
+        # cleared accel must be unbinded
+        accel = self.client.get_string(gconf_path)
+        if gconf_path in [x[0] for x in GHOTKEYS]:
+            globalhotkeys.unbind(accel)
+
+        keynum, mask = gtk.accelerator_parse(accel)
+        if keynum:
+            self.guake.accel_group.disconnect_key(keynum, mask)
+
         self.client.set_string(gconf_path, 'disabled')
+        self.guake.load_accelerators()
 
     def cell_data_func(self, column, renderer, model, giter):
@@ -688 +700 @@
         ac = gets(GCONF_PATH+'keybindings/local/new_tab')
         key, mask = gtk.accelerator_parse(ac)
-        self.accel_group.connect_group(key, mask, gtk.ACCEL_VISIBLE,
-                self.accel_add)
+        if key > 0:
+            self.accel_group.connect_group(key, mask, gtk.ACCEL_VISIBLE,
+                                           self.accel_add)
+
+        ac = gets(GCONF_PATH+'keybindings/local/close_tab')
+        key, mask = gtk.accelerator_parse(ac)
+        if key > 0:
+            self.accel_group.connect_group(key, mask, gtk.ACCEL_VISIBLE,
+                                           self.on_context_close_tab_activate)
 
         ac = gets(GCONF_PATH+'keybindings/local/previous_tab')
         key, mask = gtk.accelerator_parse(ac)
-        self.accel_group.connect_group(key, mask, gtk.ACCEL_VISIBLE,
-                self.accel_prev)
+        if key > 0:
+            self.accel_group.connect_group(key, mask, gtk.ACCEL_VISIBLE,
+                                           self.accel_prev)
 
         ac = gets(GCONF_PATH+'keybindings/local/next_tab')
         key, mask = gtk.accelerator_parse(ac)
-        self.accel_group.connect_group(key, mask, gtk.ACCEL_VISIBLE,
-                self.accel_next)
+        if key > 0:
+            self.accel_group.connect_group(key, mask, gtk.ACCEL_VISIBLE,
+                                           self.accel_next)
 
         ac = gets(GCONF_PATH+'keybindings/local/clipboard_copy')
         key, mask = gtk.accelerator_parse(ac)
-        self.accel_group.connect_group(key, mask, gtk.ACCEL_VISIBLE,
-                self.accel_copy_clipboard)
+        if key > 0:
+            self.accel_group.connect_group(key, mask, gtk.ACCEL_VISIBLE,
+                                           self.accel_copy_clipboard)
 
         ac = gets(GCONF_PATH+'keybindings/local/clipboard_paste')
         key, mask = gtk.accelerator_parse(ac)
-        self.accel_group.connect_group(key, mask, gtk.ACCEL_VISIBLE,
-                self.accel_paste_clipboard)
+        if key > 0:
+            self.accel_group.connect_group(key, mask, gtk.ACCEL_VISIBLE,
+                                           self.accel_paste_clipboard)
 
         ac = gets(GCONF_PATH+'keybindings/local/toggle_fullscreen')
         key, mask = gtk.accelerator_parse(ac)
-        self.accel_group.connect_group(key, mask, gtk.ACCEL_VISIBLE,
-                self.accel_toggle_fullscreen)
+        if key > 0:
+            self.accel_group.connect_group(key, mask, gtk.ACCEL_VISIBLE,
+                                           self.accel_toggle_fullscreen)
 
     def accel_add(self, *args):