Changeset 7595 in orxonox.OLD

Timestamp:

May 11, 2006, 2:02:37 PM (18 years ago)

Author:

bensch

Message:

qt_gui: better stuff and so on

Location:

branches/qt_gui/src

Files:

• lib/gui/gui_saveable.cc (modified) (4 diffs)
• lib/gui/gui_saveable.h (modified) (1 diff)
• lib/gui/qt_gui/gui_audio.cc (modified) (2 diffs)
• lib/gui/qt_gui/gui_general.cc (modified) (3 diffs)
• lib/particles/dot_emitter.cc (modified) (1 diff)
• orxonox.cc (modified) (1 diff)

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

@@ -18 +18 @@
 #include "gui_saveable.h"
 #include "gui.h"
+#include "preferences.h"
 
 namespace OrxGui
@@ -30 +31 @@
     this->bSaveable = false;
 
+    assert(group != NULL);
     this->group = group;
     this->group->addSaveable(this);
@@ -51 +53 @@
 
   }
+
+
+  void Saveable::load(const MultiType& value)
+  {
+    Preferences::getInstance()->setMultiType(this->group->getName(), this->getName(), value);
+  }
+
+  const MultiType& Saveable::save()
+  {
+    Preferences::getInstance()->getMultiType(this->group->getName(), this->getName(), 0);
+  }
+
+
 
 
@@ -98 +113 @@
    */
   void SaveableGroup::load(const MultiType& value)
-  {}
+  {
+  }
 
   /**

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

@@ -25 +25 @@
     void makeSaveable();
 
-    virtual void load(const MultiType& value) {};
-    virtual const MultiType& save() {};
+    virtual void load(const MultiType& value);
+    virtual const MultiType& save();
 
     MultiType&       value() { return this->_value; };

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

@@ -28 +28 @@
 
 #include <QtGui/QLayout>
+#include <QtGui/QLCDNumber>
 #include "debug.h"
 
@@ -52 +53 @@
       layout->addWidget(soundCard, 2, 1);
 
+
       QtGuiSlider* channels = new QtGuiSlider("Channels", this, Qt::Vertical);
-      layout->addWidget(channels, 0, 0, 3, 1);
+      layout->addWidget(channels, 0, 0, 2, 1);
       QLabel* channelsLabel = new QLabel("Channels");
       layout->addWidget(channelsLabel, 3,0);
+      QLCDNumber* channelNumber = new QLCDNumber();
+      connect(channels, SIGNAL(valueChanged(int)), channelNumber, SLOT(display(int)));
+      layout->addWidget(channelNumber, 2,0);
 
 

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

@@ -43 +43 @@
   {
     QGridLayout* layout = new QGridLayout(this);
-
     {
       QLabel* dataDirLabel = new QLabel("DataDirectory");
@@ -67 +66 @@
       debug->addItem("5 - extremely debug");
     }
-
-
   }
 
@@ -83 +80 @@
     QString s = QFileDialog::getOpenFileName(
         this,
-    "Choose a file",
-    "/home",
-    "Images (*.png *.xpm *.jpg)");
+    "Choose the ORXONOX DATA DIRECTORY",
+    ".",
+    "ORXONOX DATA INDEX (data.oxd)");
   }
 

branches/qt_gui/src/lib/particles/dot_emitter.cc

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

branches/qt_gui/src/orxonox.cc

@@ -274 +274 @@
   PRINT(3)("> Initializing input\n");
 
+  EventHandler::getInstance()->
   EventHandler::getInstance()->init();
   EventHandler::getInstance()->subscribe(GraphicsEngine::getInstance(), ES_ALL, EV_VIDEO_RESIZE);