2012 copyright

[psensor.git] / src / ui_graph.c

diff --git a/src/ui_graph.c b/src/ui_graph.c
index 00d6e74..47d9fd4 100644 (file)
--- a/src/ui_graph.c
+++ b/src/ui_graph.c
@@ -1,29 +1,29 @@
 /*
-    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-2012 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"
+#include "ui_sensorpref.h"
 
 static void cb_menu_quit(GtkMenuItem *mi, gpointer data)
 {
-       ui_psensor_quit();
+       ui_psensor_quit((struct ui_psensor *)data);
 }
 
 static void cb_preferences(GtkMenuItem *mi, gpointer data)
@@ -31,25 +31,51 @@ static void cb_preferences(GtkMenuItem *mi, gpointer data)
        ui_pref_dialog_run((struct ui_psensor *)data);
 }
 
+static void cb_about(GtkMenuItem *mi, gpointer data)
+{
+       ui_show_about_dialog();
+}
+
+static void cb_sensor_preferences(GtkMenuItem *mi, gpointer data)
+{
+       struct ui_psensor *ui = data;
+
+       if (ui->sensors && *ui->sensors)
+               ui_sensorpref_dialog_run(*ui->sensors, ui);
+}
+
 static const char *menu_desc =
 "<ui>"
 "  <popup name='MainMenu'>"
 "      <menuitem name='Preferences' action='PreferencesAction' />"
+"      <menuitem name='SensorPreferences' action='SensorPreferencesAction' />"
+"      <separator />"
+"      <menuitem name='About' action='AboutAction' />"
 "      <separator />"
 "      <menuitem name='Quit' action='QuitAction' />"
 "  </popup>"
 "</ui>";
 
 static GtkActionEntry entries[] = {
-  { "PsensorMenuAction", NULL, "_Psensor" }, /* name, stock id, label */
+       { "PsensorMenuAction", NULL, "_Psensor" },
 
-  { "PreferencesAction", GTK_STOCK_PREFERENCES,     /* name, stock id */
-    "_Preferences", NULL,                           /* label, accelerator */
-    "Preferences",                                  /* tooltip */
-    G_CALLBACK(cb_preferences) },
+       { "PreferencesAction", GTK_STOCK_PREFERENCES,
+         "_Preferences", NULL,
+         "Preferences",
+         G_CALLBACK(cb_preferences) },
 
-  { "QuitAction",
-    GTK_STOCK_QUIT, "_Quit", NULL, "Quit", G_CALLBACK(cb_menu_quit) }
+       { "SensorPreferencesAction", GTK_STOCK_PREFERENCES,
+         "_Sensor Preferences", NULL,
+         "Sensor Preferences",
+         G_CALLBACK(cb_sensor_preferences) },
+
+       { "AboutAction", NULL,
+         "_About", NULL,
+         "About",
+         G_CALLBACK(cb_about) },
+
+       { "QuitAction",
+         GTK_STOCK_QUIT, "_Quit", NULL, "Quit", G_CALLBACK(cb_menu_quit) }
 };
 static guint n_entries = G_N_ELEMENTS(entries);
 
@@ -76,7 +102,8 @@ static GtkWidget *get_menu(struct ui_psensor *ui)
 }
 
 
-int on_graph_clicked(GtkWidget *widget, GdkEventButton *event, gpointer data)
+static int
+on_graph_clicked(GtkWidget *widget, GdkEventButton *event, gpointer data)
 {
        GtkWidget *menu;
 
@@ -91,7 +118,7 @@ int on_graph_clicked(GtkWidget *widget, GdkEventButton *event, gpointer data)
        return TRUE;
 }
 
-gboolean
+static gboolean
 on_expose_event(GtkWidget *widget, GdkEventExpose *event, gpointer data)
 {
        struct ui_psensor *ui_psensor = (struct ui_psensor *)data;
@@ -108,9 +135,16 @@ GtkWidget *ui_graph_create(struct ui_psensor * ui)
 
        w_graph = gtk_drawing_area_new();
 
-       g_signal_connect(GTK_WIDGET(w_graph),
-                        "expose-event", G_CALLBACK(on_expose_event), ui);
-
+       if (GTK_MAJOR_VERSION == 2)
+               g_signal_connect(GTK_WIDGET(w_graph),
+                                "expose-event",
+                                G_CALLBACK(on_expose_event),
+                                ui);
+       else
+               g_signal_connect(GTK_WIDGET(w_graph),
+                                "draw",
+                                G_CALLBACK(on_expose_event),
+                                ui);
 
        gtk_widget_add_events(w_graph, GDK_BUTTON_PRESS_MASK);