projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Split data-editor.glade into two files.
[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 16db8131a16c4970efa7380cda16c1de2b557181..c735d05b077cb2f23d9f8a93fe47cde99ce459ff 100644
(file)
--- a/
src/ui/gui/psppire-data-window.c
+++ b/
src/ui/gui/psppire-data-window.c
@@
-448,14
+448,15
@@
name_has_suffix (const gchar *name)
/* Save DE to file */
static void
/* Save DE to file */
static void
-save_file (Psppire
DataWindow *de
)
+save_file (Psppire
Window *w
)
{
gchar *fn = NULL;
GString *fnx;
struct getl_interface *sss;
struct string file_name ;
{
gchar *fn = NULL;
GString *fnx;
struct getl_interface *sss;
struct string file_name ;
+ PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (w);
- g_object_get (
de
, "filename", &fn, NULL);
+ g_object_get (
w
, "filename", &fn, NULL);
fnx = g_string_new (fn);
fnx = g_string_new (fn);
@@
-485,8
+486,6
@@
save_file (PsppireDataWindow *de)
ds_destroy (&file_name);
execute_syntax (sss);
ds_destroy (&file_name);
execute_syntax (sss);
-
- psppire_window_set_unsaved (PSPPIRE_WINDOW (de), FALSE);
}
}
@@
-578,7
+577,7
@@
data_save_as_dialog (PsppireDataWindow *de)
psppire_window_set_filename (PSPPIRE_WINDOW (de), filename->str);
psppire_window_set_filename (PSPPIRE_WINDOW (de), filename->str);
- save_file (
de
);
+ save_file (
PSPPIRE_WINDOW (de)
);
g_string_free (filename, TRUE);
}
g_string_free (filename, TRUE);
}
@@
-599,7
+598,7
@@
data_save (PsppireWindow *de)
const gchar *fn = psppire_window_get_filename (de);
if ( NULL != fn)
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));
}
else
data_save_as_dialog (PSPPIRE_DATA_WINDOW (de));
}
@@
-800,15
+799,15
@@
create_data_sheet_variable_popup_menu (PsppireDataWindow *de)
gtk_menu_shell_append (GTK_MENU_SHELL (menu), sort_ascending);
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_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_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);
G_CALLBACK (gtk_action_activate),
de->insert_variable);
@@
-839,7
+838,7
@@
create_data_sheet_cases_popup_menu (PsppireDataWindow *de)
gtk_menu_shell_append (GTK_MENU_SHELL (menu), insert_case);
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);
G_CALLBACK (gtk_action_activate),
de->insert_case);
@@
-875,7
+874,7
@@
create_var_sheet_variable_popup_menu (PsppireDataWindow *de)
gtk_menu_shell_append (GTK_MENU_SHELL (menu), insert_variable);
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);
G_CALLBACK (gtk_action_activate),
de->insert_variable);
@@
-1016,7
+1015,7
@@
resolve_action (GtkBuilder *builder, const gchar *action, const gchar *proxy)
static void
set_unsaved (gpointer w)
{
static void
set_unsaved (gpointer w)
{
- psppire_window_set_unsaved (PSPPIRE_WINDOW (w)
, TRUE
);
+ psppire_window_set_unsaved (PSPPIRE_WINDOW (w));
}
static void
}
static void
@@
-1679,7
+1678,7
@@
psppire_data_window_init (PsppireDataWindow *de)
de);
de);
- g_signal_connect (
GTK_NOTEBOOK (de->data_editor)
,
+ g_signal_connect (
de->data_editor
,
"switch-page",
G_CALLBACK (on_switch_sheet), de);
"switch-page",
G_CALLBACK (on_switch_sheet), de);
@@
-1793,6
+1792,6
@@
psppire_data_window_new (void)
static void
psppire_data_window_iface_init (PsppireWindowIface *iface)
{
static void
psppire_data_window_iface_init (PsppireWindowIface *iface)
{
- iface->save =
data_sav
e;
+ iface->save =
save_fil
e;
iface->load = load_file;
}
iface->load = load_file;
}