added mouse scroll wheel tuning

diff --git a/main.c b/main.c
index e9405ccfd5b60eaeead9090557005c173c7a97d1..15c935ecb941bf1f55acbc3ded7f1de0422381ed 100644 (file)
--- a/main.c
+++ b/main.c
@@ -776,8 +776,8 @@ gint init(void* arg) {
               _exit(0);
           }
          
+          gtk_widget_destroy(discovery_dialog);
           if(result==GTK_RESPONSE_YES) {
-              gtk_widget_destroy(discovery_dialog);
               configure_gpio();
           }
       }

diff --git a/panadapter.c b/panadapter.c
index f5d4f26ec09e990fbb5a3bc380d60099fef0658c..3412cf5bada5c592bfdf78fbac5eaa2c3ac4cb74 100644 (file)
--- a/panadapter.c
+++ b/panadapter.c
@@ -154,6 +154,18 @@ panadapter_motion_notify_event_cb (GtkWidget      *widget,
   return TRUE;
 }
 
+static gboolean
+panadapter_scroll_event_cb (GtkWidget      *widget,
+               GdkEventScroll *event,
+               gpointer        data)
+{
+  if(event->direction==GDK_SCROLL_UP) {
+    vfo_move(step);
+  } else {
+    vfo_move(-step);
+  }
+}
+
 static void
 close_window (void)
 {
@@ -348,6 +360,8 @@ GtkWidget* panadapter_init(int width,int height) {
             G_CALLBACK (panadapter_button_press_event_cb), NULL);
   g_signal_connect (panadapter, "button-release-event",
             G_CALLBACK (panadapter_button_release_event_cb), NULL);
+  g_signal_connect(panadapter,"scroll_event",
+            G_CALLBACK(panadapter_scroll_event_cb),NULL);
 
   /* Ask to receive events the drawing area doesn't normally
    * subscribe to. In particular, we need to ask for the
@@ -357,6 +371,7 @@ GtkWidget* panadapter_init(int width,int height) {
                      | GDK_BUTTON_PRESS_MASK
                      | GDK_BUTTON_RELEASE_MASK
                      | GDK_BUTTON1_MOTION_MASK
+                     | GDK_SCROLL_MASK
                      | GDK_POINTER_MOTION_MASK
                      | GDK_POINTER_MOTION_HINT_MASK);
 

diff --git a/pihpsdr b/pihpsdr
index ec122cb909f4c37ff2623c7d53b1abe4813dd781..2c7f5cec883ff781dd8bf97fd3901e8f211d6a24 100755 (executable)
Binary files a/pihpsdr and b/pihpsdr differ

diff --git a/release/pihpsdr.tar b/release/pihpsdr.tar
index 82c72806118441cb012e8774f9a6d1a4adb34b09..758c956f9c89115ec3a0427aacdd0be2b5ff15f1 100644 (file)
Binary files a/release/pihpsdr.tar and b/release/pihpsdr.tar differ

diff --git a/release/pihpsdr/pihpsdr b/release/pihpsdr/pihpsdr
index ec122cb909f4c37ff2623c7d53b1abe4813dd781..2c7f5cec883ff781dd8bf97fd3901e8f211d6a24 100755 (executable)
Binary files a/release/pihpsdr/pihpsdr and b/release/pihpsdr/pihpsdr differ

diff --git a/waterfall.c b/waterfall.c
index e3dd2188a749ed77056e567c4c174cf59a4e7f3a..1490df67554a4352105fb9b78db64e8cae3ffa21 100644 (file)
--- a/waterfall.c
+++ b/waterfall.c
@@ -139,6 +139,18 @@ waterfall_motion_notify_event_cb (GtkWidget      *widget,
   return TRUE;
 }
 
+static gboolean
+waterfall_scroll_event_cb (GtkWidget      *widget,
+               GdkEventScroll *event,
+               gpointer        data)
+{
+  if(event->direction==GDK_SCROLL_UP) {
+    vfo_move(step);
+  } else {
+    vfo_move(-step);
+  }
+}
+
 void waterfall_update(float *data) {
 
 
@@ -247,6 +259,8 @@ GtkWidget* waterfall_init(int width,int height) {
             G_CALLBACK (waterfall_button_press_event_cb), NULL);
   g_signal_connect (waterfall, "button-release-event",
             G_CALLBACK (waterfall_button_release_event_cb), NULL);
+  g_signal_connect(waterfall,"scroll_event",
+            G_CALLBACK(waterfall_scroll_event_cb),NULL);
 
   /* Ask to receive events the drawing area doesn't normally
    * subscribe to. In particular, we need to ask for the
@@ -256,6 +270,7 @@ GtkWidget* waterfall_init(int width,int height) {
                      | GDK_BUTTON_PRESS_MASK
                      | GDK_BUTTON_RELEASE_MASK
                      | GDK_BUTTON1_MOTION_MASK
+                     | GDK_SCROLL_MASK
                      | GDK_POINTER_MOTION_MASK
                      | GDK_POINTER_MOTION_HINT_MASK);