NULL);
}
-static void cb_about(GtkMenuItem *mi, gpointer data)
+void ui_cb_about(GtkMenuItem *mi, gpointer data)
{
ui_show_about_dialog();
}
-static void cb_menu_quit(GtkMenuItem *mi, gpointer data)
+void ui_cb_menu_quit(GtkMenuItem *mi, gpointer data)
{
ui_psensor_quit((struct ui_psensor *)data);
}
-static void cb_preferences(GtkMenuItem *mi, gpointer data)
+void ui_cb_preferences(GtkMenuItem *mi, gpointer data)
{
ui_pref_dialog_run((struct ui_psensor *)data);
}
-static void cb_sensor_preferences(GtkMenuItem *mi, gpointer data)
+void ui_cb_sensor_preferences(GtkMenuItem *mi, gpointer data)
{
struct ui_psensor *ui = data;
gtk_main_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>"
-" <menu name='Help' action='HelpMenuAction'>"
-" <menuitem name='About' action='AboutAction' />"
-" </menu>"
-" </menubar>"
-"</ui>";
-
-static GtkActionEntry entries[] = {
- { "PsensorMenuAction", NULL, "_Psensor" },
-
- { "PreferencesAction", GTK_STOCK_PREFERENCES,
- N_("_Preferences"), NULL,
- N_("Preferences"),
- G_CALLBACK(cb_preferences) },
-
- { "SensorPreferencesAction", GTK_STOCK_PREFERENCES,
- N_("S_ensor Preferences"), NULL,
- N_("Sensor Preferences"),
- G_CALLBACK(cb_sensor_preferences) },
-
- { "QuitAction",
- GTK_STOCK_QUIT, N_("_Quit"), NULL, N_("Quit"),
- G_CALLBACK(cb_menu_quit) },
-
- { "HelpMenuAction", NULL, N_("_Help") },
-
- { "AboutAction", GTK_STOCK_PREFERENCES,
- N_("_About"), NULL,
- N_("About"),
- G_CALLBACK(cb_about) }
-};
-static guint n_entries = G_N_ELEMENTS(entries);
-
-static GtkWidget *get_menu(struct ui_psensor *ui)
-{
- 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");
-}
-
void ui_enable_alpha_channel(struct ui_psensor *ui)
{
GdkScreen *screen;
} else {
cfg->alpha_channel_enabled = 0;
}
-
}
static void on_slog_enabled_cb(GConfClient *client,
void ui_window_create(struct ui_psensor *ui)
{
- GtkWidget *window, *menubar;
+ GtkWidget *window;
GdkPixbuf *icon;
GtkIconTheme *icon_theme;
struct config *cfg;
+ guint ok;
+ GtkBuilder *builder;
+ GError *error;
- window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+ builder = gtk_builder_new();
+ error = NULL;
+ ok = gtk_builder_add_from_file
+ (builder,
+ PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "psensor.glade",
+ &error);
+
+ if (!ok) {
+ log_printf(LOG_ERR, error->message);
+ g_error_free(error);
+ return ;
+ }
+
+ window = GTK_WIDGET(gtk_builder_get_object(builder, "window"));
+ gtk_builder_connect_signals(builder, ui);
cfg = ui->config;
if (cfg->window_restore_enabled)
gtk_window_move(GTK_WINDOW(window),
cfg->window_w,
cfg->window_h);
- gtk_window_set_title(GTK_WINDOW(window),
- _("Psensor - Temperature Monitor"));
- gtk_window_set_role(GTK_WINDOW(window), "psensor");
-
icon_theme = gtk_icon_theme_get_default();
icon = gtk_icon_theme_load_icon(icon_theme, "psensor", 48, 0, NULL);
if (icon)
gtk_window_set_keep_below(GTK_WINDOW(window),
cfg->window_keep_below_enabled);
- /* main box */
- menubar = get_menu(ui);
+ ui->menu_bar = GTK_WIDGET(gtk_builder_get_object(builder, "menu_bar"));
+ ui->main_box = GTK_WIDGET(gtk_builder_get_object(builder, "main_box"));
+ ui->popup_menu = GTK_WIDGET(gtk_builder_get_object(builder,
+ "popup_menu"));
+ g_object_ref(G_OBJECT(ui->popup_menu));
+ ui->main_window = window;
+ ui->w_graph = GTK_WIDGET(gtk_builder_get_object(builder,
+ "graph"));
+ ui_graph_create(ui);
- ui->main_box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 1);
- gtk_box_set_homogeneous(GTK_BOX(ui->main_box), FALSE);
- gtk_box_pack_start(GTK_BOX(ui->main_box), menubar,
- FALSE, TRUE, 0);
+ ui->sensor_box = GTK_WIDGET(gtk_builder_get_object(builder,
+ "sensor_box"));
+ ui->sensors_store = GTK_LIST_STORE(gtk_builder_get_object
+ (builder, "sensors_store"));
+ ui->sensors_tree = GTK_TREE_VIEW(gtk_builder_get_object
+ (builder, "sensors_tree"));
- gtk_container_add(GTK_CONTAINER(window), ui->main_box);
-
- ui->main_window = window;
- ui->menu_bar = menubar;
+ ui_sensorlist_create(ui);
+ log_debug("ui_window_create(): show_all");
gtk_widget_show_all(ui->main_box);
+
+ g_object_unref(G_OBJECT(builder));
+
+
+ log_debug("ui_window_create() ends");
}
static void menu_bar_show(unsigned int show, struct ui_psensor *ui)
void ui_window_update(struct ui_psensor *ui)
{
struct config *cfg;
- int init = 1;
+ /*int init = 1;*/
- cfg = ui->config;
+ log_debug("ui_window_update()");
+ cfg = ui->config;
+ /*
if (ui->sensor_box) {
g_object_ref(GTK_WIDGET(ui->ui_sensorlist->widget));
+ if (ui->ui_sensorlist && ui->ui_sensorlist->widget) {
+ printf("remove sensor_list\n");
+ gtk_container_remove(GTK_CONTAINER(ui->sensor_box),
+ ui->ui_sensorlist->widget);
+ }
+
gtk_container_remove(GTK_CONTAINER(ui->sensor_box),
- ui->ui_sensorlist->widget);
+ ui->w_graph);
gtk_container_remove(GTK_CONTAINER(ui->main_box),
ui->sensor_box);
- ui->w_graph = ui_graph_create(ui);
-
init = 0;
}
ui->config->window_divider_pos);
if (!init)
- g_object_unref(GTK_WIDGET(ui->ui_sensorlist->widget));
+ g_object_unref(GTK_WIDGET(ui->ui_sensorlist->widget));*/
- gtk_widget_show_all(ui->sensor_box);
+ /* gtk_widget_show_all(ui->sensor_box);*/
if (cfg->menu_bar_disabled)
menu_bar_show(0, ui);
else
- menu_bar_show(1, ui);
+ menu_bar_show(1, ui);
}
void ui_window_show(struct ui_psensor *ui)
projects / psensor.git / blobdiff