X-Git-Url: https://git.wpitchoune.net/gitweb/?p=psensor.git;a=blobdiff_plain;f=src%2Fui.c;h=1ce84eae1a3dac5a5a0c6f9f96eb287e59f985ba;hp=dce1c18121d9211242cab7e8fed1fe50dd204703;hb=c1e20f2631a1249720e9c75d753eacfcb0f6c7b9;hpb=cc35e177d57bc4ee2cc57ae25f130dfc168aa61d diff --git a/src/ui.c b/src/ui.c index dce1c18..1ce84ea 100644 --- a/src/ui.c +++ b/src/ui.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2013 jeanfi@gmail.com + * Copyright (C) 2010-2016 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 @@ -16,15 +16,141 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02110-1301 USA */ -#include "cfg.h" -#include "slog.h" -#include "ui.h" -#include "ui_graph.h" -#include "ui_pref.h" -#include "ui_sensorpref.h" -#include "ui_sensorlist.h" -#include "ui_status.h" -#include "ui_appindicator.h" +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +static GtkWidget *w_sensors_scrolled_tree; +static GtkWidget *w_graph; +static GtkContainer *w_sensor_box; +static GtkContainer *w_main_box; + +static void update_layout(void) +{ + enum sensorlist_position sensorlist_pos; + + g_object_ref(w_sensors_scrolled_tree); + g_object_ref(w_graph); + + gtk_container_remove(w_sensor_box, + w_sensors_scrolled_tree); + + gtk_container_remove(w_sensor_box, w_graph); + + gtk_container_remove(w_main_box, GTK_WIDGET(w_sensor_box)); + + sensorlist_pos = config_get_sensorlist_position(); + if (sensorlist_pos == SENSORLIST_POSITION_RIGHT + || sensorlist_pos == SENSORLIST_POSITION_LEFT) + w_sensor_box + = GTK_CONTAINER(gtk_paned_new + (GTK_ORIENTATION_HORIZONTAL)); + else + w_sensor_box + = GTK_CONTAINER(gtk_paned_new + (GTK_ORIENTATION_VERTICAL)); + + gtk_box_pack_end(GTK_BOX(w_main_box), + GTK_WIDGET(w_sensor_box), TRUE, TRUE, 2); + + if (sensorlist_pos == SENSORLIST_POSITION_RIGHT + || sensorlist_pos == SENSORLIST_POSITION_BOTTOM) { + gtk_paned_pack1(GTK_PANED(w_sensor_box), w_graph, TRUE, TRUE); + gtk_paned_pack2(GTK_PANED(w_sensor_box), + w_sensors_scrolled_tree, + FALSE, + TRUE); + } else { + gtk_paned_pack1(GTK_PANED(w_sensor_box), + w_sensors_scrolled_tree, + FALSE, + TRUE); + gtk_paned_pack2(GTK_PANED(w_sensor_box), w_graph, TRUE, TRUE); + } + + g_object_unref(w_sensors_scrolled_tree); + g_object_unref(w_graph); + + gtk_widget_show_all(GTK_WIDGET(w_sensor_box)); +} + +static void set_decoration(GtkWindow *win) +{ + gtk_window_set_decorated(win, config_is_window_decoration_enabled()); +} + +static void set_keep_below(GtkWindow *win) +{ + gtk_window_set_keep_below(win, config_is_window_keep_below_enabled()); +} + +static void set_menu_bar_enabled(GtkWidget *bar) +{ + if (config_is_menu_bar_enabled()) + gtk_widget_show(bar); + else + gtk_widget_hide(bar); +} + +static void +decoration_changed_cbk(GSettings *settings, gchar *key, gpointer data) +{ + set_decoration(GTK_WINDOW(data)); +} + +static void +keep_below_changed_cbk(GSettings *settings, gchar *key, gpointer data) +{ + set_keep_below(GTK_WINDOW(data)); +} + +static void +menu_bar_changed_cbk(GSettings *settings, gchar *key, gpointer data) +{ + set_menu_bar_enabled(GTK_WIDGET(data)); +} + +static void +sensorlist_position_changed_cbk(GSettings *settings, gchar *key, gpointer data) +{ + update_layout(); +} + +static void connect_cbks(GtkWindow *win, GtkWidget *menu_bar) +{ + log_fct_enter(); + + g_signal_connect_after(config_get_GSettings(), + "changed::interface-window-decoration-disabled", + G_CALLBACK(decoration_changed_cbk), + win); + + g_signal_connect_after(config_get_GSettings(), + "changed::interface-window-keep-below-enabled", + G_CALLBACK(keep_below_changed_cbk), + win); + + g_signal_connect_after(config_get_GSettings(), + "changed::interface-menu-bar-disabled", + G_CALLBACK(menu_bar_changed_cbk), + menu_bar); + + g_signal_connect_after(config_get_GSettings(), + "changed::interface-sensorlist-position", + G_CALLBACK(sensorlist_position_changed_cbk), + menu_bar); + + + log_fct_exit(); +} static void save_window_pos(struct ui_psensor *ui) { @@ -51,7 +177,7 @@ static void save_window_pos(struct ui_psensor *ui) log_debug("Window size: %d %d", cfg->window_w, cfg->window_h); cfg->window_divider_pos - = gtk_paned_get_position(GTK_PANED(ui->sensor_box)); + = gtk_paned_get_position(GTK_PANED(w_sensor_box)); config_save(cfg); } @@ -62,52 +188,73 @@ on_delete_event_cb(GtkWidget *widget, GdkEvent *event, gpointer data) { struct ui_psensor *ui = data; - save_window_pos(ui); - log_debug("is_status_supported: %d\n", is_status_supported()); - if (is_appindicator_supported() || is_status_supported()) + if (is_appindicator_supported() || is_status_supported()) { + save_window_pos(ui); gtk_widget_hide(ui->main_window); - else + } else { ui_psensor_quit(ui); + } return TRUE; } -void ui_show_about_dialog() +void ui_show_about_dialog(GtkWindow *parent) { + static const char *const authors[] = { "jeanfi@gmail.com", NULL }; + + log_fct("parent=%p", parent); + gtk_show_about_dialog - (NULL, + (parent, + "authors", authors, "comments", _("Psensor is a GTK+ application for monitoring hardware " "sensors"), "copyright", - _("Copyright(c) 2010-2012\njeanfi@gmail.com"), + _("Copyright(c) 2010-2016 jeanfi@gmail.com"), +#if GTK_CHECK_VERSION(3, 12, 0) + "license-type", GTK_LICENSE_GPL_2_0, +#endif "logo-icon-name", "psensor", "program-name", "Psensor", "title", _("About Psensor"), + "translator-credits", _("translator-credits"), "version", VERSION, "website", PACKAGE_URL, "website-label", _("Psensor Homepage"), NULL); } -static void cb_about(GtkMenuItem *mi, gpointer data) +void ui_cb_about(GtkAction *a, gpointer data) { - ui_show_about_dialog(); + struct ui_psensor *ui; + GtkWidget *parent; + + ui = (struct ui_psensor *)data; + + log_fct("ui=%p", ui); + + if (ui) + parent = ui->main_window; + else + parent = NULL; + + ui_show_about_dialog(GTK_WINDOW(parent)); } -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; @@ -124,69 +271,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_("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; @@ -211,23 +295,19 @@ 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) +static void slog_enabled_cbk(void *data) { struct ui_psensor *ui; struct psensor **sensors; pthread_mutex_t *mutex; - ui = (struct ui_psensor *)user_data; + ui = (struct ui_psensor *)data; sensors = ui->sensors; mutex = &ui->sensors_mutex; - log_debug("cbk_slog_enabled"); + log_debug("slog_enabled_cbk"); if (is_slog_enabled()) slog_activate(NULL, sensors, mutex, config_get_slog_interval()); @@ -237,29 +317,41 @@ static void on_slog_enabled_cb(GConfClient *client, void ui_window_create(struct ui_psensor *ui) { - GtkWidget *window, *menubar; + GtkWidget *window, *menu_bar; GdkPixbuf *icon; GtkIconTheme *icon_theme; struct config *cfg; + guint ok; + GtkBuilder *builder; + GError *error; + + log_fct("ui=%p", ui); - 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); + config_set_slog_enabled_changed_cbk(slog_enabled_cbk, 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) @@ -270,96 +362,88 @@ void ui_window_create(struct ui_psensor *ui) g_signal_connect(window, "delete_event", G_CALLBACK(on_delete_event_cb), ui); - gtk_window_set_decorated(GTK_WINDOW(window), - cfg->window_decoration_enabled); + set_decoration(GTK_WINDOW(window)); + set_keep_below(GTK_WINDOW(window)); - gtk_window_set_keep_below(GTK_WINDOW(window), - cfg->window_keep_below_enabled); + menu_bar = GTK_WIDGET(gtk_builder_get_object(builder, "menu_bar")); + w_main_box = GTK_CONTAINER(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; + w_graph = GTK_WIDGET(gtk_builder_get_object(builder, "graph")); + ui_graph_create(ui); - /* main box */ - menubar = get_menu(ui); + w_sensor_box = GTK_CONTAINER(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")); + w_sensors_scrolled_tree + = GTK_WIDGET(gtk_builder_get_object + (builder, "sensors_scrolled_tree")); - 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_sensorlist_create(ui); - gtk_container_add(GTK_CONTAINER(window), ui->main_box); + connect_cbks(GTK_WINDOW(window), menu_bar); - ui->main_window = window; - ui->menu_bar = menubar; + log_debug("ui_window_create(): show_all"); + update_layout(); + gtk_widget_show_all(GTK_WIDGET(w_main_box)); + set_menu_bar_enabled(menu_bar); - gtk_widget_show_all(ui->main_box); -} + g_object_unref(G_OBJECT(builder)); -static void menu_bar_show(unsigned int show, struct ui_psensor *ui) -{ - if (show) - gtk_widget_show(ui->menu_bar); - else - gtk_widget_hide(ui->menu_bar); + log_debug("ui_window_create() ends"); } -void ui_window_update(struct ui_psensor *ui) +void ui_window_show(struct ui_psensor *ui) { struct config *cfg; - int init = 1; - - cfg = ui->config; - - if (ui->sensor_box) { - 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); + log_debug("ui_window_show()"); - init = 0; + cfg = ui->config; + if (cfg->window_restore_enabled) { + gtk_paned_set_position(GTK_PANED(w_sensor_box), + cfg->window_divider_pos); + gtk_window_move(GTK_WINDOW(ui->main_window), + cfg->window_x, + cfg->window_y); } - if (cfg->sensorlist_position == SENSORLIST_POSITION_RIGHT - || cfg->sensorlist_position == SENSORLIST_POSITION_LEFT) - ui->sensor_box = gtk_paned_new(GTK_ORIENTATION_HORIZONTAL); - else - ui->sensor_box = gtk_paned_new(GTK_ORIENTATION_VERTICAL); + gtk_window_present(GTK_WINDOW(ui->main_window)); +} - gtk_box_pack_end(GTK_BOX(ui->main_box), ui->sensor_box, TRUE, TRUE, 2); +static int cmp_sensors(const void *p1, const void *p2) +{ + const struct psensor *s1, *s2; + int pos1, pos2; - if (cfg->sensorlist_position == SENSORLIST_POSITION_RIGHT - || cfg->sensorlist_position == SENSORLIST_POSITION_BOTTOM) { - gtk_paned_pack1(GTK_PANED(ui->sensor_box), - GTK_WIDGET(ui->w_graph), TRUE, TRUE); - gtk_paned_pack2(GTK_PANED(ui->sensor_box), - ui->ui_sensorlist->widget, FALSE, TRUE); - } else { - gtk_paned_pack1(GTK_PANED(ui->sensor_box), - ui->ui_sensorlist->widget, FALSE, TRUE); - gtk_paned_pack2(GTK_PANED(ui->sensor_box), - GTK_WIDGET(ui->w_graph), TRUE, TRUE); - } + s1 = *(void **)p1; + s2 = *(void **)p2; - if (cfg->window_restore_enabled) - gtk_paned_set_position(GTK_PANED(ui->sensor_box), - ui->config->window_divider_pos); + pos1 = config_get_sensor_position(s1->id); + pos2 = config_get_sensor_position(s2->id); - if (!init) - g_object_unref(GTK_WIDGET(ui->ui_sensorlist->widget)); + return pos1 - pos2; +} - gtk_widget_show_all(ui->sensor_box); +struct psensor **ui_get_sensors_ordered_by_position(struct psensor **sensors) +{ + struct psensor **result; - if (cfg->menu_bar_disabled) - menu_bar_show(0, ui); - else - menu_bar_show(1, ui); + result = psensor_list_copy(sensors); + qsort(result, + psensor_list_size(result), + sizeof(struct psensor *), + cmp_sensors); + + return result; } -void ui_window_show(struct ui_psensor *ui) +GtkWidget *ui_get_graph(void) { - log_debug("ui_window_show()"); - ui_window_update(ui); - gtk_window_present(GTK_WINDOW(ui->main_window)); + return w_graph; }