* 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 <glib/gi18n.h>
#include "uibuilder.h"
#include "vikradiogroup.h"
#include "vikfileentry.h"
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
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 )
{
{
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 ();
- 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 )
{
- 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;
+
case VIK_LAYER_WIDGET_FILELIST:
if ( param->type == VIK_LAYER_PARAM_STRING_LIST )
{
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:
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:
+ case VIK_LAYER_WIDGET_FOLDERENTRY:
rv.s = vik_file_entry_get_filename ( VIK_FILE_ENTRY(widget) );
break;
case VIK_LAYER_WIDGET_FILELIST:
}
-gint a_uibuilder_properties_factory ( GtkWindow *parent, VikLayerParam *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),
gpointer pass_along1, gpointer pass_along2,
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 );
gint resp;
}
-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);
- if ( a_uibuilder_properties_factory ( parent,
+ if ( a_uibuilder_properties_factory ( dialog_name,
+ parent,
params,
params_count,
groups,
projects / andy / viking.git / blobdiff