Changeset 7585 in orxonox.OLD for branches

Timestamp:

May 11, 2006, 12:22:03 AM (19 years ago)

Author:

bensch

Message:

orxonox/qt_gui: more guo-elements

Location:

branches/qt_gui/src/lib/gui/qt_gui

Files:

• Makefile.am (modified) (2 diffs)
• gui_general.cc (copied) (copied from branches/qt_gui/src/lib/gui/qt_gui/gui_audio.cc) (3 diffs)
• gui_general.h (copied) (copied from branches/qt_gui/src/lib/gui/qt_gui/gui_audio.h) (2 diffs)
• qt_gui.cc (modified) (2 diffs)
• qt_gui_elements.cc (modified) (2 diffs)
• qt_gui_elements.h (modified) (1 diff)

branches/qt_gui/src/lib/gui/qt_gui/Makefile.am

@@ -21 +21 @@
                 \
                 gui_video.cc \
-                gui_audio.cc
+                gui_audio.cc \
+                gui_general.cc
 
 noinst_HEADERS= \
@@ -28 +29 @@
                 \
                 gui_video.h \
-                gui_audio.h
+                gui_audio.h \
+                gui_general.cc
+
 
 EXTRA_DIST =

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

@@ -25 +25 @@
 
 
-#include "gui_audio.h"
+#include "gui_general.h"
 
 #include <QtGui/QLayout>
@@ -35 +35 @@
 {
   /**
-   *  Creates the Audio-Option-Frame
+   *  Creates the General-Option-Frame
   */
-  GuiAudio::GuiAudio(OrxGui::Gui* gui)
-  : Element("Audio", gui), QGroupBox()
+  GuiGeneral::GuiGeneral(OrxGui::Gui* gui)
+  : Element("General", gui), QGroupBox()
   {
     QGridLayout* layout = new QGridLayout(this);
 
     {
-      QtGuiCheckBox* fullscreen = new QtGuiCheckBox("Enabled", this, true);
-      layout->addWidget(fullscreen, 0, 1);
+      QLabel* dataDirLabel = new QLabel("DataDirectory");
+      layout->addWidget(dataDirLabel, 0,0);
+      QtGuiInputLine* dataDir = new QtGuiInputLine("SoundCard", this);
+      layout->addWidget(dataDir, 0, 1, 1, 2);
 
+      QLabel* debugLabel = new QLabel("debug-mode");
+      layout->addWidget(debugLabel, 1,0);
+      QtGuiComboBox* debug = new QtGuiComboBox("debug", this);
+      layout->addWidget(debug, 1, 1, 1, 2);
 
-      QLabel* soundCardLabel = new QLabel("Soundcard");
-      layout->addWidget(soundCardLabel, 1,1);
-      QtGuiComboBox* soundCard = new QtGuiComboBox("SoundCard", this);
-      layout->addWidget(soundCard, 2, 1);
-
-      QtGuiSlider* channels = new QtGuiSlider("Channels", this, Qt::Vertical);
-      layout->addWidget(channels, 0, 0, 3, 1);
-      QLabel* channelsLabel = new QLabel("Channels");
-      layout->addWidget(channelsLabel, 3,0);
-
-
-      QLabel* musicLabel = new QLabel("Music Volume");
-      layout->addWidget(musicLabel, 0, 2);
-      QtGuiSlider* musicVolume = new QtGuiSlider("Music-Volume", this);
-      layout->addWidget(musicVolume, 1, 2);
-
-
-      QLabel* effectsLabel = new QLabel("Effects Volume");
-      layout->addWidget(effectsLabel, 2,2);
-      QtGuiSlider* effectVolume = new QtGuiSlider("Effects-Volume", this);
-      layout->addWidget(effectVolume, 3, 2);
+      debug->addItem("0 - minimal");
+      debug->addItem("1 - errors");
+      debug->addItem("2 - warnings");
+      debug->addItem("3 - information");
+      debug->addItem("4 - debug");
+      debug->addItem("5 - extremely debug");
     }
 
@@ -74 +65 @@
 
   /**
-   *  Destructs the Audio-stuff
+   *  Destructs the General-stuff
   */
-  GuiAudio::~GuiAudio()
+  GuiGeneral::~GuiGeneral()
   {
     // nothing to do here.

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

@@ -1 +1 @@
 /*!
-  \file gui_audio.h
-  \brief File that holds the class that creates the Audio-Options.
+  \file gui_general.h
+  \brief File that holds the class that creates the General-Options.
 */
-#ifndef _GUI_AUDIO_H
-#define _GUI_AUDIO_H
+#ifndef _GUI_GENERAL_H
+#define _GUI_GENERAL_H
 
 #include "../gui_element.h"
@@ -14 +14 @@
 {
   //! Class that creates the Audio-Options.
-  class GuiAudio : public OrxGui::Element, public QGroupBox
+  class GuiGeneral : public OrxGui::Element, public QGroupBox
   {
   public:
-    GuiAudio(OrxGui::Gui* gui);
-    virtual ~GuiAudio();
+    GuiGeneral(OrxGui::Gui* gui);
+    virtual ~GuiGeneral();
 
   };
 }
 
-#endif /* _GUI_AUDIO_H */
+#endif /* _GUI_GENERAL_H */

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

@@ -25 +25 @@
 #include "gui_video.h"
 #include "gui_audio.h"
+#include "gui_general.h"
 
 namespace OrxGui
@@ -43 +44 @@
         toolBox->addItem(new GuiVideo(this), "Video");
         toolBox->addItem(new GuiAudio(this), "Audio");
+        toolBox->addItem(new GuiGeneral(this), "General");
       }
       mainLayout->addWidget(toolBox,1,1, 1, 3);

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

@@ -33 +33 @@
   {
     this->setTristate(value.getBool());
-        this->value() = value;
+    this->value() = value;
   }
 
@@ -81 +81 @@
 
 
+  QtGuiInputLine::QtGuiInputLine(const std::string& name, SaveableGroup* group)
+  : QLineEdit(), Saveable(name, group)
+  {
+
+
+  }
+
+
+  void QtGuiInputLine::load(const MultiType& value)
+  {
+    this->setText(value.getString().c_str());
+    this->value() = value;
+  }
+
+
+
+  const MultiType& QtGuiInputLine::save()
+  {
+    return this->value();
+  }
+
+
+
+
 }

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

@@ -70 +70 @@
   };
 
+  class QtGuiInputLine : public QLineEdit, public OrxGui::Saveable
+  {
+    Q_OBJECT
+
+  public:
+    QtGuiInputLine(const std::string& name, SaveableGroup* group);
+
+    virtual void load(const MultiType& value);
+    virtual const MultiType& save();
+  };
+
 }