Changeset 6e52bd6bf321347c929997b1f443880fe943884d

Timestamp:

02/25/09 00:34:31 (3 years ago)

Author:

Lincoln de Sousa <lincoln@…>

Children:

c95bf630f021b6586a8fe1f66cb52041c3015b53

Parents:

c4a0f94bc911001699419c287b7c238f89fcec64

git-committer:

Lincoln de Sousa <lincoln@…> (02/25/09 00:34:31)

Message:

Making the quit shortcut configurable

Another change was that the default value to the quit
feature was changed to "Ctrl+Shift+Q" to make it harder
to clash with keybinding of other app. (Closes: #92)

Files:

• data/guake.schemas (modified) (1 diff)
• src/guake.py (modified) (4 diffs)
• src/prefs.py (modified) (1 diff)

data/guake.schemas

@@ -264 +264 @@
                 <long>Global keybinding to allow user call guake from each
                 place after it's opened without clicks.</long>
+            </locale>
+        </schema>
+
+        <schema>
+            <key>/schemas/apps/guake/keybindings/local/quit</key>
+            <applyto>/apps/guake/keybindings/local/quit</applyto>
+            <owner>guake</owner>
+            <type>string</type>
+            <default>&lt;Control&gt;&lt;Shift&gt;q</default>
+            <locale name="C">
+                <short>Quit</short>
+                <long>Quit Guake.</long>
             </locale>
         </schema>

src/guake.py

@@ -304 +304 @@
         keys = ['toggle_fullscreen', 'new_tab', 'close_tab', 'rename_tab',
                 'previous_tab', 'next_tab', 'clipboard_copy', 'clipboard_paste',
+                'quit',
                 ]
         for key in keys:
@@ -337 +338 @@
         """
         gets = lambda x:self.client.get_string(LKEY(x))
+        key, mask = gtk.accelerator_parse(gets('quit'))
+        if key > 0:
+            gtk.accel_map_change_entry('<Guake>/Quit', key, mask, True)
+            ctxbtn = self.guake.get_widget('context_close')
+            ctxbtn.set_accel_path('<Guake>/Quit')
+
         key, mask = gtk.accelerator_parse(gets('new_tab'))
         if key > 0:
@@ -554 +561 @@
         self.hotkeys = globalhotkeys.GlobalHotkey()
         self.load_config()
-        self.load_accel_map()
 
         key = self.client.get_string(GKEY('show_hide'))
@@ -751 +757 @@
         self.client.notify(KEY('/general/use_default_font'))
 
-    def load_accel_map(self):
-        """Sets the accel map of quit context option.
-        """
-        key, mask = gtk.accelerator_parse('<Control>q')
-        gtk.accel_map_add_entry('<Guake>/Quit', key, mask)
-        btn = self.get_widget('context_close')
-        btn.set_accel_path('<Guake>/Quit')
-
     def accel_add(self, *args):
         """Callback to add a new tab. Called by the accel key.

src/prefs.py

@@ -55 +55 @@
               {'key': LKEY('toggle_fullscreen'),
                'label': _('Toggle Fullscreen')},
+              {'key': LKEY('quit'),
+               'label': _('Quit')},
               ]},