Changeset 1979 in orxonox.OLD for orxonox/branches/gui

Timestamp:

Jun 18, 2004, 11:30:22 AM (20 years ago)

Author:

bensch

Message:

orxonox/branches/gui/guicc: added exec, and made menu autoSignalConnect

Location:

orxonox/branches/gui/guicc

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (5 diffs)
• orxonox_gui.cc (modified) (3 diffs)

orxonox/branches/gui/guicc/Makefile.am

@@ -3 +3 @@
 
 bin_PROGRAMS=gui
-gui_SOURCES=orxonox_gui.cc orxonox_gui_video.cc orxonox_gui_audio.cc 
-#orxonox_gui_exec.cc orxonox_gui_file.cc 
+gui_SOURCES=orxonox_gui.cc orxonox_gui_video.cc orxonox_gui_audio.cc orxonox_gui_exec.cc 
+#orxonox_gui_file.cc 
 
 #  uncomment the following if bencoder requires the math library

orxonox/branches/gui/guicc/Makefile.in

@@ -114 +114 @@
 
 bin_PROGRAMS = gui
-gui_SOURCES = orxonox_gui.cc orxonox_gui_video.cc orxonox_gui_audio.cc 
+gui_SOURCES = orxonox_gui.cc orxonox_gui_video.cc orxonox_gui_audio.cc orxonox_gui_exec.cc 
 subdir = guicc
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -124 +124 @@
 
 am_gui_OBJECTS = orxonox_gui.$(OBJEXT) orxonox_gui_video.$(OBJEXT) \
-        orxonox_gui_audio.$(OBJEXT)
+        orxonox_gui_audio.$(OBJEXT) orxonox_gui_exec.$(OBJEXT)
 gui_OBJECTS = $(am_gui_OBJECTS)
 gui_LDADD = $(LDADD)
@@ -135 +135 @@
 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/orxonox_gui.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox_gui_audio.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/orxonox_gui_exec.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox_gui_video.Po
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -190 +191 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui_audio.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui_exec.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui_video.Po@am__quote@
 
@@ -388 +390 @@
         uninstall-am uninstall-binPROGRAMS uninstall-info-am
 
-#orxonox_gui_exec.cc orxonox_gui_file.cc 
+#orxonox_gui_file.cc 
 
 #  uncomment the following if bencoder requires the math library

orxonox/branches/gui/guicc/orxonox_gui.cc

@@ -4 +4 @@
 #include "orxonox_gui_video.h"
 #include "orxonox_gui_audio.h"
+#include "orxonox_gui_exec.h"
 
 
@@ -29 +30 @@
     Box* avBox = new Box ('h');
     {
-      OrxonoxGuiVideo * video = new OrxonoxGuiVideo ();
-      avBox->fill (video->getFrame());
-      OrxonoxGuiAudio * audio = new OrxonoxGuiAudio ();
-      avBox->fill (audio->getFrame());
+      OrxonoxGuiVideo* video = new OrxonoxGuiVideo ();
+      avBox->fill (video->getFrame ());
+      OrxonoxGuiAudio* audio = new OrxonoxGuiAudio ();
+      avBox->fill (audio->getFrame ());
       
     }
     windowBox->fill (avBox);
+    
+    OrxonoxGuiExec* exec = new OrxonoxGuiExec (orxonoxGUI);
+    windowBox->fill (exec->getFrame ());
   }
   orxonoxGUI->fill (windowBox);
@@ -376 +380 @@
 
   gtk_option_menu_set_menu (GTK_OPTION_MENU (widget), menu);
+  this->connectSignal ("changed", this->OptionChange);
 }