projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Set default name on File->New
[pspp-builds.git]
/
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 5facbbd257dfc9f0c3bd78aece4bff2a9f6055b7..90e749d318af0bab38a7c7f42450e88fe16b2a10 100644
(file)
--- a/
src/ui/gui/psppire-data-window.c
+++ b/
src/ui/gui/psppire-data-window.c
@@
-337,7
+337,7
@@
open_data_file (const gchar *file_name, PsppireDataWindow *de)
if (execute_syntax (sss) )
{
if (execute_syntax (sss) )
{
-
// window_set_name_from_filename ((struct editor_window *) de
, file_name);
+
psppire_window_set_filename (PSPPIRE_WINDOW (de)
, file_name);
add_most_recent (file_name);
}
}
add_most_recent (file_name);
}
}
@@
-544,7
+544,7
@@
data_save_as_dialog (GtkAction *action, PsppireDataWindow *de)
save_file (de);
save_file (de);
-
// window_set_name_from_filename (e
, de->file_name);
+
psppire_window_set_filename (PSPPIRE_WINDOW (de)
, de->file_name);
}
break;
default:
}
break;
default:
@@
-581,7
+581,7
@@
new_file (GtkAction *action, PsppireDataWindow *de)
g_free (de->file_name);
de->file_name = NULL;
g_free (de->file_name);
de->file_name = NULL;
-
// default_window_name (de
);
+
psppire_window_set_filename (PSPPIRE_WINDOW (de), NULL
);
}
}
@@
-1005,14
+1005,6
@@
on_switch_sheet (GtkNotebook *notebook,
-void
-create_data_window (void)
-{
- GtkWidget *w = psppire_data_window_new ();
- gtk_widget_show (w);
-}
-
-
static void
psppire_data_window_init (PsppireDataWindow *de)
{
static void
psppire_data_window_init (PsppireDataWindow *de)
{
@@
-1705,6
+1697,7
@@
psppire_data_window_init (PsppireDataWindow *de)
de->data_sheet_cases_popup_menu =
GTK_MENU (create_data_sheet_cases_popup_menu (de));
de->data_sheet_cases_popup_menu =
GTK_MENU (create_data_sheet_cases_popup_menu (de));
+ PSPPIRE_WINDOW (de)->menu = GTK_MENU_SHELL (get_widget_assert (de->xml,"Windows_menu"));
g_object_set (de->data_editor,
"datasheet-column-menu", de->data_sheet_variable_popup_menu,
g_object_set (de->data_editor,
"datasheet-column-menu", de->data_sheet_variable_popup_menu,
@@
-1712,7
+1705,7
@@
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);
- gtk_widget_show (
de->data_editor
);
+ gtk_widget_show (
GTK_WIDGET (de->data_editor)
);
gtk_widget_show (box);
}
gtk_widget_show (box);
}