X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/a482007a7fe1b27f6377306ef4fc460a500413cb..4f14a010d0a7d09721c32f0d35ffbeae05ea994c:/src/dialog.c
diff --git a/src/dialog.c b/src/dialog.c
index 7ef466d6..64135559 100644
--- a/src/dialog.c
+++ b/src/dialog.c
@@ -30,6 +30,7 @@
#include "garminsymbols.h"
#include "degrees_converters.h"
#include "authors.h"
+#include "documenters.h"
#include "vikgoto.h"
#include "util.h"
@@ -82,6 +83,8 @@ gboolean a_dialog_goto_latlon ( GtkWindow *parent, struct LatLon *ll, const stru
gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), lonlabel, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), lon, FALSE, FALSE, 0);
+ gtk_dialog_set_default_response ( GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT );
+
if ( gtk_dialog_run ( GTK_DIALOG(dialog) ) == GTK_RESPONSE_ACCEPT )
{
ll->lat = convert_dms_to_dec ( gtk_entry_get_text ( GTK_ENTRY(lat) ) );
@@ -147,6 +150,8 @@ gboolean a_dialog_goto_utm ( GtkWindow *parent, struct UTM *utm, const struct UT
gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), eas, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), zonehbox, FALSE, FALSE, 0);
+ gtk_dialog_set_default_response ( GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT );
+
if ( gtk_dialog_run ( GTK_DIALOG(dialog) ) == GTK_RESPONSE_ACCEPT )
{
const gchar *letter;
@@ -183,8 +188,13 @@ static void symbol_entry_changed_cb(GtkWidget *combo, GtkListStore *store)
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
+ When an existing waypoint the default name is shown but is not allowed to be changed and NULL is returned
+ */
/* todo: less on this side, like add track */
-gboolean a_dialog_new_waypoint ( GtkWindow *parent, gchar **dest, VikWaypoint *wp, GHashTable *waypoints, VikCoordMode coord_mode )
+gchar *a_dialog_waypoint ( GtkWindow *parent, gchar *default_name, VikWaypoint *wp, GHashTable *waypoints, VikCoordMode coord_mode, gboolean is_new, gboolean *updated )
{
GtkWidget *dialog = gtk_dialog_new_with_buttons (_("Waypoint Properties"),
parent,
@@ -199,9 +209,6 @@ gboolean a_dialog_new_waypoint ( GtkWindow *parent, gchar **dest, VikWaypoint *w
*commententry, *imagelabel, *imageentry, *symbollabel, *symbolentry;
GtkListStore *store;
-
-
-
gchar *lat, *lon, *alt;
vik_coord_to_latlon ( &(wp->coord), &ll );
@@ -221,19 +228,25 @@ gboolean a_dialog_new_waypoint ( GtkWindow *parent, gchar **dest, VikWaypoint *w
g_critical("Houston, we've had a problem. height=%d", height_units);
}
- if ( dest != NULL )
+ *updated = FALSE;
+
+ namelabel = gtk_label_new (_("Name:"));
+ gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), namelabel, FALSE, FALSE, 0);
+ if ( is_new )
{
- namelabel = gtk_label_new (_("Name:"));
+ // New waypoint, so name is still changeable
nameentry = gtk_entry_new ();
- if ( *dest ) {
- gtk_entry_set_text( GTK_ENTRY(nameentry), *dest );
- g_free ( *dest );
- *dest = NULL;
- }
+ 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(dialog)->vbox), namelabel, FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), nameentry, FALSE, FALSE, 0);
}
+ else {
+ // Existing waypoint - so can not change the name this way - but at least can see it
+ if ( default_name )
+ nameentry = gtk_label_new ( default_name );
+ }
+ if ( nameentry )
+ gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), nameentry, FALSE, FALSE, 0);
latlabel = gtk_label_new (_("Latitude:"));
latentry = gtk_entry_new ();
@@ -282,7 +295,7 @@ gboolean a_dialog_new_waypoint ( GtkWindow *parent, gchar **dest, VikWaypoint *w
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 ( dest == NULL && wp->symbol ) {
+ 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)) {
@@ -294,14 +307,18 @@ gboolean a_dialog_new_waypoint ( GtkWindow *parent, gchar **dest, VikWaypoint *w
g_free(sym);
}
}
- gtk_combo_box_set_active_iter(GTK_COMBO_BOX(symbolentry), &iter);
+ // 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 ( dest == NULL && wp->comment )
+ if ( !is_new && wp->comment )
gtk_entry_set_text ( GTK_ENTRY(commententry), wp->comment );
- if ( dest == NULL && wp->image )
+ if ( !is_new && wp->image )
vik_file_entry_set_filename ( VIK_FILE_ENTRY(imageentry), wp->image );
@@ -318,24 +335,26 @@ gboolean a_dialog_new_waypoint ( GtkWindow *parent, gchar **dest, VikWaypoint *w
gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), symbollabel, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), GTK_WIDGET(symbolentry), FALSE, FALSE, 0);
+ gtk_dialog_set_default_response ( GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT );
+
gtk_widget_show_all ( GTK_DIALOG(dialog)->vbox );
while ( gtk_dialog_run ( GTK_DIALOG(dialog) ) == GTK_RESPONSE_ACCEPT )
{
- if ( dest )
+ if ( is_new )
{
- const gchar *constname = gtk_entry_get_text ( GTK_ENTRY(nameentry) );
- if ( strlen(constname) == 0 ) /* TODO: other checks (isalpha or whatever ) */
+ const gchar *entered_name = gtk_entry_get_text ( GTK_ENTRY(nameentry) );
+ if ( strlen(entered_name) == 0 ) /* TODO: other checks (isalpha or whatever ) */
a_dialog_info_msg ( parent, _("Please enter a name for the waypoint.") );
else {
- gchar *name = g_strdup ( constname );
- if ( g_hash_table_lookup ( waypoints, name ) && !a_dialog_overwrite ( parent, _("The waypoint \"%s\" exists, do you want to overwrite it?"), name ) )
- g_free ( name );
+ gchar *use_name = g_strdup ( entered_name );
+
+ if ( g_hash_table_lookup ( waypoints, use_name ) && !a_dialog_yes_or_no ( parent, _("The waypoint \"%s\" exists, do you want to overwrite it?"), use_name ) )
+ g_free ( use_name );
else
{
/* Do It */
- *dest = name;
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 );
@@ -370,7 +389,7 @@ gboolean a_dialog_new_waypoint ( GtkWindow *parent, gchar **dest, VikWaypoint *w
}
gtk_widget_destroy ( dialog );
- return TRUE;
+ return use_name;
}
} /* else (valid name) */
}
@@ -413,12 +432,13 @@ gboolean a_dialog_new_waypoint ( GtkWindow *parent, gchar **dest, VikWaypoint *w
}
gtk_widget_destroy ( dialog );
-
- return TRUE;
+
+ *updated = TRUE;
+ return NULL;
}
}
gtk_widget_destroy ( dialog );
- return FALSE;
+ return NULL;
}
static void get_selected_foreach_func(GtkTreeModel *model,
@@ -432,7 +452,7 @@ static void get_selected_foreach_func(GtkTreeModel *model,
*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 )
+GList *a_dialog_select_from_list ( GtkWindow *parent, GList *names, gboolean multiple_selection_allowed, const gchar *title, const gchar *msg )
{
GtkTreeIter iter;
GtkCellRenderer *renderer;
@@ -446,30 +466,48 @@ GList *a_dialog_select_from_list ( GtkWindow *parent, GHashTable *tracks, GList
GTK_STOCK_OK,
GTK_RESPONSE_ACCEPT,
NULL);
- GtkWidget *label = gtk_label_new ( msg );
+ /* When something is selected then OK */
+ gtk_dialog_set_default_response ( GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT );
+ GtkWidget *response_w = NULL;
+#if GTK_CHECK_VERSION (2, 20, 0)
+ /* Default to not apply - as initially nothing is selected! */
+ response_w = gtk_dialog_get_widget_for_response ( GTK_DIALOG(dialog), GTK_RESPONSE_REJECT );
+#endif
GtkListStore *store = gtk_list_store_new(1, G_TYPE_STRING);
- GList *track_runner = track_names;
- while (track_runner)
+ GtkWidget *scrolledwindow;
+
+ GList *runner = names;
+ while (runner)
{
gtk_list_store_append(store, &iter);
- gtk_list_store_set(store, &iter, 0, track_runner->data, -1);
- track_runner = g_list_next(track_runner);
+ gtk_list_store_set(store, &iter, 0, runner->data, -1);
+ runner = g_list_next(runner);
}
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);
+ // Use the column header to display the message text,
+ // this makes the overall widget allocation simple as treeview takes up all the space
+ gtk_tree_view_insert_column_with_attributes( GTK_TREE_VIEW(view), -1, msg, 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_view_set_headers_visible( GTK_TREE_VIEW(view), TRUE);
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);
- gtk_widget_show ( label );
- gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), view, FALSE, FALSE, 0);
- gtk_widget_show ( view );
+ scrolledwindow = gtk_scrolled_window_new ( NULL, NULL );
+ gtk_scrolled_window_set_policy ( GTK_SCROLLED_WINDOW(scrolledwindow), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC );
+ gtk_container_add ( GTK_CONTAINER(scrolledwindow), view );
+
+ gtk_box_pack_start ( GTK_BOX(GTK_DIALOG(dialog)->vbox), scrolledwindow, TRUE, TRUE, 0 );
+ // Ensure a reasonable number of items are shown, but let the width be automatically sized
+ gtk_widget_set_size_request ( dialog, -1, 400) ;
+
+ gtk_widget_show_all ( dialog );
+
+ if ( response_w )
+ gtk_widget_grab_focus ( response_w );
while ( gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT )
{
@@ -511,6 +549,8 @@ gchar *a_dialog_new_track ( GtkWindow *parent, GHashTable *tracks, gchar *defaul
gtk_widget_show ( label );
gtk_widget_show ( entry );
+ gtk_dialog_set_default_response ( GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT );
+
while ( gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT )
{
const gchar *constname = gtk_entry_get_text ( GTK_ENTRY(entry) );
@@ -519,7 +559,7 @@ gchar *a_dialog_new_track ( GtkWindow *parent, GHashTable *tracks, gchar *defaul
else {
gchar *name = g_strdup ( constname );
- if ( g_hash_table_lookup( tracks, name ) && !a_dialog_overwrite ( parent, _("The track \"%s\" exists, do you want to overwrite it?"), gtk_entry_get_text ( GTK_ENTRY(entry) ) ) )
+ if ( g_hash_table_lookup( tracks, name ) && !a_dialog_yes_or_no ( parent, _("The track \"%s\" exists, do you want to overwrite it?"), gtk_entry_get_text ( GTK_ENTRY(entry) ) ) )
{
g_free ( name );
}
@@ -550,7 +590,7 @@ GtkWidget *a_dialog_create_label_vbox ( gchar **texts, int label_count )
return vbox;
}
-gboolean a_dialog_overwrite ( GtkWindow *parent, const gchar *message, const gchar *extra )
+gboolean a_dialog_yes_or_no ( GtkWindow *parent, const gchar *message, const gchar *extra )
{
GtkWidget *dia;
dia = gtk_message_dialog_new ( parent,
@@ -621,6 +661,8 @@ gboolean a_dialog_custom_zoom ( GtkWindow *parent, gdouble *xmpp, gdouble *ympp
g_signal_connect ( G_OBJECT(xspin), "value-changed", G_CALLBACK(zoom_spin_changed), pass_along );
g_signal_connect ( G_OBJECT(yspin), "value-changed", G_CALLBACK(zoom_spin_changed), pass_along );
+ gtk_dialog_set_default_response ( GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT );
+
if ( gtk_dialog_run ( GTK_DIALOG(dialog) ) == GTK_RESPONSE_ACCEPT )
{
*xmpp = gtk_spin_button_get_value ( GTK_SPIN_BUTTON(xspin) );
@@ -675,6 +717,8 @@ gboolean a_dialog_time_threshold ( GtkWindow *parent, gchar *title_text, gchar *
g_signal_connect ( G_OBJECT(spin), "grab-focus", G_CALLBACK(split_spin_focused), pass_along );
+ gtk_dialog_set_default_response ( GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT );
+
if ( gtk_dialog_run ( GTK_DIALOG(dialog) ) == GTK_RESPONSE_ACCEPT )
{
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(t1))) {
@@ -693,6 +737,55 @@ gboolean a_dialog_time_threshold ( GtkWindow *parent, gchar *title_text, gchar *
return FALSE;
}
+/**
+ * Dialog to return a positive number via a spinbox within the supplied limits
+ * A return 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 )
+{
+ GtkWidget *dialog = gtk_dialog_new_with_buttons (title_text,
+ parent,
+ GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_STOCK_CANCEL,
+ GTK_RESPONSE_REJECT,
+ GTK_STOCK_OK,
+ GTK_RESPONSE_ACCEPT,
+ NULL);
+ gtk_dialog_set_default_response ( GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT );
+ GtkWidget *response_w = NULL;
+#if GTK_CHECK_VERSION (2, 20, 0)
+ response_w = gtk_dialog_get_widget_for_response ( GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT );
+#endif
+
+ GtkWidget *table, *spin, *label;
+ guint result = default_num;
+
+ table = gtk_table_new ( 2, 1, FALSE );
+ gtk_box_pack_start ( GTK_BOX(GTK_DIALOG(dialog)->vbox), table, TRUE, TRUE, 0 );
+
+ label = gtk_label_new (label_text);
+ spin = gtk_spin_button_new ( (GtkAdjustment *) gtk_adjustment_new ( default_num, min, max, step, 5, 0 ), 1, 0 );
+
+ gtk_table_attach_defaults ( GTK_TABLE(table), label, 0, 1, 0, 1 );
+ gtk_table_attach_defaults ( GTK_TABLE(table), spin, 0, 1, 1, 2 );
+
+ if ( response_w )
+ gtk_widget_grab_focus ( response_w );
+
+ gtk_widget_show_all ( table );
+
+ if ( gtk_dialog_run ( GTK_DIALOG(dialog) ) == GTK_RESPONSE_ACCEPT )
+ {
+ result = gtk_spin_button_get_value ( GTK_SPIN_BUTTON(spin) );
+ gtk_widget_destroy ( dialog );
+ return result;
+ }
+
+ // Dialog cancelled
+ gtk_widget_destroy ( dialog );
+ return 0;
+}
+
static void about_url_hook (GtkAboutDialog *about,
const gchar *link,
gpointer data)
@@ -741,6 +834,8 @@ void a_dialog_about ( GtkWindow *parent )
"wrap-license", TRUE,
/* logo automatically retrieved via gtk_window_get_default_icon_list */
"authors", AUTHORS,
+ "documenters", DOCUMENTERS,
+ "translator-credits", _("Translation is coordinated on http://launchpad.net/viking"),
NULL);
}
@@ -749,7 +844,11 @@ gboolean a_dialog_map_n_zoom(GtkWindow *parent, gchar *mapnames[], gint default_
gchar **s;
GtkWidget *dialog = gtk_dialog_new_with_buttons ( _("Download along track"), parent, 0, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, NULL );
-
+ gtk_dialog_set_default_response ( GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT );
+ GtkWidget *response_w = NULL;
+#if GTK_CHECK_VERSION (2, 20, 0)
+ response_w = gtk_dialog_get_widget_for_response ( GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT );
+#endif
GtkWidget *map_label = gtk_label_new(_("Map type:"));
GtkComboBox *map_combo = GTK_COMBO_BOX(gtk_combo_box_new_text());
for (s = mapnames; *s; s++)
@@ -769,6 +868,9 @@ gboolean a_dialog_map_n_zoom(GtkWindow *parent, gchar *mapnames[], gint default_
gtk_box_pack_start ( GTK_BOX(GTK_DIALOG(dialog)->vbox), GTK_WIDGET(box), FALSE, FALSE, 5 );
+ if ( response_w )
+ gtk_widget_grab_focus ( response_w );
+
gtk_widget_show_all ( dialog );
if ( gtk_dialog_run ( GTK_DIALOG(dialog) ) != GTK_RESPONSE_ACCEPT ) {
gtk_widget_destroy(dialog);
@@ -781,3 +883,33 @@ gboolean a_dialog_map_n_zoom(GtkWindow *parent, gchar *mapnames[], gint default_
gtk_widget_destroy(dialog);
return TRUE;
}
+
+/**
+ * Display a dialog presenting the license of a map.
+ * Allow to read the license by launching a web browser.
+ */
+void a_dialog_license ( GtkWindow *parent, const gchar *map, const gchar *license, const gchar *url)
+{
+ GtkWidget *dialog = gtk_message_dialog_new (parent,
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_INFO,
+ GTK_BUTTONS_OK,
+ _("The map data is licensed: %s."),
+ license);
+ gtk_message_dialog_format_secondary_markup (GTK_MESSAGE_DIALOG (dialog),
+ _("The data provided by '%s' are licensed under the following license: %s.\n"
+ "Please, read the license before continuing."),
+ map, license);
+#define RESPONSE_OPEN_LICENSE 600
+ if (url != NULL) {
+ gtk_dialog_add_button (GTK_DIALOG (dialog), _("Open license"), RESPONSE_OPEN_LICENSE);
+ }
+ gint response;
+ do {
+ response = gtk_dialog_run (GTK_DIALOG (dialog));
+ if (response == RESPONSE_OPEN_LICENSE) {
+ open_url (parent, url);
+ }
+ } while (response != GTK_RESPONSE_DELETE_EVENT && response != GTK_RESPONSE_OK);
+ gtk_widget_destroy (dialog);
+}