Changeset 7661 in orxonox.OLD

Timestamp:

May 18, 2006, 12:55:34 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the QT_GUI back to the trunk
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/qt_gui . -r7607:HEAD

absolutely no conflicts

Location:

trunk

Files:

• acinclude.m4 (modified) (3 diffs)
• config.h.in (modified) (2 diffs)
• configure.ac (modified) (12 diffs)
• src/Makefile.am (modified) (4 diffs)
• src/defs/class_id.h (modified) (1 diff)
• src/defs/debug.h (modified) (1 diff)
• src/defs/globals.h (modified) (6 diffs)
• src/lib/BuildLibs.am (modified) (1 diff)
• src/lib/Makefile.am (modified) (2 diffs)
• src/lib/event/key_mapper.cc (modified) (5 diffs)
• src/lib/event/key_mapper.h (modified) (3 diffs)
• src/lib/event/key_names.cc (modified) (3 diffs)
• src/lib/event/key_names.h (modified) (3 diffs)
• src/lib/graphics/graphics_engine.cc (modified) (1 diff)
• src/lib/gui/Makefile.am (modified) (1 diff)
• src/lib/gui/gtk_gui/Makefile.am (modified) (1 diff)
• src/lib/gui/gtk_gui/gui_element.h (modified) (2 diffs)
• src/lib/gui/gtk_gui/gui_exec.cc (modified) (5 diffs)
• src/lib/gui/gtk_gui/gui_update.cc (modified) (1 diff)
• src/lib/gui/gui.cc (copied) (copied from branches/qt_gui/src/lib/gui/gui.cc)
• src/lib/gui/gui.h (copied) (copied from branches/qt_gui/src/lib/gui/gui.h)
• src/lib/gui/gui_element.cc (copied) (copied from branches/qt_gui/src/lib/gui/gui_element.cc)
• src/lib/gui/gui_element.h (copied) (copied from branches/qt_gui/src/lib/gui/gui_element.h)
• src/lib/gui/gui_saveable.cc (copied) (copied from branches/qt_gui/src/lib/gui/gui_saveable.cc)
• src/lib/gui/gui_saveable.h (copied) (copied from branches/qt_gui/src/lib/gui/gui_saveable.h)
• src/lib/gui/qt_gui (copied) (copied from branches/qt_gui/src/lib/gui/qt_gui)
• src/lib/gui/qt_gui/Makefile.am (copied) (copied from branches/qt_gui/src/lib/gui/qt_gui/Makefile.am)
• src/lib/gui/qt_gui/banner.xpm (copied) (copied from branches/qt_gui/src/lib/gui/qt_gui/banner.xpm)
• src/lib/gui/qt_gui/gui_audio.cc (copied) (copied from branches/qt_gui/src/lib/gui/qt_gui/gui_audio.cc)
• src/lib/gui/qt_gui/gui_audio.h (copied) (copied from branches/qt_gui/src/lib/gui/qt_gui/gui_audio.h)
• src/lib/gui/qt_gui/gui_control.cc (copied) (copied from branches/qt_gui/src/lib/gui/qt_gui/gui_control.cc)
• src/lib/gui/qt_gui/gui_control.h (copied) (copied from branches/qt_gui/src/lib/gui/qt_gui/gui_control.h)
• src/lib/gui/qt_gui/gui_general.cc (copied) (copied from branches/qt_gui/src/lib/gui/qt_gui/gui_general.cc)
• src/lib/gui/qt_gui/gui_general.h (copied) (copied from branches/qt_gui/src/lib/gui/qt_gui/gui_general.h)
• src/lib/gui/qt_gui/gui_video.cc (copied) (copied from branches/qt_gui/src/lib/gui/qt_gui/gui_video.cc)
• src/lib/gui/qt_gui/gui_video.h (copied) (copied from branches/qt_gui/src/lib/gui/qt_gui/gui_video.h)
• src/lib/gui/qt_gui/q_image_widget.cc (copied) (copied from branches/qt_gui/src/lib/gui/qt_gui/q_image_widget.cc)
• src/lib/gui/qt_gui/q_image_widget.h (copied) (copied from branches/qt_gui/src/lib/gui/qt_gui/q_image_widget.h)
• src/lib/gui/qt_gui/qt_gui.cc (copied) (copied from branches/qt_gui/src/lib/gui/qt_gui/qt_gui.cc)
• src/lib/gui/qt_gui/qt_gui.h (copied) (copied from branches/qt_gui/src/lib/gui/qt_gui/qt_gui.h)
• src/lib/gui/qt_gui/qt_gui_elements.cc (copied) (copied from branches/qt_gui/src/lib/gui/qt_gui/qt_gui_elements.cc)
• src/lib/gui/qt_gui/qt_gui_elements.h (copied) (copied from branches/qt_gui/src/lib/gui/qt_gui/qt_gui_elements.h)
• src/lib/lang/base_object.cc (modified) (2 diffs)
• src/lib/lang/base_object.h (modified) (1 diff)
• src/lib/parser/ini_parser/ini_parser.cc (modified) (8 diffs)
• src/lib/parser/ini_parser/ini_parser.h (modified) (4 diffs)
• src/lib/parser/preferences/ini_file_prefs_reader.cc (modified) (1 diff)
• src/lib/particles/dot_emitter.cc (modified) (1 diff)
• src/lib/shell/shell_buffer.h (modified) (1 diff)
• src/lib/shell/shell_completion_plugin.cc (modified) (4 diffs)
• src/lib/util/directory.cc (copied) (copied from branches/qt_gui/src/lib/util/directory.cc)
• src/lib/util/directory.h (copied) (copied from branches/qt_gui/src/lib/util/directory.h)
• src/lib/util/file.cc (copied) (copied from branches/qt_gui/src/lib/util/file.cc)
• src/lib/util/file.h (copied) (copied from branches/qt_gui/src/lib/util/file.h)
• src/lib/util/loading/resource_manager.cc (modified) (18 diffs)
• src/lib/util/loading/resource_manager.h (modified) (3 diffs)
• src/lib/util/osdir.h (deleted)
• src/lib/util/preferences.cc (modified) (5 diffs)
• src/lib/util/preferences.h (modified) (3 diffs)
• src/orxonox.cc (modified) (9 diffs)
• src/story_entities/story_entity.cc (modified) (2 diffs)

trunk/acinclude.m4

@@ -10 +10 @@
     if [test "x$_header_check" = "xyes" && test "x$_lib_check" = "xyes"] ; then
          LIBS="$LIBS -l$2"
-         $4
+         $4
     else
          echo "no Support for $2"
-         $5
+         $5
     fi
 ])
@@ -34 +34 @@
     if [test x$_header_check = "xyes" && test "x$_lib_check" = "xyes"] ; then
          LIBS="$LIBS -l$2"
-         $4
+         $4
     else
          echo "------------------"
@@ -40 +40 @@
          echo "please install the $2-LIBRARY-package which can be found at $6"
          echo "------------------"
-         $5
+         $5
          exit -1
     fi
 ])
+
+
+
+dnl AX_CHECK_REQUIRED_LIB([LIBRARY-NAME], [FUNCTION-IN-LIB], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND], [LIB-WEB-PAGE])
+AC_DEFUN([AX_CHECK_REQUIRED_LIB], [
+    _lib_check=""
+    _found_lib=""
+
+
+    for _lib in $1
+    do
+      AC_CHECK_LIB([$_lib], [$2], [_lib_check="yes"], [_lib_check="no"])
+      if test "x$_lib_check" = "xyes" ; then
+        _found_lib=$_lib
+        break
+      fi
+    done
+
+    if [test "x$_lib_check" = "xyes"] ; then
+         LIBS="$LIBS -l$_found_lib"
+         $3
+    else
+         echo "------------------"
+         echo "LIBRARY $1 not found."
+         echo "please install the $1-LIBRARY-package which can be found at $5"
+         echo "------------------"
+         $4
+         exit -1
+    fi
+])
+
+
+
+
+dnl AX_CHECK_QT([QTDIR], [LIBRARIES], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND], [LIB-WEB-PAGE])
+AC_DEFUN([AX_CHECK_QT], [
+    _lib_check=""
+    _found_lib=""
+    QT_PREFIX="$1"
+    QT_INCLUDE_DIRECTORY=""
+    QT_LIB_DIRECTORY=""
+
+
+    QT_COMMON_INCLUDE_DIRECTORIES="
+      `ls -dr ${QT_PREFIX}/include     2>/dev/null`
+      /usr/include
+      `ls -dr /usr/include/qt*         2>/dev/null`
+      `ls -dr /usr/lib/qt*/include     2>/dev/null`
+      `ls -dr /usr/local/qt*/include   2>/dev/null`
+      `ls -dr /opt/qt*/include         2>/dev/null`
+      `ls -dr /Developer/qt*/include   2>/dev/null`
+    "
+
+    QT_COMMON_LIB_DIRECTORIES="
+      `ls -dr ${QT_PREFIX}/lib         2>/dev/null`
+      /usr/include
+      `ls -dr /usr/lib/qt*             2>/dev/null`
+      `ls -dr /usr/lib/qt*             2>/dev/null`
+      `ls -dr /usr/local/qt*/lib       2>/dev/null`
+      `ls -dr /opt/qt*/lib             2>/dev/null`
+      `ls -dr /Developer/qt*/lib       2>/dev/null`
+    "
+
+    ## Search in all IncludeDirectories for QT-includes
+    for _include_directory in ${QT_COMMON_INCLUDE_DIRECTORIES}
+    do
+      if test -e ${_include_directory}/Qt/QtCore ; then
+        QT_INCLUDE_DIRECTORY=${_include_directory}
+        break
+      fi
+    done
+    if test -n ${QT_INCLUDE_DIRECTORY} ; then
+      echo "Qt-Include Directory is: ${QT_INCLUDE_DIRECTORY}"
+    else
+      AC_MSG_ERROR([Qt Headers not found])
+    fi
+
+## Search in all LibraryDirectories for QT-includes
+    for _lib_directory in ${QT_COMMON_LIB_DIRECTORIES}
+    do
+      if test -e ${_lib_directory}/libQtCore.so || test -e ${_lib_directory}/libQtCore.dll ; then
+        QT_LIB_DIRECTORY=${_lib_directory}
+        break
+      fi
+    done
+    if test -n ${QT_LIB_DIRECTORY} ; then
+      echo "Qt-Library Directory is: ${QT_LIB_DIRECTORY}"
+    else
+      AC_MSG_ERROR([Qt LIB not found])
+    fi
+
+## Setting up the Environment Variables.
+    QT_LIBS=""
+    QT_CXXFLAGS="-I${QT_INCLUDE_DIRECTORY}"
+    LDFLAGS="${LDFLAGS} -L${QT_LIB_DIRECTORY} -Wl,-rpath -Wl,${QT_LIB_DIRECTORY}"
+    QT_BIN_DIR="${QT_PREFIX}/bin"
+
+    CACHED_CPPFLAG=${CPPFLAGS}
+    CACHED_LDFLAGS=${LDFLAGS}
+
+    LDFLAGS="${LDFLAGS} ${QT_LDFLAGS}"
+    for _lib in $2
+    do
+      AC_CHECK_LIB([$_lib], [main], [_lib_check="yes"], [_lib_check="no"])
+      if test "x$_lib_check" = "xyes" ; then
+        _found_lib=$_lib
+        break
+      fi
+    done
+
+    if [test "x$_lib_check" = "xyes"] ; then
+         QT_LIBS="${QT_LIBS} -l$_found_lib"
+         AX_CHECK_REQUIRED_LIB([QtCore QtCore4], [main],,,[http://www.trolltech.com] )
+         AX_CHECK_REQUIRED_LIB([QtGui QtGui4], [main],,,[http://www.trolltech.com] )
+         AX_CHECK_REQUIRED_LIB([QtOpenGL QtOpenGL4], [main],,,[http://www.trolltech.com] )
+
+         $3
+    else
+         echo "------------------"
+         echo "LIBRARY $2 not found.in $1"
+         echo "please install the $1-LIBRARY-package which can be found at $5"
+         echo "------------------"
+         $4
+         exit -1
+    fi
+
+    echo "QT_LIBS = ${QT_LIBS}"
+    echo "QT_CXXFLAGS = ${QT_CXXFLAGS}"
+    echo "QT_LD_FLAGS = ${QT_LDFLAGS}"
+
+    AC_SUBST([QT_LIBS])
+    AC_SUBST([QT_CXXFLAGS])
+    AC_SUBST([QT_LDFLAGS])
+
+    #----------#
+    # QT - MOC #
+    #----------#
+    AC_PATH_PROG([QT_MOC], [moc], [no], ["${QT_BIN_DIR}:${PATH}"])
+      if test x${QT_MOC} = xno ; then
+        AC_MSG_ERROR([QT MOC not found])
+      fi
+    AC_SUBST([QT_MOC])
+
+    AC_PATH_PROG([QT_UIC], [uic], [no], ["${QT_BIN_DIR}:${PATH}"])
+ #     if test x${QT_UIC} = xno ; then
+ #       AC_MSG_WARN([QT UIC not found])
+ #     fi
+    AC_SUBST([QT_UIC])
+
+    AC_PATH_PROG([QT_RCC], [rcc], [no], ["${QT_BIN_DIR}:${PATH}"])
+#      if test x${QT_RCC} = xno ; then
+#        AC_MSG_WARN([QT RCC not found])
+#      fi
+    AC_SUBST([QT_RCC])
+
+
+
+    # Restore Values of CPPFLAGS and LDFLAGS
+    CPPFLAGS=${CACHED_CPPFLAG}
+    LDFLAGS=${CACHED_LDFLAGS}
+])

trunk/config.h.in

@@ -1 +1 @@
 /* config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define to the read-only architecture-independent data directory. */
-#undef DATADIR
 
 /* in which debug mode we are */
@@ -95 +92 @@
 #undef MODULAR_DEBUG
 
+/* Define to the read-only architecture-independent data directory of ORXONOX.
+   */
+#undef ORX_DATADIR
+
 /* Name of package */
 #undef PACKAGE

trunk/configure.ac

@@ -38 +38 @@
 AM_INIT_AUTOMAKE
 
-AC_CONFIG_SRCDIR([./src])
+AC_CONFIG_SRCDIR([src/orxonox.cc])
 AC_CONFIG_HEADER([config.h])
 
@@ -64 +64 @@
         echo "given: $DATA_DIR"
 fi
-AC_DEFINE_UNQUOTED([DATADIR], ["$DATA_DIR"],
+AC_DEFINE_UNQUOTED([ORX_DATADIR], ["$DATA_DIR"],
                    [Define to the read-only architecture-independent
-                    data directory.])
+                    data directory of ORXONOX.])
 
 #-----------------#
@@ -108 +108 @@
   fi
 fi
+
+if test $DEBUD > 3 ; then
+  CPPFLAGS="${CPPFLAGS} -g"
+fi
 AC_DEFINE_UNQUOTED(DEBUG, $DEBUG, [in which debug mode we are])
 AC_SUBST(DEBUG)
@@ -127 +131 @@
 fi
 
-#--------------#
-# GTK-disabled #
-#--------------#
-AC_MSG_CHECKING([if gtk should be enabled])
-AC_ARG_ENABLE([gtk],
-        AS_HELP_STRING(--disable-gtk,Prevents GTK from being loaded), [def_gtk=no], [def_gtk=yes])
-if test x$def_gtk = xyes; then
-  echo "yes"
-fi
-if test x$def_gtk = xno; then
-  echo "no"
-fi
 
 #------------------#
@@ -152 +144 @@
   echo "no"
 fi
+
+#--------------#
+# GTK-disabled #
+#--------------#
+
+AC_MSG_CHECKING([if gtk should be enabled])
+AC_ARG_WITH([gtk],
+        AS_HELP_STRING(--with-gtk, uses GTK for the GUI), [def_gtk=yes], [def_gtk=no])
+if test x$def_gtk = xyes; then
+  echo "yes - will be overwritten if Qt is enabled"
+fi
+if test x$def_gtk = xno; then
+  echo "no"
+fi
+
+
 
 #-------------------#
@@ -211 +219 @@
 fi
 AM_CONDITIONAL(DOCUMENTATION, test x$def_documentation = xyes)
-
-
 
 #---------------------------#
@@ -228 +234 @@
   CPPFLAGS="${CPPFLAGS} -I${PREFIX}/include"
   LDFLAGS="${LDFLAGS} -L$PREFIX/${ARCH}/lib -Wl,-rpath -Wl,${PREFIX}/${ARCH}/lib"
+
+  ## QT
+  QT_PREFIX=/usr/pack/qt-4.1.1-mo/${ARCH}
+#  CPPFLAGS="${CPPFLAGS} -I${PREFIX_QT}/include"
+#  LDFLAGS="${LDFLAGS} -L${QT_PREFIX}/lib -Wl,-rpath -Wl,${QT_PREFIX}/${ARCH}/lib"
+
+
+
   ## GTK
   GTKPREFIX=/usr/pack/gtk-2.8.3-mo
@@ -238 +252 @@
   echo "no"
 fi
+
+
 
 #######################
@@ -272 +288 @@
 ## here the system is checked, and openGL is included
 ## also checking for SDL on differen Systems
-
-CPPFLAGS="$CPPFLAGS -g"
-
 
 AC_MSG_CHECKING([for System])
@@ -557 +570 @@
 
 
-#---------#
-# libcURL #
-#---------#
-AX_CHECK_HEADER_LIB([curl/curl.h], [curl], [main], [
- have_curl=yes
-  CURL_LIBS=`curl-config --libs`
-  CURLCFLAGS=`curl-config --cflags`
-  AC_DEFINE_UNQUOTED(HAVE_CURL, 1, [if we have CURL]) ]
-  ,, [http://curl.haxx.se/])
-
-AC_SUBST(CURL_LIBS)
-AC_SUBST(CURL_CFLAGS)
-AM_CONDITIONAL(HAVE_CURL, test "x$have_curl" = "xyes")
-
-#--------#
-# efence #
-#--------#
-if test x$def_efence = xyes ; then
-  AC_CHECK_LIB([efence], [main], [FOUND_efence=yes; LIBS="$LIBS -lefence"])
-   if test x$FOUND_efence != xyes ; then
-     echo "efence was requested, but is not installed!! going on"
-   fi
-
-fi
+#----#
+# QT #
+#----#
+AX_CHECK_QT([${QT_PREFIX}], [QtCore],, [http://www.trolltech.com])
+if test x$have_qt = xno ; then
+    WITH_QT=no
+fi
+
 
 #-----#
@@ -607 +604 @@
 AM_CONDITIONAL(HAVE_GTK2, test x$have_gtk2 = xyes)
 
+
+#---------#
+# libcURL #
+#---------#
+AX_CHECK_HEADER_LIB([curl/curl.h], [curl], [main], [
+ have_curl=yes
+  CURL_LIBS=`curl-config --libs`
+  CURLCFLAGS=`curl-config --cflags`
+  AC_DEFINE_UNQUOTED(HAVE_CURL, 1, [if we have CURL]) ]
+  ,, [http://curl.haxx.se/])
+
+AC_SUBST(CURL_LIBS)
+AC_SUBST(CURL_CFLAGS)
+AM_CONDITIONAL(HAVE_CURL, test "x$have_curl" = "xyes")
+
+#--------#
+# efence #
+#--------#
+if test x$def_efence = xyes ; then
+  AC_CHECK_LIB([efence], [main], [FOUND_efence=yes; LIBS="$LIBS -lefence"])
+   if test x$FOUND_efence != xyes ; then
+     echo "efence was requested, but is not installed!! going on"
+   fi
+
+fi
 
 # FIXME: Replace `main' with a function in `-lm':
@@ -643 +665 @@
                  src/lib/gui/gtk_gui/Makefile
                  src/lib/gui/gl_gui/Makefile
+                 src/lib/gui/qt_gui/Makefile
                  src/lib/parser/Makefile
                  src/lib/parser/tinyxml/Makefile
                  src/lib/parser/ini_parser/Makefile
                  src/lib/parser/cmdline_parser/Makefile
-                 src/lib/parser/preferences/Makefile
+                 src/lib/parser/preferences/Makefile
                  src/util/Makefile
                  src/world_entities/Makefile

trunk/src/Makefile.am

@@ -12 +12 @@
 bin_PROGRAMS = orxonox
 
-orxonox_CPPFLAGS = -DIS_ORXONOX
-orxonox_LDFLAGS = -u global_ModelParticles_Factory
+orxonox_CPPFLAGS = \
+                -DIS_ORXONOX \
+                @QT_CXXFLAGS@
+
+orxonox_LDFLAGS = @QT_LDFLAGS@
 
 orxonox_DEPENDENCIES = \
@@ -24 +27 @@
                 util/libORXutils.a \
                 $(libORXlibs_a_LIBRARIES_) \
-                $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
+                $(CURL_LIBS) \
+                @QT_LIBS@
 
 orxonox_SOURCES = \
@@ -66 +70 @@
 
 ## orxonox.conf will be used from home-dir instead.
-EXTRA_DIST = proto/proto_class.h \
-             proto/proto_class.cc \
-             proto/proto_singleton.h \
-             proto/proto_singleton.cc \
-             proto/proto_world_entity.h \
-             proto/proto_world_entity.cc \
-             defs/include_paths.am \
-             story_entities/Makefile.am
+EXTRA_DIST = \
+                proto/proto_class.h \
+                proto/proto_class.cc \
+                proto/proto_singleton.h \
+                proto/proto_singleton.cc \
+                proto/proto_world_entity.h \
+                proto/proto_world_entity.cc \
+                defs/include_paths.am \
+                story_entities/Makefile.am
 
 if SUB_PROJECTS
@@ -81 +86 @@
 endif
 
-SUBDIRS = lib \
-          util \
-          world_entities \
-          . \
-          $(SUB_PROGS)
+SUBDIRS = \
+                lib \
+                util \
+                world_entities \
+                . \
+                $(SUB_PROGS)
 
 

trunk/src/defs/class_id.h

@@ -322 +322 @@
   CL_GLGUI_BAR                  =    0x00000b30,
 
+  // QT_GUI
+  CL_GUI_SAVEABLE               =    0x00b10000,
+  CL_QTGUI_BUTTON               =    0x00000ba0,
+  CL_QTGUI_PUSHBUTTON           =    0x00000ba3,
+  CL_QTGUI_CHECKBUTTON          =    0x00000ba4,
+  CL_QTGUI_RADIOBUTTON          =    0x00000ba5,
+  CL_QTGUI_CONTAINER            =    0x00b200a0,
+  CL_QTGUI_BOX                  =    0x00000ba7,
+  CL_QTGUI_FRAME                =    0x00000ba8,
+  CL_QTGUI_WINDOW               =    0x00000ba9,
+  CL_QTMENU_IMAGE_SCREEN        =    0x00000ba0,
+  CL_QTGUI_BAR                  =    0x00000ba0,
+
   /// AUDIO stuff (range from 0x00000c00 to 0x00000cff)
   CL_SOUND_BUFFER               =    0x00000c01,

trunk/src/defs/debug.h

@@ -28 +28 @@
 #include "confincl.h"
 #ifndef NO_SHELL
- #include "shell_buffer.h"
+#include "lib/shell/shell_buffer.h"
 #endif /* NO_SHELL */
 

trunk/src/defs/globals.h

@@ -25 +25 @@
 #define   DEFAULT_CONFIG_FILE              "~/.orxonox/orxonox.conf"
 #define   DEFAULT_LOCK_FILE                "~/.orxonox/orxonox.lock"
-#define   DEFAULT_DATA_DIR                 DATADIR "/orxonox/"
+#define   DEFAULT_DATA_DIR                 ORX_DATADIR "/orxonox/"
 #define   DEFAULT_DATA_DIR_CHECKFILE       "data.oxd"
 
@@ -33 +33 @@
 //! Name of Section Misc in the config-File
 #define   CONFIG_SECTION_MISC              "misc"
-#define   CONFIG_SECTION_MISC_KEYS         "miscKeys"
-#define   CONFIG_SECTION_PLAYER            "player"
+#define   CONFIG_SECTION_CONTROL           "control"
 #define   CONFIG_SECTION_VIDEO             "video"
 #define   CONFIG_SECTION_VIDEO_ADVANCED    "video_advanced"
 #define   CONFIG_SECTION_AUDIO             "audio"
-#define   CONFIG_SECTION_EXEC              "exec"
-#define   CONFIG_SECTION_DATA              "data"
+#define   CONFIG_SECTION_GENERAL           "general"
 
 /*
@@ -54 +52 @@
 #define   CONFIG_NAME_FOG                  "Fog"
 #define   CONFIG_NAME_REFLECTIONS          "Reflections"
-#define   CONFIG_NAME_TEXTURES             "TEXTURES"
+#define   CONFIG_NAME_TEXTURES             "Textures"
 #define   CONFIG_NAME_TEXTURE_DETAIL       "Texture-Detail"
 #define   CONFIG_NAME_MODEL_DETAIL         "Model-Detail"
@@ -61 +59 @@
 #define   CONFIG_NAME_FILTER_METHOD        "Filtering-Method"
 
+#define   CONFIG_NAME_SOUNDCARD            "Soundcard"
 #define   CONFIG_NAME_DISABLE_AUDIO        "Disable-Audio"
 #define   CONFIG_NAME_AUDIO_CHANNELS       "Audio-Channels"
@@ -69 +68 @@
 #define   CONFIG_NAME_VERBOSE_MODE         "Verbose-Mode"
 #define   CONFIG_NAME_ALWAYS_SHOW_GUI      "Always-Show-The-Gui"
+#define   CONFIG_NAME_DEBUG_LEVEL          "Debug-Level"
+
 // evenets
 #define   CONFIG_NAME_PLAYER_FORWARD       "Forward"
@@ -80 +81 @@
 
 #define   CONFIG_NAME_PLAYER_FIRE          "Fire"
-#define   CONFIG_NAME_PLAYER_NEXT_WEAPON   "Next"
-#define   CONFIG_NAME_PLAYER_PREV_WEAPON   "Prev"
-#define   CONFIG_NAME_PLAYER_CHANGE_SHIP   "Change_Ship"
+#define   CONFIG_NAME_PLAYER_NEXT_WEAPON   "Next-Weapon"
+#define   CONFIG_NAME_PLAYER_PREV_WEAPON   "Previous-Weapon"
+#define   CONFIG_NAME_PLAYER_CHANGE_SHIP   "Change-Ship"
 
 #define   CONFIG_NAME_QUIT                 "Quit"

trunk/src/lib/BuildLibs.am

@@ -3 +3 @@
                 $(LIB_PREFIX)/libORXlibs.a \
                 $(LIB_PREFIX)/shell/libORXshell.a \
-                $(LIB_PREFIX)/gui/gtk_gui/libORXgui.a \
+                $(LIB_PREFIX)/gui/qt_gui/libORXqtgui.a \
                 $(LIB_PREFIX)/gui/gl_gui/libORXglgui.a \
+                $(LIB_PREFIX)/gui/libORXbasegui.a \
                 $(LIB_PREFIX)/graphics/importer/libORXimporter.a \
                 $(LIB_PREFIX)/graphics/libORXgraphics.a \

trunk/src/lib/Makefile.am

@@ -25 +25 @@
                 util/preferences.cc \
                 util/threading.cc \
+                util/file.cc \
+                util/directory.cc \
                 \
                 data/data_tank.cc
@@ -43 +45 @@
                 util/preferences.h \
                 util/threading.h \
-                util/osdir.h \
+                util/file.h \
+                util/directory.h \
                 \
                 util/loading/resource_manager.h \

trunk/src/lib/event/key_mapper.cc

@@ -27 +27 @@
 #include "util/preferences.h"
 #include "key_names.h"
+#include "event_def.h"
 #include "debug.h"
 
@@ -71 +72 @@
  * and you do not have to care about The namings, as they might change
  */
-orxKeyMapping map[] = {
-  {&KeyMapper::PEV_FORWARD,              CONFIG_NAME_PLAYER_FORWARD},
-  {&KeyMapper::PEV_BACKWARD,             CONFIG_NAME_PLAYER_BACKWARD},
-  {&KeyMapper::PEV_UP,                   CONFIG_NAME_PLAYER_UP},
-  {&KeyMapper::PEV_DOWN,                 CONFIG_NAME_PLAYER_DOWN},
-  {&KeyMapper::PEV_LEFT,                 CONFIG_NAME_PLAYER_LEFT},
-  {&KeyMapper::PEV_RIGHT,                CONFIG_NAME_PLAYER_RIGHT},
-  {&KeyMapper::PEV_ROLL_LEFT,            CONFIG_NAME_PLAYER_ROLL_RIGHT},
-  {&KeyMapper::PEV_ROLL_RIGHT,           CONFIG_NAME_PLAYER_ROLL_LEFT},
-  {&KeyMapper::PEV_STRAFE_LEFT,          "StrafeLeft"},
-  {&KeyMapper::PEV_STRAFE_RIGHT,         "StrafeRight"},
-
-  {&KeyMapper::PEV_FIRE1,                CONFIG_NAME_PLAYER_FIRE},
-  {&KeyMapper::PEV_FIRE1,                "Fire1"},
-  {&KeyMapper::PEV_FIRE2,                "Fire2"},
-  {&KeyMapper::PEV_NEXT_WEAPON,          CONFIG_NAME_PLAYER_NEXT_WEAPON},
-  {&KeyMapper::PEV_PREVIOUS_WEAPON,      CONFIG_NAME_PLAYER_PREV_WEAPON},
-
-  {&KeyMapper::PEV_CHANGE_SHIP,          CONFIG_NAME_PLAYER_CHANGE_SHIP},
-
-
-  {&KeyMapper::PEV_VIEW0,                CONFIG_NAME_VIEW0},
-  {&KeyMapper::PEV_VIEW1,                CONFIG_NAME_VIEW1},
-  {&KeyMapper::PEV_VIEW2,                CONFIG_NAME_VIEW2},
-  {&KeyMapper::PEV_VIEW3,                CONFIG_NAME_VIEW3},
-  {&KeyMapper::PEV_VIEW4,                CONFIG_NAME_VIEW4},
-  {&KeyMapper::PEV_VIEW5,                CONFIG_NAME_VIEW5},
-
-  {&KeyMapper::PEV_NEXT_WORLD,           CONFIG_NAME_NEXT_WORLD},
-  {&KeyMapper::PEV_PREVIOUS_WORLD,       CONFIG_NAME_PREV_WORLD},
-
-  {&KeyMapper::PEV_PAUSE,                CONFIG_NAME_PAUSE},
-  {&KeyMapper::PEV_QUIT,                 CONFIG_NAME_QUIT},
-  {NULL, NULL}
+KeyMapper::KeyMapping KeyMapper::map[] = {
+  {&KeyMapper::PEV_FORWARD,              CONFIG_NAME_PLAYER_FORWARD,         SDLK_w},
+  {&KeyMapper::PEV_BACKWARD,             CONFIG_NAME_PLAYER_BACKWARD,        SDLK_s},
+  {&KeyMapper::PEV_UP,                   CONFIG_NAME_PLAYER_UP,              SDLK_r},
+  {&KeyMapper::PEV_DOWN,                 CONFIG_NAME_PLAYER_DOWN,            SDLK_f},
+  {&KeyMapper::PEV_LEFT,                 CONFIG_NAME_PLAYER_LEFT,            SDLK_a},
+  {&KeyMapper::PEV_RIGHT,                CONFIG_NAME_PLAYER_RIGHT,           SDLK_d},
+  {&KeyMapper::PEV_ROLL_RIGHT,           CONFIG_NAME_PLAYER_ROLL_LEFT,       SDLK_z},
+  {&KeyMapper::PEV_ROLL_LEFT,            CONFIG_NAME_PLAYER_ROLL_RIGHT,      SDLK_c},
+  {&KeyMapper::PEV_STRAFE_LEFT,          "StrafeLeft",                       SDLK_q},
+  {&KeyMapper::PEV_STRAFE_RIGHT,         "StrafeRight",                      SDLK_e},
+
+  {&KeyMapper::PEV_FIRE1,                CONFIG_NAME_PLAYER_FIRE,            EV_MOUSE_BUTTON_LEFT},
+  {&KeyMapper::PEV_FIRE2,                "Fire2",                            EV_MOUSE_BUTTON_RIGHT},
+  {&KeyMapper::PEV_NEXT_WEAPON,          CONFIG_NAME_PLAYER_NEXT_WEAPON,     EV_MOUSE_BUTTON_WHEELUP},
+  {&KeyMapper::PEV_PREVIOUS_WEAPON,      CONFIG_NAME_PLAYER_PREV_WEAPON,     EV_MOUSE_BUTTON_WHEELDOWN},
+
+  {&KeyMapper::PEV_CHANGE_SHIP,          CONFIG_NAME_PLAYER_CHANGE_SHIP,     SDLK_g},
+
+
+  {&KeyMapper::PEV_VIEW0,                CONFIG_NAME_VIEW0,                  SDLK_1},
+  {&KeyMapper::PEV_VIEW1,                CONFIG_NAME_VIEW1,                  SDLK_2},
+  {&KeyMapper::PEV_VIEW2,                CONFIG_NAME_VIEW2,                  SDLK_3},
+  {&KeyMapper::PEV_VIEW3,                CONFIG_NAME_VIEW3,                  SDLK_4},
+  {&KeyMapper::PEV_VIEW4,                CONFIG_NAME_VIEW4,                  SDLK_5},
+  {&KeyMapper::PEV_VIEW5,                CONFIG_NAME_VIEW5,                  SDLK_6},
+
+  {&KeyMapper::PEV_NEXT_WORLD,           CONFIG_NAME_NEXT_WORLD,             SDLK_x},
+  {&KeyMapper::PEV_PREVIOUS_WORLD,       CONFIG_NAME_PREV_WORLD,             SDLK_z},
+
+  {&KeyMapper::PEV_PAUSE,                CONFIG_NAME_PAUSE,                  SDLK_p},
+  {&KeyMapper::PEV_QUIT,                 CONFIG_NAME_QUIT,                   SDLK_ESCAPE},
+  {NULL, "", 0}
 };
 
@@ -138 +138 @@
 void KeyMapper::loadKeyBindings(IniParser* iniParser)
 {
-  if( !iniParser->getSection (CONFIG_SECTION_PLAYER "1"))
-  {
-    PRINTF(1)("Could not find key bindings " CONFIG_SECTION_PLAYER"1\n");
+  if( !iniParser->getSection (CONFIG_SECTION_CONTROL))
+  {
+    PRINTF(1)("Could not find key bindings " CONFIG_SECTION_CONTROL "\n");
     return;
   }
@@ -158 +158 @@
 
   // PARSE MISC SECTION
-  if( !iniParser->getSection (CONFIG_SECTION_MISC_KEYS))
-  {
-    PRINTF(1)("Could not find key bindings" CONFIG_SECTION_MISC_KEYS "\n");
+//   if( !iniParser->getSection (CONFIG_SECTION_MISC_KEYS))
+//   {
+//     PRINTF(1)("Could not find key bindings" CONFIG_SECTION_MISC_KEYS "\n");
+//     return;
+//   }
+//
+//   iniParser->firstVar();
+//   while( iniParser->getCurrentName() != "" )
+//   {
+//     PRINTF(3)("MISC: Parsing %s, %s now.\n", iniParser->getCurrentName(), iniParser->getCurrentValue());
+//     index = nameToIndex (iniParser->getCurrentValue());
+//     this->mapKeys(iniParser->getCurrentName(), index);
+//     iniParser->nextVar();
+//   }
+}
+
+void KeyMapper::loadKeyBindings()
+{
+  if( !Preferences::getInstance()->sectionExists(CONFIG_SECTION_CONTROL))
+  {
+    PRINTF(1)("Could not find key bindings " CONFIG_SECTION_CONTROL "\n");
     return;
   }
-
-  iniParser->firstVar();
-  while( iniParser->getCurrentName() != "" )
-  {
-    PRINTF(3)("MISC: Parsing %s, %s now.\n", iniParser->getCurrentName(), iniParser->getCurrentValue());
-    index = nameToIndex (iniParser->getCurrentValue());
-    this->mapKeys(iniParser->getCurrentName(), index);
-    iniParser->nextVar();
-  }
-}
-
-void KeyMapper::loadKeyBindings()
-{
-  if( !Preferences::getInstance()->sectionExists(CONFIG_SECTION_PLAYER "1"))
-  {
-    PRINTF(1)("Could not find key bindings " CONFIG_SECTION_PLAYER"1\n");
-    return;
-  }
   int* index;
 
-  std::list<std::string> keys = Preferences::getInstance()->listKeys(CONFIG_SECTION_PLAYER "1");
+  std::list<std::string> keys = Preferences::getInstance()->listKeys(CONFIG_SECTION_CONTROL);
   for ( std::list<std::string>::const_iterator it = keys.begin(); it!=keys.end(); it++ )
   {
-    PRINTF(3)("Keys: Parsing %s, %s now.\n", it->c_str(), Preferences::getInstance()->getString(CONFIG_SECTION_PLAYER "1", *it, "").c_str());
+    PRINTF(3)("Keys: Parsing %s, %s now.\n", it->c_str(), Preferences::getInstance()->getString(CONFIG_SECTION_CONTROL, *it, "").c_str());
     // map the name to an sdl index
-    index = nameToIndex (Preferences::getInstance()->getString(CONFIG_SECTION_PLAYER "1", *it, ""));
+    index = nameToIndex (Preferences::getInstance()->getString(CONFIG_SECTION_CONTROL, *it, ""));
     // map the index to a internal name
-    this->mapKeys(*it, index);
-  }
-
-
-  // PARSE MISC SECTION
-  if( !Preferences::getInstance()->sectionExists (CONFIG_SECTION_MISC_KEYS))
-  {
-    PRINTF(1)("Could not find key bindings " CONFIG_SECTION_MISC_KEYS "\n");
-    return;
-  }
-
-  keys = Preferences::getInstance()->listKeys(CONFIG_SECTION_MISC_KEYS);
-  for ( std::list<std::string>::const_iterator it = keys.begin(); it!=keys.end(); it++ )
-  {
-    PRINTF(3)("MISC: Parsing %s, %s now.\n", it->c_str(), Preferences::getInstance()->getString(CONFIG_SECTION_MISC_KEYS, *it, "").c_str());
-    index = nameToIndex (Preferences::getInstance()->getString(CONFIG_SECTION_MISC_KEYS, *it, ""));
     this->mapKeys(*it, index);
   }
@@ -266 +250 @@
   for(int i = 0; map[i].pValue != NULL; ++i)
     {
-      PRINT(0)("%s = %i\n",map[i].pName, *map[i].pValue);
+      PRINT(0)("%s = %i\n",map[i].pName.c_str(), *map[i].pValue);
     }
   PRINT(0)("=======================================================\n");

trunk/src/lib/event/key_mapper.h

@@ -10 +10 @@
 
 #include "base_object.h"
-//#include "event_def.h"
-
+#include <string>
 class IniParser;
 
-//! A mapping from key-name to key-id
-typedef struct orxKeyMapping
+//! The map class functionalities
+class KeyMapper : public BaseObject
 {
-  int* pValue;
-  char* pName;
-};
+public:
+  //! A mapping from key-name to key-id
+  typedef struct KeyMapping
+  {
+    int*              pValue;
+    const std::string pName;
+    int               defaultValue;
+  };
 
-
-//! The map class functionalities
-class KeyMapper : public BaseObject {
-
- public:
+public:
   KeyMapper();
   virtual ~KeyMapper();
@@ -33 +33 @@
   void loadKeyBindings(IniParser* iniParser);
 
+  static const KeyMapping* getKeyMapping() { return KeyMapper::map; };
+
   void debug();
 
- private:
+private:
   int* nameToIndex (const std::string& name);
   void mapKeys(const std::string& name, int* index);
 
- public:
+public:
   static int PEV_FORWARD;           //!< forward button
   static int PEV_BACKWARD;          //!< backward buttton
@@ -73 +75 @@
   static int PEV_QUIT;              //!< quit button
 
- private:
-  int         coord[2];              //!< temp place to save variables in nameToIndex() function
+private:
+  int                coord[2];      //!< temp place to save variables in nameToIndex() function
+  static KeyMapping  map[];         //!< The KeyMapping that maps strings to ID's and Vice Versa
 };
 

trunk/src/lib/event/key_names.cc

@@ -17 +17 @@
 #include "event_def.h"
 
-#include "stdincl.h"
-
-#include <string.h>
-
-using namespace std;
+std::string EVToKeyName(int key)
+{
+  std::string name = SDLBToButtonname( key );
+  if (name != "UNKNOWN")
+    return name;
+  else
+    return SDLKToKeyname( key );
+}
+
+int KeyNameToEV(const std::string& keyName)
+{
+  int key = buttonnameToSDLB( keyName );
+  if (key != -1)
+    return key;
+  else
+    return keynameToSDLK( keyName );
+}
+
 
 int buttonnameToSDLB(const std::string& name)
@@ -33 +46 @@
 }
 
-const char* SDLBToButtonname( int button)
+std::string SDLBToButtonname( int button)
 {
         if( button == EV_MOUSE_BUTTON_LEFT) return "BUTTON_LEFT";
@@ -181 +194 @@
 }
 
-const char* SDLKToKeyname(int key)
+std::string SDLKToKeyname(int key)
 {
         if( key == SDLK_BACKSPACE) return "BACKSPACE";

trunk/src/lib/event/key_names.h

@@ -11 +11 @@
 
 /**
- *  converts a button name string to a integer representing the corresponding SDL mouse button identifier
+ * @brief converts an EVKey into a String, naming the Event.
+ * @param key the Key (either key or button) to convert.
+ * @returns the String containing the Event.
+ */
+std::string EVToKeyName(int key);
+/**
+ * @brief converts a KeyName into an Event.
+ * @param keyName the Key to transform.
+ * @returns the Event-Number
+ */
+int KeyNameToEV(const std::string& keyName);
+
+
+/**
+ * @brief converts a button name string to a integer representing the corresponding SDL mouse button identifier
  * @param name: the name of the mouse button
  * @return an int containing the SDL identifier of the mouse button or -1 if the button name is not valid
@@ -18 +32 @@
 
 /**
- *  converst a SDL mouse button identifier to a name string
+ * @brief converst a SDL mouse button identifier to a name string
  * @param button: an SDL mouse button identifier
  * @return a pointer to a string containing the name of the mouse button
  */
-const char* SDLBToButtonname( int button);
+std::string SDLBToButtonname( int button);
 
 /**
- *  converts a key name string to a integer representing the corresponding SDLK sym
+ * @brief converts a key name string to a integer representing the corresponding SDLK sym
  * @param name: the name of the key
  * @return the SDLK sym of the named key or -1 if the key name is not valid
@@ -32 +46 @@
 
 /**
- *  converts an SDLK sym to a name string
+ * @brief converts an SDLK sym to a name string
  * @param key: the SDLK sym
  * @return a pointer to a string containig the name of the key
  */
-const char* SDLKToKeyname( int key);
-
+std::string SDLKToKeyname( int key);
 
 #endif /* _KEY_NAMES_H */

trunk/src/lib/graphics/graphics_engine.cc

@@ -155 +155 @@
 {
   // looking if we are in fullscreen-mode
-  const std::string fullscreen = Preferences::getInstance()->getString(CONFIG_SECTION_VIDEO, CONFIG_NAME_FULLSCREEN, "0");
-
-  if (fullscreen[0] == '1' || fullscreen == "true")
+  MultiType fullscreen = Preferences::getInstance()->getString(CONFIG_SECTION_VIDEO, CONFIG_NAME_FULLSCREEN, "0");
+
+  if (fullscreen.getBool())
     this->fullscreenFlag = SDL_FULLSCREEN;
 
   // looking if we are in fullscreen-mode
-  const std::string textures = Preferences::getInstance()->getString(CONFIG_SECTION_VIDEO_ADVANCED, CONFIG_NAME_TEXTURES, "0");
-  if (textures[0] == '1' || textures == "true")
-    Texture::setTextureEnableState(true);
-  else
-    Texture::setTextureEnableState(false);
+  MultiType textures = Preferences::getInstance()->getString(CONFIG_SECTION_VIDEO_ADVANCED, CONFIG_NAME_TEXTURES, "1");
+    Texture::setTextureEnableState(textures.getBool());
 
   // searching for a usefull resolution

trunk/src/lib/gui/Makefile.am

@@ -1 @@
-SUBDIRS = gtk_gui \
-          gl_gui
+MAINSRCDIR=../..
+include $(MAINSRCDIR)/defs/include_paths.am
+
+AM_LDFLAGS =
+
+noinst_LIBRARIES = libORXbasegui.a
+
+
+libORXbasegui_a_SOURCES = \
+                gui_element.cc \
+                gui_saveable.cc \
+                gui.cc
+
+
+noinst_HEADERS= \
+                gui_element.h \
+                gui_saveable.h \
+                gui.h
+
+
+EXTRA_DIST =
+
+SUBDIRS = \
+        . \
+        gl_gui \
+        qt_gui
+
+#       gtk_gui

trunk/src/lib/gui/gtk_gui/Makefile.am

@@ -2 +2 @@
 include $(MAINSRCDIR)/defs/include_paths.am
 
-noinst_LIBRARIES = libORXgui.a
+noinst_LIBRARIES = libORXgtkgui.a
 
-libORXgui_a_CPPFLAGS = -DBUILD_ORXONOX \
-                        $(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS)
+libORXgtkgui_a_CPPFLAGS = \
+                -DBUILD_ORXONOX \
+                $(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS)
 
-libORXgui_a_SOURCES = gui.cc \
-                      gui_gtk.cc \
-                      gui_element.cc \
-                      gui_video.cc \
-                      gui_audio.cc \
-                      gui_exec.cc \
-                      gui_flags.cc \
-                      gui_banner.cc \
-                      gui_keys.cc \
-                      gui_update.cc
+libORXgtkgui_a_SOURCES = \
+                gui.cc \
+                gui_gtk.cc \
+                gui_element.cc \
+                gui_video.cc \
+                gui_audio.cc \
+                gui_exec.cc \
+                gui_flags.cc \
+                gui_banner.cc \
+                gui_keys.cc \
+                gui_update.cc
 
 noinst_HEADERS= gui.h \
-                gui_gtk.h \
-                gui_element.h \
-                gui_video.h \
-                gui_audio.h \
-                gui_exec.h \
-                gui_flags.h \
-                gui_banner.h \
-                gui_keys.h \
-                gui_update.h
+                gui_gtk.h \
+                gui_element.h \
+                gui_video.h \
+                gui_audio.h \
+                gui_exec.h \
+                gui_flags.h \
+                gui_banner.h \
+                gui_keys.h \
+                gui_update.h
 
 EXTRA_DIST = rc \

trunk/src/lib/gui/gtk_gui/gui_element.h

@@ -1 @@
-/*! 
+/*!
  * @file gui_element.h
-  *  Definition of ...
+ *  Definition of ...
 
 */
@@ -16 +16 @@
   GuiElement();
   virtual ~GuiElement();
-  
+
   /** @returns the main Widget of this GuiElement. */
-  Widget* getWidget() {return this->mainWidget;}
+  Widget* getWidget() { return this->mainWidget; }
  protected:
   void setMainWidget(Widget* widget);
-  
+
  private:
   Widget* mainWidget;

trunk/src/lib/gui/gtk_gui/gui_exec.cc

@@ -26 +26 @@
 #include "gui_exec.h"
 
+#include "file.h"
 #include "util/loading/resource_manager.h"
 #include "parser/ini_parser/ini_parser.h"
@@ -33 +34 @@
 #include <sys/stat.h>
 #include <sys/types.h>
+
 
 
@@ -147 +149 @@
 void GuiExec::setConfDir(const char* confDir)
 {
-  this->confDir = ResourceManager::homeDirCheck(confDir);
+  this->confDir = File(confDir).name();
 
   PRINTF(5)("Config Directory is: %s.\n", this->confDir);
@@ -199 +201 @@
   IniParser iniParser;
   this->writeFileText(widget, &iniParser, 0);
-  std::string fileName = ResourceManager::homeDirCheck(confFile);
-  iniParser.writeFile(fileName);
+  iniParser.writeFile(File(confFile).name());
 }
 
@@ -253 +254 @@
 void GuiExec::readFromFile(Widget* widget)
 {
-  std::string fileName = ResourceManager::homeDirCheck(confFile);
+  std::string fileName = File(confFile).name();
   IniParser iniParser(fileName);
   if (!iniParser.isOpen())

trunk/src/lib/gui/gtk_gui/gui_update.cc

@@ -51 +51 @@
 
   this->updateFrame = new Frame("Update-Options:");
-  this->updateFrame->setGroupName(CONFIG_SECTION_DATA);
+  this->updateFrame->setGroupName(CONFIG_SECTION_GENERAL);
   this->updateBox = new Box('v');
 

trunk/src/lib/lang/base_object.cc

@@ -20 +20 @@
 
 #include "util/loading/load_param.h"
-#include "compiler.h"
 #include "class_list.h"
 
@@ -32 +31 @@
  * @param root the element to load from
  */
-BaseObject::BaseObject()
+BaseObject::BaseObject(const std::string& objectName)
 {
   this->classID = CL_BASE_OBJECT;
   this->className = "BaseObject";
 
-  this->objectName = "";
+  this->objectName = objectName;
   this->classList = NULL;
   this->xmlElem = NULL;

trunk/src/lib/lang/base_object.h

@@ -27 +27 @@
 
  public:
-  BaseObject ();
+   BaseObject (const std::string& objectName = "");
   virtual ~BaseObject ();
 

trunk/src/lib/parser/ini_parser/ini_parser.cc

@@ -108 +108 @@
   if( (stream = fopen (fileName.c_str(), "r")) == NULL)
   {
-    PRINTF(1)("IniParser could not open %s\n", fileName.c_str());
+    PRINTF(1)("IniParser could not open %s for reading\n", fileName.c_str());
     return false;
   }
@@ -216 +216 @@
   if( (stream = fopen (fileName.c_str(), "w")) == NULL)
   {
-    PRINTF(1)("IniParser could not open %s\n", fileName.c_str());
+    PRINTF(1)("IniParser could not open %s for writing\n", fileName.c_str());
     return false;
   }
@@ -401 +401 @@
  * @return true if everything is ok false on error
  */
-bool IniParser::editVar(const std::string& entryName, const std::string& value, const std::string& sectionName)
+bool IniParser::editVar(const std::string& entryName, const std::string& value, const std::string& sectionName, bool createMissing)
 {
   std::list<IniSection>::iterator section;
@@ -416 +416 @@
   if (section == this->sections.end())
   {
-    IniSection sec;
-    sec.comment = "";
-    sec.name = sectionName;
-    section = this->sections.insert(this->sections.end(), sec);
-  }
-
-  if (section == this->sections.end())
-  {
-    PRINTF(2)("section '%s' not found for value '%s'\n", sectionName.c_str(), entryName.c_str());
-    return false;
-  }
-  else
-  {
-    //try find item
-    std::list<IniEntry>::iterator entry;
-    for (entry = section->entries.begin(); entry!=section->entries.end(); entry++)
-      if (entry->name == entryName )
+    this->addSection(sectionName);
+    for (section = this->sections.begin(); section != this->sections.end(); section++)
+      if ((*section).name == sectionName)
         break;
-
-    //found it?
-    if ( entry != section->entries.end() )
-    {
-      entry->value = value;
-
-      return true;
-    }
-
+  }
+
+  //try find item
+  std::list<IniEntry>::iterator entry;
+  for (entry = section->entries.begin(); entry!=section->entries.end(); entry++)
+    if (entry->name == entryName )
+      break;
+
+  //found it?
+  if ( entry != section->entries.end() )
+  {
+    entry->value = value;
+
+    return true;
+  }
+  else
+  {
     //not found -> create it
     (*section).entries.push_back(IniEntry());
@@ -448 +442 @@
     (*section).entries.back().name = entryName;
     (*section).entries.back().value = value;
-    PRINTF(5)("Added Entry %s with Value '%s' to Section %s\n",
-    (*section).entries.back().name.c_str(),
-    (*section).entries.back().value.c_str(),
-    (*section).name);
+    PRINTF(5)("Added Entry '%s' with Value '%s' to Section '%s'\n",
+              (*section).entries.back().name.c_str(),
+              (*section).entries.back().value.c_str(),
+              (*section).name);
     this->currentEntry = --(*section).entries.end();
     return true;
   }
+  return false;
 }
 
@@ -725 +720 @@
 void IniParser::debug() const
 {
-  PRINTF(0)("Iniparser %s - debug\n", this->fileName.c_str());
+  PRINT(0)("Iniparser '%s' - debug\n", this->fileName.c_str());
   if (!this->comment.empty())
-    PRINTF(0)("FileComment:\n %s\n\n", this->comment.c_str());
+    PRINT(0)("FileComment:\n '%s'\n\n", this->comment.c_str());
 
   if (!this->fileName.empty())
   {
+    if (sections.empty())
+      PRINT(0)("No Sections defined\n");
     std::list<IniSection>::const_iterator section;
     for (section = this->sections.begin(); section != this->sections.end(); section++)
@@ -737 +734 @@
         PRINTF(0)(" %s\n", (*section).comment.c_str());
       PRINTF(0)(" [%s]\n", (*section).name.c_str());
+
+      if ((*section).entries.empty())
+        PRINT(0)("No Entries defined within Section '%s'\n", (*section).name.c_str());
 
       std::list<IniEntry>::const_iterator entry;
@@ -748 +748 @@
   }
   else
-    PRINTF(1)("no opened ini-file.\n");
-}
-
+    PRINTF(0)("no opened ini-file.\n");
+}
+

trunk/src/lib/parser/ini_parser/ini_parser.h

@@ -10 +10 @@
 
 #define PARSELINELENGHT     512       //!< how many chars to read at once
-#ifndef NULL
- #define NULL 0x0                     //!< NULL
-#endif
 
+#include "src/lib/util/file.h"
 #include <list>
-#include <string>
 
 //! ini-file parser
@@ -21 +18 @@
  * This class can be used to load an initializer file and parse it's contents for variablename=value pairs.
  */
-class IniParser
+class IniParser : public File
 {
   private:
@@ -47 +44 @@
 
     /** @returns true if the file is opened, false otherwise*/
-    bool isOpen() const { return (!this->fileName.empty())? true : false; };
+    bool isOpen() const { return true; } ///HACK //(this->fileName.empty()) ? false : true; };
     /** @returns the fileName we have opened. */
     const std::string& getFileName() const { return this->fileName; };
@@ -69 +66 @@
     bool addVar(const std::string& entryName, const std::string& value, const std::string& sectionName = "" );
     const std::string& getVar(const std::string& entryName, const std::string& sectionName, const std::string& defaultValue = "") const;
-    bool IniParser::editVar(const std::string& entryName, const std::string& value, const std::string& sectionName = "");
+    bool IniParser::editVar(const std::string& entryName, const std::string& value, const std::string& sectionName = "", bool createMissing = true);
     void setEntryComment(const std::string& comment, const std::string& entryName, const std::string& sectionName);
     const std::string& getEntryComment(const std::string& entryName, const std::string& sectionName) const;

trunk/src/lib/parser/preferences/ini_file_prefs_reader.cc

@@ -28 +28 @@
   IniParser iniParser;
 
+  
+  Preferences* prefs = Preferences::getInstance();
+  
+  prefs->setUserIni( fileName );
+  
   if ( !iniParser.readFile( fileName ) )
     return;
-
-  Preferences* prefs = Preferences::getInstance();
 
   iniParser.firstSection();

trunk/src/lib/particles/dot_emitter.cc

@@ -23 +23 @@
 #include "util/loading/factory.h"
 #include "debug.h"
-#include "stdlibincl.h"
 
 using namespace std;

trunk/src/lib/shell/shell_buffer.h

@@ -10 +10 @@
 #include <stdarg.h>
 #include <list>
-#include "threading.h"
+#include "lib/util/threading.h"
 
 #define      SHELL_BUFFER_SIZE       16384         //!< The Size of the input-buffers (should be large enough to carry any kind of input)

trunk/src/lib/shell/shell_completion_plugin.cc

@@ -25 +25 @@
 #include "loading/resource_manager.h"
 
-#include "osdir.h"
+#include "directory.h"
 #include "debug.h"
 
@@ -94 +94 @@
   void CompletorFileSystem::addToCompleteList(std::vector<std::string>& completionList, const std::string& completionBegin) const
   {
-    OS::Directory dir;
+    Directory dir;
 
     if (completionBegin.empty()) // if we do not yet have the beginning of the line, start with the chosen startDir.
     {
-      dir.open(ResourceManager::getInstance()->getDataDir() + this->_subDir);
+      dir.setFileName(ResourceManager::getInstance()->getDataDir() + this->_subDir);
+      dir.open();
       while(dir)
       {
@@ -112 +113 @@
         directoryName = completionBegin.substr(0, pos);
 
-      dir.open(ResourceManager::getInstance()->getDataDir() + directoryName);
+      dir.setFileName(ResourceManager::getInstance()->getDataDir() + directoryName);
+      dir.open();
 
       std::string fileName;
@@ -136 +138 @@
         printf("%s\n", (ResourceManager::getInstance()->getDataDir() + fileName).c_str());
         if (!nocaseCmp(completionBegin, fileName, completionBegin.size()) &&
-             ResourceManager::isDir(ResourceManager::getInstance()->getDataDir() + fileName))
+             ResourceManager::isInDataDir(fileName))
         {
           printf("Dir %s\n", fileName.c_str());

trunk/src/lib/util/loading/resource_manager.cc

@@ -17 +17 @@
 
 #include "util/loading/resource_manager.h"
-
+#include "file.h"
 #include "substring.h"
 #include "debug.h"
@@ -60 +60 @@
 
   this->dataDir = "./";
-  this->_cwd = "";
   this->tryDataDir("./data");
 }
@@ -87 +86 @@
 bool ResourceManager::setDataDir(const std::string& dataDir)
 {
-  std::string realDir = ResourceManager::homeDirCheck(dataDir);
-  if (isDir(realDir))
-  {
-    if (dataDir[dataDir.size()-1] == '/' || dataDir[dataDir.size()-1] == '\\')
+  File dataDirectory(dataDir);
+  if (dataDirectory.isDirectory())
+  {
+    this->dataDir = dataDirectory.name();
+
+    if (dataDir[dataDir.size()-1] != '/' && dataDir[dataDir.size()-1] != '\\')
     {
-      this->dataDir = realDir;
-    }
-    else
-    {
-      this->dataDir = realDir;
       this->dataDir += '/';
     }
@@ -103 +99 @@
   else
   {
-    PRINTF(1)("%s is not a Directory, and can not be the Data Directory, leaving as %s \n", realDir.c_str(), this->dataDir.c_str());
+    PRINTF(1)("%s is not a Directory, and can not be the Data Directory, leaving as %s \n", dataDir.c_str(), this->dataDir.c_str());
     return false;
   }
@@ -116 +112 @@
 bool ResourceManager::tryDataDir(const std::string& dataDir)
 {
-  std::string realDir = ResourceManager::homeDirCheck(dataDir);
-  if (isDir(realDir))
-  {
-    if (dataDir[dataDir.size()-1] == '/' || dataDir[dataDir.size()-1] == '\\')
+  File dataDirectory(dataDir);
+  if (dataDirectory.isDirectory())
+  {
+    this->dataDir = dataDirectory.name();
+
+    if (dataDir[dataDir.size()-1] != '/' && dataDir[dataDir.size()-1] != '\\')
     {
-      this->dataDir = realDir;
-    }
-    else
-    {
-      this->dataDir = realDir;
       this->dataDir += '/';
     }
@@ -140 +133 @@
 bool ResourceManager::verifyDataDir(const std::string& fileInside)
 {
-  bool retVal;
-  if (!isDir(this->dataDir))
-  {
-    PRINTF(1)("%s is not a directory\n", this->dataDir.c_str());
+  File dataDirectory(this->dataDir);
+  if (!dataDirectory.isDirectory())
+  {
+    PRINTF(1)("'%s' is not a directory\n", this->dataDir.c_str());
     return false;
   }
 
-  std::string testFile = this->dataDir + fileInside;
-  retVal = isFile(testFile);
-  return retVal;
+  File testFile(this->dataDir + fileInside);
+  return testFile.isFile();
 }
 
@@ -161 +153 @@
 bool ResourceManager::addImageDir(const std::string& imageDir)
 {
-  std::string newDir;
-  if (imageDir[imageDir.size()-1] == '/' || imageDir[imageDir.size()-1] == '\\')
-  {
-    newDir = imageDir;
-  }
-  else
-  {
-    newDir = imageDir;
+  std::string newDir = imageDir;
+  if (imageDir[imageDir.size()-1] != '/' && imageDir[imageDir.size()-1] != '\\')
+  {
     newDir += '/';
   }
   // check if the param is a Directory
-  if (isDir(newDir))
+  if (File(newDir).isDirectory())
   {
     // check if the Directory has been added before
@@ -381 +368 @@
         tmpResource->param[0] = 1.0f;
 
-      if(ResourceManager::isFile(fullName))
+      if(File(fullName).isFile())
         tmpResource->pointer = new OBJModel(fullName, tmpResource->param[0].getFloat());
       else
@@ -407 +394 @@
       break;
     case MD2:
-      if(ResourceManager::isFile(fullName))
+      if(File(fullName).isFile())
       {
         tmpResource->param[0] = param0;
@@ -425 +412 @@
         tmpResource->param[0] = FONT_DEFAULT_RENDER_SIZE;
 
-      if(isFile(fullName))
+      if(File(fullName).isFile())
         tmpResource->pointer = new Font(fullName, (unsigned int) tmpResource->param[0].getInt());
       else
@@ -433 +420 @@
 #ifndef NO_AUDIO
     case WAV:
-      if(isFile(fullName))
+      if(File(fullName).isFile())
         tmpResource->pointer = new OrxSound::SoundBuffer(fullName);
       break;
     case OGG:
-      if (isFile(fullName))
+      if (File(fullName).isFile())
         tmpResource->pointer = new OrxSound::OggPlayer(fullName);
       break;
@@ -447 +434 @@
       else
         tmpResource->param[0] = GL_TEXTURE_2D;
-      if(isFile(fullName))
+      if(File(fullName).isFile())
       {
         PRINTF(4)("Image %s resides to %s\n", fileName, fullName);
@@ -458 +445 @@
         {
           std::string imgName = *imageDir + fileName;
-          if(isFile(imgName))
+          if(File(imgName).isFile())
           {
             PRINTF(4)("Image %s resides to %s\n", fileName, imgName);
@@ -472 +459 @@
 #ifndef NO_SHADERS
     case SHADER:
-      if(ResourceManager::isFile(fullName))
+      if(File(fullName).isFile())
       {
         if (param0 != MT_NULL)
@@ -478 +465 @@
           MultiType param = param0; /// HACK
           std::string secFullName = ResourceManager::getFullName(param.getCString());
-          if (ResourceManager::isFile(secFullName))
+          if (File(secFullName).isFile())
           {
             tmpResource->param[0] = secFullName;
@@ -750 +737 @@
 
 /**
- * @brief Checks if it is a Directory
- * @param directoryName the Directory to check for
- * @returns true if it is a directory/symlink false otherwise
-*/
-bool ResourceManager::isDir(const std::string& directoryName)
-{
-  std::string tmpDirName = directoryName;
-  struct stat status;
-
-  // checking for the termination of the string given. If there is a "/" at the end cut it away
-  if (directoryName[directoryName.size()-1] == '/' ||
-      directoryName[directoryName.size()-1] == '\\')
-  {
-    tmpDirName.erase(tmpDirName.size()-1);
-  }
-
-  if(!stat(tmpDirName.c_str(), &status))
-  {
-    if (status.st_mode & (S_IFDIR
-#ifndef __WIN32__
-                          | S_IFLNK
-#endif
-                         ))
-    {
-      return true;
-    }
-    else
-      return false;
-  }
-  else
-    return false;
-}
-
-/**
- * @brief Checks if the file is either a Regular file or a Symlink
- * @param fileName the File to check for
- * @returns true if it is a regular file/symlink, false otherwise
-*/
-bool ResourceManager::isFile(const std::string& fileName)
-{
-  if (fileName.empty())
-    return false;
-  std::string tmpFileName = ResourceManager::homeDirCheck(fileName);
-  // actually checks the File
-  struct stat status;
-  if (!stat(tmpFileName.c_str(), &status))
-  {
-    if (status.st_mode & (S_IFREG
-#ifndef __WIN32__
-                          | S_IFLNK
-#endif
-                         ))
-    {
-      return true;
-    }
-    else
-      return false;
-  }
-  else
-    return false;
-}
-
-/**
- * @brief touches a File on the disk (thereby creating it)
- * @param fileName The file to touch
-*/
-bool ResourceManager::touchFile(const std::string& fileName)
-{
-  std::string tmpName = ResourceManager::homeDirCheck(fileName);
-  if (tmpName.empty())
-    return false;
-  FILE* stream;
-  if( (stream = fopen (tmpName.c_str(), "w")) == NULL)
-  {
-    PRINTF(1)("could not open %s fro writing\n", fileName.c_str());
-    return false;
-  }
-  fclose(stream);
-}
-
-/**
- * @brief deletes a File from disk
- * @param fileName the File to delete
-*/
-bool ResourceManager::deleteFile(const std::string& fileName)
-{
-  std::string tmpName = ResourceManager::homeDirCheck(fileName);
-  unlink(tmpName.c_str());
-}
-
-/**
- * @param name the Name of the file to check
- * @returns The name of the file, including the HomeDir
- */
-std::string ResourceManager::homeDirCheck(const std::string& name)
-{
-  if (name.size() >= 2 && name[0] == '~' && name[1] == '/')
-  {
-    std::string homeDir;
-    std::string newName = name.substr(1);
-#ifdef __WIN32__
-    homeDir = getenv("USERPROFILE");
-#else
-    homeDir = getenv("HOME");
-#endif
-    return homeDir + newName;
-  }
-  else
-    return name;
-}
-
-/**
- * @param name the relative name of the File/Directory.
- * @returns a new std::string with the name in abs-dir-format
- */
-std::string ResourceManager::getAbsDir(const std::string& name)
-{
-  if (name.empty())
-    return "";
-  std::string retName = name;
-  if (strncmp(name.c_str(), "/", 1))
-  {
-    if (name[0] == '.' && name[1] != '.')
-      retName.erase(0);
-    const std::string& absDir = ResourceManager::cwd();
-    retName = absDir + retName;
-  }
-  return retName;
-}
-
-
-/**
  * @param fileName the Name of the File to check
  * @returns The full name of the file, including the DataDir, and NULL if the file does not exist
@@ -892 +747 @@
 
   std::string retName = ResourceManager::getInstance()->getDataDir() +fileName;
-  if (ResourceManager::isFile(retName) || ResourceManager::isDir(retName))
+  if (File(retName).isFile() || File(retName).isDirectory())
     return retName;
   else
     return "";
-}
-
-#ifdef __unix__
-  #include <unistd.h>
-#elif __WIN32__ || _MS_DOS_
-  #include <dir.h>
-#else
-  #include <direct.h> /* Visual C++ */
-#endif
-/**
- * @returns the Current Woring Directory
- */
-const std::string& ResourceManager::cwd()
-{
-  if (ResourceManager::getInstance()->_cwd.empty())
-  {
-    char cwd[1024];
-    char* errorCode = getcwd(cwd, 1024);
-    if (errorCode == 0)
-      return ResourceManager::getInstance()->_cwd;
-
-    ResourceManager::getInstance()->_cwd = cwd;
-  }
-  return ResourceManager::getInstance()->_cwd;
 }
 
@@ -936 +767 @@
   std::string checkFile = ResourceManager::getInstance()->getDataDir() + fileName;
 
-  if (ResourceManager::isFile(checkFile) || ResourceManager::isDir(checkFile))
+  if (File(checkFile).exists())
     retVal = true;
   else

trunk/src/lib/util/loading/resource_manager.h

@@ -21 +21 @@
 
 #include "base_object.h"
+#include "file.h"
+
 #include "multi_type.h"
-
 #include <vector>
 
@@ -130 +131 @@
 
   // utility functions for handling files in and around the data-directory
-  static bool isDir(const std::string& directory);
-  static bool isFile(const std::string& fileName);
-  static bool touchFile(const std::string& fileName);
-  static bool deleteFile(const std::string& fileName);
-  static std::string homeDirCheck(const std::string& fileName);
   static std::string getFullName(const std::string& fileName);
   static bool isInDataDir(const std::string& fileName);
-  static std::string getAbsDir(const std::string& fileName);
-  static const std::string& cwd();
 
   static const char* ResourceTypeToChar(ResourceType type);
@@ -151 +145 @@
   static ResourceManager*    singletonRef;       //!< singleton Reference
 
-  std::string                _cwd;               //!< The currend Working directory.
   std::string                dataDir;            //!< The Data Directory, where all relevant Data is stored.
   std::vector<std::string>   imageDirs;          //!< A list of directories in which images are stored.

trunk/src/lib/util/preferences.cc

@@ -17 +17 @@
 
 #include "preferences.h"
-
-using namespace std;
+#include "lib/parser/ini_parser/ini_parser.h"
 
 
@@ -137 +136 @@
  * @return value of the item if found. defaultValue else
  */
-const std::string Preferences::getString(const std::string& section, const std::string& name, const std::string& defaultValue)
+std::string Preferences::getString(const std::string& section, const std::string& name, const std::string& defaultValue)
 {
   return getMultiType(section, name, MultiType(defaultValue)).getString();
@@ -260 +259 @@
   IniParser iniParser(this->fileName);
 
-  if ( !iniParser.isOpen() )
-    return false;
-
   std::list<prefSection>::iterator it = data.begin();
   bool didChanges = false;
@@ -278 +274 @@
     }
   }
-
-  if ( didChanges )
+  /// HACK DO WE HAVE TO CHECK THIS??
+  //if ( didChanges )
   {
     iniParser.writeFile( this->fileName );
@@ -314 +310 @@
 {
   std::list<std::string> lst;
-  
+
   std::list<prefSection>::const_iterator it = data.begin();
 

trunk/src/lib/util/preferences.h

@@ -9 +9 @@
 #include "base_object.h"
 #include "multi_type.h"
-#include "lib/parser/ini_parser/ini_parser.h"
 
 // FORWARD DECLARATION
@@ -44 +43 @@
    void setMultiType(const std::string& section, const std::string& name, const MultiType& value, bool dontSetModified = false);
 
-   const std::string getString(const std::string& section, const std::string& name, const std::string& defaultValue);
+   std::string getString(const std::string& section, const std::string& name, const std::string& defaultValue);
    int getInt(const std::string& section, const std::string& name, int defaultValue);
    float getFloat(const std::string& section, const std::string& name, float defaultValue);
@@ -54 +53 @@
 
    void debug();
-   
+
    std::list<std::string> listKeys( const std::string section );
 

trunk/src/orxonox.cc

@@ -30 +30 @@
 #include "globals.h"
 
-#include "gui.h"
-
+#include "gui/qt_gui/qt_gui.h"
+
+#include "file.h"
 #include "parser/ini_parser/ini_parser.h"
 #include "util/loading/game_loader.h"
@@ -189 +190 @@
 const std::string& Orxonox::getConfigFile ()
 {
-  if (ResourceManager::isFile("orxonox.conf"))
+  File orxConfFile("orxonox.conf");
+  if (orxConfFile.isFile())
   {
     this->configFileName =  "orxonox.conf";
   }
   else
-    this->configFileName = ResourceManager::homeDirCheck(DEFAULT_CONFIG_FILE);
+    this->configFileName = File(DEFAULT_CONFIG_FILE).name();
 
   PRINTF(3)("Parsed Config File: '%s'\n", this->configFileName);
@@ -280 +282 @@
   PRINT(3)("> Initializing input\n");
 
+  EventHandler::getInstance()->
   EventHandler::getInstance()->init();
   EventHandler::getInstance()->subscribe(GraphicsEngine::getInstance(), ES_ALL, EV_VIDEO_RESIZE);
@@ -319 +322 @@
   // init the resource manager
   std::string dataPath;
-  if ((dataPath = Preferences::getInstance()->getString(CONFIG_SECTION_DATA, CONFIG_NAME_DATADIR, ""))!= "")
+  if ((dataPath = Preferences::getInstance()->getString(CONFIG_SECTION_GENERAL, CONFIG_NAME_DATADIR, ""))!= "")
   {
     if (!ResourceManager::getInstance()->setDataDir(dataPath) &&
@@ -334 +337 @@
     ResourceManager::getInstance()->getDataDir().c_str(),
     this->configFileName.c_str(),
-              CONFIG_SECTION_DATA,
+              CONFIG_SECTION_GENERAL,
               CONFIG_NAME_DATADIR );
-    Gui* gui = new Gui(argc, argv);
+    OrxGui::Gui* gui = new OrxGui::QtGui(argc, argv);
     gui->startGui();
     delete gui;
@@ -425 +428 @@
   CmdLinePrefsReader prefs;
 
-  IniFilePrefsReader ini(ResourceManager::homeDirCheck(DEFAULT_CONFIG_FILE));
+  IniFilePrefsReader ini(File(DEFAULT_CONFIG_FILE).name());
+  Preferences::getInstance()->setUserIni(File(DEFAULT_CONFIG_FILE).name());
 
   prefs.parse(argc, argv);
@@ -501 +505 @@
 {
   // checking for existence of the configuration-files, or if the lock file is still used
-  if (showGui || (!ResourceManager::isFile("./orxonox.conf") &&
-                  !ResourceManager::isFile(DEFAULT_CONFIG_FILE))
+  if (showGui || (!File("./orxonox.conf").isFile() &&
+      !File(DEFAULT_CONFIG_FILE).isFile())
 #if DEBUG < 3 // developers do not need to see the GUI, when orxonox fails
       || ResourceManager::isFile(DEFAULT_LOCK_FILE)
@@ -508 +512 @@
      )
   {
-    if (ResourceManager::isFile(DEFAULT_LOCK_FILE))
-      ResourceManager::deleteFile(DEFAULT_LOCK_FILE);
+    File lockFile(DEFAULT_LOCK_FILE);
+    if (lockFile.isFile())
+      lockFile.remove();
 
     // starting the GUI
-    Gui* gui = new Gui(argc, argv);
-    gui->startGui();
-
-    if (! gui->startOrxonox)
+    OrxGui::QtGui gui(argc, argv);
+    gui.startGui();
+
+    if (gui.getState() & OrxGui::Gui::Quitting)
       return 0;
 
-    delete gui;
   }
 
   PRINT(0)(">>> Starting Orxonox <<<\n");
 
-  ResourceManager::touchFile(DEFAULT_LOCK_FILE);
+  File(DEFAULT_LOCK_FILE).touch();
 
   Orxonox *orx = Orxonox::getInstance();
@@ -537 +541 @@
 
   delete orx;
-  ResourceManager::deleteFile("~/.orxonox/orxonox.lock");
-}
+  File("~/.orxonox/orxonox.lock").remove();
+}

trunk/src/story_entities/story_entity.cc

@@ -22 +22 @@
 #include "story_entity.h"
 
+#include "util/file.h"
+#include "util/loading/load_param.h"
 #include "util/loading/resource_manager.h"
-#include "util/loading/load_param.h"
 
 
@@ -102 +103 @@
 void StoryEntity::setLoadFile(const std::string& fileName)
 {
-  if (ResourceManager::isFile(fileName))
+  if (File(fileName).isFile())
   {
     this->loadFile =  fileName;