X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fui_appindicator.c;h=9fbeaa782fbb214de629748e3cbac58fcca02ea1;hb=37afe949c5c7aff3abe6e030161c64c8603877b2;hp=5f95f717e5aa4a04cd22e1d4c1ccc9c399fb185a;hpb=80bda5423ce2e29f1533d0f36b2f4a4a544e906a;p=psensor.git diff --git a/src/ui_appindicator.c b/src/ui_appindicator.c index 5f95f71..9fbeaa7 100644 --- a/src/ui_appindicator.c +++ b/src/ui_appindicator.c @@ -1,22 +1,21 @@ /* - Copyright (C) 2010-2011 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 published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301 USA -*/ - + * Copyright (C) 2010-2013 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 + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA + */ #include #include #include @@ -24,26 +23,34 @@ #include #include +#include "cfg.h" #include "psensor.h" #include "ui.h" #include "ui_appindicator.h" #include "ui_sensorpref.h" +#include "ui_status.h" #include "ui_pref.h" -static void cb_menu_show(gpointer data, guint cb_action, GtkWidget *item) -{ - struct ui_psensor *ui = (struct ui_psensor *)data; +static const char *ICON = "psensor_normal"; +static const char *ATTENTION_ICON = "psensor_hot"; + +static struct psensor **sensors; +static GtkMenuItem **menu_items; +static int appindicator_supported = 1; +static AppIndicator *indicator; +static struct ui_psensor *ui_psensor; - gtk_window_present(GTK_WINDOW(ui->main_window)); +static void cb_menu_show(GtkMenuItem *mi, gpointer data) +{ + ui_window_show((struct ui_psensor *)data); } -static void cb_menu_quit(gpointer data, guint cb_action, GtkWidget *item) +static void cb_menu_quit(GtkMenuItem *mi, gpointer data) { ui_psensor_quit(data); } -static void -cb_menu_preferences(gpointer data, guint cb_action, GtkWidget *item) +static void cb_menu_preferences(GtkMenuItem *mi, gpointer data) { #ifdef HAVE_APPINDICATOR_029 gdk_threads_enter(); @@ -56,83 +63,246 @@ cb_menu_preferences(gpointer data, guint cb_action, GtkWidget *item) #endif } -static void -cb_sensor_preferences(gpointer data, guint cb_action, GtkWidget *item) +static void 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 GtkItemFactoryEntry menu_items[] = { - {"/Show", - NULL, cb_menu_show, 0, ""}, - {"/Preferences", - NULL, cb_menu_preferences, 0, ""}, - {"/Sensor Preferences", - NULL, cb_sensor_preferences, 0, ""}, - {"/sep1", - NULL, NULL, 0, ""}, - {"/Quit", - "", cb_menu_quit, 0, "", GTK_STOCK_QUIT}, +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 gint nmenu_items = sizeof(menu_items) / sizeof(menu_items[0]); -static GtkWidget *get_menu(struct ui_psensor *ui) +static void +update_menu_item(GtkMenuItem *item, struct psensor *s, int use_celcius) { - GtkItemFactory *item_factory; + gchar *str; + char *v; + + v = psensor_current_value_to_str(s, use_celcius); - item_factory = gtk_item_factory_new(GTK_TYPE_MENU, "
", NULL); + str = g_strdup_printf("%s: %s", s->name, v); - gtk_item_factory_create_items(item_factory, - nmenu_items, menu_items, ui); - return gtk_item_factory_get_widget(item_factory, "
"); + gtk_menu_item_set_label(item, str); + + free(v); + g_free(str); } -void ui_appindicator_update(struct ui_psensor *ui) +static void update_menu_items(int use_celcius) { - struct psensor **sensor_cur = ui->sensors; - AppIndicatorStatus status; - int attention = 0; + struct psensor **s; + GtkMenuItem **m; - if (!ui->indicator) - return; + if (!sensors) + return ; - while (*sensor_cur) { - struct psensor *s = *sensor_cur; + for (s = sensors, m = menu_items; *s; s++, m++) + update_menu_item(*m, *s, use_celcius); +} - if (s->alarm_enabled && s->alarm_raised) { - attention = 1; - break; - } +static void +build_sensor_menu_items(const struct ui_psensor *ui, + GtkMenu *menu) +{ + int i, j, n, celcius; + const char *name; + struct psensor **sorted_sensors; + + free(menu_items); + + celcius = ui->config->temperature_unit == CELCIUS; + + 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)); - sensor_cur++; + gtk_menu_shell_insert(GTK_MENU_SHELL(menu), + GTK_WIDGET(menu_items[j]), + j+2); + + update_menu_item(menu_items[j], sensors[j], celcius); + + j++; + } } - status = app_indicator_get_status(ui->indicator); + sensors[j] = NULL; + + free(sorted_sensors); +} + +static GtkWidget *get_menu(struct ui_psensor *ui) +{ + GtkActionGroup *action_group; + GtkUIManager *menu_manager; + GError *error; + GtkMenu *menu; + + action_group = gtk_action_group_new("PsensorActions"); + gtk_action_group_set_translation_domain(action_group, PACKAGE); + menu_manager = gtk_ui_manager_new(); + + gtk_action_group_add_actions(action_group, entries, n_entries, ui); + gtk_ui_manager_insert_action_group(menu_manager, action_group, 0); + + error = NULL; + gtk_ui_manager_add_ui_from_string(menu_manager, menu_desc, -1, &error); + + if (error) + g_error(_("building menus failed: %s"), error->message); + + menu = GTK_MENU(gtk_ui_manager_get_widget(menu_manager, "/MainMenu")); + + build_sensor_menu_items(ui, menu); + + return GTK_WIDGET(menu); +} + +void ui_appindicator_update(struct ui_psensor *ui, unsigned int attention) +{ + AppIndicatorStatus status; + + if (!indicator) + return; + + status = app_indicator_get_status(indicator); if (!attention && status == APP_INDICATOR_STATUS_ATTENTION) - app_indicator_set_status - (ui->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 - (ui->indicator, APP_INDICATOR_STATUS_ATTENTION); + app_indicator_set_status(indicator, + APP_INDICATOR_STATUS_ATTENTION); + + update_menu_items(ui->config->temperature_unit == CELCIUS); +} + +static GtkStatusIcon *unity_fallback(AppIndicator *indicator) +{ + GtkStatusIcon *ico; + + log_debug("ui_appindicator.unity_fallback()"); + + appindicator_supported = 0; + + ico = ui_status_get_icon(ui_psensor); + + ui_status_set_visible(1); + + return ico; +} + +static void +unity_unfallback(AppIndicator *indicator, GtkStatusIcon *status_icon) +{ + log_debug("ui_appindicator.unity_unfallback()"); + + ui_status_set_visible(0); + + appindicator_supported = 1; +} + +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) { - GtkWidget *indicatormenu; + ui_psensor = ui; + + indicator = app_indicator_new + ("psensor", + ICON, + APP_INDICATOR_CATEGORY_APPLICATION_STATUS); - ui->indicator - = app_indicator_new("psensor", - "psensor", - 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(ui->indicator, APP_INDICATOR_STATUS_ACTIVE); - app_indicator_set_attention_icon(ui->indicator, "psensor_hot"); + app_indicator_set_status(indicator, APP_INDICATOR_STATUS_ACTIVE); + app_indicator_set_attention_icon(indicator, ATTENTION_ICON); - indicatormenu = get_menu(ui); - app_indicator_set_menu(ui->indicator, GTK_MENU(indicatormenu)); + ui_appindicator_update_menu(ui); +} + +int is_appindicator_supported() +{ + return appindicator_supported; +} + +void ui_appindicator_cleanup() +{ + free(sensors); + /* TODO: cleanup menu items. */ }