#include "garminsymbols.h"
#include "degrees_converters.h"
#include "authors.h"
-#include "googlesearch.h"
+#include "vikgoto.h"
#include "util.h"
#include <glib/gi18n.h>
gboolean a_dialog_goto_utm ( GtkWindow *parent, struct UTM *utm, const struct UTM *old )
{
- GtkWidget *dialog = gtk_dialog_new_with_buttons (_("Go to Lat/Lon"),
+ GtkWidget *dialog = gtk_dialog_new_with_buttons (_("Go to UTM"),
parent,
GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_STOCK_CANCEL,
zonehbox = gtk_hbox_new ( FALSE, 0 );
gtk_box_pack_start ( GTK_BOX(zonehbox), gtk_label_new ( _("Zone:") ), FALSE, FALSE, 5 );
- zonespin = gtk_spin_button_new ( (GtkAdjustment *) gtk_adjustment_new ( old->zone, 1, 60, 1, 5, 5 ), 1, 0 );
+ zonespin = gtk_spin_button_new ( (GtkAdjustment *) gtk_adjustment_new ( old->zone, 1, 60, 1, 5, 0 ), 1, 0 );
gtk_box_pack_start ( GTK_BOX(zonehbox), zonespin, TRUE, TRUE, 5 );
gtk_box_pack_start ( GTK_BOX(zonehbox), gtk_label_new ( _("Letter:") ), FALSE, FALSE, 5 );
letterentry = gtk_entry_new ();
lat = g_strdup_printf ( "%f", ll.lat );
lon = g_strdup_printf ( "%f", ll.lon );
- alt = g_strdup_printf ( "%f", wp->altitude );
+ vik_units_height_t height_units = a_vik_get_units_height ();
+ switch (height_units) {
+ case VIK_UNITS_HEIGHT_METRES:
+ alt = g_strdup_printf ( "%f", wp->altitude );
+ break;
+ case VIK_UNITS_HEIGHT_FEET:
+ alt = g_strdup_printf ( "%f", wp->altitude*3.2808399 );
+ break;
+ default:
+ alt = g_strdup_printf ( "%f", wp->altitude );
+ g_critical("Houston, we've had a problem. height=%d", height_units);
+ }
if ( dest != NULL )
{
commentlabel = gtk_label_new (_("Comment:"));
commententry = gtk_entry_new ();
- gchar *cmt = a_googlesearch_get_search_string_for_this_place(VIK_WINDOW(parent));
+ gchar *cmt = NULL;
+ cmt = a_vik_goto_get_search_string_for_this_place(VIK_WINDOW(parent));
if (cmt)
gtk_entry_set_text(GTK_ENTRY(commententry), cmt);
imagelabel = gtk_label_new (_("Image:"));
- imageentry = vik_file_entry_new ();
+ imageentry = vik_file_entry_new (GTK_FILE_CHOOSER_ACTION_OPEN);
{
GtkCellRenderer *r;
store = gtk_list_store_new(3, G_TYPE_STRING, GDK_TYPE_PIXBUF, G_TYPE_STRING);
symbolentry = gtk_combo_box_new_with_model(GTK_TREE_MODEL(store));
gtk_combo_box_set_wrap_width(GTK_COMBO_BOX(symbolentry), 6);
- g_signal_connect(symbolentry, "changed",
- G_CALLBACK(symbol_entry_changed_cb), store);
+
+ g_signal_connect(symbolentry, "changed", G_CALLBACK(symbol_entry_changed_cb), store);
gtk_list_store_append (store, &iter);
gtk_list_store_set (store, &iter, 0, NULL, 1, NULL, 2, _("(none)"), -1);
a_populate_sym_list(store);
ll.lat = convert_dms_to_dec ( gtk_entry_get_text ( GTK_ENTRY(latentry) ) );
ll.lon = convert_dms_to_dec ( gtk_entry_get_text ( GTK_ENTRY(lonentry) ) );
vik_coord_load_from_latlon ( &(wp->coord), coord_mode, &ll );
- wp->altitude = atof ( gtk_entry_get_text ( GTK_ENTRY(altentry) ) );
+ // Always store in metres
+ switch (height_units) {
+ case VIK_UNITS_HEIGHT_METRES:
+ wp->altitude = atof ( gtk_entry_get_text ( GTK_ENTRY(altentry) ) );
+ alt = g_strdup_printf ( "%f", wp->altitude );
+ break;
+ case VIK_UNITS_HEIGHT_FEET:
+ wp->altitude = atof ( gtk_entry_get_text ( GTK_ENTRY(altentry) ) ) / 3.2808399;
+ break;
+ default:
+ wp->altitude = atof ( gtk_entry_get_text ( GTK_ENTRY(altentry) ) );
+ g_critical("Houston, we've had a problem. height=%d", height_units);
+ }
vik_waypoint_set_comment ( wp, gtk_entry_get_text ( GTK_ENTRY(commententry) ) );
vik_waypoint_set_image ( wp, vik_file_entry_get_filename ( VIK_FILE_ENTRY(imageentry) ) );
if ( wp->image && *(wp->image) && (!a_thumbnails_exists(wp->image)) )
ll.lat = convert_dms_to_dec ( gtk_entry_get_text ( GTK_ENTRY(latentry) ) );
ll.lon = convert_dms_to_dec ( gtk_entry_get_text ( GTK_ENTRY(lonentry) ) );
vik_coord_load_from_latlon ( &(wp->coord), coord_mode, &ll );
- wp->altitude = atof ( gtk_entry_get_text ( GTK_ENTRY(altentry) ) );
+ switch (height_units) {
+ case VIK_UNITS_HEIGHT_METRES:
+ wp->altitude = atof ( gtk_entry_get_text ( GTK_ENTRY(altentry) ) );
+ alt = g_strdup_printf ( "%f", wp->altitude );
+ break;
+ case VIK_UNITS_HEIGHT_FEET:
+ wp->altitude = atof ( gtk_entry_get_text ( GTK_ENTRY(altentry) ) ) / 3.2808399;
+ break;
+ default:
+ wp->altitude = atof ( gtk_entry_get_text ( GTK_ENTRY(altentry) ) );
+ g_critical("Houston, we've had a problem. height=%d", height_units);
+ }
if ( (! wp->comment) || strcmp ( wp->comment, gtk_entry_get_text ( GTK_ENTRY(commententry) ) ) != 0 )
vik_waypoint_set_comment ( wp, gtk_entry_get_text ( GTK_ENTRY(commententry) ) );
if ( (! wp->image) || strcmp ( wp->image, vik_file_entry_get_filename ( VIK_FILE_ENTRY ( imageentry ) ) ) != 0 )
return FALSE;
}
-gchar *a_dialog_select_track ( GtkWindow *parent, GHashTable *tracks, gchar *orig_track_name )
+static void get_selected_foreach_func(GtkTreeModel *model,
+ GtkTreePath *path,
+ GtkTreeIter *iter,
+ gpointer data)
+{
+ GList **list = data;
+ gchar *name;
+ gtk_tree_model_get (model, iter, 0, &name, -1);
+ *list = g_list_prepend(*list, name);
+}
+
+GList *a_dialog_select_from_list ( GtkWindow *parent, GHashTable *tracks, GList *track_names, gboolean multiple_selection_allowed, const gchar *title, const gchar *msg )
{
GtkTreeIter iter;
GtkCellRenderer *renderer;
GtkWidget *view;
- GtkWidget *dialog = gtk_dialog_new_with_buttons (_("Merge with..."),
+ GtkWidget *dialog = gtk_dialog_new_with_buttons (title,
parent,
GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_STOCK_CANCEL,
GTK_STOCK_OK,
GTK_RESPONSE_ACCEPT,
NULL);
- GtkWidget *label = gtk_label_new ( _("Select track to merge with") );
+ GtkWidget *label = gtk_label_new ( msg );
GtkListStore *store = gtk_list_store_new(1, G_TYPE_STRING);
- GList *track_names = g_hash_table_get_keys(tracks);
GList *track_runner = track_names;
while (track_runner)
{
- gchar *track_name = g_strdup(track_runner->data);
- if (g_strcasecmp(track_name, orig_track_name) == 0)
- {
- g_free(track_name);
- }
- else
- {
- gtk_list_store_append(store, &iter);
- gtk_list_store_set(store, &iter, 0, track_name,-1);
- }
+ gtk_list_store_append(store, &iter);
+ gtk_list_store_set(store, &iter, 0, track_runner->data, -1);
track_runner = g_list_next(track_runner);
}
- g_list_free(track_names);
view = gtk_tree_view_new();
renderer = gtk_cell_renderer_text_new();
gtk_tree_view_insert_column_with_attributes( GTK_TREE_VIEW(view), -1, NULL, renderer, "text", 0, NULL);
gtk_tree_view_set_model(GTK_TREE_VIEW(view), GTK_TREE_MODEL(store));
gtk_tree_view_set_headers_visible( GTK_TREE_VIEW(view), FALSE);
- gtk_tree_selection_set_mode( gtk_tree_view_get_selection(GTK_TREE_VIEW(view)), GTK_SELECTION_BROWSE );
+ gtk_tree_selection_set_mode( gtk_tree_view_get_selection(GTK_TREE_VIEW(view)),
+ multiple_selection_allowed ? GTK_SELECTION_MULTIPLE : GTK_SELECTION_BROWSE );
g_object_unref(store);
gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), label, FALSE, FALSE, 0);
while ( gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT )
{
+ GList *names = NULL;
GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(view));
- if (gtk_tree_selection_get_selected(selection, &store, &iter))
+ gtk_tree_selection_selected_foreach(selection, get_selected_foreach_func, &names);
+ if (names)
{
- gchar *name;
- gtk_tree_model_get (GTK_TREE_MODEL(store), &iter, 0, &name, -1);
- gchar *ret = g_strdup ( name );
gtk_widget_destroy ( dialog );
- g_free(name);
- return (ret);
+ return (names);
}
+ a_dialog_error_msg(parent, _("Nothing was selected"));
}
gtk_widget_destroy ( dialog );
return NULL;
table = gtk_table_new ( 4, 2, FALSE );
gtk_box_pack_start ( GTK_BOX(GTK_DIALOG(dialog)->vbox), table, TRUE, TRUE, 0 );
- label = gtk_label_new ( _("Zoom factor (in meters per pixel:") );
+ label = gtk_label_new ( _("Zoom factor (in meters per pixel):") );
xlabel = gtk_label_new ( _("X (easting): "));
ylabel = gtk_label_new ( _("Y (northing): "));
- pass_along[0] = xspin = gtk_spin_button_new ( (GtkAdjustment *) gtk_adjustment_new ( *xmpp, VIK_VIEWPORT_MIN_ZOOM, VIK_VIEWPORT_MAX_ZOOM, 1, 5, 5 ), 1, 8 );
- pass_along[1] = yspin = gtk_spin_button_new ( (GtkAdjustment *) gtk_adjustment_new ( *ympp, VIK_VIEWPORT_MIN_ZOOM, VIK_VIEWPORT_MAX_ZOOM, 1, 5, 5 ), 1, 8 );
+ pass_along[0] = xspin = gtk_spin_button_new ( (GtkAdjustment *) gtk_adjustment_new ( *xmpp, VIK_VIEWPORT_MIN_ZOOM, VIK_VIEWPORT_MAX_ZOOM, 1, 5, 0 ), 1, 8 );
+ pass_along[1] = yspin = gtk_spin_button_new ( (GtkAdjustment *) gtk_adjustment_new ( *ympp, VIK_VIEWPORT_MIN_ZOOM, VIK_VIEWPORT_MAX_ZOOM, 1, 5, 0 ), 1, 8 );
pass_along[2] = samecheck = gtk_check_button_new_with_label ( _("X and Y zoom factors must be equal") );
/* TODO -- same factor */
pass_along[0] = t4;
- spin = gtk_spin_button_new ( (GtkAdjustment *) gtk_adjustment_new ( *thr, 0, 65536, 1, 5, 5 ), 1, 0 );
+ spin = gtk_spin_button_new ( (GtkAdjustment *) gtk_adjustment_new ( *thr, 0, 65536, 1, 5, 0 ), 1, 0 );
gtk_table_attach_defaults ( GTK_TABLE(table), label, 0, 2, 0, 1 );
gtk_table_attach_defaults ( GTK_TABLE(table), t1, 0, 1, 1, 2 );
const gchar *program_name = PACKAGE_NAME;
const gchar *version = VIKING_VERSION;
const gchar *website = VIKING_URL;
- const gchar *copyright = "2003-2008, Evan Battaglia";
+ const gchar *copyright = "2003-2008, Evan Battaglia\n2008-2010, Viking's contributors";
const gchar *comments = _("GPS Data and Topo Analyzer, Explorer, and Manager.");
const gchar *license = _("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 "