/*
- Copyright (C) 2010-2011 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 published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301 USA
-*/
-
+ * Copyright (C) 2010-2011 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
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "ui.h"
#include "ui_appindicator.h"
#include "ui_sensorpref.h"
+#include "ui_status.h"
#include "ui_pref.h"
+static const char *ICON = "psensor_normal";
+static const char *ATTENTION_ICON = "psensor_hot";
+
static GtkMenuItem **sensor_menu_items;
static GtkWidget *main_window;
static int appindicator_supported = 1;
+static AppIndicator *indicator;
+static struct ui_psensor *ui_psensor;
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)
#endif
}
-static void
-cb_sensor_preferences(GtkMenuItem *mi, gpointer data)
+static void cb_sensor_preferences(GtkMenuItem *mi, gpointer data)
{
struct ui_psensor *ui = data;
"</ui>";
static GtkActionEntry entries[] = {
- { "PsensorMenuAction", NULL, "_Psensor" }, /* name, stock id, label */
-
- { "ShowAction", NULL, /* name, stock id */
- "_Show", NULL, /* label, accelerator */
- "Show", /* tooltip */
- G_CALLBACK(cb_menu_show) },
-
- { "PreferencesAction", GTK_STOCK_PREFERENCES, /* name, stock id */
- "_Preferences", NULL, /* label, accelerator */
- "Preferences", /* tooltip */
- 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) }
+ { "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_items(struct psensor **sensors)
{
- int n = psensor_list_size(sensors);
- int i;
+ int n, i;
+ n = psensor_list_size(sensors);
for (i = 0; i < n; i++)
- update_sensor_menu_item(sensor_menu_items[i],
- sensors[i]);
+ update_sensor_menu_item(sensor_menu_items[i], sensors[i]);
}
static GtkWidget *get_menu(struct ui_psensor *ui)
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);
+ log_debug("ui_appindicator#unity_fallback");
appindicator_supported = 0;
- return NULL;
+ return ui_status_get_icon(ui_psensor);
}
-static void unity_unfallback(AppIndicator *indicator,
- GtkStatusIcon *status_icon)
+static void
+unity_unfallback(AppIndicator *indicator, GtkStatusIcon *status_icon)
{
- log_printf(LOG_DEBUG, "ui_appindicator#unity_unfallback");
+ log_debug("ui_appindicator#unity_unfallback");
appindicator_supported = 1;
}
-
void ui_appindicator_init(struct ui_psensor *ui)
{
GtkWidget *menu;
- AppIndicator *indicator;
+ ui_psensor = ui;
main_window = ui->main_window;
indicator = app_indicator_new
("psensor",
- "psensor_normal",
+ ICON,
APP_INDICATOR_CATEGORY_APPLICATION_STATUS);
APP_INDICATOR_GET_CLASS(indicator)->fallback = unity_fallback;
APP_INDICATOR_GET_CLASS(indicator)->unfallback = unity_unfallback;
app_indicator_set_status(indicator, APP_INDICATOR_STATUS_ACTIVE);
- app_indicator_set_attention_icon(indicator, "psensor_hot");
+ app_indicator_set_attention_icon(indicator, ATTENTION_ICON);
menu = get_menu(ui);
app_indicator_set_menu(indicator, GTK_MENU(menu));
- ui->indicator = indicator;
-
gtk_widget_show_all(menu);
}
projects / psensor.git / blobdiff