*
* Copyright (C) 2003-2005, Evan Battaglia <gtoevan@gmx.net>
* Copyright (C) 2008, Hein Ragas <viking@ragas.nl>
- * Copyright (C) 2010, Rob Norris <rw_norris@hotmail.com>
+ * Copyright (C) 2010-2014, Rob Norris <rw_norris@hotmail.com>
*
* 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
#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 <glib/gi18n.h>
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))), lon, FALSE, FALSE, 0);
+ // 'ok' when press return in the entry
+ g_signal_connect_swapped (lat, "activate", G_CALLBACK(a_dialog_response_accept), dialog);
+ g_signal_connect_swapped (lon, "activate", G_CALLBACK(a_dialog_response_accept), dialog);
+
gtk_dialog_set_default_response ( GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT );
if ( gtk_dialog_run ( GTK_DIALOG(dialog) ) == GTK_RESPONSE_ACCEPT )
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;
GtkWidget *latlabel, *lonlabel, *namelabel, *latentry, *lonentry, *altentry, *altlabel, *nameentry=NULL;
GtkWidget *commentlabel, *commententry, *descriptionlabel, *descriptionentry, *imagelabel, *imageentry, *symbollabel, *symbolentry;
GtkWidget *timelabel = NULL;
- GtkWidget *timevaluelabel = NULL; // No editing of time allowed ATM
+ GtkWidget *timevaluebutton = NULL;
+ GtkWidget *hasGeotagCB = NULL;
+ GtkWidget *consistentGeotagCB = NULL;
GtkListStore *store;
gchar *lat, *lon, *alt;
descriptionentry = gtk_entry_new ();
imagelabel = gtk_label_new (_("Image:"));
- imageentry = vik_file_entry_new (GTK_FILE_CHOOSER_ACTION_OPEN);
+ imageentry = vik_file_entry_new (GTK_FILE_CHOOSER_ACTION_OPEN, VF_FILTER_IMAGE);
{
GtkCellRenderer *r;
if ( !is_new && wp->description )
gtk_entry_set_text ( GTK_ENTRY(descriptionentry), wp->description );
- if ( !is_new && wp->image )
+ 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 ) {
- gchar tmp_str[64];
- timelabel = gtk_label_new ( _("Time:") );
- timevaluelabel = gtk_label_new ( NULL );
- strftime ( tmp_str, sizeof(tmp_str), "%c", localtime(&(wp->timestamp)) );
- gtk_label_set_text ( GTK_LABEL(timevaluelabel), tmp_str );
+ 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);
- if ( timelabel ) {
- 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))), timevaluelabel, 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))), 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);
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 );
while ( gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT )
{
- GList *names = NULL;
+ GList *names_selected = NULL;
GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(view));
- gtk_tree_selection_selected_foreach(selection, get_selected_foreach_func, &names);
- if (names)
+ gtk_tree_selection_selected_foreach(selection, get_selected_foreach_func, &names_selected);
+ if (names_selected)
{
gtk_widget_destroy ( dialog );
- return (names);
+ return names_selected;
}
a_dialog_error_msg(parent, _("Nothing was selected"));
}
return NULL;
}
-gchar *a_dialog_new_track ( GtkWindow *parent, GHashTable *tracks, gchar *default_name, gboolean is_route )
+gchar *a_dialog_new_track ( GtkWindow *parent, gchar *default_name, gboolean is_route )
{
GtkWidget *dialog = gtk_dialog_new_with_buttons ( is_route ? _("Add Route") : _("Add Track"),
parent,
return NULL;
}
+static void today_clicked (GtkWidget *cal)
+{
+ GDateTime *now = g_date_time_new_now_local ();
+ gtk_calendar_select_month ( GTK_CALENDAR(cal), g_date_time_get_month(now)-1, g_date_time_get_year(now) );
+ gtk_calendar_select_day ( GTK_CALENDAR(cal), g_date_time_get_day_of_month(now) );
+ g_date_time_unref ( now );
+}
+
+/**
+ * a_dialog_get_date:
+ *
+ * Returns: a date as a string - always in ISO8601 format (YYYY-MM-DD)
+ * This string can be NULL (especially when the dialog is cancelled)
+ * Free the string after use
+ */
+gchar *a_dialog_get_date ( GtkWindow *parent, const gchar *title )
+{
+ GtkWidget *dialog = gtk_dialog_new_with_buttons ( title,
+ parent,
+ GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_STOCK_CANCEL,
+ GTK_RESPONSE_REJECT,
+ GTK_STOCK_OK,
+ GTK_RESPONSE_ACCEPT,
+ NULL);
+ GtkWidget *cal = gtk_calendar_new ();
+ GtkWidget *today = gtk_button_new_with_label ( _("Today") );
+
+ static guint year = 0;
+ static guint month = 0;
+ static guint day = 0;
+
+ if ( year != 0 ) {
+ // restore the last selected date
+ gtk_calendar_select_month ( GTK_CALENDAR(cal), month, year );
+ gtk_calendar_select_day ( GTK_CALENDAR(cal), day );
+ }
+
+ gtk_box_pack_start (GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), today, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), cal, FALSE, FALSE, 0);
+
+ g_signal_connect_swapped ( G_OBJECT(today), "clicked", G_CALLBACK(today_clicked), cal );
+
+ gtk_widget_show_all ( dialog );
+
+ gtk_dialog_set_default_response ( GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT );
+
+ gchar *date_str = NULL;
+ if ( gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT )
+ {
+ gtk_calendar_get_date ( GTK_CALENDAR(cal), &year, &month, &day );
+ date_str = g_strdup_printf ( "%d-%02d-%02d", year, month+1, day );
+ }
+ gtk_widget_destroy ( dialog );
+ return date_str;
+}
+
/* creates a vbox full of labels */
-GtkWidget *a_dialog_create_label_vbox ( gchar **texts, int label_count )
+GtkWidget *a_dialog_create_label_vbox ( gchar **texts, int label_count, gint spacing, gint padding )
{
GtkWidget *vbox, *label;
int i;
- vbox = gtk_vbox_new( TRUE, 3 );
+ vbox = gtk_vbox_new( TRUE, spacing );
for ( i = 0; i < label_count; i++ )
{
label = gtk_label_new(NULL);
gtk_label_set_markup ( GTK_LABEL(label), _(texts[i]) );
- gtk_box_pack_start ( GTK_BOX(vbox), label, FALSE, TRUE, 5 );
+ gtk_box_pack_start ( GTK_BOX(vbox), label, FALSE, TRUE, padding );
}
return vbox;
}
}
/**
+ * a_dialog_get_positive_number:
+ *
* Dialog to return a positive number via a spinbox within the supplied limits
- * A return value of zero indicates the dialog was cancelled
+ *
+ * Returns: A value of zero indicates the dialog was cancelled
*/
guint a_dialog_get_positive_number ( GtkWindow *parent, gchar *title_text, gchar *label_text, guint default_num, guint min, guint max, guint step )
{
const gchar *program_name = PACKAGE_NAME;
const gchar *version = VIKING_VERSION;
const gchar *website = VIKING_URL;
- const gchar *copyright = "2003-2008, Evan Battaglia\n2008-2010, Viking's contributors";
+ const gchar *copyright = "2003-2008, Evan Battaglia\n2008-2013, 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 "
"along with this program; if not, write to the Free Software "
"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA");
+ // Would be nice to use gtk_about_dialog_add_credit_section (), but that requires gtk 3.4
+ // For now shove it in the 'artists' section so at least the information is easily visible
+ // Something more advanced might have proper version information too...
+ const gchar *libs[] = {
+ "Compiled in libraries:",
+ // Default libs
+ "libglib-2.0",
+ "libgthread-2.0",
+ "libgtk+-2.0",
+ "libgio-2.0",
+ // Potentially optional libs (but probably couldn't build without them)
+#ifdef HAVE_LIBM
+ "libm",
+#endif
+#ifdef HAVE_LIBZ
+ "libz",
+#endif
+#ifdef HAVE_LIBCURL
+ "libcurl",
+#endif
+ // Actually optional libs
+#ifdef HAVE_LIBGPS
+ "libgps",
+#endif
+#ifdef HAVE_LIBEXIF
+ "libexif",
+#endif
+#ifdef HAVE_LIBX11
+ "libX11",
+#endif
+#ifdef HAVE_LIBMAGIC
+ "libmagic",
+#endif
+#ifdef HAVE_LIBBZ2
+ "libbz2",
+#endif
+#ifdef HAVE_LIBSQLITE3
+ "libsqlite3",
+#endif
+ NULL
+ };
// Newer versions of GTK 'just work', calling gtk_show_uri() on the URL or email and opens up the appropriate program
// This is the old method:
#if (GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION < 24)
gtk_about_dialog_set_url_hook (about_url_hook, NULL, NULL);
gtk_about_dialog_set_email_hook (about_email_hook, NULL, NULL);
#endif
+
gtk_show_about_dialog (parent,
/* TODO do not set program-name and correctly set info for g_get_application_name */
"program-name", program_name,
"authors", AUTHORS,
"documenters", DOCUMENTERS,
"translator-credits", _("Translation is coordinated on http://launchpad.net/viking"),
+ "artists", libs,
NULL);
}
_("The map data is licensed: %s."),
license);
gtk_message_dialog_format_secondary_markup (GTK_MESSAGE_DIALOG (dialog),
- _("The data provided by '<b>%s</b>' are licensed under the following license: <b>%s</b>.\n"
- "Please, read the license before continuing."),
+ _("The data provided by '<b>%s</b>' are licensed under the following license: <b>%s</b>."),
map, license);
#define RESPONSE_OPEN_LICENSE 600
if (url != NULL) {
projects / andy / viking.git / blobdiff