X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fui.c;h=3a83f9ccf7508d674c6aef8a9bac9ea3a3ecde0d;hb=30280041f93f4374ce36a151df44c2bc7495d807;hp=7c7af9fe3dea7c1077c18a774f0e1da578b9c566;hpb=1d88ffa6951708e433d20666c8d833226f8caaf4;p=psensor.git diff --git a/src/ui.c b/src/ui.c index 7c7af9f..3a83f9c 100644 --- a/src/ui.c +++ b/src/ui.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2013 jeanfi@gmail.com + * Copyright (C) 2010-2014 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,75 @@ * 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 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 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); + + log_fct_exit(); +} static void save_window_pos(struct ui_psensor *ui) { @@ -74,18 +134,25 @@ on_delete_event_cb(GtkWidget *widget, GdkEvent *event, gpointer data) return TRUE; } -void ui_show_about_dialog() +void ui_show_about_dialog(void) { + static const char *const authors[] = { "jeanfi@gmail.com", NULL }; + gtk_show_about_dialog (NULL, + "authors", authors, "comments", _("Psensor is a GTK+ application for monitoring hardware " "sensors"), "copyright", - _("Copyright(c) 2010-2012\njeanfi@gmail.com"), + _("Copyright(c) 2010-2014 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"), @@ -150,8 +217,7 @@ void ui_enable_alpha_channel(struct ui_psensor *ui) } } -static void -slog_enabled_cbk(GConfClient *client, guint id, GConfEntry *e, gpointer data) +static void slog_enabled_cbk(void *data) { struct ui_psensor *ui; struct psensor **sensors; @@ -171,7 +237,7 @@ slog_enabled_cbk(GConfClient *client, guint id, GConfEntry *e, gpointer data) void ui_window_create(struct ui_psensor *ui) { - GtkWidget *window; + GtkWidget *window, *menu_bar; GdkPixbuf *icon; GtkIconTheme *icon_theme; struct config *cfg; @@ -190,7 +256,7 @@ void ui_window_create(struct ui_psensor *ui) if (!ok) { log_printf(LOG_ERR, error->message); g_error_free(error); - return ; + return; } window = GTK_WIDGET(gtk_builder_get_object(builder, "window")); @@ -201,7 +267,7 @@ void ui_window_create(struct ui_psensor *ui) cfg->window_x, cfg->window_y); - config_slog_enabled_notify_add(slog_enabled_cbk, ui); + config_set_slog_enabled_changed_cbk(slog_enabled_cbk, ui); gtk_window_set_default_size(GTK_WINDOW(window), cfg->window_w, @@ -217,20 +283,16 @@ 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); - - gtk_window_set_keep_below(GTK_WINDOW(window), - cfg->window_keep_below_enabled); + set_decoration(GTK_WINDOW(window)); + set_keep_below(GTK_WINDOW(window)); - ui->menu_bar = GTK_WIDGET(gtk_builder_get_object(builder, "menu_bar")); + 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->w_graph = GTK_WIDGET(gtk_builder_get_object(builder, "graph")); ui_graph_create(ui); ui->sensor_box = GTK_PANED(gtk_builder_get_object(builder, @@ -245,22 +307,17 @@ void ui_window_create(struct ui_psensor *ui) ui_sensorlist_create(ui); + connect_cbks(GTK_WINDOW(window), menu_bar); + log_debug("ui_window_create(): show_all"); gtk_widget_show_all(ui->main_box); + set_menu_bar_enabled(menu_bar); g_object_unref(G_OBJECT(builder)); log_debug("ui_window_create() ends"); } -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); -} - void ui_window_update(struct ui_psensor *ui) { struct config *cfg; @@ -313,11 +370,6 @@ void ui_window_update(struct ui_psensor *ui) g_object_unref(GTK_WIDGET(ui->w_graph)); gtk_widget_show_all(GTK_WIDGET(ui->sensor_box)); - - if (cfg->menu_bar_disabled) - menu_bar_show(0, ui); - else - menu_bar_show(1, ui); } void ui_window_show(struct ui_psensor *ui) @@ -326,3 +378,30 @@ void ui_window_show(struct ui_psensor *ui) ui_window_update(ui); gtk_window_present(GTK_WINDOW(ui->main_window)); } + +static int cmp_sensors(const void *p1, const void *p2) +{ + const struct psensor *s1, *s2; + int pos1, pos2; + + s1 = *(void **)p1; + s2 = *(void **)p2; + + pos1 = config_get_sensor_position(s1->id); + pos2 = config_get_sensor_position(s2->id); + + return pos1 - pos2; +} + +struct psensor **ui_get_sensors_ordered_by_position(struct psensor **sensors) +{ + struct psensor **result; + + result = psensor_list_copy(sensors); + qsort(result, + psensor_list_size(result), + sizeof(struct psensor *), + cmp_sensors); + + return result; +}