X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/c60f82df6d7202e2fc96628124cda3a2f0debbd7..e8bab170981ff0e1cd572107ca4de122d4aafe8c:/src/dialog.c diff --git a/src/dialog.c b/src/dialog.c index 79d0f38b..9bc2848f 100644 --- a/src/dialog.c +++ b/src/dialog.c @@ -26,21 +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 "util.h" -#include "geotag_exif.h" +#include "ui_util.h" #include #include #include #include -#include void a_dialog_msg ( GtkWindow *parent, gint type, const gchar *info, const gchar *extra ) { @@ -180,275 +175,6 @@ void a_dialog_response_accept ( GtkDialog *dialog ) gtk_dialog_response ( dialog, GTK_RESPONSE_ACCEPT ); } -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 *timevaluelabel = NULL; // No editing of time allowed ATM - 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) ); - } - } - - 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 ); - } - - 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))), 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 ); - - 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, @@ -577,14 +303,12 @@ gchar *a_dialog_new_track ( GtkWindow *parent, gchar *default_name, gboolean is_ return NULL; } -static guint today_year = 0; -static guint today_month = 0; -static guint today_day = 0; - static void today_clicked (GtkWidget *cal) { - gtk_calendar_select_month ( GTK_CALENDAR(cal), today_month, today_year ); - gtk_calendar_select_day ( GTK_CALENDAR(cal), today_day ); + 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 ); } /** @@ -611,15 +335,8 @@ gchar *a_dialog_get_date ( GtkWindow *parent, const gchar *title ) static guint month = 0; static guint day = 0; - if ( year == 0 ) { - // Store today's date so we can return to it on the button callback - gtk_calendar_get_date ( GTK_CALENDAR(cal), &year, &month, &day ); - today_year = year; - today_month = month; - today_day = day; - } - else { - // Otherwise restore the last selected date + 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 ); } @@ -874,6 +591,33 @@ static void about_email_hook (GtkAboutDialog *about, } #endif +/** + * Creates a dialog with list of text + * Mostly useful for longer messages that have several lines of information. + */ +void a_dialog_list ( GtkWindow *parent, const gchar *title, GArray *array, gint padding ) +{ + GtkWidget *dialog = gtk_dialog_new_with_buttons ( title, + parent, + GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_STOCK_CLOSE, + GTK_RESPONSE_CLOSE, + NULL); + + GtkBox *vbox = GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))); + GtkWidget *label; + + for ( int i = 0; i < array->len; i++ ) { + label = ui_label_new_selectable (NULL); + gtk_label_set_markup ( GTK_LABEL(label), g_array_index(array,gchar*,i) ); + gtk_box_pack_start ( GTK_BOX(vbox), label, FALSE, TRUE, padding ); + } + + gtk_widget_show_all ( dialog ); + gtk_dialog_run ( GTK_DIALOG(dialog) ); + gtk_widget_destroy ( dialog ); +} + void a_dialog_about ( GtkWindow *parent ) { const gchar *program_name = PACKAGE_NAME; @@ -919,6 +663,9 @@ void a_dialog_about ( GtkWindow *parent ) #ifdef HAVE_LIBGPS "libgps", #endif +#ifdef HAVE_LIBGEXIV2 + "libgexiv2", +#endif #ifdef HAVE_LIBEXIF "libexif", #endif @@ -933,6 +680,9 @@ void a_dialog_about ( GtkWindow *parent ) #endif #ifdef HAVE_LIBSQLITE3 "libsqlite3", +#endif +#ifdef HAVE_LIBMAPNIK + "libmapnik", #endif NULL };