From 96c30db45eb42b538d1b221d71f00a62068eefa0 Mon Sep 17 00:00:00 2001 From: Rob Norris Date: Thu, 5 Jun 2014 21:43:25 +0100 Subject: [PATCH] [QA] Move Waypoint dialog code into its own file. --- po/POTFILES.in | 1 + src/Makefile.am | 1 + src/dialog.c | 325 ------------------------------ src/dialog.h | 10 - src/viktrwlayer.c | 1 + src/viktrwlayer_waypointlist.c | 1 + src/viktrwlayer_wpwin.c | 351 +++++++++++++++++++++++++++++++++ src/viktrwlayer_wpwin.h | 40 ++++ 8 files changed, 395 insertions(+), 335 deletions(-) create mode 100644 src/viktrwlayer_wpwin.c create mode 100644 src/viktrwlayer_wpwin.h diff --git a/po/POTFILES.in b/po/POTFILES.in index e546c3f1..a971d9c6 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -58,6 +58,7 @@ src/viktrwlayer_propwin.c src/viktrwlayer_tpwin.c src/viktrwlayer_tracklist.c src/viktrwlayer_waypointlist.c +src/viktrwlayer_wpwin.c src/viktrwlayer_geotag.c src/viktrwlayer_analysis.c src/vikstatus.c diff --git a/src/Makefile.am b/src/Makefile.am index a2fda1c0..74ee0d79 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -89,6 +89,7 @@ libviking_a_SOURCES = \ vikgoto.c vikgoto.h \ viktrwlayer_export.c viktrwlayer_export.h \ viktrwlayer_tpwin.c viktrwlayer_tpwin.h \ + viktrwlayer_wpwin.c viktrwlayer_wpwin.h \ viktrwlayer_propwin.c viktrwlayer_propwin.h \ viktrwlayer_analysis.c viktrwlayer_analysis.h \ viktrwlayer_tracklist.c viktrwlayer_tracklist.h \ diff --git a/src/dialog.c b/src/dialog.c index 1f590ee5..5d805c7c 100644 --- a/src/dialog.c +++ b/src/dialog.c @@ -26,23 +26,16 @@ #endif #include "viking.h" -#include "thumbnails.h" -#include "garminsymbols.h" #include "degrees_converters.h" #include "authors.h" #include "documenters.h" -#include "vikgoto.h" -#include "vikutils.h" #include "util.h" -#include "geotag_exif.h" -#include "vikdatetime_edit_dialog.h" #include #include #include #include -#include void a_dialog_msg ( GtkWindow *parent, gint type, const gchar *info, const gchar *extra ) { @@ -182,324 +175,6 @@ void a_dialog_response_accept ( GtkDialog *dialog ) gtk_dialog_response ( dialog, GTK_RESPONSE_ACCEPT ); } -static void update_time ( GtkWidget *widget, VikWaypoint *wp ) -{ - gchar *msg = vu_get_time_string ( &(wp->timestamp), "%c", &(wp->coord), NULL ); - gtk_button_set_label ( GTK_BUTTON(widget), msg ); - g_free ( msg ); -} - -static VikWaypoint *edit_wp; - -static void time_edit_click ( GtkWidget *widget, VikWaypoint *wp ) -{ - GTimeZone *gtz = g_time_zone_new_local (); - time_t mytime = vik_datetime_edit_dialog ( GTK_WINDOW(gtk_widget_get_toplevel(widget)), - _("Date/Time Edit"), - wp->timestamp, - gtz ); - g_time_zone_unref ( gtz ); - - // Was the dialog cancelled? - if ( mytime == 0 ) - return; - - // Otherwise use new value in the edit buffer - edit_wp->timestamp = mytime; - - // Clear the previous 'Add' image as now a time is set - if ( gtk_button_get_image ( GTK_BUTTON(widget) ) ) - gtk_button_set_image ( GTK_BUTTON(widget), NULL ); - - update_time ( widget, edit_wp ); -} - -static void symbol_entry_changed_cb(GtkWidget *combo, GtkListStore *store) -{ - GtkTreeIter iter; - gchar *sym; - - if (!gtk_combo_box_get_active_iter(GTK_COMBO_BOX(combo), &iter)) - return; - - gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, 0, (void *)&sym, -1 ); - /* Note: symm is NULL when "(none)" is select (first cell is empty) */ - gtk_widget_set_tooltip_text(combo, sym); - g_free(sym); -} - -/* Specify if a new waypoint or not */ -/* If a new waypoint then it uses the default_name for the suggested name allowing the user to change it. - The name to use is returned - */ -/* todo: less on this side, like add track */ -gchar *a_dialog_waypoint ( GtkWindow *parent, gchar *default_name, VikTrwLayer *vtl, VikWaypoint *wp, VikCoordMode coord_mode, gboolean is_new, gboolean *updated ) -{ - GtkWidget *dialog = gtk_dialog_new_with_buttons (_("Waypoint Properties"), - parent, - GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_STOCK_CANCEL, - GTK_RESPONSE_REJECT, - GTK_STOCK_OK, - GTK_RESPONSE_ACCEPT, - NULL); - struct LatLon ll; - GtkWidget *latlabel, *lonlabel, *namelabel, *latentry, *lonentry, *altentry, *altlabel, *nameentry=NULL; - GtkWidget *commentlabel, *commententry, *descriptionlabel, *descriptionentry, *imagelabel, *imageentry, *symbollabel, *symbolentry; - GtkWidget *timelabel = NULL; - GtkWidget *timevaluebutton = NULL; - GtkWidget *hasGeotagCB = NULL; - GtkWidget *consistentGeotagCB = NULL; - GtkListStore *store; - - gchar *lat, *lon, *alt; - - vik_coord_to_latlon ( &(wp->coord), &ll ); - - lat = g_strdup_printf ( "%f", ll.lat ); - lon = g_strdup_printf ( "%f", ll.lon ); - 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", VIK_METERS_TO_FEET(wp->altitude) ); - break; - default: - alt = g_strdup_printf ( "%f", wp->altitude ); - g_critical("Houston, we've had a problem. height=%d", height_units); - } - - *updated = FALSE; - - namelabel = gtk_label_new (_("Name:")); - gtk_box_pack_start (GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), namelabel, FALSE, FALSE, 0); - // Name is now always changeable - nameentry = gtk_entry_new (); - if ( default_name ) - gtk_entry_set_text( GTK_ENTRY(nameentry), default_name ); - g_signal_connect_swapped ( nameentry, "activate", G_CALLBACK(a_dialog_response_accept), GTK_DIALOG(dialog) ); - gtk_box_pack_start (GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), nameentry, FALSE, FALSE, 0); - - latlabel = gtk_label_new (_("Latitude:")); - latentry = gtk_entry_new (); - gtk_entry_set_text ( GTK_ENTRY(latentry), lat ); - g_free ( lat ); - - lonlabel = gtk_label_new (_("Longitude:")); - lonentry = gtk_entry_new (); - gtk_entry_set_text ( GTK_ENTRY(lonentry), lon ); - g_free ( lon ); - - altlabel = gtk_label_new (_("Altitude:")); - altentry = gtk_entry_new (); - gtk_entry_set_text ( GTK_ENTRY(altentry), alt ); - g_free ( alt ); - - commentlabel = gtk_label_new (_("Comment:")); - commententry = gtk_entry_new (); - gchar *cmt = NULL; - // Auto put in some kind of 'name' as a comment if one previously 'goto'ed this exact location - cmt = a_vik_goto_get_search_string_for_this_place(VIK_WINDOW(parent)); - if (cmt) - gtk_entry_set_text(GTK_ENTRY(commententry), cmt); - - descriptionlabel = gtk_label_new (_("Description:")); - descriptionentry = gtk_entry_new (); - - imagelabel = gtk_label_new (_("Image:")); - imageentry = vik_file_entry_new (GTK_FILE_CHOOSER_ACTION_OPEN, VF_FILTER_IMAGE); - - { - GtkCellRenderer *r; - symbollabel = gtk_label_new (_("Symbol:")); - GtkTreeIter iter; - - 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); - gtk_list_store_append (store, &iter); - gtk_list_store_set (store, &iter, 0, NULL, 1, NULL, 2, _("(none)"), -1); - a_populate_sym_list(store); - - r = gtk_cell_renderer_pixbuf_new (); - gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (symbolentry), r, FALSE); - gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (symbolentry), r, "pixbuf", 1, NULL); - - r = gtk_cell_renderer_text_new (); - gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (symbolentry), r, FALSE); - gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (symbolentry), r, "text", 2, NULL); - - if ( !is_new && wp->symbol ) { - gboolean ok; - gchar *sym; - for (ok = gtk_tree_model_get_iter_first ( GTK_TREE_MODEL(store), &iter ); ok; ok = gtk_tree_model_iter_next ( GTK_TREE_MODEL(store), &iter)) { - gtk_tree_model_get ( GTK_TREE_MODEL(store), &iter, 0, (void *)&sym, -1 ); - if (sym && !strcmp(sym, wp->symbol)) { - g_free(sym); - break; - } else { - g_free(sym); - } - } - // Ensure is it a valid symbol in the given symbol set (large vs small) - // Not all symbols are available in both - // The check prevents a Gtk Critical message - if ( iter.stamp ) - gtk_combo_box_set_active_iter(GTK_COMBO_BOX(symbolentry), &iter); - } - } - - if ( !is_new && wp->comment ) - gtk_entry_set_text ( GTK_ENTRY(commententry), wp->comment ); - - if ( !is_new && wp->description ) - gtk_entry_set_text ( GTK_ENTRY(descriptionentry), wp->description ); - - if ( !is_new && wp->image ) { - vik_file_entry_set_filename ( VIK_FILE_ENTRY(imageentry), wp->image ); - - // Geotag Info [readonly] - hasGeotagCB = gtk_check_button_new_with_label ( _("Has Geotag") ); - gtk_widget_set_sensitive ( hasGeotagCB, FALSE ); - gboolean hasGeotag; - gchar *ignore = a_geotag_get_exif_date_from_file ( wp->image, &hasGeotag ); - g_free ( ignore ); - gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON(hasGeotagCB), hasGeotag ); - - consistentGeotagCB = gtk_check_button_new_with_label ( _("Consistent Position") ); - gtk_widget_set_sensitive ( consistentGeotagCB, FALSE ); - if ( hasGeotag ) { - struct LatLon ll = a_geotag_get_position ( wp->image ); - VikCoord coord; - vik_coord_load_from_latlon ( &coord, coord_mode, &ll ); - gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON(consistentGeotagCB), vik_coord_equals(&coord, &wp->coord) ); - } - } - - timelabel = gtk_label_new ( _("Time:") ); - timevaluebutton = gtk_button_new(); - gtk_button_set_relief ( GTK_BUTTON(timevaluebutton), GTK_RELIEF_NONE ); - - if ( !edit_wp ) - edit_wp = vik_waypoint_new (); - edit_wp = vik_waypoint_copy ( wp ); - - // TODO: Consider if there should be a remove time button... - - if ( !is_new && wp->has_timestamp ) { - update_time ( timevaluebutton, wp ); - } - else { - GtkWidget *img = gtk_image_new_from_stock ( GTK_STOCK_ADD, GTK_ICON_SIZE_MENU ); - gtk_button_set_image ( GTK_BUTTON(timevaluebutton), img ); - // Initially use current time or otherwise whatever the last value used was - if ( edit_wp->timestamp == 0 ) { - time ( &edit_wp->timestamp ); - } - } - g_signal_connect ( G_OBJECT(timevaluebutton), "clicked", G_CALLBACK(time_edit_click), edit_wp ); - - gtk_box_pack_start (GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), latlabel, FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), latentry, FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), lonlabel, FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), lonentry, FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), timelabel, FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), timevaluebutton, FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), altlabel, FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), altentry, FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), commentlabel, FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), commententry, FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), descriptionlabel, FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), descriptionentry, FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), imagelabel, FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), imageentry, FALSE, FALSE, 0); - if ( hasGeotagCB ) { - GtkWidget *hbox = gtk_hbox_new ( FALSE, 0 ); - gtk_box_pack_start (GTK_BOX(hbox), hasGeotagCB, FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX(hbox), consistentGeotagCB, FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), hbox, FALSE, FALSE, 0); - } - gtk_box_pack_start (GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), symbollabel, FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), GTK_WIDGET(symbolentry), FALSE, FALSE, 0); - - gtk_dialog_set_default_response ( GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT ); - - gtk_widget_show_all ( gtk_dialog_get_content_area(GTK_DIALOG(dialog)) ); - - if ( !is_new ) { - // Shift left<->right to try not to obscure the waypoint. - trw_layer_dialog_shift ( vtl, GTK_WINDOW(dialog), &(wp->coord), FALSE ); - } - - while ( gtk_dialog_run ( GTK_DIALOG(dialog) ) == GTK_RESPONSE_ACCEPT ) - { - if ( strlen((gchar*)gtk_entry_get_text ( GTK_ENTRY(nameentry) )) == 0 ) /* TODO: other checks (isalpha or whatever ) */ - a_dialog_info_msg ( parent, _("Please enter a name for the waypoint.") ); - else { - // NB: No check for unique names - this allows generation of same named entries. - gchar *entered_name = g_strdup ( (gchar*)gtk_entry_get_text ( GTK_ENTRY(nameentry) ) ); - - /* Do It */ - 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 ); - // Always store in metres - switch (height_units) { - case VIK_UNITS_HEIGHT_METRES: - wp->altitude = atof ( gtk_entry_get_text ( GTK_ENTRY(altentry) ) ); - break; - case VIK_UNITS_HEIGHT_FEET: - wp->altitude = VIK_FEET_TO_METERS(atof ( gtk_entry_get_text ( GTK_ENTRY(altentry) ) )); - 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 ( g_strcmp0 ( wp->comment, gtk_entry_get_text ( GTK_ENTRY(commententry) ) ) ) - vik_waypoint_set_comment ( wp, gtk_entry_get_text ( GTK_ENTRY(commententry) ) ); - if ( g_strcmp0 ( wp->description, gtk_entry_get_text ( GTK_ENTRY(descriptionentry) ) ) ) - vik_waypoint_set_description ( wp, gtk_entry_get_text ( GTK_ENTRY(descriptionentry) ) ); - if ( g_strcmp0 ( wp->image, vik_file_entry_get_filename ( VIK_FILE_ENTRY(imageentry) ) ) ) - vik_waypoint_set_image ( wp, vik_file_entry_get_filename ( VIK_FILE_ENTRY(imageentry) ) ); - if ( wp->image && *(wp->image) && (!a_thumbnails_exists(wp->image)) ) - a_thumbnails_create ( wp->image ); - if ( edit_wp->timestamp ) { - wp->timestamp = edit_wp->timestamp; - wp->has_timestamp = TRUE; - } - - GtkTreeIter iter, first; - gtk_tree_model_get_iter_first ( GTK_TREE_MODEL(store), &first ); - if ( !gtk_combo_box_get_active_iter ( GTK_COMBO_BOX(symbolentry), &iter ) || !memcmp(&iter, &first, sizeof(GtkTreeIter)) ) { - vik_waypoint_set_symbol ( wp, NULL ); - } else { - gchar *sym; - gtk_tree_model_get ( GTK_TREE_MODEL(store), &iter, 0, (void *)&sym, -1 ); - vik_waypoint_set_symbol ( wp, sym ); - g_free(sym); - } - - gtk_widget_destroy ( dialog ); - if ( is_new ) - return entered_name; - else { - *updated = TRUE; - // See if name has been changed - if ( g_strcmp0 (default_name, entered_name ) ) - return entered_name; - else - return NULL; - } - } - } - gtk_widget_destroy ( dialog ); - return NULL; -} - static void get_selected_foreach_func(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, diff --git a/src/dialog.h b/src/dialog.h index 7e3ea30f..851b4025 100644 --- a/src/dialog.h +++ b/src/dialog.h @@ -26,9 +26,6 @@ #include #include "coords.h" -#include "vikwaypoint.h" -#include "vikcoord.h" -#include "viktrwlayer.h" G_BEGIN_DECLS @@ -53,13 +50,6 @@ void a_dialog_about ( GtkWindow *parent ); gboolean a_dialog_goto_latlon ( GtkWindow *parent, struct LatLon *ll, const struct LatLon *old ); gboolean a_dialog_goto_utm ( GtkWindow *parent, struct UTM *utm, const struct UTM *old ); -/* Specify if a new waypoint or not */ -/* If a new waypoint then it uses the default_name for the suggested name allowing the user to change it. - The name to use is returned - When an existing waypoint the name is shown but is not allowed to be changed and NULL is returned - */ -gchar *a_dialog_waypoint ( GtkWindow *parent, gchar *default_name, VikTrwLayer *vtl, VikWaypoint *wp, VikCoordMode coord_mode, gboolean is_new, gboolean *updated ); - gchar *a_dialog_new_track ( GtkWindow *parent, gchar *default_name, gboolean is_route ); gchar *a_dialog_get_date ( GtkWindow *parent, const gchar *title ); diff --git a/src/viktrwlayer.c b/src/viktrwlayer.c index da2e3922..8bd6cb29 100644 --- a/src/viktrwlayer.c +++ b/src/viktrwlayer.c @@ -35,6 +35,7 @@ #include "vikgpslayer.h" #include "viktrwlayer_export.h" #include "viktrwlayer_tpwin.h" +#include "viktrwlayer_wpwin.h" #include "viktrwlayer_propwin.h" #include "viktrwlayer_analysis.h" #include "viktrwlayer_tracklist.h" diff --git a/src/viktrwlayer_waypointlist.c b/src/viktrwlayer_waypointlist.c index ce09ef6b..f8aae95b 100644 --- a/src/viktrwlayer_waypointlist.c +++ b/src/viktrwlayer_waypointlist.c @@ -29,6 +29,7 @@ #include "viking.h" #include "viktrwlayer_waypointlist.h" +#include "viktrwlayer_wpwin.h" // Long formatted date+basic time - listing this way ensures the string comparison sort works - so no local type format %x or %c here! #define WAYPOINT_LIST_DATE_FORMAT "%Y-%m-%d %H:%M" diff --git a/src/viktrwlayer_wpwin.c b/src/viktrwlayer_wpwin.c new file mode 100644 index 00000000..87c68f2a --- /dev/null +++ b/src/viktrwlayer_wpwin.c @@ -0,0 +1,351 @@ +/* + * viking -- GPS Data and Topo Analyzer, Explorer, and Manager + * + * Copyright (C) 2003-2005, Evan Battaglia + * Copyright (C) 2010-2014, Rob Norris + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ +#include +#include + +#include "viktrwlayer_wpwin.h" +#include "degrees_converters.h" +#include "garminsymbols.h" +#include "geotag_exif.h" +#include "thumbnails.h" +#include "viking.h" +#include "vikdatetime_edit_dialog.h" +#include "vikgoto.h" +#include "vikutils.h" + +static void update_time ( GtkWidget *widget, VikWaypoint *wp ) +{ + gchar *msg = vu_get_time_string ( &(wp->timestamp), "%c", &(wp->coord), NULL ); + gtk_button_set_label ( GTK_BUTTON(widget), msg ); + g_free ( msg ); +} + +static VikWaypoint *edit_wp; + +static void time_edit_click ( GtkWidget *widget, VikWaypoint *wp ) +{ + GTimeZone *gtz = g_time_zone_new_local (); + time_t mytime = vik_datetime_edit_dialog ( GTK_WINDOW(gtk_widget_get_toplevel(widget)), + _("Date/Time Edit"), + wp->timestamp, + gtz ); + g_time_zone_unref ( gtz ); + + // Was the dialog cancelled? + if ( mytime == 0 ) + return; + + // Otherwise use new value in the edit buffer + edit_wp->timestamp = mytime; + + // Clear the previous 'Add' image as now a time is set + if ( gtk_button_get_image ( GTK_BUTTON(widget) ) ) + gtk_button_set_image ( GTK_BUTTON(widget), NULL ); + + update_time ( widget, edit_wp ); +} + +static void symbol_entry_changed_cb(GtkWidget *combo, GtkListStore *store) +{ + GtkTreeIter iter; + gchar *sym; + + if (!gtk_combo_box_get_active_iter(GTK_COMBO_BOX(combo), &iter)) + return; + + gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, 0, (void *)&sym, -1 ); + /* Note: symm is NULL when "(none)" is select (first cell is empty) */ + gtk_widget_set_tooltip_text(combo, sym); + g_free(sym); +} + +/* Specify if a new waypoint or not */ +/* If a new waypoint then it uses the default_name for the suggested name allowing the user to change it. + The name to use is returned + */ +/* todo: less on this side, like add track */ +gchar *a_dialog_waypoint ( GtkWindow *parent, gchar *default_name, VikTrwLayer *vtl, VikWaypoint *wp, VikCoordMode coord_mode, gboolean is_new, gboolean *updated ) +{ + GtkWidget *dialog = gtk_dialog_new_with_buttons (_("Waypoint Properties"), + parent, + GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_STOCK_CANCEL, + GTK_RESPONSE_REJECT, + GTK_STOCK_OK, + GTK_RESPONSE_ACCEPT, + NULL); + struct LatLon ll; + GtkWidget *latlabel, *lonlabel, *namelabel, *latentry, *lonentry, *altentry, *altlabel, *nameentry=NULL; + GtkWidget *commentlabel, *commententry, *descriptionlabel, *descriptionentry, *imagelabel, *imageentry, *symbollabel, *symbolentry; + GtkWidget *timelabel = NULL; + GtkWidget *timevaluebutton = NULL; + GtkWidget *hasGeotagCB = NULL; + GtkWidget *consistentGeotagCB = NULL; + GtkListStore *store; + + gchar *lat, *lon, *alt; + + vik_coord_to_latlon ( &(wp->coord), &ll ); + + lat = g_strdup_printf ( "%f", ll.lat ); + lon = g_strdup_printf ( "%f", ll.lon ); + 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", VIK_METERS_TO_FEET(wp->altitude) ); + break; + default: + alt = g_strdup_printf ( "%f", wp->altitude ); + g_critical("Houston, we've had a problem. height=%d", height_units); + } + + *updated = FALSE; + + namelabel = gtk_label_new (_("Name:")); + gtk_box_pack_start (GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), namelabel, FALSE, FALSE, 0); + // Name is now always changeable + nameentry = gtk_entry_new (); + if ( default_name ) + gtk_entry_set_text( GTK_ENTRY(nameentry), default_name ); + g_signal_connect_swapped ( nameentry, "activate", G_CALLBACK(a_dialog_response_accept), GTK_DIALOG(dialog) ); + gtk_box_pack_start (GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), nameentry, FALSE, FALSE, 0); + + latlabel = gtk_label_new (_("Latitude:")); + latentry = gtk_entry_new (); + gtk_entry_set_text ( GTK_ENTRY(latentry), lat ); + g_free ( lat ); + + lonlabel = gtk_label_new (_("Longitude:")); + lonentry = gtk_entry_new (); + gtk_entry_set_text ( GTK_ENTRY(lonentry), lon ); + g_free ( lon ); + + altlabel = gtk_label_new (_("Altitude:")); + altentry = gtk_entry_new (); + gtk_entry_set_text ( GTK_ENTRY(altentry), alt ); + g_free ( alt ); + + commentlabel = gtk_label_new (_("Comment:")); + commententry = gtk_entry_new (); + gchar *cmt = NULL; + // Auto put in some kind of 'name' as a comment if one previously 'goto'ed this exact location + cmt = a_vik_goto_get_search_string_for_this_place(VIK_WINDOW(parent)); + if (cmt) + gtk_entry_set_text(GTK_ENTRY(commententry), cmt); + + descriptionlabel = gtk_label_new (_("Description:")); + descriptionentry = gtk_entry_new (); + + imagelabel = gtk_label_new (_("Image:")); + imageentry = vik_file_entry_new (GTK_FILE_CHOOSER_ACTION_OPEN, VF_FILTER_IMAGE); + + { + GtkCellRenderer *r; + symbollabel = gtk_label_new (_("Symbol:")); + GtkTreeIter iter; + + 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); + gtk_list_store_append (store, &iter); + gtk_list_store_set (store, &iter, 0, NULL, 1, NULL, 2, _("(none)"), -1); + a_populate_sym_list(store); + + r = gtk_cell_renderer_pixbuf_new (); + gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (symbolentry), r, FALSE); + gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (symbolentry), r, "pixbuf", 1, NULL); + + r = gtk_cell_renderer_text_new (); + gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (symbolentry), r, FALSE); + gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (symbolentry), r, "text", 2, NULL); + + if ( !is_new && wp->symbol ) { + gboolean ok; + gchar *sym; + for (ok = gtk_tree_model_get_iter_first ( GTK_TREE_MODEL(store), &iter ); ok; ok = gtk_tree_model_iter_next ( GTK_TREE_MODEL(store), &iter)) { + gtk_tree_model_get ( GTK_TREE_MODEL(store), &iter, 0, (void *)&sym, -1 ); + if (sym && !strcmp(sym, wp->symbol)) { + g_free(sym); + break; + } else { + g_free(sym); + } + } + // Ensure is it a valid symbol in the given symbol set (large vs small) + // Not all symbols are available in both + // The check prevents a Gtk Critical message + if ( iter.stamp ) + gtk_combo_box_set_active_iter(GTK_COMBO_BOX(symbolentry), &iter); + } + } + + if ( !is_new && wp->comment ) + gtk_entry_set_text ( GTK_ENTRY(commententry), wp->comment ); + + if ( !is_new && wp->description ) + gtk_entry_set_text ( GTK_ENTRY(descriptionentry), wp->description ); + + if ( !is_new && wp->image ) { + vik_file_entry_set_filename ( VIK_FILE_ENTRY(imageentry), wp->image ); + + // Geotag Info [readonly] + hasGeotagCB = gtk_check_button_new_with_label ( _("Has Geotag") ); + gtk_widget_set_sensitive ( hasGeotagCB, FALSE ); + gboolean hasGeotag; + gchar *ignore = a_geotag_get_exif_date_from_file ( wp->image, &hasGeotag ); + g_free ( ignore ); + gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON(hasGeotagCB), hasGeotag ); + + consistentGeotagCB = gtk_check_button_new_with_label ( _("Consistent Position") ); + gtk_widget_set_sensitive ( consistentGeotagCB, FALSE ); + if ( hasGeotag ) { + struct LatLon ll = a_geotag_get_position ( wp->image ); + VikCoord coord; + vik_coord_load_from_latlon ( &coord, coord_mode, &ll ); + gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON(consistentGeotagCB), vik_coord_equals(&coord, &wp->coord) ); + } + } + + timelabel = gtk_label_new ( _("Time:") ); + timevaluebutton = gtk_button_new(); + gtk_button_set_relief ( GTK_BUTTON(timevaluebutton), GTK_RELIEF_NONE ); + + if ( !edit_wp ) + edit_wp = vik_waypoint_new (); + edit_wp = vik_waypoint_copy ( wp ); + + // TODO: Consider if there should be a remove time button... + + if ( !is_new && wp->has_timestamp ) { + update_time ( timevaluebutton, wp ); + } + else { + GtkWidget *img = gtk_image_new_from_stock ( GTK_STOCK_ADD, GTK_ICON_SIZE_MENU ); + gtk_button_set_image ( GTK_BUTTON(timevaluebutton), img ); + // Initially use current time or otherwise whatever the last value used was + if ( edit_wp->timestamp == 0 ) { + time ( &edit_wp->timestamp ); + } + } + g_signal_connect ( G_OBJECT(timevaluebutton), "clicked", G_CALLBACK(time_edit_click), edit_wp ); + + gtk_box_pack_start (GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), latlabel, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), latentry, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), lonlabel, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), lonentry, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), timelabel, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), timevaluebutton, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), altlabel, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), altentry, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), commentlabel, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), commententry, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), descriptionlabel, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), descriptionentry, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), imagelabel, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), imageentry, FALSE, FALSE, 0); + if ( hasGeotagCB ) { + GtkWidget *hbox = gtk_hbox_new ( FALSE, 0 ); + gtk_box_pack_start (GTK_BOX(hbox), hasGeotagCB, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX(hbox), consistentGeotagCB, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), hbox, FALSE, FALSE, 0); + } + gtk_box_pack_start (GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), symbollabel, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), GTK_WIDGET(symbolentry), FALSE, FALSE, 0); + + gtk_dialog_set_default_response ( GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT ); + + gtk_widget_show_all ( gtk_dialog_get_content_area(GTK_DIALOG(dialog)) ); + + if ( !is_new ) { + // Shift left<->right to try not to obscure the waypoint. + trw_layer_dialog_shift ( vtl, GTK_WINDOW(dialog), &(wp->coord), FALSE ); + } + + while ( gtk_dialog_run ( GTK_DIALOG(dialog) ) == GTK_RESPONSE_ACCEPT ) + { + if ( strlen((gchar*)gtk_entry_get_text ( GTK_ENTRY(nameentry) )) == 0 ) /* TODO: other checks (isalpha or whatever ) */ + a_dialog_info_msg ( parent, _("Please enter a name for the waypoint.") ); + else { + // NB: No check for unique names - this allows generation of same named entries. + gchar *entered_name = g_strdup ( (gchar*)gtk_entry_get_text ( GTK_ENTRY(nameentry) ) ); + + /* Do It */ + 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 ); + // Always store in metres + switch (height_units) { + case VIK_UNITS_HEIGHT_METRES: + wp->altitude = atof ( gtk_entry_get_text ( GTK_ENTRY(altentry) ) ); + break; + case VIK_UNITS_HEIGHT_FEET: + wp->altitude = VIK_FEET_TO_METERS(atof ( gtk_entry_get_text ( GTK_ENTRY(altentry) ) )); + 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 ( g_strcmp0 ( wp->comment, gtk_entry_get_text ( GTK_ENTRY(commententry) ) ) ) + vik_waypoint_set_comment ( wp, gtk_entry_get_text ( GTK_ENTRY(commententry) ) ); + if ( g_strcmp0 ( wp->description, gtk_entry_get_text ( GTK_ENTRY(descriptionentry) ) ) ) + vik_waypoint_set_description ( wp, gtk_entry_get_text ( GTK_ENTRY(descriptionentry) ) ); + if ( g_strcmp0 ( wp->image, vik_file_entry_get_filename ( VIK_FILE_ENTRY(imageentry) ) ) ) + vik_waypoint_set_image ( wp, vik_file_entry_get_filename ( VIK_FILE_ENTRY(imageentry) ) ); + if ( wp->image && *(wp->image) && (!a_thumbnails_exists(wp->image)) ) + a_thumbnails_create ( wp->image ); + if ( edit_wp->timestamp ) { + wp->timestamp = edit_wp->timestamp; + wp->has_timestamp = TRUE; + } + + GtkTreeIter iter, first; + gtk_tree_model_get_iter_first ( GTK_TREE_MODEL(store), &first ); + if ( !gtk_combo_box_get_active_iter ( GTK_COMBO_BOX(symbolentry), &iter ) || !memcmp(&iter, &first, sizeof(GtkTreeIter)) ) { + vik_waypoint_set_symbol ( wp, NULL ); + } else { + gchar *sym; + gtk_tree_model_get ( GTK_TREE_MODEL(store), &iter, 0, (void *)&sym, -1 ); + vik_waypoint_set_symbol ( wp, sym ); + g_free(sym); + } + + gtk_widget_destroy ( dialog ); + if ( is_new ) + return entered_name; + else { + *updated = TRUE; + // See if name has been changed + if ( g_strcmp0 (default_name, entered_name ) ) + return entered_name; + else + return NULL; + } + } + } + gtk_widget_destroy ( dialog ); + return NULL; +} diff --git a/src/viktrwlayer_wpwin.h b/src/viktrwlayer_wpwin.h new file mode 100644 index 00000000..59c5a144 --- /dev/null +++ b/src/viktrwlayer_wpwin.h @@ -0,0 +1,40 @@ +/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */ +/* + * viking -- GPS Data and Topo Analyzer, Explorer, and Manager + * + * Copyright (c) 2014, Rob Norris + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ +#ifndef _VIKING_TRWLAYER_WPWIN_H +#define _VIKING_TRWLAYER_WPWIN_H + +#include +#include +#include "viktrwlayer.h" + +G_BEGIN_DECLS + +/* Specify if a new waypoint or not */ +/* If a new waypoint then it uses the default_name for the suggested name allowing the user to change it. + The name to use is returned + When an existing waypoint the name is shown but is not allowed to be changed and NULL is returned + */ +gchar *a_dialog_waypoint ( GtkWindow *parent, gchar *default_name, VikTrwLayer *vtl, VikWaypoint *wp, VikCoordMode coord_mode, gboolean is_new, gboolean *updated ); + +G_END_DECLS + +#endif -- 2.39.5