X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fvariable-info-dialog.c;h=612643b4351b4447f72b3b35449a1e63793dafd6;hb=40233794e1b6c07262aaa30a5b6e977caf359ca1;hp=04e38f273602a7ab2282c664e303acd63f104bde;hpb=43b1296aafe7582e7dbe6c2b6a8b478d7d9b0fcf;p=pspp-builds.git diff --git a/src/ui/gui/variable-info-dialog.c b/src/ui/gui/variable-info-dialog.c index 04e38f27..612643b4 100644 --- a/src/ui/gui/variable-info-dialog.c +++ b/src/ui/gui/variable-info-dialog.c @@ -16,21 +16,19 @@ #include #include -#include -#include -#include "dict-display.h" #include "var-display.h" #include +#include #include -#include "data-editor.h" +#include "psppire-data-window.h" #include "psppire-dialog.h" #include "psppire-var-store.h" +#include "psppire-dictview.h" #include "helper.h" -#include #include -#include "syntax-editor.h" +#include "helper.h" #include @@ -38,44 +36,19 @@ #define N_(msgid) msgid -static struct variable * -get_selected_variable (GtkTreeView *treeview) -{ - struct variable *var; - GtkTreeModel *top_model; - GtkTreeIter top_iter; - - GtkTreeModel *model; - GtkTreeIter iter; - - GtkTreeSelection *selection = gtk_tree_view_get_selection (treeview); - - if (! gtk_tree_selection_get_selected (selection, - &top_model, &top_iter)) - { - return NULL; - } - - get_base_model (top_model, &top_iter, &model, &iter); - - g_assert (PSPPIRE_IS_DICT (model)); - - gtk_tree_model_get (model, - &iter, DICT_TVM_COL_VAR, &var, -1); - - return var; -} - - static void -populate_text (GtkTreeView *treeview, gpointer data) +populate_text (PsppireDictView *treeview, gpointer data) { gchar *text = 0; GString *gstring; GtkTextBuffer *textbuffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW(data)); - const struct variable *var = get_selected_variable (treeview); + const struct variable *var = + psppire_dict_view_get_selected_variable (treeview); + + if ( var == NULL) + return; gstring = g_string_sized_new (200); text = name_to_string (var, NULL); @@ -142,35 +115,47 @@ populate_text (GtkTreeView *treeview, gpointer data) g_string_free (gstring, TRUE); } -static gchar * generate_syntax (GtkTreeView *treeview); +static gboolean +treeview_item_selected (gpointer data) +{ + GtkTreeView *tv = GTK_TREE_VIEW (data); + GtkTreeModel *model = gtk_tree_view_get_model (tv); + + gint n_rows = gtk_tree_model_iter_n_children (model, NULL); + + if ( n_rows == 0 ) + return FALSE; + + return TRUE; +} + + +static gchar * generate_syntax (PsppireDictView *treeview); void variable_info_dialog (GObject *o, gpointer data) { - struct data_editor *de = data; + PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data); gint response ; - GladeXML *xml = XML_NEW ("psppire.glade"); + GtkBuilder *xml = builder_new ("variable-info-dialog.ui"); GtkWidget *dialog = get_widget_assert (xml, "variable-info-dialog"); GtkWidget *treeview = get_widget_assert (xml, "treeview2"); GtkWidget *textview = get_widget_assert (xml, "textview1"); - GtkSheet *var_sheet = - GTK_SHEET (get_widget_assert (de->xml, "variable_sheet")); - - - PsppireVarStore *vs = PSPPIRE_VAR_STORE (gtk_sheet_get_model (var_sheet)); + PsppireVarStore *vs = NULL; - gtk_window_set_transient_for (GTK_WINDOW (dialog), de->parent.window); + g_object_get (de->data_editor, "var-store", &vs, NULL); - attach_dictionary_to_treeview (GTK_TREE_VIEW (treeview), - vs->dict, - GTK_SELECTION_SINGLE, - NULL ); + gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (de)); + g_object_set (treeview, + "dictionary", vs->dict, + "selection-mode", GTK_SELECTION_SINGLE, + NULL); g_signal_connect (treeview, "cursor-changed", G_CALLBACK (populate_text), textview); @@ -178,48 +163,31 @@ variable_info_dialog (GObject *o, gpointer data) gtk_text_view_set_indent (GTK_TEXT_VIEW (textview), -5); + psppire_dialog_set_valid_predicate (PSPPIRE_DIALOG (dialog), + treeview_item_selected, treeview); + response = psppire_dialog_run (PSPPIRE_DIALOG (dialog)); switch (response) { case PSPPIRE_RESPONSE_GOTO: { - gint row, col; - GtkNotebook *notebook = GTK_NOTEBOOK - (get_widget_assert (de->xml,"notebook")); - const struct variable *var = - get_selected_variable (GTK_TREE_VIEW (treeview)); - - - if (PAGE_VAR_SHEET == gtk_notebook_get_current_page (notebook)) - { - GtkSheet *var_sheet = - GTK_SHEET (get_widget_assert (de->xml, "variable_sheet")); - - gtk_sheet_get_active_cell (var_sheet, &row, &col); - row = var_get_dict_index (var); - gtk_sheet_set_active_cell (var_sheet, row, col); - } - else - { - GtkSheet *data_sheet = - GTK_SHEET (get_widget_assert (de->xml, "data_sheet")); - - gtk_sheet_get_active_cell (data_sheet, &row, &col); - col = var_get_dict_index (var); - gtk_sheet_set_active_cell (data_sheet, row, col); - } + psppire_dict_view_get_selected_variable (PSPPIRE_DICT_VIEW (treeview)); + + if ( NULL == var) + goto done; + + g_object_set (de->data_editor, + "current-variable", var_get_dict_index (var), + NULL); } + break; case PSPPIRE_RESPONSE_PASTE: { - gchar *syntax = generate_syntax (GTK_TREE_VIEW (treeview)); - - struct syntax_editor *se = - (struct syntax_editor *) window_create (WINDOW_SYNTAX, NULL); - - gtk_text_buffer_insert_at_cursor (se->buffer, syntax, -1); + gchar *syntax = generate_syntax (PSPPIRE_DICT_VIEW (treeview)); + paste_syntax_in_new_window (syntax); g_free (syntax); } @@ -228,14 +196,15 @@ variable_info_dialog (GObject *o, gpointer data) break; } + done: g_object_unref (xml); - } static gchar * -generate_syntax (GtkTreeView *treeview) +generate_syntax (PsppireDictView *treeview) { - const struct variable *var = get_selected_variable (treeview); + const struct variable *var = + psppire_dict_view_get_selected_variable (treeview); if ( NULL == var) return g_strdup ("");