projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
PsppireSelector: new properties: "source-widget" and "dest-widget".
[pspp-builds.git]
/
src
/
ui
/
gui
/
descriptives-dialog.c
diff --git
a/src/ui/gui/descriptives-dialog.c
b/src/ui/gui/descriptives-dialog.c
index 4697c9fdfa073308f08fc1ef823519537f90af97..1b49d92130839f9db49f0d3cc8d57390043bd1b7 100644
(file)
--- a/
src/ui/gui/descriptives-dialog.c
+++ b/
src/ui/gui/descriptives-dialog.c
@@
-20,17
+20,16
@@
#include "descriptives-dialog.h"
#include <gtk/gtk.h>
#include "descriptives-dialog.h"
#include <gtk/gtk.h>
-#include <gtksheet/gtksheet.h>
#include <stdlib.h>
#include <language/syntax-string-source.h>
#include <stdlib.h>
#include <language/syntax-string-source.h>
-#include <ui/gui/
data-editor
.h>
+#include <ui/gui/
psppire-data-window
.h>
#include <ui/gui/dialog-common.h>
#include <ui/gui/dict-display.h>
#include <ui/gui/helper.h>
#include <ui/gui/psppire-dialog.h>
#include <ui/gui/psppire-var-store.h>
#include <ui/gui/dialog-common.h>
#include <ui/gui/dict-display.h>
#include <ui/gui/helper.h>
#include <ui/gui/psppire-dialog.h>
#include <ui/gui/psppire-var-store.h>
-#include
<ui/gui/syntax-editor.h>
+#include
"executor.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@
-118,7
+117,7
@@
generate_syntax (const struct descriptives_dialog *scd)
string = g_string_new ("DESCRIPTIVES");
g_string_append (string, "\n /VARIABLES=");
string = g_string_new ("DESCRIPTIVES");
g_string_append (string, "\n /VARIABLES=");
- append_variable_names (string, scd->dict, GTK_TREE_VIEW (scd->stat_vars));
+ append_variable_names (string, scd->dict, GTK_TREE_VIEW (scd->stat_vars)
, 0
);
listwise = gtk_toggle_button_get_active (scd->exclude_missing_listwise);
include = gtk_toggle_button_get_active (scd->include_user_missing);
listwise = gtk_toggle_button_get_active (scd->exclude_missing_listwise);
include = gtk_toggle_button_get_active (scd->include_user_missing);
@@
-203,11
+202,11
@@
void
descriptives_dialog (GObject *o, gpointer data)
{
gint response;
descriptives_dialog (GObject *o, gpointer data)
{
gint response;
-
struct data_editor *de = data
;
+
PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data)
;
struct descriptives_dialog scd;
struct descriptives_dialog scd;
- G
ladeXML *xml = XML_NEW ("descriptives-dialog.glade
");
+ G
tkBuilder *xml = builder_new ("descriptives.ui
");
GtkWidget *dialog = get_widget_assert (xml, "descriptives-dialog");
GtkWidget *dialog = get_widget_assert (xml, "descriptives-dialog");
@@
-218,23
+217,23
@@
descriptives_dialog (GObject *o, gpointer data)
GtkWidget *stats_treeview = get_widget_assert (xml, "statistics");
GtkWidget *stats_treeview = get_widget_assert (xml, "statistics");
- GtkSheet *var_sheet =
- GTK_SHEET (get_widget_assert (de->xml, "variable_sheet"));
+ PsppireVarStore *vs = NULL;
+ PsppireDict *dict;
+
+ g_object_get (de->data_editor, "var-store", &vs, NULL);
+ g_object_get (vs, "dictionary", &dict, NULL);
-
PsppireVarStore *vs = PSPPIRE_VAR_STORE (gtk_sheet_get_model (var_sheet
));
+
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (de
));
- gtk_window_set_transient_for (GTK_WINDOW (dialog), de->parent.window);
- attach_dictionary_to_treeview (GTK_TREE_VIEW (source),
- vs->dict,
- GTK_SELECTION_MULTIPLE, var_is_numeric);
+ g_object_set (source, "dictionary", dict,
+ "predicate", var_is_numeric, NULL);
- set_dest_model (GTK_TREE_VIEW (dest),
vs->
dict);
+ set_dest_model (GTK_TREE_VIEW (dest), dict);
psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector),
psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector),
- source,
- dest,
insert_source_row_into_tree_view,
insert_source_row_into_tree_view,
+ NULL,
NULL);
put_checkbox_items_in_treeview (GTK_TREE_VIEW (stats_treeview),
NULL);
put_checkbox_items_in_treeview (GTK_TREE_VIEW (stats_treeview),
@@
-243,7
+242,9
@@
descriptives_dialog (GObject *o, gpointer data)
scd.stat_vars = GTK_TREE_VIEW (dest);
scd.stats = gtk_tree_view_get_model (GTK_TREE_VIEW (stats_treeview));
scd.stat_vars = GTK_TREE_VIEW (dest);
scd.stats = gtk_tree_view_get_model (GTK_TREE_VIEW (stats_treeview));
- scd.dict = vs->dict;
+
+ g_object_get (vs, "dictionary", &scd.dict, NULL);
+
scd.include_user_missing =
GTK_TOGGLE_BUTTON (get_widget_assert (xml, "include_user_missing"));
scd.exclude_missing_listwise =
scd.include_user_missing =
GTK_TOGGLE_BUTTON (get_widget_assert (xml, "include_user_missing"));
scd.exclude_missing_listwise =
@@
-264,6
+265,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);
@@
-273,12
+275,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);
-
- 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);
}
break;
g_free (syntax);
}
break;