Move some variables and enums around

[mapper] / src / cb.c

diff --git a/src/cb.c b/src/cb.c
index 7496a5403ee697ef8f1420c6b0899986cc4c70b9..41cd62e7e4f37f69b71b7238f9125e90c2214e99 100644 (file)
--- a/src/cb.c
+++ b/src/cb.c
@@ -35,6 +35,7 @@
 #include <sys/wait.h>
 #include <glib/gstdio.h>
 #include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
 #include <fcntl.h>
 #include <libintl.h>
 #include <locale.h>
@@ -50,7 +51,6 @@
 #include "gps.h"
 #include "map.h"
 #include "mapper-types.h"
-#include "bt.h"
 #include "ui-common.h"
 #include "db.h"
 #include "latlon.h"
@@ -59,19 +59,28 @@
 #include "gps-panels.h"
 #include "gps-conn.h"
 #include "search.h"
+#include "dialogs.h"
+#include "filter-gui.h"
 #include "help.h"
+#include "map-repo.h"
 
-gboolean 
-menu_cb_route_download(GtkAction * action)
+static void
+track_tree_view_update_store(GtkWidget *tree_view, Path *track)
 {
 GtkListStore *store;
 
-route_download(NULL);
-store=route_generate_store(&_route);
+store=path_generate_store(track);
 if (store!=NULL) {
-       gtk_tree_view_set_model(route_tree_view, store);
+       gtk_tree_view_set_model(tree_view, store);
        g_object_unref(G_OBJECT(store));
 }
+}
+
+gboolean 
+menu_cb_route_download(GtkAction * action)
+{
+route_download(NULL);
+track_tree_view_update_store(route_tree_view, &_route);
 return TRUE;
 }
 
@@ -81,11 +90,7 @@ menu_cb_route_open(GtkAction * action)
 GtkListStore *store;
 
 route_open_file();
-store=route_generate_store(&_route);
-if (store!=NULL) {
-       gtk_tree_view_set_model(route_tree_view, store);
-       g_object_unref(G_OBJECT(store));
-}
+track_tree_view_update_store(route_tree_view, &_route);
 return TRUE;
 }
 
@@ -124,6 +129,7 @@ gboolean
 menu_cb_track_open(GtkAction * action)
 {
 track_open();
+track_tree_view_update_store(track_tree_view, &_track);
 return TRUE;
 }
 
@@ -131,6 +137,7 @@ gboolean
 menu_cb_track_save(GtkAction * action)
 {
 track_save();
+track_tree_view_update_store(track_tree_view, &_track);
 return TRUE;
 }
 
@@ -138,6 +145,7 @@ gboolean
 menu_cb_track_insert_break(GtkAction * action)
 {
 track_insert_break();
+track_tree_view_update_store(track_tree_view, &_track);
 return TRUE;
 }
 
@@ -145,6 +153,7 @@ gboolean
 menu_cb_track_insert_mark(GtkAction * action)
 {
 track_insert_mark();
+track_tree_view_update_store(track_tree_view, &_track);
 return TRUE;
 }
 
@@ -173,13 +182,14 @@ gboolean
 menu_cb_track_clear(GtkAction * action)
 {
 track_clear();
+track_tree_view_update_store(track_tree_view, &_track);
 return TRUE;
 }
 
 gboolean 
 menu_cb_track_filter(GtkAction * action)
 {
-filter_dialog();
+filter_dialog(_window);
 return TRUE;
 }
 
@@ -244,7 +254,7 @@ gboolean
 menu_cb_gps_show_info(GtkAction * action)
 {
 _gps_info = gtk_toggle_action_get_active(GTK_TOGGLE_ACTION(action));
-gps_show_info();
+gps_show_info(_gps);
 return TRUE;
 }
 
@@ -271,7 +281,7 @@ switch (value) {
        break;
 }
 
-MACRO_RECALC_CENTER(new_center_unitx, new_center_unity);
+MACRO_RECALC_CENTER(_gps->data, new_center_unitx, new_center_unity);
 map_center_unit(new_center_unitx, new_center_unity);
 return TRUE;
 }
@@ -311,7 +321,7 @@ gboolean
 menu_cb_goto_gps(GtkAction *action)
 {
 _center_mode = CENTER_LATLON;
-map_center_unit(_pos.unitx, _pos.unity);
+map_center_unit(_gps->data.unitx, _gps->data.unity);
 map_update_location_from_center();
 MACRO_BANNER_SHOW_INFO(_window, _("At GPS coordinates."));
 return TRUE;
@@ -340,7 +350,8 @@ poi_info *p;
 
 if (_center_mode > 0) {
        /* Auto-Center is enabled - use the GPS position. */
-       unit2latlon(_pos.unitx, _pos.unity, lat, lon);
+       lat=_gps->data.lat;
+       lon=_gps->data.lon;
 } else {
        /* Auto-Center is disabled - use the view center. */
        unit2latlon(_center.unitx, _center.unity, lat, lon);
@@ -389,14 +400,14 @@ return TRUE;
 gboolean 
 cb_zoom_auto(GtkAction * action)
 {
-map_set_autozoom(TRUE);
+map_set_autozoom(TRUE, _gps->data.speed);
 return TRUE;
 }
 
 gboolean 
 cb_zoom_base(GtkAction * action)
 {
-map_set_autozoom(FALSE);
+map_set_autozoom(FALSE, 0);
 map_set_zoom(3);
 return TRUE;
 }
@@ -404,7 +415,7 @@ return TRUE;
 gboolean 
 cb_zoomin(GtkAction * action)
 {
-map_set_autozoom(FALSE);
+map_set_autozoom(FALSE, 0);
 g_idle_add((GSourceFunc)map_zoom_in, NULL);
 return TRUE;
 }
@@ -412,7 +423,7 @@ return TRUE;
 gboolean 
 cb_zoomout(GtkAction * action)
 {
-map_set_autozoom(FALSE);
+map_set_autozoom(FALSE, 0);
 g_idle_add((GSourceFunc)map_zoom_out, NULL);
 return TRUE;
 }
@@ -433,29 +444,28 @@ gboolean
 menu_cb_enable_gps(GtkAction * action)
 {
 if ((_enable_gps = gtk_toggle_action_get_active(GTK_TOGGLE_ACTION(action)))) {
-       if (_rcvr_mac) {
-               gps_conn_set_state(RCVR_DOWN);
-               rcvr_connect_now();
+       if (_gps->io.address) {
+               gps_conn_set_state(_gps, RCVR_DOWN);
+               gps_connect_now(_gps);
        } else {
-               popup_error(_window, _("Cannot enable GPS until a GPS Receiver MAC is set in the Settings dialog box."));
-               set_action_activate("gps_enable", FALSE);
+               popup_error(_window, _("Cannot enable GPS until a GPS Receiver has been configured in the GPS Settings dialog."));
+               set_action_activate("gps_enabled", FALSE);
        }
 } else {
-       if (_conn_state > RCVR_OFF)
-               gps_conn_set_state(RCVR_OFF);
-       rcvr_disconnect();
-       track_add(0, FALSE);
+       if (_gps->io.conn > RCVR_OFF)
+               gps_conn_set_state(_gps, RCVR_OFF);
+       gps_disconnect(_gps);
+       track_add(NULL);
        _speed_excess=FALSE;
 }
 if (_enable_gps==FALSE)
        set_action_activate("autocenter_none", TRUE);
-set_action_sensitive("gps_details", _enable_gps);
 set_action_sensitive("goto_gps", _enable_gps);
 set_action_sensitive("autocenter_latlon", _enable_gps);
 set_action_sensitive("autocenter_lead", _enable_gps);
 
 map_move_mark();
-gps_show_info();
+gps_show_info(&_gps->data);
 
 return TRUE;
 }
@@ -464,30 +474,37 @@ gboolean
 menu_cb_auto_download(GtkAction * action)
 {
 if ((_auto_download = gtk_toggle_action_get_active(GTK_TOGGLE_ACTION(action)) )) {
-       if (_curr_repo->url == REPOTYPE_NONE)
+       if (_curr_repo->url == REPOTYPE_NONE) {
                popup_error(_window, _("NOTE: You must set a Map URI in the current repository in order to download maps."));
+               /* set_action_activate("", FALSE); */
+       }
        map_force_redraw();
+} else {
+       map_download_stop();
 }
 
 return TRUE;
 }
 
 gboolean 
-menu_cb_gps_details(GtkAction * action)
+menu_cb_settings(GtkAction * action)
 {
-gps_details();
+settings_dialog();
+MACRO_RECALC_FOCUS_BASE();
+MACRO_RECALC_FOCUS_SIZE();
+map_force_redraw();
 return TRUE;
 }
 
 gboolean 
-menu_cb_settings(GtkAction * action)
+menu_cb_settings_gps(GtkAction * action)
 {
-if (settings_dialog()) {
+if (settings_dialog_gps(_gps)) {
        /* Settings have changed - reconnect to receiver. */
        if (_enable_gps) {
-               gps_conn_set_state(RCVR_DOWN);
-               rcvr_disconnect();
-               rcvr_connect_now();
+               gps_conn_set_state(_gps, RCVR_DOWN);
+               gps_disconnect(_gps);
+               gps_connect_now(_gps);
        }
 }
 MACRO_RECALC_FOCUS_BASE();
@@ -496,6 +513,29 @@ map_force_redraw();
 return TRUE;
 }
 
+gboolean 
+menu_cb_settings_colors(GtkAction * action)
+{
+settings_dialog_colors();
+map_force_redraw();
+return TRUE;
+}
+
+gboolean 
+menu_cb_settings_osm(GtkAction * action)
+{
+settings_dialog_osm();
+return TRUE;
+}
+
+gboolean 
+menu_cb_import_osm(GtkAction * action)
+{
+osm_import_dialog(_window);
+return TRUE;
+}
+
+
 gboolean 
 menu_cb_help(GtkAction * action)
 {
@@ -750,7 +790,7 @@ gdouble lat, lon;
 unit2latlon(unitx, unity, lat, lon);
 
 g_snprintf(buffer, sizeof(buffer), "%s: %.02lf %s", _("Distance"),
-        calculate_distance(_gps.lat, _gps.lon, lat, lon) * UNITS_CONVERT[_units], UNITS_TEXT[_units]);
+        calculate_distance(_gps->data.lat, _gps->data.lon, lat, lon) * UNITS_CONVERT[_units], UNITS_TEXT[_units]);
 MACRO_BANNER_SHOW_INFO(_window, buffer);
 }
 
@@ -947,8 +987,8 @@ poi_info poi;
 gdouble lat, lon;
 
 if (_center_mode>0) {
-       lat=_gps.lat;
-       lon=_gps.lon;
+       lat=_gps->data.lat;
+       lon=_gps->data.lon;
 } else {
        unit2latlon(_center.unitx, _center.unity, lat, lon);
 }
@@ -965,8 +1005,8 @@ const gchar *name = gtk_action_get_name(action);
 poi_info *p;
 
 if (_center_mode>0) {
-       lat=_gps.lat;
-       lon=_gps.lon;
+       lat=_gps->data.lat;
+       lon=_gps->data.lon;
 } else {
        unit2latlon(_center.unitx, _center.unity, lat, lon);
 }
@@ -992,8 +1032,8 @@ menu_cb_search_address(GtkAction *action)
 gdouble lat, lon;
 
 if (_center_mode>0) {
-       lat=_gps.lat;
-       lon=_gps.lon;
+       lat=_gps->data.lat;
+       lon=_gps->data.lon;
 } else {
        unit2latlon(_center.unitx, _center.unity, lat, lon);
 }
@@ -1034,13 +1074,14 @@ return TRUE;
 gboolean 
 cmenu_cb_loc_set_gps(GtkAction * action)
 {
-_pos.unitx = x2unit(_cmenu_position_x);
-_pos.unity = y2unit(_cmenu_position_y);
-unit2latlon(_pos.unitx, _pos.unity, _gps.lat, _gps.lon);
+_gps->data.unitx = x2unit(_cmenu_position_x);
+_gps->data.unity = y2unit(_cmenu_position_y);
+unit2latlon(_gps->data.unitx, _gps->data.unity, _gps->data.lat, _gps->data.lon);
 
 /* Move mark to new location. */
 map_refresh_mark();
-track_add(time(NULL), FALSE);
+_gps->data.time=time(NULL);
+track_add(&_gps->data);
 
 return TRUE;
 }