Changeset 1504958463fcadd570c9117ca26b4c4a1aa1d8ad

Timestamp:

06/16/08 21:49:28 (4 years ago)

Author:

Lincoln de Sousa <lincoln@…>

Children:

316c9b7f0eaaf164ab678550cbab314c7e8fccee

Parents:

95d3ca771a1ce90e9a5ccd7d4b3b36d8e3dcde3c

git-committer:

Lincoln de Sousa <lincoln@…> (06/16/08 21:49:28)

Message:

KeyEntry?: Adding repr and eq methods to
make it easy and pythonic to compare with other keyentry and to
debug.

(PrefsDialog?.on_key_edited): Adding validation to
avoid repeated keybindings and to avoid using simple keys
as [a-zA-Z0-9] keys.

(PrefsDialog?): Adding a way to clear a keybinding
with on_key_cleared method.

Files:

• ChangeLog (modified) (1 diff)
• src/guake.py (modified) (5 diffs)

ChangeLog

@@ +1 @@
+2008-06-16  Lincoln de Sousa  <lincoln@minaslivre.org>
+
+        * src/guake.py (KeyEntry): Adding __repr__ and __eq__ methods to
+        make it easy and pythonic to compare with other keyentry and to
+        debug.
+
+        * src/guake.py (PrefsDialog.on_key_edited): Adding validation to
+        avoid repeated keybindings and to avoid using simple keys
+        as [a-zA-Z0-9] keys.
+
+        * src/guake.py (PrefsDialog): Adding a way to clear a keybinding
+        with on_key_cleared method.
+
 2008-06-15  Lincoln de Sousa  <lincoln@minaslivre.org>
 

src/guake.py

@@ -72 +72 @@
         self.mask = mask
 
+    def __repr__(self):
+        return u'KeyEntry(%d, %d, %d)' % (
+            self.keyval, self.keycode, self.mask)
+
+    def __eq__(self, rval):
+        return self.keycode == rval.keycode and \
+            self.keyval == rval.keyval and \
+            self.mask == rval.mask
+
 class AboutDialog(SimpleGladeApp):
     def __init__(self):
@@ -136 +145 @@
 
         renderer.connect('accel-edited', self.on_key_edited, model)
+        renderer.connect('accel-cleared', self.on_key_cleared, model)
+
         column = gtk.TreeViewColumn(_('Shortcut'), renderer)
         column.set_cell_data_func(renderer, self.cell_data_func)
@@ -374 +385 @@
         gconf_path = model.get_value(giter, 0)
 
+        oldkey = model.get_value(giter, 2)
         hotkey = KeyEntry(keyval, keycode, mask)
+        key = cellrendererkeys.accelerator_name(keyval, keycode, mask)
+        keylabel = cellrendererkeys.accelerator_label(keyval, keycode, mask)
+
+        # we needn't to change anything, the user is trying to set the
+        # same key that is already set.
+        if oldkey == hotkey:
+            return False
+
+        # looking for already used keybindings
+        def each_key(model, path, subiter):
+            keyentry = model.get_value(subiter, 2)
+            if keyentry and keyentry == hotkey:
+                msg = _("The shortcut \"%s\" is already in use.") % keylabel
+                raise ShowableError(_('Error setting keybinding.'), msg, -1)
+        model.foreach(each_key)
+
+        # avoiding problems with common keys
+        if ((mask == 0 and keycode != 0) and (
+            (keyval >= ord('a') and keyval <= ord('z')) or
+            (keyval >= ord('A') and keyval <= ord('Z')) or
+            (keyval >= ord('0') and keyval <= ord('9')))):
+            parent = self.get_widget('config-window')
+            dialog = gtk.MessageDialog(parent,
+                                       gtk.DIALOG_MODAL |
+                                       gtk.DIALOG_DESTROY_WITH_PARENT,
+                                       gtk.MESSAGE_WARNING,
+                                       gtk.BUTTONS_OK,
+                                       _("The shortcut \"%s\" cannot be used "
+                                         "because it will become impossible to "
+                                         "type using this key.\n\n"
+                                         "Please try with a key such as "
+                                         "Control, Alt or Shift at the same "
+                                         "time.\n") % key)
+            dialog.run()
+            dialog.destroy()
+            return False
+
         giter = model.get_iter(path)
         model.set_value(giter, 2, hotkey)
-        key = cellrendererkeys.accelerator_name(keyval, keycode, mask)
 
         # old key, used only to disconnect current shortcuts
@@ -398 +446 @@
         self.client.set_string(gconf_path, key)
         self.guake.load_accelerators()
+
+    def on_key_cleared(self, renderer, path, model):
+        giter = model.get_iter(path)
+        gconf_path = model.get_value(giter, 0)
+        model.set_value(giter, 2, KeyEntry(0, 0, 0))
+        self.client.set_string(gconf_path, 'disabled')
 
     def cell_data_func(self, column, renderer, model, giter):
@@ -437 +491 @@
 
         x, y = int(event.x), int(event.y)
-        path, column, cellx, celly = treeview.get_path_at_pos(x, y)
+        ret = treeview.get_path_at_pos(x, y)
+        if not ret:
+            return False
+
+        path, column, cellx, celly = ret
         if path and len(path) > 1:
             def real_cb():