candidate_name = uniquify (name, &x);
}
- window->basename = g_path_get_basename (candidate_name);
+ window->basename = g_filename_display_basename (candidate_name);
g_value_unset (&def);
}
static gboolean
-on_configure (GtkWidget *window, GdkEventConfigure *event, gpointer data)
+save_geometry (GtkWidget *window, GdkEvent *event, gpointer data)
{
const gchar *base = G_OBJECT_TYPE_NAME (window);
static void
insert_menuitem_into_menu (PsppireWindow *window, gpointer key)
{
- GtkWidget *item = gtk_check_menu_item_new_with_label (key);
+ gchar *filename = g_filename_display_name (key);
+ GtkWidget *item = gtk_check_menu_item_new_with_label (filename);
+
+ g_free (filename);
g_signal_connect (item, "toggled", G_CALLBACK (menu_toggled), NULL);
g_signal_connect (item, "activate", G_CALLBACK (menu_activate), key);
{
window->name = NULL;
window->menu = NULL;
+ window->description = strdup ("");
window->menuitem_table = g_hash_table_new (g_str_hash, g_str_equal);
g_object_set (window, "icon-name", "psppicon", NULL);
g_signal_connect (window, "configure-event",
- G_CALLBACK (on_configure), window);
+ G_CALLBACK (save_geometry), window);
+
+ g_signal_connect (window, "window-state-event",
+ G_CALLBACK (save_geometry), window);
g_signal_connect (window, "realize",
G_CALLBACK (on_realize), window);
if ( ok )
{
+ psppire_window_set_filename (w, file);
add_most_recent (file, the_recent_mgr);
w->dirty = FALSE;
}