-/*
- PSPPIRE --- A Graphical User Interface for PSPP
- Copyright (C) 2006, 2007 Free Software Foundation
+/* PSPPIRE - a graphical user interface for PSPP.
+ Copyright (C) 2006, 2007 Free Software Foundation
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA. */
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
#include <stdlib.h>
#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 "compute-dialog.h"
+#include "comments-dialog.h"
+#include "variable-info-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"
+
+/* Update the data_ref_entry with the reference of the active cell */
+static gint update_data_ref_entry (const GtkSheet *sheet,
+ gint row, gint col, gpointer data);
static void register_data_editor_actions (struct data_editor *de);
-static void insert_variable (GtkCheckMenuItem *m, gpointer data);
+static void insert_variable (GtkAction *, gpointer data);
/* Switch between the VAR SHEET and the DATA SHEET */
-enum {PAGE_DATA_SHEET = 0, PAGE_VAR_SHEET};
static gboolean click2column (GtkWidget *w, gint col, gpointer data);
return FALSE;
}
-static void weight_cases_dialog (GObject *o, gpointer data);
+static void open_data_file (const gchar *, struct data_editor *);
+
+
+
+#if RECENT_LISTS_AVAILABLE
+
+static void
+on_recent_data_select (GtkMenuShell *menushell, gpointer user_data)
+{
+ gchar *file;
+
+ struct data_editor *de = user_data;
+
+ gchar *uri =
+ gtk_recent_chooser_get_current_uri (GTK_RECENT_CHOOSER (menushell));
+
+ file = g_filename_from_uri (uri, NULL, NULL);
+
+ g_free (uri);
+
+ open_data_file (file, de);
+
+ g_free (file);
+}
+
+static void
+on_recent_files_select (GtkMenuShell *menushell, gpointer user_data)
+{
+ gchar *file;
+
+ struct syntax_editor *se ;
+
+ gchar *uri =
+ gtk_recent_chooser_get_current_uri (GTK_RECENT_CHOOSER (menushell));
+
+ file = g_filename_from_uri (uri, NULL, NULL);
+
+ g_free (uri);
+
+ se = (struct syntax_editor *)
+ window_create (WINDOW_SYNTAX, file);
+ load_editor_from_file (se, file, NULL);
+
+ g_free (file);
+}
+
+#endif
+
+static void
+datum_entry_activate (GtkEntry *entry, gpointer data)
+{
+ gint row, column;
+ GtkSheet *data_sheet = GTK_SHEET (data);
+ PsppireDataStore *store = PSPPIRE_DATA_STORE (gtk_sheet_get_model (data_sheet));
+
+ const char *text = gtk_entry_get_text (entry);
+
+ gtk_sheet_get_active_cell (data_sheet, &row, &column);
+
+ if ( row == -1 || column == -1)
+ return;
+
+ psppire_data_store_set_string (store, text, row, column);
+}
/*
Create a new data editor.
struct data_editor *de ;
struct editor_window *e;
GtkSheet *var_sheet ;
+ GtkSheet *data_sheet ;
PsppireVarStore *vs;
+ GtkWidget *datum_entry;
de = g_malloc0 (sizeof (*de));
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"));
+ data_sheet = GTK_SHEET (get_widget_assert (de->xml, "data_sheet"));
vs = PSPPIRE_VAR_STORE (gtk_sheet_get_model (var_sheet));
+ g_assert(vs); /* Traps a possible bug in win32 build */
+
+ g_signal_connect (G_OBJECT (data_sheet), "activate",
+ G_CALLBACK (update_data_ref_entry),
+ de->xml);
+
+ datum_entry = get_widget_assert (de->xml, "datum_entry");
+
+ g_signal_connect (G_OBJECT (datum_entry), "activate",
+ G_CALLBACK (datum_entry_activate),
+ data_sheet);
+
g_signal_connect (vs->dict, "weight-changed",
G_CALLBACK (on_weight_change),
de);
register_data_editor_actions (de);
+ de->insert_variable =
+ gtk_action_new ("insert-variable",
+ _("Insert Variable"),
+ _("Create a new variable at the current position"),
+ "pspp-insert-variable");
+
+ g_signal_connect (de->insert_variable, "activate",
+ G_CALLBACK (insert_variable), de);
+
+
+ gtk_action_connect_proxy (de->insert_variable,
+ get_widget_assert (de->xml, "button-insert-variable")
+ );
+
+ gtk_action_connect_proxy (de->insert_variable,
+ get_widget_assert (de->xml, "data_insert-variable")
+ );
+
de->invoke_weight_cases_dialog =
gtk_action_new ("weight-cases-dialog",
_("Weights"),
_("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);
+
+
+ de->invoke_compute_dialog =
+ gtk_action_new ("compute-dialog",
+ _("Compute"),
+ _("Compute new values for a variable"),
+ "pspp-compute");
+
+ g_signal_connect (de->invoke_compute_dialog, "activate",
+ G_CALLBACK (compute_dialog), de);
+
+ de->invoke_comments_dialog =
+ gtk_action_new ("commments-dialog",
+ _("Data File Comments"),
+ _("Commentary text for the data file"),
+ NULL);
+
+ g_signal_connect (de->invoke_comments_dialog, "activate",
+ G_CALLBACK (comments_dialog), de);
+
+ de->invoke_variable_info_dialog =
+ gtk_action_new ("variable-info-dialog",
+ _("Variables"),
+ _("Jump to Variable"),
+ "pspp-goto-variable");
+
+ g_signal_connect (de->invoke_variable_info_dialog, "activate",
+ G_CALLBACK (variable_info_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"),
G_CALLBACK (gtk_action_activate),
de->action_data_open);
+
+#if RECENT_LISTS_AVAILABLE
+ {
+ GtkRecentManager *rm = gtk_recent_manager_get_default ();
+ GtkWidget *recent_data = get_widget_assert (de->xml, "file_recent-data");
+ GtkWidget *recent_files = get_widget_assert (de->xml, "file_recent-files");
+
+ GtkWidget *menu = gtk_recent_chooser_menu_new_for_manager (rm);
+
+ GtkRecentFilter *filter = gtk_recent_filter_new ();
+
+ gtk_recent_filter_add_pattern (filter, "*.sav");
+ gtk_recent_filter_add_pattern (filter, "*.SAV");
+
+ gtk_recent_chooser_add_filter (GTK_RECENT_CHOOSER (menu), filter);
+
+ gtk_widget_set_sensitive (recent_data, TRUE);
+ g_signal_connect (menu, "selection-done",
+ G_CALLBACK (on_recent_data_select), de);
+
+ gtk_menu_item_set_submenu (GTK_MENU_ITEM (recent_data), menu);
+
+
+ filter = gtk_recent_filter_new ();
+ menu = gtk_recent_chooser_menu_new_for_manager (rm);
+
+ gtk_recent_filter_add_pattern (filter, "*.sps");
+ gtk_recent_filter_add_pattern (filter, "*.SPS");
+
+ gtk_recent_chooser_add_filter (GTK_RECENT_CHOOSER (menu), filter);
+
+ gtk_widget_set_sensitive (recent_files, TRUE);
+ g_signal_connect (menu, "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_widget_assert (de->xml,"file_new_syntax"),
"activate",
G_CALLBACK (new_syntax_window),
de);
- g_signal_connect (get_widget_assert (de->xml,"data_insert-variable"),
- "activate",
- G_CALLBACK (insert_variable),
- de);
gtk_action_connect_proxy (de->invoke_weight_cases_dialog,
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")
+ );
+
+ gtk_action_connect_proxy (de->invoke_compute_dialog,
+ get_widget_assert (de->xml, "transform_compute")
+ );
+
+ gtk_action_connect_proxy (de->invoke_comments_dialog,
+ get_widget_assert (de->xml, "utilities_comments")
+ );
+
+ gtk_action_connect_proxy (de->invoke_variable_info_dialog,
+ get_widget_assert (de->xml, "utilities_variables")
+ );
g_signal_connect (get_widget_assert (de->xml,"help_about"),
"activate",
G_CALLBACK (reference_manual),
e->window);
-
-
g_signal_connect (get_widget_assert (de->xml,"data_sheet"),
"double-click-column",
G_CALLBACK (click2column),
de);
-
g_signal_connect (get_widget_assert (de->xml, "variable_sheet"),
"double-click-row",
GTK_SIGNAL_FUNC (click2row),
de);
-
g_signal_connect (get_widget_assert (de->xml, "variable_sheet"),
"select-row",
GTK_SIGNAL_FUNC (enable_edit_clear),
get_widget_assert (de->xml, "button-save")
);
+ gtk_action_connect_proxy (de->invoke_variable_info_dialog,
+ get_widget_assert (de->xml, "button-goto-variable")
+ );
+
gtk_action_connect_proxy (de->invoke_weight_cases_dialog,
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);
click2row (GtkWidget *w, gint row, gpointer data)
{
struct data_editor *de = data;
+ GtkSheetRange visible_range;
gint current_row, current_column;
gtk_sheet_set_active_cell (GTK_SHEET (data_sheet), current_row, row);
+ gtk_sheet_get_visible_range (GTK_SHEET (data_sheet), &visible_range);
+
+ if ( row < visible_range.col0 || row > visible_range.coli)
+ {
+ gtk_sheet_moveto (GTK_SHEET (data_sheet),
+ current_row, row, 0, 0);
+ }
+
return FALSE;
}
/* Insert a new variable before the current row in the variable sheet,
or before the current column in the data sheet, whichever is selected */
static void
-insert_variable (GtkCheckMenuItem *m, gpointer data)
+insert_variable (GtkAction *action, gpointer data)
{
struct data_editor *de = data;
- gint posn;
+ gint posn = -1;
GtkWidget *notebook = get_widget_assert (de->xml, "notebook");
g_assert_not_reached ();
}
+ if ( posn == -1 ) posn = 0;
+
psppire_dict_insert_variable (vs->dict, posn, NULL);
}
{
gint i;
GString *text;
- struct variable *const * split_vars = dict_get_split_vars (dict->dict);
+ const struct variable *const * split_vars = dict_get_split_vars (dict->dict);
text = g_string_new (_("Split by "));
}
}
-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);
+}
+
+
+static void
+open_data_file (const gchar *file_name, struct data_editor *de)
+{
+ struct getl_interface *sss;
+ struct string filename;
+
+ ds_init_cstr (&filename, file_name);
+
+ gen_quoted_string (&filename);
+
+ sss = create_syntax_string_source ("GET FILE=%s.",
+ ds_cstr (&filename));
+
+ execute_syntax (sss);
+ ds_destroy (&filename);
+
+ window_set_name_from_filename ((struct editor_window *) de, file_name);
}
/* 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 =
+ 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);
+ open_data_file (de->file_name, de);
- execute_syntax (sss);
+#if RECENT_LISTS_AVAILABLE
+ {
+ GtkRecentManager *manager = gtk_recent_manager_get_default();
+ gchar *uri = g_filename_to_uri (de->file_name, NULL, NULL);
- window_set_name_from_filename (de, file_name);
+ if ( ! gtk_recent_manager_add_item (manager, uri))
+ g_warning ("Could not add item %s to recent list\n",uri);
+
+ g_free (uri);
+ }
+#endif
- g_free (file_name);
}
break;
default:
+/* Update the data_ref_entry with the reference of the active cell */
+static gint
+update_data_ref_entry (const GtkSheet *sheet, gint row, gint col, gpointer data)
+{
+ GladeXML *data_editor_xml = data;
+ PsppireDataStore *data_store =
+ PSPPIRE_DATA_STORE (gtk_sheet_get_model (sheet));
+
+ g_return_val_if_fail (data_editor_xml, FALSE);
+
+ if (data_store)
+ {
+ const struct variable *var =
+ psppire_dict_get_variable (data_store->dict, col);
+
+ /* The entry where the reference to the current cell is displayed */
+ GtkEntry *cell_ref_entry =
+ GTK_ENTRY (get_widget_assert (data_editor_xml,
+ "cell_ref_entry"));
+ GtkEntry *datum_entry =
+ GTK_ENTRY (get_widget_assert (data_editor_xml,
+ "datum_entry"));
+
+ if ( var )
+ {
+ gchar *text = g_strdup_printf ("%d: %s", row,
+ var_get_name (var));
+
+ gchar *s = pspp_locale_to_utf8 (text, -1, 0);
+
+ g_free (text);
+
+ gtk_entry_set_text (cell_ref_entry, s);
+
+ g_free (s);
+ }
+ else
+ gtk_entry_set_text (cell_ref_entry, "");
+
+
+ if ( var )
+ {
+ gchar *text =
+ psppire_data_store_get_string (data_store, row,
+ var_get_dict_index(var));
+ g_strchug (text);
+
+ gtk_entry_set_text (datum_entry, text);
+
+ free (text);
+ }
+ else
+ gtk_entry_set_text (datum_entry, "");
+ }
+
+ return FALSE;
+}
projects / pspp-builds.git / blobdiff