--- qsampler/trunk/src/qsamplerChannelForm.ui	2004/05/30 15:38:06	95
+++ qsampler/trunk/src/qsamplerChannelForm.ui	2004/09/29 13:12:45	264
@@ -28,8 +28,8 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>424</width>
-            <height>268</height>
+            <width>430</width>
+            <height>255</height>
         </rect>
     </property>
     <property name="sizePolicy">
@@ -159,6 +159,12 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
+            <property name="minimumSize">
+                <size>
+                    <width>320</width>
+                    <height>0</height>
+                </size>
+            </property>
             <property name="editable">
                 <bool>true</bool>
             </property>
@@ -166,23 +172,6 @@
                 <string>Instrument filename</string>
             </property>
         </widget>
-        <spacer row="3" column="0" rowspan="2" colspan="1">
-            <property name="name">
-                <cstring>spacer1</cstring>
-            </property>
-            <property name="orientation">
-                <enum>Vertical</enum>
-            </property>
-            <property name="sizeType">
-                <enum>Expanding</enum>
-            </property>
-            <property name="sizeHint">
-                <size>
-                    <width>8</width>
-                    <height>8</height>
-                </size>
-            </property>
-        </spacer>
         <widget class="QLayoutWidget" row="5" column="0" rowspan="1" colspan="4">
             <property name="name">
                 <cstring>layout1</cstring>
@@ -289,7 +278,7 @@
                 </sizepolicy>
             </property>
             <property name="title">
-                <string>&amp;MIDI/Input</string>
+                <string>MIDI / Input</string>
             </property>
             <hbox>
                 <property name="name">
@@ -361,18 +350,97 @@
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="buddy" stdset="0">
-                        <cstring>MidiChannelSpinBox</cstring>
+                        <cstring>MidiChannelComboBox</cstring>
                     </property>
                 </widget>
-                <widget class="QSpinBox">
+                <widget class="QComboBox">
+                    <item>
+                        <property name="text">
+                            <string>All</string>
+                        </property>
+                    </item>
+                    <item>
+                        <property name="text">
+                            <string>1</string>
+                        </property>
+                    </item>
+                    <item>
+                        <property name="text">
+                            <string>2</string>
+                        </property>
+                    </item>
+                    <item>
+                        <property name="text">
+                            <string>3</string>
+                        </property>
+                    </item>
+                    <item>
+                        <property name="text">
+                            <string>4</string>
+                        </property>
+                    </item>
+                    <item>
+                        <property name="text">
+                            <string>5</string>
+                        </property>
+                    </item>
+                    <item>
+                        <property name="text">
+                            <string>6</string>
+                        </property>
+                    </item>
+                    <item>
+                        <property name="text">
+                            <string>7</string>
+                        </property>
+                    </item>
+                    <item>
+                        <property name="text">
+                            <string>8</string>
+                        </property>
+                    </item>
+                    <item>
+                        <property name="text">
+                            <string>9</string>
+                        </property>
+                    </item>
+                    <item>
+                        <property name="text">
+                            <string>10</string>
+                        </property>
+                    </item>
+                    <item>
+                        <property name="text">
+                            <string>11</string>
+                        </property>
+                    </item>
+                    <item>
+                        <property name="text">
+                            <string>12</string>
+                        </property>
+                    </item>
+                    <item>
+                        <property name="text">
+                            <string>13</string>
+                        </property>
+                    </item>
+                    <item>
+                        <property name="text">
+                            <string>14</string>
+                        </property>
+                    </item>
+                    <item>
+                        <property name="text">
+                            <string>15</string>
+                        </property>
+                    </item>
+                    <item>
+                        <property name="text">
+                            <string>16</string>
+                        </property>
+                    </item>
                     <property name="name">
-                        <cstring>MidiChannelSpinBox</cstring>
-                    </property>
-                    <property name="maxValue">
-                        <number>16</number>
-                    </property>
-                    <property name="minValue">
-                        <number>0</number>
+                        <cstring>MidiChannelComboBox</cstring>
                     </property>
                     <property name="toolTip" stdset="0">
                         <string>MIDI input channel</string>
@@ -410,7 +478,7 @@
                 </sizepolicy>
             </property>
             <property name="title">
-                <string>&amp;Audio/Output</string>
+                <string>Audio / Output</string>
             </property>
             <property name="alignment">
                 <set>AlignAuto</set>
@@ -516,8 +584,8 @@
         <slot>optionsChanged()</slot>
     </connection>
     <connection>
-        <sender>MidiChannelSpinBox</sender>
-        <signal>valueChanged(int)</signal>
+        <sender>MidiChannelComboBox</sender>
+        <signal>activated(int)</signal>
         <receiver>qsamplerChannelForm</receiver>
         <slot>optionsChanged()</slot>
     </connection>
@@ -547,19 +615,17 @@
     <tabstop>InstrumentNrSpinBox</tabstop>
     <tabstop>MidiDriverComboBox</tabstop>
     <tabstop>MidiPortSpinBox</tabstop>
-    <tabstop>MidiChannelSpinBox</tabstop>
+    <tabstop>MidiChannelComboBox</tabstop>
     <tabstop>AudioDriverComboBox</tabstop>
     <tabstop>OkPushButton</tabstop>
     <tabstop>CancelPushButton</tabstop>
 </tabstops>
 <includes>
+    <include location="local" impldecl="in declaration">qsamplerChannel.h</include>
     <include location="local" impldecl="in implementation">qsamplerChannelForm.ui.h</include>
 </includes>
-<forwards>
-    <forward>class qsamplerChannelStrip;</forward>
-</forwards>
 <variables>
-    <variable access="private">qsamplerChannelStrip *m_pChannel;</variable>
+    <variable access="private">qsamplerChannel *m_pChannel;</variable>
     <variable access="private">int m_iDirtySetup;</variable>
     <variable access="private">int m_iDirtyCount;</variable>
 </variables>
@@ -574,7 +640,7 @@
 <functions>
     <function access="private" specifier="non virtual">init()</function>
     <function access="private" specifier="non virtual">destroy()</function>
-    <function specifier="non virtual">setup( qsamplerChannelStrip *pChannel )</function>
+    <function specifier="non virtual">setup( qsamplerChannel *pChannel, bool bNew )</function>
 </functions>
 <pixmapinproject/>
 <layoutdefaults spacing="8" margin="8"/>