#include "ui.h"
#include "ui_graph.h"
#include "ui_pref.h"
+#include "ui_sensorpref.h"
#include "ui_sensorlist.h"
static gboolean
return TRUE;
}
-static void
-cb_menu_quit(gpointer data, guint cb_action, GtkWidget *item)
+static void cb_menu_quit(GtkMenuItem *mi, gpointer data)
{
ui_psensor_quit();
}
-static void
-cb_menu_preferences(gpointer data, guint cb_action, GtkWidget *item)
+static void cb_preferences(GtkMenuItem *mi, gpointer data)
{
ui_pref_dialog_run((struct ui_psensor *)data);
}
+static void cb_sensor_preferences(GtkMenuItem *mi, gpointer data)
+{
+ struct ui_psensor *ui = data;
+
+ if (ui->sensors && *ui->sensors)
+ ui_sensorpref_dialog_run(*ui->sensors, ui);
+}
+
void ui_psensor_quit()
{
gtk_main_quit();
}
-static GtkItemFactoryEntry menu_items[] = {
- {"/Psensor", NULL, NULL, 0, "<Branch>"},
- {"/Psensor/Preferences",
- NULL, cb_menu_preferences, 0, "<Item>"},
- {"/Psensor/sep1",
- NULL, NULL, 0, "<Separator>"},
- {"/Psensor/Quit",
- "", cb_menu_quit, 0, "<StockItem>", GTK_STOCK_QUIT},
+static const char *menu_desc =
+"<ui>"
+" <menubar name='MainMenu'>"
+" <menu name='Psensor' action='PsensorMenuAction'>"
+" <menuitem name='Preferences' action='PreferencesAction' />"
+" <menuitem name='SensorPreferences' action='SensorPreferencesAction' />"
+" <separator />"
+" <menuitem name='Quit' action='QuitAction' />"
+" </menu>"
+" </menubar>"
+"</ui>";
+
+static GtkActionEntry entries[] = {
+ { "PsensorMenuAction", NULL, "_Psensor" }, /* name, stock id, label */
+
+ { "PreferencesAction", GTK_STOCK_PREFERENCES, /* name, stock id */
+ N_("_Preferences"), NULL, /* label, accelerator */
+ N_("Preferences"), /* tooltip */
+ G_CALLBACK(cb_preferences) },
+
+ { "SensorPreferencesAction", GTK_STOCK_PREFERENCES,
+ N_("_Sensor Preferences"), NULL,
+ N_("Sensor Preferences"),
+ G_CALLBACK(cb_sensor_preferences) },
+
+ { "QuitAction",
+ GTK_STOCK_QUIT, N_("_Quit"), NULL, N_("Quit"), G_CALLBACK(cb_menu_quit) }
};
-
-static gint nmenu_items = sizeof(menu_items) / sizeof(menu_items[0]);
+static guint n_entries = G_N_ELEMENTS(entries);
static GtkWidget *get_menu(struct ui_psensor *ui)
{
- GtkItemFactory *item_factory;
+ GtkActionGroup *action_group;
+ GtkUIManager *menu_manager;
+ GError *error;
+
+ action_group = gtk_action_group_new("PsensorActions");
+ gtk_action_group_set_translation_domain(action_group, PACKAGE);
+ menu_manager = gtk_ui_manager_new();
+
+ gtk_action_group_add_actions(action_group, entries, n_entries, ui);
+ gtk_ui_manager_insert_action_group(menu_manager, action_group, 0);
+
+ error = NULL;
+ gtk_ui_manager_add_ui_from_string(menu_manager, menu_desc, -1, &error);
+
+ if (error)
+ g_error(_("building menus failed: %s"), error->message);
+
+ return gtk_ui_manager_get_widget(menu_manager, "/MainMenu");
+}
+
+static unsigned int enable_alpha_channel(GtkWidget *w)
+{
+ GdkScreen *screen = gtk_widget_get_screen(w);
+
+#if (GTK_CHECK_VERSION(3, 0, 0))
+ GdkVisual *visual = gdk_screen_get_rgba_visual(screen);
- item_factory = gtk_item_factory_new(GTK_TYPE_MENU_BAR, "<main>", NULL);
+ if (visual) {
+ gtk_widget_set_visual(w, visual);
+ return 1;
+ }
+#else
+ GdkColormap *colormap = gdk_screen_get_rgba_colormap(screen);
- gtk_item_factory_create_items(item_factory,
- nmenu_items, menu_items, ui);
- return gtk_item_factory_get_widget(item_factory, "<main>");
+ if (colormap) {
+ gtk_widget_set_colormap(w, colormap);
+ return 1;
+ }
+#endif
+ return 0;
}
void ui_window_create(struct ui_psensor *ui)
{
GtkWidget *window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
GdkScreen *screen;
- GdkColormap *colormap;
GdkPixbuf *icon;
GtkIconTheme *icon_theme;
GtkWidget *menubar;
if (ui->config->alpha_channel_enabled
&& gdk_screen_is_composited(screen)) {
-
- colormap = gdk_screen_get_rgba_colormap(screen);
- if (colormap)
- gtk_widget_set_colormap(window, colormap);
- else
+ if (!enable_alpha_channel(window))
ui->config->alpha_channel_enabled = 0;
} else {
ui->config->alpha_channel_enabled = 0;
ui->main_window = window;
ui->menu_bar = menubar;
- gtk_widget_show_all(ui->main_window);
+ if (ui->config->hide_on_startup)
+ gtk_widget_show_all(ui->main_box);
+ else
+ gtk_widget_show_all(ui->main_window);
}
static void menu_bar_show(unsigned int show, struct ui_psensor *ui)
void ui_window_update(struct ui_psensor *ui)
{
struct config *cfg;
- GtkWidget *w_sensorlist;
+ int init = 1;
cfg = ui->config;
if (ui->sensor_box) {
- ui_sensorlist_create_widget(ui->ui_sensorlist);
+ g_object_ref(GTK_WIDGET(ui->ui_sensorlist->widget));
+
+ gtk_container_remove(GTK_CONTAINER(ui->sensor_box),
+ ui->ui_sensorlist->widget);
gtk_container_remove(GTK_CONTAINER(ui->main_box),
ui->sensor_box);
ui->w_graph = ui_graph_create(ui);
- ui->w_sensorlist = ui->ui_sensorlist->widget;
+
+ init = 0;
}
if (cfg->sensorlist_position == SENSORLIST_POSITION_RIGHT
else
ui->sensor_box = gtk_vpaned_new();
- w_sensorlist = gtk_scrolled_window_new(NULL, NULL);
- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(w_sensorlist),
- GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
- gtk_container_add(GTK_CONTAINER(w_sensorlist),
- ui->ui_sensorlist->widget);
-
gtk_box_pack_end(GTK_BOX(ui->main_box), ui->sensor_box, TRUE, TRUE, 2);
if (cfg->sensorlist_position == SENSORLIST_POSITION_RIGHT
gtk_paned_pack1(GTK_PANED(ui->sensor_box),
GTK_WIDGET(ui->w_graph), TRUE, TRUE);
gtk_paned_pack2(GTK_PANED(ui->sensor_box),
- w_sensorlist, FALSE, TRUE);
+ ui->ui_sensorlist->widget, FALSE, TRUE);
} else {
gtk_paned_pack1(GTK_PANED(ui->sensor_box),
- w_sensorlist, FALSE, TRUE);
+ ui->ui_sensorlist->widget, FALSE, TRUE);
gtk_paned_pack2(GTK_PANED(ui->sensor_box),
GTK_WIDGET(ui->w_graph), TRUE, TRUE);
}
+ if (!init)
+ g_object_unref(GTK_WIDGET(ui->ui_sensorlist->widget));
+
gtk_widget_show_all(ui->sensor_box);
if (cfg->menu_bar_disabled)
projects / psensor.git / blobdiff