projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change argument type of pspp_window_register_foreach
[pspp]
/
src
/
ui
/
gui
/
psppire-data-window.c
diff --git
a/src/ui/gui/psppire-data-window.c
b/src/ui/gui/psppire-data-window.c
index cd0c3751f4c6a67f4381a16d6098abc5558f28ce..84fc50717aa3b023ceed12768e35149fd4ccd9af 100644
(file)
--- a/
src/ui/gui/psppire-data-window.c
+++ b/
src/ui/gui/psppire-data-window.c
@@
-148,19
+148,19
@@
extern PsppireDataStore *the_data_store ;
static void
set_paste_menuitem_sensitivity (PsppireDataWindow *de, gboolean x)
{
static void
set_paste_menuitem_sensitivity (PsppireDataWindow *de, gboolean x)
{
- G
tkAction
*edit_paste = get_object_assert (de->builder, "edit_paste");
+ G
Object
*edit_paste = get_object_assert (de->builder, "edit_paste");
- gtk_action_set_sensitive (
edit_paste
, x);
+ gtk_action_set_sensitive (
GTK_ACTION (edit_paste)
, x);
}
static void
set_cut_copy_menuitem_sensitivity (PsppireDataWindow *de, gboolean x)
{
}
static void
set_cut_copy_menuitem_sensitivity (PsppireDataWindow *de, gboolean x)
{
- G
tkAction
*edit_copy = get_object_assert (de->builder, "edit_copy");
- G
tkAction
*edit_cut = get_object_assert (de->builder, "edit_cut");
+ G
Object
*edit_copy = get_object_assert (de->builder, "edit_copy");
+ G
Object
*edit_cut = get_object_assert (de->builder, "edit_cut");
- gtk_action_set_sensitive (
edit_copy
, x);
- gtk_action_set_sensitive (
edit_cut
, x);
+ gtk_action_set_sensitive (
GTK_ACTION (edit_copy)
, x);
+ gtk_action_set_sensitive (
GTK_ACTION (edit_cut)
, x);
}
/* Run the EXECUTE command. */
}
/* Run the EXECUTE command. */
@@
-339,9
+339,6
@@
psppire_data_window_load_file (PsppireDataWindow *de,
}
psppire_window_set_unsaved (PSPPIRE_WINDOW (de), FALSE);
}
psppire_window_set_unsaved (PSPPIRE_WINDOW (de), FALSE);
- free (de->file_name);
-
- de->file_name = g_strdup (file_name);
}
}
@@
-376,19
+373,22
@@
open_data_dialog (GtkAction *action, PsppireDataWindow *de)
gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
- if (de->file_name)
- {
- gchar *dir_name = g_path_get_dirname (de->file_name);
- gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog),
- dir_name);
- free (dir_name);
- }
+ {
+ gchar *dir_name;
+ gchar *filename = NULL;
+ g_object_get (de, "filename", &filename, NULL);
+
+ dir_name = g_path_get_dirname (filename);
+ gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog),
+ dir_name);
+ free (dir_name);
+ }
switch (gtk_dialog_run (GTK_DIALOG (dialog)))
{
case GTK_RESPONSE_ACCEPT:
{
switch (gtk_dialog_run (GTK_DIALOG (dialog)))
{
case GTK_RESPONSE_ACCEPT:
{
- gchar *name =
+ gchar *name =
gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
psppire_data_window_load_file (de, name);
gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
psppire_data_window_load_file (de, name);
@@
-420,39
+420,38
@@
name_has_suffix (const gchar *name)
}
}
-/* Append SUFFIX to the filename of DE */
-static void
-append_filename_suffix (PsppireDataWindow *de, const gchar *suffix)
-{
- if ( ! name_has_suffix (de->file_name))
- {
- gchar *s = de->file_name;
- de->file_name = g_strconcat (de->file_name, suffix, NULL);
- g_free (s);
- }
-}
-
/* Save DE to file */
static void
save_file (PsppireDataWindow *de)
{
/* Save DE to file */
static void
save_file (PsppireDataWindow *de)
{
+ gchar *fn = NULL;
+ GString *fnx;
struct getl_interface *sss;
struct string file_name ;
struct getl_interface *sss;
struct string file_name ;
- g_assert (de->file_name);
+ g_object_get (de, "filename", &fn, NULL);
+
+ fnx = g_string_new (fn);
+
+ if ( ! name_has_suffix (fnx->str))
+ {
+ if ( de->save_as_portable)
+ g_string_append (fnx, ".por");
+ else
+ g_string_append (fnx, ".sav");
+ }
ds_init_empty (&file_name);
ds_init_empty (&file_name);
- syntax_gen_string (&file_name, ss_cstr (de->file_name));
+ syntax_gen_string (&file_name, ss_cstr (fnx->str));
+ g_string_free (fnx, FALSE);
if ( de->save_as_portable )
{
if ( de->save_as_portable )
{
- append_filename_suffix (de, ".por");
sss = create_syntax_string_source ("EXPORT OUTFILE=%s.",
ds_cstr (&file_name));
}
else
{
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.",
ds_cstr (&file_name));
}
sss = create_syntax_string_source ("SAVE OUTFILE=%s.",
ds_cstr (&file_name));
}
@@
-483,7
+482,7
@@
on_insert_variable (GtkAction *action, gpointer data)
/* Callback for data_save_as action. Prompt for a filename and save */
static void
/* Callback for data_save_as action. Prompt for a filename and save */
static void
-data_save_as_dialog (
GtkAction *action,
PsppireDataWindow *de)
+data_save_as_dialog (PsppireDataWindow *de)
{
GtkWidget *button_sys;
GtkWidget *dialog =
{
GtkWidget *button_sys;
GtkWidget *dialog =
@@
-534,22
+533,28
@@
data_save_as_dialog (GtkAction *action, PsppireDataWindow *de)
{
case GTK_RESPONSE_ACCEPT:
{
{
case GTK_RESPONSE_ACCEPT:
{
- g_free (de->file_name);
-
- de->file_name =
- gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
+ GString *filename =
+ g_string_new
+ (
+ gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog))
+ );
de->save_as_portable =
! gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button_sys));
de->save_as_portable =
! gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button_sys));
- if ( de->save_as_portable)
- append_filename_suffix (de, ".por");
- else
- append_filename_suffix (de, ".sav");
+ if ( ! name_has_suffix (filename->str))
+ {
+ if ( de->save_as_portable)
+ g_string_append (filename, ".por");
+ else
+ g_string_append (filename, ".sav");
+ }
+
+ psppire_window_set_filename (PSPPIRE_WINDOW (de), filename->str);
save_file (de);
save_file (de);
-
psppire_window_set_filename (PSPPIRE_WINDOW (de), de->file_name
);
+
g_string_free (filename, TRUE
);
}
break;
default:
}
break;
default:
@@
-561,15
+566,16
@@
data_save_as_dialog (GtkAction *action, PsppireDataWindow *de)
/* Callback for data_save action.
/* Callback for data_save action.
- If there's an existing file name, then just save,
- otherwise prompt for a file name, then save */
+ */
static void
static void
-data_save (
GtkAction *action,
PsppireDataWindow *de)
+data_save (PsppireDataWindow *de)
{
{
- if (de->file_name)
+ const gchar *fn = psppire_window_get_filename (PSPPIRE_WINDOW (de));
+
+ if ( NULL != fn)
save_file (de);
else
save_file (de);
else
- data_save_as_dialog (
action,
de);
+ data_save_as_dialog (de);
}
}
@@
-583,9
+589,6
@@
new_file (GtkAction *action, PsppireDataWindow *de)
execute_syntax (sss);
execute_syntax (sss);
- g_free (de->file_name);
- de->file_name = NULL;
-
psppire_window_set_filename (PSPPIRE_WINDOW (de), NULL);
}
psppire_window_set_filename (PSPPIRE_WINDOW (de), NULL);
}
@@
-994,6
+997,22
@@
set_unsaved (gpointer w)
psppire_window_set_unsaved (PSPPIRE_WINDOW (w), TRUE);
}
psppire_window_set_unsaved (PSPPIRE_WINDOW (w), TRUE);
}
+/* Callback for the "delete" action (clicking the x on the top right
+ hand corner of the window) */
+static gboolean
+on_delete (GtkWidget *w, GdkEvent *event, gpointer user_data)
+{
+ PsppireDataWindow *dw = PSPPIRE_DATA_WINDOW (user_data);
+
+ if (psppire_window_query_save (PSPPIRE_WINDOW (dw)))
+ {
+ data_save (dw);
+ }
+
+ return FALSE;
+}
+
+
static void
psppire_data_window_init (PsppireDataWindow *de)
{
static void
psppire_data_window_init (PsppireDataWindow *de)
{
@@
-1012,8
+1031,6
@@
psppire_data_window_init (PsppireDataWindow *de)
hb = get_widget_assert (de->builder, "handlebox1");
sb = get_widget_assert (de->builder, "status-bar");
hb = get_widget_assert (de->builder, "handlebox1");
sb = get_widget_assert (de->builder, "status-bar");
- de->file_name = NULL;
-
de->data_editor =
PSPPIRE_DATA_EDITOR (psppire_data_editor_new (the_var_store, the_data_store));
de->data_editor =
PSPPIRE_DATA_EDITOR (psppire_data_editor_new (the_var_store, the_data_store));
@@
-1144,8
+1161,8
@@
psppire_data_window_init (PsppireDataWindow *de)
"stock-id", "gtk-save",
NULL);
"stock-id", "gtk-save",
NULL);
- g_signal_connect (action_data_save, "activate",
- G_CALLBACK (data_save), de);
+ g_signal_connect
_swapped
(action_data_save, "activate",
+
G_CALLBACK (data_save), de);
}
}
@@
-1161,7
+1178,7
@@
psppire_data_window_init (PsppireDataWindow *de)
"stock-id", "gtk-save-as",
NULL);
"stock-id", "gtk-save-as",
NULL);
- g_signal_connect (action_data_save_as, "activate",
+ g_signal_connect
_swapped
(action_data_save_as, "activate",
G_CALLBACK (data_save_as_dialog), de);
}
G_CALLBACK (data_save_as_dialog), de);
}
@@
-1739,6
+1756,9
@@
psppire_data_window_init (PsppireDataWindow *de)
"varsheet-row-menu", de->var_sheet_variable_popup_menu,
NULL);
"varsheet-row-menu", de->var_sheet_variable_popup_menu,
NULL);
+ g_signal_connect (de, "delete-event", G_CALLBACK (on_delete), de);
+
+
gtk_widget_show (GTK_WIDGET (de->data_editor));
gtk_widget_show (box);
}
gtk_widget_show (GTK_WIDGET (de->data_editor));
gtk_widget_show (box);
}