projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed most uses of GladeXML from data window
[pspp]
/
src
/
ui
/
gui
/
transpose-dialog.c
diff --git
a/src/ui/gui/transpose-dialog.c
b/src/ui/gui/transpose-dialog.c
index cdd3364d8fa7aa9d5a1971be51d0fd8c4fb453a4..09756d3738919bc40f2f314b3d4d924a7a287499 100644
(file)
--- a/
src/ui/gui/transpose-dialog.c
+++ b/
src/ui/gui/transpose-dialog.c
@@
-20,15
+20,14
@@
#include "psppire-selector.h"
#include "psppire-dialog.h"
#include "helper.h"
#include "psppire-selector.h"
#include "psppire-dialog.h"
#include "helper.h"
-#include "
data-editor
.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>
@@
-37,16
+36,15
@@
/* FIXME: These shouldn't be here */
/* FIXME: These shouldn't be here */
-#include <gtksheet/gtksheet.h>
#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));
@@
-58,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");
@@
-81,14
+79,11
@@
void
transpose_dialog (GObject *o, gpointer data)
{
gint response ;
transpose_dialog (GObject *o, gpointer data)
{
gint response ;
- struct data_editor *de = data;
-
- GladeXML *xml = XML_NEW ("psppire.glade");
+ PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
- GtkSheet *var_sheet =
- GTK_SHEET (get_widget_assert (de->xml, "variable_sheet"));
+ GtkBuilder *xml = builder_new ("psppire.ui");
- PsppireVarStore *vs =
PSPPIRE_VAR_STORE (gtk_sheet_get_model (var_sheet))
;
+ 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");
@@
-97,6
+92,8
@@
transpose_dialog (GObject *o, gpointer data)
GtkWidget *selector2 = get_widget_assert (xml, "psppire-selector3");
GtkWidget *new_name_entry = get_widget_assert (xml, "new-name-entry");
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);
+
attach_dictionary_to_treeview (GTK_TREE_VIEW (source),
vs->dict,
GTK_SELECTION_MULTIPLE, NULL);
attach_dictionary_to_treeview (GTK_TREE_VIEW (source),
vs->dict,
GTK_SELECTION_MULTIPLE, NULL);
@@
-119,7
+116,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);
@@
-131,6
+128,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);
@@
-140,11
+138,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);
}
@@
-161,7
+155,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");