projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/stable'
[pspp-builds.git]
/
src
/
ui
/
gui
/
transpose-dialog.c
diff --git
a/src/ui/gui/transpose-dialog.c
b/src/ui/gui/transpose-dialog.c
index 621e196c2914ea43e9b2f5995be2acf8f1c0ea91..beed72d731590eb4089d442a41e684545e2be6da 100644
(file)
--- a/
src/ui/gui/transpose-dialog.c
+++ b/
src/ui/gui/transpose-dialog.c
@@
-19,16
+19,15
@@
#include "transpose-dialog.h"
#include "psppire-selector.h"
#include "psppire-dialog.h"
#include "transpose-dialog.h"
#include "psppire-selector.h"
#include "psppire-dialog.h"
-#include "
helpe
r.h"
-#include "
data-editor
.h"
+#include "
executo
r.h"
+#include "
psppire-data-window
.h"
#include "dict-display.h"
#include <language/syntax-string-source.h>
#include "dict-display.h"
#include <language/syntax-string-source.h>
-#include "
syntax-edito
r.h"
+#include "
helpe
r.h"
#include "dialog-common.h"
#include <gtk/gtk.h>
#include "dialog-common.h"
#include <gtk/gtk.h>
-#include <glade/glade.h>
#include <gettext.h>
#include <gettext.h>
@@
-40,12
+39,12
@@
#include "psppire-var-store.h"
#include "psppire-var-store.h"
-static gchar * generate_syntax (PsppireDict *dict, G
ladeXML
*xml);
+static gchar * generate_syntax (PsppireDict *dict, G
tkBuilder
*xml);
static void
refresh (PsppireDialog *dialog, gpointer data)
{
static void
refresh (PsppireDialog *dialog, gpointer data)
{
- G
ladeXML
*xml = data;
+ G
tkBuilder
*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));
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));
@@
-57,7
+56,7
@@
refresh (PsppireDialog *dialog, gpointer data)
static gboolean
dialog_state_valid (gpointer data)
{
static gboolean
dialog_state_valid (gpointer data)
{
- G
ladeXML
*xml = data;
+ G
tkBuilder
*xml = data;
GtkWidget *tv = get_widget_assert (xml, "variables-treeview");
GtkWidget *entry = get_widget_assert (xml, "new-name-entry");
GtkWidget *tv = get_widget_assert (xml, "variables-treeview");
GtkWidget *entry = get_widget_assert (xml, "new-name-entry");
@@
-80,9
+79,9
@@
void
transpose_dialog (GObject *o, gpointer data)
{
gint response ;
transpose_dialog (GObject *o, gpointer data)
{
gint response ;
-
struct data_editor *de = data
;
+
PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data)
;
- G
ladeXML *xml = XML_NEW ("psppire.glade
");
+ G
tkBuilder *xml = builder_new ("psppire.ui
");
PsppireVarStore *vs = NULL;
PsppireVarStore *vs = NULL;
@@
-95,9
+94,7
@@
transpose_dialog (GObject *o, gpointer data)
g_object_get (de->data_editor, "var-store", &vs, NULL);
g_object_get (de->data_editor, "var-store", &vs, NULL);
- attach_dictionary_to_treeview (GTK_TREE_VIEW (source),
- vs->dict,
- GTK_SELECTION_MULTIPLE, NULL);
+ g_object_set (source, "dictionary", vs->dict, NULL);
set_dest_model (GTK_TREE_VIEW (dest), vs->dict);
set_dest_model (GTK_TREE_VIEW (dest), vs->dict);
@@
-117,7
+114,7
@@
transpose_dialog (GObject *o, gpointer data)
g_signal_connect (dialog, "refresh", G_CALLBACK (refresh), xml);
g_signal_connect (dialog, "refresh", G_CALLBACK (refresh), xml);
- gtk_window_set_transient_for (GTK_WINDOW (dialog),
de->parent.window
);
+ gtk_window_set_transient_for (GTK_WINDOW (dialog),
GTK_WINDOW (de)
);
psppire_dialog_set_valid_predicate (PSPPIRE_DIALOG (dialog),
dialog_state_valid, xml);
psppire_dialog_set_valid_predicate (PSPPIRE_DIALOG (dialog),
dialog_state_valid, xml);
@@
-129,6
+126,7
@@
transpose_dialog (GObject *o, gpointer data)
case GTK_RESPONSE_OK:
{
gchar *syntax = generate_syntax (vs->dict, xml);
case GTK_RESPONSE_OK:
{
gchar *syntax = generate_syntax (vs->dict, xml);
+
struct getl_interface *sss = create_syntax_string_source (syntax);
execute_syntax (sss);
struct getl_interface *sss = create_syntax_string_source (syntax);
execute_syntax (sss);
@@
-138,11
+136,7
@@
transpose_dialog (GObject *o, gpointer data)
case PSPPIRE_RESPONSE_PASTE:
{
gchar *syntax = generate_syntax (vs->dict, xml);
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);
+ paste_syntax_in_new_window (syntax);
g_free (syntax);
}
g_free (syntax);
}
@@
-159,7
+153,7
@@
transpose_dialog (GObject *o, gpointer data)
FLIP /VARIABLES=var_list /NEWNAMES=var_name.
*/
static gchar *
FLIP /VARIABLES=var_list /NEWNAMES=var_name.
*/
static gchar *
-generate_syntax (PsppireDict *dict, G
ladeXML
*xml)
+generate_syntax (PsppireDict *dict, G
tkBuilder
*xml)
{
const gchar *text;
GString *string = g_string_new ("FLIP");
{
const gchar *text;
GString *string = g_string_new ("FLIP");