--- qsampler/trunk/src/qsamplerChannelForm.ui	2007/11/01 13:01:27	1463
+++ qsampler/trunk/src/qsamplerChannelForm.ui	2010/03/29 17:00:30	2074
@@ -2,7 +2,8 @@
  <author>rncbc aka Rui Nuno Capela</author>
  <comment>qsampler - A LinuxSampler Qt GUI Interface.
 
-   Copyright (C) 2005-2007, rncbc aka Rui Nuno Capela. All rights reserved.
+   Copyright (C) 2005-2010, rncbc aka Rui Nuno Capela. All rights reserved.
+   Copyright (C) 2007, Christian Schoenebeck
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License
@@ -25,8 +26,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>450</width>
-    <height>484</height>
+    <width>460</width>
+    <height>320</height>
    </rect>
   </property>
   <property name="sizePolicy" >
@@ -44,7 +45,7 @@
    <string>Qsampler: Channel</string>
   </property>
   <property name="windowIcon" >
-   <iconset resource="../icons/qsampler.qrc" >:/icons/qsamplerChannel.png</iconset>
+   <iconset resource="qsampler.qrc" >:/images/qsamplerChannel.png</iconset>
   </property>
   <layout class="QVBoxLayout" >
    <property name="margin" >
@@ -93,7 +94,7 @@
         <string/>
        </property>
        <property name="icon" >
-        <iconset resource="../icons/qsampler.qrc" >:/icons/fileOpen.png</iconset>
+        <iconset resource="qsampler.qrc" >:/images/fileOpen.png</iconset>
        </property>
       </widget>
      </item>
@@ -134,7 +135,7 @@
        </property>
       </widget>
      </item>
-     <item row="0" column="1" colspan="2" >
+     <item row="0" column="1" colspan="1" >
       <widget class="QComboBox" name="EngineNameComboBox" >
        <property name="sizePolicy" >
         <sizepolicy>
@@ -274,7 +275,7 @@
            <string/>
           </property>
           <property name="icon" >
-           <iconset resource="../icons/qsampler.qrc" >:/icons/midi1.png</iconset>
+           <iconset resource="qsampler.qrc" >:/images/midi1.png</iconset>
           </property>
          </widget>
         </item>
@@ -302,7 +303,7 @@
          <string>&amp;Device:</string>
         </property>
         <property name="alignment" >
-         <set>Qt::AlignVCenter</set>
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
         </property>
         <property name="wordWrap" >
          <bool>false</bool>
@@ -359,7 +360,7 @@
          <string>&amp;Type:</string>
         </property>
         <property name="alignment" >
-         <set>Qt::AlignVCenter</set>
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
         </property>
         <property name="wordWrap" >
          <bool>false</bool>
@@ -619,7 +620,7 @@
              <string/>
             </property>
             <property name="icon" >
-             <iconset resource="../icons/qsampler.qrc" >:/icons/audio1.png</iconset>
+             <iconset resource="qsampler.qrc" >:/images/audio1.png</iconset>
             </property>
            </widget>
           </item>
@@ -628,17 +629,17 @@
         <item row="1" column="0" >
          <widget class="QLabel" name="AudioDeviceTextLabel" >
           <property name="text" >
-           <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
-p, li { white-space: pre-wrap; }
-&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;">
-&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" text-decoration: underline;">D&lt;/span>evice:&lt;/p>&lt;/body>&lt;/html></string>
+           <string>&amp;Device:</string>
           </property>
           <property name="alignment" >
-           <set>Qt::AlignVCenter</set>
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
           </property>
           <property name="wordWrap" >
            <bool>false</bool>
           </property>
+          <property name="buddy" >
+           <cstring>AudioDeviceComboBox</cstring>
+          </property>
          </widget>
         </item>
         <item row="0" column="1" >
@@ -685,23 +686,41 @@
         <item row="0" column="0" >
          <widget class="QLabel" name="AudioDriverTextLabel" >
           <property name="text" >
-           <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
-p, li { white-space: pre-wrap; }
-&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;">
-&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" text-decoration: underline;">T&lt;/span>ype:&lt;/p>&lt;/body>&lt;/html></string>
+           <string>&amp;Type:</string>
           </property>
           <property name="alignment" >
-           <set>Qt::AlignVCenter</set>
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
           </property>
           <property name="wordWrap" >
            <bool>false</bool>
           </property>
+          <property name="buddy" >
+           <cstring>AudioDriverComboBox</cstring>
+          </property>
          </widget>
         </item>
        </layout>
       </item>
       <item>
-       <widget class="QTableView" name="AudioRoutingTable" />
+       <widget class="QTableView" name="AudioRoutingTable" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>7</hsizetype>
+          <vsizetype>7</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="toolTip" >
+         <string>Audio routing table</string>
+        </property>
+        <property name="minimumSize" >
+         <size>
+          <width>320</width>
+          <height>80</height>
+         </size>
+        </property>
+       </widget>
       </item>
      </layout>
     </widget>
@@ -736,7 +755,7 @@
         <string>OK</string>
        </property>
        <property name="icon" >
-        <iconset resource="../icons/qsampler.qrc" >:/icons/formAccept.png</iconset>
+        <iconset resource="qsampler.qrc" >:/images/formAccept.png</iconset>
        </property>
       </widget>
      </item>
@@ -746,7 +765,7 @@
         <string>Cancel</string>
        </property>
        <property name="icon" >
-        <iconset resource="../icons/qsampler.qrc" >:/icons/formReject.png</iconset>
+        <iconset resource="qsampler.qrc" >:/images/formReject.png</iconset>
        </property>
       </widget>
      </item>
@@ -755,7 +774,6 @@
   </layout>
  </widget>
  <layoutdefault spacing="4" margin="4" />
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>EngineNameComboBox</tabstop>
   <tabstop>InstrumentFileComboBox</tabstop>
@@ -765,104 +783,6 @@
   <tabstop>CancelPushButton</tabstop>
  </tabstops>
  <resources>
-  <include location="../icons/qsampler.qrc" />
+  <include location="qsampler.qrc" />
  </resources>
- <connections>
-  <connection>
-   <sender>EngineNameComboBox</sender>
-   <signal>activated(int)</signal>
-   <receiver>qsamplerChannelForm</receiver>
-   <slot>optionsChanged()</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>20</x>
-     <y>20</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>20</x>
-     <y>20</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>InstrumentFileComboBox</sender>
-   <signal>activated(QString)</signal>
-   <receiver>qsamplerChannelForm</receiver>
-   <slot>updateInstrumentName()</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>20</x>
-     <y>20</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>20</x>
-     <y>20</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>InstrumentFileToolButton</sender>
-   <signal>clicked()</signal>
-   <receiver>qsamplerChannelForm</receiver>
-   <slot>openInstrumentFile()</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>20</x>
-     <y>20</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>20</x>
-     <y>20</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>InstrumentNrComboBox</sender>
-   <signal>activated(int)</signal>
-   <receiver>qsamplerChannelForm</receiver>
-   <slot>optionsChanged()</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>20</x>
-     <y>20</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>20</x>
-     <y>20</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>OkPushButton</sender>
-   <signal>clicked()</signal>
-   <receiver>qsamplerChannelForm</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>20</x>
-     <y>20</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>20</x>
-     <y>20</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>CancelPushButton</sender>
-   <signal>clicked()</signal>
-   <receiver>qsamplerChannelForm</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>20</x>
-     <y>20</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>20</x>
-     <y>20</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
 </ui>