Fixed restoration of the panel divider position.

[psensor.git] / src / ui_graph.c

diff --git a/src/ui_graph.c b/src/ui_graph.c
index b5683d7..577e83a 100644 (file)
--- a/src/ui_graph.c
+++ b/src/ui_graph.c
@@ -1,94 +1,79 @@
 /*
-    Copyright (C) 2010-2011 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 published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301 USA
-*/
-
+ * 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
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
 #include "graph.h"
 #include "ui_graph.h"
-#include "ui_pref.h"
-
-static void
-cb_preferences(gpointer data, guint callback_action, GtkWidget *item)
-{
-       ui_pref_dialog_run((struct ui_psensor *)data);
-}
-
-static GtkItemFactoryEntry menu_items[] = {
-       {N_("/Preferences"),
-        NULL, cb_preferences, 0, "<Item>"},
-
-       {"/sep1",
-        NULL, NULL, 0, "<Separator>"},
 
-       {N_("/Quit"),
-        "", ui_psensor_quit, 0, "<StockItem>", GTK_STOCK_QUIT},
-};
-
-static gint nmenu_items = sizeof(menu_items) / sizeof(menu_items[0]);
-
-static GtkWidget *get_menu(struct ui_psensor *ui)
+static int
+on_graph_clicked(GtkWidget *widget, GdkEventButton *event, gpointer data)
 {
-       GtkItemFactory *item_factory;
-
-       item_factory = gtk_item_factory_new(GTK_TYPE_MENU, "<main>", NULL);
-       gtk_item_factory_create_items(item_factory,
-                                     nmenu_items, menu_items, ui);
-       return gtk_item_factory_get_widget(item_factory, "<main>");
-}
-
-int on_graph_clicked(GtkWidget *widget, GdkEventButton *event, gpointer data)
-{
-       GtkWidget *menu;
-
        if (event->type != GDK_BUTTON_PRESS)
                return FALSE;
 
-       menu = get_menu((struct ui_psensor *)data);
-
-       gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL,
+       gtk_menu_popup(GTK_MENU(((struct ui_psensor *)data)->popup_menu),
+                      NULL, NULL, NULL, NULL,
                       event->button, event->time);
 
        return TRUE;
 }
 
-gboolean
+static gboolean
 on_expose_event(GtkWidget *widget, GdkEventExpose *event, gpointer data)
 {
        struct ui_psensor *ui_psensor = (struct ui_psensor *)data;
 
        graph_update(ui_psensor->sensors,
-                    ui_psensor->w_graph, ui_psensor->config);
+                    ui_get_graph(),
+                    ui_psensor->config,
+                    ui_psensor->main_window);
 
        return FALSE;
 }
 
-GtkWidget *ui_graph_create(struct ui_psensor * ui)
+static void smooth_curves_enabled_changed_cbk(void *data)
+{
+       is_smooth_curves_enabled = config_is_smooth_curves_enabled();
+}
+
+void ui_graph_create(struct ui_psensor *ui)
 {
        GtkWidget *w_graph;
 
-       w_graph = gtk_drawing_area_new();
+       log_debug("ui_graph_create()");
+
+       w_graph = ui_get_graph();
 
-       g_signal_connect(G_OBJECT(w_graph),
-                        "expose-event", G_CALLBACK(on_expose_event), ui);
+       is_smooth_curves_enabled = config_is_smooth_curves_enabled();
+       g_signal_connect_after(config_get_GSettings(),
+                              "changed::graph-smooth-curves-enabled",
+                              G_CALLBACK(smooth_curves_enabled_changed_cbk),
+                              NULL);
+
+       g_signal_connect(GTK_WIDGET(w_graph),
+                        "draw",
+                        G_CALLBACK(on_expose_event),
+                        ui);
 
        gtk_widget_add_events(w_graph, GDK_BUTTON_PRESS_MASK);
-       gtk_signal_connect(GTK_OBJECT(w_graph),
-                          "button_press_event",
-                          (GCallback) on_graph_clicked, ui);
 
-       return w_graph;
+       g_signal_connect(GTK_WIDGET(w_graph),
+                        "button_press_event",
+                        (GCallback) on_graph_clicked, ui);
+
+       log_debug("ui_graph_create() ends");
 }