Changeset 7599 in orxonox.OLD

Timestamp:

May 11, 2006, 5:47:48 PM (18 years ago)

Author:

bensch

Message:

qt_gui: more saveable

Location:

branches/qt_gui/src

Files:

• defs/globals.h (modified) (1 diff)
• lib/gui/qt_gui/gui_audio.cc (modified) (5 diffs)
• lib/gui/qt_gui/qt_gui_elements.cc (modified) (2 diffs)
• lib/gui/qt_gui/qt_gui_elements.h (modified) (1 diff)

branches/qt_gui/src/defs/globals.h

@@ -61 +61 @@
 #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"

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

@@ -30 +30 @@
 #include <QtGui/QLCDNumber>
 #include "debug.h"
+#include "globals.h"
 
 #include "qt_gui_elements.h"
@@ -39 +40 @@
   */
   GuiAudio::GuiAudio(OrxGui::Gui* gui)
-  : Element("Audio", gui), QGroupBox()
+  : Element(CONFIG_SECTION_AUDIO, gui), QGroupBox()
   {
     QGridLayout* layout = new QGridLayout(this);
 
     {
-      QtGuiCheckBox* fullscreen = new QtGuiCheckBox("Enabled", this, true);
+      QtGuiCheckBox* fullscreen = new QtGuiCheckBox(CONFIG_NAME_DISABLE_AUDIO, this, true);
       layout->addWidget(fullscreen, 0, 1);
 
@@ -50 +51 @@
       QLabel* soundCardLabel = new QLabel("Soundcard");
       layout->addWidget(soundCardLabel, 1,1);
-      QtGuiComboBox* soundCard = new QtGuiComboBox("SoundCard", this);
+      QtGuiComboBox* soundCard = new QtGuiComboBox(CONFIG_NAME_SOUNDCARD, this);
       layout->addWidget(soundCard, 2, 1);
 
 
-      QtGuiSlider* channels = new QtGuiSlider("Channels", this, Qt::Vertical);
+      QtGuiSlider* channels = new QtGuiSlider(CONFIG_NAME_AUDIO_CHANNELS, this, Qt::Vertical);
       layout->addWidget(channels, 0, 0, 2, 1);
       QLabel* channelsLabel = new QLabel("Channels");
@@ -65 +66 @@
       QLabel* musicLabel = new QLabel("Music Volume");
       layout->addWidget(musicLabel, 0, 2);
-      QtGuiSlider* musicVolume = new QtGuiSlider("Music-Volume", this);
+      QtGuiSlider* musicVolume = new QtGuiSlider(CONFIG_NAME_MUSIC_VOLUME, this);
       layout->addWidget(musicVolume, 1, 2);
 
@@ -71 +72 @@
       QLabel* effectsLabel = new QLabel("Effects Volume");
       layout->addWidget(effectsLabel, 2,2);
-      QtGuiSlider* effectVolume = new QtGuiSlider("Effects-Volume", this);
+      QtGuiSlider* effectVolume = new QtGuiSlider(CONFIG_NAME_EFFECTS_VOLUME, this);
       layout->addWidget(effectVolume, 3, 2);
     }

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

@@ -42 +42 @@
   void QtGuiCheckBox::save()
   {
+    this->value() = this->checkState();
+    Saveable::save();
   }
 
@@ -53 +55 @@
 
   }
+
   QtGuiSlider::~QtGuiSlider()
   {}
 
+  void QtGuiSlider::load()
+  {
+    Saveable::load();
+    this->setValue(this->Saveable::value().getInt());
+  }
+
+  void QtGuiSlider::save()
+  {
+    this->Saveable::value() = this->QSlider::value();
+    Saveable::save();
+  }
 
 

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

@@ -51 +51 @@
     virtual ~QtGuiSlider();
 
+    virtual void load();
+    virtual void save();
+
   public slots:
     //   void setSliderValue(float);