Changeset 1829 in orxonox.OLD for orxonox/branches/bensch/orxonox_gui.c

Timestamp:

Apr 15, 2004, 2:14:40 AM (21 years ago)

Author:

bensch

Message:

orxonox/branches/bensch: added save/load ability

File:

• orxonox/branches/bensch/orxonox_gui.c (modified) (4 diffs)

orxonox/branches/bensch/orxonox_gui.c

@@ -3 +3 @@
 #include "orxonox_gui_audio.h"
 int verbose = 1;
-
-
-gint delete_event ( GtkWidget *widget, GdkEvent *event, gpointer data )
-{
-  return FALSE;
-}
-
 
 int main( int argc, char *argv[] )
@@ -18 +11 @@
     GtkWidget *hbox_view_exec;
     struct settings *orxonox_settings;
+
     int option_count = 7; /* important: look that this is greater than options in 'struct settings' */
 
@@ -25 +19 @@
 
     orxonox_gui_file_default (orxonox_settings);
+    orxonox_gui_file_load ("~/.orxonox.conf", orxonox_settings);
 
 
@@ -32 +27 @@
     gtk_window_set_title ( GTK_WINDOW (window), "orxonox");
     g_signal_connect (G_OBJECT (window), "delete_event", G_CALLBACK (gtk_main_quit), NULL);
-    g_signal_connect (G_OBJECT (window), "destroy", G_CALLBACK (gtk_main_quit), NULL);
+    g_signal_connect (G_OBJECT (window), "destroy", G_CALLBACK (orxonox_gui_quit), orxonox_settings);
     gtk_container_set_border_width (GTK_CONTAINER (window), 5);