added log file

[psensor.git] / src / ui_appindicator.c

diff --git a/src/ui_appindicator.c b/src/ui_appindicator.c
index eb11572..317e238 100644 (file)
--- a/src/ui_appindicator.c
+++ b/src/ui_appindicator.c
@@ -30,6 +30,10 @@
 #include "ui_sensorpref.h"
 #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)
 {
        struct ui_psensor *ui = (struct ui_psensor *)data;
@@ -61,17 +65,34 @@ 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 =
 "<ui>"
 "  <popup name='MainMenu'>"
 "      <menuitem name='Show' action='ShowAction' />"
+"      <separator />"
+"      <separator />"
 "      <menuitem name='Preferences' action='PreferencesAction' />"
 "      <menuitem name='SensorPreferences' action='SensorPreferencesAction' />"
 "      <separator />"
+"      <menuitem name='About' action='AboutAction' />"
+"      <separator />"
 "      <menuitem name='Quit' action='QuitAction' />"
 "  </popup>"
 "</ui>";
@@ -95,16 +116,51 @@ 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) }
 };
 static guint n_entries = G_N_ELEMENTS(entries);
 
+static void update_sensor_menu_item(GtkMenuItem *item, struct psensor *s)
+{
+       gchar *str;
+
+       str = g_strdup_printf("%s: %2.f %s",
+                             s->name,
+                             psensor_get_current_value(s),
+                             psensor_type_to_unit_str(s->type));
+
+       gtk_menu_item_set_label(item, str);
+
+       g_free(str);
+}
+
+static void update_sensor_menu_items(struct psensor **sensors)
+{
+       int n = psensor_list_size(sensors);
+       int i;
+
+       for (i = 0; i < n; i++)
+               update_sensor_menu_item(sensor_menu_items[i],
+                                       sensors[i]);
+}
+
 static GtkWidget *get_menu(struct ui_psensor *ui)
 {
-       GtkActionGroup      *action_group;
-       GtkUIManager        *menu_manager;
-       GError              *error;
+       GtkActionGroup *action_group;
+       GtkUIManager *menu_manager;
+       GError *error;
+       GtkMenu *menu;
+       int i;
+       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);
@@ -119,7 +175,25 @@ static GtkWidget *get_menu(struct ui_psensor *ui)
        if (error)
                g_error(_("building menus failed: %s"), error->message);
 
-       return gtk_ui_manager_get_widget(menu_manager, "/MainMenu");
+       menu = GTK_MENU(gtk_ui_manager_get_widget(menu_manager, "/MainMenu"));
+
+       sensor_menu_items = malloc(sizeof(GtkWidget *)*n);
+       for (i = 0; i < n; i++) {
+               struct psensor *s = sensors[i];
+
+               sensor_menu_items[i]
+                       = GTK_MENU_ITEM(gtk_menu_item_new_with_label(s->name));
+
+               gtk_menu_shell_insert(GTK_MENU_SHELL(menu),
+                                     GTK_WIDGET(sensor_menu_items[i]),
+                                     i+2);
+
+               update_sensor_menu_item(sensor_menu_items[i],
+                                       s);
+       }
+
+
+       return GTK_WIDGET(menu);
 }
 
 
@@ -152,20 +226,55 @@ void ui_appindicator_update(struct ui_psensor *ui)
        if (attention && status == APP_INDICATOR_STATUS_ACTIVE)
                app_indicator_set_status
                    (ui->indicator, APP_INDICATOR_STATUS_ATTENTION);
+
+       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");
 
        indicatormenu = get_menu(ui);
+
+       gtk_widget_show_all(indicatormenu);
+
        app_indicator_set_menu(ui->indicator, GTK_MENU(indicatormenu));
 }
+
+int is_appindicator_supported()
+{
+       return appindicator_supported;
+}