Changeset 3300 in orxonox.OLD for orxonox/branches/updater/src/gui/orxonox_gui_exec.cc

Timestamp:

Dec 27, 2004, 4:14:47 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/updater: implemented a new SignalHandler, signals for starting and quiting the Gui are now located in OrxonoxGuiExec.
Now thinking about a way to pass options to Orxonox (so the GUI really makes sense)

File:

• orxonox/branches/updater/src/gui/orxonox_gui_exec.cc (modified) (4 diffs)

orxonox/branches/updater/src/gui/orxonox_gui_exec.cc

@@ -27 +27 @@
 #include <iostream>
 #include <string>
+
+HashTable* orxonoxFlagHash;
 
 /** 
@@ -42 +44 @@
   start = new Button ("Start");
 #ifdef HAVE_GTK2
-  start->connectSignal ("clicked", startOrxonox);
+  start->connectSignal ("clicked", this, startOrxonox);
 #endif /* HAVE_GTK2 */
   execBox->fill (start);
@@ -59 +61 @@
   quit = new Button ("Quit");
 #ifdef HAVE_GTK2
-  quit->connectSignal ("clicked", orxonoxGUI->orxonox_gui_quit);
+  quit->connectSignal ("clicked", this, OrxonoxGuiExec::quitOrxonox);
+  orxonoxGUI->connectSignal ("destroy", this, OrxonoxGuiExec::quitOrxonox);
+  //! orxonoxGUI->connectSignal ("delete_event", this, OrxonoxGuiExec::quitOrxonox); \todo fix this to work.
 #endif /* HAVE_GTK2 */
   execBox->fill (quit);
@@ -294 +298 @@
 /**
    \brief Starts ORXONOX. (not really implemented yet, but the function is there.\n
-   This is a Signal and can be executed through Widget::signal_connect
    \param widget the widget that executed the start command
    \param data additional data
-*/
-int OrxonoxGuiExec::startOrxonox (GtkWidget* widget, Widget* data)
-{
+
+   This is a Signal and can be executed through Widget::signal_connect
+*/
+int OrxonoxGuiExec::startOrxonox (GtkWidget* widget, void* data)
+{
+  OrxonoxGuiExec* exec = (OrxonoxGuiExec*)data;
+  if (exec->shouldsave())
+    exec->writeToFile (Window::mainWindow);
   cout << "Starting Orxonox" <<endl;
-}
-#else /* HAVE_GTK2 */
+  gtk_main_quit();
+  system("cd ..;./orxonox"); //!< \todo fix this. should execute orxonox for real (coded not over the shell)
+}
+
 /**
    \brief Starts ORXONOX. (not really implemented yet, but the function is there.\n
-   This is a Signal and can be executed through Widget::signal_connect
    \param widget the widget that executed the start command
    \param data additional data
-*/
-int OrxonoxGuiExec::startOrxonox (void* widget, Widget* data)
-{
-  cout << "Starting Orxonox" <<endl;
+
+   This is a Signal and can be executed through Widget::signal_connect
+*/
+int OrxonoxGuiExec::quitOrxonox (GtkWidget* widget, void* data)
+{
+  OrxonoxGuiExec* exec = (OrxonoxGuiExec*)data;
+  PRINT(3)( "Quitting Orxonox %p\n", exec);
+  if (exec->shouldsave())
+    exec->writeToFile (Window::mainWindow);
+  gtk_main_quit();
+}
+#else /* HAVE_GTK2 */
+/**
+   \brief Starts ORXONOX. (not really implemented yet, but the function is there.\n
+   \param widget the widget that executed the start command
+   \param data additional data
+*/
+int OrxonoxGuiExec::startOrxonox (void* widget, void* data)
+{
+  OrxonoxGuiExec* exec = (OrxonoxGuiExec*)data;
+  COUT(3) << "Starting Orxonox" <<endl;
+  if (exec->shouldsave())
+    exec->writeToFile (Window::mainWindow);
+}
+/**
+   \brief Quits ORXONOX.
+   \param widget the widget that executed the Quit command
+   \param data additional data
+
+   This is a Signal and can be executed through Widget::signal_connect
+*/
+int OrxonoxGuiExec::quitOrxonox (void* widget, void* data)
+{
+  OrxonoxGuiExec* exec = (OrxonoxGuiExec*)data;
+  COUT(3) << "Quiting Orxonox" <<endl;
+  if (exec->shouldsave())
+    exec->writeToFile (Window::mainWindow);
 }