fahrenheit support for application indicator

[psensor.git] / src / ui_appindicator.c

diff --git a/src/ui_appindicator.c b/src/ui_appindicator.c
index 2c42f70..77a2991 100644 (file)
--- a/src/ui_appindicator.c
+++ b/src/ui_appindicator.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 jeanfi@gmail.com
+ * Copyright (C) 2010-2012 jeanfi@gmail.com
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -23,6 +23,7 @@
 #include <gtk/gtk.h>
 #include <libappindicator/app-indicator.h>
 
+#include "cfg.h"
 #include "psensor.h"
 #include "ui.h"
 #include "ui_appindicator.h"
@@ -30,6 +31,9 @@
 #include "ui_status.h"
 #include "ui_pref.h"
 
+static const char *ICON = "psensor_normal";
+static const char *ATTENTION_ICON = "psensor_hot";
+
 static GtkMenuItem **sensor_menu_items;
 static GtkWidget *main_window;
 static int appindicator_supported = 1;
@@ -96,56 +100,67 @@ static const char *menu_desc =
 "</ui>";
 
 static GtkActionEntry entries[] = {
-  { "PsensorMenuAction", NULL, "_Psensor" }, /* name, stock id, label */
-
-  { "ShowAction", NULL,        /* name, stock id */
-    "_Show", NULL, /* label, accelerator */
-    "Show",                    /* tooltip */
-    G_CALLBACK(cb_menu_show) },
-
-  { "PreferencesAction", GTK_STOCK_PREFERENCES,     /* name, stock id */
-    "_Preferences", NULL,                           /* label, accelerator */
-    "Preferences",                                  /* tooltip */
-    G_CALLBACK(cb_menu_preferences) },
-
-  { "SensorPreferencesAction", GTK_STOCK_PREFERENCES,
-    "S_ensor Preferences",
-    NULL,
-    "SensorPreferences",
-    G_CALLBACK(cb_sensor_preferences) },
-
-  { "AboutAction", NULL,
-    "_About",
-    NULL,
-    "About",
-    G_CALLBACK(cb_about) },
-
-  { "QuitAction",
-    GTK_STOCK_QUIT, "_Quit", NULL, "Quit", G_CALLBACK(cb_menu_quit) }
+       { "PsensorMenuAction", NULL, "_Psensor" },
+
+       { "ShowAction", NULL,
+         "_Show", NULL,
+         "Show",
+         G_CALLBACK(cb_menu_show) },
+
+       { "PreferencesAction", GTK_STOCK_PREFERENCES,
+         "_Preferences", NULL,
+         "Preferences",
+         G_CALLBACK(cb_menu_preferences) },
+
+       { "SensorPreferencesAction", GTK_STOCK_PREFERENCES,
+         "S_ensor Preferences",
+         NULL,
+         "SensorPreferences",
+         G_CALLBACK(cb_sensor_preferences) },
+
+       { "AboutAction", NULL,
+         "_About",
+         NULL,
+         "About",
+         G_CALLBACK(cb_about) },
+
+       { "QuitAction",
+         GTK_STOCK_QUIT, "_Quit", NULL, "Quit", G_CALLBACK(cb_menu_quit) }
 };
 static guint n_entries = G_N_ELEMENTS(entries);
 
-static void update_sensor_menu_item(GtkMenuItem *item, struct psensor *s)
+static void update_sensor_menu_item(GtkMenuItem *item,
+                                   struct psensor *s,
+                                   int use_celcius)
 {
        gchar *str;
+       double v;
+
+       v = psensor_get_current_value(s);
+
+       if (!use_celcius)
+               v = celcius_to_fahrenheit(v);
 
        str = g_strdup_printf("%s: %2.f %s",
                              s->name,
-                             psensor_get_current_value(s),
-                             psensor_type_to_unit_str(s->type));
+                             v,
+                             psensor_type_to_unit_str(s->type, use_celcius));
 
        gtk_menu_item_set_label(item, str);
 
        g_free(str);
 }
 
-static void update_sensor_menu_items(struct psensor **sensors)
+static void update_sensor_menu_items(struct psensor **sensors,
+                                    int use_celcius)
 {
        int n, i;
 
        n = psensor_list_size(sensors);
        for (i = 0; i < n; i++)
-               update_sensor_menu_item(sensor_menu_items[i], sensors[i]);
+               update_sensor_menu_item(sensor_menu_items[i],
+                                       sensors[i],
+                                       use_celcius);
 }
 
 static GtkWidget *get_menu(struct ui_psensor *ui)
@@ -158,7 +173,6 @@ static GtkWidget *get_menu(struct ui_psensor *ui)
        int n = psensor_list_size(ui->sensors);
        struct psensor **sensors = ui->sensors;
 
-
        action_group = gtk_action_group_new("PsensorActions");
        gtk_action_group_set_translation_domain(action_group, PACKAGE);
        menu_manager = gtk_ui_manager_new();
@@ -185,8 +199,10 @@ static GtkWidget *get_menu(struct ui_psensor *ui)
                                      GTK_WIDGET(sensor_menu_items[i]),
                                      i+2);
 
-               update_sensor_menu_item(sensor_menu_items[i],
-                                       s);
+               update_sensor_menu_item
+                       (sensor_menu_items[i],
+                        s,
+                        ui->config->temperature_unit == CELCIUS);
        }
 
 
@@ -210,16 +226,23 @@ void ui_appindicator_update(struct ui_psensor *ui, unsigned int attention)
                app_indicator_set_status
                    (indicator, APP_INDICATOR_STATUS_ATTENTION);
 
-       update_sensor_menu_items(ui->sensors);
+       update_sensor_menu_items(ui->sensors,
+                                ui->config->temperature_unit == CELCIUS);
 }
 
 static GtkStatusIcon *unity_fallback(AppIndicator *indicator)
 {
+       GtkStatusIcon *ico;
+
        log_debug("ui_appindicator#unity_fallback");
 
        appindicator_supported = 0;
 
-       return ui_status_get_icon(ui_psensor);
+       ico = ui_status_get_icon(ui_psensor);
+
+       ui_status_set_visible(1);
+
+       return ico;
 }
 
 static void
@@ -227,6 +250,8 @@ unity_unfallback(AppIndicator *indicator, GtkStatusIcon *status_icon)
 {
        log_debug("ui_appindicator#unity_unfallback");
 
+       ui_status_set_visible(0);
+
        appindicator_supported = 1;
 }
 
@@ -239,14 +264,14 @@ void ui_appindicator_init(struct ui_psensor *ui)
 
        indicator = app_indicator_new
                ("psensor",
-                "psensor_normal",
+                ICON,
                 APP_INDICATOR_CATEGORY_APPLICATION_STATUS);
 
        APP_INDICATOR_GET_CLASS(indicator)->fallback = unity_fallback;
        APP_INDICATOR_GET_CLASS(indicator)->unfallback = unity_unfallback;
 
        app_indicator_set_status(indicator, APP_INDICATOR_STATUS_ACTIVE);
-       app_indicator_set_attention_icon(indicator, "psensor_hot");
+       app_indicator_set_attention_icon(indicator, ATTENTION_ICON);
 
        menu = get_menu(ui);
        app_indicator_set_menu(indicator, GTK_MENU(menu));