Don't git-ignore the whole debian directory

[software/sadba.git] / src / lib-display-blanking-status-menu-widget.c

diff --git a/src/lib-display-blanking-status-menu-widget.c b/src/lib-display-blanking-status-menu-widget.c
index a3fbb2c1b46b72e9f258f85c2f52026894569393..dce50b68b7828c41775862f23a9cfc79f8bf410e 100644 (file)
--- a/src/lib-display-blanking-status-menu-widget.c
+++ b/src/lib-display-blanking-status-menu-widget.c
@@ -76,21 +76,34 @@ GType display_blanking_status_plugin_get_type (void);
 #define MODE_GCONF_ROOT "/system/osso/dsm/display"
 #define MODE_GCONF_KEY  MODE_GCONF_ROOT "/inhibit_blank_mode"
 
 #define MODE_GCONF_ROOT "/system/osso/dsm/display"
 #define MODE_GCONF_KEY  MODE_GCONF_ROOT "/inhibit_blank_mode"
 

+#define HOURS_GCONF_KEY   "/apps/Maemo/sadba/timed_inhibit_hours"
+#define MINUTES_GCONF_KEY "/apps/Maemo/sadba/timed_inhibit_minutes"
+

 #define INHIBIT_MSG_INTERVAL 30 // in seconds
 
 #define GETTEXT_DOM "status-area-displayblanking-applet"
 #define INHIBIT_MSG_INTERVAL 30 // in seconds
 
 #define GETTEXT_DOM "status-area-displayblanking-applet"

+#define _(str) dgettext (GETTEXT_DOM, (str))

 #define gettext_noop(str) (str)
 #define gettext_noop(str) (str)

+#define N_(str) gettext_noop(str)

 
 // Undocumented blanking modes as reported by David Weinehall from Nokia:
 // http://www.gossamer-threads.com/lists/maemo/developers/61201#61201
 #define BLANKING_MODES 5
 
 // Undocumented blanking modes as reported by David Weinehall from Nokia:
 // http://www.gossamer-threads.com/lists/maemo/developers/61201#61201
 #define BLANKING_MODES 5

-static const char *_DisplayBlankingDescription[BLANKING_MODES] =
+static const char *mode_title[BLANKING_MODES] =
+{
+    N_ ("Both enabled"),
+    N_ ("Both only on battery"),
+    N_ ("Blanking only on battery"),
+    N_ ("Both disabled"),
+    N_ ("Only dimming")
+};
+static const char *mode_desc[BLANKING_MODES] =

 {
 {

-    gettext_noop ("Both enabled"),
-    gettext_noop ("Both only on battery"),
-    gettext_noop ("Blanking only on battery"),
-    gettext_noop ("Both disabled"),
-    gettext_noop ("Only dimming")
+    N_ ("Blanking and dimming always enabled"),
+    N_ ("Blanking and dimming enabled only on battery"),
+    N_ ("Always dim, blank only on battery"),
+    N_ ("Blanking and dimming always disabled"),
+    N_ ("Blanking disabled, dimming enabled")

 };
 static const char *mode_icon_name[BLANKING_MODES] =
 {
 };
 static const char *mode_icon_name[BLANKING_MODES] =
 {


@@ -102,9 +115,11 @@ static const char *mode_icon_name[BLANKING_MODES] =
 };
 #define INHIBIT_ICON_NAME       "display-blanking-inhibit-icon"
 #define TIMED_INHIBIT_ICON_NAME "display-blanking-inhibit-icon.timed"
 };
 #define INHIBIT_ICON_NAME       "display-blanking-inhibit-icon"
 #define TIMED_INHIBIT_ICON_NAME "display-blanking-inhibit-icon.timed"

+#define INHIBIT_STATUS_ICON_NAME "display-blanking-status"

 
 struct _DisplayBlankingStatusPluginPrivate
 {
 
 struct _DisplayBlankingStatusPluginPrivate
 {

+    DisplayBlankingStatusPlugin* plugin;

     GConfClient *gconf_client;
     DBusConnection* dbus_conn;
     DBusMessage* dbus_msg;
     GConfClient *gconf_client;
     DBusConnection* dbus_conn;
     DBusMessage* dbus_msg;


@@ -155,6 +170,14 @@ disable_timer (gint *timer_id)
     *timer_id = 0;
 }
 
     *timer_id = 0;
 }
 

+static void
+disable_inhibition (DisplayBlankingStatusPluginPrivate *priv)
+{
+    disable_timer (&(priv->inhibit_timer_id));
+    hd_status_plugin_item_set_status_area_icon (
+            HD_STATUS_PLUGIN_ITEM (priv->plugin), NULL);
+}
+

 static gboolean
 on_inhibit_timeout (DisplayBlankingStatusPluginPrivate *priv)
 {
 static gboolean
 on_inhibit_timeout (DisplayBlankingStatusPluginPrivate *priv)
 {


@@ -168,7 +191,7 @@ on_inhibit_timeout (DisplayBlankingStatusPluginPrivate *priv)
 static gboolean
 on_timed_inhibit_timeout (DisplayBlankingStatusPluginPrivate *priv)
 {
 static gboolean
 on_timed_inhibit_timeout (DisplayBlankingStatusPluginPrivate *priv)
 {

-    disable_timer (&(priv->inhibit_timer_id));
+    disable_inhibition (priv);

     disable_timer (&(priv->timed_inhibit_timer_id));
 
     priv->inhibit_in_signal = TRUE;
     disable_timer (&(priv->timed_inhibit_timer_id));
 
     priv->inhibit_in_signal = TRUE;


@@ -178,19 +201,25 @@ on_timed_inhibit_timeout (DisplayBlankingStatusPluginPrivate *priv)
 
     GtkWidget *banner = hildon_banner_show_information (
             priv->timed_inhibit_button, NULL,
 
     GtkWidget *banner = hildon_banner_show_information (
             priv->timed_inhibit_button, NULL,

-            dgettext (GETTEXT_DOM, "Display blanking inhibition disabled"));
+            _ ("Display blanking inhibition disabled"));

     hildon_banner_set_timeout (HILDON_BANNER (banner), 5000);
 
     return FALSE;
 }
 
 static void
     hildon_banner_set_timeout (HILDON_BANNER (banner), 5000);
 
     return FALSE;
 }
 
 static void

-enable_inhibit_timer (DisplayBlankingStatusPluginPrivate *priv)
+enable_inhibition (DisplayBlankingStatusPluginPrivate *priv)

 {
     g_assert (priv->inhibit_timer_id == 0);
     priv->inhibit_timer_id = g_timeout_add_seconds (INHIBIT_MSG_INTERVAL,
             (GSourceFunc) on_inhibit_timeout, priv);
     g_assert (priv->inhibit_timer_id > 0);
 {
     g_assert (priv->inhibit_timer_id == 0);
     priv->inhibit_timer_id = g_timeout_add_seconds (INHIBIT_MSG_INTERVAL,
             (GSourceFunc) on_inhibit_timeout, priv);
     g_assert (priv->inhibit_timer_id > 0);

+
+    GtkIconTheme *icon_theme = gtk_icon_theme_get_default ();
+    GdkPixbuf *pixbuf = gtk_icon_theme_load_icon (icon_theme,
+            INHIBIT_STATUS_ICON_NAME, 18, GTK_ICON_LOOKUP_NO_SVG, NULL);
+    hd_status_plugin_item_set_status_area_icon (
+            HD_STATUS_PLUGIN_ITEM (priv->plugin), pixbuf);

 }
 
 static void
 }
 
 static void


@@ -221,29 +250,33 @@ on_inhibit_button_clicked (GtkWidget *button,
     else if (self_pressed && !other_pressed) {
         g_assert (priv->timed_inhibit_timer_id == 0);
 
     else if (self_pressed && !other_pressed) {
         g_assert (priv->timed_inhibit_timer_id == 0);
 

-        enable_inhibit_timer (priv);
+        enable_inhibition (priv);

     }
     else if (!self_pressed) {
         g_assert (!other_pressed);
         g_assert (priv->timed_inhibit_timer_id == 0);
 
     }
     else if (!self_pressed) {
         g_assert (!other_pressed);
         g_assert (priv->timed_inhibit_timer_id == 0);
 

-        disable_timer (&(priv->inhibit_timer_id));
+        disable_inhibition (priv);

     }
     else
         g_assert (FALSE);
 }
 
 static GtkWidget *
     }
     else
         g_assert (FALSE);
 }
 
 static GtkWidget *

-timed_inhibit_picker_new (const gchar* title, gsize selected, guint max,
+timed_inhibit_picker_new (const gchar* title, gsize current, guint max,

         guint step)
 {
     g_assert (max < 100);
     static gchar buffer[3]; // 2 for the number + 1 for \0
 
     GtkWidget *selector = hildon_touch_selector_entry_new_text ();
         guint step)
 {
     g_assert (max < 100);
     static gchar buffer[3]; // 2 for the number + 1 for \0
 
     GtkWidget *selector = hildon_touch_selector_entry_new_text ();

-    for (int i = 0; i <= max; i += step)
+    gint selected = -1;
+    for (int i = 0; i*step <= max; i++) {
+        if (i*step == current)
+            selected = i;

         hildon_touch_selector_append_text (HILDON_TOUCH_SELECTOR (selector),
         hildon_touch_selector_append_text (HILDON_TOUCH_SELECTOR (selector),

-                g_ascii_formatd (buffer, 3, "%.0f", i));
+                g_ascii_formatd (buffer, 3, "%.0f", i*step));
+    }

     hildon_gtk_entry_set_input_mode (GTK_ENTRY (
                 hildon_touch_selector_entry_get_entry (
                     HILDON_TOUCH_SELECTOR_ENTRY (selector))),
     hildon_gtk_entry_set_input_mode (GTK_ENTRY (
                 hildon_touch_selector_entry_get_entry (
                     HILDON_TOUCH_SELECTOR_ENTRY (selector))),


@@ -254,7 +287,10 @@ timed_inhibit_picker_new (const gchar* title, gsize selected, guint max,
     hildon_button_set_title (HILDON_BUTTON (picker), title);
     hildon_picker_button_set_selector (HILDON_PICKER_BUTTON (picker),
             HILDON_TOUCH_SELECTOR (selector));
     hildon_button_set_title (HILDON_BUTTON (picker), title);
     hildon_picker_button_set_selector (HILDON_PICKER_BUTTON (picker),
             HILDON_TOUCH_SELECTOR (selector));

-    hildon_picker_button_set_active (HILDON_PICKER_BUTTON (picker), selected);
+    hildon_picker_button_set_active (HILDON_PICKER_BUTTON (picker),
+            selected);
+    hildon_button_set_value (HILDON_BUTTON (picker),
+                g_ascii_formatd (buffer, 3, "%.0f", current));

 
     g_object_set_data (G_OBJECT (picker), "max", GUINT_TO_POINTER (max));
 
 
     g_object_set_data (G_OBJECT (picker), "max", GUINT_TO_POINTER (max));
 


@@ -275,14 +311,16 @@ timed_inhibit_get_input (DisplayBlankingStatusPluginPrivate *priv)
 {
     g_assert (priv->timed_inhibit_dialog == NULL);
     priv->timed_inhibit_dialog = gtk_dialog_new_with_buttons (
 {
     g_assert (priv->timed_inhibit_dialog == NULL);
     priv->timed_inhibit_dialog = gtk_dialog_new_with_buttons (

-            dgettext (GETTEXT_DOM, "Inhibit display blanking for..."), NULL,
-            GTK_DIALOG_MODAL, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
+            _ ("Inhibit display blanking for..."), NULL, GTK_DIALOG_MODAL,
+            GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,

             GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, NULL);
 
             GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, NULL);
 

-    GtkWidget *h_picker = timed_inhibit_picker_new (
-            dgettext (GETTEXT_DOM, "Hours"), 1, 24, 1);
-    GtkWidget *m_picker = timed_inhibit_picker_new (
-            dgettext (GETTEXT_DOM, "Minutes"), 0, 60, 10);
+    GtkWidget *h_picker = timed_inhibit_picker_new (_ ("Hours"),
+            gconf_client_get_int (priv->gconf_client, HOURS_GCONF_KEY, NULL),
+            24, 1);
+    GtkWidget *m_picker = timed_inhibit_picker_new (_ ("Minutes"),
+            gconf_client_get_int (priv->gconf_client, MINUTES_GCONF_KEY, NULL),
+            60, 10);

 
     GtkWidget *hbox = gtk_hbox_new (FALSE, 0);
     g_assert (hbox != NULL);
 
     GtkWidget *hbox = gtk_hbox_new (FALSE, 0);
     g_assert (hbox != NULL);


@@ -299,9 +337,18 @@ timed_inhibit_get_input (DisplayBlankingStatusPluginPrivate *priv)
     gint result = gtk_dialog_run (GTK_DIALOG (priv->timed_inhibit_dialog));
 
     guint timeout = 0;
     gint result = gtk_dialog_run (GTK_DIALOG (priv->timed_inhibit_dialog));
 
     guint timeout = 0;

-    if (result == GTK_RESPONSE_ACCEPT)
-        timeout = timed_inhibit_picker_get_value (h_picker) * 3600 +
-            timed_inhibit_picker_get_value (m_picker) * 60;
+    if (result == GTK_RESPONSE_ACCEPT) {
+        gint hours = timed_inhibit_picker_get_value (h_picker);
+        gint mins = timed_inhibit_picker_get_value (m_picker);
+
+        GError *e = NULL;
+        gconf_client_set_int (priv->gconf_client, HOURS_GCONF_KEY, hours, &e);
+        g_assert (e == NULL);
+        gconf_client_set_int (priv->gconf_client, MINUTES_GCONF_KEY, mins, &e);
+        g_assert (e == NULL);
+
+        timeout = hours*3600 + mins*60;
+    }

 
     gtk_widget_destroy (priv->timed_inhibit_dialog);
     priv->timed_inhibit_dialog = NULL;
 
     gtk_widget_destroy (priv->timed_inhibit_dialog);
     priv->timed_inhibit_dialog = NULL;


@@ -339,7 +386,7 @@ on_timed_inhibit_button_clicked (GtkWidget *button,
                 priv->inhibit_in_signal = FALSE;
             }
             else
                 priv->inhibit_in_signal = FALSE;
             }
             else

-                enable_inhibit_timer (priv);
+                enable_inhibition (priv);

 
             priv->timed_inhibit_timer_id = g_timeout_add_seconds (timeout,
                     (GSourceFunc) on_timed_inhibit_timeout, priv);
 
             priv->timed_inhibit_timer_id = g_timeout_add_seconds (timeout,
                     (GSourceFunc) on_timed_inhibit_timeout, priv);


@@ -355,7 +402,7 @@ on_timed_inhibit_button_clicked (GtkWidget *button,
     else { // !self_pressed
         g_assert (!other_pressed);
 
     else { // !self_pressed
         g_assert (!other_pressed);
 

-        disable_timer (&(priv->inhibit_timer_id));
+        disable_inhibition (priv);

         disable_timer (&(priv->timed_inhibit_timer_id));
     }
 }
         disable_timer (&(priv->timed_inhibit_timer_id));
     }
 }


@@ -365,11 +412,11 @@ on_mode_dialog_button_clicked (GtkWidget *button, GtkDialog *dialog)
 {
     const gchar *title = hildon_button_get_title (HILDON_BUTTON (button));
 
 {
     const gchar *title = hildon_button_get_title (HILDON_BUTTON (button));
 

-    gint *mode = (gint *) g_object_get_data (G_OBJECT(dialog), "mode");
+    gint *mode = (gint *) g_object_get_data (G_OBJECT (dialog), "mode");

     g_assert (mode != NULL);
 
     for (*mode = 0; *mode < BLANKING_MODES; (*mode)++) {
     g_assert (mode != NULL);
 
     for (*mode = 0; *mode < BLANKING_MODES; (*mode)++) {

-        if (strcmp (title, _DisplayBlankingDescription[*mode]) == 0)
+        if (strcmp (title, mode_title[*mode]) == 0)

             break;
     }
     g_assert (*mode < BLANKING_MODES);
             break;
     }
     g_assert (*mode < BLANKING_MODES);


@@ -384,7 +431,7 @@ mode_get_input (DisplayBlankingStatusPluginPrivate *priv)
     priv->mode_dialog = gtk_dialog_new ();
     gtk_window_set_modal (GTK_WINDOW (priv->mode_dialog), TRUE);
     gtk_window_set_title (GTK_WINDOW (priv->mode_dialog),
     priv->mode_dialog = gtk_dialog_new ();
     gtk_window_set_modal (GTK_WINDOW (priv->mode_dialog), TRUE);
     gtk_window_set_title (GTK_WINDOW (priv->mode_dialog),

-            dgettext (GETTEXT_DOM, "Select display blanking mode"));
+            _ ("Select display blanking mode"));

 
     GtkWidget *pan_area = hildon_pannable_area_new ();
     g_assert (pan_area != NULL);
 
     GtkWidget *pan_area = hildon_pannable_area_new ();
     g_assert (pan_area != NULL);


@@ -404,9 +451,8 @@ mode_get_input (DisplayBlankingStatusPluginPrivate *priv)
     for (int i = 0; i < BLANKING_MODES; i++) {
         GtkWidget *button =
                 hildon_button_new_with_text (HILDON_SIZE_FINGER_HEIGHT,
     for (int i = 0; i < BLANKING_MODES; i++) {
         GtkWidget *button =
                 hildon_button_new_with_text (HILDON_SIZE_FINGER_HEIGHT,

-                    HILDON_BUTTON_ARRANGEMENT_VERTICAL,
-                    dgettext (GETTEXT_DOM, (_DisplayBlankingDescription[i])),
-                    NULL);
+                    HILDON_BUTTON_ARRANGEMENT_VERTICAL, _ (mode_title[i]),
+                    _ (mode_desc[i]));

         hildon_button_set_style (HILDON_BUTTON (button),
             HILDON_BUTTON_STYLE_PICKER);
         GtkWidget *icon = gtk_image_new_from_icon_name (mode_icon_name[i],
         hildon_button_set_style (HILDON_BUTTON (button),
             HILDON_BUTTON_STYLE_PICKER);
         GtkWidget *icon = gtk_image_new_from_icon_name (mode_icon_name[i],


@@ -524,7 +570,7 @@ inhibit_button_new (const gchar *icon_name,
 
     GtkWidget *b = hildon_gtk_toggle_button_new (HILDON_SIZE_FINGER_HEIGHT |
             HILDON_SIZE_AUTO_WIDTH);
 
     GtkWidget *b = hildon_gtk_toggle_button_new (HILDON_SIZE_FINGER_HEIGHT |
             HILDON_SIZE_AUTO_WIDTH);

-    gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON(b), FALSE);
+    gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (b), FALSE);

     GtkWidget *icon = gtk_image_new_from_icon_name (icon_name,
             GTK_ICON_SIZE_DIALOG);
     gtk_button_set_image (GTK_BUTTON (b), icon);
     GtkWidget *icon = gtk_image_new_from_icon_name (icon_name,
             GTK_ICON_SIZE_DIALOG);
     gtk_button_set_image (GTK_BUTTON (b), icon);


@@ -555,6 +601,7 @@ display_blanking_status_plugin_init (DisplayBlankingStatusPlugin *plugin)
 
     priv = DISPLAY_BLANKING_STATUS_PLUGIN_GET_PRIVATE (plugin);
     plugin->priv = priv;
 
     priv = DISPLAY_BLANKING_STATUS_PLUGIN_GET_PRIVATE (plugin);
     plugin->priv = priv;

+    priv->plugin = plugin;

 
     init_gconf (priv);
     init_dbus (priv);
 
     init_gconf (priv);
     init_dbus (priv);