X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fui%2Fgui%2Ftranspose-dialog.c;h=742dff527bd7110fb15022ee1694f7c4bb5ce7e5;hb=refs%2Fbuilds%2F20130402031823%2Fpspp;hp=4691fff7ba0f039b6dbe1a5fc999f4bfdcae9c5d;hpb=a10cebe053263d7e936b6533a3dbf5ac2f0586a1;p=pspp
diff --git a/src/ui/gui/transpose-dialog.c b/src/ui/gui/transpose-dialog.c
index 4691fff7ba..742dff527b 100644
--- a/src/ui/gui/transpose-dialog.c
+++ b/src/ui/gui/transpose-dialog.c
@@ -1,35 +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, 2010, 2011, 2012 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.
+ 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. */
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see . */
#include
#include "transpose-dialog.h"
#include "psppire-selector.h"
+#include "psppire-var-view.h"
#include "psppire-dialog.h"
-#include "helper.h"
-#include "data-editor.h"
+#include "executor.h"
+#include "psppire-data-window.h"
#include "dict-display.h"
-#include
-#include "syntax-editor.h"
+#include "builder-wrapper.h"
+#include "helper.h"
+
+#include "dialog-common.h"
#include
-#include
#include
@@ -37,142 +36,79 @@
#define N_(msgid) msgid
-/* FIXME: These shouldn't be here */
-#include
-#include "psppire-var-store.h"
-
-
+static gchar * generate_syntax (PsppireDict *dict, GtkBuilder *xml);
-static struct variable *
-get_selected_variable (GtkTreeModel *treemodel,
- GtkTreeIter *iter,
- PsppireDict *dict)
+static void
+refresh (PsppireDialog *dialog, gpointer data)
{
- struct variable *var;
- GValue value = {0};
-
- GtkTreePath *path = gtk_tree_model_get_path (treemodel, iter);
-
- gtk_tree_model_get_value (treemodel, iter, 0, &value);
+ GtkBuilder *xml = data;
+ GtkWidget *dest = get_widget_assert (xml, "variables-treeview");
+ GtkWidget *entry = get_widget_assert (xml, "new-name-entry");
+ GtkTreeModel *dmodel = gtk_tree_view_get_model (GTK_TREE_VIEW (dest));
- gtk_tree_path_free (path);
+ gtk_list_store_clear (GTK_LIST_STORE (dmodel));
+ gtk_entry_set_text (GTK_ENTRY (entry), "");
+}
- var = psppire_dict_get_variable (dict, g_value_get_int (&value));
+static gboolean
+dialog_state_valid (gpointer data)
+{
+ GtkBuilder *xml = data;
- g_value_unset (&value);
+ GtkWidget *tv = get_widget_assert (xml, "variables-treeview");
+ GtkWidget *entry = get_widget_assert (xml, "new-name-entry");
- return var;
-}
+ GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (tv));
+ gint n_rows = gtk_tree_model_iter_n_children (model, NULL);
-/* A (*GtkTreeCellDataFunc) function.
- This function expects TREEMODEL to hold G_TYPE_INT. The ints it holds
- are the indices of the variables in the dictionary, which DATA points to.
- It renders the name of the variable into CELL.
-*/
-static void
-cell_var_name (GtkTreeViewColumn *tree_column,
- GtkCellRenderer *cell,
- GtkTreeModel *tree_model,
- GtkTreeIter *iter,
- gpointer data)
-{
- PsppireDict *dict = data;
- struct variable *var;
- gchar *name;
+ if ( n_rows == 0 )
+ return FALSE;
- var = get_selected_variable (tree_model, iter, dict);
+ if ( 0 == strcmp ("", gtk_entry_get_text (GTK_ENTRY (entry))))
+ return FALSE;
- name = pspp_locale_to_utf8 (var_get_name (var), -1, NULL);
- g_object_set (cell, "text", name, NULL);
- g_free (name);
+ return TRUE;
}
-static gchar * generate_syntax (PsppireDict *dict, GladeXML *xml);
void
-transpose_dialog (GObject *o, gpointer data)
+transpose_dialog (PsppireDataWindow *de)
{
gint response ;
- struct data_editor *de = data;
-
- GladeXML *xml = glade_xml_new (PKGDATADIR "/psppire.glade",
- "transpose-dialog", NULL);
-
- GtkSheet *var_sheet =
- GTK_SHEET (get_widget_assert (de->xml, "variable_sheet"));
+ PsppireDict *dict = NULL;
- PsppireVarStore *vs = PSPPIRE_VAR_STORE (gtk_sheet_get_model (var_sheet));
+ GtkBuilder *xml = builder_new ("psppire.ui");
GtkWidget *dialog = get_widget_assert (xml, "transpose-dialog");
GtkWidget *source = get_widget_assert (xml, "source-treeview");
- GtkWidget *dest = get_widget_assert (xml, "variables-treeview");
- GtkWidget *selector1 = get_widget_assert (xml, "psppire-selector2");
GtkWidget *selector2 = get_widget_assert (xml, "psppire-selector3");
- GtkWidget *new_name_entry = get_widget_assert (xml, "new-name-entry");
-
- attach_dictionary_to_treeview (GTK_TREE_VIEW (source),
- vs->dict,
- GTK_SELECTION_MULTIPLE, NULL);
- {
- GtkTreeViewColumn *col;
- GtkListStore *dest_list = gtk_list_store_new (1, G_TYPE_INT);
- GtkCellRenderer *renderer = gtk_cell_renderer_text_new ();
- gtk_tree_view_set_model (GTK_TREE_VIEW (dest), GTK_TREE_MODEL (dest_list));
-
- col = gtk_tree_view_column_new_with_attributes (_("Var"),
- renderer,
- "text",
- 0,
- NULL);
-
- gtk_tree_view_column_set_cell_data_func (col, renderer,
- cell_var_name,
- vs->dict, 0);
-
- /* FIXME: make this a value in terms of character widths */
- g_object_set (col, "min-width", 100, NULL);
-
- gtk_tree_view_column_set_sizing (col, GTK_TREE_VIEW_COLUMN_FIXED);
-
- gtk_tree_view_append_column (GTK_TREE_VIEW(dest), col);
- }
+ g_object_get (de->data_editor, "dictionary", &dict, NULL);
+ g_object_set (source, "model", dict, NULL);
+ psppire_selector_set_filter_func (PSPPIRE_SELECTOR (selector2),
+ is_currently_in_entry);
- psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector1),
- source, dest,
- insert_source_row_into_tree_view,
- NULL);
+ g_signal_connect (dialog, "refresh", G_CALLBACK (refresh), xml);
- psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector2),
- source, new_name_entry,
- insert_source_row_into_entry,
- is_currently_in_entry);
+ gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (de));
+ psppire_dialog_set_valid_predicate (PSPPIRE_DIALOG (dialog),
+ dialog_state_valid, xml);
response = psppire_dialog_run (PSPPIRE_DIALOG (dialog));
switch (response)
{
case GTK_RESPONSE_OK:
- {
- gchar *syntax = generate_syntax (vs->dict, xml);
- struct getl_interface *sss = create_syntax_string_source (syntax);
- execute_syntax (sss);
-
- g_free (syntax);
- }
+ g_free (execute_syntax_string (de, generate_syntax (dict, xml)));
break;
case PSPPIRE_RESPONSE_PASTE:
{
- gchar *syntax = generate_syntax (vs->dict, xml);
-
- 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 (dict, xml);
+ paste_syntax_to_window (syntax);
g_free (syntax);
}
@@ -189,9 +125,8 @@ transpose_dialog (GObject *o, gpointer data)
FLIP /VARIABLES=var_list /NEWNAMES=var_name.
*/
static gchar *
-generate_syntax (PsppireDict *dict, GladeXML *xml)
+generate_syntax (PsppireDict *dict, GtkBuilder *xml)
{
- GtkTreeIter iter;
const gchar *text;
GString *string = g_string_new ("FLIP");
gchar *syntax ;
@@ -199,29 +134,9 @@ generate_syntax (PsppireDict *dict, GladeXML *xml)
GtkWidget *dest = get_widget_assert (xml, "variables-treeview");
GtkWidget *entry = get_widget_assert (xml, "new-name-entry");
- GtkTreeModel *list_store = gtk_tree_view_get_model (GTK_TREE_VIEW (dest));
-
- if ( gtk_tree_model_get_iter_first (list_store, &iter) )
- {
- g_string_append (string, " /VARIABLES =");
- do
- {
- GValue value = {0};
- struct variable *var;
- GtkTreePath *path = gtk_tree_model_get_path (list_store, &iter);
+ g_string_append (string, " /VARIABLES = ");
- gtk_tree_model_get_value (list_store, &iter, 0, &value);
-
- var = psppire_dict_get_variable (dict, g_value_get_int (&value));
- g_value_unset (&value);
-
- g_string_append (string, " ");
- g_string_append (string, var_get_name (var));
-
- gtk_tree_path_free (path);
- }
- while (gtk_tree_model_iter_next (list_store, &iter));
- }
+ psppire_var_view_append_names (PSPPIRE_VAR_VIEW (dest), 0, string);
text = gtk_entry_get_text (GTK_ENTRY (entry));