X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fui_appindicator.c;h=5c3f66e6f151de9f77f967516e784123e678552d;hb=b0fbaa0cc4cdc38bc86e3739e5bc78d73ca063ec;hp=eb115728cae8cae2247800e730d26718167047bb;hpb=3e41247352bcabe8fb2fc009c6a213c4b389444f;p=psensor.git diff --git a/src/ui_appindicator.c b/src/ui_appindicator.c index eb11572..5c3f66e 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-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 + * 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,17 +23,26 @@ #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 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; + static void cb_menu_show(GtkMenuItem *mi, gpointer data) { - struct ui_psensor *ui = (struct ui_psensor *)data; - - gtk_window_present(GTK_WINDOW(ui->main_window)); + ui_window_show((struct ui_psensor *)data); } static void cb_menu_quit(GtkMenuItem *mi, gpointer data) @@ -42,8 +50,7 @@ static void cb_menu_quit(GtkMenuItem *mi, gpointer data) ui_psensor_quit(data); } -static void -cb_menu_preferences(GtkMenuItem *mi, gpointer data) +static void cb_menu_preferences(GtkMenuItem *mi, gpointer data) { #ifdef HAVE_APPINDICATOR_029 gdk_threads_enter(); @@ -56,55 +63,114 @@ cb_menu_preferences(GtkMenuItem *mi, gpointer data) #endif } -static void -cb_sensor_preferences(GtkMenuItem *mi, gpointer data) +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 void cb_about(GtkMenuItem *mi, gpointer data) +{ + ui_show_about_dialog(); } static const char *menu_desc = "" " " " " +" " +" " " " " " " " +" " +" " " " " " ""; 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) }, - - { "QuitAction", - GTK_STOCK_QUIT, "_Quit", NULL, "Quit", G_CALLBACK(cb_menu_quit) } + { "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_menu_item(GtkMenuItem *item, struct psensor *s, int use_celcius) +{ + gchar *str; + double v; + + v = psensor_get_current_value(s); + + if (is_temp_type(s->type) && !use_celcius) + v = celcius_to_fahrenheit(v); + + str = g_strdup_printf("%s: %2.f %s", + s->name, + v, + psensor_type_to_unit_str(s->type, use_celcius)); + + gtk_menu_item_set_label(item, str); + + g_free(str); +} + +static void update_menu_items(int use_celcius) +{ + struct psensor **s; + GtkMenuItem **m; + + if (!sensors) + return ; + + for (s = sensors, m = menu_items; *s; s++, m++) + update_menu_item(*m, *s, use_celcius); +} + 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, n, j; + int celcius; + const char *name; action_group = gtk_action_group_new("PsensorActions"); gtk_action_group_set_translation_domain(action_group, PACKAGE); @@ -119,53 +185,116 @@ 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")); + celcius = ui->config->temperature_unit == CELCIUS; -void ui_appindicator_update(struct ui_psensor *ui) -{ - struct psensor **sensor_cur = ui->sensors; - AppIndicatorStatus status; - int attention = 0; + n = psensor_list_size(ui->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(ui->sensors[i]->id)) { + sensors[j] = ui->sensors[i]; + name = sensors[j]->name; - if (!ui->indicator) - return; + menu_items[j] = GTK_MENU_ITEM + (gtk_menu_item_new_with_label(name)); - while (*sensor_cur) { - struct psensor *s = *sensor_cur; + gtk_menu_shell_insert(GTK_MENU_SHELL(menu), + GTK_WIDGET(menu_items[j]), + j+2); - if (s->alarm_enabled && s->alarm_raised) { - attention = 1; - break; - } + update_menu_item(menu_items[j], sensors[j], celcius); - sensor_cur++; + j++; + } } - status = app_indicator_get_status(ui->indicator); + sensors[j] = NULL; + + 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); + + ui_appindicator_update_menu(ui); +} - indicatormenu = get_menu(ui); - app_indicator_set_menu(ui->indicator, GTK_MENU(indicatormenu)); +int is_appindicator_supported() +{ + return appindicator_supported; +} + +void ui_appindicator_cleanup() +{ + free(sensors); + /* TODO: cleanup menu items. */ }