Cleaned up Sound widget

1 files changed, 128 insertions, 137 deletions

diff --git a/sigmodr/gui/sound.ui b/sigmodr/gui/sound.ui
index 449dfd4c..5908569f 100644
--- a/sigmodr/gui/sound.ui
+++ b/sigmodr/gui/sound.ui
@@ -1,156 +1,138 @@
 <ui version="4.0" >
  <class>formSound</class>
  <widget class="QWidget" name="formSound" >
-  <layout class="QVBoxLayout" >
-   <item>
-    <widget class="QGroupBox" name="boxName" >
-     <property name="title" >
-      <string comment="Label for the name of the sound" >Name</string>
+  <layout class="QGridLayout" >
+   <item row="0" column="0" >
+    <widget class="QLabel" name="labelName" >
+     <property name="text" >
+      <string comment="Label for the name of the sound" >Name:</string>
      </property>
-     <property name="toolTip" >
-      <string>Name of the sound (internal use only)</string>
+     <property name="alignment" >
+      <set>Qt::AlignRight|Qt::AlignVCenter</set>
      </property>
-     <property name="statusTip" >
-      <string>Name of the sound (internal use only)</string>
-     </property>
-     <property name="whatsThis" >
-      <string>Name of the sound (internal use only)</string>
+     <property name="buddy" >
+      <cstring>varName</cstring>
      </property>
-     <layout class="QHBoxLayout" >
-      <item>
-       <widget class="KLineEdit" name="varName" >
-        <property name="showClearButton" stdset="0" >
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-     </layout>
     </widget>
    </item>
-   <item>
-    <widget class="QGroupBox" name="boxSound" >
-     <property name="title" >
-      <string comment="Label for the audio for the sound" >Sound</string>
-     </property>
+   <item row="0" column="1" >
+    <widget class="KLineEdit" name="varName" >
      <property name="toolTip" >
-      <string>The audio data</string>
+      <string>Name of the sound (internal use only)</string>
      </property>
      <property name="statusTip" >
-      <string>The audio data</string>
+      <string>Name of the sound (internal use only)</string>
      </property>
      <property name="whatsThis" >
-      <string>The audio data</string>
+      <string>Name of the sound (internal use only)</string>
+     </property>
+     <property name="showClearButton" stdset="0" >
+      <bool>true</bool>
      </property>
-     <layout class="QVBoxLayout" >
-      <item>
-       <layout class="QHBoxLayout" >
-        <item>
-         <widget class="Phonon::SeekSlider" name="seeker" >
-          <property name="toolTip" >
-           <string>Seek</string>
-          </property>
-          <property name="statusTip" >
-           <string>Seek</string>
-          </property>
-          <property name="whatsThis" >
-           <string>Seek</string>
-          </property>
-          <property name="tracking" >
-           <bool>true</bool>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QLabel" name="label" >
-          <property name="toolTip" >
-           <string>Seek Time</string>
-          </property>
-          <property name="statusTip" >
-           <string>Seek Time</string>
-          </property>
-          <property name="whatsThis" >
-           <string>Seek Time</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-      <item>
-       <layout class="QHBoxLayout" >
-        <item>
-         <widget class="KPushButton" name="buttonPlay" >
-          <property name="toolTip" >
-           <string>Play</string>
-          </property>
-          <property name="statusTip" >
-           <string>Play</string>
-          </property>
-          <property name="whatsThis" >
-           <string>Play</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="KPushButton" name="buttonPause" >
-          <property name="toolTip" >
-           <string>Pause</string>
-          </property>
-          <property name="statusTip" >
-           <string>Pause</string>
-          </property>
-          <property name="whatsThis" >
-           <string>Pause</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="KPushButton" name="buttonStop" >
-          <property name="toolTip" >
-           <string>Stop</string>
-          </property>
-          <property name="statusTip" >
-           <string>Stop</string>
-          </property>
-          <property name="whatsThis" >
-           <string>Stop</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="Phonon::VolumeSlider" name="sliderVolume" >
-          <property name="toolTip" >
-           <string comment="Volume control" >Volume</string>
-          </property>
-          <property name="statusTip" >
-           <string comment="Volume control" >Volume</string>
-          </property>
-          <property name="whatsThis" >
-           <string comment="Volume control" >Volume</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="KPushButton" name="buttonBrowse" >
-          <property name="toolTip" >
-           <string>Find an audio file</string>
-          </property>
-          <property name="statusTip" >
-           <string>Find an audio file</string>
-          </property>
-          <property name="whatsThis" >
-           <string>Find an audio file</string>
-          </property>
-          <property name="text" >
-           <string>Browse...</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-     </layout>
     </widget>
    </item>
-   <item>
+   <item row="1" column="0" colspan="2" >
+    <layout class="QGridLayout" >
+     <item row="0" column="0" colspan="4" >
+      <widget class="Phonon::SeekSlider" name="seeker" >
+       <property name="toolTip" >
+        <string>Seek</string>
+       </property>
+       <property name="statusTip" >
+        <string>Seek</string>
+       </property>
+       <property name="whatsThis" >
+        <string>Seek</string>
+       </property>
+       <property name="tracking" >
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="4" >
+      <widget class="QLabel" name="label" >
+       <property name="toolTip" >
+        <string>Seek Time</string>
+       </property>
+       <property name="statusTip" >
+        <string>Seek Time</string>
+       </property>
+       <property name="whatsThis" >
+        <string>Seek Time</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0" >
+      <widget class="KPushButton" name="buttonPlay" >
+       <property name="toolTip" >
+        <string>Play</string>
+       </property>
+       <property name="statusTip" >
+        <string>Play</string>
+       </property>
+       <property name="whatsThis" >
+        <string>Play</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1" >
+      <widget class="KPushButton" name="buttonPause" >
+       <property name="toolTip" >
+        <string>Pause</string>
+       </property>
+       <property name="statusTip" >
+        <string>Pause</string>
+       </property>
+       <property name="whatsThis" >
+        <string>Pause</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="2" >
+      <widget class="KPushButton" name="buttonStop" >
+       <property name="toolTip" >
+        <string>Stop</string>
+       </property>
+       <property name="statusTip" >
+        <string>Stop</string>
+       </property>
+       <property name="whatsThis" >
+        <string>Stop</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="3" >
+      <widget class="Phonon::VolumeSlider" name="sliderVolume" >
+       <property name="toolTip" >
+        <string comment="Volume control" >Volume</string>
+       </property>
+       <property name="statusTip" >
+        <string comment="Volume control" >Volume</string>
+       </property>
+       <property name="whatsThis" >
+        <string comment="Volume control" >Volume</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="4" >
+      <widget class="KPushButton" name="buttonBrowse" >
+       <property name="toolTip" >
+        <string>Find an audio file</string>
+       </property>
+       <property name="statusTip" >
+        <string>Find an audio file</string>
+       </property>
+       <property name="whatsThis" >
+        <string>Find an audio file</string>
+       </property>
+       <property name="text" >
+        <string>Browse...</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="2" column="0" colspan="2" >
     <spacer>
      <property name="orientation" >
       <enum>Qt::Vertical</enum>
@@ -189,6 +171,15 @@
    <container>1</container>
   </customwidget>
  </customwidgets>
+ <tabstops>
+  <tabstop>varName</tabstop>
+  <tabstop>seeker</tabstop>
+  <tabstop>buttonPlay</tabstop>
+  <tabstop>buttonPause</tabstop>
+  <tabstop>buttonStop</tabstop>
+  <tabstop>sliderVolume</tabstop>
+  <tabstop>buttonBrowse</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>