X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fvariable-info-dialog.c;h=2f5495f137dd5a41f0e889cc847a210f7bf4b3e7;hb=df63b7b8aec3bd284ba2c4e62f1fc30924fe2c5b;hp=e5d8d05bc8aca269f3e6be352d817ac888258910;hpb=b06c888cf2e8c126b04d4678120439533a5086e5;p=pspp-builds.git
diff --git a/src/ui/gui/variable-info-dialog.c b/src/ui/gui/variable-info-dialog.c
index e5d8d05b..2f5495f1 100644
--- a/src/ui/gui/variable-info-dialog.c
+++ b/src/ui/gui/variable-info-dialog.c
@@ -1,39 +1,34 @@
-/*
- PSPPIRE --- A Graphical User Interface for PSPP
- Copyright (C) 2007 Free Software Foundation
+/* PSPPIRE - a graphical user interface for PSPP.
+ Copyright (C) 2007 Free Software Foundation
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA. */
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see . */
+#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 "helper.h"
-#include
#include
-#include "syntax-editor.h"
+#include "helper.h"
#include
@@ -79,6 +74,8 @@ populate_text (GtkTreeView *treeview, gpointer data)
GtkTextBuffer *textbuffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW(data));
const struct variable *var = get_selected_variable (treeview);
+ if ( var == NULL)
+ return;
gstring = g_string_sized_new (200);
text = name_to_string (var, NULL);
@@ -145,29 +142,42 @@ populate_text (GtkTreeView *treeview, gpointer data)
g_string_free (gstring, TRUE);
}
+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 (GtkTreeView *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 ("psppire.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 = NULL;
- PsppireVarStore *vs = PSPPIRE_VAR_STORE (gtk_sheet_get_model (var_sheet));
+ g_object_get (de->data_editor, "var-store", &vs, NULL);
- gtk_window_set_transient_for (GTK_WINDOW (dialog), de->parent.window);
+ gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (de));
attach_dictionary_to_treeview (GTK_TREE_VIEW (treeview),
vs->dict,
@@ -181,48 +191,29 @@ 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 ( NULL == var)
+ goto done;
- 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);
- }
+ 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);
+ paste_syntax_in_new_window (syntax);
g_free (syntax);
}
@@ -231,8 +222,8 @@ variable_info_dialog (GObject *o, gpointer data)
break;
}
+ done:
g_object_unref (xml);
-
}
static gchar *