Changeset 7479 in orxonox.OLD

Timestamp:

May 2, 2006, 10:04:13 PM (18 years ago)

Author:

bensch

Message:

orxonox/qt_gui: opens up a Windows

Location:

branches/qt_gui/src

Files:

• Makefile.am (modified) (4 diffs)
• lib/BuildLibs.am (modified) (1 diff)
• lib/gui/gtk_gui/Makefile.am (modified) (1 diff)
• lib/gui/gui_saveable.cc (modified) (2 diffs)
• lib/gui/gui_saveable.h (modified) (1 diff)
• lib/gui/qt_gui/qt_gui.cc (modified) (1 diff)
• lib/gui/qt_gui/qt_gui.h (modified) (2 diffs)
• orxonox.cc (modified) (3 diffs)

branches/qt_gui/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 =
 
 orxonox_DEPENDENCIES = \
@@ -24 +27 @@
                 util/libORXutils.a \
                 $(libORXlibs_a_LIBRARIES_) \
-                $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
+                $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS) \
+                @QT_LIBS@
 
 orxonox_SOURCES = \
@@ -63 +67 @@
 
 ## 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
@@ -78 +83 @@
 endif
 
-SUBDIRS = lib \
-          util \
-          world_entities \
-          . \
-          $(SUB_PROGS)
+SUBDIRS = \
+                lib \
+                util \
+                world_entities \
+                . \
+                $(SUB_PROGS)
 
 

branches/qt_gui/src/lib/BuildLibs.am

@@ -2 +2 @@
 libORXlibs_a_LIBRARIES_ = \
                 $(LIB_PREFIX)/libORXlibs.a \
-                $(LIB_PREFIX)/gui/gtk_gui/libORXgui.a \
+                $(LIB_PREFIX)/gui/gtk_gui/libORXgtkgui.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 \

branches/qt_gui/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 \

branches/qt_gui/src/lib/gui/gui_saveable.cc

@@ -25 +25 @@
   */
   GuiSaveable::GuiSaveable (const std::string& optionName)
+  : BaseObject(optionName)
   {
     this->bSaveable = false;
+
   }
 
@@ -49 +51 @@
       : GuiSaveable(groupName)
   {
-    //    this->setName(groupName);
   }
 

branches/qt_gui/src/lib/gui/gui_saveable.h

@@ -15 +15 @@
 {
   //! A class for ...
-  class GuiSaveable
+  class GuiSaveable : public BaseObject
   {
   public:

branches/qt_gui/src/lib/gui/qt_gui/qt_gui.cc

@@ -27 +27 @@
   {
 
+    this->mainWindow = new QMainWindow();
+    this->mainWindow->show();
+
+    this->exec();
 
 

branches/qt_gui/src/lib/gui/qt_gui/qt_gui.h

@@ -10 +10 @@
 #include "gui_element.h"
 #include <qapplication.h>
+#include <qmainwindow.h>
 
 namespace OrxGui
@@ -30 +31 @@
 
     private:
+      QMainWindow*              mainWindow;
       std::list<GuiElement*>    elements;   //!< A List of Elements within the QTGui
   };

branches/qt_gui/src/orxonox.cc

@@ -30 +30 @@
 #include "globals.h"
 
-#include "gui.h"
+#include "gui/qt_gui/qt_gui.h"
 
 #include "parser/ini_parser/ini_parser.h"
@@ -330 +330 @@
               CONFIG_SECTION_DATA,
               CONFIG_NAME_DATADIR );
-    Gui* gui = new Gui(argc, argv);
+    OrxGui::Gui* gui = new OrxGui::QtGui(argc, argv);
     gui->startGui();
     delete gui;
@@ -497 +497 @@
 
     // starting the GUI
-    Gui* gui = new Gui(argc, argv);
+    OrxGui::Gui* gui = new OrxGui::QtGui(argc, argv);
     gui->startGui();
 
-    if (! gui->startOrxonox)
-      return 0;
+//    if (!gui->startOrxonox)
+//      return 0;
 
     delete gui;