-/*
- 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 <http://www.gnu.org/licenses/>. */
#include <config.h>
#include "split-file-dialog.h"
#include "psppire-selector.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 <language/syntax-string-source.h>
-#include "syntax-editor.h"
+#include "helper.h"
+#include <data/dictionary.h>
#include <gtk/gtk.h>
-#include <glade/glade.h>
#include "dialog-common.h"
/* FIXME: These shouldn't be here */
-#include <gtksheet/gtksheet.h>
#include "psppire-var-store.h"
struct split_file_dialog
{
/* The XML that created the dialog */
- GladeXML *xml;
+ GtkBuilder *xml;
/* The dictionary to which this dialog pertains */
PsppireDict *dict;
GtkWidget *sort = get_widget_assert (sfd->xml, "split-radiobutton3");
GtkWidget *layered = get_widget_assert (sfd->xml, "split-radiobutton1");
gint n_vars = append_variable_names (varlist,
- sfd->dict, GTK_TREE_VIEW (vars));
+ sfd->dict, GTK_TREE_VIEW (vars), 0);
if ( n_vars > 0 )
{
on_off_toggled (GtkToggleButton *togglebutton,
gpointer user_data)
{
- GladeXML *xml = user_data;
+ GtkBuilder *xml = user_data;
GtkWidget *dest = get_widget_assert (xml, "split-file-grouping-vars");
GtkWidget *selector = get_widget_assert (xml, "split-file-selector");
GtkWidget *source = get_widget_assert (xml, "split-file-dict-treeview");
{
GtkTreeIter iter;
gint i;
- struct variable *const *vars = dict_get_split_vars (d->dict->dict);
+ const struct variable *const *vars = dict_get_split_vars (d->dict->dict);
for (i = 0 ; i < n_vars; ++i )
{
split_file_dialog (GObject *o, gpointer data)
{
gint response;
- struct data_editor *de = data;
+ PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
struct split_file_dialog sfd;
+ PsppireVarStore *vs ;
GtkWidget *dialog ;
GtkWidget *source ;
GtkWidget *selector ;
GtkWidget *on_off ;
- GtkSheet *var_sheet ;
-
- sfd.xml = XML_NEW ("psppire.glade");
+ sfd.xml = builder_new ("psppire.ui");
dialog = get_widget_assert (sfd.xml, "split-file-dialog");
source = get_widget_assert (sfd.xml, "split-file-dict-treeview");
selector = get_widget_assert (sfd.xml, "split-file-selector");
on_off = get_widget_assert (sfd.xml, "split-radiobutton0");
- 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));
-
- sfd.dict = vs->dict;
+ g_object_get (vs, "dictionary", &sfd.dict, NULL);
sfd.tv = GTK_TREE_VIEW (dest);
sfd.selector = PSPPIRE_SELECTOR (
get_widget_assert (sfd.xml, "split-file-selector"));
- attach_dictionary_to_treeview (GTK_TREE_VIEW (source),
- vs->dict,
- GTK_SELECTION_MULTIPLE, NULL);
-
+ g_object_set (source, "dictionary", sfd.dict, NULL);
g_signal_connect (on_off, "toggled", G_CALLBACK(on_off_toggled), sfd.xml);
-
- set_dest_model (GTK_TREE_VIEW (dest), vs->dict);
+ set_dest_model (GTK_TREE_VIEW (dest), sfd.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), &sfd);
+ gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (de));
+
response = psppire_dialog_run (PSPPIRE_DIALOG (dialog));
case GTK_RESPONSE_OK:
{
gchar *syntax = generate_syntax (&sfd);
+
struct getl_interface *sss = create_syntax_string_source (syntax);
execute_syntax (sss);
case PSPPIRE_RESPONSE_PASTE:
{
gchar *syntax = generate_syntax (&sfd);
-
- 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);
}
projects / pspp-builds.git / blobdiff