Changeset 7551 in orxonox.OLD

Timestamp:

May 6, 2006, 11:11:57 AM (18 years ago)

Author:

bensch

Message:

orxonox/qt_gui: more gui-stuff

Location:

branches/qt_gui/src/lib/gui/qt_gui

Files:

• gui_audio.cc (modified) (1 diff)
• qt_gui_elements.cc (modified) (1 diff)
• qt_gui_elements.h (modified) (1 diff)

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

@@ -44 +44 @@
     {
       QtGuiCheckBox* fullscreen = new QtGuiCheckBox("Enabled", true);
-      layout->addWidget(fullscreen, 0, 0);
+      layout->addWidget(fullscreen, 0, 1);
 
-      QtGuiCheckBox* wireframe = new QtGuiCheckBox("Test");
-      layout->addWidget(wireframe, 1, 0);
 
+      QLabel* soundCardLabel = new QLabel("Soundcard");
+      layout->addWidget(soundCardLabel, 1,1);
       QtGuiComboBox* soundCard = new QtGuiComboBox("SoundCard");
-      layout->addWidget(soundCard, 2, 0);
+      layout->addWidget(soundCard, 2, 1);
 
-      QtGuiSlider* channels = new QtGuiSlider("Channels");
-      layout->addWidget(channels, 3, 0);
+      QtGuiSlider* channels = new QtGuiSlider("Channels", 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");
-      layout->addWidget(musicVolume,0, 1);
+      layout->addWidget(musicVolume, 1, 2);
+
+
+      QLabel* effectsLabel = new QLabel("Effects Volume");
+      layout->addWidget(effectsLabel, 2,2);
       QtGuiSlider* effectVolume = new QtGuiSlider("Effects-Volume");
-      layout->addWidget(effectVolume, 0, 2);
+      layout->addWidget(effectVolume, 3, 2);
     }
 

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

@@ -47 +47 @@
 
 
-  QtGuiSlider::QtGuiSlider(const std::string& name)
-  : QSlider(), Saveable(name)
+  QtGuiSlider::QtGuiSlider(const std::string& name, Qt::Orientation orientation)
+  : QSlider(orientation), Saveable(name)
   {
 

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

@@ -48 +48 @@
 
   public:
-    QtGuiSlider(const std::string& name);
+    QtGuiSlider(const std::string& name, Qt::Orientation orientation = Qt::Horizontal);
     virtual ~QtGuiSlider();