Merge lp:~3v1n0/caffeine/screensaver-lock-support into lp:caffeine

[Marco Trevisan (Treviño)]

Support for disabling ScreenSaver Lock

I've added some methods to disable the ScreenSaver lock; actually
I've implemented this just for Gnome, but it could be easily ported
to other screensaving systems which supports something similar.
(since the "public" core methods are generic)

Now, (when possible) from the Caffine Menu you can control if the
screensaver lock should be enabled or not.

[Reuben Thomas (rrt)]

I don't think controlling the screensaver lock is really Caffeine's job.

Unmerged revisions

367. By Marco Trevisan (Treviño) on 2011-03-04

Support for disabling ScreenSaver Lock

I've added some methods to disable the ScreenSaver lock; actually
I've implemented this just for Gnome, but it could be easily ported
to other screensaving systems which supports something similar.
(since the "public" core methods are generic)

Now, (when possible) from the Caffine Menu you can control if the
screensaver lock should be enabled or not.

=== modified file 'caffeine/core.py'
--- caffeine/core.py	2011-01-14 20:12:35 +0000
+++ caffeine/core.py	2011-03-04 20:53:56 +0000
@@ -279,6 +279,55 @@
         if self.dbusDetectionTimer:
             self.dbusDetectionTimer.cancel()
 
+    def isLockAvailable(self):
+        if self.screensaverAndPowersavingType == None:
+            if self.attemptingToDetect == False:
+                self.attemptingToDetect = True
+                self._detectScreensaverAndPowersavingType()
+
+        if self.screensaverAndPowersavingType == "Gnome":
+            return True
+
+        return False
+
+    def isLocking(self):
+        if not self.isLockAvailable():
+            return False
+        
+        if self.screensaverAndPowersavingType == "Gnome":
+            return self._get_gnome_lock()
+
+        return False
+
+    def lockEnable(self, enable):
+        if not self.isLockAvailable():
+            return
+
+        if self.screensaverAndPowersavingType == "Gnome":
+            self._set_gnome_lock(enable)
+
+    def onLockChangeCb(self, toggle_func, data=None):
+        if not self.isLockAvailable():
+            return
+        
+        if self.screensaverAndPowersavingType == "Gnome":
+            self._register_gnome_lock_cb(toggle_func, data)
+
+    def _get_gnome_lock(self):
+        return self.Conf.client.get_bool("/apps/gnome-screensaver/lock_enabled")
+
+    def _set_gnome_lock(self, enable):
+        self.Conf.client.set_bool("/apps/gnome-screensaver/lock_enabled", enable)
+
+    def _register_gnome_lock_cb(self, toggle_func, data):
+        self.Conf.client.notify_add("/apps/gnome-screensaver/lock_enabled",
+                                    self._gnome_lock_option_changed, [toggle_func, data])
+
+    def _gnome_lock_option_changed(self, client, cnxn_id, entry, args):
+        toggle_func = args[0]
+        data = args[1]
+        toggle_func(data)
+
     ## The following four methods deal with adding the correct syntax
     ## for plural forms of time units. For example, 1 minute and 2
     ## minutes. Will be obsolete once the application is

=== modified file 'caffeine/main.py'
--- caffeine/main.py	2011-01-14 20:50:42 +0000
+++ caffeine/main.py	2011-03-04 20:53:56 +0000
@@ -371,6 +371,12 @@
         
 
         self.activate_menuitem = get("activate_menuitem")
+        self.toggle_lock_menuitem = get("toggle_lock_menuitem")
+
+        if self.Core.isLockAvailable():
+            self.toggle_lock_menuitem.show()
+            self.lock_menuitem_set_label(self.toggle_lock_menuitem)
+            self.Core.onLockChangeCb(self.on_lock_toggle, self.toggle_lock_menuitem)
 
         self.set_icon_is_activated(self.Core.getActivated())
 
@@ -626,6 +632,13 @@
         label = [_("Disable Screensaver"), _("Enable Screensaver")]
         menuitem.set_label (label[self.Core.getActivated()])
 
+    def lock_menuitem_set_label(self, menuitem):
+        label = [_("Disable Screensaver Lock"), _("Enable Screensaver Lock")]
+        menuitem.set_label (label[not self.Core.isLocking()])
+
+    def on_lock_toggle (self, menuitem, data=None):
+        self.Core.lockEnable(not self.Core.isLocking())
+        self.lock_menuitem_set_label(menuitem)
 
     def on_time_menuitem_activate(self, menuitem, data=None):
 

=== modified file 'share/caffeine/glade/GUI.glade'
--- share/caffeine/glade/GUI.glade	2011-01-14 20:50:42 +0000
+++ share/caffeine/glade/GUI.glade	2011-03-04 20:53:56 +0000
@@ -712,6 +712,14 @@
       </object>
     </child>
     <child>
+      <object class="GtkMenuItem" id="toggle_lock_menuitem">
+        <property name="visible">False</property>
+        <property name="label" translatable="yes">Disable Screensaver Lock</property>
+        <property name="use_underline">True</property>
+        <signal name="activate" handler="on_lock_toggle"/>
+      </object>
+    </child>
+    <child>
       <object class="GtkSeparatorMenuItem" id="menuitem2">
         <property name="visible">True</property>
       </object>