Use less precise images when wanted image is not present

[andy/viking.git] / src / dialog.c

diff --git a/src/dialog.c b/src/dialog.c
index 89ccb196a401d6f0c2adbebea8bfe295e11a6ae0..a3c4bdba27a5b6ff8b053831a312a5c6891d795b 100644 (file)
--- a/src/dialog.c
+++ b/src/dialog.c
@@ -28,7 +28,12 @@
 #include "garminsymbols.h"
 #include "degrees_converters.h"
 #include "authors.h"
+#ifdef VIK_CONFIG_GOOGLE
 #include "googlesearch.h"
+#endif
+#ifdef VIK_CONFIG_GEONAMES
+#include "geonamessearch.h"
+#endif
 #include "util.h"
 
 #include <glib/gi18n.h>
@@ -239,12 +244,20 @@ gboolean a_dialog_new_waypoint ( GtkWindow *parent, gchar **dest, VikWaypoint *w
 
   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;
+#if defined(VIK_CONFIG_GOOGLE) && VIK_CONFIG_SEARCH==VIK_CONFIG_SEARCH_GOOGLE
+  //if (strcmp(VIK_CONFIG_SEARCH,"google"))
+    cmt =  a_googlesearch_get_search_string_for_this_place(VIK_WINDOW(parent));
+#endif
+#if defined(VIK_CONFIG_GEONAMES) && VIK_CONFIG_SEARCH==VIK_CONFIG_SEARCH_GEONAMES
+  //if (strcmp(VIK_CONFIG_SEARCH,"geonames"))
+    cmt =  a_geonamessearch_get_search_string_for_this_place(VIK_WINDOW(parent));
+#endif
   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;
@@ -386,13 +399,24 @@ gboolean a_dialog_new_waypoint ( GtkWindow *parent, gchar **dest, VikWaypoint *w
   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,
@@ -400,33 +424,24 @@ gchar *a_dialog_select_track ( GtkWindow *parent, GHashTable *tracks, gchar *ori
                                                   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);
@@ -436,16 +451,15 @@ gchar *a_dialog_select_track ( GtkWindow *parent, GHashTable *tracks, gchar *ori
 
   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;