-#include <config.h>
+/*
+ * This file is part of mapper
+ *
+ * Copyright (C) 2007 Kaj-Michael Lang
+ * Copyright (C) 2006-2007 John Costigan.
+ *
+ * POI and GPS-Info code originally written by Cezary Jackiewicz.
+ *
+ * Default map data provided by http://www.openstreetmap.org/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
-#define _GNU_SOURCE
+#include <config.h>
#include <unistd.h>
#include <stdlib.h>
#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>
#include "utils.h"
#include "poi.h"
-#include "route.h"
-#include "track.h"
#include "path.h"
#include "settings.h"
#include "gps.h"
-#include "map.h"
#include "mapper-types.h"
-#include "bt.h"
#include "ui-common.h"
#include "db.h"
#include "latlon.h"
#include "cb.h"
+#include "poi-gui.h"
#include "gps-panels.h"
-
-gboolean
-menu_cb_route_download(GtkAction * action)
+#include "gps-conn.h"
+#include "search.h"
+#include "dialogs.h"
+#include "filter-gui.h"
+#include "help.h"
+#include "map-repo.h"
+#include "config-gconf.h"
+#include "gtkmap.h"
+
+static gboolean
+path_tree_view_update_store(GtkWidget *tree_view, Path *path)
{
GtkListStore *store;
-route_download(NULL);
-store=route_generate_store();
-if (store!=NULL) {
- gtk_tree_view_set_model(route_tree_view, store);
- g_object_unref(G_OBJECT(store));
-}
+g_assert(tree_view);
+g_assert(path);
+
+store=path_get_waypoints_store(path);
+if (!store)
+ return FALSE;
+
+gtk_tree_view_set_model(GTK_TREE_VIEW(tree_view), store);
+g_object_unref(G_OBJECT(store));
return TRUE;
}
+/***********************
+ Route menu callbacks
+ ***********************/
gboolean
-menu_cb_route_open(GtkAction * action)
+menu_cb_route_download(GtkAction *action)
{
-GtkListStore *store;
-
-route_open_file();
-store=route_generate_store();
-if (store!=NULL) {
- gtk_tree_view_set_model(route_tree_view, store);
- g_object_unref(G_OBJECT(store));
+route_download(_route, NULL);
+route_menu_set_sensitive(path_tree_view_update_store(route_tree_view, _route));
+return TRUE;
}
+
+gboolean
+menu_cb_route_open(GtkAction *action)
+{
+route_open_file(_route);
+route_menu_set_sensitive(path_tree_view_update_store(route_tree_view, _route));
return TRUE;
}
gboolean
-menu_cb_route_distnext(GtkAction * action)
+menu_cb_route_save(GtkAction *action)
{
-route_show_distance_to_next();
+route_save(_route);
return TRUE;
}
gboolean
-menu_cb_route_distlast(GtkAction * action)
+menu_cb_route_distnext(GtkAction *action)
{
-route_show_distance_to_last();
+path_show_distance_to_next(_route);
return TRUE;
}
gboolean
-menu_cb_route_reset(GtkAction * action)
+menu_cb_route_distlast(GtkAction *action)
{
-route_find_nearest_point();
-map_render_data();
-MACRO_QUEUE_DRAW_AREA();
+path_show_distance_to_last(_route);
return TRUE;
}
gboolean
-menu_cb_route_clear(GtkAction * action)
+menu_cb_route_reset(GtkAction *action)
{
-route_clear();
-gtk_tree_view_set_model(route_tree_view, NULL);
+path_find_nearest_point(_route, _gps->data.lat, _gps->data.lon);
return TRUE;
}
gboolean
-menu_cb_track_open(GtkAction * action)
+menu_cb_route_clear(GtkAction *action)
{
-track_open();
+if (route_clear(_route)) {
+ gtk_tree_view_set_model(route_tree_view, NULL);
+ route_menu_set_sensitive(FALSE);
+}
return TRUE;
}
+/***********************
+ Track menu callbacks
+ ***********************/
gboolean
-menu_cb_track_save(GtkAction * action)
+menu_cb_track_open(GtkAction *action)
{
-track_save();
+track_open(_track);
+path_tree_view_update_store(track_tree_view, _track);
return TRUE;
}
gboolean
-menu_cb_track_insert_break(GtkAction * action)
+menu_cb_track_save(GtkAction *action)
{
-track_insert_break();
+track_save(_track);
+path_tree_view_update_store(track_tree_view, _track);
return TRUE;
}
gboolean
-menu_cb_track_insert_mark(GtkAction * action)
+menu_cb_track_insert_break(GtkAction *action)
{
-track_insert_mark();
+path_insert_break(_track);
+path_tree_view_update_store(track_tree_view, _track);
return TRUE;
}
gboolean
-menu_cb_track_distlast(GtkAction * action)
+menu_cb_track_insert_mark(GtkAction *action)
{
-track_show_distance_from_last();
+if (path_insert_mark(_track)) {
+ path_tree_view_update_store(track_tree_view, _track);
+}
return TRUE;
}
gboolean
-menu_cb_track_distfirst(GtkAction * action)
+menu_cb_track_distlast(GtkAction *action)
{
-track_show_distance_from_first();
+path_show_distance_from_last(_track);
return TRUE;
}
gboolean
-menu_cb_route_save(GtkAction * action)
+menu_cb_track_distfirst(GtkAction *action)
{
-route_save();
+path_show_distance_from_first(_track);
return TRUE;
}
gboolean
-menu_cb_track_clear(GtkAction * action)
+menu_cb_track_clear(GtkAction *action)
{
-track_clear();
+path_clear(_track);
+path_tree_view_update_store(track_tree_view, _track);
return TRUE;
}
gboolean
-menu_cb_track_filter(GtkAction * action)
+menu_cb_track_filter(GtkAction *action)
{
-filter_dialog();
+filter_dialog(_window);
return TRUE;
}
+/***********************
+ Other menu callbacks
+ ***********************/
gboolean
menu_cb_show_tracks(GtkAction *action)
{
_show_tracks ^= TRACKS_MASK;
if (gtk_toggle_action_get_active(GTK_TOGGLE_ACTION(action))) {
_show_tracks |= TRACKS_MASK;
- map_render_paths();
- MACRO_QUEUE_DRAW_AREA();
+ gtk_map_set_path_display(_map, _show_tracks);
MACRO_BANNER_SHOW_INFO(_window, _("Tracks are now shown"));
} else {
_show_tracks &= ~TRACKS_MASK;
- map_force_redraw();
+ gtk_map_set_path_display(_map, _show_tracks);
MACRO_BANNER_SHOW_INFO(_window, _("Tracks are now hidden"));
}
return TRUE;
}
gboolean
-menu_cb_show_scale(GtkAction * action)
+menu_cb_show_scale(GtkAction *action)
{
_show_scale = gtk_toggle_action_get_active(GTK_TOGGLE_ACTION(action));
-MACRO_QUEUE_DRAW_AREA();
+/* XXXXXXXXXXXXXXXXX */
return TRUE;
}
gboolean
-menu_cb_show_routes(GtkAction * action)
+menu_cb_show_routes(GtkAction *action)
{
if (gtk_toggle_action_get_active(GTK_TOGGLE_ACTION(action))) {
_show_tracks |= ROUTES_MASK;
- map_render_paths();
- MACRO_QUEUE_DRAW_AREA();
+ gtk_map_set_path_display(_map, _show_tracks);
MACRO_BANNER_SHOW_INFO(_window, _("Routes are now shown"));
} else {
_show_tracks &= ~ROUTES_MASK;
- map_force_redraw();
+ gtk_map_set_path_display(_map, _show_tracks);
MACRO_BANNER_SHOW_INFO(_window, _("Routes are now hidden"));
}
return TRUE;
}
gboolean
-menu_cb_show_velvec(GtkAction * action)
+menu_cb_show_velvec(GtkAction *action)
{
_show_velvec = gtk_toggle_action_get_active(GTK_TOGGLE_ACTION(action));
-map_move_mark();
+g_object_set(_map, "show-velvec", _show_velvec, NULL);
return TRUE;
}
gboolean
-menu_cb_show_poi(GtkAction * action)
+menu_cb_show_poi(GtkAction *action)
{
_show_poi = gtk_toggle_action_get_active(GTK_TOGGLE_ACTION(action));
-map_force_redraw();
+g_object_set(_map, "show-markers", _show_poi, NULL);
return TRUE;
}
gboolean
-menu_cb_gps_show_info(GtkAction * action)
+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;
}
gboolean
menu_cb_autocenter(GtkAction *action, GtkRadioAction *current)
{
-guint new_center_unitx, new_center_unity;
-gint value = gtk_radio_action_get_current_value (GTK_RADIO_ACTION (current));
+gint value=gtk_radio_action_get_current_value(GTK_RADIO_ACTION(current));
switch (value) {
case CENTER_LEAD:
- _center_mode = CENTER_LEAD;
+ gtk_map_set_center_mode(_map, CENTER_LEAD);
MACRO_BANNER_SHOW_INFO(_window, _("Auto-Center Mode: Lead"));
break;
case CENTER_LATLON:
- _center_mode = CENTER_LATLON;
+ gtk_map_set_center_mode(_map, CENTER_LATLON);
MACRO_BANNER_SHOW_INFO(_window, _("Auto-Center Mode: Lat/Lon"));
break;
case CENTER_MANUAL:
default:
- _center_mode = -_center_mode;
+ gtk_map_set_center_mode(_map, CENTER_MANUAL);
MACRO_BANNER_SHOW_INFO(_window, _("Auto-Center Off"));
- return TRUE;
break;
}
-MACRO_RECALC_CENTER(new_center_unitx, new_center_unity);
-map_center_unit(new_center_unitx, new_center_unity);
return TRUE;
}
gboolean
-menu_cb_goto_latlon(GtkAction * action)
-{
-GtkWidget *dialog;
-GtkWidget *table;
-GtkWidget *label;
-GtkWidget *txt_lat;
-GtkWidget *txt_lon;
-
-dialog = gtk_dialog_new_with_buttons(_("Go to Lat/Lon"),
- GTK_WINDOW(_window),
- GTK_DIALOG_MODAL, GTK_STOCK_OK,
- GTK_RESPONSE_ACCEPT,
- GTK_STOCK_CANCEL,
- GTK_RESPONSE_REJECT, NULL);
-
-gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), table = gtk_table_new(2, 3, FALSE), TRUE, TRUE, 0);
-
-gtk_table_attach(GTK_TABLE(table), label = gtk_label_new(_("Latitude")),0, 1, 0, 1, GTK_FILL, 0, 2, 4);
-gtk_misc_set_alignment(GTK_MISC(label), 1.f, 0.5f);
-
-gtk_table_attach(GTK_TABLE(table), txt_lat = gtk_entry_new(), 1, 2, 0, 1, GTK_FILL, 0, 2, 4);
-gtk_misc_set_alignment(GTK_MISC(label), 0.0f, 0.5f);
-
-gtk_table_attach(GTK_TABLE(table), label = gtk_label_new(_("Longitude")), 0, 1, 1, 2, GTK_FILL, 0, 2, 4);
-gtk_misc_set_alignment(GTK_MISC(label), 1.f, 0.5f);
-
-gtk_table_attach(GTK_TABLE(table), txt_lon = gtk_entry_new(), 1, 2, 1, 2, GTK_FILL, 0, 2, 4);
-gtk_misc_set_alignment(GTK_MISC(label), 0.0f, 0.5f);
-
-#if defined (WITH_DEVICE_770) && !defined(WITH_HILDON_NEW)
-g_object_set(G_OBJECT(txt_lat), HILDON_INPUT_MODE_HINT, HILDON_INPUT_MODE_HINT_NUMERICSPECIAL, NULL);
-g_object_set(G_OBJECT(txt_lon), HILDON_INPUT_MODE_HINT, HILDON_INPUT_MODE_HINT_NUMERICSPECIAL, NULL);
-#endif
-
-/* Initialize with the current center position. */
+menu_cb_goto_latlon(GtkAction *action)
{
- gchar buffer[32];
- gdouble lat, lon;
- unit2latlon(_center.unitx, _center.unity, lat, lon);
- snprintf(buffer, sizeof(buffer), "%.06f", lat);
- gtk_label_set_text(GTK_LABEL(txt_lat), buffer);
- snprintf(buffer, sizeof(buffer), "%.06f", lon);
- gtk_label_set_text(GTK_LABEL(txt_lon), buffer);
-}
-
-gtk_widget_show_all(dialog);
-
-while (GTK_RESPONSE_ACCEPT == gtk_dialog_run(GTK_DIALOG(dialog))) {
- const gchar *text;
- gchar *error_check;
- gdouble lat, lon;
- guint unitx, unity;
-
- text = gtk_entry_get_text(GTK_ENTRY(txt_lat));
- lat = strtof(text, &error_check);
- if (text == error_check || lat < -90.f || lat > 90.f) {
- popup_error(dialog, _("Invalid Latitude"));
- continue;
- }
-
- text = gtk_entry_get_text(GTK_ENTRY(txt_lon));
- lon = strtof(text, &error_check);
- if (text == error_check || lon < -180.f || lon > 180.f) {
- popup_error(dialog, _("Invalid Longitude"));
- continue;
- }
-
- latlon2unit(lat, lon, unitx, unity);
- if (_center_mode > 0)
- set_action_activate("autocenter_none", TRUE);
-
- map_center_unit(unitx, unity);
- break;
-}
-gtk_widget_destroy(dialog);
+gtk_map_dialog_goto_latlon();
return TRUE;
}
gboolean
menu_cb_goto_home(GtkAction *action)
{
-if (map_goto_position(&_home)==FALSE) {
+if (gtk_map_goto_position(_home)==FALSE) {
MACRO_BANNER_SHOW_INFO(_window, _("Home not set."));
} else {
+ if (gtk_map_get_zoom(_map)>3)
+ gtk_map_set_zoom(_map, 3);
MACRO_BANNER_SHOW_INFO(_window, _("At home location"));
}
return TRUE;
gboolean
menu_cb_goto_destination(GtkAction *action)
{
-if (map_goto_position(&_dest)==FALSE) {
- MACRO_BANNER_SHOW_INFO(_window, _("Destination not set."));
+if (gtk_map_goto_position(_dest)==FALSE) {
+ MACRO_BANNER_SHOW_INFO(_window, _("Destination has not been set."));
} else {
- MACRO_BANNER_SHOW_INFO(_window, _("At destination"));
+ if (gtk_map_get_zoom(_map)>3)
+ gtk_map_set_zoom(_map, 3);
+ MACRO_BANNER_SHOW_INFO(_window, _("At destination point"));
}
return TRUE;
}
gboolean
menu_cb_goto_gps(GtkAction *action)
{
-_center_mode = CENTER_LATLON;
-map_center_unit(_pos.unitx, _pos.unity);
-map_update_location_from_center();
-
+if (gtk_map_set_center_mode(_map, CENTER_LATLON)) {
+ MACRO_BANNER_SHOW_INFO(_window, _("At GPS track coordinates."));
+} else {
+ MACRO_BANNER_SHOW_INFO(_window, _("No active GPS track."));
+}
return TRUE;
}
gboolean
-menu_cb_goto_nextway(GtkAction * action)
+menu_cb_goto_nextway(GtkAction *action)
{
-if (_next_way && _next_way->point->unity) {
- if (_center_mode > 0)
+GtkMapCenterMode cm;
+
+g_return_val_if_fail(_route, TRUE);
+
+if (_route->next_way && _route->next_way->point && _route->next_way->point->unity && _route->next_way->point->unitx) {
+ g_object_get(_map, "center-mode", &cm);
+ if (cm>0)
set_action_activate("autocenter_none", TRUE);
- map_center_unit(_next_way->point->unitx, _next_way->point->unity);
+ gtk_map_set_center(_map, _route->next_way->point->unitx, _route->next_way->point->unity);
+ if (gtk_map_get_zoom(_map)>3)
+ gtk_map_set_zoom(_map, 3);
} else {
MACRO_BANNER_SHOW_INFO(_window, _("There is no next waypoint."));
}
}
gboolean
-menu_cb_goto_nearpoi(GtkAction * action)
+menu_cb_goto_nearpoi(GtkAction *action)
{
+GtkMapCenterMode cm;
gdouble lat, lon;
poi_info *p;
-if (_center_mode > 0) {
- /* Auto-Center is enabled - use the GPS position. */
- unit2latlon(_pos.unitx, _pos.unity, lat, lon);
-} else {
- /* Auto-Center is disabled - use the view center. */
- unit2latlon(_center.unitx, _center.unity, lat, lon);
-}
+gtk_map_get_center_latlon(_map, &lat, &lon);
p=poi_find_nearest(lat, lon);
-
if (p) {
- guint unitx, unity;
gchar *banner;
- latlon2unit(p->lat, p->lon, unitx, unity);
banner = g_strdup_printf("%s (%s)", p->label, p->cat_label);
- g_printf("%s\n", banner);
MACRO_BANNER_SHOW_INFO(_window, banner);
g_free(banner);
poi_free(p);
- if (_center_mode > 0)
+ g_object_get(_map, "center-mode", &cm);
+ if (cm!=CENTER_MANUAL)
set_action_activate("autocenter_none", TRUE);
- map_center_unit(unitx, unity);
- map_update_location_from_center();
+ gtk_map_set_center_latlon(_map, p->lat, p->lon);
} else {
MACRO_BANNER_SHOW_INFO(_window, _("No POIs found."));
}
}
gboolean
-menu_cb_maps_repoman(GtkAction * action)
+menu_cb_maps_repoman(GtkAction *action)
{
repoman_dialog();
return TRUE;
}
gboolean
-menu_cb_maps_select(GtkAction * action, gpointer new_repo)
+menu_cb_maps_select(GtkAction *action, gpointer new_repo)
{
-repo_set_curr(new_repo);
-map_force_redraw();
+gtk_map_set_repo(_map, new_repo);
return TRUE;
}
gboolean
-cb_zoom_auto(GtkAction * action)
+cb_zoom_auto(GtkAction *action)
{
-map_set_autozoom(TRUE);
+gtk_map_set_autozoom(_map, TRUE);
return TRUE;
}
gboolean
-cb_zoom_base(GtkAction * action)
+cb_zoom_base(GtkAction *action)
{
-map_set_autozoom(FALSE);
-map_set_zoom(3);
+gtk_map_set_autozoom(_map, FALSE);
return TRUE;
}
gboolean
-cb_zoomin(GtkAction * action)
+cb_zoomin(GtkAction *action)
{
-map_set_autozoom(FALSE);
-map_zoom(-1);
+g_idle_add((GSourceFunc)gtk_map_zoom_in, NULL);
return TRUE;
}
gboolean
-cb_zoomout(GtkAction * action)
+cb_zoomout(GtkAction *action)
{
-map_set_autozoom(FALSE);
-map_zoom(1);
+g_idle_add((GSourceFunc)gtk_map_zoom_out, NULL);
return TRUE;
}
gboolean
-cb_fullscreen(GtkAction * action)
+cb_fullscreen(GtkAction *action)
{
if ((_fullscreen = gtk_toggle_action_get_active(GTK_TOGGLE_ACTION(action)))) {
gtk_window_fullscreen(GTK_WINDOW(_window));
return TRUE;
}
+gboolean
+menu_cb_view_toolbar(GtkAction *action)
+{
+if (gtk_toggle_action_get_active(GTK_TOGGLE_ACTION(action)))
+ gtk_widget_show(_toolbar);
+else
+ gtk_widget_hide(_toolbar);
+
+return TRUE;
+}
+
gboolean
-menu_cb_enable_gps(GtkAction * action)
+menu_cb_enable_gps(GtkAction *action)
{
if ((_enable_gps = gtk_toggle_action_get_active(GTK_TOGGLE_ACTION(action)))) {
- if (_rcvr_mac) {
- set_conn_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);
+ MACRO_BANNER_SHOW_INFO(_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)
- set_conn_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);
+ path_add_break(_track);
_speed_excess=FALSE;
}
-set_action_sensitive("gps_details", _enable_gps);
+if (_enable_gps==FALSE)
+ set_action_activate("autocenter_none", TRUE);
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;
}
gboolean
-menu_cb_auto_download(GtkAction * action)
+menu_cb_auto_download(GtkAction *action)
{
if ((_auto_download = gtk_toggle_action_get_active(GTK_TOGGLE_ACTION(action)) )) {
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."));
- map_force_redraw();
+ gtk_map_refresh(_map);
+} else {
+ map_download_stop();
}
return TRUE;
}
gboolean
-menu_cb_gps_details(GtkAction * action)
+menu_cb_settings(GtkAction *action)
{
-gps_details();
+if (settings_dialog()) {
+ gtk_map_refresh(_map);
+}
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) {
- set_conn_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();
-MACRO_RECALC_FOCUS_SIZE();
-map_force_redraw();
+
return TRUE;
}
gboolean
-menu_cb_help(GtkAction * action)
+menu_cb_settings_colors(GtkAction *action)
{
-#ifdef WITH_OSSO_HELP
-ossohelp_show(_osso, HELP_ID_INTRO, 0);
-#endif
-#ifdef WITH_HILDON_HELP
-hildon_help_show(_osso, HELP_ID_INTRO, 0);
-#endif
+settings_dialog_colors();
+return TRUE;
+}
+
+gboolean
+menu_cb_settings_osm(GtkAction *action)
+{
+settings_dialog_osm();
+return TRUE;
+}
+
+gboolean
+menu_cb_settings_keys(GtkAction *action)
+{
+settings_dialog_hardkeys();
return TRUE;
}
gboolean
-menu_cb_about(GtkAction * action)
+menu_cb_import_osm(GtkAction *action)
+{
+osm_import_dialog(_window);
+return TRUE;
+}
+
+gboolean
+menu_cb_help(GtkAction *action)
+{
+help_topic_display(HELP_ID_INTRO, 0);
+return TRUE;
+}
+
+gboolean
+menu_cb_about(GtkAction *action)
{
gchar *authors[]={
"Kaj-Michael Lang",
return TRUE;
}
-gboolean
-window_cb_key_press(GtkWidget * widget, GdkEventKey * event)
+static CustomKey
+custom_key_get_type(gint keyval)
{
-CustomKey custom_key;
-
-switch (event->keyval) {
+switch (keyval) {
case HILDON_HARDKEY_UP:
- custom_key = CUSTOM_KEY_UP;
+ return CUSTOM_KEY_UP;
break;
case HILDON_HARDKEY_DOWN:
- custom_key = CUSTOM_KEY_DOWN;
+ return CUSTOM_KEY_DOWN;
break;
case HILDON_HARDKEY_LEFT:
- custom_key = CUSTOM_KEY_LEFT;
+ return CUSTOM_KEY_LEFT;
break;
case HILDON_HARDKEY_RIGHT:
- custom_key = CUSTOM_KEY_RIGHT;
+ return CUSTOM_KEY_RIGHT;
break;
case HILDON_HARDKEY_SELECT:
- custom_key = CUSTOM_KEY_SELECT;
+ return CUSTOM_KEY_SELECT;
break;
case HILDON_HARDKEY_INCREASE:
- custom_key = CUSTOM_KEY_INCREASE;
+ return CUSTOM_KEY_INCREASE;
break;
case HILDON_HARDKEY_DECREASE:
- custom_key = CUSTOM_KEY_DECREASE;
+ return CUSTOM_KEY_DECREASE;
break;
case HILDON_HARDKEY_FULLSCREEN:
- custom_key = CUSTOM_KEY_FULLSCREEN;
+ return CUSTOM_KEY_FULLSCREEN;
break;
case HILDON_HARDKEY_ESC:
- custom_key = CUSTOM_KEY_ESC;
+ return CUSTOM_KEY_ESC;
break;
default:
- return FALSE;
+ return CUSTOM_KEY_ENUM_COUNT;
}
- switch (_action[custom_key]) {
+}
+
+gboolean
+window_cb_key_press(GtkWidget * widget, GdkEventKey * event)
+{
+CustomKey custom_key;
+GtkMapCenterMode cm;
+
+custom_key=custom_key_get_type(event->keyval);
+if (custom_key==CUSTOM_KEY_ENUM_COUNT)
+ return FALSE;
+
+switch (_action[custom_key]) {
case CUSTOM_ACTION_PAN_NORTH:
- map_pan(0, -PAN_UNITS);
+ gtk_map_pan(_map, 0, -1);
break;
case CUSTOM_ACTION_PAN_WEST:
- map_pan(-PAN_UNITS, 0);
+ gtk_map_pan(_map, -1, 0);
break;
case CUSTOM_ACTION_PAN_SOUTH:
- map_pan(0, PAN_UNITS);
+ gtk_map_pan(_map, 0, 1);
break;
case CUSTOM_ACTION_PAN_EAST:
- map_pan(PAN_UNITS, 0);
+ gtk_map_pan(_map, 1, 0);
break;
case CUSTOM_ACTION_TOGGLE_AUTOCENTER:
- switch (_center_mode) {
- case CENTER_LATLON:
- case CENTER_WAS_LEAD:
- set_action_activate("autocenter_lead", TRUE);
- break;
- case CENTER_LEAD:
- case CENTER_WAS_LATLON:
- set_action_activate("autocenter_latlon", TRUE);
- break;
- default:
- set_action_activate("autocenter_latlon", TRUE);
- break;
+ g_object_get(_map, "center-mode", &cm);
+ switch (cm) {
+ case CENTER_LATLON:
+ case CENTER_WAS_LEAD:
+ set_action_activate("autocenter_lead", TRUE);
+ break;
+ case CENTER_LEAD:
+ case CENTER_WAS_LATLON:
+ set_action_activate("autocenter_latlon", TRUE);
+ break;
+ default:
+ set_action_activate("autocenter_latlon", TRUE);
+ break;
}
break;
case CUSTOM_ACTION_ZOOM_IN:
+ gtk_map_zoom_in(_map);
+ break;
case CUSTOM_ACTION_ZOOM_OUT:
- if (!_key_zoom_timeout_sid) {
- g_printf("Z: %d %d\n", _key_zoom_new, _zoom);
- _key_zoom_new = _zoom + (_action[custom_key] == CUSTOM_ACTION_ZOOM_IN
- ? -_curr_repo->view_zoom_steps : _curr_repo->view_zoom_steps);
- /* Remember, _key_zoom_new is unsigned. */
- if (_key_zoom_new < MAX_ZOOM) {
- gchar buffer[80];
- snprintf(buffer, sizeof(buffer), "%s %d", _("Zoom to Level"), _key_zoom_new);
- MACRO_BANNER_SHOW_INFO(_window, buffer);
- _key_zoom_timeout_sid = g_timeout_add(400, map_key_zoom_timeout, NULL);
- }
- }
+ gtk_map_zoom_out(_map);
break;
case CUSTOM_ACTION_TOGGLE_FULLSCREEN:
set_action_activate("view_fullscreen", !_fullscreen);
}
break;
case CUSTOM_ACTION_ROUTE_DISTNEXT:
- route_show_distance_to_next();
+ path_show_distance_to_next(_route);
break;
case CUSTOM_ACTION_ROUTE_DISTLAST:
- route_show_distance_to_last();
+ path_show_distance_to_last(_route);
break;
case CUSTOM_ACTION_TRACK_BREAK:
- track_insert_break();
+ path_add_break(_track);
break;
case CUSTOM_ACTION_TRACK_DISTLAST:
- track_show_distance_from_last();
+ path_show_distance_from_last(_track);
break;
case CUSTOM_ACTION_TRACK_DISTFIRST:
- track_show_distance_from_first();
+ path_show_distance_from_first(_track);
break;
case CUSTOM_ACTION_TOGGLE_GPS:
set_action_activate("gps_enable", !_enable_gps);
set_action_activate("gps_info", !_gps_info);
break;
case CUSTOM_ACTION_TOGGLE_SPEEDLIMIT:
- _speed_limit_on ^= 1;
+ _speed_on ^= 1;
break;
default:
return FALSE;
{
switch (event->keyval) {
case HILDON_HARDKEY_INCREASE:
+ gtk_map_zoom_in(_map);
+ break;
case HILDON_HARDKEY_DECREASE:
- if (_key_zoom_timeout_sid) {
- g_source_remove(_key_zoom_timeout_sid);
- _key_zoom_timeout_sid = 0;
- map_set_zoom(_key_zoom_new);
- }
- return TRUE;
+ gtk_map_zoom_out(_map);
break;
default:
- return FALSE;
+ break;
}
+return FALSE;
}
void
-cmenu_show_latlon(guint unitx, guint unity)
+cmenu_show_latlon(gdouble lat, gdouble lon)
{
-gdouble lat, lon;
gchar buffer[80], tmp1[16], tmp2[16];
-unit2latlon(unitx, unity, lat, lon);
-lat_format(lat, tmp1);
-lon_format(lon, tmp2);
-
-snprintf(buffer, sizeof(buffer),
- "%s: %s\n"
- "%s: %s", _("Latitude"), tmp1, _("Longitude"), tmp2);
+lat_format(_degformat, lat, tmp1);
+lon_format(_degformat, lon, tmp2);
+g_snprintf(buffer, sizeof(buffer), "%s: %s\n%s: %s", _("Latitude"), tmp1, _("Longitude"), tmp2);
+/* XXX: Use a dialog under plain Gtk */
MACRO_BANNER_SHOW_INFO(_window, buffer);
}
void
-cmenu_clip_latlon(guint unitx, guint unity)
+cmenu_clip_latlon(gdouble lat, gdouble lon)
{
gchar buffer[80];
-gdouble lat, lon;
-unit2latlon(unitx, unity, lat, lon);
-snprintf(buffer, sizeof(buffer), "%.06f,%.06f", lat, lon);
+g_snprintf(buffer, sizeof(buffer), "%.06f,%.06f", lat, lon);
gtk_clipboard_set_text(gtk_clipboard_get(GDK_SELECTION_CLIPBOARD), buffer, -1);
}
void
-cmenu_route_to(guint unitx, guint unity)
+cmenu_route_to(gdouble lat, gdouble lon)
{
gchar buffer[80];
gchar strlat[32];
gchar strlon[32];
-gdouble lat, lon;
-
-unit2latlon(unitx, unity, lat, lon);
g_ascii_formatd(strlat, 32, "%.06f", lat);
g_ascii_formatd(strlon, 32, "%.06f", lon);
-snprintf(buffer, sizeof(buffer), "%s, %s", strlat, strlon);
+g_snprintf(buffer, sizeof(buffer), "%s, %s", strlat, strlon);
-route_download(buffer);
+route_download(_route, buffer);
}
void
-cmenu_distance_to(guint unitx, guint unity)
+cmenu_distance_to(gdouble lat, gdouble lon)
{
gchar buffer[80];
-gdouble lat, lon;
-unit2latlon(unitx, unity, lat, lon);
-
-snprintf(buffer, sizeof(buffer), "%s: %.02lf %s", _("Distance"),
- calculate_distance(_gps.lat, _gps.lon, lat, lon) * UNITS_CONVERT[_units], UNITS_TEXT[_units]);
+g_snprintf(buffer, sizeof(buffer), "%s: %.02lf %s", _("Distance"),
+ calculate_distance(_gps->data.lat, _gps->data.lon, lat, lon) * UNITS_CONVERT[_units], UNITS_TEXT[_units]);
MACRO_BANNER_SHOW_INFO(_window, buffer);
}
-void
-cmenu_add_route(guint unitx, guint unity)
-{
-MACRO_PATH_INCREMENT_TAIL(_route);
-_route.tail->unitx = x2unit(_cmenu_position_x);
-_route.tail->unity = y2unit(_cmenu_position_y);
-route_find_nearest_point();
-map_force_redraw();
-}
-
-void cmenu_route_add_way(guint unitx, guint unity)
+void
+cmenu_route_add_way(gdouble lat, gdouble lon)
{
-gdouble lat, lon;
gchar tmp1[16], tmp2[16], *p_latlon;
GtkWidget *dialog;
GtkWidget *table;
GTK_STOCK_CANCEL,
GTK_RESPONSE_REJECT, NULL);
- gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox),
- table = gtk_table_new(2, 2, FALSE), TRUE, TRUE, 0);
-
- gtk_table_attach(GTK_TABLE(table),
- label = gtk_label_new(_("Lat, Lon")),
- 0, 1, 0, 1, GTK_FILL, 0, 2, 4);
- gtk_misc_set_alignment(GTK_MISC(label), 1.f, 0.5f);
-
- unit2latlon(unitx, unity, lat, lon);
- lat_format(lat, tmp1);
- lon_format(lon, tmp2);
- p_latlon = g_strdup_printf("%s, %s", tmp1, tmp2);
- gtk_table_attach(GTK_TABLE(table),
- label = gtk_label_new(p_latlon),
- 1, 2, 0, 1, GTK_FILL, 0, 2, 4);
- gtk_misc_set_alignment(GTK_MISC(label), 0.0f, 0.5f);
- g_free(p_latlon);
-
- gtk_table_attach(GTK_TABLE(table),
- label = gtk_label_new(_("Description")),
- 0, 1, 1, 2, GTK_FILL, 0, 2, 4);
- gtk_misc_set_alignment(GTK_MISC(label), 1.f, 0.5f);
-
- txt_scroll = gtk_scrolled_window_new(NULL, NULL);
- gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(txt_scroll),
- GTK_SHADOW_IN);
- gtk_table_attach(GTK_TABLE(table),
- txt_scroll,
- 1, 2, 1, 2, GTK_EXPAND | GTK_FILL, 0, 2, 4);
-
- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(txt_scroll),
- GTK_POLICY_AUTOMATIC,
- GTK_POLICY_AUTOMATIC);
-
- txt_desc = gtk_text_view_new();
- gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(txt_desc), GTK_WRAP_WORD);
-
- gtk_container_add(GTK_CONTAINER(txt_scroll), txt_desc);
- gtk_widget_set_size_request(GTK_WIDGET(txt_scroll), 400, 60);
-
- gtk_widget_show_all(dialog);
-
- while (GTK_RESPONSE_ACCEPT == gtk_dialog_run(GTK_DIALOG(dialog))) {
- GtkTextBuffer *tbuf;
- GtkTextIter ti1, ti2;
- gchar *desc;
-
- tbuf = gtk_text_view_get_buffer(GTK_TEXT_VIEW(txt_desc));
- gtk_text_buffer_get_iter_at_offset(tbuf, &ti1, 0);
- gtk_text_buffer_get_end_iter(tbuf, &ti2);
- desc = gtk_text_buffer_get_text(tbuf, &ti1, &ti2, TRUE);
-
- if (*desc) {
- /* There's a description. Add a waypoint. */
- MACRO_PATH_INCREMENT_TAIL(_route);
- _route.tail->unitx = unitx;
- _route.tail->unity = unity;
- _route.tail->time = 0;
- _route.tail->altitude = NAN;
-
- MACRO_PATH_INCREMENT_WTAIL(_route);
- _route.wtail->point = _route.tail;
- _route.wtail->desc
- = gtk_text_buffer_get_text(tbuf, &ti1, &ti2, TRUE);
- } else {
- GtkWidget *confirm;
-
- g_free(desc);
-
- confirm = hildon_note_new_confirmation(GTK_WINDOW(dialog),
- _("Creating a \"waypoint\" with no description actually "
- "adds a break point. Is that what you want?"));
-
- if (GTK_RESPONSE_OK == gtk_dialog_run(GTK_DIALOG(confirm))) {
- /* There's no description. Add a break by adding a (0, 0)
- * point (if necessary), and then the ordinary route point. */
- if (_route.tail->unity) {
- MACRO_PATH_INCREMENT_TAIL(_route);
- *_route.tail = _point_null;
- }
-
- MACRO_PATH_INCREMENT_TAIL(_route);
- _route.tail->unitx = unitx;
- _route.tail->unity = unity;
- _route.tail->time = 0;
- _route.tail->altitude = NAN;
-
- gtk_widget_destroy(confirm);
- } else {
- gtk_widget_destroy(confirm);
- continue;
- }
- }
+gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), table = gtk_table_new(2, 2, FALSE), TRUE, TRUE, 0);
- route_find_nearest_point();
- map_render_paths();
- MACRO_QUEUE_DRAW_AREA();
- break;
- }
+gtk_table_attach(GTK_TABLE(table), label = gtk_label_new(_("Lat, Lon")), 0, 1, 0, 1, GTK_FILL, 0, 2, 4);
+gtk_misc_set_alignment(GTK_MISC(label), 1.f, 0.5f);
+
+lat_format(_degformat, lat, tmp1);
+lon_format(_degformat, lon, tmp2);
+p_latlon = g_strdup_printf("%s, %s", tmp1, tmp2);
+gtk_table_attach(GTK_TABLE(table), label = gtk_label_new(p_latlon), 1, 2, 0, 1, GTK_FILL, 0, 2, 4);
+gtk_misc_set_alignment(GTK_MISC(label), 0.0f, 0.5f);
+g_free(p_latlon);
+
+gtk_table_attach(GTK_TABLE(table), label = gtk_label_new(_("Description")), 0, 1, 1, 2, GTK_FILL, 0, 2, 4);
+gtk_misc_set_alignment(GTK_MISC(label), 1.f, 0.5f);
+
+txt_scroll = gtk_scrolled_window_new(NULL, NULL);
+gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(txt_scroll), GTK_SHADOW_IN);
+gtk_table_attach(GTK_TABLE(table), txt_scroll, 1, 2, 1, 2, GTK_EXPAND | GTK_FILL, 0, 2, 4);
+
+gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(txt_scroll), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+
+txt_desc = gtk_text_view_new();
+gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(txt_desc), GTK_WRAP_WORD);
+
+gtk_container_add(GTK_CONTAINER(txt_scroll), txt_desc);
+gtk_widget_set_size_request(GTK_WIDGET(txt_scroll), 400, 60);
+
+gtk_widget_show_all(dialog);
+
+while (GTK_RESPONSE_ACCEPT == gtk_dialog_run(GTK_DIALOG(dialog))) {
+ GtkTextBuffer *tbuf;
+ GtkTextIter ti1, ti2;
+ gchar *desc;
+
+ tbuf = gtk_text_view_get_buffer(GTK_TEXT_VIEW(txt_desc));
+ gtk_text_buffer_get_iter_at_offset(tbuf, &ti1, 0);
+ gtk_text_buffer_get_end_iter(tbuf, &ti2);
+ desc = gtk_text_buffer_get_text(tbuf, &ti1, &ti2, TRUE);
+
+ path_add_waypoint(_route, lat, lon, desc);
+ break;
+}
gtk_widget_destroy(dialog);
}
gboolean
-cmenu_cb_loc_show_latlon(GtkAction * action)
+cmenu_cb_loc_show_latlon(GtkAction *action)
{
-cmenu_show_latlon(x2unit(_cmenu_position_x), y2unit(_cmenu_position_y));
+gdouble lat, lon;
+
+gtk_map_get_menu_latlon(_map, &lat, &lon);
+cmenu_show_latlon(lat, lon);
return TRUE;
}
gboolean
-cmenu_cb_loc_clip_latlon(GtkAction * action)
+cmenu_cb_loc_clip_latlon(GtkAction *action)
{
-cmenu_clip_latlon(x2unit(_cmenu_position_x), y2unit(_cmenu_position_y));
+gdouble lat, lon;
+
+gtk_map_get_menu_latlon(_map, &lat, &lon);
+cmenu_clip_latlon(lat, lon);
return TRUE;
}
gboolean
-cmenu_cb_loc_route_to(GtkAction * action)
+cmenu_cb_loc_route_to(GtkAction *action)
{
-cmenu_route_to(x2unit(_cmenu_position_x), y2unit(_cmenu_position_y));
+gdouble lat, lon;
+
+gtk_map_get_menu_latlon(_map, &lat, &lon);
+cmenu_route_to(lat, lon);
return TRUE;
}
gboolean
-cmenu_cb_loc_distance_to(GtkAction * action)
+cmenu_cb_loc_distance_to(GtkAction *action)
{
-cmenu_distance_to(x2unit(_cmenu_position_x), y2unit(_cmenu_position_y));
+gdouble lat, lon;
+
+gtk_map_get_menu_latlon(_map, &lat, &lon);
+cmenu_distance_to(lat, lon);
return TRUE;
}
gboolean
-cmenu_cb_loc_add_route(GtkAction * action)
+cmenu_cb_loc_add_route(GtkAction *action)
{
-cmenu_add_route(x2unit(_cmenu_position_x), y2unit(_cmenu_position_y));
+gdouble lat, lon;
+
+gtk_map_get_menu_latlon(_map, &lat, &lon);
+path_add_latlon(_route, lat, lon, time(NULL), 0, 0);
return TRUE;
}
gboolean
-cmenu_cb_loc_add_way(GtkAction * action)
+cmenu_cb_loc_add_way(GtkAction *action)
{
-cmenu_route_add_way(x2unit(_cmenu_position_x), y2unit(_cmenu_position_y));
+gdouble lat, lon;
+
+gtk_map_get_menu_latlon(_map, &lat, &lon);
+cmenu_route_add_way(lat, lon);
return TRUE;
}
gboolean
-cmenu_cb_loc_add_poi(GtkAction * action)
+cmenu_cb_loc_add_poi(GtkAction *action)
{
-poi_dialog(ACTION_ADD_POI, x2unit(_cmenu_position_x), y2unit(_cmenu_position_y));
+poi_info *poi;
+
+poi=poi_new();
+gtk_map_get_menu_latlon(_map, &poi->lat, &poi->lon);
+poi_edit_dialog(ACTION_ADD_POI, poi);
+
return TRUE;
}
cb_poi_search(GtkAction *action)
{
poi_info poi;
+gdouble lat, lon;
+GtkMapCenterMode cm;
+
+g_object_get(_map, "center-mode", &cm);
+if (cm!=CENTER_MANUAL) {
+ lat=_gps->data.lat;
+ lon=_gps->data.lon;
+} else {
+ gtk_map_get_center_latlon(_map, &lat, &lon);
+}
-poi_search_dialog(NULL, &poi);
+mapper_search_dialog(SEARCH_TYPE_POI, lat, lon);
return TRUE;
}
gboolean
cb_poi_add(GtkAction *action)
{
-guint unitx, unity;
+gdouble lat,lon;
const gchar *name = gtk_action_get_name(action);
+poi_info *p;
-if (_center_mode > 0) {
- latlon2unit(_gps.lat, _gps.lon, unitx, unity);
+if (gtk_map_get_center_mode(_map)!=CENTER_MANUAL) {
+ lat=_gps->data.lat;
+ lon=_gps->data.lon;
} else {
- unitx=_center.unitx;
- unity=_center.unity;
+ gtk_map_get_center_latlon(_map, &lat, &lon);
+}
+
+if (strcmp(name, "poi_add")==0) {
+ p=poi_new();
+ p->lat=lat;
+ p->lon=lon;
+ poi_edit_dialog(ACTION_ADD_POI, p);
+ map_poi_cache_clear();
+} else if (strcmp(name, "poi_quick_add")==0) {
+ poi_quick_dialog(lat, lon);
+ map_poi_cache_clear();
+} else
+ g_assert_not_reached();
+
+return TRUE;
}
-if (strcmp(name, "poi_add")==0)
- poi_dialog(ACTION_ADD_POI, unitx, unity);
-else if (strcmp(name, "poi_quick_add")==0)
- poi_quick_dialog(unitx, unity);
-else
- g_assert_not_reached();
+gboolean
+menu_cb_search_address(GtkAction *action)
+{
+gdouble lat, lon;
+if (gtk_map_get_center_mode(_map)!=CENTER_MANUAL) {
+ lat=_gps->data.lat;
+ lon=_gps->data.lon;
+} else {
+ gtk_map_get_center_latlon(_map, &lat, &lon);
+}
+mapper_search_dialog(SEARCH_TYPE_WAY, lat, lon);
return TRUE;
}
gboolean
-cmenu_cb_loc_set_home(GtkAction * action)
+cmenu_cb_loc_set_home(GtkAction *action)
{
-guint unitx, unity;
+gtk_map_get_menu_latlon(_map, &_home->lat, &_home->lon);
+_home->valid=TRUE;
-unitx = x2unit(_cmenu_position_x);
-unity = y2unit(_cmenu_position_y);
-unit2latlon(unitx, unity, _home.lat, _home.lon);
-_home.valid=TRUE;
+if (!config_save_position(_home, GCONF_KEY_POSITION_HOME))
+ popup_error(_window, _("Failed to save home position."));
-config_save_home();
-map_render_data();
+gtk_map_refresh(_map);
return TRUE;
}
gboolean
cmenu_cb_loc_set_destination(GtkAction *action)
{
-guint unitx, unity;
+gtk_map_get_menu_latlon(_map, &_dest->lat, &_dest->lon);
+_dest->valid=TRUE;
+
+if (!config_save_position(&_dest, GCONF_KEY_POSITION_DEST))
+ popup_error(_window, _("Failed to save destination."));
-unitx = x2unit(_cmenu_position_x);
-unity = y2unit(_cmenu_position_y);
-unit2latlon(unitx, unity, _dest.lat, _dest.lon);
-_dest.valid=TRUE;
-map_update_location_from_center();
+gtk_map_refresh(_map);
return TRUE;
}
gboolean
-cmenu_cb_loc_set_gps(GtkAction * action)
+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);
-
-/* Move mark to new location. */
-map_refresh_mark();
-track_add(time(NULL), FALSE);
+gtk_map_get_menu_latlon(_map, &_gps->data.lat, &_gps->data.lon);
+path_add_latlon(_track, _gps->data.lat, _gps->data.lon, time(NULL), 0, NAN);
return TRUE;
}
gboolean
-cmenu_cb_way_show_latlon(GtkAction * action)
+cmenu_cb_way_show_latlon(GtkAction *action)
{
WayPoint *way;
+gdouble lat, lon;
+
+gtk_map_get_menu_latlon(_map, &lat, &lon);
-if ((way = find_nearest_waypoint(x2unit(_cmenu_position_x), y2unit(_cmenu_position_y))))
- cmenu_show_latlon(way->point->unitx, way->point->unity);
+if ((way = path_find_nearest_waypoint(_route, lat, lon)))
+ cmenu_show_latlon(lat, lon);
return TRUE;
}
gboolean
-cmenu_cb_way_show_desc(GtkAction * action)
+cmenu_cb_way_show_desc(GtkAction *action)
{
WayPoint *way;
+gdouble lat, lon;
+
+gtk_map_get_menu_latlon(_map, &lat, &lon);
-if ((way = find_nearest_waypoint(x2unit(_cmenu_position_x), y2unit(_cmenu_position_y)))) {
+if ((way = path_find_nearest_waypoint(_route, lat, lon)))
MACRO_BANNER_SHOW_INFO(_window, way->desc);
-}
return TRUE;
}
gboolean
-cmenu_cb_way_clip_latlon(GtkAction * action)
+cmenu_cb_way_clip_latlon(GtkAction *action)
{
WayPoint *way;
+gdouble lat, lon;
-if ((way = find_nearest_waypoint(x2unit(_cmenu_position_x), y2unit(_cmenu_position_y))))
+gtk_map_get_menu_latlon(_map, &lat, &lon);
+if ((way = path_find_nearest_waypoint(_route, lat, lon)))
cmenu_clip_latlon(way->point->unitx, way->point->unity);
+
return TRUE;
}
gboolean
-cmenu_cb_way_clip_desc(GtkAction * action)
+cmenu_cb_way_clip_desc(GtkAction *action)
{
WayPoint *way;
+gdouble lat, lon;
-if ((way = find_nearest_waypoint(x2unit(_cmenu_position_x), y2unit(_cmenu_position_y))))
+gtk_map_get_menu_latlon(_map, &lat, &lon);
+if ((way = path_find_nearest_waypoint(_route, lat, lon)))
gtk_clipboard_set_text(gtk_clipboard_get(GDK_SELECTION_CLIPBOARD), way->desc, -1);
return TRUE;
}
gboolean
-cmenu_cb_way_route_to(GtkAction * action)
+cmenu_cb_way_route_to(GtkAction *action)
{
WayPoint *way;
+gdouble lat, lon;
-if ((way = find_nearest_waypoint(x2unit(_cmenu_position_x), y2unit(_cmenu_position_y))))
+gtk_map_get_menu_latlon(_map, &lat, &lon);
+
+if ((way = path_find_nearest_waypoint(_route, lat, lon)))
cmenu_route_to(way->point->unitx, way->point->unity);
return TRUE;
}
gboolean
-cmenu_cb_way_distance_to(GtkAction * action)
+cmenu_cb_way_distance_to(GtkAction *action)
{
WayPoint *way;
+gdouble lat, lon;
-if ((way = find_nearest_waypoint(x2unit(_cmenu_position_x), y2unit(_cmenu_position_y))))
- route_show_distance_to(way->point);
+gtk_map_get_menu_latlon(_map, &lat, &lon);
+
+if ((way = route_find_nearest_waypoint(_route, lat, lon)))
+ route_show_distance_to(_route, way->point);
return TRUE;
}
gboolean
-cmenu_cb_way_delete(GtkAction * action)
+cmenu_cb_way_delete(GtkAction *action)
{
WayPoint *way;
+gdouble lat, lon;
-if ((way = find_nearest_waypoint(x2unit(_cmenu_position_x), y2unit(_cmenu_position_y)))) {
+gtk_map_get_menu_latlon(_map, &lat, &lon);
+
+if ((way = path_find_nearest_waypoint(_route, lat, lon))) {
gchar buffer[BUFFER_SIZE];
GtkWidget *confirm;
- snprintf(buffer, sizeof(buffer), "%s:\n%s\n",
- _("Confirm delete of waypoint"), way->desc);
+ g_snprintf(buffer, sizeof(buffer), "%s:\n%s\n", _("Confirm delete of waypoint"), way->desc);
confirm = hildon_note_new_confirmation(GTK_WINDOW(_window), buffer);
if (GTK_RESPONSE_OK == gtk_dialog_run(GTK_DIALOG(confirm))) {
guint num_del;
/* Delete surrounding route data, too. */
- if (way == _route.whead)
- pdel_min = _route.head;
+ if (way == _route->whead)
+ pdel_min = _route->head;
else
pdel_min = way[-1].point;
- if (way == _route.wtail)
- pdel_max = _route.tail;
+ if (way == _route->wtail)
+ pdel_max = _route->tail;
else
pdel_max = way[1].point;
- /* Find largest continuous segment around the waypoint, EXCLUDING
- * pdel_min and pdel_max. */
- for (pdel_start = way->point - 1; pdel_start->unity
- && pdel_start > pdel_min; pdel_start--) {
+ /* Find largest continuous segment around the waypoint, EXCLUDING pdel_min and pdel_max. */
+ for (pdel_start = way->point - 1; pdel_start->unity && pdel_start > pdel_min; pdel_start--) {
}
- for (pdel_end = way->point + 1; pdel_end->unity
- && pdel_end < pdel_max; pdel_end++) {
+ for (pdel_end = way->point + 1; pdel_end->unity && pdel_end < pdel_max; pdel_end++) {
}
- /* If pdel_end is set to _route.tail, and if _route.tail is a
- * non-zero point, then delete _route.tail. */
- if (pdel_end == _route.tail && pdel_end->unity)
- pdel_end++; /* delete _route.tail too */
+ /* If pdel_end is set to _route->tail, and if _route->tail is a non-zero point, then delete _route->tail. */
+ if (pdel_end == _route->tail && pdel_end->unity)
+ pdel_end++; /* delete _route->tail too */
/* else, if *both* endpoints are zero points, delete one. */
else if (!pdel_start->unity && !pdel_end->unity)
pdel_start--;
/* Delete BETWEEN pdel_start and pdel_end, exclusive. */
num_del = pdel_end - pdel_start - 1;
- memmove(pdel_start + 1, pdel_end,(_route.tail - pdel_end + 1) * sizeof(Point));
- _route.tail -= num_del;
+ memmove(pdel_start + 1, pdel_end,(_route->tail - pdel_end + 1) * sizeof(Point));
+ _route->tail -= num_del;
/* Remove waypoint and move/adjust subsequent waypoints. */
g_free(way->desc);
- while (way++ != _route.wtail) {
+ while (way++ != _route->wtail) {
way[-1] = *way;
way[-1].point -= num_del;
}
- _route.wtail--;
-
- route_find_nearest_point();
- map_force_redraw();
+ _route->wtail--;
+#if 0
+ path_find_nearest_point(_route);
+#endif
}
gtk_widget_destroy(confirm);
}
}
gboolean
-menu_cb_category(GtkAction * action)
+menu_cb_category(GtkAction *action)
{
if (poi_category_list())
- map_force_redraw();
+ gtk_map_refresh(_map);
return TRUE;
}
gboolean
-cmenu_cb_way_add_poi(GtkAction * action)
+cmenu_cb_way_add_poi(GtkAction *action)
{
WayPoint *way;
+gdouble lat, lon;
+
+gtk_map_get_menu_latlon(_map, &lat, &lon);
-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 = path_find_nearest_waypoint(_route, lat, lon))) {
+ poi_info *p;
+ p=poi_new();
+ path_get_waypoint_latlon(way, &p->lat, &p->lon);
+ poi_edit_dialog(ACTION_ADD_POI, p);
+}
return TRUE;
}
gboolean
-cmenu_cb_poi_route_to(GtkAction * action)
+cmenu_cb_poi_route_to(GtkAction *action)
{
poi_info poi;
+gdouble lat, lon;
-if (poi_select(x2unit(_cmenu_position_x), y2unit(_cmenu_position_y), &poi)) {
- guint unitx, unity;
- latlon2unit(poi.lat, poi.lon, unitx, unity);
- cmenu_route_to(unitx, unity);
-}
+gtk_map_get_menu_latlon(_map, &lat, &lon);
+if (poi_select(lat, lon, 4, &poi))
+ cmenu_route_to(poi.lat, poi.lon);
return TRUE;
}
gboolean
-cmenu_cb_poi_distance_to(GtkAction * action)
+cmenu_cb_poi_distance_to(GtkAction *action)
{
poi_info poi;
+gdouble lat, lon;
-if (poi_select(x2unit(_cmenu_position_x), y2unit(_cmenu_position_y), &poi)) {
- guint unitx, unity;
- latlon2unit(poi.lat, poi.lon, unitx, unity);
- cmenu_distance_to(unitx, unity);
-}
+gtk_map_get_menu_latlon(_map, &lat, &lon);
+
+if (poi_select(lat, lon, 4, &poi))
+ cmenu_distance_to(poi.lat, poi.lon);
return TRUE;
}
gboolean
-cmenu_cb_poi_add_route(GtkAction * action)
+cmenu_cb_poi_add_route(GtkAction *action)
{
poi_info poi;
+gdouble lat, lon;
-if (poi_select(x2unit(_cmenu_position_x), y2unit(_cmenu_position_y), &poi)) {
- guint unitx, unity;
- latlon2unit(poi.lat, poi.lon, unitx, unity);
- cmenu_add_route(unitx, unity);
-}
+gtk_map_get_menu_latlon(_map, &lat, &lon);
+if (poi_select(lat, lon, 4, &poi))
+ path_add_latlon(_route, lat, lon, time(NULL), 0, 0);
return TRUE;
}
gboolean
-cmenu_cb_poi_add_way(GtkAction * action)
+cmenu_cb_poi_add_way(GtkAction *action)
{
poi_info poi;
+gdouble lat, lon;
-if (poi_select(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);
+gtk_map_get_menu_latlon(_map, &lat, &lon);
+
+if (poi_select(lat, lon, 4, &poi))
+ cmenu_route_add_way(lat, lon);
+
+return TRUE;
}
+gboolean
+cmenu_cb_poi_show_poi(GtkAction *action)
+{
+/* XXX: Write this */
return TRUE;
}
gboolean
-cmenu_cb_poi_edit_poi(GtkAction * action)
+cmenu_cb_poi_edit_poi(GtkAction *action)
{
-poi_dialog(ACTION_EDIT_POI, x2unit(_cmenu_position_x), y2unit(_cmenu_position_y));
+poi_info *p;
+gdouble lat, lon;
+
+gtk_map_get_menu_latlon(_map, &lat, &lon);
+p=poi_find_nearest(lat, lon);
+if (!p) {
+ popup_error(_window, _("No POI found at location."));
+ return TRUE;
+}
+poi_edit_dialog(ACTION_EDIT_POI, p);
return TRUE;
}
+
+/***/
+
+gboolean
+headphone_button_cb(gpointer data)
+{
+gint hb_action=0;
+switch (hb_action) {
+case 1:
+#if 0
+ /* XXX: Add code to add generic POI */
+ hildon_banner_show_information(_window, NULL, _("POI Added"));
+#endif
+break;
+case 0:
+default:
+ path_insert_mark_text(_track, g_strdup("Mark"));
+ hildon_banner_show_information(_window, NULL, _("Mark added"));
+break;
+}
+return FALSE;
+}
projects / mapper / blobdiff