static GtkMenuItem **sensor_menu_items;
static GtkWidget *main_window;
static int appindicator_supported = 1;
+static AppIndicator *indicator;
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)
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();
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);
}
static GtkStatusIcon *unity_fallback(AppIndicator *indicator)
{
+ log_printf(LOG_DEBUG, "ui_appindicator#unity_fallback");
+
gtk_widget_show_all(main_window);
appindicator_supported = 0;
static void unity_unfallback(AppIndicator *indicator,
GtkStatusIcon *status_icon)
{
+ log_printf(LOG_DEBUG, "ui_appindicator#unity_unfallback");
+
appindicator_supported = 1;
}
-
void ui_appindicator_init(struct ui_psensor *ui)
{
- GtkWidget *indicatormenu;
+ GtkWidget *menu;
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",
+ "psensor_normal",
+ 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, "psensor_hot");
- 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. */
+}