#include <gtk/gtksignal.h>
#include <gtk/gtkbox.h>
+#include "executor.h"
#include "helper.h"
#include "text-data-import-dialog.h"
#include "crosstabs-dialog.h"
#include "frequencies-dialog.h"
#include "examine-dialog.h"
-#include "dict-display.h"
#include "regression-dialog.h"
+#include "reliability-dialog.h"
#include "oneway-anova-dialog.h"
#include "t-test-independent-samples-dialog.h"
#include "t-test-one-sample.h"
extern struct dataset *the_dataset;
extern PsppireDataStore *the_data_store ;
+extern GtkRecentManager *the_recent_mgr;
static void
set_paste_menuitem_sensitivity (PsppireDataWindow *de, gboolean x)
else
{
PsppireVarStore *vs = NULL;
+ PsppireDict *dict = NULL;
struct variable *var ;
gchar *text ;
g_object_get (de->data_editor, "var-store", &vs, NULL);
+ g_object_get (vs, "dictionary", &dict, NULL);
- var = psppire_dict_get_variable (vs->dict, filter_index);
+ var = psppire_dict_get_variable (dict, filter_index);
text = g_strdup_printf (_("Filter by %s"), var_get_name (var));
{
struct variable *var ;
PsppireVarStore *vs = NULL;
+ PsppireDict *dict = NULL;
gchar *text;
g_object_get (de->data_editor, "var-store", &vs, NULL);
-
- var = psppire_dict_get_variable (vs->dict, weight_index);
+ g_object_get (vs, "dictionary", &dict, NULL);
+
+ var = psppire_dict_get_variable (dict, weight_index);
text = g_strdup_printf (_("Weight by %s"), var_get_name (var));
}
}
-/* Puts FILE_NAME into the recent list.
- If it's already in the list, it moves it to the top
-*/
+#if 0
static void
-add_most_recent (const char *file_name)
+dump_rm (GtkRecentManager *rm)
{
+ GList *items = gtk_recent_manager_get_items (rm);
+
+ GList *i;
+
+ g_print ("Recent Items:\n");
+ for (i = items; i; i = i->next)
+ {
+ GtkRecentInfo *ri = i->data;
+
+ g_print ("Item: %s (Mime: %s) (Desc: %s) (URI: %s)\n",
+ gtk_recent_info_get_short_name (ri),
+ gtk_recent_info_get_mime_type (ri),
+ gtk_recent_info_get_description (ri),
+ gtk_recent_info_get_uri (ri)
+ );
+
+
+ gtk_recent_info_unref (ri);
+ }
+
+ g_list_free (items);
}
+#endif
-void
-psppire_data_window_load_file (PsppireDataWindow *de,
- const gchar *file_name)
+
+static gboolean
+load_file (PsppireWindow *de, const gchar *file_name)
{
+ gchar *native_file_name;
struct getl_interface *sss;
struct string filename;
ds_init_empty (&filename);
- syntax_gen_string (&filename, ss_cstr (file_name));
+
+ native_file_name =
+ convert_glib_filename_to_system_filename (file_name, NULL);
+
+ syntax_gen_string (&filename, ss_cstr (native_file_name));
+
+ g_free (native_file_name);
sss = create_syntax_string_source ("GET FILE=%s.",
ds_cstr (&filename));
+
ds_destroy (&filename);
if (execute_syntax (sss) )
- {
- psppire_window_set_filename (PSPPIRE_WINDOW (de), file_name);
- add_most_recent (file_name);
- }
+ return TRUE;
- psppire_window_set_unsaved (PSPPIRE_WINDOW (de), FALSE);
+ return FALSE;
}
-
-/* Callback for the data_open action.
- Prompts for a filename and opens it */
-static void
-open_data_dialog (GtkAction *action, PsppireDataWindow *de)
+static GtkWidget *
+sysfile_chooser_dialog (PsppireWindow *toplevel)
{
GtkWidget *dialog =
gtk_file_chooser_dialog_new (_("Open"),
- GTK_WINDOW (de),
+ GTK_WINDOW (toplevel),
GTK_FILE_CHOOSER_ACTION_OPEN,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
gtk_file_filter_add_pattern (filter, "*");
gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
-
{
gchar *dir_name;
gchar *filename = NULL;
- g_object_get (de, "filename", &filename, NULL);
+ g_object_get (toplevel, "filename", &filename, NULL);
- dir_name = g_path_get_dirname (filename);
+ if ( ! g_path_is_absolute (filename))
+ {
+ gchar *path =
+ g_build_filename (g_get_current_dir (), filename, NULL);
+ dir_name = g_path_get_dirname (path);
+ g_free (path);
+ }
+ else
+ {
+ dir_name = g_path_get_dirname (filename);
+ }
gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog),
dir_name);
free (dir_name);
}
+ return dialog;
+}
+
+/* Callback for the data_open action.
+ Prompts for a filename and opens it */
+static void
+open_data_dialog (GtkAction *action, PsppireWindow *de)
+{
+ GtkWidget *dialog = sysfile_chooser_dialog (de);
+
switch (gtk_dialog_run (GTK_DIALOG (dialog)))
{
case GTK_RESPONSE_ACCEPT:
gchar *name =
gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
- psppire_data_window_load_file (de, name);
+ psppire_window_load (de, name);
g_free (name);
}
/* Save DE to file */
static void
-save_file (PsppireDataWindow *de)
+save_file (PsppireWindow *w)
{
- gchar *fn = NULL;
+ gchar *native_file_name = NULL;
+ gchar *file_name = NULL;
GString *fnx;
struct getl_interface *sss;
- struct string file_name ;
+ struct string filename ;
+ PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (w);
- g_object_get (de, "filename", &fn, NULL);
+ g_object_get (w, "filename", &file_name, NULL);
- fnx = g_string_new (fn);
+ fnx = g_string_new (file_name);
if ( ! name_has_suffix (fnx->str))
{
g_string_append (fnx, ".sav");
}
- ds_init_empty (&file_name);
- syntax_gen_string (&file_name, ss_cstr (fnx->str));
- g_string_free (fnx, FALSE);
+ ds_init_empty (&filename);
+
+ native_file_name =
+ convert_glib_filename_to_system_filename (fnx->str, NULL);
+
+ g_string_free (fnx, TRUE);
+
+ syntax_gen_string (&filename, ss_cstr (native_file_name));
+ g_free (native_file_name);
if ( de->save_as_portable )
{
sss = create_syntax_string_source ("EXPORT OUTFILE=%s.",
- ds_cstr (&file_name));
+ ds_cstr (&filename));
}
else
{
sss = create_syntax_string_source ("SAVE OUTFILE=%s.",
- ds_cstr (&file_name));
+ ds_cstr (&filename));
}
- ds_destroy (&file_name);
+ ds_destroy (&filename);
execute_syntax (sss);
-
- psppire_window_set_unsaved (PSPPIRE_WINDOW (de), FALSE);
}
insert_case (GtkAction *action, gpointer data)
{
PsppireDataWindow *dw = PSPPIRE_DATA_WINDOW (data);
-
psppire_data_editor_insert_case (dw->data_editor);
}
}
+static void
+display_dict (PsppireDataWindow *de)
+{
+
+ struct getl_interface *sss =
+ create_syntax_string_source ("DISPLAY DICTIONARY.");
+
+ execute_syntax (sss);
+}
+
+static void
+sysfile_info (PsppireDataWindow *de)
+{
+ GtkWidget *dialog = sysfile_chooser_dialog (PSPPIRE_WINDOW (de));
+
+ if ( GTK_RESPONSE_ACCEPT == gtk_dialog_run (GTK_DIALOG (dialog)))
+ {
+ struct string filename;
+ struct getl_interface *sss;
+ gchar *file_name =
+ gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
+
+ gchar *native_file_name =
+ convert_glib_filename_to_system_filename (file_name, NULL);
+
+ ds_init_empty (&filename);
+
+ syntax_gen_string (&filename, ss_cstr (native_file_name));
+
+ g_free (native_file_name);
+
+ sss = create_syntax_string_source ("SYSFILE INFO %s.",
+ ds_cstr (&filename));
+ execute_syntax (sss);
+ }
+
+ gtk_widget_destroy (dialog);
+}
+
+
/* Callback for data_save_as action. Prompt for a filename and save */
static void
data_save_as_dialog (PsppireDataWindow *de)
psppire_window_set_filename (PSPPIRE_WINDOW (de), filename->str);
- save_file (de);
+ save_file (PSPPIRE_WINDOW (de));
g_string_free (filename, TRUE);
}
const gchar *fn = psppire_window_get_filename (de);
if ( NULL != fn)
- save_file (PSPPIRE_DATA_WINDOW (de));
+ psppire_window_save (de);
else
data_save_as_dialog (PSPPIRE_DATA_WINDOW (de));
}
fonts_activate (GtkMenuItem *menuitem, gpointer data)
{
PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
+ GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (de));
PangoFontDescription *current_font;
gchar *font_name;
GtkWidget *dialog =
g_free (font_name);
gtk_window_set_transient_for (GTK_WINDOW (dialog),
- GTK_WINDOW (get_widget_assert (de->builder,
- "data_editor")));
+ GTK_WINDOW (toplevel));
+
if ( GTK_RESPONSE_OK == gtk_dialog_run (GTK_DIALOG (dialog)) )
{
const gchar *font = gtk_font_selection_dialog_get_font_name
gtk_menu_shell_append (GTK_MENU_SHELL (menu), sort_ascending);
- g_signal_connect_swapped (G_OBJECT (sort_ascending), "activate",
+ g_signal_connect_swapped (sort_ascending, "activate",
G_CALLBACK (psppire_data_editor_sort_ascending),
de->data_editor);
- g_signal_connect_swapped (G_OBJECT (sort_descending), "activate",
+ g_signal_connect_swapped (sort_descending, "activate",
G_CALLBACK (psppire_data_editor_sort_descending),
de->data_editor);
- g_signal_connect_swapped (G_OBJECT (insert_variable), "activate",
+ g_signal_connect_swapped (insert_variable, "activate",
G_CALLBACK (gtk_action_activate),
de->insert_variable);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), insert_case);
- g_signal_connect_swapped (G_OBJECT (insert_case), "activate",
+ g_signal_connect_swapped (insert_case, "activate",
G_CALLBACK (gtk_action_activate),
de->insert_case);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), insert_variable);
- g_signal_connect_swapped (G_OBJECT (insert_variable), "activate",
+ g_signal_connect_swapped (insert_variable, "activate",
G_CALLBACK (gtk_action_activate),
de->insert_variable);
static void
-on_recent_data_select (GtkMenuShell *menushell, gpointer user_data)
+on_recent_data_select (GtkMenuShell *menushell,
+ PsppireWindow *window)
{
gchar *file;
- PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (user_data);
gchar *uri =
gtk_recent_chooser_get_current_uri (GTK_RECENT_CHOOSER (menushell));
g_free (uri);
- psppire_data_window_load_file (de, file);
+ psppire_window_load (window, file);
g_free (file);
}
se = psppire_syntax_window_new ();
- psppire_syntax_window_load_from_file (PSPPIRE_SYNTAX_WINDOW (se), file, NULL);
- gtk_widget_show (se);
+ if ( psppire_window_load (PSPPIRE_WINDOW (se), file) )
+ gtk_widget_show (se);
+ else
+ gtk_widget_destroy (se);
g_free (file);
}
static void
set_unsaved (gpointer w)
{
- psppire_window_set_unsaved (PSPPIRE_WINDOW (w), TRUE);
+ psppire_window_set_unsaved (PSPPIRE_WINDOW (w));
}
static void
psppire_data_window_init (PsppireDataWindow *de)
{
PsppireVarStore *vs;
+ PsppireDict *dict = NULL;
GtkWidget *menubar;
GtkWidget *hb ;
connect_help (de->builder);
- g_object_ref (menubar);
- gtk_widget_unparent (menubar);
-
- g_object_ref (hb);
- gtk_widget_unparent (hb);
-
- g_object_ref (sb);
- gtk_widget_unparent (sb);
-
gtk_box_pack_start (GTK_BOX (box), menubar, FALSE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (box), hb, FALSE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (box), GTK_WIDGET (de->data_editor), TRUE, TRUE, 0);
g_assert(vs); /* Traps a possible bug in w32 build */
- g_signal_connect (vs->dict, "weight-changed",
+ g_object_get (vs, "dictionary", &dict, NULL);
+
+ g_signal_connect (dict, "weight-changed",
G_CALLBACK (on_weight_change),
de);
- g_signal_connect (vs->dict, "filter-changed",
+ g_signal_connect (dict, "filter-changed",
G_CALLBACK (on_filter_change),
de);
- g_signal_connect (vs->dict, "split-changed",
+ g_signal_connect (dict, "split-changed",
G_CALLBACK (on_split_change),
de);
{
+ GtkWidget *toolbarbutton = get_widget_assert (de->builder, "button-open");
+
GtkAction *action_data_open =
- resolve_action (de->builder, "file_open_data", "button-open");
+ resolve_action (de->builder, "file_open_data", NULL);
g_object_set (action_data_open,
"tooltip", _("Open a data file"),
g_signal_connect (action_data_open, "activate",
G_CALLBACK (open_data_dialog), de);
+
+ g_signal_connect_swapped (toolbarbutton, "clicked",
+ G_CALLBACK (gtk_action_activate), action_data_open);
}
}
+ {
+ GtkAction *action_info_working_file =
+ resolve_action (de->builder,
+ "file_information_working-file", NULL);
+
+
+ g_signal_connect_swapped (action_info_working_file, "activate",
+ G_CALLBACK (display_dict), de);
+ }
+
+
+ {
+ GtkAction *action_info_external_file =
+ resolve_action (de->builder,
+ "file_information_external-file", NULL);
+
+
+ g_signal_connect_swapped (action_info_external_file, "activate",
+ G_CALLBACK (sysfile_info), de);
+ }
+
+
{
GtkAction *value_labels_action =
G_CALLBACK (regression_dialog), de);
}
+ {
+ GtkAction *invoke_reliability_dialog =
+ resolve_action (de->builder, "reliability", NULL);
+
+ g_object_set (invoke_reliability_dialog,
+ "tooltip", _("Reliability Analysis"),
+ "stock-id", "pspp-reliability",
+ NULL
+ );
+
+ g_signal_connect (invoke_reliability_dialog, "activate",
+ G_CALLBACK (reliability_dialog), de);
+ }
+
-#if 0
{
- GtkRecentManager *rm = gtk_recent_manager_get_default ();
- GtkAction *recent_data = get_action_assert (de->builder, "file_recent-data");
- GtkAction *recent_files = get_action_assert (de->builder, "file_recent-files");
-#if 0
- GtkWidget *recent_separator = get_widget_assert (de->builder, "file_separator1");
-#endif
+ GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (de->builder, "uimanager1", GTK_TYPE_UI_MANAGER));
- GtkWidget *menu = gtk_recent_chooser_menu_new_for_manager (rm);
+ GtkWidget *recent_data =
+ gtk_ui_manager_get_widget (uim,"/ui/menubar/file/file_recent-data");
- GtkRecentFilter *filter = gtk_recent_filter_new ();
+ GtkWidget *recent_files =
+ gtk_ui_manager_get_widget (uim,"/ui/menubar/file/file_recent-files");
-#if 0
- gtk_widget_show (recent_data);
- gtk_widget_show (recent_files);
- gtk_widget_show (recent_separator);
-#endif
- gtk_recent_filter_add_pattern (filter, "*.sav");
- gtk_recent_filter_add_pattern (filter, "*.SAV");
+ GtkWidget *menu_data =
+ gtk_recent_chooser_menu_new_for_manager (the_recent_mgr);
+
+ GtkWidget *menu_files =
+ gtk_recent_chooser_menu_new_for_manager (the_recent_mgr);
+
+ {
+ GtkRecentFilter *filter = gtk_recent_filter_new ();
+
+ gtk_recent_filter_add_pattern (filter, "*.sav");
+ gtk_recent_filter_add_pattern (filter, "*.SAV");
+ gtk_recent_filter_add_pattern (filter, "*.por");
+ gtk_recent_filter_add_pattern (filter, "*.POR");
- gtk_recent_chooser_add_filter (GTK_RECENT_CHOOSER (menu), filter);
+ gtk_recent_chooser_set_sort_type (GTK_RECENT_CHOOSER (menu_data), GTK_RECENT_SORT_MRU);
- gtk_action_set_sensitive (recent_data, TRUE);
- g_signal_connect (menu, "selection-done",
- G_CALLBACK (on_recent_data_select), de);
+ gtk_recent_chooser_add_filter (GTK_RECENT_CHOOSER (menu_data), filter);
+ }
- gtk_menu_item_set_submenu (GTK_MENU_ITEM (recent_data), menu);
+ gtk_menu_item_set_submenu (GTK_MENU_ITEM (recent_data), menu_data);
- filter = gtk_recent_filter_new ();
- menu = gtk_recent_chooser_menu_new_for_manager (rm);
+ g_signal_connect (menu_data, "selection-done",
+ G_CALLBACK (on_recent_data_select),
+ de);
- gtk_recent_filter_add_pattern (filter, "*.sps");
- gtk_recent_filter_add_pattern (filter, "*.SPS");
+ {
+ GtkRecentFilter *filter = gtk_recent_filter_new ();
- gtk_recent_chooser_add_filter (GTK_RECENT_CHOOSER (menu), filter);
+ gtk_recent_filter_add_pattern (filter, "*.sps");
+ gtk_recent_filter_add_pattern (filter, "*.SPS");
- gtk_widget_set_sensitive (recent_files, TRUE);
- g_signal_connect (menu, "selection-done",
- G_CALLBACK (on_recent_files_select), de);
+ gtk_recent_chooser_set_sort_type (GTK_RECENT_CHOOSER (menu_files), GTK_RECENT_SORT_MRU);
+
+ gtk_recent_chooser_add_filter (GTK_RECENT_CHOOSER (menu_files), filter);
+ }
+
+ gtk_menu_item_set_submenu (GTK_MENU_ITEM (recent_files), menu_files);
+
+ g_signal_connect (menu_files, "selection-done",
+ G_CALLBACK (on_recent_files_select),
+ de);
- gtk_menu_item_set_submenu (GTK_MENU_ITEM (recent_files), menu);
}
-#endif
g_signal_connect (get_action_assert (de->builder,"file_new_syntax"),
"activate",
de);
- g_signal_connect (GTK_NOTEBOOK (de->data_editor),
+ g_signal_connect (de->data_editor,
"switch-page",
G_CALLBACK (on_switch_sheet), de);
de);
}
- de->data_sheet_variable_popup_menu =
- GTK_MENU (create_data_sheet_variable_popup_menu (de));
-
- de->var_sheet_variable_popup_menu =
- GTK_MENU (create_var_sheet_variable_popup_menu (de));
+ {
+ GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (de->builder, "uimanager1", GTK_TYPE_UI_MANAGER));
- de->data_sheet_cases_popup_menu =
- GTK_MENU (create_data_sheet_cases_popup_menu (de));
+ PSPPIRE_WINDOW (de)->menu =
+ GTK_MENU_SHELL (gtk_ui_manager_get_widget (uim,"/ui/menubar/windows/windows_minimise_all")->parent);
+ }
{
- GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (de->builder, "uimanager1", GTK_TYPE_UI_MANAGER));
+ GtkMenu *data_sheet_variable_popup_menu =
+ GTK_MENU (create_data_sheet_variable_popup_menu (de));
- PSPPIRE_WINDOW (de)->menu =
- GTK_MENU_SHELL (gtk_ui_manager_get_widget (uim,"/ui/menubar/windows/windows_minimise_all")->parent);
- }
+ GtkMenu *var_sheet_variable_popup_menu =
+ GTK_MENU (create_var_sheet_variable_popup_menu (de));
+ GtkMenu *data_sheet_cases_popup_menu =
+ GTK_MENU (create_data_sheet_cases_popup_menu (de));
- g_object_set (de->data_editor,
- "datasheet-column-menu", de->data_sheet_variable_popup_menu,
- "datasheet-row-menu", de->data_sheet_cases_popup_menu,
- "varsheet-row-menu", de->var_sheet_variable_popup_menu,
- NULL);
+ g_object_set (de->data_editor,
+ "datasheet-column-menu", data_sheet_variable_popup_menu,
+ "datasheet-row-menu", data_sheet_cases_popup_menu,
+ "varsheet-row-menu", var_sheet_variable_popup_menu,
+ NULL);
+ }
gtk_widget_show (GTK_WIDGET (de->data_editor));
gtk_widget_show (box);
static void
psppire_data_window_iface_init (PsppireWindowIface *iface)
{
- iface->save = data_save;
+ iface->save = save_file;
+ iface->load = load_file;
}
projects / pspp-builds.git / blobdiff