Changeset 767310e0c6e1ffdf03bef5a6b287fd87ee664a47

Timestamp:

07/30/08 12:25:38 (4 years ago)

Author:

Lincoln de Sousa <lincoln@…>

Children:

ea868df7d6dfdd72046f45a7c359de9b3ad1aa5a

Parents:

749640b3b0557ac31244ea8c00d936573b3daa5e

git-committer:

Lincoln de Sousa <lincoln@…> (07/30/08 12:25:38)

Message:

Removing eggcellrendererkeys, because gtk already provides
a cell to render accelerators.

Files:

• ChangeLog (modified) (1 diff)
• configure.ac (modified) (1 diff)
• src/Makefile.am (modified) (1 diff)
• src/eggcellrendererkeys/Makefile.am (deleted)
• src/eggcellrendererkeys/cellrendererkeys.defs (deleted)
• src/eggcellrendererkeys/cellrendererkeys.override (deleted)
• src/eggcellrendererkeys/cellrendererkeysmodule.c (deleted)
• src/eggcellrendererkeys/eggaccelerators.c (deleted)
• src/eggcellrendererkeys/eggaccelerators.h (deleted)
• src/eggcellrendererkeys/eggcellrendererkeys-arg-types.py (deleted)
• src/eggcellrendererkeys/eggcellrendererkeys.c (deleted)
• src/eggcellrendererkeys/eggcellrendererkeys.h (deleted)
• src/guake.py (modified) (9 diffs)

ChangeLog

@@ +1 @@
+2008-07-30  Lincoln de Sousa  <lincoln@alfaiati.net>
+
+        * src/eggcellrendererkeys: Removed.
+
+        * configure.ac:
+        * src/Makefile.am: Removing references of eggcellrendererkeys.
+
+        * src/guake.py: Removing all references of eggcellrendererkeys,
+        gtk provides a bult-in CellRendererAccel, I don't know how I
+        didn't see it before =/
+
 2008-07-25  Lincoln de Sousa  <lincoln@minaslivre.org>
 

configure.ac

@@ -100 +100 @@
     src/Makefile
     src/globalhotkeys/Makefile
-    src/eggcellrendererkeys/Makefile
     src/guake_globals.py
     src/guake

src/Makefile.am

@@ -1 @@
-SUBDIRS = globalhotkeys eggcellrendererkeys
+SUBDIRS = globalhotkeys
 
 guakedir = $(bindir)

src/guake.py

@@ -45 +45 @@
 import globalhotkeys
 import guake_globals
-import cellrendererkeys
 
 pynotify.init('Guake!')
@@ -86 +85 @@
 
 class KeyEntry(object):
-    def __init__(self, keyval, keycode, mask):
-        self.keyval = keyval
+    def __init__(self, keycode, mask):
         self.keycode = keycode
         self.mask = mask
 
     def __repr__(self):
-        return u'KeyEntry(%d, %d, %d)' % (
-            self.keyval, self.keycode, self.mask)
+        return u'KeyEntry(%d, %d)' % (
+            self.keycode, self.mask)
 
     def __eq__(self, rval):
         return self.keycode == rval.keycode and \
-            self.keyval == rval.keyval and \
             self.mask == rval.mask
 
@@ -158 +155 @@
         treeview.append_column(column)
 
-        renderer = cellrendererkeys.CellRendererKeys()
+        renderer = gtk.CellRendererAccel()
         renderer.set_property('editable', True)
-        renderer.set_property('accel-mode',
-                              cellrendererkeys.CELL_RENDERER_KEYS_MODE_X)
 
         renderer.connect('accel-edited', self.on_key_edited, model)
@@ -321 +316 @@
             accel = self.client.get_string(i[0])
             if accel:
-                params = cellrendererkeys.accelerator_parse_virtual(accel)
+                params = gtk.accelerator_parse(accel)
                 hotkey = KeyEntry(*params)
             else:
-                hotkey = KeyEntry(0, 0, 0)
+                hotkey = KeyEntry(0, 0)
 
             model.set(child,
@@ -339 +334 @@
             accel = self.client.get_string(i[0])
             if accel:
-                params = cellrendererkeys.accelerator_parse_virtual(accel)
+                params = gtk.accelerator_parse(accel)
                 hotkey = KeyEntry(*params)
             else:
-                hotkey = KeyEntry(0, 0, 0)
+                hotkey = KeyEntry(0, 0)
 
             model.set(child,
@@ -449 +444 @@
         self.guake.set_erasebindings()
 
-    def on_key_edited(self, renderer, path, keyval, mask, keycode, model):
+    def on_key_edited(self, renderer, path, keycode, mask, keyval, model):
         giter = model.get_iter(path)
         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)
+        hotkey = KeyEntry(keycode, mask)
+        key = gtk.accelerator_name(keycode, mask)
+        keylabel = gtk.accelerator_get_label(keycode, mask)
 
         # we needn't to change anything, the user is trying to set the
@@ -473 +468 @@
         # 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')))):
+            (keycode >= ord('a') and keycode <= ord('z')) or
+            (keycode >= ord('A') and keycode <= ord('Z')) or
+            (keycode >= ord('0') and keycode <= ord('9')))):
             parent = self.get_widget('config-window')
             dialog = gtk.MessageDialog(parent,
@@ -519 +514 @@
         gconf_path = model.get_value(giter, 0)
         accel = self.client.get_string(gconf_path)
-        model.set_value(giter, 2, KeyEntry(0, 0, 0))
+        model.set_value(giter, 2, KeyEntry(0, 0))
 
         # cleared accel must be unbinded
@@ -537 +532 @@
         if obj:
             renderer.set_property('visible', True)
-            renderer.set_accelerator(obj.keyval, obj.keycode, obj.mask)
+            renderer.set_property('accel-key', obj.keycode)
+            renderer.set_property('accel-mods', obj.mask)
         else:
             renderer.set_property('visible', False)
-            renderer.set_accelerator(0, 0, 0)
+            renderer.set_property('accel-key', 0)
+            renderer.set_property('accel-mods', 0)
 
     def update_preview_cb(self,file_chooser, preview):