X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fui_appindicator.c;h=84483cddf4cf173f27796271182d017115838a03;hb=5f275b753e5b28de21690bd9bacb53262e59c58a;hp=29244b568ef49031db7074cc8110b43dc2820ad0;hpb=77fbc451078b7c4bf9cd4884814f0f087e87dd77;p=psensor.git

diff --git a/src/ui_appindicator.c b/src/ui_appindicator.c
index 29244b5..84483cd 100644
--- a/src/ui_appindicator.c
+++ b/src/ui_appindicator.c
@@ -75,12 +75,12 @@ void ui_appindicator_cb_sensor_preferences(GtkMenuItem *mi, gpointer data)
 }
 
 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);
 
@@ -90,7 +90,7 @@ update_menu_item(GtkMenuItem *item, struct psensor *s, int use_celcius)
 	g_free(str);
 }
 
-static void update_menu_items(int use_celcius)
+static void update_menu_items(int use_celsius)
 {
 	struct psensor **s;
 	GtkMenuItem **m;
@@ -99,20 +99,19 @@ static void update_menu_items(int use_celcius)
 		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);
@@ -130,7 +129,7 @@ build_sensor_menu_items(const struct ui_psensor *ui,
 					      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++;
 		}
@@ -172,22 +171,19 @@ static GtkWidget *get_menu(struct ui_psensor *ui)
 	return GTK_WIDGET(menu);
 }
 
-void ui_appindicator_update(struct ui_psensor *ui, unsigned int attention)
+static void update_label(struct ui_psensor *ui)
 {
-	AppIndicatorStatus status;
-	char *label, *str, *tmp;
+	char *label, *str, *tmp, *guide;
 	struct psensor **p;
 
-	if (!indicator)
-		return;
-
-	status = app_indicator_get_status(indicator);
-
 	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, 1);
+			str = psensor_current_value_to_str
+				(*p, ui->config->temperature_unit == CELSIUS);
+
 			if (label == NULL) {
 				label = str;
 			} else {
@@ -200,11 +196,43 @@ void ui_appindicator_update(struct ui_psensor *ui, unsigned int attention)
 				free(str);
 				label = tmp;
 			}
+
+			if (is_temp_type((*p)->type))
+				str = "999UUU";
+			else if ((*p)->type & SENSOR_TYPE_RPM)
+				str = "999UUU";
+			else /* percent */
+				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, NULL);
+	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,
@@ -214,7 +242,7 @@ void ui_appindicator_update(struct ui_psensor *ui, unsigned int 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)