#include "vikfileentry.h"
#include "vikfilelist.h"
+VikLayerParamData vik_lpd_true_default ( void ) { return VIK_LPD_BOOLEAN ( TRUE ); }
+VikLayerParamData vik_lpd_false_default ( void ) { return VIK_LPD_BOOLEAN ( FALSE ); }
+
GtkWidget *a_uibuilder_new_widget ( VikLayerParam *param, VikLayerParamData data )
{
GtkWidget *rv = NULL;
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:
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:
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;
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;
}
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:
return rv;
}
-
-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;
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;
-
GtkWidget *table = NULL;
GtkWidget **tables = NULL; /* for more than one group */
guint8 current_group;
guint16 tab_widget_count;
notebook = gtk_notebook_new ();
- gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), notebook, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), notebook, FALSE, FALSE, 0);
tables = g_malloc ( sizeof(GtkWidget *) * groups_count );
for ( current_group = 0; current_group < groups_count; current_group++ )
{
else
{
table = gtk_table_new( widget_count, 1, FALSE );
- gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), table, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), table, FALSE, FALSE, 0);
}
for ( i = 0, j = 0; i < params_count; i++ )
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 ) );
-
- g_assert ( widgets[j] != NULL );
+ widgets[j] = a_uibuilder_new_widget ( &(params[i]), getparam ( pass_along_getparam, i, FALSE ) );
- 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 );
+ if ( widgets[j] ) {
+ 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));
{
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++;
}
gtk_widget_destroy ( dialog ); /* hide before redrawing. */
g_free ( widgets );
+ if ( tables )
+ g_free ( tables );
return must_redraw ? 2 : 3; /* user clicked OK */
}
}
-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,
}
g_list_free ( paramdatas[i].sl );
break;
+ default:
+ break;
}
}
}
projects / andy / viking.git / blobdiff