Changeset 7634 in orxonox.OLD for branches/qt_gui/src/lib

Timestamp:

May 17, 2006, 9:35:53 AM (18 years ago)

Author:

bensch

Message:

better layout in Sound

Location:

branches/qt_gui/src/lib/gui/qt_gui

Files:

• gui_audio.cc (modified) (1 diff)
• gui_general.cc (modified) (1 diff)

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

@@ -46 +46 @@
     {
       QtGuiCheckBox* fullscreen = new QtGuiCheckBox(CONFIG_NAME_DISABLE_AUDIO, this, true);
-      layout->addWidget(fullscreen, 0, 1);
+      layout->addWidget(fullscreen, 0, 0);
 
 
       QLabel* soundCardLabel = new QLabel("Soundcard");
-      layout->addWidget(soundCardLabel, 1,1);
+      layout->addWidget(soundCardLabel, 0,1);
       QtGuiComboBox* soundCard = new QtGuiComboBox(CONFIG_NAME_SOUNDCARD, this, "");
-      layout->addWidget(soundCard, 2, 1);
+      layout->addWidget(soundCard, 0, 2);
 
 
       QtGuiSlider* channels = new QtGuiSlider(CONFIG_NAME_AUDIO_CHANNELS, this, 16, Qt::Vertical);
-      layout->addWidget(channels, 0, 0, 2, 1);
+      layout->addWidget(channels, 0, 3, 2, 1);
       QLabel* channelsLabel = new QLabel("Channels");
-      layout->addWidget(channelsLabel, 3,0);
+      layout->addWidget(channelsLabel, 3,3);
       QLCDNumber* channelNumber = new QLCDNumber();
       connect(channels, SIGNAL(valueChanged(int)), channelNumber, SLOT(display(int)));
-      layout->addWidget(channelNumber, 2,0);
+      layout->addWidget(channelNumber, 2,3);
 
 
       QLabel* musicLabel = new QLabel("Music Volume");
-      layout->addWidget(musicLabel, 0, 2);
+      layout->addWidget(musicLabel, 1, 0);
       QtGuiSlider* musicVolume = new QtGuiSlider(CONFIG_NAME_MUSIC_VOLUME, this, 80);
-      layout->addWidget(musicVolume, 1, 2);
+      layout->addWidget(musicVolume, 2, 0, 1, 2);
 
 
       QLabel* effectsLabel = new QLabel("Effects Volume");
-      layout->addWidget(effectsLabel, 2,2);
+      layout->addWidget(effectsLabel, 3, 0);
       QtGuiSlider* effectVolume = new QtGuiSlider(CONFIG_NAME_EFFECTS_VOLUME, this, 80);
-      layout->addWidget(effectVolume, 3, 2);
+      layout->addWidget(effectVolume, 4, 0, 1, 2);
     }
 

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

@@ -78 +78 @@
   void GuiGeneral::openDataFileDialog()
   {
+    QString browsePath = this->dataDir->text();
+    if (browsePath.isEmpty())
+      browsePath = ".";
+
     QString s = QFileDialog::getOpenFileName(
         this,
     "Choose the ORXONOX DATA DIRECTORY",
-    ".",
+    browsePath,
     "ORXONOX DATA INDEX (" DEFAULT_DATA_DIR_CHECKFILE ")" );