More toolbar items

diff --git a/src/cb.c b/src/cb.c
index 1f3e5a70a7ba10c564484b4e67ae03e3271e4edd..b4ba737a3d452c983b101366f37840e92e29cf32 100644 (file)
--- a/src/cb.c
+++ b/src/cb.c
@@ -1234,8 +1234,17 @@ gboolean cmenu_cb_loc_add_poi(GtkAction * action)
 {
        printf("%s()\n", __PRETTY_FUNCTION__);
 
-       poi_dialog(ACTION_ADD_POI,
-                  x2unit(_cmenu_position_x), y2unit(_cmenu_position_y));
+       poi_dialog(ACTION_ADD_POI, x2unit(_cmenu_position_x), y2unit(_cmenu_position_y));
+
+       vprintf("%s(): return TRUE\n", __PRETTY_FUNCTION__);
+       return TRUE;
+}
+
+gboolean cb_add_poi(GtkAction * action)
+{
+       printf("%s()\n", __PRETTY_FUNCTION__);
+
+       poi_dialog(ACTION_ADD_POI, _gps.lat, _gps.lon);
 
        vprintf("%s(): return TRUE\n", __PRETTY_FUNCTION__);
        return TRUE;
@@ -1414,10 +1423,8 @@ gboolean cmenu_cb_way_add_poi(GtkAction * action)
        WayPoint *way;
        printf("%s()\n", __PRETTY_FUNCTION__);
 
-       if ((way = find_nearest_waypoint(x2unit(_cmenu_position_x),
-                                        y2unit(_cmenu_position_y))))
-               poi_dialog(ACTION_ADD_POI, way->point->unitx,
-                          way->point->unity);
+       if ((way = find_nearest_waypoint(x2unit(_cmenu_position_x), y2unit(_cmenu_position_y))))
+               poi_dialog(ACTION_ADD_POI, way->point->unitx, way->point->unity);
 
        vprintf("%s(): return TRUE\n", __PRETTY_FUNCTION__);
        return TRUE;
@@ -1444,8 +1451,7 @@ gboolean cmenu_cb_poi_distance_to(GtkAction * action)
        PoiInfo poi;
        printf("%s()\n", __PRETTY_FUNCTION__);
 
-       if (select_poi
-           (x2unit(_cmenu_position_x), y2unit(_cmenu_position_y), &poi)) {
+       if (select_poi(x2unit(_cmenu_position_x), y2unit(_cmenu_position_y), &poi)) {
                guint unitx, unity;
                latlon2unit(poi.lat, poi.lon, unitx, unity);
                cmenu_distance_to(unitx, unity);
@@ -1460,8 +1466,7 @@ gboolean cmenu_cb_poi_add_route(GtkAction * action)
        PoiInfo poi;
        printf("%s()\n", __PRETTY_FUNCTION__);
 
-       if (select_poi
-           (x2unit(_cmenu_position_x), y2unit(_cmenu_position_y), &poi)) {
+       if (select_poi(x2unit(_cmenu_position_x), y2unit(_cmenu_position_y), &poi)) {
                guint unitx, unity;
                latlon2unit(poi.lat, poi.lon, unitx, unity);
                cmenu_add_route(unitx, unity);
@@ -1476,8 +1481,7 @@ gboolean cmenu_cb_poi_add_way(GtkAction * action)
        PoiInfo poi;
        printf("%s()\n", __PRETTY_FUNCTION__);
 
-       if (select_poi
-           (x2unit(_cmenu_position_x), y2unit(_cmenu_position_y), &poi)) {
+       if (select_poi(x2unit(_cmenu_position_x), y2unit(_cmenu_position_y), &poi)) {
                guint unitx, unity;
                latlon2unit(poi.lat, poi.lon, unitx, unity);
                cmenu_route_add_way(unitx, unity);
@@ -1491,8 +1495,7 @@ gboolean cmenu_cb_poi_edit_poi(GtkAction * action)
 {
        printf("%s()\n", __PRETTY_FUNCTION__);
 
-       poi_dialog(ACTION_EDIT_POI,
-                  x2unit(_cmenu_position_x), y2unit(_cmenu_position_y));
+       poi_dialog(ACTION_EDIT_POI, x2unit(_cmenu_position_x), y2unit(_cmenu_position_y));
 
        vprintf("%s(): return TRUE\n", __PRETTY_FUNCTION__);
        return TRUE;

diff --git a/src/cb.h b/src/cb.h
index 8306265a4537b085c0ee29dc6f73075809b7530a..43640e08448d01f1c061be685612752084fcb25a 100644 (file)
--- a/src/cb.h
+++ b/src/cb.h
@@ -95,6 +95,8 @@ gboolean cmenu_cb_loc_add_way(GtkAction * action);
 gboolean cmenu_cb_loc_add_poi(GtkAction * action);
 gboolean cmenu_cb_loc_set_gps(GtkAction * action);
 
+gboolean cb_add_poi(GtkAction * action);
+
 /* Callbacks for the "Waypoint" context menu. */
 gboolean cmenu_cb_way_show_latlon(GtkAction * action);
 gboolean cmenu_cb_way_show_desc(GtkAction * action);

diff --git a/src/ui-common.c b/src/ui-common.c
index 858febc82c473d76c0aea60fb64c37ce0cd59842..f9416661bc1a484a55696c3836591c936aa4e424 100644 (file)
--- a/src/ui-common.c
+++ b/src/ui-common.c
@@ -710,11 +710,27 @@ static void toolbar_init(void)
 {
 GtkWidget *item;
 
-#if 0
-item = gtk_tool_button_new_from_stock (GTK_STOCK_REFRESH);
+item = gtk_tool_button_new_from_stock (GTK_STOCK_HOME);
+gtk_toolbar_insert (GTK_TOOLBAR (_toolbar), item, -1);
+/* g_signal_connect (item, "clicked", G_CALLBACK (cb_jump_to_home), NULL); */
+
+item = gtk_tool_button_new_from_stock (GTK_STOCK_JUMP_TO);
+gtk_toolbar_insert (GTK_TOOLBAR (_toolbar), item, -1);
+g_signal_connect (item, "clicked", G_CALLBACK (menu_cb_goto_gps), NULL);
+
+item = gtk_tool_button_new_from_stock (GTK_STOCK_GO_FORWARD);
+gtk_toolbar_insert (GTK_TOOLBAR (_toolbar), item, -1);
+g_signal_connect (item, "clicked", G_CALLBACK (menu_cb_goto_nextway), NULL);
+
+item = gtk_separator_tool_item_new();
+gtk_toolbar_insert (GTK_TOOLBAR (_toolbar), item, -1);
+
+item = gtk_tool_button_new_from_stock (GTK_STOCK_ADD);
+gtk_toolbar_insert (GTK_TOOLBAR (_toolbar), item, -1);
+g_signal_connect (item, "clicked", G_CALLBACK (cb_add_poi), NULL);
+
+item = gtk_separator_tool_item_new();
 gtk_toolbar_insert (GTK_TOOLBAR (_toolbar), item, -1);
-g_signal_connect (item, "clicked", G_CALLBACK (gtk_main_quit), NULL);
-#endif
 
 item = gtk_tool_button_new_from_stock (GTK_STOCK_ZOOM_IN);
 gtk_toolbar_insert (GTK_TOOLBAR (_toolbar), item, -1);