Merge lp:~bzeghers/caffeine/main into lp:caffeine

[Ben]

This patch adds an option to show/hide the notification message when starting caffeine. I got tired of seeing it on every startup so why not add an option to disable it?

[Isaiah Heyer (freshapplepy)]

There isn't supposed to be a notification when starting Caffeine...what does the notification say?

[Ben (bzeghers)]

I get a notification that says "Caffeine is running To show the tray icon,
run 'caffeine -p' or open Caffeine Preferences from your system menu." every
time caffeine is started (manually and on startup). I have had this come up
on two installs of 10.10 and on 10.04 on another box.

On Thu, Jan 13, 2011 at 11:29 PM, Isaiah Heyer <email address hidden>wrote:

> There isn't supposed to be a notification when starting Caffeine...what
> does the notification say?
> --
> https://code.launchpad.net/~bzeghers/caffeine/main/+merge/46228<https://code.launchpad.net/%7Ebzeghers/caffeine/main/+merge/46228>
> You are the owner of lp:~bzeghers/caffeine/main.
>

[Isaiah Heyer (freshapplepy)]

So you have the tray icon hidden?

[Ben (bzeghers)]

Yes, I do. There really isn't any need (for me anyway) for the tray icon. If I want to change a setting I can get into the caffeine preferences from the settings menu. I don't really need my tray starting to look like a Windows system tray :)

[Isaiah Heyer (freshapplepy)]

review: Approve

=== modified file 'caffeine/__init__.py'
--- caffeine/__init__.py	2010-12-22 18:08:19 +0000
+++ caffeine/__init__.py	2011-01-14 05:10:13 +0000
@@ -120,6 +120,8 @@
     "act_for_flash"), False)
 _conf.register_opt("show_tray_icon", os.path.join(_key,
     "show_tray_icon"), True)
+_conf.register_opt("show_notification", os.path.join(_key,
+    "show_notification"), True)
 
 ## Functions to add/remove Caffeine from the list of startup programs
 import shutil

=== modified file 'caffeine/main.py'
--- caffeine/main.py	2010-12-22 19:12:43 +0000
+++ caffeine/main.py	2011-01-14 05:10:13 +0000
@@ -347,6 +347,7 @@
         get = builder.get_object
         
         show_tray_icon = self.Conf.get("show_tray_icon").get_bool()
+        show_notification = self.Conf.get("show_notification").get_bool()
 
         if appindicator_avail:
             self.AppInd = appindicator.Indicator ("caffeine-cup-empty",
@@ -362,7 +363,7 @@
             self.status_icon = get("statusicon")
             self.status_icon.set_visible(show_tray_icon)
         
-        if show_tray_icon is False and options.preferences is not True:
+        if show_notification is True and options.preferences is not True:
             note = pynotify.Notification(_("Caffeine is running"), _("To show the tray icon, \nrun ") + "'caffeine -p' " + _("or open Caffeine Preferences from your system menu."), "caffeine")
 
             note.show()
@@ -413,6 +414,7 @@
         self.ql_cb = get("ql_cbutton")
         self.flash_cb = get("flash_cbutton")
         self.trayicon_cb = get("trayicon_cbutton")
+        self.notification_cb = get("notification_cbutton")
 
         self.Conf.client.notify_add("/apps/caffeine/prefs/autostart",
                 self.on_gconf_autostart_changed)
@@ -430,6 +432,7 @@
         self.ql_cb.set_active(self.Conf.get("act_for_ql").get_bool())
         self.flash_cb.set_active(self.Conf.get("act_for_flash").get_bool())
         self.trayicon_cb.set_active(self.Conf.get("show_tray_icon").get_bool())
+        self.notification_cb.set_active(self.Conf.get("show_notification").get_bool())
 
         ## about dialog
         self.about_dialog = get("aboutdialog")
@@ -598,6 +601,13 @@
         #if state = False:
             
         self.Conf.set("show_tray_icon", state)
+    
+    def on_notification_cbutton_toggled(self, cbutton, data=None):
+        state = cbutton.get_active()
+
+        #if state = False:
+            
+        self.Conf.set("show_notification", state)
 
     #### Menu callbacks
     def on_activate_menuitem_activate (self, menuitem, data=None):

=== modified file 'share/caffeine/glade/GUI.glade'
--- share/caffeine/glade/GUI.glade	2010-12-22 19:12:43 +0000
+++ share/caffeine/glade/GUI.glade	2011-01-14 05:10:13 +0000
@@ -383,6 +383,40 @@
                                 <property name="position">5</property>
                               </packing>
                             </child>
+                            <child>
+                              <object class="GtkLabel" id="label8">
+                                <property name="visible">True</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">Notification</property>
+                                <attributes>
+                                  <attribute name="weight" value="bold"/>
+                                </attributes>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="position">4</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkAlignment" id="alignment6">
+                                <property name="visible">True</property>
+                                <property name="left_padding">10</property>
+                                <child>
+                                  <object class="GtkCheckButton" id="notification_cbutton">
+                                    <property name="label" translatable="yes">Show notification message</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="draw_indicator">True</property>
+                                    <signal name="toggled" handler="on_notification_cbutton_toggled"/>
+                                  </object>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="position">5</property>
+                              </packing>
+                            </child>
                           </object>
                           <packing>
                             <property name="position">0</property>