}
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++;
}
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;
- char *label;
- double v;
if (!indicator)
return;
- status = app_indicator_get_status(indicator);
+ update_label(ui);
- 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);
- }
+ status = app_indicator_get_status(indicator);
if (!attention && status == APP_INDICATOR_STATUS_ATTENTION)
app_indicator_set_status(indicator,
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)