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=242b7d3c07392b8ecca08bb46cb67ad91eb26238;hb=7c2fa3735ac1115b6c1ad4b5e0613673de2faf4c;hp=c299d3d4a0d60674d43c2f9465c402b0c8c3cf67;hpb=a1fa03b1638263a959df0b2943478a0a4ca4b11a;p=pspp-builds.git
diff --git a/src/ui/gui/sort-cases-dialog.c b/src/ui/gui/sort-cases-dialog.c
index c299d3d4..242b7d3c 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 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
#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
-#include "syntax-editor.h"
+#include "helper.h"
static void
refresh (PsppireDialog *dialog, GtkTreeView *dest)
@@ -48,13 +45,28 @@ struct sort_cases_dialog
GtkToggleButton *ascending;
};
+
+static gboolean
+dialog_state_valid (gpointer data)
+{
+ struct sort_cases_dialog *scd = data;
+ GtkTreeModel *model = gtk_tree_view_get_model (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));
+ scd->dict, GTK_TREE_VIEW (scd->tv), 0);
if ( n_vars == 0 )
g_string_assign (string, "");
@@ -80,11 +92,11 @@ void
sort_cases_dialog (GObject *o, gpointer data)
{
gint response;
- struct data_editor *de = data;
+ PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (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");
@@ -93,32 +105,33 @@ sort_cases_dialog (GObject *o, gpointer data)
GtkWidget *selector = get_widget_assert (xml, "sort-cases-selector");
GtkWidget *dest = get_widget_assert (xml, "sort-cases-treeview2");
- 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 (source),
- vs->dict,
- GTK_SELECTION_MULTIPLE, NULL);
+ g_object_get (vs, "dictionary", &scd.dict, NULL);
+ g_object_set (source, "dictionary", scd.dict, NULL);
- set_dest_model (GTK_TREE_VIEW (dest), vs->dict);
+ set_dest_model (GTK_TREE_VIEW (dest), scd.dict);
psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector),
- source,
- dest,
insert_source_row_into_tree_view,
+ NULL,
NULL);
g_signal_connect (dialog, "refresh", G_CALLBACK (refresh), dest);
scd.tv = GTK_TREE_VIEW (dest);
- scd.dict = vs->dict;
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));
@@ -127,6 +140,7 @@ sort_cases_dialog (GObject *o, gpointer data)
case GTK_RESPONSE_OK:
{
gchar *syntax = generate_syntax (&scd);
+
struct getl_interface *sss = create_syntax_string_source (syntax);
execute_syntax (sss);
@@ -136,11 +150,7 @@ sort_cases_dialog (GObject *o, gpointer data)
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);
+ paste_syntax_in_new_window (syntax);
g_free (syntax);
}