code style

[psensor.git] / src / ui_graph.c

diff --git a/src/ui_graph.c b/src/ui_graph.c
index c6ce62f..f5ef501 100644 (file)
--- a/src/ui_graph.c
+++ b/src/ui_graph.c
@@ -20,10 +20,11 @@
 #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,10 +32,26 @@ 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>"
@@ -48,6 +65,16 @@ static GtkActionEntry entries[] = {
     "Preferences",                                  /* tooltip */
     G_CALLBACK(cb_preferences) },
 
+  { "SensorPreferencesAction", GTK_STOCK_PREFERENCES,/* name, stock id */
+    "_Sensor Preferences", NULL,                     /* label, accelerator */
+    "Sensor Preferences",                            /* tooltip */
+    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) }
 };
@@ -76,7 +103,7 @@ static GtkWidget *get_menu(struct ui_psensor *ui)
 }
 
 
-static int 
+static int
 on_graph_clicked(GtkWidget *widget, GdkEventButton *event, gpointer data)
 {
        GtkWidget *menu;
@@ -109,8 +136,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);