--- qsampler/trunk/src/qsamplerDeviceForm.ui	2005/03/16 09:49:37	468
+++ qsampler/trunk/src/qsamplerDeviceForm.ui	2006/12/03 18:26:13	961
@@ -2,7 +2,7 @@
 <class>qsamplerDeviceForm</class>
 <comment>qsampler - A LinuxSampler Qt GUI Interface.
 
-   Copyright (C) 2005, rncbc aka Rui Nuno Capela. All rights reserved.
+   Copyright (C) 2004-2006, rncbc aka Rui Nuno Capela. All rights reserved.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License
@@ -14,9 +14,9 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   You should have received a copy of the GNU General Public License along
+   with this program; if not, write to the Free Software Foundation, Inc.,
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 </comment>
 <author>rncbc aka Rui Nuno Capela</author>
@@ -28,8 +28,8 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>556</width>
-            <height>345</height>
+            <width>570</width>
+            <height>361</height>
         </rect>
     </property>
     <property name="sizePolicy">
@@ -41,7 +41,7 @@
         </sizepolicy>
     </property>
     <property name="caption">
-        <string>Devices</string>
+        <string>Qsampler: Devices</string>
     </property>
     <property name="icon">
         <pixmap>qsamplerDevice.png</pixmap>
@@ -100,7 +100,7 @@
                 </property>
                 <widget class="QLayoutWidget">
                     <property name="name">
-                        <cstring>layout4</cstring>
+                        <cstring>layout2</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -181,21 +181,13 @@
                 </widget>
                 <widget class="QLayoutWidget">
                     <property name="name">
-                        <cstring>layout5</cstring>
+                        <cstring>layout3</cstring>
                     </property>
-                    <vbox>
+                    <grid>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <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">
+                        <widget class="qsamplerDeviceParamTable" row="1" column="0" rowspan="1" colspan="2">
                             <property name="name">
                                 <cstring>DevicePortParamTable</cstring>
                             </property>
@@ -220,13 +212,43 @@
                                 <string>Device port/channel parameters</string>
                             </property>
                         </widget>
-                    </vbox>
+                        <widget class="QLabel" row="0" column="0">
+                            <property name="name">
+                                <cstring>DevicePortTextLabel</cstring>
+                            </property>
+                            <property name="text">
+                                <string>Channel:</string>
+                            </property>
+                            <property name="alignment">
+                                <set>AlignVCenter|AlignRight</set>
+                            </property>
+                            <property name="buddy" stdset="0">
+                                <cstring>DevicePortComboBox</cstring>
+                            </property>
+                        </widget>
+                        <widget class="QComboBox" row="0" column="1">
+                            <property name="name">
+                                <cstring>DevicePortComboBox</cstring>
+                            </property>
+                            <property name="sizePolicy">
+                                <sizepolicy>
+                                    <hsizetype>7</hsizetype>
+                                    <vsizetype>0</vsizetype>
+                                    <horstretch>0</horstretch>
+                                    <verstretch>0</verstretch>
+                                </sizepolicy>
+                            </property>
+                            <property name="toolTip" stdset="0">
+                                <string>Device port/channel</string>
+                            </property>
+                        </widget>
+                    </grid>
                 </widget>
             </widget>
         </widget>
         <widget class="QLayoutWidget">
             <property name="name">
-                <cstring>layout6</cstring>
+                <cstring>layout1</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -246,7 +268,7 @@
                         <iconset>formRefresh.png</iconset>
                     </property>
                     <property name="toolTip" stdset="0">
-                        <string>refresh device list view</string>
+                        <string>Refresh device list view</string>
                     </property>
                 </widget>
                 <spacer>
@@ -280,7 +302,7 @@
                         <iconset>deviceCreate.png</iconset>
                     </property>
                     <property name="toolTip" stdset="0">
-                        <string>Create current device</string>
+                        <string>Create device</string>
                     </property>
                 </widget>
                 <widget class="QPushButton">
@@ -297,7 +319,7 @@
                         <iconset>deviceDelete.png</iconset>
                     </property>
                     <property name="toolTip" stdset="0">
-                        <string>Delete current device</string>
+                        <string>Delete device</string>
                     </property>
                 </widget>
                 <widget class="QPushButton">
@@ -336,14 +358,8 @@
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
         </sizepolicy>
-        <pixmap>image0</pixmap>
     </customwidget>
 </customwidgets>
-<images>
-    <image name="image0">
-        <data format="XPM.GZ" length="45">789cd3d7528808f055d0d2e72a2e492cc94c5648ce482c52d04a29cdcdad8c8eb5ade6523250004143a55a6b2e0026630c4f</data>
-    </image>
-</images>
 <connections>
     <connection>
         <sender>DeviceListView</sender>
@@ -414,13 +430,18 @@
 </forwards>
 <variables>
     <variable access="private">qsamplerMainForm *m_pMainForm;</variable>
-    <variable access="private">int m_iDirtySetup;</variable>
     <variable access="private">lscp_client_t *m_pClient;</variable>
+    <variable access="private">int m_iDirtySetup;</variable>
+    <variable access="private">int m_iDirtyCount;</variable>
     <variable access="private">bool m_bNewDevice;</variable>
     <variable access="private">qsamplerDevice::qsamplerDeviceType m_deviceType;</variable>
+    <variable access="private">qsamplerDevice::qsamplerDeviceType m_deviceTypeMode;</variable>
     <variable access="private">qsamplerDeviceItem *m_pAudioItems;</variable>
     <variable access="private">qsamplerDeviceItem *m_pMidiItems;</variable>
 </variables>
+<signals>
+    <signal>devicesChanged()</signal>
+</signals>
 <slots>
     <slot specifier="non virtual">createDevice()</slot>
     <slot specifier="non virtual">deleteDevice()</slot>
@@ -438,12 +459,10 @@
     <function access="private" specifier="non virtual">destroy()</function>
     <function access="private" specifier="non virtual">showEvent( QShowEvent * pShowEvent )</function>
     <function access="private" specifier="non virtual">hideEvent( QHideEvent * pHideEvent )</function>
-    <function specifier="non virtual">setClient( lscp_client_t *pClient )</function>
+    <function specifier="non virtual">setDeviceTypeMode( qsamplerDevice::qsamplerDeviceType deviceType )</function>
+    <function specifier="non virtual">setDriverName( const QString &amp; sDriverName )</function>
+    <function specifier="non virtual">setDevice( qsamplerDevice *pDevice )</function>
 </functions>
 <pixmapinproject/>
 <layoutdefaults spacing="4" margin="4"/>
-<includehints>
-    <includehint>qsamplerdeviceparamtable.h</includehint>
-    <includehint>qsamplerdeviceparamtable.h</includehint>
-</includehints>
 </UI>