code refactoring and cleanup

diff --git a/src/main.c b/src/main.c
index 35bef5b..933784a 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -164,7 +164,7 @@ gboolean ui_refresh_thread(gpointer data)
 
        graph_update(ui->sensors, ui->w_graph, ui->config);
 
-       ui_sensorlist_update(ui->ui_sensorlist);
+       ui_sensorlist_update(ui);
 
 #if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029)
        ui_appindicator_update(ui);
@@ -383,7 +383,7 @@ int main(int argc, char **argv)
        ui.w_graph = ui_graph_create(&ui);
 
        /* sensor list */
-       ui.ui_sensorlist = ui_sensorlist_create(ui.sensors);
+       ui_sensorlist_create(&ui);
 
        ui_window_update(&ui);
 

diff --git a/src/ui_sensorlist.c b/src/ui_sensorlist.c
index c036bc9..af830ae 100644 (file)
--- a/src/ui_sensorlist.c
+++ b/src/ui_sensorlist.c
@@ -24,6 +24,7 @@
 #include "ui.h"
 #include "ui_pref.h"
 #include "ui_sensorlist.h"
+#include "ui_sensorpref.h"
 #include "cfg.h"
 #include "ui_color.h"
 #include "compat.h"
@@ -41,7 +42,7 @@ enum {
 };
 
 struct cb_data {
-       struct ui_sensorlist *ui_sensorlist;
+       struct ui_psensor *ui;
        struct psensor *sensor;
 };
 
@@ -55,13 +56,14 @@ static int col_index_to_col(int idx)
        return idx;
 }
 
-void ui_sensorlist_update(struct ui_sensorlist *list)
+void ui_sensorlist_update(struct ui_psensor *ui)
 {
        GtkTreeIter iter;
+       struct ui_sensorlist *ui_sl = ui->ui_sensorlist;
        GtkTreeModel *model
-           = gtk_tree_view_get_model(list->treeview);
+           = gtk_tree_view_get_model(ui_sl->treeview);
        gboolean valid = gtk_tree_model_get_iter_first(model, &iter);
-       struct psensor **sensor = list->sensors;
+       struct psensor **sensor = ui->sensors;
 
        while (valid && *sensor) {
                struct psensor *s = *sensor;
@@ -138,13 +140,13 @@ static int get_col_index_at_pos(GtkTreeView *view, int x)
        return -1;
 }
 
-void ui_sensorlist_update_sensors_preferences(struct ui_sensorlist *list)
+void ui_sensorlist_update_sensors_preferences(struct ui_psensor *ui)
 {
        GtkTreeIter iter;
        GtkTreeModel *model
-           = gtk_tree_view_get_model(list->treeview);
+           = gtk_tree_view_get_model(ui->ui_sensorlist->treeview);
        gboolean valid = gtk_tree_model_get_iter_first(model, &iter);
-       struct psensor **sensor = list->sensors;
+       struct psensor **sensor = ui->ui_sensorlist->sensors;
 
        while (valid && *sensor) {
                GdkColor color;
@@ -175,97 +177,11 @@ void ui_sensorlist_update_sensors_preferences(struct ui_sensorlist *list)
 static void on_preferences_activated(GtkWidget *menu_item, gpointer data)
 {
        struct cb_data *cb_data = data;
-       struct psensor *sensor = cb_data->sensor;
-       GtkDialog *diag;
-       gint result;
-       GtkBuilder *builder;
-       GError *error = NULL;
-       GtkLabel *w_id, *w_type;
-       GtkEntry *w_name;
-       GtkToggleButton *w_draw, *w_alarm;
-       GtkColorButton *w_color;
-       GtkSpinButton *w_temp_limit;
-       GdkColor *color;
-       guint ok;
-
-       builder = gtk_builder_new();
-
-       ok = gtk_builder_add_from_file
-               (builder,
-                PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "sensor-edit.glade",
-                &error);
-
-       if (!ok) {
-               g_warning("%s", error->message);
-               g_free(error);
-               return ;
-       }
-
-       w_id = GTK_LABEL(gtk_builder_get_object(builder, "sensor_id"));
-       gtk_label_set_text(w_id, sensor->id);
-
-       w_type = GTK_LABEL(gtk_builder_get_object(builder, "sensor_type"));
-       gtk_label_set_text(w_type, psensor_type_to_str(sensor->type));
-
-       w_name = GTK_ENTRY(gtk_builder_get_object(builder, "sensor_name"));
-       gtk_entry_set_text(w_name, sensor->name);
-
-       w_draw = GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder,
-                                                         "sensor_draw"));
-       gtk_toggle_button_set_active(w_draw, sensor->enabled);
-
-       color = color_to_gdkcolor(sensor->color);
-       w_color = GTK_COLOR_BUTTON(gtk_builder_get_object(builder,
-                                                         "sensor_color"));
-       gtk_color_button_set_color(w_color, color);
-
-       w_alarm = GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder,
-                                                          "sensor_alarm"));
-       w_temp_limit
-               = GTK_SPIN_BUTTON(gtk_builder_get_object(builder,
-                                                        "sensor_temp_limit"));
-
-       if (is_temp_type(sensor->type)) {
-               gtk_toggle_button_set_active(w_alarm, sensor->alarm_enabled);
-               gtk_spin_button_set_value(w_temp_limit, sensor->alarm_limit);
-       } else {
-               gtk_widget_set_sensitive(GTK_WIDGET(w_alarm), FALSE);
-               gtk_widget_set_sensitive(GTK_WIDGET(w_temp_limit), FALSE);
-       }
-
-       diag = GTK_DIALOG(gtk_builder_get_object(builder, "dialog1"));
-       result = gtk_dialog_run(diag);
-
-       if (result == GTK_RESPONSE_ACCEPT) {
 
-               free(sensor->name);
-               sensor->name = strdup(gtk_entry_get_text(w_name));
-               config_set_sensor_name(sensor->id, sensor->name);
-
-               sensor->enabled = gtk_toggle_button_get_active(w_draw);
-               config_set_sensor_enabled(sensor->id, sensor->enabled);
-
-               sensor->alarm_limit = gtk_spin_button_get_value(w_temp_limit);
-               config_set_sensor_alarm_limit(sensor->id, sensor->alarm_limit);
-
-               sensor->alarm_enabled = gtk_toggle_button_get_active(w_alarm);
-               config_set_sensor_alarm_enabled(sensor->id,
-                                               sensor->alarm_enabled);
-
-               gtk_color_button_get_color(w_color, color);
-               color_set(sensor->color, color->red, color->green, color->blue);
-               config_set_sensor_color(sensor->id, sensor->color);
-
-               ui_sensorlist_update_sensors_preferences
-                   (cb_data->ui_sensorlist);
-       }
-
-       g_object_unref(G_OBJECT(builder));
-
-       gtk_widget_destroy(GTK_WIDGET(diag));
+       ui_sensorpref_dialog_run(cb_data->sensor, cb_data->ui);
 }
 
-static GtkWidget *create_sensor_popup(struct ui_sensorlist *ui_sensorlist,
+static GtkWidget *create_sensor_popup(struct ui_psensor *ui,
                                      struct psensor *sensor)
 {
        GtkWidget *menu;
@@ -285,7 +201,7 @@ static GtkWidget *create_sensor_popup(struct ui_sensorlist *ui_sensorlist,
        gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
 
        data = malloc(sizeof(struct cb_data));
-       data->ui_sensorlist = ui_sensorlist;
+       data->ui = ui;
        data->sensor = sensor;
 
        g_signal_connect(item,
@@ -299,13 +215,13 @@ static GtkWidget *create_sensor_popup(struct ui_sensorlist *ui_sensorlist,
 
 static int on_clicked(GtkWidget *widget, GdkEventButton *event, gpointer data)
 {
-       struct ui_sensorlist *list = (struct ui_sensorlist *)data;
-       GtkTreeView *view = list->treeview;
+       struct ui_psensor *ui = (struct ui_psensor *)data;
+       GtkTreeView *view = ui->ui_sensorlist->treeview;
 
        struct psensor *sensor = get_sensor_at_pos(view,
                                                   event->x,
                                                   event->y,
-                                                  list->sensors);
+                                                  ui->sensors);
 
        if (sensor) {
                int coli = col_index_to_col(get_col_index_at_pos(view,
@@ -314,12 +230,12 @@ static int on_clicked(GtkWidget *widget, GdkEventButton *event, gpointer data)
                if (coli == COL_COLOR) {
                        if (ui_change_color(_("Select foreground color"),
                                            sensor->color)) {
-                               ui_sensorlist_update_sensors_preferences(list);
+                               ui_sensorlist_update_sensors_preferences(ui);
                                config_set_sensor_color(sensor->id,
                                                        sensor->color);
                        }
                } else if (coli >= 0 && coli != COL_ENABLED) {
-                       GtkWidget *menu = create_sensor_popup(list,
+                       GtkWidget *menu = create_sensor_popup(ui,
                                                              sensor);
 
                        gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL,
@@ -363,11 +279,12 @@ on_toggled(GtkCellRendererToggle *cell, gchar *path_str, gpointer data)
        gtk_tree_path_free(path);
 }
 
-static void create_widget(struct ui_sensorlist *ui)
+static void create_widget(struct ui_psensor *ui)
 {
        GtkListStore *store;
        GtkCellRenderer *renderer;
-       struct psensor **s_cur;
+       struct psensor **s_cur = ui->sensors;
+       struct ui_sensorlist *ui_sl = ui->ui_sensorlist;
 
        store = gtk_list_store_new(COLS_COUNT,
                                   G_TYPE_STRING,
@@ -378,39 +295,40 @@ static void create_widget(struct ui_sensorlist *ui)
                                   G_TYPE_STRING,
                                   G_TYPE_BOOLEAN, G_TYPE_STRING);
 
-       ui->treeview = GTK_TREE_VIEW
+       ui_sl->treeview = GTK_TREE_VIEW
                (gtk_tree_view_new_with_model(GTK_TREE_MODEL(store)));
 
-       gtk_tree_selection_set_mode(gtk_tree_view_get_selection(ui->treeview),
-                                   GTK_SELECTION_NONE);
+       gtk_tree_selection_set_mode
+               (gtk_tree_view_get_selection(ui_sl->treeview),
+                GTK_SELECTION_NONE);
 
        renderer = gtk_cell_renderer_text_new();
-       gtk_tree_view_insert_column_with_attributes(ui->treeview,
+       gtk_tree_view_insert_column_with_attributes(ui_sl->treeview,
                                                    -1,
                                                    _("Sensor"),
                                                    renderer,
                                                    "text", COL_NAME, NULL);
 
-       gtk_tree_view_insert_column_with_attributes(ui->treeview,
+       gtk_tree_view_insert_column_with_attributes(ui_sl->treeview,
                                                    -1,
                                                    _("Current"),
                                                    renderer,
                                                    "text", COL_TEMP, NULL);
 
-       gtk_tree_view_insert_column_with_attributes(ui->treeview,
+       gtk_tree_view_insert_column_with_attributes(ui_sl->treeview,
                                                    -1,
                                                    _("Min"),
                                                    renderer,
                                                    "text", COL_TEMP_MIN, NULL);
 
-       gtk_tree_view_insert_column_with_attributes(ui->treeview,
+       gtk_tree_view_insert_column_with_attributes(ui_sl->treeview,
                                                    -1,
                                                    _("Max"),
                                                    renderer,
                                                    "text", COL_TEMP_MAX, NULL);
 
        renderer = gtk_cell_renderer_text_new();
-       gtk_tree_view_insert_column_with_attributes(ui->treeview,
+       gtk_tree_view_insert_column_with_attributes(ui_sl->treeview,
                                                    -1,
                                                    _("Color"),
                                                    renderer,
@@ -418,27 +336,26 @@ static void create_widget(struct ui_sensorlist *ui)
                                                    "background", COL_COLOR_STR,
                                                    NULL);
 
-       g_signal_connect(ui->treeview,
+       g_signal_connect(ui_sl->treeview,
                         "button-press-event", (GCallback) on_clicked, ui);
 
        renderer = gtk_cell_renderer_toggle_new();
-       gtk_tree_view_insert_column_with_attributes(ui->treeview,
+       gtk_tree_view_insert_column_with_attributes(ui_sl->treeview,
                                                    -1,
                                                    _("Enabled"),
                                                    renderer,
                                                    "active", COL_ENABLED,
                                                    NULL);
        g_signal_connect(G_OBJECT(renderer),
-                        "toggled", (GCallback) on_toggled, ui);
+                        "toggled", (GCallback) on_toggled, ui_sl);
 
        renderer = gtk_cell_renderer_text_new();
-       gtk_tree_view_insert_column_with_attributes(ui->treeview,
+       gtk_tree_view_insert_column_with_attributes(ui_sl->treeview,
                                                    -1,
                                                    "",
                                                    renderer,
                                                    "text", COL_EMPTY, NULL);
 
-       s_cur = ui->sensors;
        while (*s_cur) {
                GtkTreeIter iter;
                GdkColor color;
@@ -465,21 +382,17 @@ static void create_widget(struct ui_sensorlist *ui)
                s_cur++;
        }
 
-       ui->widget = gtk_scrolled_window_new(NULL, NULL);
-       gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(ui->widget),
+       ui_sl->widget = gtk_scrolled_window_new(NULL, NULL);
+       gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(ui_sl->widget),
                                       GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-       gtk_container_add(GTK_CONTAINER(ui->widget), GTK_WIDGET(ui->treeview));
+       gtk_container_add(GTK_CONTAINER(ui_sl->widget),
+                         GTK_WIDGET(ui_sl->treeview));
 }
 
-struct ui_sensorlist *ui_sensorlist_create(struct psensor **sensors)
+void ui_sensorlist_create(struct ui_psensor *ui)
 {
-       struct ui_sensorlist *list;
-
-       list = malloc(sizeof(struct ui_sensorlist));
-       list->sensors = sensors;
-
-       create_widget(list);
-
-       return list;
+       ui->ui_sensorlist = malloc(sizeof(struct ui_sensorlist));
+       ui->ui_sensorlist->sensors = ui->sensors;
 
+       create_widget(ui);
 }

diff --git a/src/ui_sensorlist.h b/src/ui_sensorlist.h
index 8691581..542df7d 100644 (file)
--- a/src/ui_sensorlist.h
+++ b/src/ui_sensorlist.h
@@ -28,16 +28,17 @@ struct ui_sensorlist {
        /* The GtkTreeView widget containing the list of sensors */
        GtkTreeView *treeview;
 
+       /* Scrolled widget containing the GtkTreeView */
        GtkWidget *widget;
 
        struct psensor **sensors;
 };
 
-struct ui_sensorlist *ui_sensorlist_create(struct psensor **);
+void ui_sensorlist_create(struct ui_psensor *);
 
 /* Update values current/min/max */
-void ui_sensorlist_update(struct ui_sensorlist *list);
+void ui_sensorlist_update(struct ui_psensor *ui);
 
-void ui_sensorlist_update_sensors_preferences(struct ui_sensorlist *);
+void ui_sensorlist_update_sensors_preferences(struct ui_psensor *);
 
 #endif

diff --git a/src/ui_sensorpref.c b/src/ui_sensorpref.c
index a13ac07..ecd6193 100644 (file)
--- a/src/ui_sensorpref.c
+++ b/src/ui_sensorpref.c
@@ -109,7 +109,7 @@ void ui_sensorpref_dialog_run(struct psensor *sensor, struct ui_psensor *ui)
                color_set(sensor->color, color->red, color->green, color->blue);
                config_set_sensor_color(sensor->id, sensor->color);
 
-               ui_sensorlist_update_sensors_preferences(ui->ui_sensorlist);
+               ui_sensorlist_update_sensors_preferences(ui);
        }
 
        g_object_unref(G_OBJECT(builder));