--- qsampler/trunk/src/qsamplerDeviceForm.ui	2005/03/15 11:39:12	462
+++ qsampler/trunk/src/qsamplerDeviceForm.ui	2005/03/15 15:32:29	463
@@ -28,8 +28,8 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>544</width>
-            <height>343</height>
+            <width>536</width>
+            <height>301</height>
         </rect>
     </property>
     <property name="sizePolicy">
@@ -55,7 +55,7 @@
         </property>
         <widget class="QSplitter">
             <property name="name">
-                <cstring>splitter3</cstring>
+                <cstring>splitter1</cstring>
             </property>
             <property name="orientation">
                 <enum>Horizontal</enum>
@@ -91,86 +91,137 @@
                     <string>Device list</string>
                 </property>
             </widget>
-            <widget class="QLayoutWidget">
+            <widget class="QSplitter">
                 <property name="name">
-                    <cstring>layout5</cstring>
+                    <cstring>splitter2</cstring>
                 </property>
-                <grid>
+                <property name="orientation">
+                    <enum>Vertical</enum>
+                </property>
+                <widget class="QLayoutWidget">
                     <property name="name">
-                        <cstring>unnamed</cstring>
+                        <cstring>layout4</cstring>
                     </property>
-                    <widget class="QLabel" row="0" column="0">
-                        <property name="name">
-                            <cstring>DeviceNameTextLabel</cstring>
-                        </property>
-                        <property name="sizePolicy">
-                            <sizepolicy>
-                                <hsizetype>7</hsizetype>
-                                <vsizetype>5</vsizetype>
-                                <horstretch>0</horstretch>
-                                <verstretch>0</verstretch>
-                            </sizepolicy>
-                        </property>
-                        <property name="font">
-                            <font>
-                                <bold>1</bold>
-                            </font>
-                        </property>
-                        <property name="indent">
-                            <number>4</number>
-                        </property>
-                        <property name="toolTip" stdset="0">
-                            <string>Device name</string>
-                        </property>
-                    </widget>
-                    <widget class="qsamplerDeviceParamTable" row="1" column="0" rowspan="1" colspan="3">
+                    <grid>
                         <property name="name">
-                            <cstring>DeviceParamTable</cstring>
-                        </property>
-                        <property name="sizePolicy">
-                            <sizepolicy>
-                                <hsizetype>7</hsizetype>
-                                <vsizetype>7</vsizetype>
-                                <horstretch>0</horstretch>
-                                <verstretch>0</verstretch>
-                            </sizepolicy>
-                        </property>
-                        <property name="minimumSize">
-                            <size>
-                                <width>360</width>
-                                <height>260</height>
-                            </size>
-                        </property>
-                        <property name="focusPolicy">
-                            <enum>StrongFocus</enum>
-                        </property>
-                        <property name="toolTip" stdset="0">
-                            <string>Device parameters</string>
-                        </property>
-                    </widget>
-                    <widget class="QComboBox" row="0" column="2">
-                        <property name="name">
-                            <cstring>DriverNameComboBox</cstring>
-                        </property>
-                        <property name="toolTip" stdset="0">
-                            <string>Driver type name</string>
+                            <cstring>unnamed</cstring>
                         </property>
-                    </widget>
-                    <widget class="QLabel" row="0" column="1">
+                        <widget class="QLabel" row="0" column="0">
+                            <property name="name">
+                                <cstring>DeviceNameTextLabel</cstring>
+                            </property>
+                            <property name="sizePolicy">
+                                <sizepolicy>
+                                    <hsizetype>7</hsizetype>
+                                    <vsizetype>5</vsizetype>
+                                    <horstretch>0</horstretch>
+                                    <verstretch>0</verstretch>
+                                </sizepolicy>
+                            </property>
+                            <property name="font">
+                                <font>
+                                    <bold>1</bold>
+                                </font>
+                            </property>
+                            <property name="indent">
+                                <number>4</number>
+                            </property>
+                            <property name="toolTip" stdset="0">
+                                <string>Device name</string>
+                            </property>
+                        </widget>
+                        <widget class="QLabel" row="0" column="1">
+                            <property name="name">
+                                <cstring>DriverNameTextLabel</cstring>
+                            </property>
+                            <property name="text">
+                                <string>Dri&amp;ver:</string>
+                            </property>
+                            <property name="alignment">
+                                <set>AlignVCenter|AlignRight</set>
+                            </property>
+                            <property name="buddy" stdset="0">
+                                <cstring>DriverNameComboBox</cstring>
+                            </property>
+                        </widget>
+                        <widget class="qsamplerDeviceParamTable" row="1" column="0" rowspan="1" colspan="3">
+                            <property name="name">
+                                <cstring>DeviceParamTable</cstring>
+                            </property>
+                            <property name="sizePolicy">
+                                <sizepolicy>
+                                    <hsizetype>7</hsizetype>
+                                    <vsizetype>7</vsizetype>
+                                    <horstretch>0</horstretch>
+                                    <verstretch>0</verstretch>
+                                </sizepolicy>
+                            </property>
+                            <property name="minimumSize">
+                                <size>
+                                    <width>360</width>
+                                    <height>120</height>
+                                </size>
+                            </property>
+                            <property name="focusPolicy">
+                                <enum>StrongFocus</enum>
+                            </property>
+                            <property name="toolTip" stdset="0">
+                                <string>Device parameters</string>
+                            </property>
+                        </widget>
+                        <widget class="QComboBox" row="0" column="2">
+                            <property name="name">
+                                <cstring>DriverNameComboBox</cstring>
+                            </property>
+                            <property name="toolTip" stdset="0">
+                                <string>Driver type name</string>
+                            </property>
+                        </widget>
+                    </grid>
+                </widget>
+                <widget class="QLayoutWidget">
+                    <property name="name">
+                        <cstring>layout5</cstring>
+                    </property>
+                    <vbox>
                         <property name="name">
-                            <cstring>DriverNameTextLabel</cstring>
-                        </property>
-                        <property name="text">
-                            <string>Dri&amp;ver:</string>
+                            <cstring>unnamed</cstring>
                         </property>
-                        <property name="alignment">
-                            <set>AlignVCenter|AlignRight</set>
-                        </property>
-                        <property name="buddy" stdset="0">
-                            <cstring>DriverNameComboBox</cstring>
-                        </property>
-                    </widget>
-                </grid>
+                        <widget class="QComboBox">
+                            <property name="name">
+                                <cstring>DevicePortComboBox</cstring>
+                            </property>
+                            <property name="toolTip" stdset="0">
+                                <string>Device port/channel</string>
+                            </property>
+                        </widget>
+                        <widget class="qsamplerDeviceParamTable">
+                            <property name="name">
+                                <cstring>DevicePortParamTable</cstring>
+                            </property>
+                            <property name="sizePolicy">
+                                <sizepolicy>
+                                    <hsizetype>7</hsizetype>
+                                    <vsizetype>7</vsizetype>
+                                    <horstretch>0</horstretch>
+                                    <verstretch>0</verstretch>
+                                </sizepolicy>
+                            </property>
+                            <property name="minimumSize">
+                                <size>
+                                    <width>360</width>
+                                    <height>80</height>
+                                </size>
+                            </property>
+                            <property name="focusPolicy">
+                                <enum>StrongFocus</enum>
+                            </property>
+                            <property name="toolTip" stdset="0">
+                                <string>Device port/channel parameters</string>
+                            </property>
+                        </widget>
+                    </vbox>
+                </widget>
             </widget>
         </widget>
         <widget class="QLayoutWidget">
@@ -290,7 +341,7 @@
 </customwidgets>
 <images>
     <image name="image0">
-        <data format="XBM.GZ" length="79">789c534e494dcbcc4b554829cdcdad8c2fcf4c29c95030e0524611cd48cd4ccf28010a1797249664262b2467241641a592324b8aa363156c15aab914146aadb90067111b1f</data>
+        <data format="XPM.GZ" length="45">789cd3d7528808f055d0d2e72a2e492cc94c5648ce482c52d04a29cdcdad8c8eb5ade6523250004143a55a6b2e0026630c4f</data>
     </image>
 </images>
 <connections>
@@ -319,6 +370,12 @@
         <slot>selectDriver(const QString&amp;)</slot>
     </connection>
     <connection>
+        <sender>DevicePortComboBox</sender>
+        <signal>activated(int)</signal>
+        <receiver>qsamplerDeviceForm</receiver>
+        <slot>selectDevicePort(int)</slot>
+    </connection>
+    <connection>
         <sender>CreateDevicePushButton</sender>
         <signal>clicked()</signal>
         <receiver>qsamplerDeviceForm</receiver>
@@ -342,6 +399,8 @@
     <tabstop>RefreshDevicesPushButton</tabstop>
     <tabstop>DriverNameComboBox</tabstop>
     <tabstop>DeviceParamTable</tabstop>
+    <tabstop>DevicePortComboBox</tabstop>
+    <tabstop>DevicePortParamTable</tabstop>
     <tabstop>CreateDevicePushButton</tabstop>
     <tabstop>DeleteDevicePushButton</tabstop>
     <tabstop>ClosePushButton</tabstop>
@@ -363,13 +422,15 @@
     <variable access="private">qsamplerDeviceItem *m_pMidiItems;</variable>
 </variables>
 <slots>
-    <slot specifier="non virtual">contextMenu(QListViewItem *, const QPoint&amp;, int)</slot>
     <slot specifier="non virtual">createDevice()</slot>
     <slot specifier="non virtual">deleteDevice()</slot>
     <slot specifier="non virtual">refreshDevices()</slot>
     <slot specifier="non virtual">selectDriver( const QString &amp; sDriverName )</slot>
     <slot specifier="non virtual">selectDevice()</slot>
-    <slot specifier="non virtual">changeValue( int iRow, int iCol )</slot>
+    <slot specifier="non virtual">selectDevicePort( int iPort )</slot>
+    <slot specifier="non virtual">changeDeviceParam( int iRow, int iCol )</slot>
+    <slot specifier="non virtual">changeDevicePortParam( int iRow, int iCol )</slot>
+    <slot specifier="non virtual">contextMenu(QListViewItem *, const QPoint&amp;, int)</slot>
     <slot specifier="non virtual">stabilizeForm()</slot>
 </slots>
 <functions>
@@ -383,5 +444,6 @@
 <layoutdefaults spacing="4" margin="4"/>
 <includehints>
     <includehint>qsamplerdeviceparamtable.h</includehint>
+    <includehint>qsamplerdeviceparamtable.h</includehint>
 </includehints>
 </UI>