[Goodies-commits] r7645 - in xfce4-power-manager/trunk: . settings

[Ali Abdallah]

Author: aliov
Date: 2009-06-30 14:41:12 +0000 (Tue, 30 Jun 2009)
New Revision: 7645

Modified:
   xfce4-power-manager/trunk/ChangeLog
   xfce4-power-manager/trunk/settings/xfpm-settings.c
Log:
	* settings/xfpm-setting.c Don't allow brightness timeout to be less than
	DPMS sleep timeout.
	

Modified: xfce4-power-manager/trunk/ChangeLog
===================================================================
--- xfce4-power-manager/trunk/ChangeLog	2009-06-29 14:45:41 UTC (rev 7644)
+++ xfce4-power-manager/trunk/ChangeLog	2009-06-30 14:41:12 UTC (rev 7645)
@@ -1,3 +1,7 @@
+2009-06-30: 15:00 Ali aliov at xfce.org
+	* settings/xfpm-setting.c Don't allow brightness timeout to be less than
+	DPMS sleep timeout.
+	
 2009-06-28: 12:10 Ali aliov at xfce.org
 	* Use xfpm-dbus-monitor for dbus monitoring stuff, so hal-monitor is removed.
 	* hal-device.c Fix a Glib warnings when DBus is disconnected.

Modified: xfce4-power-manager/trunk/settings/xfpm-settings.c
===================================================================
--- xfce4-power-manager/trunk/settings/xfpm-settings.c	2009-06-29 14:45:41 UTC (rev 7644)
+++ xfce4-power-manager/trunk/settings/xfpm-settings.c	2009-06-30 14:41:12 UTC (rev 7645)
@@ -43,6 +43,7 @@
 #include "xfpm-enum.h"
 
 #define INTERFACE_FILE INTERFACES_DIR "/xfpm-settings.ui"
+#define BRIGHTNESS_DISABLED 	9
 
 static 	GtkBuilder *xml 			= NULL;
 static  GtkWidget  *nt				= NULL;
@@ -54,6 +55,8 @@
 static  GtkWidget *on_ac_dpms_off 		= NULL;
 #endif
 
+static  gboolean  lcd_brightness = FALSE;
+
 /*
  * GtkBuilder callbacks
  */
@@ -403,8 +406,10 @@
 sleep_on_battery_value_changed_cb (GtkWidget *w, XfconfChannel *channel)
 {
 #ifdef HAVE_DPMS
+    GtkWidget *brg;
     gint off_value    = (gint)gtk_range_get_value (GTK_RANGE (on_battery_dpms_off));
     gint sleep_value  = (gint)gtk_range_get_value (GTK_RANGE (w));
+    gint brightness_value;
     
     if ( off_value != 0 )
     {
@@ -414,6 +419,17 @@
 	}
     }
     
+    if ( lcd_brightness )
+    {
+	brg = GTK_WIDGET (gtk_builder_get_object (xml, "brg-on-battery"));
+	brightness_value = (gint) gtk_range_get_value (GTK_RANGE (brg));
+	
+	if ( sleep_value * 60 <= brightness_value && brightness_value != BRIGHTNESS_DISABLED)
+	{
+	    gtk_range_set_value (GTK_RANGE (brg), BRIGHTNESS_DISABLED);
+	}
+    }
+    
     if (!xfconf_channel_set_uint (channel, PROPERTIES_PREFIX ON_BATT_DPMS_SLEEP, sleep_value))
     {
 	g_critical ("Cannot set value for property %s\n", ON_BATT_DPMS_SLEEP);
@@ -447,6 +463,9 @@
 sleep_on_ac_value_changed_cb (GtkWidget *w, XfconfChannel *channel)
 {
 #ifdef HAVE_DPMS
+    GtkWidget *brg;
+
+    gint brightness_value;
     gint off_value    = (gint)gtk_range_get_value (GTK_RANGE(on_ac_dpms_off));
     gint sleep_value  = (gint)gtk_range_get_value (GTK_RANGE(w));
     
@@ -461,6 +480,18 @@
 	}
     }
 
+    if ( lcd_brightness )
+    {
+	brg = GTK_WIDGET (gtk_builder_get_object (xml, "brg-on-ac"));
+    
+	brightness_value = (gint) gtk_range_get_value (GTK_RANGE (brg));
+	
+	if ( sleep_value * 60 <= brightness_value && brightness_value != BRIGHTNESS_DISABLED)
+	{
+	    gtk_range_set_value (GTK_RANGE (brg), BRIGHTNESS_DISABLED);
+	}
+    }
+
     if (!xfconf_channel_set_uint (channel, PROPERTIES_PREFIX ON_AC_DPMS_SLEEP, sleep_value))
     {
 	g_critical ("Cannot set value for property %s\n", ON_AC_DPMS_SLEEP);
@@ -532,7 +563,7 @@
     else 
 	if ( min == 0 )      return g_strdup_printf ("%d %s", h, _("hours"));
 	else if ( min == 1 ) return g_strdup_printf ("%d %s %s", h, _("hours"), _("one minute"));
-	else            return g_strdup_printf ("%d %s %d %s", h, _("hours"), min, _("minutes"));
+	else                 return g_strdup_printf ("%d %s %d %s", h, _("hours"), min, _("minutes"));
 }
 
 /*
@@ -550,7 +581,16 @@
 void
 brightness_on_battery_value_changed_cb (GtkWidget *w, XfconfChannel *channel)
 {
-    gint value    = (gint)gtk_range_get_value (GTK_RANGE(w));
+    gint dpms_sleep = (gint) gtk_range_get_value (GTK_RANGE (on_battery_dpms_sleep) );
+    gint value    = (gint)gtk_range_get_value (GTK_RANGE (w));
+
+    if ( value != BRIGHTNESS_DISABLED )
+    {
+	if ( dpms_sleep != 0 && dpms_sleep * 60 <= value)
+	{
+	    gtk_range_set_value (GTK_RANGE (on_battery_dpms_sleep), (value / 60) + 1);
+	}
+    }
     
     if (!xfconf_channel_set_uint (channel, PROPERTIES_PREFIX BRIGHTNESS_ON_BATTERY, value))
     {
@@ -561,8 +601,17 @@
 void
 brightness_on_ac_value_changed_cb (GtkWidget *w, XfconfChannel *channel)
 {
-    gint value    = (gint)gtk_range_get_value (GTK_RANGE(w));
-    
+    gint dpms_sleep = (gint) gtk_range_get_value (GTK_RANGE (on_ac_dpms_sleep) );
+    gint value    = (gint)gtk_range_get_value (GTK_RANGE (w));
+
+    if ( value != BRIGHTNESS_DISABLED )
+    {
+	if ( dpms_sleep != 0 && dpms_sleep * 60 <= value)
+	{
+	    gtk_range_set_value (GTK_RANGE (on_ac_dpms_sleep), (value / 60) + 1);
+	}
+    }
+
     if (!xfconf_channel_set_uint (channel, PROPERTIES_PREFIX BRIGHTNESS_ON_AC, value))
     {
 	g_critical ("Cannot set value for property %s\n", BRIGHTNESS_ON_AC);
@@ -1519,7 +1568,9 @@
 	xfce_err ("%s : %s", error->message, _("Check your power manager installation"));
 	g_error ("%s", error->message);
     }
-
+    
+    lcd_brightness = has_lcd_brightness;
+    
 #ifdef HAVE_DPMS
     on_battery_dpms_sleep = GTK_WIDGET (gtk_builder_get_object (xml, "sleep-dpms-on-battery"));
     on_battery_dpms_off = GTK_WIDGET (gtk_builder_get_object (xml, "off-dpms-on-battery"));