Ticket #37: guake.py.patch

.py

@@ -221 +221 @@
         ac = self.client.get_bool(GCONF_PATH + 'general/use_scrollbar')
         self.get_widget('show-scrollbar-checkbutton').set_active(ac)
 
+        # tray
+        ac = self.client.get_bool(GCONF_PATH + 'general/use_tray')
+        self.get_widget('show-tray-checkbutton').set_active(ac)
+ 
+
         # hide on lost focus
         ac = self.client.get_bool(GCONF_PATH + 'general/hide_on_lost_focus')
         self.get_widget('hide-onlostfocus-checkbutton').set_active(ac)
@@ -343 +348 @@
         fbool = chk.get_active()
         self.client.set_bool(GCONF_PATH + 'general/use_scrollbar', fbool)
         self.guake.toggle_scrollbars()
-        
+
+    def on_show_tray_checkbutton_toggled(self, chk):
+        fbool = chk.get_active()
+        self.client.set_bool(GCONF_PATH + 'general/use_tray', fbool)
+        self.guake.toggle_tray()
+
     def on_chk_lostfocus_toggled(self, chk):
         fbool = chk.get_active()
         self.client.set_bool(GCONF_PATH + 'general/hide_on_lost_focus', fbool)
@@ -574 +584 @@
         # setting global hotkey and showing a pretty notification =)
         globalhotkeys.init()
         key = self.client.get_string(GHOTKEYS[0][0])
-        filename = common.pixmapfile('guake-notification.png')
-        if not globalhotkeys.bind(key, self.show_hide):
-            n = pynotify.Notification(_('Guake!'),
-                _('A problem happened when binding <b>%s</b> key.\n'
-                  'Please use guake properties form to choose another '
-                  'key') % key, filename)
-        else:
-            n = pynotify.Notification(_('Guake!'),
-                _('Guake is already running,\n'
-                  'press <b>%s</b> to use it.') % key, filename)
-        n.show()
 
         # trayicon!
-        tray_icon = GuakeStatusIcon()
-        tray_icon.connect('popup-menu', self.show_menu)
-        tray_icon.connect('activate', self.show_hide)
-        tray_icon.show_all()
+        ac = self.client.get_bool(GCONF_PATH + 'general/use_tray')
+             if ac==True:
+           tray_icon = GuakeStatusIcon()
+           tray_icon = tray_icon.set_tray()
+           tray_icon.connect('popup-menu', self.show_menu)
+           tray_icon.connect('activate', self.show_hide)
+           tray_icon.show_all()
 
         # adding images from a different path.
         ipath = common.pixmapfile('guake.png')
@@ -641 +643 @@
         self.add_tab()
         self.toggle_ontop()
 
+        # pop up that guake is working (or not)
+        filename = common.pixmapfile('guake-notification.png')
+        if not globalhotkeys.bind(key, self.show_hide):
+            n = pynotify.Notification(_('Guake!'),
+                _('A problem happened when binding <b>%s</b> key.\n'
+                  'Please use guake properties form to choose another '
+                  'key') % key, filename)
+        else:
+            n = pynotify.Notification(_('Guake!'),
+                _('Guake is already running,\n'
+                  'press <b>%s</b> to use it.') % key, filename)
+
+        n.show()
+
     def on_window_lostfocus(self,window, event):
         getb = lambda x:self.client.get_bool(x)
         value = getb(GCONF_PATH+'general/hide_on_lost_focus')
@@ -849 +865 @@
         b = self.client.get_bool(GCONF_PATH+'general/window_ontop')
         self.window.set_keep_above(b)
 
+    def toggle_tray(self):
+        b = self.client.get_bool(GCONF_PATH+'general/use_tray')
+        if b==False:
+                 try:
+                   tray_icon = GuakeStatusIcon()
+                # To be fixed does not work yet, should remove all the tray
+               tray_icon.hide_all()
+              except:
+                     pass
+
     # -- format functions --
 
     def set_bgcolor(self):