X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fui.c;h=b444d1063c551c7a4931ab7744d316f7b53b10db;hb=b6211b9c17d3c35702adcbb69d9c5884cb85f028;hp=ee75c33f1bd39670d90095b4a5b8681b714cc4d1;hpb=f8fe519c1b5454ba939ade2a4b60f0066fb6aa14;p=psensor.git diff --git a/src/ui.c b/src/ui.c index ee75c33..b444d10 100644 --- a/src/ui.c +++ b/src/ui.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2012 jeanfi@gmail.com + * Copyright (C) 2010-2013 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 @@ -17,6 +17,7 @@ * 02110-1301 USA */ #include "cfg.h" +#include "slog.h" #include "ui.h" #include "ui_graph.h" #include "ui_pref.h" @@ -75,37 +76,38 @@ on_delete_event_cb(GtkWidget *widget, GdkEvent *event, gpointer data) void ui_show_about_dialog() { - gtk_show_about_dialog(NULL, - "comments", - _("Psensor is a GTK+ application for monitoring " - "hardware sensors"), - "copyright", - _("Copyright(c) 2010-2012\njeanfi@gmail.com"), - "logo-icon-name", "psensor", - "program-name", "Psensor", - "title", _("About Psensor"), - "version", VERSION, - "website", PACKAGE_URL, - "website-label", _("Psensor Homepage"), - NULL); + gtk_show_about_dialog + (NULL, + "comments", + _("Psensor is a GTK+ application for monitoring hardware " + "sensors"), + "copyright", + _("Copyright(c) 2010-2012\njeanfi@gmail.com"), + "logo-icon-name", "psensor", + "program-name", "Psensor", + "title", _("About Psensor"), + "version", VERSION, + "website", PACKAGE_URL, + "website-label", _("Psensor Homepage"), + 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; @@ -122,69 +124,6 @@ void ui_psensor_quit(struct ui_psensor *ui) gtk_main_quit(); } -static const char *menu_desc = -"" -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -""; - -static GtkActionEntry entries[] = { - { "PsensorMenuAction", NULL, "_Psensor" }, - - { "PreferencesAction", GTK_STOCK_PREFERENCES, - N_("_Preferences"), NULL, - N_("Preferences"), - 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) }, - - { "HelpMenuAction", NULL, "_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; @@ -195,7 +134,8 @@ void ui_enable_alpha_channel(struct ui_psensor *ui) screen = gtk_widget_get_screen(ui->main_window); - log_debug("Config alpha channel enabled: %d", cfg->alpha_channel_enabled); + log_debug("Config alpha channel enabled: %d", + cfg->alpha_channel_enabled); if (cfg->alpha_channel_enabled && gdk_screen_is_composited(screen)) { log_debug("Screen is composited"); visual = gdk_screen_get_rgba_visual(screen); @@ -208,38 +148,73 @@ void ui_enable_alpha_channel(struct ui_psensor *ui) } else { cfg->alpha_channel_enabled = 0; } +} + +static void on_slog_enabled_cb(GConfClient *client, + guint cnxn_id, + GConfEntry *entry, + gpointer user_data) +{ + struct ui_psensor *ui; + struct psensor **sensors; + pthread_mutex_t *mutex; + ui = (struct ui_psensor *)user_data; + sensors = ui->sensors; + mutex = &ui->sensors_mutex; + + log_debug("cbk_slog_enabled"); + + if (is_slog_enabled()) + slog_activate(NULL, sensors, mutex, config_get_slog_interval()); + else + slog_close(); } 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_x, cfg->window_y); + config_slog_enabled_notify_add(on_slog_enabled_cb, ui); + gtk_window_set_default_size(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_icon(GTK_WINDOW(window), icon); else - fprintf(stderr, _("ERROR: Failed to load psensor icon.\n")); + log_err(_("Failed to load Psensor icon.")); g_signal_connect(window, "delete_event", G_CALLBACK(on_delete_event_cb), ui); @@ -250,20 +225,32 @@ void ui_window_create(struct ui_psensor *ui) gtk_window_set_keep_below(GTK_WINDOW(window), cfg->window_keep_below_enabled); - /* main box */ - menubar = get_menu(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->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); - gtk_container_add(GTK_CONTAINER(window), ui->main_box); + 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")); - 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) @@ -277,21 +264,27 @@ 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; } @@ -321,18 +314,19 @@ void ui_window_update(struct ui_psensor *ui) 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) { log_debug("ui_window_show()"); + ui_window_update(ui); gtk_window_present(GTK_WINDOW(ui->main_window)); }