Fix a minor missing include

[andy/viking.git] / src / osm-traces.c

diff --git a/src/osm-traces.c b/src/osm-traces.c
index 237751ead5c8dc80b13abb041cda7b8b3aaecf79..343607e275ca6fa96634d1928af8fcb0c02ad0cd 100644 (file)
--- a/src/osm-traces.c
+++ b/src/osm-traces.c
@@ -61,6 +61,22 @@ static gchar *password = NULL;
  */
 static GMutex *login_mutex = NULL;
 
+/**
+ * Different type of trace visibility.
+ */
+typedef struct _OsmTraceVis_t {
+       const gchar *combostr;
+       const gchar *apistr;
+} OsmTraceVis_t;
+
+static const OsmTraceVis_t OsmTraceVis[] = {
+       { N_("Identifiable (public w/ timestamps)"),    "identifiable" },
+       { N_("Trackable (private w/ timestamps)"),      "trackable" },
+       { N_("Public"),                                 "public" },
+       { N_("Private"),                                "private" },
+       { NULL, NULL },
+};
+
 /**
  * Struct hosting needed info.
  */
@@ -68,7 +84,7 @@ typedef struct _OsmTracesInfo {
   gchar *name;
   gchar *description;
   gchar *tags;
-  gboolean public;
+  const OsmTraceVis_t *vistype;
   VikTrwLayer *vtl;
   gchar *track_name;
 } OsmTracesInfo;
@@ -152,7 +168,7 @@ void osm_traces_upload_file(const char *user,
                            const char *filename,
                            const char *description,
                            const char *tags,
-                           gboolean public)
+                           const OsmTraceVis_t *vistype)
 {
   CURL *curl;
   CURLcode res;
@@ -160,7 +176,6 @@ void osm_traces_upload_file(const char *user,
   struct curl_slist *headers = NULL;
   struct curl_httppost *post=NULL;
   struct curl_httppost *last=NULL;
-  gchar *public_string;
 
   char *base_url = "http://www.openstreetmap.org/api/0.6/gpx/create";
 
@@ -179,13 +194,9 @@ void osm_traces_upload_file(const char *user,
   curl_formadd(&post, &last,
                CURLFORM_COPYNAME, "tags",
                CURLFORM_COPYCONTENTS, tags, CURLFORM_END);
-  if (public)
-    public_string = "1";
-  else
-    public_string = "0";
   curl_formadd(&post, &last,
-               CURLFORM_COPYNAME, "public",
-               CURLFORM_COPYCONTENTS, public_string, CURLFORM_END);
+               CURLFORM_COPYNAME, "visibility",
+               CURLFORM_COPYCONTENTS, vistype->apistr, CURLFORM_END);
   curl_formadd(&post, &last,
                CURLFORM_COPYNAME, "file",
                CURLFORM_FILE, file,
@@ -279,7 +290,7 @@ static void osm_traces_upload_thread ( OsmTracesInfo *oti, gpointer threaddata )
 
   /* finally, upload it */
   osm_traces_upload_file(user, password, filename,
-                         oti->name, oti->description, oti->tags, oti->public);
+                         oti->name, oti->description, oti->tags, oti->vistype);
 
   /* Removing temporary file */
   ret = g_unlink(filename);
@@ -314,7 +325,8 @@ static void osm_traces_upload_viktrwlayer ( VikTrwLayer *vtl, const gchar *track
   GtkWidget *name_label, *name_entry;
   GtkWidget *description_label, *description_entry;
   GtkWidget *tags_label, *tags_entry;
-  GtkWidget *public;
+  GtkComboBox *visibility;
+  const OsmTraceVis_t *vis_t;
 
   user_label = gtk_label_new(_("Email:"));
   user_entry = gtk_entry_new();
@@ -326,8 +338,6 @@ static void osm_traces_upload_viktrwlayer ( VikTrwLayer *vtl, const gchar *track
     gtk_entry_set_text(GTK_ENTRY(user_entry), default_user);
   gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dia)->vbox), user_label, FALSE, FALSE, 0);
   gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dia)->vbox), user_entry, FALSE, FALSE, 0);
-  gtk_widget_show_all ( user_label );
-  gtk_widget_show_all ( user_entry );
   gtk_widget_set_tooltip_markup(GTK_WIDGET(user_entry),
                         _("The email used as login\n"
                         "<small>Enter the email you use to login into www.openstreetmap.org.</small>"));
@@ -342,8 +352,6 @@ static void osm_traces_upload_viktrwlayer ( VikTrwLayer *vtl, const gchar *track
   gtk_entry_set_visibility(GTK_ENTRY(password_entry), FALSE);
   gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dia)->vbox), password_label, FALSE, FALSE, 0);
   gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dia)->vbox), password_entry, FALSE, FALSE, 0);
-  gtk_widget_show_all ( password_label );
-  gtk_widget_show_all ( password_entry );
   gtk_widget_set_tooltip_markup(GTK_WIDGET(password_entry),
                         _("The password used to login\n"
                         "<small>Enter the password you use to login into www.openstreetmap.org.</small>"));
@@ -357,8 +365,6 @@ static void osm_traces_upload_viktrwlayer ( VikTrwLayer *vtl, const gchar *track
   gtk_entry_set_text(GTK_ENTRY(name_entry), name);
   gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dia)->vbox), name_label, FALSE, FALSE, 0);
   gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dia)->vbox), name_entry, FALSE, FALSE, 0);
-  gtk_widget_show_all ( name_label );
-  gtk_widget_show_all ( name_entry );
   gtk_widget_set_tooltip_markup(GTK_WIDGET(name_entry),
                         _("The name of the file on OSM\n"
                         "<small>This is the name of the file created on the server."
@@ -368,8 +374,6 @@ static void osm_traces_upload_viktrwlayer ( VikTrwLayer *vtl, const gchar *track
   description_entry = gtk_entry_new();
   gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dia)->vbox), description_label, FALSE, FALSE, 0);
   gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dia)->vbox), description_entry, FALSE, FALSE, 0);
-  gtk_widget_show_all ( description_label );
-  gtk_widget_show_all ( description_entry );
   gtk_widget_set_tooltip_text(GTK_WIDGET(description_entry),
                         _("The description of the trace"));
 
@@ -377,18 +381,18 @@ static void osm_traces_upload_viktrwlayer ( VikTrwLayer *vtl, const gchar *track
   tags_entry = gtk_entry_new();
   gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dia)->vbox), tags_label, FALSE, FALSE, 0);
   gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dia)->vbox), tags_entry, FALSE, FALSE, 0);
-  gtk_widget_show_all ( tags_label );
-  gtk_widget_show_all ( tags_entry );
   gtk_widget_set_tooltip_text(GTK_WIDGET(tags_entry),
                         _("The tags associated to the trace"));
 
-  public = gtk_check_button_new_with_label(_("Public"));
-  /* Set public by default */
-  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(public), TRUE);
-  gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dia)->vbox), public, FALSE, FALSE, 0);
-  gtk_widget_show_all ( public );
-  gtk_widget_set_tooltip_text(GTK_WIDGET(public),
-                        _("Indicates if the trace is public or not"));
+  visibility = GTK_COMBO_BOX(gtk_combo_box_new_text ());
+  for (vis_t = OsmTraceVis; vis_t->combostr != NULL; vis_t++)
+       gtk_combo_box_append_text(visibility, vis_t->combostr);
+  /* Set identifiable by default */
+  gtk_combo_box_set_active(visibility, 0);
+  gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dia)->vbox), GTK_WIDGET(visibility), FALSE, FALSE, 0);
+
+  gtk_widget_show_all ( dia );
+  gtk_widget_grab_focus ( description_entry );
 
   if ( gtk_dialog_run ( GTK_DIALOG(dia) ) == GTK_RESPONSE_ACCEPT )
   {
@@ -404,7 +408,7 @@ static void osm_traces_upload_viktrwlayer ( VikTrwLayer *vtl, const gchar *track
     info->description = g_strdup(gtk_entry_get_text(GTK_ENTRY(description_entry)));
     /* TODO Normalize tags: they will be used as URL part */
     info->tags        = g_strdup(gtk_entry_get_text(GTK_ENTRY(tags_entry)));
-    info->public      = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(public));
+    info->vistype     = &OsmTraceVis[gtk_combo_box_get_active(visibility)];
     info->vtl         = VIK_TRW_LAYER(g_object_ref(vtl));
     info->track_name  = (track_name == NULL) ? NULL : g_strdup(track_name);