projects
/
pspp-builds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4421e7a
)
Refactor common code in dialog implementations
author
John Darrington
<john@darrington.wattle.id.au>
Thu, 1 Jan 2009 07:35:50 +0000
(16:35 +0900)
committer
John Darrington
<john@darrington.wattle.id.au>
Thu, 1 Jan 2009 07:35:50 +0000
(16:35 +0900)
26 files changed:
src/ui/gui/comments-dialog.c
patch
|
blob
|
history
src/ui/gui/compute-dialog.c
patch
|
blob
|
history
src/ui/gui/crosstabs-dialog.c
patch
|
blob
|
history
src/ui/gui/descriptives-dialog.c
patch
|
blob
|
history
src/ui/gui/examine-dialog.c
patch
|
blob
|
history
src/ui/gui/frequencies-dialog.c
patch
|
blob
|
history
src/ui/gui/helper.c
patch
|
blob
|
history
src/ui/gui/helper.h
patch
|
blob
|
history
src/ui/gui/oneway-anova-dialog.c
patch
|
blob
|
history
src/ui/gui/psppire-data-store.c
patch
|
blob
|
history
src/ui/gui/psppire-data-window.c
patch
|
blob
|
history
src/ui/gui/psppire-syntax-window.c
patch
|
blob
|
history
src/ui/gui/psppire-syntax-window.h
patch
|
blob
|
history
src/ui/gui/rank-dialog.c
patch
|
blob
|
history
src/ui/gui/recode-dialog.c
patch
|
blob
|
history
src/ui/gui/regression-dialog.c
patch
|
blob
|
history
src/ui/gui/select-cases-dialog.c
patch
|
blob
|
history
src/ui/gui/sort-cases-dialog.c
patch
|
blob
|
history
src/ui/gui/split-file-dialog.c
patch
|
blob
|
history
src/ui/gui/t-test-independent-samples-dialog.c
patch
|
blob
|
history
src/ui/gui/t-test-one-sample.c
patch
|
blob
|
history
src/ui/gui/t-test-paired-samples.c
patch
|
blob
|
history
src/ui/gui/text-data-import-dialog.c
patch
|
blob
|
history
src/ui/gui/transpose-dialog.c
patch
|
blob
|
history
src/ui/gui/variable-info-dialog.c
patch
|
blob
|
history
src/ui/gui/weight-cases-dialog.c
patch
|
blob
|
history
diff --git
a/src/ui/gui/comments-dialog.c
b/src/ui/gui/comments-dialog.c
index 9b521a7669fb1cfbe4f6f1063807078932e42880..34c9957d4fea4ea659f56b7e02e9e91b090dc2df 100644
(file)
--- a/
src/ui/gui/comments-dialog.c
+++ b/
src/ui/gui/comments-dialog.c
@@
-21,7
+21,7
@@
#include "psppire-data-window.h"
#include "psppire-data-editor.h"
#include <language/syntax-string-source.h>
#include "psppire-data-window.h"
#include "psppire-data-editor.h"
#include <language/syntax-string-source.h>
-#include "
psppire-syntax-window
.h"
+#include "
helper
.h"
#include "psppire-var-store.h"
#include <ui/syntax-gen.h>
#include "psppire-var-store.h"
#include <ui/syntax-gen.h>
@@
-168,6
+168,7
@@
comments_dialog (GObject *o, gpointer data)
case GTK_RESPONSE_OK:
{
gchar *syntax = generate_syntax (&cd);
case GTK_RESPONSE_OK:
{
gchar *syntax = generate_syntax (&cd);
+
struct getl_interface *sss = create_syntax_string_source (syntax);
execute_syntax (sss);
struct getl_interface *sss = create_syntax_string_source (syntax);
execute_syntax (sss);
@@
-178,11
+179,7
@@
comments_dialog (GObject *o, gpointer data)
{
gchar *syntax = generate_syntax (&cd);
{
gchar *syntax = generate_syntax (&cd);
- GtkWidget *se = psppire_syntax_window_new ();
-
- gtk_text_buffer_insert_at_cursor (PSPPIRE_SYNTAX_WINDOW (se)->buffer, syntax, -1);
-
- gtk_widget_show (se);
+ paste_syntax_in_new_window (syntax);
g_free (syntax);
}
g_free (syntax);
}
diff --git
a/src/ui/gui/compute-dialog.c
b/src/ui/gui/compute-dialog.c
index 17611ac8a9fcbc72f2078f8a153e067da774645e..96ea6630885b08fedf74a9b42d655fa94e18f333 100644
(file)
--- a/
src/ui/gui/compute-dialog.c
+++ b/
src/ui/gui/compute-dialog.c
@@
-27,7
+27,7
@@
#include <language/expressions/public.h>
#include <language/syntax-string-source.h>
#include <language/expressions/public.h>
#include <language/syntax-string-source.h>
-#include "
psppire-syntax-window
.h"
+#include "
helper
.h"
static void function_list_populate (GtkTreeView *tv);
static void function_list_populate (GtkTreeView *tv);
@@
-447,6
+447,7
@@
compute_dialog (GObject *o, gpointer data)
case GTK_RESPONSE_OK:
{
gchar *syntax = generate_syntax (&scd);
case GTK_RESPONSE_OK:
{
gchar *syntax = generate_syntax (&scd);
+
struct getl_interface *sss = create_syntax_string_source (syntax);
execute_syntax (sss);
struct getl_interface *sss = create_syntax_string_source (syntax);
execute_syntax (sss);
@@
-457,11
+458,7
@@
compute_dialog (GObject *o, gpointer data)
{
gchar *syntax = generate_syntax (&scd);
{
gchar *syntax = generate_syntax (&scd);
- GtkWidget *se = psppire_syntax_window_new ();
-
- gtk_text_buffer_insert_at_cursor (PSPPIRE_SYNTAX_WINDOW (se)->buffer, syntax, -1);
-
- gtk_widget_show (se);
+ paste_syntax_in_new_window (syntax);
g_free (syntax);
}
g_free (syntax);
}
diff --git
a/src/ui/gui/crosstabs-dialog.c
b/src/ui/gui/crosstabs-dialog.c
index dfe03e3c67d9ce75ad001c761c57565697a933c7..9654a27ccf90364a368cd89937999e9f8c39167b 100644
(file)
--- a/
src/ui/gui/crosstabs-dialog.c
+++ b/
src/ui/gui/crosstabs-dialog.c
@@
-29,7
+29,7
@@
#include <ui/gui/helper.h>
#include <ui/gui/psppire-dialog.h>
#include <ui/gui/psppire-var-store.h>
#include <ui/gui/helper.h>
#include <ui/gui/psppire-dialog.h>
#include <ui/gui/psppire-var-store.h>
-#include <ui/gui/
psppire-syntax-window
.h>
+#include <ui/gui/
helper
.h>
#include "gettext.h"
#define _(msgid) gettext (msgid)
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@
-487,6
+487,7
@@
crosstabs_dialog (GObject *o, gpointer data)
case GTK_RESPONSE_OK:
{
gchar *syntax = generate_syntax (&cd);
case GTK_RESPONSE_OK:
{
gchar *syntax = generate_syntax (&cd);
+
struct getl_interface *sss = create_syntax_string_source (syntax);
execute_syntax (sss);
struct getl_interface *sss = create_syntax_string_source (syntax);
execute_syntax (sss);
@@
-497,11
+498,7
@@
crosstabs_dialog (GObject *o, gpointer data)
{
gchar *syntax = generate_syntax (&cd);
{
gchar *syntax = generate_syntax (&cd);
- GtkWidget *se = psppire_syntax_window_new ();
-
- gtk_text_buffer_insert_at_cursor (PSPPIRE_SYNTAX_WINDOW (se)->buffer, syntax, -1);
-
- gtk_widget_show (se);
+ paste_syntax_in_new_window (syntax);
g_free (syntax);
}
g_free (syntax);
}
diff --git
a/src/ui/gui/descriptives-dialog.c
b/src/ui/gui/descriptives-dialog.c
index f909ed02328e166311a1401a08a92af7d300c741..aaed7eee2c8b2dd7fd04e265b183e5521eae3f38 100644
(file)
--- a/
src/ui/gui/descriptives-dialog.c
+++ b/
src/ui/gui/descriptives-dialog.c
@@
-29,7
+29,7
@@
#include <ui/gui/helper.h>
#include <ui/gui/psppire-dialog.h>
#include <ui/gui/psppire-var-store.h>
#include <ui/gui/helper.h>
#include <ui/gui/psppire-dialog.h>
#include <ui/gui/psppire-var-store.h>
-#include <ui/gui/
psppire-syntax-window
.h>
+#include <ui/gui/
helper
.h>
#include "gettext.h"
#define _(msgid) gettext (msgid)
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@
-263,6
+263,7
@@
descriptives_dialog (GObject *o, gpointer data)
case GTK_RESPONSE_OK:
{
gchar *syntax = generate_syntax (&scd);
case GTK_RESPONSE_OK:
{
gchar *syntax = generate_syntax (&scd);
+
struct getl_interface *sss = create_syntax_string_source (syntax);
execute_syntax (sss);
struct getl_interface *sss = create_syntax_string_source (syntax);
execute_syntax (sss);
@@
-272,13
+273,7
@@
descriptives_dialog (GObject *o, gpointer data)
case PSPPIRE_RESPONSE_PASTE:
{
gchar *syntax = generate_syntax (&scd);
case PSPPIRE_RESPONSE_PASTE:
{
gchar *syntax = generate_syntax (&scd);
-
- GtkWidget *se = psppire_syntax_window_new ();
-
- gtk_text_buffer_insert_at_cursor (PSPPIRE_SYNTAX_WINDOW (se)->buffer, syntax, -1);
-
- gtk_widget_show (se);
-
+ paste_syntax_in_new_window (syntax);
g_free (syntax);
}
break;
g_free (syntax);
}
break;
diff --git
a/src/ui/gui/examine-dialog.c
b/src/ui/gui/examine-dialog.c
index 33f8b129e888ca0b375fd644d71a34dc564ad7dc..3c11a08aa477eea73f26f89f2f36ab737741934a 100644
(file)
--- a/
src/ui/gui/examine-dialog.c
+++ b/
src/ui/gui/examine-dialog.c
@@
-28,7
+28,7
@@
#include <ui/gui/helper.h>
#include <ui/gui/psppire-dialog.h>
#include <ui/gui/psppire-var-store.h>
#include <ui/gui/helper.h>
#include <ui/gui/psppire-dialog.h>
#include <ui/gui/psppire-var-store.h>
-#include <ui/gui/
psppire-syntax-window
.h>
+#include <ui/gui/
helper
.h>
#include "gettext.h"
#define _(msgid) gettext (msgid)
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@
-346,13
+346,7
@@
examine_dialog (GObject *o, gpointer data)
case PSPPIRE_RESPONSE_PASTE:
{
gchar *syntax = generate_syntax (&ex_d);
case PSPPIRE_RESPONSE_PASTE:
{
gchar *syntax = generate_syntax (&ex_d);
-
- GtkWidget *se = psppire_syntax_window_new ();
-
- gtk_text_buffer_insert_at_cursor (PSPPIRE_SYNTAX_WINDOW (se)->buffer, syntax, -1);
-
- gtk_widget_show (se);
-
+ paste_syntax_in_new_window (syntax);
g_free (syntax);
}
break;
g_free (syntax);
}
break;
diff --git
a/src/ui/gui/frequencies-dialog.c
b/src/ui/gui/frequencies-dialog.c
index cba8573d2860de40625e6565a055700ce6ffee37..978bfcd2eda7eb095ff729fa889ea4eb0760e295 100644
(file)
--- a/
src/ui/gui/frequencies-dialog.c
+++ b/
src/ui/gui/frequencies-dialog.c
@@
-29,7
+29,7
@@
#include <ui/gui/helper.h>
#include <ui/gui/psppire-dialog.h>
#include <ui/gui/psppire-var-store.h>
#include <ui/gui/helper.h>
#include <ui/gui/psppire-dialog.h>
#include <ui/gui/psppire-var-store.h>
-#include <ui/gui/
psppire-syntax-window
.h>
+#include <ui/gui/
helper
.h>
#include "gettext.h"
#define _(msgid) gettext (msgid)
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@
-393,6
+393,7
@@
frequencies_dialog (GObject *o, gpointer data)
case GTK_RESPONSE_OK:
{
gchar *syntax = generate_syntax (&fd);
case GTK_RESPONSE_OK:
{
gchar *syntax = generate_syntax (&fd);
+
struct getl_interface *sss = create_syntax_string_source (syntax);
execute_syntax (sss);
struct getl_interface *sss = create_syntax_string_source (syntax);
execute_syntax (sss);
@@
-402,13
+403,7
@@
frequencies_dialog (GObject *o, gpointer data)
case PSPPIRE_RESPONSE_PASTE:
{
gchar *syntax = generate_syntax (&fd);
case PSPPIRE_RESPONSE_PASTE:
{
gchar *syntax = generate_syntax (&fd);
-
- GtkWidget *se = psppire_syntax_window_new ();
-
- gtk_text_buffer_insert_at_cursor (PSPPIRE_SYNTAX_WINDOW (se)->buffer, syntax, -1);
-
- gtk_widget_show (se);
-
+ paste_syntax_in_new_window (syntax);
g_free (syntax);
}
break;
g_free (syntax);
}
break;
diff --git
a/src/ui/gui/helper.c
b/src/ui/gui/helper.c
index c8b1a745dce6231abdb441c4817de238a9681eb3..12003e2ac23f8a48ec17a348c8aaca970921dd67 100644
(file)
--- a/
src/ui/gui/helper.c
+++ b/
src/ui/gui/helper.c
@@
-20,6
+20,8
@@
*/
#include <config.h>
*/
#include <config.h>
+#include "psppire-syntax-window.h"
+
#include <glib-object.h>
#include <glib.h>
#include <glib-object.h>
#include <glib.h>
@@
-297,3
+299,14
@@
clone_list_store (const GtkListStore *src)
}
}
+
+
+void
+paste_syntax_in_new_window (const gchar *syntax)
+{
+ GtkWidget *se = psppire_syntax_window_new ();
+
+ gtk_text_buffer_insert_at_cursor (PSPPIRE_SYNTAX_WINDOW (se)->buffer, syntax, -1);
+
+ gtk_widget_show (se);
+}
diff --git
a/src/ui/gui/helper.h
b/src/ui/gui/helper.h
index 1a620908309c3f93450dd4b90178ec1ca0001785..25ff0aa00c4cdccd60268efca6321eb4c045f1f2 100644
(file)
--- a/
src/ui/gui/helper.h
+++ b/
src/ui/gui/helper.h
@@
-26,6
+26,10
@@
#include <gtk/gtk.h>
#include <glade/glade.h>
#include <gtk/gtk.h>
#include <glade/glade.h>
+
+
+void paste_syntax_in_new_window (const gchar *syntax);
+
/*
GtkRecentChooserMenu was added in 2.10.0
but it didn't support GtkRecentFilters until
/*
GtkRecentChooserMenu was added in 2.10.0
but it didn't support GtkRecentFilters until
diff --git
a/src/ui/gui/oneway-anova-dialog.c
b/src/ui/gui/oneway-anova-dialog.c
index 505d9039b55deeef8e6703b2f833591faf5c3d24..45e888074cb586cc74f7de93fde4daedce62051a 100644
(file)
--- a/
src/ui/gui/oneway-anova-dialog.c
+++ b/
src/ui/gui/oneway-anova-dialog.c
@@
-31,7
+31,7
@@
#include <language/syntax-string-source.h>
#include <language/syntax-string-source.h>
-#include "
psppire-syntax-window
.h"
+#include "
helper
.h"
#include "gettext.h"
#include "gettext.h"
@@
-232,6
+232,7
@@
oneway_anova_dialog (GObject *o, gpointer data)
case GTK_RESPONSE_OK:
{
gchar *syntax = generate_syntax (&ow);
case GTK_RESPONSE_OK:
{
gchar *syntax = generate_syntax (&ow);
+
struct getl_interface *sss = create_syntax_string_source (syntax);
execute_syntax (sss);
struct getl_interface *sss = create_syntax_string_source (syntax);
execute_syntax (sss);
@@
-241,12
+242,7
@@
oneway_anova_dialog (GObject *o, gpointer data)
case PSPPIRE_RESPONSE_PASTE:
{
gchar *syntax = generate_syntax (&ow);
case PSPPIRE_RESPONSE_PASTE:
{
gchar *syntax = generate_syntax (&ow);
-
- GtkWidget *se = psppire_syntax_window_new ();
-
- gtk_text_buffer_insert_at_cursor (PSPPIRE_SYNTAX_WINDOW (se)->buffer, syntax, -1);
-
- gtk_widget_show (se);
+ paste_syntax_in_new_window (syntax);
g_free (syntax);
}
g_free (syntax);
}
diff --git
a/src/ui/gui/psppire-data-store.c
b/src/ui/gui/psppire-data-store.c
index 37747e07c702d0c179064348ca921384bed8a2af..91b96f64514da4a85ca0a696f652916f303f5b78 100644
(file)
--- a/
src/ui/gui/psppire-data-store.c
+++ b/
src/ui/gui/psppire-data-store.c
@@
-308,8
+308,6
@@
delete_variable_callback (GObject *obj, gint dict_index,
#endif
}
#endif
}
-
-
static void
variable_changed_callback (GObject *obj, gint var_num, gpointer data)
{
static void
variable_changed_callback (GObject *obj, gint var_num, gpointer data)
{
@@
-319,7
+317,6
@@
variable_changed_callback (GObject *obj, gint var_num, gpointer data)
psppire_sheet_column_columns_changed (PSPPIRE_SHEET_COLUMN (store),
var_num, 1);
psppire_sheet_column_columns_changed (PSPPIRE_SHEET_COLUMN (store),
var_num, 1);
-
psppire_sheet_model_range_changed (PSPPIRE_SHEET_MODEL (store),
-1, var_num,
-1, var_num);
psppire_sheet_model_range_changed (PSPPIRE_SHEET_MODEL (store),
-1, var_num,
-1, var_num);
diff --git
a/src/ui/gui/psppire-data-window.c
b/src/ui/gui/psppire-data-window.c
index fdc4087b964be97201c9ca828fe55626e70fac3e..21226ea56edcbdba88a7032c218bfbb1079405b6 100644
(file)
--- a/
src/ui/gui/psppire-data-window.c
+++ b/
src/ui/gui/psppire-data-window.c
@@
-1705,8
+1705,7
@@
psppire_data_window_init (PsppireDataWindow *de)
de->data_sheet_cases_popup_menu =
GTK_MENU (create_data_sheet_cases_popup_menu (de));
de->data_sheet_cases_popup_menu =
GTK_MENU (create_data_sheet_cases_popup_menu (de));
- PSPPIRE_WINDOW (de)->menu = GTK_MENU (get_widget_assert (de->xml,"Windows_menu"));
- g_object_ref (PSPPIRE_WINDOW (de)->menu);
+ PSPPIRE_WINDOW (de)->menu = GTK_MENU_SHELL (get_widget_assert (de->xml,"Windows_menu"));
g_object_set (de->data_editor,
"datasheet-column-menu", de->data_sheet_variable_popup_menu,
g_object_set (de->data_editor,
"datasheet-column-menu", de->data_sheet_variable_popup_menu,
diff --git
a/src/ui/gui/psppire-syntax-window.c
b/src/ui/gui/psppire-syntax-window.c
index 766134b2678132abc7eea0425e9a18e62bfe9ea1..c8fede093ae7b60144d991f09e3b74a3691775b5 100644
(file)
--- a/
src/ui/gui/psppire-syntax-window.c
+++ b/
src/ui/gui/psppire-syntax-window.c
@@
-75,8
+75,6
@@
psppire_syntax_window_finalize (GObject *object)
{
GObjectClass *class = G_OBJECT_GET_CLASS (object);
{
GObjectClass *class = G_OBJECT_GET_CLASS (object);
- PsppireSyntaxWindow *window = PSPPIRE_SYNTAX_WINDOW (object);
-
GObjectClass *parent_class = g_type_class_peek_parent (class);
if (G_OBJECT_CLASS (parent_class)->finalize)
GObjectClass *parent_class = g_type_class_peek_parent (class);
if (G_OBJECT_CLASS (parent_class)->finalize)
@@
-575,8
+573,7
@@
psppire_syntax_window_init (PsppireSyntaxWindow *window)
"activate",
G_CALLBACK (psppire_window_minimise_all), NULL);
"activate",
G_CALLBACK (psppire_window_minimise_all), NULL);
- PSPPIRE_WINDOW (window)->menu = GTK_MENU (get_widget_assert (xml,"windows_menu"));
- g_object_ref (PSPPIRE_WINDOW (window)->menu);
+ PSPPIRE_WINDOW (window)->menu = GTK_MENU_SHELL (get_widget_assert (xml,"windows_menu"));
g_object_unref (xml);
g_object_unref (xml);
diff --git
a/src/ui/gui/psppire-syntax-window.h
b/src/ui/gui/psppire-syntax-window.h
index 18946413c2b957cd461db9f4053b6884481ecee8..c434e07fab74bee695c23fa3c7817c818221e61f 100644
(file)
--- a/
src/ui/gui/psppire-syntax-window.h
+++ b/
src/ui/gui/psppire-syntax-window.h
@@
-18,7
+18,6
@@
#ifndef __PSPPIRE_SYNTAX_WINDOW_H__
#define __PSPPIRE_SYNTAX_WINDOW_H__
#ifndef __PSPPIRE_SYNTAX_WINDOW_H__
#define __PSPPIRE_SYNTAX_WINDOW_H__
-
#include <glib.h>
#include <glib-object.h>
#include <gtk/gtkaction.h>
#include <glib.h>
#include <glib-object.h>
#include <gtk/gtkaction.h>
diff --git
a/src/ui/gui/rank-dialog.c
b/src/ui/gui/rank-dialog.c
index c75f64f205d29abc680f1925d50860170a8c25b1..307e37331038137e3e747fe02fd4e918aaf4e4d0 100644
(file)
--- a/
src/ui/gui/rank-dialog.c
+++ b/
src/ui/gui/rank-dialog.c
@@
-28,7
+28,7
@@
#include <ui/gui/helper.h>
#include <ui/gui/psppire-dialog.h>
#include <ui/gui/psppire-var-store.h>
#include <ui/gui/helper.h>
#include <ui/gui/psppire-dialog.h>
#include <ui/gui/psppire-var-store.h>
-#include <ui/gui/
psppire-syntax-window
.h>
+#include <ui/gui/
helper
.h>
#include "gettext.h"
#define _(msgid) gettext (msgid)
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@
-349,6
+349,7
@@
rank_dialog (GObject *o, gpointer data)
case GTK_RESPONSE_OK:
{
gchar *syntax = generate_syntax (&rd);
case GTK_RESPONSE_OK:
{
gchar *syntax = generate_syntax (&rd);
+
struct getl_interface *sss = create_syntax_string_source (syntax);
execute_syntax (sss);
struct getl_interface *sss = create_syntax_string_source (syntax);
execute_syntax (sss);
@@
-358,13
+359,7
@@
rank_dialog (GObject *o, gpointer data)
case PSPPIRE_RESPONSE_PASTE:
{
gchar *syntax = generate_syntax (&rd);
case PSPPIRE_RESPONSE_PASTE:
{
gchar *syntax = generate_syntax (&rd);
-
- GtkWidget *se = psppire_syntax_window_new ();
-
- gtk_text_buffer_insert_at_cursor (PSPPIRE_SYNTAX_WINDOW (se)->buffer, syntax, -1);
-
- gtk_widget_show (se);
-
+ paste_syntax_in_new_window (syntax);
g_free (syntax);
}
break;
g_free (syntax);
}
break;
diff --git
a/src/ui/gui/recode-dialog.c
b/src/ui/gui/recode-dialog.c
index da32620b126fbde4d7a346442043954308fdabd3..642dae02d4a01283276c86356618b79cf7689603 100644
(file)
--- a/
src/ui/gui/recode-dialog.c
+++ b/
src/ui/gui/recode-dialog.c
@@
-33,7
+33,7
@@
#include <ui/gui/helper.h>
#include <ui/gui/psppire-dialog.h>
#include <ui/gui/psppire-var-store.h>
#include <ui/gui/helper.h>
#include <ui/gui/psppire-dialog.h>
#include <ui/gui/psppire-var-store.h>
-#include <ui/gui/
psppire-syntax-window
.h>
+#include <ui/gui/
helper
.h>
#include <ui/syntax-gen.h>
#include "psppire-acr.h"
#include <ui/syntax-gen.h>
#include "psppire-acr.h"
@@
-1085,6
+1085,7
@@
recode_dialog (PsppireDataWindow *de, gboolean diff)
case GTK_RESPONSE_OK:
{
gchar *syntax = generate_syntax (&rd);
case GTK_RESPONSE_OK:
{
gchar *syntax = generate_syntax (&rd);
+
struct getl_interface *sss = create_syntax_string_source (syntax);
execute_syntax (sss);
struct getl_interface *sss = create_syntax_string_source (syntax);
execute_syntax (sss);
@@
-1094,12
+1095,7
@@
recode_dialog (PsppireDataWindow *de, gboolean diff)
case PSPPIRE_RESPONSE_PASTE:
{
gchar *syntax = generate_syntax (&rd);
case PSPPIRE_RESPONSE_PASTE:
{
gchar *syntax = generate_syntax (&rd);
-
- GtkWidget *se = psppire_syntax_window_new ();
-
- gtk_text_buffer_insert_at_cursor (PSPPIRE_SYNTAX_WINDOW (se)->buffer, syntax, -1);
-
- gtk_widget_show (se);
+ paste_syntax_in_new_window (syntax);
g_free (syntax);
}
g_free (syntax);
}
diff --git
a/src/ui/gui/regression-dialog.c
b/src/ui/gui/regression-dialog.c
index 4988261ae93e4c4f3770426d858cd76c1a03c7f3..b0c11b0798dc8d591594055f7b5cb8fdd14c169b 100644
(file)
--- a/
src/ui/gui/regression-dialog.c
+++ b/
src/ui/gui/regression-dialog.c
@@
-29,7
+29,7
@@
#include <ui/gui/helper.h>
#include <ui/gui/psppire-dialog.h>
#include <ui/gui/psppire-var-store.h>
#include <ui/gui/helper.h>
#include <ui/gui/psppire-dialog.h>
#include <ui/gui/psppire-var-store.h>
-#include <ui/gui/
psppire-syntax-window
.h>
+#include <ui/gui/
helper
.h>
#include "gettext.h"
#define _(msgid) gettext (msgid)
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@
-307,6
+307,7
@@
regression_dialog (GObject *o, gpointer data)
case GTK_RESPONSE_OK:
{
gchar *syntax = generate_syntax (&rd);
case GTK_RESPONSE_OK:
{
gchar *syntax = generate_syntax (&rd);
+
struct getl_interface *sss = create_syntax_string_source (syntax);
execute_syntax (sss);
struct getl_interface *sss = create_syntax_string_source (syntax);
execute_syntax (sss);
@@
-316,12
+317,7
@@
regression_dialog (GObject *o, gpointer data)
case PSPPIRE_RESPONSE_PASTE:
{
gchar *syntax = generate_syntax (&rd);
case PSPPIRE_RESPONSE_PASTE:
{
gchar *syntax = generate_syntax (&rd);
-
- GtkWidget *se = psppire_syntax_window_new ();
-
- gtk_text_buffer_insert_at_cursor (PSPPIRE_SYNTAX_WINDOW (se)->buffer, syntax, -1);
-
- gtk_widget_show (se);
+ paste_syntax_in_new_window (syntax);
g_free (syntax);
}
g_free (syntax);
}
diff --git
a/src/ui/gui/select-cases-dialog.c
b/src/ui/gui/select-cases-dialog.c
index 9d711d31729624875aa76cafb72cdb47a9c65713..58b2879d07fe79cfdfa7d774d3b833fd22d11bb3 100644
(file)
--- a/
src/ui/gui/select-cases-dialog.c
+++ b/
src/ui/gui/select-cases-dialog.c
@@
-26,7
+26,7
@@
#include "dict-display.h"
#include "widget-io.h"
#include <language/syntax-string-source.h>
#include "dict-display.h"
#include "widget-io.h"
#include <language/syntax-string-source.h>
-#include "
psppire-syntax-window
.h"
+#include "
helper
.h"
#include <gettext.h>
#include <gettext.h>
@@
-354,6
+354,7
@@
select_cases_dialog (GObject *o, gpointer data)
case GTK_RESPONSE_OK:
{
gchar *syntax = generate_syntax (&scd);
case GTK_RESPONSE_OK:
{
gchar *syntax = generate_syntax (&scd);
+
struct getl_interface *sss = create_syntax_string_source (syntax);
execute_syntax (sss);
struct getl_interface *sss = create_syntax_string_source (syntax);
execute_syntax (sss);
@@
-363,12
+364,7
@@
select_cases_dialog (GObject *o, gpointer data)
case PSPPIRE_RESPONSE_PASTE:
{
gchar *syntax = generate_syntax (&scd);
case PSPPIRE_RESPONSE_PASTE:
{
gchar *syntax = generate_syntax (&scd);
-
- GtkWidget *se = psppire_syntax_window_new ();
-
- gtk_text_buffer_insert_at_cursor (PSPPIRE_SYNTAX_WINDOW (se)->buffer, syntax, -1);
-
- gtk_widget_show (se);
+ paste_syntax_in_new_window (syntax);
g_free (syntax);
}
g_free (syntax);
}
diff --git
a/src/ui/gui/sort-cases-dialog.c
b/src/ui/gui/sort-cases-dialog.c
index 9e294861fe210a295346da63a5cf6b36e1623580..6da083be724ef166b6a89f86259f39083e19d03b 100644
(file)
--- a/
src/ui/gui/sort-cases-dialog.c
+++ b/
src/ui/gui/sort-cases-dialog.c
@@
-25,7
+25,7
@@
#include "dict-display.h"
#include <language/syntax-string-source.h>
#include "dict-display.h"
#include <language/syntax-string-source.h>
-#include "
psppire-syntax-window
.h"
+#include "
helper
.h"
static void
refresh (PsppireDialog *dialog, GtkTreeView *dest)
static void
refresh (PsppireDialog *dialog, GtkTreeView *dest)
@@
-143,6
+143,7
@@
sort_cases_dialog (GObject *o, gpointer data)
case GTK_RESPONSE_OK:
{
gchar *syntax = generate_syntax (&scd);
case GTK_RESPONSE_OK:
{
gchar *syntax = generate_syntax (&scd);
+
struct getl_interface *sss = create_syntax_string_source (syntax);
execute_syntax (sss);
struct getl_interface *sss = create_syntax_string_source (syntax);
execute_syntax (sss);
@@
-152,12
+153,7
@@
sort_cases_dialog (GObject *o, gpointer data)
case PSPPIRE_RESPONSE_PASTE:
{
gchar *syntax = generate_syntax (&scd);
case PSPPIRE_RESPONSE_PASTE:
{
gchar *syntax = generate_syntax (&scd);
-
- GtkWidget *se = psppire_syntax_window_new ();
-
- gtk_text_buffer_insert_at_cursor (PSPPIRE_SYNTAX_WINDOW (se)->buffer, syntax, -1);
-
- gtk_widget_show (se);
+ paste_syntax_in_new_window (syntax);
g_free (syntax);
}
g_free (syntax);
}
diff --git
a/src/ui/gui/split-file-dialog.c
b/src/ui/gui/split-file-dialog.c
index f548a7aac297e57d38852017c246606b40c5c91a..c44d5591cd9c08e20f88cd2bd90bf63658c09318 100644
(file)
--- a/
src/ui/gui/split-file-dialog.c
+++ b/
src/ui/gui/split-file-dialog.c
@@
-23,7
+23,7
@@
#include "psppire-data-window.h"
#include "dict-display.h"
#include <language/syntax-string-source.h>
#include "psppire-data-window.h"
#include "dict-display.h"
#include <language/syntax-string-source.h>
-#include "
psppire-syntax-window
.h"
+#include "
helper
.h"
#include <data/dictionary.h>
#include <gtk/gtk.h>
#include <data/dictionary.h>
#include <gtk/gtk.h>
@@
-221,6
+221,7
@@
split_file_dialog (GObject *o, gpointer data)
case GTK_RESPONSE_OK:
{
gchar *syntax = generate_syntax (&sfd);
case GTK_RESPONSE_OK:
{
gchar *syntax = generate_syntax (&sfd);
+
struct getl_interface *sss = create_syntax_string_source (syntax);
execute_syntax (sss);
struct getl_interface *sss = create_syntax_string_source (syntax);
execute_syntax (sss);
@@
-230,12
+231,7
@@
split_file_dialog (GObject *o, gpointer data)
case PSPPIRE_RESPONSE_PASTE:
{
gchar *syntax = generate_syntax (&sfd);
case PSPPIRE_RESPONSE_PASTE:
{
gchar *syntax = generate_syntax (&sfd);
-
- GtkWidget *se = psppire_syntax_window_new ();
-
- gtk_text_buffer_insert_at_cursor (PSPPIRE_SYNTAX_WINDOW (se)->buffer, syntax, -1);
-
- gtk_widget_show (se);
+ paste_syntax_in_new_window (syntax);
g_free (syntax);
}
g_free (syntax);
}
diff --git
a/src/ui/gui/t-test-independent-samples-dialog.c
b/src/ui/gui/t-test-independent-samples-dialog.c
index a54a94addccebf7bf758a1d4e848cf650d126338..4ceab4d8e8cfa91840c359f866d97e5a62460ae1 100644
(file)
--- a/
src/ui/gui/t-test-independent-samples-dialog.c
+++ b/
src/ui/gui/t-test-independent-samples-dialog.c
@@
-32,7
+32,7
@@
#include <ui/syntax-gen.h>
#include <language/syntax-string-source.h>
#include <ui/syntax-gen.h>
#include <language/syntax-string-source.h>
-#include "
psppire-syntax-window
.h"
+#include "
helper
.h"
#include <gl/xalloc.h>
#include <gl/xalloc.h>
@@
-475,6
+475,7
@@
t_test_independent_samples_dialog (GObject *o, gpointer data)
case GTK_RESPONSE_OK:
{
gchar *syntax = generate_syntax (&tt_d);
case GTK_RESPONSE_OK:
{
gchar *syntax = generate_syntax (&tt_d);
+
struct getl_interface *sss = create_syntax_string_source (syntax);
execute_syntax (sss);
struct getl_interface *sss = create_syntax_string_source (syntax);
execute_syntax (sss);
@@
-484,13
+485,7
@@
t_test_independent_samples_dialog (GObject *o, gpointer data)
case PSPPIRE_RESPONSE_PASTE:
{
gchar *syntax = generate_syntax (&tt_d);
case PSPPIRE_RESPONSE_PASTE:
{
gchar *syntax = generate_syntax (&tt_d);
-
- GtkWidget *se = psppire_syntax_window_new ();
-
- gtk_text_buffer_insert_at_cursor (PSPPIRE_SYNTAX_WINDOW (se)->buffer, syntax, -1);
-
- gtk_widget_show (se);
-
+ paste_syntax_in_new_window (syntax);
g_free (syntax);
}
break;
g_free (syntax);
}
break;
diff --git
a/src/ui/gui/t-test-one-sample.c
b/src/ui/gui/t-test-one-sample.c
index 6ce649b935a108c1323e3558d8f2308b79655a9e..985845015f56db5473cbd4d035a385666b0d2d05 100644
(file)
--- a/
src/ui/gui/t-test-one-sample.c
+++ b/
src/ui/gui/t-test-one-sample.c
@@
-31,7
+31,6
@@
#include "t-test-options.h"
#include <language/syntax-string-source.h>
#include "t-test-options.h"
#include <language/syntax-string-source.h>
-#include "psppire-syntax-window.h"
#include <gettext.h>
#define _(msgid) gettext (msgid)
#include <gettext.h>
#define _(msgid) gettext (msgid)
@@
-181,6
+180,7
@@
t_test_one_sample_dialog (GObject *o, gpointer data)
case GTK_RESPONSE_OK:
{
gchar *syntax = generate_syntax (&tt_d);
case GTK_RESPONSE_OK:
{
gchar *syntax = generate_syntax (&tt_d);
+
struct getl_interface *sss = create_syntax_string_source (syntax);
execute_syntax (sss);
struct getl_interface *sss = create_syntax_string_source (syntax);
execute_syntax (sss);
@@
-191,11
+191,7
@@
t_test_one_sample_dialog (GObject *o, gpointer data)
{
gchar *syntax = generate_syntax (&tt_d);
{
gchar *syntax = generate_syntax (&tt_d);
- GtkWidget *se = psppire_syntax_window_new ();
-
- gtk_text_buffer_insert_at_cursor (PSPPIRE_SYNTAX_WINDOW (se)->buffer, syntax, -1);
-
- gtk_widget_show (se);
+ paste_syntax_in_new_window (syntax);
g_free (syntax);
}
g_free (syntax);
}
diff --git
a/src/ui/gui/t-test-paired-samples.c
b/src/ui/gui/t-test-paired-samples.c
index b84bee9bfc90dff286c345c79a3dbfea546ef7b7..58b68b2ff2f652d387f34d1d7394e33e20f8437f 100644
(file)
--- a/
src/ui/gui/t-test-paired-samples.c
+++ b/
src/ui/gui/t-test-paired-samples.c
@@
-31,8
+31,6
@@
#include "dialog-common.h"
#include "psppire-dialog.h"
#include "dialog-common.h"
#include "psppire-dialog.h"
-#include "psppire-syntax-window.h"
-
#include "helper.h"
#include "psppire-var-ptr.h"
#include "helper.h"
#include "psppire-var-ptr.h"
@@
-255,6
+253,7
@@
t_test_paired_samples_dialog (GObject *o, gpointer data)
case GTK_RESPONSE_OK:
{
gchar *syntax = generate_syntax (&tt_d);
case GTK_RESPONSE_OK:
{
gchar *syntax = generate_syntax (&tt_d);
+
struct getl_interface *sss = create_syntax_string_source (syntax);
execute_syntax (sss);
struct getl_interface *sss = create_syntax_string_source (syntax);
execute_syntax (sss);
@@
-264,12
+263,7
@@
t_test_paired_samples_dialog (GObject *o, gpointer data)
case PSPPIRE_RESPONSE_PASTE:
{
gchar *syntax = generate_syntax (&tt_d);
case PSPPIRE_RESPONSE_PASTE:
{
gchar *syntax = generate_syntax (&tt_d);
-
- GtkWidget *se = psppire_syntax_window_new ();
-
- gtk_text_buffer_insert_at_cursor (PSPPIRE_SYNTAX_WINDOW (se)->buffer, syntax, -1);
-
- gtk_widget_show (se);
+ paste_syntax_in_new_window (syntax);
g_free (syntax);
}
g_free (syntax);
}
diff --git
a/src/ui/gui/text-data-import-dialog.c
b/src/ui/gui/text-data-import-dialog.c
index f749de38581f9a02640472d350f00fc311135e53..fa55bba5e95d64e561682245050b6e3cd56ddf1f 100644
(file)
--- a/
src/ui/gui/text-data-import-dialog.c
+++ b/
src/ui/gui/text-data-import-dialog.c
@@
-45,7
+45,7
@@
#include <ui/gui/psppire-dialog.h>
#include <ui/gui/psppire-var-sheet.h>
#include <ui/gui/psppire-var-store.h>
#include <ui/gui/psppire-dialog.h>
#include <ui/gui/psppire-var-sheet.h>
#include <ui/gui/psppire-var-store.h>
-#include <ui/gui/
psppire-syntax-window
.h>
+#include <ui/gui/
helper
.h>
#include "error.h"
#include "xalloc.h"
#include "error.h"
#include "xalloc.h"
@@
-293,13
+293,7
@@
text_data_import_assistant (GObject *o, gpointer de_)
case PSPPIRE_RESPONSE_PASTE:
{
char *syntax = generate_syntax (ia);
case PSPPIRE_RESPONSE_PASTE:
{
char *syntax = generate_syntax (ia);
-
- GtkWidget *se = psppire_syntax_window_new ();
-
- gtk_text_buffer_insert_at_cursor (PSPPIRE_SYNTAX_WINDOW (se)->buffer, syntax, -1);
-
- gtk_widget_show (se);
-
+ paste_syntax_in_new_window (syntax);
free (syntax);
}
break;
free (syntax);
}
break;
diff --git
a/src/ui/gui/transpose-dialog.c
b/src/ui/gui/transpose-dialog.c
index 1a98a6a53b94c54f6db9eb0a6787affc808e0279..9e8c18f44e2ac601bb9a56bca1ab245b78dce963 100644
(file)
--- a/
src/ui/gui/transpose-dialog.c
+++ b/
src/ui/gui/transpose-dialog.c
@@
-23,7
+23,7
@@
#include "psppire-data-window.h"
#include "dict-display.h"
#include <language/syntax-string-source.h>
#include "psppire-data-window.h"
#include "dict-display.h"
#include <language/syntax-string-source.h>
-#include "
psppire-syntax-window
.h"
+#include "
helper
.h"
#include "dialog-common.h"
#include "dialog-common.h"
@@
-129,6
+129,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,12
+139,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);
-
- GtkWidget *se = psppire_syntax_window_new ();
-
- gtk_text_buffer_insert_at_cursor (PSPPIRE_SYNTAX_WINDOW (se)->buffer, syntax, -1);
-
- gtk_widget_show (se);
+ paste_syntax_in_new_window (syntax);
g_free (syntax);
}
g_free (syntax);
}
diff --git
a/src/ui/gui/variable-info-dialog.c
b/src/ui/gui/variable-info-dialog.c
index 09b545bd6afb10b941b1c5efd02e6813c5f05f66..43a3832c01822dd5829cc42aa317f29700e949a1 100644
(file)
--- a/
src/ui/gui/variable-info-dialog.c
+++ b/
src/ui/gui/variable-info-dialog.c
@@
-29,7
+29,7
@@
#include "helper.h"
#include <language/syntax-string-source.h>
#include "helper.h"
#include <language/syntax-string-source.h>
-#include "
psppire-syntax-window
.h"
+#include "
helper
.h"
#include <gettext.h>
#include <gettext.h>
@@
-214,12
+214,7
@@
variable_info_dialog (GObject *o, gpointer data)
case PSPPIRE_RESPONSE_PASTE:
{
gchar *syntax = generate_syntax (GTK_TREE_VIEW (treeview));
case PSPPIRE_RESPONSE_PASTE:
{
gchar *syntax = generate_syntax (GTK_TREE_VIEW (treeview));
-
- GtkWidget *se = psppire_syntax_window_new ();
-
- gtk_text_buffer_insert_at_cursor (PSPPIRE_SYNTAX_WINDOW (se)->buffer, syntax, -1);
-
- gtk_widget_show (se);
+ paste_syntax_in_new_window (syntax);
g_free (syntax);
}
g_free (syntax);
}
diff --git
a/src/ui/gui/weight-cases-dialog.c
b/src/ui/gui/weight-cases-dialog.c
index 121a523dae5ec5b099444cd8df0b30a8b2aa1330..9d103e1c97c8e6b58023afd88be4fbdf00e1ff43 100644
(file)
--- a/
src/ui/gui/weight-cases-dialog.c
+++ b/
src/ui/gui/weight-cases-dialog.c
@@
-23,7
+23,7
@@
#include "psppire-data-window.h"
#include "dict-display.h"
#include <language/syntax-string-source.h>
#include "psppire-data-window.h"
#include "dict-display.h"
#include <language/syntax-string-source.h>
-#include "
psppire-syntax-window
.h"
+#include "
helper
.h"
#include <gtk/gtk.h>
#include <glade/glade.h>
#include <gtk/gtk.h>
#include <glade/glade.h>
@@
-172,13
+172,7
@@
weight_cases_dialog (GObject *o, gpointer data)
case PSPPIRE_RESPONSE_PASTE:
{
gchar *syntax = generate_syntax (&wcd);
case PSPPIRE_RESPONSE_PASTE:
{
gchar *syntax = generate_syntax (&wcd);
-
- GtkWidget *se = psppire_syntax_window_new ();
-
- gtk_text_buffer_insert_at_cursor (PSPPIRE_SYNTAX_WINDOW (se)->buffer, syntax, -1);
-
- gtk_widget_show (se);
-
+ paste_syntax_in_new_window (syntax);
g_free (syntax);
}
break;
g_free (syntax);
}
break;