gtk_object_sink has been deprecated since gtk version 2.10, use g_object_ref_sink...

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

diff --git a/src/uibuilder.c b/src/uibuilder.c
index b2a77262762ce34c5bfa864c13ae9657b7585f55..ff7557378a6e4a7cb1608afd1783a3b5fafa1868 100644 (file)
--- a/src/uibuilder.c
+++ b/src/uibuilder.c
@@ -18,7 +18,12 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+

 #include <gtk/gtk.h>
 #include <gtk/gtk.h>

+#include <glib/gi18n.h>

 #include "uibuilder.h"
 #include "vikradiogroup.h"
 #include "vikfileentry.h"
 #include "uibuilder.h"
 #include "vikradiogroup.h"
 #include "vikfileentry.h"


@@ -60,7 +65,19 @@ GtkWidget *a_uibuilder_new_widget ( VikLayerParam *param, VikLayerParamData data
               break;
             }
         }
               break;
             }
         }

-        gtk_combo_box_set_active ( GTK_COMBO_BOX ( rv ), data.u );
+        else
+          gtk_combo_box_set_active ( GTK_COMBO_BOX ( rv ), data.u );
+      }
+      else if ( param->type == VIK_LAYER_PARAM_STRING && param->widget_data )
+      {
+        gchar **pstr = param->widget_data;
+        rv = GTK_WIDGET ( gtk_combo_box_entry_new_text () );
+        if ( data.s )
+          gtk_combo_box_append_text ( GTK_COMBO_BOX ( rv ), data.s );
+        while ( *pstr )
+          gtk_combo_box_append_text ( GTK_COMBO_BOX ( rv ), *(pstr++) );
+        if ( data.s )
+          gtk_combo_box_set_active ( GTK_COMBO_BOX ( rv ), 0 );

       }
       break;
 #endif
       }
       break;
 #endif


@@ -72,7 +89,7 @@ GtkWidget *a_uibuilder_new_widget ( VikLayerParam *param, VikLayerParamData data
         if ( param->extra_widget_data ) /* map of alternate uint values for options */
         {
           int i;
         if ( param->extra_widget_data ) /* map of alternate uint values for options */
         {
           int i;

-         int nb_elem = g_list_length(param->widget_data);
+          int nb_elem = g_list_length(param->widget_data);

           for ( i = 0; i < nb_elem; i++ )
             if ( GPOINTER_TO_UINT ( g_list_nth_data(param->extra_widget_data, i) ) == data.u )
             {
           for ( i = 0; i < nb_elem; i++ )
             if ( GPOINTER_TO_UINT ( g_list_nth_data(param->extra_widget_data, i) ) == data.u )
             {


@@ -108,27 +125,49 @@ GtkWidget *a_uibuilder_new_widget ( VikLayerParam *param, VikLayerParamData data
       {
         gdouble init_val = (param->type == VIK_LAYER_PARAM_DOUBLE) ? data.d : (param->type == VIK_LAYER_PARAM_UINT ? data.u : data.i);
         VikLayerParamScale *scale = (VikLayerParamScale *) param->widget_data;
       {
         gdouble init_val = (param->type == VIK_LAYER_PARAM_DOUBLE) ? data.d : (param->type == VIK_LAYER_PARAM_UINT ? data.u : data.i);
         VikLayerParamScale *scale = (VikLayerParamScale *) param->widget_data;

-        rv = gtk_spin_button_new ( GTK_ADJUSTMENT(gtk_adjustment_new( init_val, scale->min, scale->max, scale->step, scale->step, scale->step )), scale->step, scale->digits );
+        rv = gtk_spin_button_new ( GTK_ADJUSTMENT(gtk_adjustment_new( init_val, scale->min, scale->max, scale->step, scale->step, 0 )), scale->step, scale->digits );

       }
     break;
     case VIK_LAYER_WIDGET_ENTRY:
       if ( param->type == VIK_LAYER_PARAM_STRING )
       {
         rv = gtk_entry_new ();
       }
     break;
     case VIK_LAYER_WIDGET_ENTRY:
       if ( param->type == VIK_LAYER_PARAM_STRING )
       {
         rv = gtk_entry_new ();

-        gtk_entry_set_text ( GTK_ENTRY(rv), data.s );
+        if (data.s)
+          gtk_entry_set_text ( GTK_ENTRY(rv), data.s );
+      }
+      break;
+    case VIK_LAYER_WIDGET_PASSWORD:
+      if ( param->type == VIK_LAYER_PARAM_STRING )
+      {
+        rv = gtk_entry_new ();
+        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

       }
       break;
     case VIK_LAYER_WIDGET_FILEENTRY:
       if ( param->type == VIK_LAYER_PARAM_STRING )
       {
       }
       break;
     case VIK_LAYER_WIDGET_FILEENTRY:
       if ( param->type == VIK_LAYER_PARAM_STRING )
       {

-        rv = vik_file_entry_new ();
+        rv = vik_file_entry_new (GTK_FILE_CHOOSER_ACTION_OPEN);
+        vik_file_entry_set_filename ( VIK_FILE_ENTRY(rv), data.s );
+      }
+      break;
+    case VIK_LAYER_WIDGET_FOLDERENTRY:
+      if ( param->type == VIK_LAYER_PARAM_STRING )
+      {
+        rv = vik_file_entry_new (GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);

         vik_file_entry_set_filename ( VIK_FILE_ENTRY(rv), data.s );
       }
       break;
         vik_file_entry_set_filename ( VIK_FILE_ENTRY(rv), data.s );
       }
       break;

+

     case VIK_LAYER_WIDGET_FILELIST:
       if ( param->type == VIK_LAYER_PARAM_STRING_LIST )
       {
     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;
         vik_file_list_set_files ( VIK_FILE_LIST(rv), data.sl );
       }
       break;


@@ -159,11 +198,19 @@ VikLayerParamData a_uibuilder_widget_get_value ( GtkWidget *widget, VikLayerPara
       break;
     case VIK_LAYER_WIDGET_COMBOBOX:
 #ifndef GTK_2_2
       break;
     case VIK_LAYER_WIDGET_COMBOBOX:
 #ifndef GTK_2_2

-      rv.i = gtk_combo_box_get_active ( GTK_COMBO_BOX(widget) );
-      if ( rv.i == -1 ) rv.i = 0;
-      rv.u = rv.i;
-      if ( param->extra_widget_data )
-        rv.u = ((guint *)param->extra_widget_data)[rv.u];
+      if ( param->type == VIK_LAYER_PARAM_UINT )
+      {
+        rv.i = gtk_combo_box_get_active ( GTK_COMBO_BOX(widget) );
+        if ( rv.i == -1 ) rv.i = 0;
+        rv.u = rv.i;
+        if ( param->extra_widget_data )
+          rv.u = ((guint *)param->extra_widget_data)[rv.u];
+      }
+      if ( param->type == VIK_LAYER_PARAM_STRING)
+      {
+        rv.s = gtk_combo_box_get_active_text ( GTK_COMBO_BOX(widget) );
+       g_debug("%s: %s", __FUNCTION__, rv.s);
+      }

       break;
 #endif
     case VIK_LAYER_WIDGET_RADIOGROUP:
       break;
 #endif
     case VIK_LAYER_WIDGET_RADIOGROUP:


@@ -181,9 +228,11 @@ VikLayerParamData a_uibuilder_widget_get_value ( GtkWidget *widget, VikLayerPara
         rv.d = gtk_spin_button_get_value ( GTK_SPIN_BUTTON(widget) );
       break;
     case VIK_LAYER_WIDGET_ENTRY:
         rv.d = gtk_spin_button_get_value ( GTK_SPIN_BUTTON(widget) );
       break;
     case VIK_LAYER_WIDGET_ENTRY:

+    case VIK_LAYER_WIDGET_PASSWORD:

       rv.s = gtk_entry_get_text ( GTK_ENTRY(widget) );
       break;
     case VIK_LAYER_WIDGET_FILEENTRY:
       rv.s = gtk_entry_get_text ( GTK_ENTRY(widget) );
       break;
     case VIK_LAYER_WIDGET_FILEENTRY:

+    case VIK_LAYER_WIDGET_FOLDERENTRY:

       rv.s = vik_file_entry_get_filename ( VIK_FILE_ENTRY(widget) );
       break;
     case VIK_LAYER_WIDGET_FILELIST:
       rv.s = vik_file_entry_get_filename ( VIK_FILE_ENTRY(widget) );
       break;
     case VIK_LAYER_WIDGET_FILELIST:


@@ -202,13 +251,13 @@ VikLayerParamData a_uibuilder_widget_get_value ( GtkWidget *widget, VikLayerPara
 }
 
 
 }
 
 

-gint a_uibuilder_properties_factory ( GtkWindow *parent, VikLayerParam *params,
-                       guint16 params_count, gchar **groups, guint8 groups_count,
-                       gboolean (*setparam) (gpointer,guint16,VikLayerParamData,gpointer),
-                       gpointer pass_along1, gpointer pass_along2,
-                       VikLayerParamData (*getparam) (gpointer,guint16),
-                       gpointer pass_along_getparam )
-                               /* pass_along1 and pass_along2 are for set_param first and last params */
+gint a_uibuilder_properties_factory ( const gchar *dialog_name, GtkWindow *parent, VikLayerParam *params,
+                                     guint16 params_count, gchar **groups, guint8 groups_count,
+                                     gboolean (*setparam) (gpointer,guint16,VikLayerParamData,gpointer,gboolean),
+                                     gpointer pass_along1, gpointer pass_along2,
+                                     VikLayerParamData (*getparam) (gpointer,guint16,gboolean),
+                                     gpointer pass_along_getparam )
+                                     /* pass_along1 and pass_along2 are for set_param first and last params */

 {
   guint16 i, j, widget_count = 0;
   gboolean must_redraw = FALSE;
 {
   guint16 i, j, widget_count = 0;
   gboolean must_redraw = FALSE;


@@ -225,14 +274,18 @@ gint a_uibuilder_properties_factory ( GtkWindow *parent, VikLayerParam *params,
   else
   {
     /* create widgets and titles; place in table */
   else
   {
     /* create widgets and titles; place in table */

-    GtkWidget *dialog = gtk_dialog_new_with_buttons ( "Layer Properties",
-                            parent,
-                            GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
-                            GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
-                            GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL );
+    GtkWidget *dialog = gtk_dialog_new_with_buttons ( dialog_name,
+                                                     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

     gint resp;
 
     gint resp;
 

-

     GtkWidget *table = NULL;
     GtkWidget **tables = NULL; /* for more than one group */
 
     GtkWidget *table = NULL;
     GtkWidget **tables = NULL; /* for more than one group */
 


@@ -273,16 +326,19 @@ gint a_uibuilder_properties_factory ( GtkWindow *parent, VikLayerParam *params,
         if ( tables )
           table = tables[MAX(0, params[i].group)]; /* round up NOT_IN_GROUP, that's not reasonable here */
 
         if ( tables )
           table = tables[MAX(0, params[i].group)]; /* round up NOT_IN_GROUP, that's not reasonable here */
 

-        widgets[j] = a_uibuilder_new_widget ( &(params[i]), getparam ( pass_along_getparam, i ) );
+        widgets[j] = a_uibuilder_new_widget ( &(params[i]), getparam ( pass_along_getparam, i, FALSE ) );

 
         g_assert ( widgets[j] != NULL );
 
 
         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++;
       }
     }
 
         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));
     gtk_widget_show_all ( dialog );
 
     resp = gtk_dialog_run (GTK_DIALOG (dialog));


@@ -292,8 +348,11 @@ gint a_uibuilder_properties_factory ( GtkWindow *parent, VikLayerParam *params,
       {
         if ( params[i].group != VIK_LAYER_NOT_IN_PROPERTIES )
         {
       {
         if ( params[i].group != VIK_LAYER_NOT_IN_PROPERTIES )
         {

-          if ( setparam ( pass_along1, i,
-              a_uibuilder_widget_get_value ( widgets[j], &(params[i]) ), pass_along2 ) )
+          if ( setparam ( pass_along1,
+                         i,
+                         a_uibuilder_widget_get_value ( widgets[j], &(params[i]) ),
+                         pass_along2,
+                         FALSE ) )

             must_redraw = TRUE;
           j++;
         }
             must_redraw = TRUE;
           j++;
         }


@@ -332,12 +391,13 @@ static VikLayerParamData uibuilder_run_getparam ( VikLayerParamData *params_defa
 }
 
 
 }
 
 

-VikLayerParamData *a_uibuilder_run_dialog ( GtkWindow *parent, VikLayerParam *params,
+VikLayerParamData *a_uibuilder_run_dialog (  const gchar *dialog_name, GtkWindow *parent, VikLayerParam *params,

                         guint16 params_count, gchar **groups, guint8 groups_count,
                         VikLayerParamData *params_defaults )
 {
     VikLayerParamData *paramdatas = g_new(VikLayerParamData, params_count);
                         guint16 params_count, gchar **groups, guint8 groups_count,
                         VikLayerParamData *params_defaults )
 {
     VikLayerParamData *paramdatas = g_new(VikLayerParamData, params_count);

-    if ( a_uibuilder_properties_factory ( parent, 
+    if ( a_uibuilder_properties_factory ( dialog_name,
+                                         parent,

                                          params, 
                                          params_count, 
                                          groups, 
                                          params, 
                                          params_count, 
                                          groups,