X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fui_appindicator.c;h=c6b3f5276fbbdf99237fe49b3931c43410b5e956;hb=ab7f1a53d66d4812d5aacfa50bf75df379a65309;hp=24781f26e712b9b3096d8b3d4f60d5eff9e04d9f;hpb=8612c1232bcf96bf8f6c03c04d6d595423d23455;p=psensor.git

diff --git a/src/ui_appindicator.c b/src/ui_appindicator.c
index 24781f2..c6b3f52 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,138 @@ 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 =
-"<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,
-	  "_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,
-				    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;
 
-	n = psensor_list_size(sensors);
-	for (i = 0; i < n; i++)
-		update_sensor_menu_item(sensor_menu_items[i],
-					sensors[i],
-					use_celcius);
+	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)
+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;
 
-	if (error)
-		g_error(_("building menus failed: %s"), error->message);
+			menu_items[j] = GTK_MENU_ITEM
+				(gtk_menu_item_new_with_label(name));
 
-	menu = GTK_MENU(gtk_ui_manager_get_widget(menu_manager, "/MainMenu"));
+			gtk_menu_shell_insert(GTK_MENU_SHELL(menu),
+					      GTK_WIDGET(menu_items[j]),
+					      j+2);
 
-	sensor_menu_items = malloc(sizeof(GtkWidget *)*n);
-	for (i = 0; i < n; i++) {
-		struct psensor *s = sensors[i];
+			update_menu_item(menu_items[j], sensors[j], celcius);
 
-		sensor_menu_items[i]
-			= GTK_MENU_ITEM(gtk_menu_item_new_with_label(s->name));
+			j++;
+		}
+	}
 
-		gtk_menu_shell_insert(GTK_MENU_SHELL(menu),
-				      GTK_WIDGET(sensor_menu_items[i]),
-				      i+2);
+	sensors[j] = NULL;
 
-		update_sensor_menu_item
-			(sensor_menu_items[i],
-			 s,
-			 ui->config->temperature_unit == CELCIUS);
+	free(sorted_sensors);
+}
+
+static GtkWidget *get_menu(struct ui_psensor *ui)
+{
+	GError *error;
+	GtkMenu *menu;
+	guint ok;
+	GtkBuilder *builder;
+
+	builder = gtk_builder_new();
+
+	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;
+	double v;
 
 	if (!indicator)
 		return;
 
 	status = app_indicator_get_status(indicator);
 
+	v = psensor_get_max_current_value(ui->sensors, SENSOR_TYPE_TEMP);
+	if (v != UNKNOWN_DBL_VALUE) {
+		label = psensor_value_to_str(SENSOR_TYPE_TEMP, v, 1);
+		app_indicator_set_label(indicator, label, NULL);
+		free(label);
+	}
+
 	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 +219,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 +251,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 +261,5 @@ int is_appindicator_supported()
 
 void ui_appindicator_cleanup()
 {
-	/* TODO: cleanup menu items. */
+	free(sensors);
 }