Added 'Hide' menu item in the contextual menu of the list of sensors.
authorJean-Philippe Orsini <jeanfi@gmail.com>
Mon, 8 Sep 2014 06:40:11 +0000 (08:40 +0200)
committerJean-Philippe Orsini <jeanfi@gmail.com>
Mon, 8 Sep 2014 06:40:11 +0000 (08:40 +0200)
NEWS
NEWS.html
src/lib/bool.h
src/ui_sensorlist.c

diff --git a/NEWS b/NEWS
index fecd19b..b829ddd 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,8 @@ v1.1.2
 * Added NVidia GPU graphics, memory, PCIe and video usage.
 * Fixed message when the configuration file is missing.
 * Added NVidia fan support.
+* Added 'Hide' menu item in the contextual menu of the list of
+  sensors.
 
 v1.1.1
 ------
index 08d8bdd..b5b40e5 100644 (file)
--- a/NEWS.html
+++ b/NEWS.html
@@ -421,6 +421,17 @@ Added NVidia GPU graphics, memory, PCIe and video usage.
 Fixed message when the configuration file is missing.\r
 </p>\r
 </li>\r
+<li>\r
+<p>\r
+Added NVidia fan support.\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+Added <em>Hide</em> menu item in the contextual menu of the list of\r
+  sensors.\r
+</p>\r
+</li>\r
 </ul></div>\r
 </div>\r
 </div>\r
@@ -2773,7 +2784,7 @@ Fixed BR1: crash when no temperature sensor is available
 <div id="footnotes"><hr /></div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 2014-09-07 11:48:04 CEST\r
+Last updated 2014-09-08 08:39:43 CEST\r
 </div>\r
 </div>\r
 </body>\r
index 3aba0b6..c31360d 100644 (file)
@@ -25,6 +25,8 @@
 #include <stdbool.h>
 #else
 #define bool char
+#define true 1
+#define false 0
 #endif
 
 #endif
index b446259..beaef1a 100644 (file)
@@ -195,9 +195,46 @@ static int get_col_index_at_pos(GtkTreeView *view, int x)
 
 static void preferences_activated_cbk(GtkWidget *menu_item, gpointer data)
 {
-       struct cb_data *cb_data = data;
+       struct cb_data *cb_data;
 
+       cb_data = data;
        ui_sensorpref_dialog_run(cb_data->sensor, cb_data->ui);
+       free(cb_data);
+}
+
+static void hide_activated_cbk(GtkWidget *menu_item, gpointer data)
+{
+       struct psensor *s, *s2;
+       GtkTreeModel *model, *fmodel;
+       GtkTreeIter iter;
+       struct cb_data *cb_data;
+       gboolean valid;
+
+       log_fct_enter();
+
+       cb_data = data;
+       s = cb_data->sensor;
+       config_set_sensor_enabled(s->id, false);
+       config_sync();
+
+       fmodel = gtk_tree_view_get_model(cb_data->ui->sensors_tree);
+       model = gtk_tree_model_filter_get_model(GTK_TREE_MODEL_FILTER(fmodel));
+       valid = gtk_tree_model_get_iter_first(model, &iter);
+       while (valid) {
+               gtk_tree_model_get(model, &iter, COL_SENSOR, &s2, -1);
+
+               if (s == s2)
+                       gtk_list_store_set(cb_data->ui->sensors_store,
+                                          &iter,
+                                          COL_DISPLAY_ENABLED,
+                                          false,
+                                          -1);
+               valid = gtk_tree_model_iter_next(model, &iter);
+       }
+
+       free(cb_data);
+
+       log_fct_exit();
 }
 
 static GtkWidget *
@@ -214,13 +251,22 @@ create_sensor_popup(struct ui_psensor *ui, struct psensor *sensor)
        separator = gtk_separator_menu_item_new();
        gtk_menu_shell_append(GTK_MENU_SHELL(menu), separator);
 
-       item = gtk_menu_item_new_with_label(_("Preferences"));
+       item = gtk_menu_item_new_with_label(_("Hide"));
        gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
 
        data = malloc(sizeof(struct cb_data));
        data->ui = ui;
        data->sensor = sensor;
+       g_signal_connect(item,
+                        "activate",
+                        G_CALLBACK(hide_activated_cbk), data);
+
+       item = gtk_menu_item_new_with_label(_("Preferences"));
+       gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
 
+       data = malloc(sizeof(struct cb_data));
+       data->ui = ui;
+       data->sensor = sensor;
        g_signal_connect(item,
                         "activate",
                         G_CALLBACK(preferences_activated_cbk), data);