projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update remaining gtk_paint_focus calls to Gtk3 signature
[pspp]
/
src
/
ui
/
gui
/
transpose-dialog.c
diff --git
a/src/ui/gui/transpose-dialog.c
b/src/ui/gui/transpose-dialog.c
index beed72d731590eb4089d442a41e684545e2be6da..742dff527bd7110fb15022ee1694f7c4bb5ce7e5 100644
(file)
--- a/
src/ui/gui/transpose-dialog.c
+++ b/
src/ui/gui/transpose-dialog.c
@@
-1,5
+1,5
@@
/* PSPPIRE - a graphical user interface for PSPP.
/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2007 Free Software Foundation
+ 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
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
@@
-18,11
+18,12
@@
#include "transpose-dialog.h"
#include "psppire-selector.h"
#include "transpose-dialog.h"
#include "psppire-selector.h"
+#include "psppire-var-view.h"
#include "psppire-dialog.h"
#include "executor.h"
#include "psppire-data-window.h"
#include "dict-display.h"
#include "psppire-dialog.h"
#include "executor.h"
#include "psppire-data-window.h"
#include "dict-display.h"
-#include
<language/syntax-string-source.h>
+#include
"builder-wrapper.h"
#include "helper.h"
#include "dialog-common.h"
#include "helper.h"
#include "dialog-common.h"
@@
-35,10
+36,6
@@
#define N_(msgid) msgid
#define N_(msgid) msgid
-/* FIXME: These shouldn't be here */
-#include "psppire-var-store.h"
-
-
static gchar * generate_syntax (PsppireDict *dict, GtkBuilder *xml);
static void
static gchar * generate_syntax (PsppireDict *dict, GtkBuilder *xml);
static void
@@
-76,40
+73,22
@@
dialog_state_valid (gpointer data)
void
void
-transpose_dialog (
GObject *o, gpointer data
)
+transpose_dialog (
PsppireDataWindow *de
)
{
gint response ;
{
gint response ;
- PsppireD
ataWindow *de = PSPPIRE_DATA_WINDOW (data)
;
+ PsppireD
ict *dict = NULL
;
GtkBuilder *xml = builder_new ("psppire.ui");
GtkBuilder *xml = builder_new ("psppire.ui");
- PsppireVarStore *vs = NULL;
-
GtkWidget *dialog = get_widget_assert (xml, "transpose-dialog");
GtkWidget *source = get_widget_assert (xml, "source-treeview");
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 *selector2 = get_widget_assert (xml, "psppire-selector3");
- GtkWidget *new_name_entry = get_widget_assert (xml, "new-name-entry");
-
- g_object_get (de->data_editor, "var-store", &vs, NULL);
-
- g_object_set (source, "dictionary", vs->dict, NULL);
-
- set_dest_model (GTK_TREE_VIEW (dest), vs->dict);
- psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector1),
- source, dest,
- insert_source_row_into_tree_view,
- NULL,
- NULL);
+ g_object_get (de->data_editor, "dictionary", &dict, NULL);
+ g_object_set (source, "model", dict, NULL);
-
- psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector2),
- source, new_name_entry,
- insert_source_row_into_entry,
- is_currently_in_entry,
- NULL);
+ psppire_selector_set_filter_func (PSPPIRE_SELECTOR (selector2),
+ is_currently_in_entry);
g_signal_connect (dialog, "refresh", G_CALLBACK (refresh), xml);
g_signal_connect (dialog, "refresh", G_CALLBACK (refresh), xml);
@@
-124,19
+103,12
@@
transpose_dialog (GObject *o, gpointer data)
switch (response)
{
case GTK_RESPONSE_OK:
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:
{
break;
case PSPPIRE_RESPONSE_PASTE:
{
- gchar *syntax = generate_syntax (
vs->
dict, xml);
- paste_syntax_
in_new
_window (syntax);
+ gchar *syntax = generate_syntax (dict, xml);
+ paste_syntax_
to
_window (syntax);
g_free (syntax);
}
g_free (syntax);
}
@@
-164,7
+136,7
@@
generate_syntax (PsppireDict *dict, GtkBuilder *xml)
g_string_append (string, " /VARIABLES = ");
g_string_append (string, " /VARIABLES = ");
-
append_variable_names (string, dict, GTK_TREE_VIEW (dest), 0
);
+
psppire_var_view_append_names (PSPPIRE_VAR_VIEW (dest), 0, string
);
text = gtk_entry_get_text (GTK_ENTRY (entry));
text = gtk_entry_get_text (GTK_ENTRY (entry));