X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fui.c;h=967f31e963f33c87cf78422685554c8ada306e69;hb=f3b05dae619a7909bd7422b3a82422c9442aa114;hp=cc6c270ca547f73a5a95be0d8215368d352c1606;hpb=f46ad1a4a864b7c39e51727d60635ac036635aa7;p=psensor.git diff --git a/src/ui.c b/src/ui.c index cc6c270..967f31e 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,6 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02110-1301 USA */ +#include + #include "cfg.h" #include "slog.h" #include "ui.h" @@ -82,7 +84,7 @@ void ui_show_about_dialog() _("Psensor is a GTK+ application for monitoring hardware " "sensors"), "copyright", - _("Copyright(c) 2010-2012\njeanfi@gmail.com"), + _("Copyright(c) 2010-2014\njeanfi@gmail.com"), "logo-icon-name", "psensor", "program-name", "Psensor", "title", _("About Psensor"), @@ -150,20 +152,18 @@ void ui_enable_alpha_channel(struct ui_psensor *ui) } } -static void on_slog_enabled_cb(GConfClient *client, - guint cnxn_id, - GConfEntry *entry, - gpointer user_data) +static void +slog_enabled_cbk(GConfClient *client, guint id, GConfEntry *e, gpointer 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()); @@ -203,7 +203,7 @@ void ui_window_create(struct ui_psensor *ui) cfg->window_x, cfg->window_y); - config_slog_enabled_notify_add(on_slog_enabled_cb, ui); + config_slog_enabled_notify_add(slog_enabled_cbk, ui); gtk_window_set_default_size(GTK_WINDOW(window), cfg->window_w, @@ -227,11 +227,32 @@ void ui_window_create(struct ui_psensor *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->sensor_box = GTK_PANED(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->sensors_scrolled_tree + = GTK_SCROLLED_WINDOW(gtk_builder_get_object + (builder, "sensors_scrolled_tree")); + + 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) @@ -245,53 +266,55 @@ 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; + + log_debug("ui_window_update()"); cfg = ui->config; - if (ui->sensor_box) { - g_object_ref(GTK_WIDGET(ui->ui_sensorlist->widget)); + g_object_ref(GTK_WIDGET(ui->sensors_scrolled_tree)); + g_object_ref(GTK_WIDGET(ui->w_graph)); - gtk_container_remove(GTK_CONTAINER(ui->sensor_box), - ui->ui_sensorlist->widget); + gtk_container_remove(GTK_CONTAINER(ui->sensor_box), + GTK_WIDGET(ui->sensors_scrolled_tree)); - gtk_container_remove(GTK_CONTAINER(ui->main_box), - ui->sensor_box); + gtk_container_remove(GTK_CONTAINER(ui->sensor_box), ui->w_graph); - ui->w_graph = ui_graph_create(ui); - - init = 0; - } + gtk_container_remove(GTK_CONTAINER(ui->main_box), + GTK_WIDGET(ui->sensor_box)); if (cfg->sensorlist_position == SENSORLIST_POSITION_RIGHT || cfg->sensorlist_position == SENSORLIST_POSITION_LEFT) - ui->sensor_box = gtk_paned_new(GTK_ORIENTATION_HORIZONTAL); + ui->sensor_box + = GTK_PANED(gtk_paned_new(GTK_ORIENTATION_HORIZONTAL)); else - ui->sensor_box = gtk_paned_new(GTK_ORIENTATION_VERTICAL); + ui->sensor_box + = GTK_PANED(gtk_paned_new(GTK_ORIENTATION_VERTICAL)); - gtk_box_pack_end(GTK_BOX(ui->main_box), ui->sensor_box, TRUE, TRUE, 2); + gtk_box_pack_end(GTK_BOX(ui->main_box), + GTK_WIDGET(ui->sensor_box), TRUE, TRUE, 2); if (cfg->sensorlist_position == SENSORLIST_POSITION_RIGHT || cfg->sensorlist_position == SENSORLIST_POSITION_BOTTOM) { - gtk_paned_pack1(GTK_PANED(ui->sensor_box), + gtk_paned_pack1(ui->sensor_box, GTK_WIDGET(ui->w_graph), TRUE, TRUE); - gtk_paned_pack2(GTK_PANED(ui->sensor_box), - ui->ui_sensorlist->widget, FALSE, TRUE); + gtk_paned_pack2(ui->sensor_box, + GTK_WIDGET(ui->sensors_scrolled_tree), + 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_paned_pack1(ui->sensor_box, + GTK_WIDGET(ui->sensors_scrolled_tree), + FALSE, TRUE); + gtk_paned_pack2(ui->sensor_box, GTK_WIDGET(ui->w_graph), TRUE, TRUE); } if (cfg->window_restore_enabled) - gtk_paned_set_position(GTK_PANED(ui->sensor_box), - ui->config->window_divider_pos); + gtk_paned_set_position(ui->sensor_box, cfg->window_divider_pos); - if (!init) - g_object_unref(GTK_WIDGET(ui->ui_sensorlist->widget)); + g_object_unref(GTK_WIDGET(ui->sensors_scrolled_tree)); + g_object_unref(GTK_WIDGET(ui->w_graph)); - gtk_widget_show_all(ui->sensor_box); + gtk_widget_show_all(GTK_WIDGET(ui->sensor_box)); if (cfg->menu_bar_disabled) menu_bar_show(0, ui); @@ -305,3 +328,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(const struct ui_psensor *ui) +{ + struct psensor **result; + + result = psensor_list_copy(ui->sensors); + qsort(result, + psensor_list_size(result), + sizeof(struct psensor *), + cmp_sensors); + + return result; +}