X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-dialog-action-compute.c;h=a97d19535d49d8aa4672377d944b775179d44e0f;hb=0bda70f475aad77db5636ae0bca170513353c988;hp=46944c3fd3da9c37f1045fb6e639b03d92124d42;hpb=e2da62d735c597afeef2e0e9b36e5a4a83d7da94;p=pspp diff --git a/src/ui/gui/psppire-dialog-action-compute.c b/src/ui/gui/psppire-dialog-action-compute.c index 46944c3fd3..a97d19535d 100644 --- a/src/ui/gui/psppire-dialog-action-compute.c +++ b/src/ui/gui/psppire-dialog-action-compute.c @@ -22,7 +22,7 @@ #include #include "psppire-var-view.h" - +#include "dict-display.h" #include "psppire-dialog.h" #include "psppire-keypad.h" #include "psppire-selector.h" @@ -365,10 +365,10 @@ static void insert_source_row_into_text_view (GtkTreeIter iter, GtkWidget *dest, GtkTreeModel *model, - gpointer data - ) + gpointer data) { GtkTreePath *path; + GtkTreeModel *m; PsppireDict *dict; gint *idx; struct variable *var; @@ -377,20 +377,8 @@ insert_source_row_into_text_view (GtkTreeIter iter, g_return_if_fail (GTK_IS_TEXT_VIEW (dest)); - if ( GTK_IS_TREE_MODEL_FILTER (model)) - { - dict = PSPPIRE_DICT (gtk_tree_model_filter_get_model - (GTK_TREE_MODEL_FILTER(model))); - - gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER - (model), - &dict_iter, &iter); - } - else - { - dict = PSPPIRE_DICT (model); - dict_iter = iter; - } + get_base_model (model, &iter, &m, &dict_iter); + dict = PSPPIRE_DICT (m); path = gtk_tree_model_get_path (GTK_TREE_MODEL (dict), &dict_iter); @@ -405,7 +393,6 @@ insert_source_row_into_text_view (GtkTreeIter iter, erase_selection (buffer); gtk_text_buffer_insert_at_cursor (buffer, var_get_name (var), -1); - } static void @@ -469,71 +456,76 @@ insert_function_into_syntax_area (GtkTreeIter iter, static void -psppire_dialog_action_compute_activate (GtkAction *a) +psppire_dialog_action_compute_activate (PsppireDialogAction *a) { PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); PsppireDialogActionCompute *act = PSPPIRE_DIALOG_ACTION_COMPUTE (a); - GtkBuilder *xml = builder_new ("compute.ui"); - pda->dialog = get_widget_assert (xml, "compute-variable-dialog"); - pda->source = get_widget_assert (xml, "compute-treeview1"); + GHashTable *thing = psppire_dialog_action_get_hash_table (pda); + GtkBuilder *xml = g_hash_table_lookup (thing, a); + if (!xml) + { + xml = builder_new ("compute.ui"); + g_hash_table_insert (thing, a, xml); - act->textview = get_widget_assert (xml, "compute-textview1"); - act->entry = - get_widget_assert (xml, "type-and-label-label-entry"); + pda->dialog = get_widget_assert (xml, "compute-variable-dialog"); + pda->source = get_widget_assert (xml, "compute-treeview1"); - act->width_entry = - get_widget_assert (xml, "type-and-label-width"); + act->textview = get_widget_assert (xml, "compute-textview1"); + act->entry = + get_widget_assert (xml, "type-and-label-label-entry"); - act->functions = get_widget_assert (xml, "compute-treeview2"); - act->keypad = get_widget_assert (xml, "psppire-keypad1"); - act->target = get_widget_assert (xml, "compute-entry1"); - act->var_selector = get_widget_assert (xml, "compute-selector1"); - act->func_selector = get_widget_assert (xml, "compute-selector2"); - act->type_and_label = get_widget_assert (xml, "compute-button1"); + act->width_entry = + get_widget_assert (xml, "type-and-label-width"); - act->subdialog = get_widget_assert (xml, "type-and-label-dialog"); + act->functions = get_widget_assert (xml, "compute-treeview2"); + act->keypad = get_widget_assert (xml, "psppire-keypad1"); + act->target = get_widget_assert (xml, "compute-entry1"); + act->var_selector = get_widget_assert (xml, "compute-selector1"); + act->func_selector = get_widget_assert (xml, "compute-selector2"); + act->type_and_label = get_widget_assert (xml, "compute-button1"); - act->numeric_target = get_widget_assert (xml, "radio-button-numeric"); - act->expression = get_widget_assert (xml, "radio-button-expression-label"); - act->user_label = get_widget_assert (xml, "radio-button-user-label"); - act->str_btn = get_widget_assert (xml, "radio-button-string"); + act->subdialog = get_widget_assert (xml, "type-and-label-dialog"); - g_signal_connect (act->expression, "toggled", - G_CALLBACK (on_expression_toggle), pda); + act->numeric_target = get_widget_assert (xml, "radio-button-numeric"); + act->expression = get_widget_assert (xml, "radio-button-expression-label"); + act->user_label = get_widget_assert (xml, "radio-button-user-label"); + act->str_btn = get_widget_assert (xml, "radio-button-string"); - g_signal_connect (act->str_btn, "toggled", - G_CALLBACK (on_type_toggled), pda); + g_signal_connect (act->expression, "toggled", + G_CALLBACK (on_expression_toggle), pda); + g_signal_connect (act->str_btn, "toggled", + G_CALLBACK (on_type_toggled), pda); - g_object_set (pda->source, - "selection-mode", GTK_SELECTION_SINGLE, - NULL); - psppire_selector_set_select_func (PSPPIRE_SELECTOR (act->var_selector), - insert_source_row_into_text_view, NULL); + g_object_set (pda->source, + "selection-mode", GTK_SELECTION_SINGLE, + NULL); + psppire_selector_set_select_func (PSPPIRE_SELECTOR (act->var_selector), + insert_source_row_into_text_view, NULL); - function_list_populate (GTK_TREE_VIEW (act->functions)); - psppire_selector_set_select_func (PSPPIRE_SELECTOR (act->func_selector), - insert_function_into_syntax_area, NULL); + function_list_populate (GTK_TREE_VIEW (act->functions)); - g_signal_connect (act->target, "changed", G_CALLBACK (on_target_change), act); + psppire_selector_set_select_func (PSPPIRE_SELECTOR (act->func_selector), + insert_function_into_syntax_area, NULL); - g_signal_connect (act->keypad, "insert-syntax", - G_CALLBACK (on_keypad_button), act); + g_signal_connect (act->target, "changed", G_CALLBACK (on_target_change), act); - g_signal_connect (act->keypad, "erase", - G_CALLBACK (erase), act); + g_signal_connect (act->keypad, "insert-syntax", + G_CALLBACK (on_keypad_button), act); - g_signal_connect (act->type_and_label, "clicked", - G_CALLBACK (run_type_label_dialog), pda); + g_signal_connect (act->keypad, "erase", + G_CALLBACK (erase), act); - psppire_dialog_action_set_valid_predicate (pda, dialog_state_valid); - psppire_dialog_action_set_refresh (pda, refresh); + g_signal_connect (act->type_and_label, "clicked", + G_CALLBACK (run_type_label_dialog), pda); - g_object_unref (xml); + psppire_dialog_action_set_valid_predicate (pda, dialog_state_valid); + psppire_dialog_action_set_refresh (pda, refresh); + } if (PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_compute_parent_class)->activate) PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_compute_parent_class)->activate (pda); @@ -542,9 +534,8 @@ psppire_dialog_action_compute_activate (GtkAction *a) static void psppire_dialog_action_compute_class_init (PsppireDialogActionComputeClass *class) { - GtkActionClass *action_class = GTK_ACTION_CLASS (class); + psppire_dialog_action_set_activation (class, psppire_dialog_action_compute_activate); - action_class->activate = psppire_dialog_action_compute_activate; PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax; }