#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;
case VIK_LAYER_WIDGET_COMBOBOX:
-#ifndef GTK_2_2
if ( param->type == VIK_LAYER_PARAM_UINT && param->widget_data )
{
+ /* Build a simple combobox */
gchar **pstr = param->widget_data;
- rv = gtk_combo_box_new_text ();
+ rv = vik_combo_box_text_new ();
while ( *pstr )
- gtk_combo_box_append_text ( GTK_COMBO_BOX ( rv ), *(pstr++) );
+ vik_combo_box_text_append ( rv, *(pstr++) );
if ( param->extra_widget_data ) /* map of alternate uint values for options */
{
+ /* Set the effective default value */
int i;
for ( i = 0; ((const char **)param->widget_data)[i]; i++ )
if ( ((guint *)param->extra_widget_data)[i] == data.u )
{
+ /* Match default value */
gtk_combo_box_set_active ( GTK_COMBO_BOX(rv), i );
break;
}
else
gtk_combo_box_set_active ( GTK_COMBO_BOX ( rv ), data.u );
}
- else if ( param->type == VIK_LAYER_PARAM_STRING && param->widget_data )
+ else if ( param->type == VIK_LAYER_PARAM_STRING && param->widget_data && !param->extra_widget_data )
{
+ /* Build a combobox with editable text */
gchar **pstr = param->widget_data;
- rv = GTK_WIDGET ( gtk_combo_box_entry_new_text () );
+#if GTK_CHECK_VERSION (2, 24, 0)
+ rv = gtk_combo_box_text_new_with_entry ();
+#else
+ rv = gtk_combo_box_entry_new_text ();
+#endif
if ( data.s )
- gtk_combo_box_append_text ( GTK_COMBO_BOX ( rv ), data.s );
+ vik_combo_box_text_append ( rv, data.s );
while ( *pstr )
- gtk_combo_box_append_text ( GTK_COMBO_BOX ( rv ), *(pstr++) );
+ vik_combo_box_text_append ( rv, *(pstr++) );
if ( data.s )
gtk_combo_box_set_active ( GTK_COMBO_BOX ( rv ), 0 );
}
+ else if ( param->type == VIK_LAYER_PARAM_STRING && param->widget_data && param->extra_widget_data)
+ {
+ /* Build a combobox with fixed selections without editable text */
+ gchar **pstr = param->widget_data;
+ rv = GTK_WIDGET ( vik_combo_box_text_new () );
+ while ( *pstr )
+ vik_combo_box_text_append ( rv, *(pstr++) );
+ if ( data.s )
+ {
+ /* Set the effective default value */
+ /* In case of value does not exist, set the first value */
+ gtk_combo_box_set_active ( GTK_COMBO_BOX ( rv ), 0 );
+ int i;
+ for ( i = 0; ((const char **)param->widget_data)[i]; i++ )
+ if ( strcmp(((const char **)param->extra_widget_data)[i], data.s) == 0 )
+ {
+ /* Match default value */
+ gtk_combo_box_set_active ( GTK_COMBO_BOX ( rv ), i );
+ break;
+ }
+ }
+ else
+ gtk_combo_box_set_active ( GTK_COMBO_BOX ( rv ), 0 );
+ }
break;
-#endif
case VIK_LAYER_WIDGET_RADIOGROUP:
/* widget_data and extra_widget_data are GList */
if ( param->type == VIK_LAYER_PARAM_UINT && param->widget_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:
if ( param->type == VIK_LAYER_PARAM_STRING )
{
rv = vik_file_entry_new (GTK_FILE_CHOOSER_ACTION_OPEN);
- vik_file_entry_set_filename ( VIK_FILE_ENTRY(rv), data.s );
+ if ( data.s )
+ 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 );
+ if ( data.s )
+ vik_file_entry_set_filename ( VIK_FILE_ENTRY(rv), data.s );
}
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;
}
rv.b = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
break;
case VIK_LAYER_WIDGET_COMBOBOX:
-#ifndef GTK_2_2
if ( param->type == VIK_LAYER_PARAM_UINT )
{
rv.i = gtk_combo_box_get_active ( GTK_COMBO_BOX(widget) );
}
if ( param->type == VIK_LAYER_PARAM_STRING)
{
- rv.s = gtk_combo_box_get_active_text ( GTK_COMBO_BOX(widget) );
+ if ( param->extra_widget_data )
+ {
+ /* Combobox displays labels and we want values from extra */
+ int pos = gtk_combo_box_get_active ( GTK_COMBO_BOX(widget) );
+ rv.s = ((const char **)param->extra_widget_data)[pos];
+ }
+ else
+ {
+ /* Return raw value */
+#if GTK_CHECK_VERSION (2, 24, 0)
+ rv.s = gtk_entry_get_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (widget))));
+#else
+ rv.s = gtk_combo_box_get_active_text ( GTK_COMBO_BOX(widget) );
+#endif
+ }
g_debug("%s: %s", __FUNCTION__, rv.s);
}
break;
-#endif
case VIK_LAYER_WIDGET_RADIOGROUP:
case VIK_LAYER_WIDGET_RADIOGROUP_STATIC:
rv.u = vik_radio_group_get_selected(VIK_RADIO_GROUP(widget));
return rv;
}
-
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),
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);
+ // Switch to vertical notebook mode when many groups
+ if ( groups_count > 4 )
+ gtk_notebook_set_tab_pos ( GTK_NOTEBOOK(notebook), GTK_POS_LEFT );
+ 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++ )
widgets[j] = a_uibuilder_new_widget ( &(params[i]), getparam ( pass_along_getparam, i, FALSE ) );
- 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), 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++;
}
}
gtk_widget_destroy ( dialog ); /* hide before redrawing. */
g_free ( widgets );
+ if ( tables )
+ g_free ( tables );
return must_redraw ? 2 : 3; /* user clicked OK */
}
}
g_list_free ( paramdatas[i].sl );
break;
+ default:
+ break;
}
}
}
projects / andy / viking.git / blobdiff