Tagged 0.1

git-svn-id: file:///svnroot/speedometer/trunk@49 df364472-da61-43ef-8a67-511c89aa921b

diff --git a/README b/README
index 913066d..2540da9 100644 (file)
--- a/README
+++ b/README
@@ -11,7 +11,7 @@ what this means.
 
 Anyway, here goes the address:
 
-Wellu Mäkinen,
-Poste restante,
+Wellu Mäkinen
+Poste restante
 33580 Tampere
 FINLAND

diff --git a/callbacks.c b/callbacks.c
index ea30825..ce5a5a8 100644 (file)
--- a/callbacks.c
+++ b/callbacks.c
@@ -75,25 +75,16 @@ gboolean key_press_cb(GtkWidget* widget, GdkEventKey* event, HildonWindow* windo
        return FALSE;
 }
 
-gboolean middle_event_box_button_press(GtkWidget* widget, GdkEventButton* event, gpointer data) {
-       gdouble x = event->x;
-       if (event->type == GDK_2BUTTON_PRESS || event->type == GDK_3BUTTON_PRESS) {
-               g_assert(data);
-               AppData* appdata = (AppData*) data;
-               g_signal_emit_by_name(appdata->window, "delete_event");
-       }
-
-
-
-       g_print("Middle event box pressed at: %f\n", x);
-       g_print("Changing conversion unit\n");
-       change_unit();
+gboolean long_tap(GtkWidget* widget, gpointer data) {
+       g_assert(data);
+       AppData* appdata = (AppData*) data;
+       g_signal_emit_by_name(appdata->window, "delete_event");
        return TRUE;
 }
 
-gboolean bottom_event_box_button_press(GtkWidget* widget, GdkEventButton* event, gpointer data) {
-       gdouble x = event->x;
-       g_print("Bottom event box pressed at: %f\n", x);
+gboolean middle_event_box_button_press(GtkWidget* widget, GdkEventButton* event, gpointer data) {
+       g_print("Middle event box pressed\n");
+       g_print("Changing conversion unit\n");
+       change_unit();
        return TRUE;
 }
-

diff --git a/callbacks.h b/callbacks.h
index 44911d0..8b0e93f 100644 (file)
--- a/callbacks.h
+++ b/callbacks.h
@@ -29,10 +29,10 @@ void location_changed(LocationGPSDevice* device, gpointer data);
 // for hardware keys
 gboolean key_press_cb(GtkWidget* widget, GdkEventKey* event, HildonWindow* window);
 
+// for handling long tap
+gboolean long_tap(GtkWidget* widget, gpointer data);
+
 // middle event box
 gboolean middle_event_box_button_press(GtkWidget* widget, GdkEventButton* event, gpointer data);
 
-// bottom event box
-gboolean bottom_event_box_button_press(GtkWidget* widget, GdkEventButton* event, gpointer data);
-
 #endif /* CALLBACKS_H_ */

diff --git a/data/units.xcf b/data/units.xcf
deleted file mode 100644 (file)
index d3222a5..0000000
Binary files a/data/units.xcf and /dev/null differ

diff --git a/ui.c b/ui.c
index 35e01e5..a893045 100644 (file)
--- a/ui.c
+++ b/ui.c
@@ -146,24 +146,18 @@ void create_ui(AppData* appdata) {
        hbox = gtk_hbox_new(TRUE, 0);
        bhbox = gtk_hbox_new(TRUE, 0);
 
-       //GtkWidget* top_e = gtk_event_box_new();
        GtkWidget* middle_e = gtk_event_box_new();
        GtkWidget* bottom_e = gtk_event_box_new();
 
-/*
-       g_signal_connect(G_OBJECT(top_e),
-                       "button_press_event",
-                       G_CALLBACK(top_event_box_button_press),
-                       appdata);
-*/
        g_signal_connect(G_OBJECT(middle_e),
-                       "button_press_event",
-                       G_CALLBACK(middle_event_box_button_press),
+                       "tap_and_hold",
+                       G_CALLBACK(long_tap),
                        appdata);
+       gtk_widget_tap_and_hold_setup(middle_e, NULL, NULL, 0);
 
-       g_signal_connect(G_OBJECT(bottom_e),
+       g_signal_connect(G_OBJECT(middle_e),
                        "button_press_event",
-                       G_CALLBACK(bottom_event_box_button_press),
+                       G_CALLBACK(middle_event_box_button_press),
                        appdata);
 
        g_signal_connect(G_OBJECT(appdata->window),