X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fui_appindicator.c;h=77a2991b06e9badc54eccde5f149c85d4d44b77c;hb=a57708401519afe0a8dce1a9704db1af1cc8f10d;hp=45ed0fd993681704df0a84e9ac5929402322434f;hpb=cbd4fca0240899b81d45821ac13ced9c7c6bcef2;p=psensor.git diff --git a/src/ui_appindicator.c b/src/ui_appindicator.c index 45ed0fd..77a2991 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,21 +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 GtkMenuItem **sensor_menu_items; static GtkWidget *main_window; 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) @@ -46,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(); @@ -60,8 +63,7 @@ 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; @@ -98,57 +100,67 @@ 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) }, - - { "AboutAction", NULL, - "_About", - NULL, - "About", - G_CALLBACK(cb_about) }, - - { "QuitAction", - GTK_STOCK_QUIT, "_Quit", NULL, "Quit", G_CALLBACK(cb_menu_quit) } + { "PsensorMenuAction", NULL, "_Psensor" }, + + { "ShowAction", NULL, + "_Show", NULL, + "Show", + G_CALLBACK(cb_menu_show) }, + + { "PreferencesAction", GTK_STOCK_PREFERENCES, + "_Preferences", NULL, + "Preferences", + G_CALLBACK(cb_menu_preferences) }, + + { "SensorPreferencesAction", GTK_STOCK_PREFERENCES, + "S_ensor Preferences", + NULL, + "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) +static void update_sensor_menu_item(GtkMenuItem *item, + struct psensor *s, + int use_celcius) { gchar *str; + double v; + + v = psensor_get_current_value(s); + + if (!use_celcius) + v = celcius_to_fahrenheit(v); str = g_strdup_printf("%s: %2.f %s", s->name, - psensor_get_current_value(s), - psensor_type_to_unit_str(s->type)); + v, + psensor_type_to_unit_str(s->type, use_celcius)); gtk_menu_item_set_label(item, str); g_free(str); } -static void update_sensor_menu_items(struct psensor **sensors) +static void update_sensor_menu_items(struct psensor **sensors, + int use_celcius) { - int n = psensor_list_size(sensors); - int i; + int n, i; + n = psensor_list_size(sensors); for (i = 0; i < n; i++) update_sensor_menu_item(sensor_menu_items[i], - sensors[i]); + sensors[i], + use_celcius); } static GtkWidget *get_menu(struct ui_psensor *ui) @@ -161,7 +173,6 @@ static GtkWidget *get_menu(struct ui_psensor *ui) 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); menu_manager = gtk_ui_manager_new(); @@ -188,93 +199,92 @@ static GtkWidget *get_menu(struct ui_psensor *ui) GTK_WIDGET(sensor_menu_items[i]), i+2); - update_sensor_menu_item(sensor_menu_items[i], - s); + update_sensor_menu_item + (sensor_menu_items[i], + s, + ui->config->temperature_unit == CELCIUS); } return GTK_WIDGET(menu); } - -void ui_appindicator_update(struct ui_psensor *ui) +void ui_appindicator_update(struct ui_psensor *ui, unsigned int attention) { - struct psensor **sensor_cur = ui->sensors; AppIndicatorStatus status; - int attention = 0; - if (!ui->indicator) + if (!indicator) return; - while (*sensor_cur) { - struct psensor *s = *sensor_cur; - - if (s->alarm_enabled && s->alarm_raised) { - attention = 1; - break; - } - - sensor_cur++; - } - - status = app_indicator_get_status(ui->indicator); + status = app_indicator_get_status(indicator); if (!attention && status == APP_INDICATOR_STATUS_ATTENTION) app_indicator_set_status - (ui->indicator, APP_INDICATOR_STATUS_ACTIVE); + (indicator, APP_INDICATOR_STATUS_ACTIVE); if (attention && status == APP_INDICATOR_STATUS_ACTIVE) app_indicator_set_status - (ui->indicator, APP_INDICATOR_STATUS_ATTENTION); + (indicator, APP_INDICATOR_STATUS_ATTENTION); - update_sensor_menu_items(ui->sensors); + update_sensor_menu_items(ui->sensors, + ui->config->temperature_unit == CELCIUS); } static GtkStatusIcon *unity_fallback(AppIndicator *indicator) { - log_printf(LOG_DEBUG, "ui_appindicator#unity_fallback"); + GtkStatusIcon *ico; - gtk_widget_show_all(main_window); + log_debug("ui_appindicator#unity_fallback"); appindicator_supported = 0; - return NULL; + ico = ui_status_get_icon(ui_psensor); + + ui_status_set_visible(1); + + return ico; } -static void unity_unfallback(AppIndicator *indicator, - GtkStatusIcon *status_icon) +static void +unity_unfallback(AppIndicator *indicator, GtkStatusIcon *status_icon) { - log_printf(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) { - GtkWidget *indicatormenu; + GtkWidget *menu; + ui_psensor = ui; main_window = ui->main_window; - ui->indicator - = app_indicator_new("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; + indicator = app_indicator_new + ("psensor", + ICON, + APP_INDICATOR_CATEGORY_APPLICATION_STATUS); - app_indicator_set_status(ui->indicator, APP_INDICATOR_STATUS_ACTIVE); - app_indicator_set_attention_icon(ui->indicator, "psensor_hot"); + APP_INDICATOR_GET_CLASS(indicator)->fallback = unity_fallback; + APP_INDICATOR_GET_CLASS(indicator)->unfallback = unity_unfallback; - indicatormenu = get_menu(ui); + app_indicator_set_status(indicator, APP_INDICATOR_STATUS_ACTIVE); + app_indicator_set_attention_icon(indicator, ATTENTION_ICON); - gtk_widget_show_all(indicatormenu); + menu = get_menu(ui); + app_indicator_set_menu(indicator, GTK_MENU(menu)); - app_indicator_set_menu(ui->indicator, GTK_MENU(indicatormenu)); + gtk_widget_show_all(menu); } int is_appindicator_supported() { return appindicator_supported; } + +void ui_appindicator_cleanup() +{ + /* TODO: cleanup menu items. */ +}