Changeset 2707 in orxonox.OLD for orxonox/branches/buerli/gui

Timestamp:

Nov 3, 2004, 12:29:03 AM (20 years ago)

Author:

bensch

Message:

orxonox/branches/buerli: merged back from trunk, with new configure makefile and so forth.

Location:

orxonox/branches/buerli/gui

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (23 diffs)
• orxonox_gui.cc (modified) (45 diffs)
• orxonox_gui.h (modified) (15 diffs)
• orxonox_gui_audio.cc (modified) (1 diff)
• orxonox_gui_banner.cc (modified) (2 diffs)
• orxonox_gui_exec.cc (modified) (10 diffs)
• orxonox_gui_exec.h (modified) (1 diff)
• orxonox_gui_flags.cc (modified) (1 diff)
• orxonox_gui_keys.cc (copied) (copied from orxonox/trunk/gui/orxonox_gui_keys.cc)
• orxonox_gui_keys.h (copied) (copied from orxonox/trunk/gui/orxonox_gui_keys.h)
• orxonox_gui_video.cc (modified) (1 diff)

orxonox/branches/buerli/gui/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_flags.cc orxonox_gui_banner.cc
+gui_SOURCES=orxonox_gui.cc orxonox_gui_video.cc orxonox_gui_audio.cc orxonox_gui_exec.cc orxonox_gui_flags.cc orxonox_gui_banner.cc orxonox_gui_keys.cc
 
-noinst_HEADERS=orxonox_gui.h orxonox_gui_video.h orxonox_gui_audio.h orxonox_gui_exec.h orxonox_gui_flags.h orxonox_gui_banner.h
+noinst_HEADERS=orxonox_gui.h orxonox_gui_video.h orxonox_gui_audio.h orxonox_gui_exec.h orxonox_gui_flags.h orxonox_gui_banner.h orxonox_gui_keys.h
 
 #  uncomment the following if bencoder requires the math library

orxonox/branches/buerli/gui/Makefile.in

@@ -1 @@
-# Makefile.in generated by automake 1.7.1 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -14 +14 @@
 
 @SET_MAKE@
+
+
+SOURCES = $(gui_SOURCES)
 
 srcdir = @srcdir@
@@ -22 +25 @@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
@@ -36 +38 @@
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+bin_PROGRAMS = gui$(EXEEXT)
+subdir = gui
+DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+        $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+        $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+am__installdirs = "$(DESTDIR)$(bindir)"
+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(bin_PROGRAMS)
+am_gui_OBJECTS = orxonox_gui.$(OBJEXT) orxonox_gui_video.$(OBJEXT) \
+        orxonox_gui_audio.$(OBJEXT) orxonox_gui_exec.$(OBJEXT) \
+        orxonox_gui_flags.$(OBJEXT) orxonox_gui_banner.$(OBJEXT) \
+        orxonox_gui_keys.$(OBJEXT)
+gui_OBJECTS = $(am_gui_OBJECTS)
+gui_LDADD = $(LDADD)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/orxonox_gui.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/orxonox_gui_audio.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/orxonox_gui_banner.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/orxonox_gui_exec.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/orxonox_gui_flags.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/orxonox_gui_keys.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/orxonox_gui_video.Po
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+CXXLD = $(CXX)
+CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
+        -o $@
+SOURCES = $(gui_SOURCES)
+DIST_SOURCES = $(gui_SOURCES)
+HEADERS = $(noinst_HEADERS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -90 +133 @@
 am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
+am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 bindir = @bindir@
@@ -103 +147 @@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 prefix = @prefix@
@@ -111 +156 @@
 target_alias = @target_alias@
 AM_CXXFLAGS = `pkg-config --cflags gtk+-2.0` $(MSBITFIELDS)
-
-#AM_LDFLAGS=`pkg-config --libs  gtk+-2.0`
-bin_PROGRAMS = gui
-gui_SOURCES = orxonox_gui.cc orxonox_gui_video.cc       orxonox_gui_audio.cc orxonox_gui_exec.cc orxonox_gui_flags.cc orxonox_gui_banner.cc
-
-noinst_HEADERS = orxonox_gui.h orxonox_gui_video.h orxonox_gui_audio.h orxonox_gui_exec.h orxonox_gui_flags.h orxonox_gui_banner.h
+gui_SOURCES = orxonox_gui.cc orxonox_gui_video.cc       orxonox_gui_audio.cc orxonox_gui_exec.cc orxonox_gui_flags.cc orxonox_gui_banner.cc orxonox_gui_keys.cc
+noinst_HEADERS = orxonox_gui.h orxonox_gui_video.h orxonox_gui_audio.h orxonox_gui_exec.h orxonox_gui_flags.h orxonox_gui_banner.h orxonox_gui_keys.h
 
 #  uncomment the following if bencoder requires the math library
@@ -127 +168 @@
 #TESTS=chk
 EXTRA_DIST = rc banner.xpm
-subdir = gui
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-bin_PROGRAMS = gui$(EXEEXT)
-PROGRAMS = $(bin_PROGRAMS)
-
-am_gui_OBJECTS = orxonox_gui.$(OBJEXT) orxonox_gui_video.$(OBJEXT) \
-        orxonox_gui_audio.$(OBJEXT) orxonox_gui_exec.$(OBJEXT) \
-        orxonox_gui_flags.$(OBJEXT) orxonox_gui_banner.$(OBJEXT)
-gui_OBJECTS = $(am_gui_OBJECTS)
-gui_LDADD = $(LDADD)
-gui_DEPENDENCIES =
-gui_LDFLAGS =
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/orxonox_gui.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/orxonox_gui_audio.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/orxonox_gui_banner.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/orxonox_gui_exec.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/orxonox_gui_flags.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/orxonox_gui_video.Po
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLD = $(CXX)
-CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
-        -o $@
-DIST_SOURCES = $(gui_SOURCES)
-HEADERS = $(noinst_HEADERS)
-
-DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in
-SOURCES = $(gui_SOURCES)
-
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .cc .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+        @for dep in $?; do \
+          case '$(am__configure_deps)' in \
+            *$$dep*) \
+              cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+                && exit 0; \
+              exit 1;; \
+          esac; \
+        done; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  gui/Makefile'; \
         cd $(top_srcdir) && \
           $(AUTOMAKE) --gnu  gui/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-        cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+        @case '$?' in \
+          *config.status*) \
+            cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+          *) \
+            echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+            cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+        esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 install-binPROGRAMS: $(bin_PROGRAMS)
         @$(NORMAL_INSTALL)
-        $(mkinstalldirs) $(DESTDIR)$(bindir)
+        test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
         @list='$(bin_PROGRAMS)'; for p in $$list; do \
           p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
@@ -180 +209 @@
           ; then \
             f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-           echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
-           $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
+           echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+           $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
           else :; fi; \
         done
@@ -189 +218 @@
         @list='$(bin_PROGRAMS)'; for p in $$list; do \
           f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-          echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
-          rm -f $(DESTDIR)$(bindir)/$$f; \
+          echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+          rm -f "$(DESTDIR)$(bindir)/$$f"; \
         done
 
@@ -200 +229 @@
 
 mostlyclean-compile:
-        -rm -f *.$(OBJEXT) core *.core
+        -rm -f *.$(OBJEXT)
 
 distclean-compile:
@@ -210 +239 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui_exec.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui_flags.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui_keys.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui_video.Po@am__quote@
 
-distclean-depend:
-        -rm -rf ./$(DEPDIR)
-
 .cc.o:
-@am__fastdepCXX_TRUE@   if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCXX_TRUE@     -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCXX_TRUE@   then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCXX_TRUE@   else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCXX_TRUE@   fi
+@am__fastdepCXX_TRUE@   if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ $<
 
 .cc.obj:
-@am__fastdepCXX_TRUE@   if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCXX_TRUE@     -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'`; \
-@am__fastdepCXX_TRUE@   then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCXX_TRUE@   else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCXX_TRUE@   fi
+@am__fastdepCXX_TRUE@   if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'`
+@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -254 +267 @@
                END { for (i in files) print i; }'`; \
         mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
@@ -265 +279 @@
           $(AWK) '    { files[$$0] = 1; } \
                END { for (i in files) print i; }'`; \
-        test -z "$(ETAGS_ARGS)$$tags$$unique" \
-          || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-             $$tags $$unique
-
+        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+          test -n "$$unique" || unique=$$empty_fix; \
+          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+            $$tags $$unique; \
+        fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
@@ -291 +306 @@
 distclean-tags:
         -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
@@ -308 +319 @@
           if test "$$dir" != "$$file" && test "$$dir" != "."; then \
             dir="/$$dir"; \
-            $(mkinstalldirs) "$(distdir)$$dir"; \
+            $(mkdir_p) "$(distdir)$$dir"; \
           else \
             dir=''; \
@@ -326 +337 @@
 check: check-am
 all-am: Makefile $(PROGRAMS) $(HEADERS)
-
 installdirs:
-        $(mkinstalldirs) $(DESTDIR)$(bindir)
-
+        for dir in "$(DESTDIR)$(bindir)"; do \
+          test -z "$$dir" || $(mkdir_p) "$$dir"; \
+        done
 install: install-am
 install-exec: install-exec-am
@@ -341 +352 @@
 install-strip:
         $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-          INSTALL_STRIP_FLAG=-s \
+          install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
           `test -z '$(STRIP)' || \
             echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
@@ -349 +360 @@
 
 distclean-generic:
-        -rm -f Makefile $(CONFIG_CLEAN_FILES)
+        -rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
@@ -359 +370 @@
 
 distclean: distclean-am
-
-distclean-am: clean-am distclean-compile distclean-depend \
-        distclean-generic distclean-tags
+        -rm -rf ./$(DEPDIR)
+        -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+        distclean-tags
 
 dvi: dvi-am
@@ -367 +379 @@
 dvi-am:
 
+html: html-am
+
 info: info-am
 
@@ -382 +396 @@
 
 maintainer-clean: maintainer-clean-am
-
+        -rm -rf ./$(DEPDIR)
+        -rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -401 +416 @@
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
         clean-generic ctags distclean distclean-compile \
-        distclean-depend distclean-generic distclean-tags distdir dvi \
-        dvi-am info info-am install install-am install-binPROGRAMS \
+        distclean-generic distclean-tags distdir dvi dvi-am html \
+        html-am info info-am install install-am install-binPROGRAMS \
         install-data install-data-am install-exec install-exec-am \
         install-info install-info-am install-man install-strip \

orxonox/branches/buerli/gui/orxonox_gui.cc

@@ -32 +32 @@
 #include "orxonox_gui_flags.h"
 #include "orxonox_gui_banner.h"
+#include "orxonox_gui_keys.h"
 
   Window* orxonoxGUI;
@@ -39 +40 @@
   OrxonoxGuiFlags* flags;
   OrxonoxGuiBanner* banner;
+  OrxonoxGuiKeys* keys;
 
 int main( int argc, char *argv[] )
@@ -49 +51 @@
 
 /**
- * Initializes the Gui
+   \brief Initializes the Gui
 */
 OrxonoxGui::OrxonoxGui (int argc, char *argv[])
@@ -56 +58 @@
   gtk_rc_parse( "rc" );
   
-  orxonoxGUI = new Window("Graphical Orxonox Launcher");
+  orxonoxGUI = new Window( "Grafical OrxOnoX loader, "PACKAGE_VERSION );
   orxonoxGUI->connectSignal ("destroy", orxonoxGUI->orxonox_gui_quit);
   orxonoxGUI->connectSignal ("delete_event", orxonoxGUI->orxonox_gui_quit);
@@ -75 +77 @@
       
   optionBox->fill (avBox);
-    
+
+  keys = new OrxonoxGuiKeys ();
+  optionBox->fill (keys->getWidget ());
+
   exec = new OrxonoxGuiExec (orxonoxGUI);
   optionBox->fill (exec->getWidget ());
@@ -99 +104 @@
 
 /* WIDGET */
-/**
- * Initializes a widget.
- * Nothing to do here.
- */
+
+/**
+   \brief deletes any given Widget
+   This is still pretty crappy.
+*/
+Widget::~Widget()
+{
+  //  cout << "hiding: " <<this->label <<"\n";
+  this->hide();
+  //  cout << "check if Packer: "<<this->label <<"\n";
+  if (this->is_option < 0)
+    {
+      //  cout << "get Down "<<this->label <<"\n";
+      static_cast<Packer*>(this)->down->~Widget();
+    }
+  //  cout << "next != NULL?: " <<this->label <<"\n";
+  if (this->next != NULL)
+    this->next->~Widget();
+  cout << "delete Widget: " <<this->label <<"\n";
+  //  delete widget;
+}
+
+/**
+   \brief Initializes a widget.
+   Initializes the next Pointer and the other Widget-specific Defaults.
+*/
 void Widget::init()
 {
+  next = NULL;
+  label = "";
   return;
 }
 
-/** 
- * Connect any signal to any given Sub-widget
- */
+/**
+   \brief makes the widget visible.
+*/
+void Widget::show()
+{
+  gtk_widget_show (this->widget);
+}
+
+/**
+   \brief hides the widget.
+*/
+void Widget::hide()
+{
+  gtk_widget_hide (this->widget);
+}
+
+/**
+   \brief Sets the resolution of a specific widget to the given size.
+   \param width the width of the widget to set.
+   \param height the height of the widget to set.
+*/
+void Widget::setSize(int width, int height)
+{
+  gtk_widget_set_usize (this->widget, width, height);
+}
+
+/** 
+    \brief Connect any signal to any given Sub-widget
+*/
 void Widget::connectSignal (char* event, gint (*signal)(GtkWidget*, GdkEvent*, void *))
 {
@@ -117 +172 @@
 
 /**
- * Connect a signal with additionally passing the whole Object
- */
+   \brief Connect a signal with additionally passing the whole Object
+*/
 void Widget::connectSignal (char* event, gint (*signal)( GtkWidget*, Widget *))
 {
@@ -125 +180 @@
 
 /**
- * Connect a signal with additionally passing a whole external Object
- */
+   \brief Connect a signal with additionally passing a whole external Object
+*/
 void Widget::connectSignal (char* event, void* extObj, gint (*signal)(GtkWidget*, GdkEvent*, void *))
 {
@@ -132 +187 @@
 }
 
-
-/**
- * Function to Shows a specific widget.
- */
-void Widget::show()
-{
-  gtk_widget_show (this->widget);
-}
-
-/**
- * Moves through all the Widgets downwards from this and executes the function on them.
- \param function must be of type void and takes a Widget* as an Input.
-
- */
+/**
+   \brief Moves through all the Widgets downwards from this and executes the function on them.
+   \param function must be of type void and takes a Widget* as an Input. 
+*/
 void Widget::walkThrough (void (*function)(Widget*))
 {
   function(this);
-  switch (this->is_option)
+  if (this->is_option < 0)
     {
-    case -1:
-      static_cast<Container*>(this)->down->walkThrough (function);
-      break;
-    case -2:
-      static_cast<Box*>(this)->down->walkThrough (function);
-      break;
+      static_cast<Packer*>(this)->down->walkThrough (function);
     } 
 
@@ -163 +203 @@
 }
 
-
-/** 
- * This is for listing the option of "widget"
- \param widget specifies the widget that should be listed
+/** 
+    \brief This is for listing the option of "widget"
+    \param widget specifies the widget that should be listed
 */
 void Widget::listOptions (Widget* widget)
 {
   if (widget->is_option >= 1)
-    cout << static_cast<Option*>(widget)->option_name <<" is : " << static_cast<Option*>(widget)->value <<endl;
-}
-
-/** 
- * This is for setting the option of "widget"
- \param widget specifies the widget that should be set.
+    cout << static_cast<Option*>(widget)->label <<" is : " << static_cast<Option*>(widget)->value <<endl;
+}
+
+/** 
+    \brief This is for setting the option of "widget"
+    \param widget specifies the widget that should be set.
 */
 void Widget::setOptions (Widget* widget)
@@ -184 +223 @@
 }
 
-/* CONTAINERS*/
-
-/**
- * Initializes a Container.
- * nothing to do here
- */
+//void deleteWidget(Widget* lastWidget)
+
+
+/* PACKERS */
+
+/**
+   \brief Initializes a Packer.
+   Sets the down-pinter to NULL and other PackerSpecific-values to their defaults.
+*/
+void Packer::init (void)
+{
+  down = NULL;
+  this->setGroupName ("");
+
+
+  static_cast<Widget*>(this)->init();
+  return;
+}
+
+/**
+   \brief Sets the group name under which all the lower widgets of this will be saved.
+   \param name The name of the group.
+*/
+void Packer::setGroupName (char* name)
+{
+  groupName = name;
+}
+
+/**
+   \brief Retrieves the group name under which all the lower widgets of this will be saved.
+   \returns name The name of the group.
+*/
+char* Packer::getGroupName (void)
+{
+  return groupName;
+}
+
+/* CONTAINERS */
+
+/**
+   \brief Initializes a Container.
+   sets the Container-Specific defaults.
+*/
 void Container::init (void)
 {
+  is_option = -1;
+
+  static_cast<Packer*>(this)->init();
+
   return;
 }
 
 /**
- * Fills a Container with lowerWidget.
- * It does this by filling up the down pointer only if down points to NULL.
- \param lowerWidget the Widget that should be filled into the Container.
+   \briefFills a Container with lowerWidget.
+   It does this by filling up the down pointer only if down points to NULL.
+   \param lowerWidget the Widget that should be filled into the Container.
 */
 void Container::fill (Widget *lowerWidget)
@@ -215 +295 @@
 /* WINDOW */
 
-  /**
-   * Creating a new Window without a Name
-   */
+/**
+   \brief Creating a new Window without a Name
+*/
 Window::Window (void)
 {
@@ -224 +304 @@
 
 /**
- * Creating a Window with a name
- \param windowName the name the window should get.
- */
+   \brief Creating a Window with a name
+   \param windowName the name the window should get.
+*/
 Window::Window (char* windowName)
 {
@@ -234 +314 @@
 
 /**
- * Destoying a Window (very BAD implemented).
- * For now it just hides the window.
- */
-Window::~Window ()
-{
-  gtk_widget_hide (widget);
-}
-
-/**
- *initializes a new Window
- */
+   \brief initializes a new Window
+*/
 void Window::init()
 {
-  is_option = -1;
-  next = NULL;
-  down = NULL;
+  isOpen = true;
+
+  static_cast<Container*>(this)->init();
+
   widget = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_policy (GTK_WINDOW(widget), TRUE, TRUE, TRUE);
@@ -259 +331 @@
 
 /**
- * Shows all Widgets that are included within this->widget.
- */
+   \brief Shows all Widgets that are included within this->widget.
+*/
 void Window::showall ()
 {
+  isOpen = true;
   gtk_widget_show_all  (widget);
 }
 
 /**
- * Set The Window-title to title
- \param title title the Window should get.
+   \brief Set The Window-title to title
+   \param title title the Window should get.
 */
 void Window::setTitle (char* title)
 {
+  label=title;
   gtk_window_set_title (GTK_WINDOW (widget), title);
 }
@@ -295 +369 @@
 
 /** 
- * Creates a new Frame without a name
- */
+    \brief Creates a new Frame without a name
+*/
 Frame::Frame (void)
 {
@@ -303 +377 @@
 
 /**
- * Creates a new Frame with name title
- */
+   \brief Creates a new Frame with name title
+*/
 Frame::Frame (char* title)
 {
@@ -311 +385 @@
 }
 
-/**
- * Destroys given Frame (not implemented yet)
- */
-Frame::~Frame ()
-{
-}
-
-/** 
- * Initializes a new Frame with default settings
- */
+/** 
+    \brief Initializes a new Frame with default settings
+*/
 void Frame::init()
 {
-  is_option = -1;
-  next = NULL;
-  down = NULL;
+  static_cast<Container*>(this)->init();
+  
   widget = gtk_frame_new ("");
   gtk_container_set_border_width (GTK_CONTAINER (widget), 3);
@@ -331 +397 @@
 
 /**
- * Sets the Frames name to title
- \param title The title the Frame should get.
- */
+   \brief Sets the Frames name to title
+   \param title The title the Frame should get.
+*/
 void Frame::setTitle (char* title)
 {
+  label = title;
   gtk_frame_set_label (GTK_FRAME (widget), title);
 }
@@ -342 +409 @@
 
 /**
- * Creates a new EventBox with default settings.
- */
+   \brief Creates a new EventBox with default settings.
+*/
 EventBox::EventBox ()
 {
@@ -349 +416 @@
 }
 /**
- * Creates a new EventBox with name title
- \param title title the Eventbox should get (only data-structure-internal)
+   \brief Creates a new EventBox with name title
+   \param title title the Eventbox should get (only data-structure-internal)
 */
 EventBox::EventBox (char* title)
@@ -360 +427 @@
 
 /**
- * Initializes a new EventBox
- */
+   \brief Initializes a new EventBox
+*/
 void EventBox::init(void)
 {
   is_option = -1;
-  next = NULL;
-  down = NULL;
+
+  static_cast<Container*>(this)->init();
+
   widget = gtk_event_box_new ();
   gtk_container_set_border_width (GTK_CONTAINER (widget), 3);
@@ -373 +441 @@
 
 /**
- * Sets the Title of the EventBox (not implemented)
- \param title Name the EventBox should get (only datastructure-internal).
+   \brief Sets the Title of the EventBox (not implemented)
+   \param title Name the EventBox should get (only datastructure-internal).
 */
 void EventBox::setTitle (char* title)
 {
-
-}
-
-/**
- * Destructs an EventBox (not Implemented)
- */
-EventBox::~EventBox ()
-{
-}
-
+  label = title;
+}
 
 /* BOX */
 
 /**
- * Creates a new horizontal Box
- */
+   \brief Creates a new horizontal Box
+*/
 Box::Box (void)
 {
@@ -400 +460 @@
 
 /**
- * Creates a new Box of type boxtype
- \param boxtype if 'v' the Box will be vertically, if 'h' the Box will be horizontally
- */
+   \brief Creates a new Box of type boxtype
+   \param boxtype if 'v' the Box will be vertically, if 'h' the Box will be horizontally
+*/
 Box::Box (char boxtype)
 {
@@ -409 +469 @@
 
 /**
- * Destroys given Box (not implemented yet)
- */
-Box::~Box ()
-{
-}
-
-/**
- * Initializes a new Box with type boxtype
- \param boxtype see Box(char boxtype)
+   \brief Initializes a new Box with type boxtype
+   \param boxtype see Box(char boxtype)
 */
 void Box::init(char boxtype)
 {
   is_option = -2;
-  next = NULL;
-  down = NULL;
+
+  static_cast<Packer*>(this)->init();
   if (boxtype == 'v')
     {
@@ -435 +488 @@
 
 /** 
- * Fills a box with a given Widget.
- * It does this by apending the first one to its down-pointer and all its following ones to the preceding next-pointer. The last one will receive a NULL pointer as Next
- \param lowerWidget the next Widget that should be appendet to this Box
- */
+    \brief Fills a box with a given Widget.
+    It does this by apending the first one to its down-pointer and all its following ones to the preceding next-pointer. The last one will receive a NULL pointer as Next
+    \param lowerWidget the next Widget that should be appendet to this Box
+*/
 void Box::fill (Widget *lowerWidget)
 {
-  /**
-   * Fill a Box with its lowerwidgets
-   */
   gtk_box_pack_start (GTK_BOX (this->widget), lowerWidget->widget, TRUE, TRUE, 0);
   if (this->down == NULL)
@@ -462 +512 @@
 
 /**
- * Creates a new Image
- \param imagename the location of the Image on the Hard Disc
+   \brief Creates a new Image
+   \param imagename the location of the Image on the Hard Disc
 */
 Image::Image (char* imagename)
@@ -469 +519 @@
   this->init();
   widget = gtk_image_new_from_file (imagename);
-}
-
-/** 
- * Initializes a new Image
- */
+  label = imagename;
+}
+
+/** 
+    \brief Initializes a new Image
+*/
 void Image::init()
 {
   is_option = 0;
-  next = NULL;
+
+  static_cast<Widget*>(this)->init();
 }
 
@@ -484 +536 @@
 
 /**
- * Initializes a new Option: nothing to do here
- */
+   \brief Initializes a new Option.
+   sets all Option-Specific-Values to their defaults.
+*/
 void Option::init()
 {
+  value = 0;
+  flag_name = "";
+  flag_name_short = "";
+  default_value = 0;
+
+  static_cast<Widget*>(this)->init();
+
   return;
 }
 
 /**
- * This sets The FlagName of an Option and defines its default Values
- !! Options will be saved if flagname is different from "" !!
-\param flagname the Name that will be displayed in the output
-\param defaultvalue the default Value for this Option (see definition of defaultvalue
+   \brief This sets The FlagName of an Option and defines its default Values
+   !! Options will be saved if flagname is different from "" !!
+   \param flagname the Name that will be displayed in the output
+   \param defaultvalue the default Value for this Option (see definition of defaultvalue
 */
 void Option::setFlagName (char* flagname, int defaultvalue)
@@ -501 +561 @@
   flag_name = flagname;
   default_value = defaultvalue;
-  cout << "Set Flagname of " << option_name << " to " << flagname << endl;
-}
-
-/** 
- * see Option::setFlagName (char* flagname, int defaultvalue)
- \param flagname the Name that will be displayed in the output
- \param defaultvalue the default Value for this Option (see definition of defaultvalue
- \param flagnameshort a short flagname to be displayed in the output
+  cout << "Set Flagname of " << label << " to " << flagname << endl;
+}
+
+/** 
+    \brief see Option::setFlagName (char* flagname, int defaultvalue)
+    \param flagname the Name that will be displayed in the output
+    \param defaultvalue the default Value for this Option (see definition of defaultvalue
+    \param flagnameshort a short flagname to be displayed in the output
 */
 void Option::setFlagName (char* flagname, char* flagnameshort,  int defaultvalue)
@@ -515 +575 @@
   flag_name_short = flagnameshort;
   default_value = defaultvalue;
-  cout << "Set Flagname of " << option_name << " to " << flagname << endl;
+  cout << "Set Flagname of " << label << " to " << flagname << endl;
 }
 
@@ -522 +582 @@
 
 /**
- * Creates a new Button with a buttonname
- \param buttonname sets the Name of the Button
+   \brief Creates a new Button with a buttonname
+   \param buttonname sets the Name of the Button
 */
 Button::Button(char* buttonname)
@@ -532 +592 @@
 
 /**
- * Initializes a new Button
- */
+   \brief Initializes a new Button
+*/
 void Button::init(void)
 {
   is_option = 0;
-  value = 0;
-  next = NULL;
-  option_name ="";
-  flag_name = "";
-  flag_name_short = "";
-  default_value = 0;
+
+  static_cast<Option*>(this)->init();
+
   widget = gtk_button_new_with_label ("");
 }
 
 /**
- * Sets a new name to the Button
-\param title The name the Button should get
+   \brief Sets a new name to the Button
+   \param title The name the Button should get
 */
 void Button::setTitle (char *title)
 {
-  option_name = title;
+  label = title;
   gtk_button_set_label (GTK_BUTTON(widget), title);
 }
 
 /**
- * redraws the Button
- * not implemented yet
- */
+   \brief redraws the Button
+   not implemented yet
+*/
 void Button::redraw ()
 {
@@ -567 +624 @@
 
 /**
- * Creates a new CheckButton with an ame 
- \param buttonname The name the CheckButton should display.
- */
+   \brief Creates a new CheckButton with an ame 
+   \param buttonname The name the CheckButton should display.
+*/
 CheckButton::CheckButton (char* buttonname)
 {
@@ -578 +635 @@
 }
 
-/** 
- * Destructs a CheckButton (not Implemented yet).
- */
-CheckButton::~CheckButton()
-{
-}
-
-/**
- * Initiali a new CheckButton with default settings
- */
+/**
+   \brief Initialize a new CheckButton with default settings
+*/
 void CheckButton::init(void)
 {
   is_option = 1;
-  value = 0;
-  next = NULL;
-  option_name = "";
-  flag_name = "";
-  flag_name_short = "";
-  default_value = 0;
+
+  static_cast<Option*>(this)->init();
+
   widget = gtk_check_button_new_with_label ("");
 }
 
 /**
- * Sets a new Title to a CheckButton
- \param title The new Name the CheckButton should display.
+   \brief Sets a new Title to a CheckButton
+   \param title The new Name the CheckButton should display.
 */
 void CheckButton::setTitle(char* title)
 {
-  option_name = title;
+  label = title;
   gtk_button_set_label(GTK_BUTTON(widget), title);
 }
@@ -612 +659 @@
 
 /** 
- * Signal OptionChange writes the Value from the CheckButton to its Object-Database.
- \param widget The widget(CheckButton) that has a changed Value
- \param checkbutton the CheckButton-Object that should receive the change.
- */
+    \brief Signal OptionChange writes the Value from the CheckButton to its Object-Database.
+    \param widget The widget(CheckButton) that has a changed Value
+    \param checkbutton the CheckButton-Object that should receive the change.
+*/
 gint CheckButton::OptionChange (GtkWidget *widget, Widget* checkbutton)
 {
   static_cast<CheckButton*>(checkbutton)->value = (int)gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON ((CheckButton*)checkbutton->widget));
   flags->setTextFromFlags(orxonoxGUI);
-  cout << static_cast<CheckButton*>(checkbutton)->option_name << " set to: " << static_cast<CheckButton*>(checkbutton)->value << endl;
-}
-
-/**
- * Redraws the CheckButton (if option has changed).
- * Example: if new settings are loaded the Button must be redrawn for the GUI to display that Change
- */
+  cout << static_cast<CheckButton*>(checkbutton)->label << " set to: " << static_cast<CheckButton*>(checkbutton)->value << endl;
+}
+
+/**
+   \brief Redraws the CheckButton (if option has changed).
+   Example: if new settings are loaded the Button must be redrawn for the GUI to display that Change
+*/
 void CheckButton::redraw ()
 {
@@ -635 +682 @@
 
 /**
- * Creates a new Slider
- \param slidername The data-structure-name of the slider.
- \param start The minimal Value of the slider.
- \param end The maximal Value of the slider.
+   \brief Creates a new Slider
+   \param slidername The data-structure-name of the slider.
+   \param start The minimal Value of the slider.
+   \param end The maximal Value of the slider.
 */
 Slider::Slider (char* slidername, int start, int end)
@@ -649 +696 @@
 
 /**
- * Destructs a Slider (not implemented yet)
- */
-Slider::~Slider()
-{
-}
-
-/**
- * Initializes a Slider with start and end Values
- * params: see Slider::Slider (char* slidername, int start, int end)
- */
+   \brief Initializes a Slider with start and end Values
+   params: see Slider::Slider (char* slidername, int start, int end)
+*/
 void Slider::init(int start, int end)
 {
   is_option = 2;
-  value = 0;
-  next = NULL;
-  option_name = "";
-  flag_name = "";
-  flag_name_short = "";
-  default_value = 0;
+
+  static_cast<Option*>(this)->init();
+
   widget = gtk_hscale_new_with_range (start, end, 5);
 }
 
 /**
- * Sets a new Title to the Slider
- \param title The new Name of the slider
+   \brief Sets a new Title to the Slider
+   \param title The new Name of the slider
 */
 void Slider::setTitle(char* title)
 {
-  option_name = title;
-}
-
-/**
- * Setting a new value to the Slider.
- * Maybe you also require a Slider::redraw() for this to display
- */
+  label = title;
+}
+
+/**
+   \brief Setting a new value to the Slider.
+   Maybe you also require a Slider::redraw() for this to display
+*/
 void Slider::setValue(int value)
 {
@@ -690 +727 @@
 
 /** 
- * Signal OptionChange writes the Value from the Slider to its Object-Database.
- \param widget The widget(Slider) that has a changed Value
- \param slider the Slider-Object that should receive the change.
- */
+    \brief Signal OptionChange writes the Value from the Slider to its Object-Database.
+    \param widget The widget(Slider) that has a changed Value
+    \param slider the Slider-Object that should receive the change.
+*/
 gint Slider::OptionChange (GtkWidget *widget, Widget* slider)
 {
   static_cast<Slider*>(slider)->value = (int)gtk_range_get_value (GTK_RANGE ((Slider*)slider->widget));
   flags->setTextFromFlags(orxonoxGUI);
-  cout << static_cast<Slider*>(slider)->option_name << " set to: "<< static_cast<Slider*>(slider)->value << endl;
-}
-
-/**
- * Redraws the widget
- * Example: see void CheckButton::redraw ()
- */
+  cout << static_cast<Slider*>(slider)->label << " set to: "<< static_cast<Slider*>(slider)->value << endl;
+}
+
+/**
+   \brief Redraws the widget
+   Example: see void CheckButton::redraw ()
+*/
 void Slider::redraw ()
 {
@@ -713 +750 @@
 
 /** 
- * Creates a Menu-Item-list out of multiple input.
- * !! Consider, that the last input argument has to be "lastItem" for this to work!!
- \param menuname The Database-Name of this Menu
- \param ... items to be added to this Menu. !! Consider, that the last input argument has to be "lastItem" for this to work!!
- */
+    \brief Creates a Menu-Item-list out of multiple input.
+    !! Consider, that the last input argument has to be "lastItem" for this to work!!
+    \param menuname The Database-Name of this Menu
+    \param ... items to be added to this Menu. !! Consider, that the last input argument has to be "lastItem" for this to work!!
+*/
 Menu::Menu (char* menuname, ...)
 {
@@ -737 +774 @@
 
 /**
- * Initializes a new Menu with no items
- */
+   \brief Initializes a new Menu with no items
+*/
 void Menu::init(void)
 {
   is_option = 2;
-  value = 0;
-  next = NULL;
-  flag_name = "";
-  flag_name_short = "";
-  default_value = 0;
+
+  static_cast<Option*>(this)->init();
+
   widget = gtk_option_menu_new ();
   menu = gtk_menu_new ();
@@ -758 +793 @@
 void Menu::setTitle(char* title)
 {
-  option_name = title;
-}
-
-/**
- * appends a new Item to the Menu-List.
- \param itemName the itemName to be appendet.
+  label = title;
+}
+
+/**
+   \brief appends a new Item to the Menu-List.
+   \param itemName the itemName to be appendet.
 */
 void Menu::addItem (char* itemName)
@@ -772 +807 @@
 
 /** 
- * Signal OptionChange writes the Value from the Menu to its Object-Database.
- \param widget The widget(Menu) that has a changed Value
- \param menu the Menu-Object that should receive the change.
- */gint Menu::OptionChange (GtkWidget *widget, Widget* menu)
+    \brief Signal OptionChange writes the Value from the Menu to its Object-Database.
+    \param widget The widget(Menu) that has a changed Value
+    \param menu the Menu-Object that should receive the change.
+*/
+gint Menu::OptionChange (GtkWidget *widget, Widget* menu)
 {
   static_cast<Menu*>(menu)->value = (int)gtk_option_menu_get_history (GTK_OPTION_MENU (menu->widget));
   flags->setTextFromFlags(orxonoxGUI);
-  cout << static_cast<Menu*>(menu)->option_name << " changed to : " << static_cast<Menu*>(menu)->value << endl;
-}
-
-/**
- * Redraws the widget
- * Example: see void CheckButton::redraw ()
+  cout << static_cast<Menu*>(menu)->label << " changed to : " << static_cast<Menu*>(menu)->value << endl;
+}
+
+/**
+   \brief Redraws the widget
+   Example: see void CheckButton::redraw ()
  */
 void Menu::redraw ()
@@ -792 +828 @@
 
 /**
- * Creates a new default Label with no Text.
- * You migth consider adding Label::setTitle with this.
- */
+   \brief Creates a new default Label with no Text.
+   You migth consider adding Label::setTitle with this.
+*/
 Label:: Label ()
 {
@@ -801 +837 @@
 
 /**
- * Creates a new Label with a Text.
- \param text The text to be displayed.
+   \brief Creates a new Label with a Text.
+   \param text The text to be displayed.
 */
 Label:: Label (char* text)
 {
+  this->init();
+  this->setText(text);
+}
+
+/**
+   \brief initializes a new Label
+*/
+void Label::init(void)
+{
   is_option = 0;
-  next = NULL;
-  widget = gtk_label_new (text);
+
+  static_cast<Widget*>(this)->init();
+
+  widget = gtk_label_new ("");
   gtk_label_set_line_wrap (GTK_LABEL(widget), TRUE);
 }
 
-/** 
- * Destructs a Label
- */
-Label::~Label ()
-{}
-
-/**
- * initializes a new Label
- */
-void Label::init(void)
-{
-  is_option = 0;
-  next = NULL;
-  widget = gtk_label_new ("");
-  gtk_widget_set_usize (widget, 260, 60);
-  gtk_label_set_line_wrap (GTK_LABEL(widget), TRUE);
-}
-
-/**
- * Sets a new Text to a Label.
- \param text The text to be inserted into the Label.
- */
+/**
+   \brief Sets a new Text to a Label.
+   \param text The text to be inserted into the Label.
+*/
 void Label::setText (char * text)
 {
+  label = text;
   gtk_label_set_text (GTK_LABEL (this->widget), text);
 }
 
 /**
- * get the Text of a Label
- \return The Text the Label holds.
+   \brief get the Text of a Label
+   \return The Text the Label holds.
 */
 char* Label::getText ()

orxonox/branches/buerli/gui/orxonox_gui.h

@@ -7 +7 @@
 #define _ORXONOX_GUI_H
 
+#if HAVE_CONFIG_H 
+#include <config.h> 
+#endif
+
 #include <stdlib.h>
-#include <string.h>
 #include <gtk/gtkmain.h>
 #include <gtk/gtkwindow.h>
@@ -34 +37 @@
 
 //! This is the topmost object that can be displayed all others are derived from it.
-
 class Widget
 {
  private:
  public:
+  ~Widget ();
+
   Widget* next; //!< next always points to the next Widget in the list. Every Widget has a next one, or has NULL as next
   GtkWidget* widget; //!< widget is the gtk_widget that the specific Object Contains.
-  virtual void init(void);
+  void init(void);
   int is_option; //!< with this Paramenter one can set the IsOption type: -2:Container, -1: Box, 0: not an Option, 1: Bool-option, 2: int-option
-  enum option { containerType = -2, boxType = -1, nothingType = 0, boolType = 1, intType = 2}; //!< defines is_option states
+  /**
+     \briefdefines is_option states
+  */
+  enum option { containerType = -2, boxType = -1, nothingType = 0, boolType = 1, intType = 2}; 
+  char* label; //!< The name of the Widget. Some do display it, Options need it to save;
   void connectSignal (char* event, gint (*signal)(GtkWidget*, GdkEvent*, void *));
   void connectSignal (char* event, gint (*signal)(GtkWidget*, Widget *));
   void connectSignal (char* event, void* extObj, gint (*signal)(GtkWidget*, GdkEvent*, void *));
   void show ();
+  void hide ();
+  void setSize(int width, int height);
 
   void walkThrough (void (*function)(Widget*));
@@ -55 +65 @@
 };
 
+//! This is a Packer Object, which has the ability to Pack other Widgets into itself.
+class Packer : public Widget
+{
+ public:
+  Widget* down; //!< this points to the Widget below this.
+  char* groupName; //!< For each Packer you can specify a Groupname under which the lowerWidgets will be saved.
+
+  void init(void);
+  void setGroupName (char* name);
+  char* getGroupName (void);
+};
 
 //! This is a Container Class, it can contain one sub-Widget: down.
@@ -62 +83 @@
  * The derived classes of Container can be displayed
 */
-class Container : public Widget
+class Container : public Packer
 {
  private:
   int borderwidth;
   int policy;
-  char* label;
-  
- public:
-  void init(void);
-  Widget* down; //!< this points to the Widget below this.
+  
+ public:
+  void init(void);
   //  void setBorderWidth (int borderwidth);
   //  virtual void setTitle (char* title) = 0;
@@ -84 +103 @@
 class Window : public Container
 {
+ private:
+  bool isOpen;
  public:
   Window (char* windowName);
   Window (void);
-  ~Window ();
   void init ();
   
@@ -105 +125 @@
   Frame (char* frameName);
   Frame (void);
-  ~Frame ();
   void init(void);
   
@@ -120 +139 @@
   EventBox (char* eventBoxName);
   EventBox (void);
-  ~EventBox ();
   void init(void);
   
@@ -132 +150 @@
  * A Box is always filled left->right (horizontally) or up->down (vertically)
  */
-class Box : public Widget
+class Box : public Packer
 {
  public:
   Box (void);
   Box (char boxtype);
-  ~Box (void);
   void init(char boxtype);
 
-  Widget* down; //!< the Lower Widget of a Box.
   void fill (Widget* lowerWidget);
 
@@ -154 +170 @@
  public:
   Image (char* imgaename);
-  ~Image ();
   void init(void);
 };
@@ -169 +184 @@
 
   int value; //!< every option has a value either true or false (0,1) or something else like 25 for 25% of the volume
-  char* option_name; //!< options have a name, that can be displayed around them
   char* flag_name; //!< options have a flag name that will be appendet if you start the Program from the GUI.
   char* flag_name_short; //!< like flag_name but shorter
@@ -187 +201 @@
  public:
   Button (char* buttonname);
-  ~Button (void);
   void init(void);
 
@@ -202 +215 @@
  public:
   CheckButton (char* buttonname);
-  ~CheckButton (void);
   static gint OptionChange (GtkWidget* widget, Widget* checkbutton);
   
@@ -219 +231 @@
  public:
   Slider (char* slidername,int start, int end);
-  ~Slider ();
   void init(int start, int end);
 
@@ -239 +250 @@
  public:
   Menu (char* menuname, ...);
-  ~Menu ();
   void init(void);
 
@@ -255 +265 @@
   Label ();
   Label (char* text);
-  ~Label ();
   void init(void);
   

orxonox/branches/buerli/gui/orxonox_gui_audio.cc

@@ -33 +33 @@
   audioFrame = new Frame ("Audio-Options:");
   audioBox = new Box ('v');
+  audioFrame->setGroupName ("audio");
   
   enableSound = new CheckButton ("Disable Sound");

orxonox/branches/buerli/gui/orxonox_gui_banner.cc

@@ -63 +63 @@
           logoEventBox = new EventBox();
           logoBox = new Box('v');
-          logoLabel = new Label("OrxOnoX");
+          logoLabel = new Label("OrxOnoX, " PACKAGE_VERSION);
           logoImage = new Image("banner.xpm");
           logoEventBox->fill(logoImage);
@@ -88 +88 @@
 {
   logoWindowIsOpen = 0;
-  logoWindow->~Window();
+  logoWindow->hide();
 }
 

orxonox/branches/buerli/gui/orxonox_gui_exec.cc

@@ -38 +38 @@
   execFrame = new Frame ("Execute-Tags:");
   execBox = new Box ('v');
+  execFrame->setGroupName ("misc");
   
   start = new Button ("Start");
@@ -109 +110 @@
   CONFIG_FILE = fopen (configFile, "w");
   if (CONFIG_FILE)
-    writeFileText (widget);
+    writeFileText (widget, 0);
   fclose (CONFIG_FILE);
 }
@@ -116 +117 @@
    \brief Actually writes into the configuration file to the disk.
    \param widget from which Widget on should be saved.
-*/
-void OrxonoxGuiExec::writeFileText (Widget* widget)
-{
+   \param depth initially "0", and grows higher, while new Groups are bundeled.
+*/
+void OrxonoxGuiExec::writeFileText (Widget* widget, int depth)
+{
+  int counter = 0;
+  while (counter < depth && ((widget->is_option>0
+                              && (strcmp (static_cast<Option*>(widget)->flag_name, "")
+                                  || strcmp (static_cast<Option*>(widget)->flag_name_short, "")) )
+                             || (widget->is_option<0
+                                 && strcmp (static_cast<Packer*>(widget)->getGroupName(), ""))))
+    {
+      fprintf (CONFIG_FILE, "  ", depth);
+      counter++;
+    }
+  
+  // check if it is a Packer, and if it is, check if it has a name and if there is something in it.
+  if (widget->is_option <0)
+    {
+      if (strcmp (static_cast<Packer*>(widget)->getGroupName(), ""))
+        {
+          fprintf (CONFIG_FILE, "[%s]\n", static_cast<Packer*>(widget)->getGroupName());
+          writeFileText (static_cast<Packer*>(widget)->down, depth+1);
+          fprintf(CONFIG_FILE, "\n");
+        }
+      else
+        {
+          writeFileText (static_cast<Packer*>(widget)->down, depth);
+        }
+    } 
+  
   if (widget->is_option >= 1)
     if  (strcmp (static_cast<Option*>(widget)->flag_name, "") || strcmp (static_cast<Option*>(widget)->flag_name_short, ""))
@@ -124 +152 @@
         char Buffer[256];
         char* space2under;
-        sprintf (Buffer, "%s", static_cast<Option*>(widget)->option_name);
+        sprintf (Buffer, "%s", static_cast<Option*>(widget)->label);
         if (strchr (Buffer, '_'))
-          cout << "Warning Optionname" << Buffer << " is not Valid for Saving, because it includes an underscore" << endl; 
+          cout << "Warning Optionname" << Buffer << " is not Valid for Saving, because it includes an underscore" << endl;
         while (space2under = strchr(Buffer, ' '))
           {
@@ -133 +161 @@
         fprintf (CONFIG_FILE, "%s = %i\n", Buffer, static_cast<Option*>(widget)->value);
       }
-  switch (widget->is_option)
-    {
-    case -1:
-      writeFileText (static_cast<Container*>(widget)->down);
-      break;
-    case -2:
-      writeFileText (static_cast<Box*>(widget)->down);
-      break;
-    } 
-  
+
   if (widget->next != NULL)
-    writeFileText (widget->next);
+    writeFileText (widget->next, depth);
 }
 
@@ -156 +175 @@
   if (CONFIG_FILE)
     {
+      Widget* groupWidget = widget;
       char Buffer[256] = "";
       char Variable[256]= "";
@@ -161 +181 @@
       while (fscanf (CONFIG_FILE, "%s", Buffer) != EOF)
         {
+          if (!strncmp (Buffer, "[", 1))
+            {
+              if ((groupWidget = locateGroup (widget, Buffer, 1))==NULL)
+                {
+                  cout << "!!There is no group called " << Buffer << " in this GUI.\n First best Widget will get the Infos assigned.\n Config-File will be updated in next Save\n";
+                  groupWidget = widget;
+                }
+            }
           if (!strcmp (Buffer, "="))
             {
@@ -171 +199 @@
               fscanf (CONFIG_FILE, "%s", Buffer);
               Value = atoi(Buffer);
-              readFileText (widget, Variable, Value);
+              readFileText (groupWidget, Variable, Value, 0);
               sprintf (Variable, "");
             }
@@ -179 +207 @@
     }
 }
-
 /**
    \brief Maps Confugurations to the Options.
@@ -185 +212 @@
    \param variableName the name of the Variable that should be set up.
    \param variableValue the Value of the Variable that should be set up
-*/
-void OrxonoxGuiExec::readFileText (Widget* widget, char* variableName, int variableValue)
+   \param depth the depth of the local Widget
+*/
+void OrxonoxGuiExec::readFileText (Widget* widget, char* variableName, int variableValue, int depth)
 {
   if (widget->is_option >= 1)
-    if (!strcmp (static_cast<Option*>(widget)->option_name, variableName))
+    if (!strcmp (static_cast<Option*>(widget)->label, variableName))
         static_cast<Option*>(widget)->value = variableValue;
 
-  switch (widget->is_option)
-    {
-    case -1:
-      readFileText (static_cast<Container*>(widget)->down, variableName, variableValue);
-      break;
-    case -2:
-      readFileText (static_cast<Box*>(widget)->down, variableName, variableValue);
-      break;
+  if (widget->is_option < 0)
+    {
+      readFileText (static_cast<Packer*>(widget)->down, variableName, variableValue, depth+1);
     } 
 
-  if (widget->next != NULL)
-    readFileText (widget->next, variableName, variableValue);
+  if (widget->next != NULL && depth !=0)
+    readFileText (widget->next, variableName, variableValue, depth);
+}
+
+/**
+   \brief locates a Group member
+*/
+Widget* OrxonoxGuiExec::locateGroup(Widget* widget, char* groupName, int depth)
+{
+  Widget* tmp;
+
+  // removes the trailing and ending [ ].
+  if (!strncmp (groupName, "[", 1))
+    {
+      groupName = groupName+1;
+      groupName[strlen(groupName)-1] = '\0';
+    }
+
+  if (widget->is_option < 0)
+    {
+      if (!strcmp(groupName, static_cast<Packer*>(widget)->getGroupName()))
+        {
+          return widget;
+        }
+      else
+        {
+          if ((tmp = locateGroup (static_cast<Packer*>(widget)->down, groupName, depth+1)) != NULL)
+            return tmp;
+        }
+    } 
+  
+  if (widget->next != NULL && depth != 0)
+    {
+      if ((tmp = locateGroup (widget->next, groupName, depth)) != NULL)
+        return tmp;
+    }
+  return NULL;
 }
 

orxonox/branches/buerli/gui/orxonox_gui_exec.h

@@ -33 +33 @@
   int shouldsave ();
   void writeToFile (Widget* widget);
-  void writeFileText (Widget* widget);
+  void writeFileText (Widget* widget, int depth);
   void readFromFile (Widget* widget);
-  void readFileText (Widget* widget, char* variableName, int variableValue);
+  void readFileText (Widget* widget, char* variableName, int variableValue, int depth);
+  Widget* locateGroup(Widget* widget, char* groupName, int depth);
 
 };

orxonox/branches/buerli/gui/orxonox_gui_flags.cc

@@ -39 +39 @@
 
   flagsLabel = new Label ();
+  flagsLabel->setSize (260,60);
   flagsBox->fill (flagsLabel);
   shortFlags = new CheckButton ("shortFlags");

orxonox/branches/buerli/gui/orxonox_gui_video.cc

@@ -32 +32 @@
   videoFrame = new Frame ("Video-Options:");
   videoBox = new Box ('v');
+  videoFrame->setGroupName("video");
   
   fullscreen = new CheckButton ("Fullscreen-mode");