Use elevation values in creating waypoints from Wikipedia.

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

diff --git a/src/uibuilder.c b/src/uibuilder.c
index 5333bb8ef93ec54c07b86a4ad3c471f9907cbfbc..9eec9b3106561c2a1d2fc339e1db20d23bd213c9 100644 (file)
--- a/src/uibuilder.c
+++ b/src/uibuilder.c
@@ -143,10 +143,8 @@ GtkWidget *a_uibuilder_new_widget ( VikLayerParam *param, VikLayerParamData data
         gtk_entry_set_visibility ( GTK_ENTRY(rv), FALSE );
         if (data.s)
           gtk_entry_set_text ( GTK_ENTRY(rv), data.s );
-#if GTK_CHECK_VERSION(2,12,0)
-       gtk_widget_set_tooltip_text ( GTK_WIDGET(rv),
-                                     _("Take care that this password will be stored clearly in a plain file.") );
-#endif
+        gtk_widget_set_tooltip_text ( GTK_WIDGET(rv),
+                                     _("Take care that this password will be stored clearly in a plain file.") );
       }
       break;
     case VIK_LAYER_WIDGET_FILEENTRY:
@@ -167,7 +165,7 @@ GtkWidget *a_uibuilder_new_widget ( VikLayerParam *param, VikLayerParamData data
     case VIK_LAYER_WIDGET_FILELIST:
       if ( param->type == VIK_LAYER_PARAM_STRING_LIST )
       {
-        rv = vik_file_list_new ( param->title );
+        rv = vik_file_list_new ( _(param->title) );
         vik_file_list_set_files ( VIK_FILE_LIST(rv), data.sl );
       }
       break;
@@ -182,6 +180,10 @@ GtkWidget *a_uibuilder_new_widget ( VikLayerParam *param, VikLayerParamData data
         gtk_range_set_value ( GTK_RANGE(rv), init_val );
       }
   }
+  if ( rv && !gtk_widget_get_tooltip_text ( rv ) ) {
+    if ( param->tooltip )
+      gtk_widget_set_tooltip_text ( rv, _(param->tooltip) );
+  }
   return rv;
 }
 
@@ -279,9 +281,13 @@ gint a_uibuilder_properties_factory ( const gchar *dialog_name, GtkWindow *paren
                                                      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
     gint resp;
 
-
     GtkWidget *table = NULL;
     GtkWidget **tables = NULL; /* for more than one group */
 
@@ -326,12 +332,15 @@ gint a_uibuilder_properties_factory ( const gchar *dialog_name, GtkWindow *paren
 
         g_assert ( widgets[j] != NULL );
 
-        gtk_table_attach ( GTK_TABLE(table), gtk_label_new(params[i].title), 0, 1, j, j+1, 0, 0, 0, 0 );
+        gtk_table_attach ( GTK_TABLE(table), gtk_label_new(_(params[i].title)), 0, 1, j, j+1, 0, 0, 0, 0 );
         gtk_table_attach ( GTK_TABLE(table), widgets[j], 1, 2, j, j+1, GTK_EXPAND | GTK_FILL, 0, 2, 2 );
         j++;
       }
     }
 
+    if ( response_w )
+      gtk_widget_grab_focus ( response_w );
+
     gtk_widget_show_all ( dialog );
 
     resp = gtk_dialog_run (GTK_DIALOG (dialog));
@@ -353,6 +362,8 @@ gint a_uibuilder_properties_factory ( const gchar *dialog_name, GtkWindow *paren
 
       gtk_widget_destroy ( dialog ); /* hide before redrawing. */
       g_free ( widgets );
+      if ( tables )
+        g_free ( tables );
 
       return must_redraw ? 2 : 3; /* user clicked OK */
     }