added log file

[psensor.git] / src / ui_appindicator.c

diff --git a/src/ui_appindicator.c b/src/ui_appindicator.c
index 153046e..317e238 100644 (file)
--- a/src/ui_appindicator.c
+++ b/src/ui_appindicator.c
@@ -31,6 +31,8 @@
 #include "ui_pref.h"
 
 static GtkMenuItem **sensor_menu_items;
+static GtkWidget *main_window;
+static int appindicator_supported = 1;
 
 static void cb_menu_show(GtkMenuItem *mi, gpointer data)
 {
@@ -63,8 +65,21 @@ cb_sensor_preferences(GtkMenuItem *mi, gpointer data)
 {
        struct ui_psensor *ui = data;
 
+#ifdef HAVE_APPINDICATOR_029
+       gdk_threads_enter();
+#endif
+
        if (ui->sensors && *ui->sensors)
                ui_sensorpref_dialog_run(*ui->sensors, ui);
+
+#ifdef HAVE_APPINDICATOR_029
+       gdk_threads_leave();
+#endif
+}
+
+static void cb_about(GtkMenuItem *mi, gpointer data)
+{
+       ui_show_about_dialog();
 }
 
 static const char *menu_desc =
@@ -76,6 +91,8 @@ static const char *menu_desc =
 "      <menuitem name='Preferences' action='PreferencesAction' />"
 "      <menuitem name='SensorPreferences' action='SensorPreferencesAction' />"
 "      <separator />"
+"      <menuitem name='About' action='AboutAction' />"
+"      <separator />"
 "      <menuitem name='Quit' action='QuitAction' />"
 "  </popup>"
 "</ui>";
@@ -99,6 +116,12 @@ static GtkActionEntry entries[] = {
     "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) }
 };
@@ -108,9 +131,10 @@ static void update_sensor_menu_item(GtkMenuItem *item, struct psensor *s)
 {
        gchar *str;
 
-       str = g_strdup_printf("%s: %2.f",
+       str = g_strdup_printf("%s: %2.f %s",
                              s->name,
-                             psensor_get_current_value(s));
+                             psensor_get_current_value(s),
+                             psensor_type_to_unit_str(s->type));
 
        gtk_menu_item_set_label(item, str);
 
@@ -206,15 +230,40 @@ void ui_appindicator_update(struct ui_psensor *ui)
        update_sensor_menu_items(ui->sensors);
 }
 
+static GtkStatusIcon *unity_fallback(AppIndicator *indicator)
+{
+       log_puts(LOG_DEBUG, "ui_appindicator#unity_fallback");
+
+       gtk_widget_show_all(main_window);
+
+       appindicator_supported = 0;
+
+       return NULL;
+}
+
+static void unity_unfallback(AppIndicator *indicator,
+                            GtkStatusIcon *status_icon)
+{
+       log_puts(LOG_DEBUG, "ui_appindicator#unity_unfallback");
+
+       appindicator_supported = 1;
+}
+
+
 void ui_appindicator_init(struct ui_psensor *ui)
 {
        GtkWidget *indicatormenu;
 
+       main_window = ui->main_window;
+
        ui->indicator
            = app_indicator_new("psensor",
-                               "psensor",
+                               "psensor_normal",
                                APP_INDICATOR_CATEGORY_APPLICATION_STATUS);
 
+       APP_INDICATOR_GET_CLASS(ui->indicator)->fallback = unity_fallback;
+       APP_INDICATOR_GET_CLASS(ui->indicator)->unfallback = unity_unfallback;
+
        app_indicator_set_status(ui->indicator, APP_INDICATOR_STATUS_ACTIVE);
        app_indicator_set_attention_icon(ui->indicator, "psensor_hot");
 
@@ -224,3 +273,8 @@ void ui_appindicator_init(struct ui_psensor *ui)
 
        app_indicator_set_menu(ui->indicator, GTK_MENU(indicatormenu));
 }
+
+int is_appindicator_supported()
+{
+       return appindicator_supported;
+}