#include "helper.h"
#include "about.h"
#include "psppire-dialog.h"
-#include "psppire-var-select.h"
+#include "psppire-selector.h"
+#include "weight-cases-dialog.h"
+#include "split-file-dialog.h"
+#include "transpose-dialog.h"
+#include "sort-cases-dialog.h"
+#include "dict-display.h"
#define _(msgid) gettext (msgid)
#define N_(msgid) msgid
#include "data-editor.h"
#include "syntax-editor.h"
#include <language/syntax-string-source.h>
+#include <libpspp/syntax-gen.h>
#include "window-manager.h"
#include "psppire-data-store.h"
#include "psppire-var-store.h"
-#include "weight-cases-dialog.h"
-
static void register_data_editor_actions (struct data_editor *de);
static void insert_variable (GtkCheckMenuItem *m, gpointer data);
return FALSE;
}
-static void weight_cases_dialog (GObject *o, gpointer data);
-
/*
Create a new data editor.
e = (struct editor_window *) de;
- de->xml = glade_xml_new (PKGDATADIR "/data-editor.glade", NULL, NULL);
-
+ de->xml = XML_NEW ("data-editor.glade");
var_sheet = GTK_SHEET (get_widget_assert (de->xml, "variable_sheet"));
vs = PSPPIRE_VAR_STORE (gtk_sheet_get_model (var_sheet));
+ g_assert(vs); /* Traps a possible bug in win32 build */
+
g_signal_connect (vs->dict, "weight-changed",
G_CALLBACK (on_weight_change),
de);
_("Weight cases by variable"),
"pspp-weight-cases");
-
g_signal_connect (de->invoke_weight_cases_dialog, "activate",
G_CALLBACK (weight_cases_dialog), de);
+
+ de->invoke_transpose_dialog =
+ gtk_action_new ("transpose-dialog",
+ _("Transpose"),
+ _("Transpose the cases with the variables"),
+ NULL);
+
+
+ g_signal_connect (de->invoke_transpose_dialog, "activate",
+ G_CALLBACK (transpose_dialog), de);
+
+
+
+ de->invoke_split_file_dialog =
+ gtk_action_new ("split-file-dialog",
+ _("Split"),
+ _("Split the active file"),
+ "pspp-split-file");
+
+ g_signal_connect (de->invoke_split_file_dialog, "activate",
+ G_CALLBACK (split_file_dialog), de);
+
+
+
+ de->invoke_sort_cases_dialog =
+ gtk_action_new ("sort-cases-dialog",
+ _("Sort"),
+ _("Sort cases in the active file"),
+ "pspp-sort-cases");
+
+ g_signal_connect (de->invoke_sort_cases_dialog, "activate",
+ G_CALLBACK (sort_cases_dialog), de);
+
+
e->window = GTK_WINDOW (get_widget_assert (de->xml, "data_editor"));
g_signal_connect_swapped (get_widget_assert (de->xml,"file_new_data"),
get_widget_assert (de->xml, "data_weight-cases")
);
+ gtk_action_connect_proxy (de->invoke_transpose_dialog,
+ get_widget_assert (de->xml, "data_transpose")
+ );
+
+ gtk_action_connect_proxy (de->invoke_split_file_dialog,
+ get_widget_assert (de->xml, "data_split-file")
+ );
+
+ gtk_action_connect_proxy (de->invoke_sort_cases_dialog,
+ get_widget_assert (de->xml, "data_sort-cases")
+ );
+
g_signal_connect (get_widget_assert (de->xml,"help_about"),
"activate",
get_widget_assert (de->xml, "button-weight-cases")
);
+ gtk_action_connect_proxy (de->invoke_split_file_dialog,
+ get_widget_assert (de->xml, "button-split-file")
+ );
+
g_signal_connect (get_widget_assert (de->xml, "file_quit"),
"activate",
G_CALLBACK (file_quit), de);
}
}
-static void
-weight_cases_dialog (GObject *o, gpointer data)
-{
- gint response;
- struct data_editor *de = data;
- GtkSheet *var_sheet =
- GTK_SHEET (get_widget_assert (de->xml, "variable_sheet"));
-
-
- GladeXML *xml = glade_xml_new (PKGDATADIR "/psppire.glade",
- "weight-cases-dialog", NULL);
-
-
- GtkWidget *treeview = get_widget_assert (xml, "treeview");
- GtkWidget *entry = get_widget_assert (xml, "entry1");
-
-
- PsppireVarStore *vs = PSPPIRE_VAR_STORE (gtk_sheet_get_model (var_sheet));
-
- PsppireVarSelect *select = psppire_var_select_new (treeview,
- entry, vs->dict);
-
-
- PsppireDialog *dialog = create_weight_dialog (select, xml);
-
- response = psppire_dialog_run (dialog);
-
- g_object_unref (xml);
-
- switch (response)
- {
- case GTK_RESPONSE_OK:
- {
- struct getl_interface *sss ;
- const GList *list = psppire_var_select_get_variables (select);
-
- g_assert ( g_list_length ((GList *)list) <= 1 );
-
- if ( list == NULL)
- {
- sss = create_syntax_string_source ("WEIGHT OFF.");
- }
- else
- {
- struct variable *var = list->data;
-
- sss = create_syntax_string_source ("WEIGHT BY %s.\n",
- var_get_name (var));
- }
-
- execute_syntax (sss);
- }
- break;
- case PSPPIRE_RESPONSE_PASTE:
- {
- struct syntax_editor *se = (struct syntax_editor *) window_create (WINDOW_SYNTAX, NULL);
-
- const GList *list = psppire_var_select_get_variables (select);
-
- g_assert ( g_list_length ((GList *)list) <= 1 );
-
- if ( list == NULL)
- {
- gtk_text_buffer_insert_at_cursor (se->buffer, "WEIGHT OFF.", -1);
- }
- else
- {
- struct variable *var = list->data;
-
- gchar *text = g_strdup_printf ("WEIGHT BY %s.",
- var_get_name (var));
-
- gtk_text_buffer_insert_at_cursor (se->buffer,
- text, -1);
-
- g_free (text);
- }
- }
- break;
- default:
- break;
- }
-}
-
\f
static void data_save_as_dialog (GtkAction *, struct data_editor *de);
static void new_file (GtkAction *, struct editor_window *de);
-static void open_data_dialog (GtkAction *, struct editor_window *de);
+static void open_data_dialog (GtkAction *, struct data_editor *de);
static void data_save (GtkAction *action, struct data_editor *e);
save_file (struct data_editor *de)
{
struct getl_interface *sss;
+ struct string file_name ;
g_assert (de->file_name);
+ ds_init_cstr (&file_name, de->file_name);
+ gen_quoted_string (&file_name);
+
if ( de->save_as_portable )
{
append_filename_suffix (de, ".por");
- sss = create_syntax_string_source ("EXPORT OUTFILE='%s'.",
- de->file_name);
+ sss = create_syntax_string_source ("EXPORT OUTFILE=%s.",
+ ds_cstr (&file_name));
}
else
{
append_filename_suffix (de, ".sav");
- sss = create_syntax_string_source ("SAVE OUTFILE='%s'.",
- de->file_name);
+ sss = create_syntax_string_source ("SAVE OUTFILE=%s.",
+ ds_cstr (&file_name));
}
+ ds_destroy (&file_name);
+
execute_syntax (sss);
}
/* Callback for data_new action.
Performs the NEW FILE command */
static void
-new_file (GtkAction *action, struct editor_window *de)
+new_file (GtkAction *action, struct editor_window *e)
{
+ struct data_editor *de = (struct data_editor *) e;
+
struct getl_interface *sss =
create_syntax_string_source ("NEW FILE.");
execute_syntax (sss);
- default_window_name (de);
+ g_free (de->file_name);
+ de->file_name = NULL;
+
+ default_window_name (e);
}
/* Callback for the data_open action.
Prompts for a filename and opens it */
static void
-open_data_dialog (GtkAction *action, struct editor_window *de)
+open_data_dialog (GtkAction *action, struct data_editor *de)
{
+ struct editor_window *e = (struct editor_window *) de;
+
GtkWidget *dialog =
gtk_file_chooser_dialog_new (_("Open"),
- GTK_WINDOW (de->window),
+ GTK_WINDOW (e->window),
GTK_FILE_CHOOSER_ACTION_OPEN,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
case GTK_RESPONSE_ACCEPT:
{
struct getl_interface *sss;
- gchar *file_name =
+ struct string filename;
+ g_free (de->file_name);
+ de->file_name =
gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
- sss = create_syntax_string_source ("GET FILE='%s'.", file_name);
+ ds_init_cstr (&filename, de->file_name);
- execute_syntax (sss);
+ gen_quoted_string (&filename);
- window_set_name_from_filename (de, file_name);
+ sss = create_syntax_string_source ("GET FILE=%s.",
+ ds_cstr (&filename));
- g_free (file_name);
+ execute_syntax (sss);
+ ds_destroy (&filename);
+
+ window_set_name_from_filename (e, de->file_name);
}
break;
default:
projects / pspp-builds.git / blobdiff