Changeset 7608 in orxonox.OLD for branches/qt_gui
- Timestamp:
- May 12, 2006, 10:43:53 AM (19 years ago)
- Location:
- branches/qt_gui
- Files:
-
- 16 edited
- 21 copied
Legend:
- Unmodified
- Added
- Removed
-
branches/qt_gui/acinclude.m4
r6274 r7608 10 10 if [test "x$_header_check" = "xyes" && test "x$_lib_check" = "xyes"] ; then 11 11 LIBS="$LIBS -l$2" 12 12 $4 13 13 else 14 14 echo "no Support for $2" 15 15 $5 16 16 fi 17 17 ]) … … 34 34 if [test x$_header_check = "xyes" && test "x$_lib_check" = "xyes"] ; then 35 35 LIBS="$LIBS -l$2" 36 36 $4 37 37 else 38 38 echo "------------------" … … 40 40 echo "please install the $2-LIBRARY-package which can be found at $6" 41 41 echo "------------------" 42 42 $5 43 43 exit -1 44 44 fi 45 45 ]) 46 47 48 49 dnl AX_CHECK_REQUIRED_LIB([LIBRARY-NAME], [FUNCTION-IN-LIB], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND], [LIB-WEB-PAGE]) 50 AC_DEFUN([AX_CHECK_REQUIRED_LIB], [ 51 _lib_check="" 52 _found_lib="" 53 54 55 for _lib in $1 56 do 57 AC_CHECK_LIB([$_lib], [$2], [_lib_check="yes"], [_lib_check="no"]) 58 if test "x$_lib_check" = "xyes" ; then 59 _found_lib=$_lib 60 break 61 fi 62 done 63 64 if [test "x$_lib_check" = "xyes"] ; then 65 LIBS="$LIBS -l$_found_lib" 66 $3 67 else 68 echo "------------------" 69 echo "LIBRARY $1 not found." 70 echo "please install the $1-LIBRARY-package which can be found at $5" 71 echo "------------------" 72 $4 73 exit -1 74 fi 75 ]) 76 77 78 79 80 dnl AX_CHECK_QT([QTDIR], [LIBRARIES], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND], [LIB-WEB-PAGE]) 81 AC_DEFUN([AX_CHECK_QT], [ 82 _lib_check="" 83 _found_lib="" 84 QT_PREFIX="$1" 85 QT_INCLUDE_DIRECTORY="" 86 QT_LIB_DIRECTORY="" 87 88 89 QT_COMMON_INCLUDE_DIRECTORIES=" 90 `ls -dr ${QT_PREFIX}/include 2>/dev/null` 91 /usr/include 92 `ls -dr /usr/include/qt* 2>/dev/null` 93 `ls -dr /usr/lib/qt*/include 2>/dev/null` 94 `ls -dr /usr/local/qt*/include 2>/dev/null` 95 `ls -dr /opt/qt*/include 2>/dev/null` 96 `ls -dr /Developer/qt*/include 2>/dev/null` 97 " 98 99 QT_COMMON_LIB_DIRECTORIES=" 100 `ls -dr ${QT_PREFIX}/lib 2>/dev/null` 101 /usr/include 102 `ls -dr /usr/lib/qt* 2>/dev/null` 103 `ls -dr /usr/lib/qt* 2>/dev/null` 104 `ls -dr /usr/local/qt*/lib 2>/dev/null` 105 `ls -dr /opt/qt*/lib 2>/dev/null` 106 `ls -dr /Developer/qt*/lib 2>/dev/null` 107 " 108 109 ## Search in all IncludeDirectories for QT-includes 110 for _include_directory in ${QT_COMMON_INCLUDE_DIRECTORIES} 111 do 112 if test -e ${_include_directory}/Qt/QtCore ; then 113 QT_INCLUDE_DIRECTORY=${_include_directory} 114 break 115 fi 116 done 117 if test -n ${QT_INCLUDE_DIRECTORY} ; then 118 echo "Qt-Include Directory is: ${QT_INCLUDE_DIRECTORY}" 119 else 120 AC_MSG_ERROR([Qt Headers not found]) 121 fi 122 123 ## Search in all LibraryDirectories for QT-includes 124 for _lib_directory in ${QT_COMMON_LIB_DIRECTORIES} 125 do 126 if test -e ${_lib_directory}/libQtCore.so || test -e ${_lib_directory}/libQtCore.dll ; then 127 QT_LIB_DIRECTORY=${_lib_directory} 128 break 129 fi 130 done 131 if test -n ${QT_LIB_DIRECTORY} ; then 132 echo "Qt-Library Directory is: ${QT_LIB_DIRECTORY}" 133 else 134 AC_MSG_ERROR([Qt LIB not found]) 135 fi 136 137 ## Setting up the Environment Variables. 138 QT_LIBS="" 139 QT_CXXFLAGS="-I${QT_INCLUDE_DIRECTORY}" 140 LDFLAGS="${LDFLAGS} -L${QT_LIB_DIRECTORY} -Wl,-rpath -Wl,${QT_LIB_DIRECTORY}" 141 QT_BIN_DIR="${QT_PREFIX}/bin" 142 143 CACHED_CPPFLAG=${CPPFLAGS} 144 CACHED_LDFLAGS=${LDFLAGS} 145 146 LDFLAGS="${LDFLAGS} ${QT_LDFLAGS}" 147 for _lib in $2 148 do 149 AC_CHECK_LIB([$_lib], [main], [_lib_check="yes"], [_lib_check="no"]) 150 if test "x$_lib_check" = "xyes" ; then 151 _found_lib=$_lib 152 break 153 fi 154 done 155 156 if [test "x$_lib_check" = "xyes"] ; then 157 QT_LIBS="${QT_LIBS} -l$_found_lib" 158 AX_CHECK_REQUIRED_LIB([QtCore QtCore4], [main],,,[http://www.trolltech.com] ) 159 AX_CHECK_REQUIRED_LIB([QtGui QtGui4], [main],,,[http://www.trolltech.com] ) 160 AX_CHECK_REQUIRED_LIB([QtOpenGL QtOpenGL4], [main],,,[http://www.trolltech.com] ) 161 162 $3 163 else 164 echo "------------------" 165 echo "LIBRARY $2 not found.in $1" 166 echo "please install the $1-LIBRARY-package which can be found at $5" 167 echo "------------------" 168 $4 169 exit -1 170 fi 171 172 echo "QT_LIBS = ${QT_LIBS}" 173 echo "QT_CXXFLAGS = ${QT_CXXFLAGS}" 174 echo "QT_LD_FLAGS = ${QT_LDFLAGS}" 175 176 AC_SUBST([QT_LIBS]) 177 AC_SUBST([QT_CXXFLAGS]) 178 AC_SUBST([QT_LDFLAGS]) 179 180 #----------# 181 # QT - MOC # 182 #----------# 183 AC_PATH_PROG([QT_MOC], [moc], [no], ["${QT_BIN_DIR}:${PATH}"]) 184 if test x${QT_MOC} = xno ; then 185 AC_MSG_ERROR([QT MOC not found]) 186 fi 187 AC_SUBST([QT_MOC]) 188 189 AC_PATH_PROG([QT_UIC], [uic], [no], ["${QT_BIN_DIR}:${PATH}"]) 190 # if test x${QT_UIC} = xno ; then 191 # AC_MSG_WARN([QT UIC not found]) 192 # fi 193 AC_SUBST([QT_UIC]) 194 195 AC_PATH_PROG([QT_RCC], [rcc], [no], ["${QT_BIN_DIR}:${PATH}"]) 196 # if test x${QT_RCC} = xno ; then 197 # AC_MSG_WARN([QT RCC not found]) 198 # fi 199 AC_SUBST([QT_RCC]) 200 201 202 203 # Restore Values of CPPFLAGS and LDFLAGS 204 CPPFLAGS=${CACHED_CPPFLAG} 205 LDFLAGS=${CACHED_LDFLAGS} 206 ]) -
branches/qt_gui/configure.ac
r7256 r7608 108 108 fi 109 109 fi 110 111 if test $DEBUD > 3 ; then 112 CPPFLAGS="${CPPFLAGS} -g" 113 fi 110 114 AC_DEFINE_UNQUOTED(DEBUG, $DEBUG, [in which debug mode we are]) 111 115 AC_SUBST(DEBUG) … … 127 131 fi 128 132 129 #--------------#130 # GTK-disabled #131 #--------------#132 AC_MSG_CHECKING([if gtk should be enabled])133 AC_ARG_ENABLE([gtk],134 AS_HELP_STRING(--disable-gtk,Prevents GTK from being loaded), [def_gtk=no], [def_gtk=yes])135 if test x$def_gtk = xyes; then136 echo "yes"137 fi138 if test x$def_gtk = xno; then139 echo "no"140 fi141 133 142 134 #------------------# … … 152 144 echo "no" 153 145 fi 146 147 #--------------# 148 # GTK-disabled # 149 #--------------# 150 151 AC_MSG_CHECKING([if gtk should be enabled]) 152 AC_ARG_WITH([gtk], 153 AS_HELP_STRING(--with-gtk, uses GTK for the GUI), [def_gtk=yes], [def_gtk=no]) 154 if test x$def_gtk = xyes; then 155 echo "yes - will be overwritten if Qt is enabled" 156 fi 157 if test x$def_gtk = xno; then 158 echo "no" 159 fi 160 161 154 162 155 163 #-------------------# … … 211 219 fi 212 220 AM_CONDITIONAL(DOCUMENTATION, test x$def_documentation = xyes) 213 214 215 221 216 222 #---------------------------# … … 228 234 CPPFLAGS="${CPPFLAGS} -I${PREFIX}/include" 229 235 LDFLAGS="${LDFLAGS} -L$PREFIX/${ARCH}/lib -Wl,-rpath -Wl,${PREFIX}/${ARCH}/lib" 236 237 ## QT 238 QT_PREFIX=/usr/pack/qt-4.1.1-mo/${ARCH} 239 # CPPFLAGS="${CPPFLAGS} -I${PREFIX_QT}/include" 240 # LDFLAGS="${LDFLAGS} -L${QT_PREFIX}/lib -Wl,-rpath -Wl,${QT_PREFIX}/${ARCH}/lib" 241 242 243 230 244 ## GTK 231 245 GTKPREFIX=/usr/pack/gtk-2.8.3-mo … … 238 252 echo "no" 239 253 fi 254 255 240 256 241 257 ####################### … … 272 288 ## here the system is checked, and openGL is included 273 289 ## also checking for SDL on differen Systems 274 275 CPPFLAGS="$CPPFLAGS -g"276 277 290 278 291 AC_MSG_CHECKING([for System]) … … 557 570 558 571 559 #---------# 560 # libcURL # 561 #---------# 562 AX_CHECK_HEADER_LIB([curl/curl.h], [curl], [main], [ 563 have_curl=yes 564 CURL_LIBS=`curl-config --libs` 565 CURLCFLAGS=`curl-config --cflags` 566 AC_DEFINE_UNQUOTED(HAVE_CURL, 1, [if we have CURL]) ] 567 ,, [http://curl.haxx.se/]) 568 569 AC_SUBST(CURL_LIBS) 570 AC_SUBST(CURL_CFLAGS) 571 AM_CONDITIONAL(HAVE_CURL, test "x$have_curl" = "xyes") 572 573 #--------# 574 # efence # 575 #--------# 576 if test x$def_efence = xyes ; then 577 AC_CHECK_LIB([efence], [main], [FOUND_efence=yes; LIBS="$LIBS -lefence"]) 578 if test x$FOUND_efence != xyes ; then 579 echo "efence was requested, but is not installed!! going on" 580 fi 581 582 fi 572 #----# 573 # QT # 574 #----# 575 AX_CHECK_QT([${QT_PREFIX}], [QtCore],, [http://www.trolltech.com]) 576 if test x$have_qt = xno ; then 577 WITH_QT=no 578 fi 579 583 580 584 581 #-----# … … 607 604 AM_CONDITIONAL(HAVE_GTK2, test x$have_gtk2 = xyes) 608 605 606 607 #---------# 608 # libcURL # 609 #---------# 610 AX_CHECK_HEADER_LIB([curl/curl.h], [curl], [main], [ 611 have_curl=yes 612 CURL_LIBS=`curl-config --libs` 613 CURLCFLAGS=`curl-config --cflags` 614 AC_DEFINE_UNQUOTED(HAVE_CURL, 1, [if we have CURL]) ] 615 ,, [http://curl.haxx.se/]) 616 617 AC_SUBST(CURL_LIBS) 618 AC_SUBST(CURL_CFLAGS) 619 AM_CONDITIONAL(HAVE_CURL, test "x$have_curl" = "xyes") 620 621 #--------# 622 # efence # 623 #--------# 624 if test x$def_efence = xyes ; then 625 AC_CHECK_LIB([efence], [main], [FOUND_efence=yes; LIBS="$LIBS -lefence"]) 626 if test x$FOUND_efence != xyes ; then 627 echo "efence was requested, but is not installed!! going on" 628 fi 629 630 fi 609 631 610 632 # FIXME: Replace `main' with a function in `-lm': … … 643 665 src/lib/gui/gtk_gui/Makefile 644 666 src/lib/gui/gl_gui/Makefile 667 src/lib/gui/qt_gui/Makefile 645 668 src/lib/parser/Makefile 646 669 src/lib/parser/tinyxml/Makefile 647 670 src/lib/parser/ini_parser/Makefile 648 671 src/lib/parser/cmdline_parser/Makefile 649 672 src/lib/parser/preferences/Makefile 650 673 src/util/Makefile 651 674 src/world_entities/Makefile -
branches/qt_gui/src/Makefile.am
r7462 r7608 12 12 bin_PROGRAMS = orxonox 13 13 14 orxonox_CPPFLAGS = -DIS_ORXONOX 15 orxonox_LDFLAGS = -u global_ModelParticles_Factory 14 orxonox_CPPFLAGS = \ 15 -DIS_ORXONOX \ 16 @QT_CXXFLAGS@ 17 18 orxonox_LDFLAGS = @QT_LDFLAGS@ 16 19 17 20 orxonox_DEPENDENCIES = \ … … 24 27 util/libORXutils.a \ 25 28 $(libORXlibs_a_LIBRARIES_) \ 26 $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS) 29 $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS) \ 30 @QT_LIBS@ 27 31 28 32 orxonox_SOURCES = \ … … 66 70 67 71 ## orxonox.conf will be used from home-dir instead. 68 EXTRA_DIST = proto/proto_class.h \ 69 proto/proto_class.cc \ 70 proto/proto_singleton.h \ 71 proto/proto_singleton.cc \ 72 proto/proto_world_entity.h \ 73 proto/proto_world_entity.cc \ 74 defs/include_paths.am \ 75 story_entities/Makefile.am 72 EXTRA_DIST = \ 73 proto/proto_class.h \ 74 proto/proto_class.cc \ 75 proto/proto_singleton.h \ 76 proto/proto_singleton.cc \ 77 proto/proto_world_entity.h \ 78 proto/proto_world_entity.cc \ 79 defs/include_paths.am \ 80 story_entities/Makefile.am 76 81 77 82 if SUB_PROJECTS … … 81 86 endif 82 87 83 SUBDIRS = lib \ 84 util \ 85 world_entities \ 86 . \ 87 $(SUB_PROGS) 88 SUBDIRS = \ 89 lib \ 90 util \ 91 world_entities \ 92 . \ 93 $(SUB_PROGS) 88 94 89 95 -
branches/qt_gui/src/defs/class_id.h
r7486 r7608 322 322 CL_GLGUI_BAR = 0x00000b30, 323 323 324 // QT_GUI 325 CL_GUI_SAVEABLE = 0x00b10000, 326 CL_QTGUI_BUTTON = 0x00000ba0, 327 CL_QTGUI_PUSHBUTTON = 0x00000ba3, 328 CL_QTGUI_CHECKBUTTON = 0x00000ba4, 329 CL_QTGUI_RADIOBUTTON = 0x00000ba5, 330 CL_QTGUI_CONTAINER = 0x00b200a0, 331 CL_QTGUI_BOX = 0x00000ba7, 332 CL_QTGUI_FRAME = 0x00000ba8, 333 CL_QTGUI_WINDOW = 0x00000ba9, 334 CL_QTMENU_IMAGE_SCREEN = 0x00000ba0, 335 CL_QTGUI_BAR = 0x00000ba0, 336 324 337 /// AUDIO stuff (range from 0x00000c00 to 0x00000cff) 325 338 CL_SOUND_BUFFER = 0x00000c01, -
branches/qt_gui/src/defs/debug.h
r7374 r7608 28 28 #include "confincl.h" 29 29 #ifndef NO_SHELL 30 #include "shell_buffer.h"30 #include "lib/shell/shell_buffer.h" 31 31 #endif /* NO_SHELL */ 32 32 -
branches/qt_gui/src/defs/globals.h
r7256 r7608 38 38 #define CONFIG_SECTION_VIDEO_ADVANCED "video_advanced" 39 39 #define CONFIG_SECTION_AUDIO "audio" 40 #define CONFIG_SECTION_EXEC "exec" 41 #define CONFIG_SECTION_DATA "data" 40 #define CONFIG_SECTION_GENERAL "general" 42 41 43 42 /* … … 54 53 #define CONFIG_NAME_FOG "Fog" 55 54 #define CONFIG_NAME_REFLECTIONS "Reflections" 56 #define CONFIG_NAME_TEXTURES "T EXTURES"55 #define CONFIG_NAME_TEXTURES "Textures" 57 56 #define CONFIG_NAME_TEXTURE_DETAIL "Texture-Detail" 58 57 #define CONFIG_NAME_MODEL_DETAIL "Model-Detail" … … 61 60 #define CONFIG_NAME_FILTER_METHOD "Filtering-Method" 62 61 62 #define CONFIG_NAME_SOUNDCARD "Soundcard" 63 63 #define CONFIG_NAME_DISABLE_AUDIO "Disable-Audio" 64 64 #define CONFIG_NAME_AUDIO_CHANNELS "Audio-Channels" … … 69 69 #define CONFIG_NAME_VERBOSE_MODE "Verbose-Mode" 70 70 #define CONFIG_NAME_ALWAYS_SHOW_GUI "Always-Show-The-Gui" 71 #define CONFIG_NAME_DEBUG_LEVEL "Debug-Level" 72 71 73 // evenets 72 74 #define CONFIG_NAME_PLAYER_FORWARD "Forward" -
branches/qt_gui/src/lib/BuildLibs.am
r7457 r7608 3 3 $(LIB_PREFIX)/libORXlibs.a \ 4 4 $(LIB_PREFIX)/shell/libORXshell.a \ 5 $(LIB_PREFIX)/gui/gtk_gui/libORXgui.a \ 5 $(LIB_PREFIX)/gui/gtk_gui/libORXgtkgui.a \ 6 $(LIB_PREFIX)/gui/qt_gui/libORXqtgui.a \ 6 7 $(LIB_PREFIX)/gui/gl_gui/libORXglgui.a \ 8 $(LIB_PREFIX)/gui/libORXbasegui.a \ 7 9 $(LIB_PREFIX)/graphics/importer/libORXimporter.a \ 8 10 $(LIB_PREFIX)/graphics/libORXgraphics.a \ -
branches/qt_gui/src/lib/gui/Makefile.am
r5315 r7608 1 SUBDIRS = gtk_gui \ 2 gl_gui 1 MAINSRCDIR=../.. 2 include $(MAINSRCDIR)/defs/include_paths.am 3 4 AM_LDFLAGS = 5 6 noinst_LIBRARIES = libORXbasegui.a 7 8 9 libORXbasegui_a_SOURCES = \ 10 gui_element.cc \ 11 gui_saveable.cc \ 12 gui.cc 13 14 15 noinst_HEADERS= \ 16 gui_element.h \ 17 gui_saveable.h \ 18 gui.h 19 20 21 EXTRA_DIST = 22 23 SUBDIRS = \ 24 . \ 25 gtk_gui \ 26 gl_gui \ 27 qt_gui -
branches/qt_gui/src/lib/gui/gtk_gui/Makefile.am
r5463 r7608 2 2 include $(MAINSRCDIR)/defs/include_paths.am 3 3 4 noinst_LIBRARIES = libORXg ui.a4 noinst_LIBRARIES = libORXgtkgui.a 5 5 6 libORXgui_a_CPPFLAGS = -DBUILD_ORXONOX \ 7 $(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS) 6 libORXgtkgui_a_CPPFLAGS = \ 7 -DBUILD_ORXONOX \ 8 $(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS) 8 9 9 libORXgui_a_SOURCES = gui.cc \ 10 gui_gtk.cc \ 11 gui_element.cc \ 12 gui_video.cc \ 13 gui_audio.cc \ 14 gui_exec.cc \ 15 gui_flags.cc \ 16 gui_banner.cc \ 17 gui_keys.cc \ 18 gui_update.cc 10 libORXgtkgui_a_SOURCES = \ 11 gui.cc \ 12 gui_gtk.cc \ 13 gui_element.cc \ 14 gui_video.cc \ 15 gui_audio.cc \ 16 gui_exec.cc \ 17 gui_flags.cc \ 18 gui_banner.cc \ 19 gui_keys.cc \ 20 gui_update.cc 19 21 20 22 noinst_HEADERS= gui.h \ 21 22 23 24 25 26 27 28 29 23 gui_gtk.h \ 24 gui_element.h \ 25 gui_video.h \ 26 gui_audio.h \ 27 gui_exec.h \ 28 gui_flags.h \ 29 gui_banner.h \ 30 gui_keys.h \ 31 gui_update.h 30 32 31 33 EXTRA_DIST = rc \ -
branches/qt_gui/src/lib/gui/gtk_gui/gui_element.h
r5039 r7608 1 /*! 1 /*! 2 2 * @file gui_element.h 3 3 * Definition of ... 4 4 5 5 */ … … 16 16 GuiElement(); 17 17 virtual ~GuiElement(); 18 18 19 19 /** @returns the main Widget of this GuiElement. */ 20 Widget* getWidget() { return this->mainWidget;}20 Widget* getWidget() { return this->mainWidget; } 21 21 protected: 22 22 void setMainWidget(Widget* widget); 23 23 24 24 private: 25 25 Widget* mainWidget; -
branches/qt_gui/src/lib/gui/gtk_gui/gui_update.cc
r5766 r7608 51 51 52 52 this->updateFrame = new Frame("Update-Options:"); 53 this->updateFrame->setGroupName(CONFIG_SECTION_ DATA);53 this->updateFrame->setGroupName(CONFIG_SECTION_GENERAL); 54 54 this->updateBox = new Box('v'); 55 55 -
branches/qt_gui/src/lib/lang/base_object.cc
r7429 r7608 20 20 21 21 #include "util/loading/load_param.h" 22 #include "compiler.h"23 22 #include "class_list.h" 24 23 … … 32 31 * @param root the element to load from 33 32 */ 34 BaseObject::BaseObject( )33 BaseObject::BaseObject(const std::string& objectName) 35 34 { 36 35 this->classID = CL_BASE_OBJECT; 37 36 this->className = "BaseObject"; 38 37 39 this->objectName = "";38 this->objectName = objectName; 40 39 this->classList = NULL; 41 40 this->xmlElem = NULL; -
branches/qt_gui/src/lib/lang/base_object.h
r7221 r7608 27 27 28 28 public: 29 BaseObject ();29 BaseObject (const std::string& objectName = ""); 30 30 virtual ~BaseObject (); 31 31 -
branches/qt_gui/src/lib/particles/dot_emitter.cc
r7302 r7608 23 23 #include "util/loading/factory.h" 24 24 #include "debug.h" 25 #include "stdlibincl.h"26 25 27 26 using namespace std; -
branches/qt_gui/src/lib/shell/shell_buffer.h
r7374 r7608 10 10 #include <stdarg.h> 11 11 #include <list> 12 #include " threading.h"12 #include "lib/util/threading.h" 13 13 14 14 #define SHELL_BUFFER_SIZE 16384 //!< The Size of the input-buffers (should be large enough to carry any kind of input) -
branches/qt_gui/src/orxonox.cc
r7460 r7608 30 30 #include "globals.h" 31 31 32 #include "gui .h"32 #include "gui/qt_gui/qt_gui.h" 33 33 34 34 #include "parser/ini_parser/ini_parser.h" … … 280 280 PRINT(3)("> Initializing input\n"); 281 281 282 EventHandler::getInstance()-> 282 283 EventHandler::getInstance()->init(); 283 284 EventHandler::getInstance()->subscribe(GraphicsEngine::getInstance(), ES_ALL, EV_VIDEO_RESIZE); … … 319 320 // init the resource manager 320 321 std::string dataPath; 321 if ((dataPath = Preferences::getInstance()->getString(CONFIG_SECTION_ DATA, CONFIG_NAME_DATADIR, ""))!= "")322 if ((dataPath = Preferences::getInstance()->getString(CONFIG_SECTION_GENERAL, CONFIG_NAME_DATADIR, ""))!= "") 322 323 { 323 324 if (!ResourceManager::getInstance()->setDataDir(dataPath) && … … 334 335 ResourceManager::getInstance()->getDataDir().c_str(), 335 336 this->configFileName.c_str(), 336 CONFIG_SECTION_ DATA,337 CONFIG_SECTION_GENERAL, 337 338 CONFIG_NAME_DATADIR ); 338 Gui* gui = newGui(argc, argv);339 OrxGui::Gui* gui = new OrxGui::QtGui(argc, argv); 339 340 gui->startGui(); 340 341 delete gui; … … 426 427 427 428 IniFilePrefsReader ini(ResourceManager::homeDirCheck(DEFAULT_CONFIG_FILE)); 429 Preferences::getInstance()->setUserIni(ResourceManager::homeDirCheck(DEFAULT_CONFIG_FILE)); 428 430 429 431 prefs.parse(argc, argv); … … 512 514 513 515 // starting the GUI 514 Gui* gui = new Gui(argc, argv);515 gui ->startGui();516 517 if ( ! gui->startOrxonox)516 OrxGui::QtGui gui(argc, argv); 517 gui.startGui(); 518 519 if (gui.getState() & OrxGui::Gui::Quitting) 518 520 return 0; 519 521 520 delete gui;521 522 } 522 523
Note: See TracChangeset
for help on using the changeset viewer.