X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fui%2Fgui%2Fsort-cases-dialog.c;h=50624ad009ce74d32d197e6ea53cb2d724d93b3f;hb=a2979bf95f3eb83e88a3bd723c09f22548775de5;hp=d7b742c279128656a587ddbbebccb156bc87eb7f;hpb=146997e1690f055481e2003529eaa4f8848ca4a8;p=pspp
diff --git a/src/ui/gui/sort-cases-dialog.c b/src/ui/gui/sort-cases-dialog.c
index d7b742c279..50624ad009 100644
--- a/src/ui/gui/sort-cases-dialog.c
+++ b/src/ui/gui/sort-cases-dialog.c
@@ -1,35 +1,32 @@
-/*
- PSPPIRE --- A Graphical User Interface for PSPP
- Copyright (C) 2007 Free Software Foundation
+/* PSPPIRE - a graphical user interface for PSPP.
+ Copyright (C) 2007, 2010 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 "sort-cases-dialog.h"
-#include "helper.h"
+#include "executor.h"
#include "psppire-dialog.h"
-#include "data-editor.h"
-#include
+#include "psppire-data-window.h"
#include "psppire-var-store.h"
#include "dialog-common.h"
+#include "psppire-selector.h"
#include "dict-display.h"
+#include "psppire-var-view.h"
-#include
-#include "syntax-editor.h"
+#include "helper.h"
static void
refresh (PsppireDialog *dialog, GtkTreeView *dest)
@@ -43,18 +40,33 @@ refresh (PsppireDialog *dialog, GtkTreeView *dest)
struct sort_cases_dialog
{
- GtkTreeView *tv;
+ PsppireVarView *tv;
PsppireDict *dict;
GtkToggleButton *ascending;
};
+
+static gboolean
+dialog_state_valid (gpointer data)
+{
+ struct sort_cases_dialog *scd = data;
+ GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (scd->tv));
+
+ gint n_rows = gtk_tree_model_iter_n_children (model, NULL);
+
+ if ( n_rows == 0 )
+ return FALSE;
+
+ return TRUE;
+}
+
static char *
generate_syntax (const struct sort_cases_dialog *scd)
{
gchar *text;
GString *string = g_string_new ("SORT CASES BY ");
- gint n_vars = append_variable_names (string,
- scd->dict, GTK_TREE_VIEW (scd->tv));
+
+ gint n_vars = psppire_var_view_append_names (scd->tv, 0, string);
if ( n_vars == 0 )
g_string_assign (string, "");
@@ -77,73 +89,49 @@ generate_syntax (const struct sort_cases_dialog *scd)
/* Pops up the Sort Cases dialog box */
void
-sort_cases_dialog (GObject *o, gpointer data)
+sort_cases_dialog (PsppireDataWindow *de)
{
gint response;
- struct data_editor *de = data;
struct sort_cases_dialog scd;
- GladeXML *xml = XML_NEW ("psppire.glade");
+ GtkBuilder *xml = builder_new ("sort.ui");
GtkWidget *dialog = get_widget_assert (xml, "sort-cases-dialog");
GtkWidget *source = get_widget_assert (xml, "sort-cases-treeview1");
- GtkWidget *selector = get_widget_assert (xml, "sort-cases-selector");
GtkWidget *dest = get_widget_assert (xml, "sort-cases-treeview2");
+ PsppireVarStore *vs = NULL;
- GtkSheet *var_sheet =
- GTK_SHEET (get_widget_assert (de->xml, "variable_sheet"));
+ g_object_get (de->data_editor, "var-store", &vs, NULL);
- PsppireVarStore *vs = PSPPIRE_VAR_STORE (gtk_sheet_get_model (var_sheet));
+ gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (de));
- gtk_window_set_transient_for (GTK_WINDOW (dialog), de->parent.window);
-
- attach_dictionary_to_treeview (GTK_TREE_VIEW (source),
- vs->dict,
- GTK_SELECTION_MULTIPLE, NULL);
-
- set_dest_model (GTK_TREE_VIEW (dest), vs->dict);
-
- psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector),
- source,
- dest,
- insert_source_row_into_tree_view,
- NULL);
+ g_object_get (vs, "dictionary", &scd.dict, NULL);
+ g_object_set (source, "model", scd.dict, NULL);
g_signal_connect (dialog, "refresh", G_CALLBACK (refresh), dest);
- scd.tv = GTK_TREE_VIEW (dest);
- scd.dict = vs->dict;
+ scd.tv = PSPPIRE_VAR_VIEW (dest);
scd.ascending =
GTK_TOGGLE_BUTTON (get_widget_assert (xml, "sort-cases-radiobutton0"));
+
+ psppire_dialog_set_valid_predicate (PSPPIRE_DIALOG (dialog),
+ dialog_state_valid, &scd);
+
+
response = psppire_dialog_run (PSPPIRE_DIALOG (dialog));
switch (response)
{
case GTK_RESPONSE_OK:
- {
- gchar *syntax = generate_syntax (&scd);
- struct getl_interface *sss = create_syntax_string_source (syntax);
- execute_syntax (sss);
-
- g_free (syntax);
- }
+ g_free (execute_syntax_string (generate_syntax (&scd)));
break;
case PSPPIRE_RESPONSE_PASTE:
- {
- gchar *syntax = generate_syntax (&scd);
-
- struct syntax_editor *se =
- (struct syntax_editor *) window_create (WINDOW_SYNTAX, NULL);
-
- gtk_text_buffer_insert_at_cursor (se->buffer, syntax, -1);
-
- g_free (syntax);
- }
+ g_free (paste_syntax_to_window (generate_syntax (&scd)));
break;
default:
break;