X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fui_appindicator.c;h=4b4f9d6d8d9e9c7081b3ddc94aeb7cc8b0990855;hb=01515c2f46a2b0cc70c0ef54f49d16493a2b5ce2;hp=7961100cca8d254e77787815d0a0ccc0c23b1a92;hpb=fc7e3cbee1da3ec94be41084dbf9ae22bfe0d676;p=psensor.git diff --git a/src/ui_appindicator.c b/src/ui_appindicator.c index 7961100..4b4f9d6 100644 --- a/src/ui_appindicator.c +++ b/src/ui_appindicator.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2012 jeanfi@gmail.com + * Copyright (C) 2010-2014 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 @@ -34,23 +34,18 @@ static const char *ICON = "psensor_normal"; static const char *ATTENTION_ICON = "psensor_hot"; -static GtkMenuItem **sensor_menu_items; -static GtkWidget *main_window; +static struct psensor **sensors; +static GtkMenuItem **menu_items; static int appindicator_supported = 1; static AppIndicator *indicator; static struct ui_psensor *ui_psensor; -static void cb_menu_show(GtkMenuItem *mi, gpointer data) +void cb_menu_show(GtkMenuItem *mi, gpointer data) { ui_window_show((struct ui_psensor *)data); } -static void cb_menu_quit(GtkMenuItem *mi, gpointer data) -{ - ui_psensor_quit(data); -} - -static void cb_menu_preferences(GtkMenuItem *mi, gpointer data) +void ui_appindicator_cb_preferences(GtkMenuItem *mi, gpointer data) { #ifdef HAVE_APPINDICATOR_029 gdk_threads_enter(); @@ -63,7 +58,7 @@ static void cb_menu_preferences(GtkMenuItem *mi, gpointer data) #endif } -static void cb_sensor_preferences(GtkMenuItem *mi, gpointer data) +void ui_appindicator_cb_sensor_preferences(GtkMenuItem *mi, gpointer data) { struct ui_psensor *ui = data; @@ -79,161 +74,155 @@ static void cb_sensor_preferences(GtkMenuItem *mi, gpointer data) #endif } -static void cb_about(GtkMenuItem *mi, gpointer data) -{ - ui_show_about_dialog(); -} - -static const char *menu_desc = -"" -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -""; - -static GtkActionEntry entries[] = { - { "PsensorMenuAction", NULL, "_Psensor" }, - - { "ShowAction", NULL, - N_("_Show"), NULL, - N_("Show"), - G_CALLBACK(cb_menu_show) }, - - { "PreferencesAction", GTK_STOCK_PREFERENCES, - N_("_Preferences"), NULL, - N_("Preferences"), - G_CALLBACK(cb_menu_preferences) }, - - { "SensorPreferencesAction", GTK_STOCK_PREFERENCES, - N_("S_ensor Preferences"), - NULL, - N_("SensorPreferences"), - G_CALLBACK(cb_sensor_preferences) }, - - { "AboutAction", NULL, - N_("_About"), - NULL, - N_("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, - int use_celcius) +static void +update_menu_item(GtkMenuItem *item, struct psensor *s, int use_celcius) { gchar *str; - double v; - - v = psensor_get_current_value(s); + char *v; - if (is_temp_type(s->type) && !use_celcius) - v = celcius_to_fahrenheit(v); + v = psensor_current_value_to_str(s, use_celcius); - str = g_strdup_printf("%s: %2.f %s", - s->name, - v, - psensor_type_to_unit_str(s->type, use_celcius)); + str = g_strdup_printf("%s: %s", s->name, v); gtk_menu_item_set_label(item, str); + free(v); g_free(str); } -static void update_sensor_menu_items(struct psensor **sensors, - int use_celcius) +static void update_menu_items(int use_celcius) { - int n, i; + struct psensor **s; + GtkMenuItem **m; + + if (!sensors) + return ; - n = psensor_list_size(sensors); - for (i = 0; i < n; i++) - update_sensor_menu_item(sensor_menu_items[i], - sensors[i], - use_celcius); + for (s = sensors, m = menu_items; *s; s++, m++) + update_menu_item(*m, *s, use_celcius); } -static GtkWidget *get_menu(struct ui_psensor *ui) +static void +build_sensor_menu_items(const struct ui_psensor *ui, + GtkMenu *menu) { - GtkActionGroup *action_group; - GtkUIManager *menu_manager; - GError *error; - GtkMenu *menu; - int i; - int n = psensor_list_size(ui->sensors); - struct psensor **sensors = ui->sensors; + int i, j, n, celcius; + const char *name; + struct psensor **sorted_sensors; - action_group = gtk_action_group_new("PsensorActions"); - gtk_action_group_set_translation_domain(action_group, PACKAGE); - menu_manager = gtk_ui_manager_new(); + free(menu_items); - gtk_action_group_add_actions(action_group, entries, n_entries, ui); - gtk_ui_manager_insert_action_group(menu_manager, action_group, 0); + celcius = ui->config->temperature_unit == CELCIUS; - error = NULL; - gtk_ui_manager_add_ui_from_string(menu_manager, menu_desc, -1, &error); + sorted_sensors = ui_get_sensors_ordered_by_position(ui); + n = psensor_list_size(sorted_sensors); + menu_items = malloc(n * sizeof(GtkWidget *)); + sensors = malloc((n + 1) * sizeof(struct psensor *)); + for (i = 0, j = 0; i < n; i++) { + if (config_is_appindicator_enabled(sorted_sensors[i]->id)) { + sensors[j] = sorted_sensors[i]; + name = sensors[j]->name; + + menu_items[j] = GTK_MENU_ITEM + (gtk_menu_item_new_with_label(name)); + + gtk_menu_shell_insert(GTK_MENU_SHELL(menu), + GTK_WIDGET(menu_items[j]), + j+2); - if (error) - g_error(_("building menus failed: %s"), error->message); + update_menu_item(menu_items[j], sensors[j], celcius); - menu = GTK_MENU(gtk_ui_manager_get_widget(menu_manager, "/MainMenu")); + j++; + } + } + + sensors[j] = NULL; - sensor_menu_items = malloc(sizeof(GtkWidget *)*n); - for (i = 0; i < n; i++) { - struct psensor *s = sensors[i]; + free(sorted_sensors); +} - sensor_menu_items[i] - = GTK_MENU_ITEM(gtk_menu_item_new_with_label(s->name)); +static GtkWidget *get_menu(struct ui_psensor *ui) +{ + GError *error; + GtkMenu *menu; + guint ok; + GtkBuilder *builder; - gtk_menu_shell_insert(GTK_MENU_SHELL(menu), - GTK_WIDGET(sensor_menu_items[i]), - i+2); + builder = gtk_builder_new(); - update_sensor_menu_item - (sensor_menu_items[i], - s, - ui->config->temperature_unit == CELCIUS); + error = NULL; + ok = gtk_builder_add_from_file + (builder, + PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "psensor.glade", + &error); + + if (!ok) { + log_printf(LOG_ERR, error->message); + g_error_free(error); + return NULL; } + menu = GTK_MENU(gtk_builder_get_object(builder, "appindicator_menu")); + build_sensor_menu_items(ui, menu); + gtk_builder_connect_signals(builder, ui); + + g_object_ref(G_OBJECT(menu)); + g_object_unref(G_OBJECT(builder)); + return GTK_WIDGET(menu); } void ui_appindicator_update(struct ui_psensor *ui, unsigned int attention) { AppIndicatorStatus status; + char *label, *str, *tmp; + struct psensor **p; if (!indicator) return; status = app_indicator_get_status(indicator); + p = ui_get_sensors_ordered_by_position(ui); + label = NULL; + while (*p) { + if (config_is_appindicator_label_enabled((*p)->id)) { + str = psensor_current_value_to_str + (*p, ui->config->temperature_unit == CELCIUS); + if (label == NULL) { + label = str; + } else { + tmp = malloc(strlen(label) + + 1 + + strlen(str) + + 1); + sprintf(tmp, "%s %s", label, str); + free(label); + free(str); + label = tmp; + } + } + p++; + } + + app_indicator_set_label(indicator, label, NULL); + if (!attention && status == APP_INDICATOR_STATUS_ATTENTION) - app_indicator_set_status - (indicator, APP_INDICATOR_STATUS_ACTIVE); + app_indicator_set_status(indicator, + APP_INDICATOR_STATUS_ACTIVE); if (attention && status == APP_INDICATOR_STATUS_ACTIVE) - app_indicator_set_status - (indicator, APP_INDICATOR_STATUS_ATTENTION); + app_indicator_set_status(indicator, + APP_INDICATOR_STATUS_ATTENTION); - update_sensor_menu_items(ui->sensors, - ui->config->temperature_unit == CELCIUS); + update_menu_items(ui->config->temperature_unit == CELCIUS); } static GtkStatusIcon *unity_fallback(AppIndicator *indicator) { GtkStatusIcon *ico; - log_debug("ui_appindicator#unity_fallback"); + log_debug("ui_appindicator.unity_fallback()"); appindicator_supported = 0; @@ -247,19 +236,26 @@ static GtkStatusIcon *unity_fallback(AppIndicator *indicator) static void unity_unfallback(AppIndicator *indicator, GtkStatusIcon *status_icon) { - log_debug("ui_appindicator#unity_unfallback"); + log_debug("ui_appindicator.unity_unfallback()"); ui_status_set_visible(0); appindicator_supported = 1; } -void ui_appindicator_init(struct ui_psensor *ui) +void ui_appindicator_update_menu(struct ui_psensor *ui) { GtkWidget *menu; + menu = get_menu(ui); + app_indicator_set_menu(indicator, GTK_MENU(menu)); + + gtk_widget_show_all(menu); +} + +void ui_appindicator_init(struct ui_psensor *ui) +{ ui_psensor = ui; - main_window = ui->main_window; indicator = app_indicator_new ("psensor", @@ -272,10 +268,7 @@ void ui_appindicator_init(struct ui_psensor *ui) app_indicator_set_status(indicator, APP_INDICATOR_STATUS_ACTIVE); app_indicator_set_attention_icon(indicator, ATTENTION_ICON); - menu = get_menu(ui); - app_indicator_set_menu(indicator, GTK_MENU(menu)); - - gtk_widget_show_all(menu); + ui_appindicator_update_menu(ui); } int is_appindicator_supported() @@ -285,5 +278,5 @@ int is_appindicator_supported() void ui_appindicator_cleanup() { - /* TODO: cleanup menu items. */ + free(sensors); }