/*
- * Copyright (C) 2010-2013 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
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();
#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;
#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>";
-
-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,
- N_("_Quit"),
- NULL, N_("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)
+update_menu_item(GtkMenuItem *item, struct psensor *s, int use_celsius)
{
gchar *str;
char *v;
- v = psensor_current_value_to_str(s, use_celcius);
+ v = psensor_current_value_to_str(s, use_celsius);
str = g_strdup_printf("%s: %s", s->name, v);
g_free(str);
}
-static void update_menu_items(int use_celcius)
+static void update_menu_items(int use_celsius)
{
struct psensor **s;
GtkMenuItem **m;
return ;
for (s = sensors, m = menu_items; *s; s++, m++)
- update_menu_item(*m, *s, use_celcius);
+ update_menu_item(*m, *s, use_celsius);
}
static void
-build_sensor_menu_items(const struct ui_psensor *ui,
- GtkMenu *menu)
+build_sensor_menu_items(const struct ui_psensor *ui, GtkMenu *menu)
{
- int i, j, n, celcius;
+ int i, j, n, celsius;
const char *name;
struct psensor **sorted_sensors;
free(menu_items);
- celcius = ui->config->temperature_unit == CELCIUS;
+ celsius = ui->config->temperature_unit == CELSIUS;
sorted_sensors = ui_get_sensors_ordered_by_position(ui);
n = psensor_list_size(sorted_sensors);
GTK_WIDGET(menu_items[j]),
j+2);
- update_menu_item(menu_items[j], sensors[j], celcius);
+ update_menu_item(menu_items[j], sensors[j], celsius);
j++;
}
static GtkWidget *get_menu(struct ui_psensor *ui)
{
- GtkActionGroup *action_group;
- GtkUIManager *menu_manager;
GError *error;
GtkMenu *menu;
+ guint ok;
+ GtkBuilder *builder;
- 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);
+ builder = gtk_builder_new();
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"));
+ 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);
}
+static void update_label(struct ui_psensor *ui)
+{
+ char *label, *str, *tmp, *guide;
+ struct psensor **p;
+
+ p = ui_get_sensors_ordered_by_position(ui);
+ label = NULL;
+ guide = NULL;
+ while (*p) {
+ if (config_is_appindicator_label_enabled((*p)->id)) {
+ str = psensor_current_value_to_str
+ (*p, ui->config->temperature_unit == CELSIUS);
+
+ 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;
+ }
+
+ if (is_temp_type((*p)->type))
+ str = "999UUU";
+ else if (is_fan_type((*p)->type))
+ str = "999UUU";
+ else /* cpu load */
+ str = "999%";
+
+ if (guide == NULL) {
+ guide = strdup(str);
+ } else {
+ tmp = malloc(strlen(guide)
+ + 1
+ + strlen(str)
+ + 1);
+ sprintf(tmp, "%sW%s", guide, str);
+ free(guide);
+ guide = tmp;
+ }
+
+ }
+ p++;
+ }
+
+ app_indicator_set_label(indicator, label, guide);
+}
+
void ui_appindicator_update(struct ui_psensor *ui, unsigned int attention)
{
AppIndicatorStatus status;
if (!indicator)
return;
+ update_label(ui);
+
status = app_indicator_get_status(indicator);
if (!attention && status == APP_INDICATOR_STATUS_ATTENTION)
app_indicator_set_status(indicator,
APP_INDICATOR_STATUS_ATTENTION);
- update_menu_items(ui->config->temperature_unit == CELCIUS);
+ update_menu_items(ui->config->temperature_unit == CELSIUS);
}
static GtkStatusIcon *unity_fallback(AppIndicator *indicator)
void ui_appindicator_cleanup()
{
free(sensors);
- /* TODO: cleanup menu items. */
}
projects / psensor-pkg-debian.git / blobdiff