--- qsampler/trunk/src/qsamplerChannelStrip.ui	2007/11/01 17:14:21	1464
+++ qsampler/trunk/src/qsamplerChannelStrip.ui	2007/11/23 09:32:06	1513
@@ -45,7 +45,7 @@
    <string>Qsampler: Channel</string>
   </property>
   <property name="windowIcon" >
-   <iconset/>
+   <iconset resource="../icons/qsampler.qrc" >:/icons/qsamplerChannel.png</iconset>
   </property>
   <layout class="QHBoxLayout" >
    <property name="margin" >
@@ -56,6 +56,18 @@
    </property>
    <item>
     <widget class="QPushButton" name="ChannelSetupPushButton" >
+     <property name="minimumSize" >
+      <size>
+       <width>100</width>
+       <height>0</height>
+      </size>
+     </property>
+     <property name="maximumSize" >
+      <size>
+       <width>140</width>
+       <height>32</height>
+      </size>
+     </property>
      <property name="toolTip" >
       <string>Channel setup</string>
      </property>
@@ -68,9 +80,6 @@
      <property name="shortcut" >
       <string>Alt+C</string>
      </property>
-     <property name="flat" >
-      <bool>true</bool>
-     </property>
     </widget>
    </item>
    <item>
@@ -95,72 +104,11 @@
        <height>64</height>
       </size>
      </property>
-     <property name="palette" >
-      <palette>
-       <active>
-        <colorrole role="Base" >
-         <brush brushstyle="SolidPattern" >
-          <color alpha="255" >
-           <red>255</red>
-           <green>255</green>
-           <blue>255</blue>
-          </color>
-         </brush>
-        </colorrole>
-        <colorrole role="Window" >
-         <brush brushstyle="SolidPattern" >
-          <color alpha="255" >
-           <red>0</red>
-           <green>0</green>
-           <blue>0</blue>
-          </color>
-         </brush>
-        </colorrole>
-       </active>
-       <inactive>
-        <colorrole role="Base" >
-         <brush brushstyle="SolidPattern" >
-          <color alpha="255" >
-           <red>255</red>
-           <green>255</green>
-           <blue>255</blue>
-          </color>
-         </brush>
-        </colorrole>
-        <colorrole role="Window" >
-         <brush brushstyle="SolidPattern" >
-          <color alpha="255" >
-           <red>0</red>
-           <green>0</green>
-           <blue>0</blue>
-          </color>
-         </brush>
-        </colorrole>
-       </inactive>
-       <disabled>
-        <colorrole role="Base" >
-         <brush brushstyle="SolidPattern" >
-          <color alpha="255" >
-           <red>0</red>
-           <green>0</green>
-           <blue>0</blue>
-          </color>
-         </brush>
-        </colorrole>
-        <colorrole role="Window" >
-         <brush brushstyle="SolidPattern" >
-          <color alpha="255" >
-           <red>0</red>
-           <green>0</green>
-           <blue>0</blue>
-          </color>
-         </brush>
-        </colorrole>
-       </disabled>
-      </palette>
+     <property name="autoFillBackground" >
+      <bool>true</bool>
      </property>
      <property name="frameShape" >
-      <enum>QFrame::Panel</enum>
+      <enum>QFrame::StyledPanel</enum>
      </property>
      <property name="frameShadow" >
       <enum>QFrame::Sunken</enum>
@@ -182,96 +130,10 @@
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
-        <property name="palette" >
-         <palette>
-          <active>
-           <colorrole role="WindowText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
-              <red>255</red>
-              <green>255</green>
-              <blue>0</blue>
-             </color>
-            </brush>
-           </colorrole>
-          </active>
-          <inactive>
-           <colorrole role="WindowText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
-              <red>255</red>
-              <green>255</green>
-              <blue>0</blue>
-             </color>
-            </brush>
-           </colorrole>
-          </inactive>
-          <disabled>
-           <colorrole role="WindowText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
-              <red>119</red>
-              <green>119</green>
-              <blue>119</blue>
-             </color>
-            </brush>
-           </colorrole>
-          </disabled>
-         </palette>
-        </property>
-        <property name="toolTip" >
-         <string>Engine name</string>
-        </property>
-        <property name="text" >
-         <string>--</string>
-        </property>
-        <property name="alignment" >
-         <set>Qt::AlignTop</set>
-        </property>
-        <property name="wordWrap" >
-         <bool>false</bool>
-        </property>
        </widget>
       </item>
       <item row="1" column="0" >
        <widget class="QLabel" name="InstrumentNameTextLabel" >
-        <property name="palette" >
-         <palette>
-          <active>
-           <colorrole role="WindowText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
-              <red>85</red>
-              <green>255</green>
-              <blue>0</blue>
-             </color>
-            </brush>
-           </colorrole>
-          </active>
-          <inactive>
-           <colorrole role="WindowText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
-              <red>85</red>
-              <green>255</green>
-              <blue>0</blue>
-             </color>
-            </brush>
-           </colorrole>
-          </inactive>
-          <disabled>
-           <colorrole role="WindowText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
-              <red>119</red>
-              <green>119</green>
-              <blue>119</blue>
-             </color>
-            </brush>
-           </colorrole>
-          </disabled>
-         </palette>
-        </property>
         <property name="toolTip" >
          <string>Instrument name</string>
         </property>
@@ -291,43 +153,6 @@
           <height>0</height>
          </size>
         </property>
-        <property name="palette" >
-         <palette>
-          <active>
-           <colorrole role="WindowText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
-              <red>255</red>
-              <green>255</green>
-              <blue>0</blue>
-             </color>
-            </brush>
-           </colorrole>
-          </active>
-          <inactive>
-           <colorrole role="WindowText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
-              <red>255</red>
-              <green>255</green>
-              <blue>0</blue>
-             </color>
-            </brush>
-           </colorrole>
-          </inactive>
-          <disabled>
-           <colorrole role="WindowText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
-              <red>119</red>
-              <green>119</green>
-              <blue>119</blue>
-             </color>
-            </brush>
-           </colorrole>
-          </disabled>
-         </palette>
-        </property>
         <property name="toolTip" >
          <string>MIDI port / channel</string>
         </property>
@@ -350,43 +175,6 @@
           <height>0</height>
          </size>
         </property>
-        <property name="palette" >
-         <palette>
-          <active>
-           <colorrole role="WindowText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
-              <red>85</red>
-              <green>255</green>
-              <blue>0</blue>
-             </color>
-            </brush>
-           </colorrole>
-          </active>
-          <inactive>
-           <colorrole role="WindowText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
-              <red>85</red>
-              <green>255</green>
-              <blue>0</blue>
-             </color>
-            </brush>
-           </colorrole>
-          </inactive>
-          <disabled>
-           <colorrole role="WindowText" >
-            <brush brushstyle="SolidPattern" >
-             <color alpha="255" >
-              <red>119</red>
-              <green>119</green>
-              <blue>119</blue>
-             </color>
-            </brush>
-           </colorrole>
-          </disabled>
-         </palette>
-        </property>
         <property name="toolTip" >
          <string>Instrument load status</string>
         </property>
@@ -409,7 +197,7 @@
      <property name="maximumSize" >
       <size>
        <width>48</width>
-       <height>64</height>
+       <height>32</height>
       </size>
      </property>
      <property name="toolTip" >
@@ -431,7 +219,7 @@
      <property name="maximumSize" >
       <size>
        <width>48</width>
-       <height>64</height>
+       <height>32</height>
       </size>
      </property>
      <property name="toolTip" >
@@ -456,6 +244,12 @@
        <height>0</height>
       </size>
      </property>
+     <property name="maximumSize" >
+      <size>
+       <width>32767</width>
+       <height>32</height>
+      </size>
+     </property>
      <property name="toolTip" >
       <string>Channel volume</string>
      </property>
@@ -477,14 +271,14 @@
     <widget class="QSpinBox" name="VolumeSpinBox" >
      <property name="minimumSize" >
       <size>
-       <width>40</width>
+       <width>60</width>
        <height>0</height>
       </size>
      </property>
      <property name="maximumSize" >
       <size>
-       <width>60</width>
-       <height>32767</height>
+       <width>120</width>
+       <height>32</height>
       </size>
      </property>
      <property name="toolTip" >
@@ -503,11 +297,11 @@
      <property name="maximumSize" >
       <size>
        <width>48</width>
-       <height>64</height>
+       <height>32</height>
       </size>
      </property>
      <property name="toolTip" >
-      <string>Edit channel</string>
+      <string>Edit channel's instrument</string>
      </property>
      <property name="text" >
       <string>&amp;Edit</string>
@@ -536,7 +330,7 @@
      <property name="maximumSize" >
       <size>
        <width>32767</width>
-       <height>22</height>
+       <height>32</height>
       </size>
      </property>
      <property name="toolTip" >
@@ -558,105 +352,17 @@
      <property name="maximumSize" >
       <size>
        <width>32767</width>
-       <height>22</height>
+       <height>32</height>
       </size>
      </property>
-     <property name="palette" >
-      <palette>
-       <active>
-        <colorrole role="WindowText" >
-         <brush brushstyle="SolidPattern" >
-          <color alpha="255" >
-           <red>85</red>
-           <green>255</green>
-           <blue>0</blue>
-          </color>
-         </brush>
-        </colorrole>
-        <colorrole role="Base" >
-         <brush brushstyle="SolidPattern" >
-          <color alpha="255" >
-           <red>255</red>
-           <green>255</green>
-           <blue>255</blue>
-          </color>
-         </brush>
-        </colorrole>
-        <colorrole role="Window" >
-         <brush brushstyle="SolidPattern" >
-          <color alpha="255" >
-           <red>0</red>
-           <green>0</green>
-           <blue>0</blue>
-          </color>
-         </brush>
-        </colorrole>
-       </active>
-       <inactive>
-        <colorrole role="WindowText" >
-         <brush brushstyle="SolidPattern" >
-          <color alpha="255" >
-           <red>85</red>
-           <green>255</green>
-           <blue>0</blue>
-          </color>
-         </brush>
-        </colorrole>
-        <colorrole role="Base" >
-         <brush brushstyle="SolidPattern" >
-          <color alpha="255" >
-           <red>255</red>
-           <green>255</green>
-           <blue>255</blue>
-          </color>
-         </brush>
-        </colorrole>
-        <colorrole role="Window" >
-         <brush brushstyle="SolidPattern" >
-          <color alpha="255" >
-           <red>0</red>
-           <green>0</green>
-           <blue>0</blue>
-          </color>
-         </brush>
-        </colorrole>
-       </inactive>
-       <disabled>
-        <colorrole role="WindowText" >
-         <brush brushstyle="SolidPattern" >
-          <color alpha="255" >
-           <red>119</red>
-           <green>119</green>
-           <blue>119</blue>
-          </color>
-         </brush>
-        </colorrole>
-        <colorrole role="Base" >
-         <brush brushstyle="SolidPattern" >
-          <color alpha="255" >
-           <red>0</red>
-           <green>0</green>
-           <blue>0</blue>
-          </color>
-         </brush>
-        </colorrole>
-        <colorrole role="Window" >
-         <brush brushstyle="SolidPattern" >
-          <color alpha="255" >
-           <red>0</red>
-           <green>0</green>
-           <blue>0</blue>
-          </color>
-         </brush>
-        </colorrole>
-       </disabled>
-      </palette>
-     </property>
      <property name="toolTip" >
       <string>Stream / Voice count</string>
      </property>
+     <property name="autoFillBackground" >
+      <bool>true</bool>
+     </property>
      <property name="frameShape" >
-      <enum>QFrame::Panel</enum>
+      <enum>QFrame::StyledPanel</enum>
      </property>
      <property name="frameShadow" >
       <enum>QFrame::Sunken</enum>
@@ -675,116 +381,15 @@
   </layout>
  </widget>
  <layoutdefault spacing="0" margin="0" />
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>ChannelSetupPushButton</tabstop>
   <tabstop>ChannelMutePushButton</tabstop>
   <tabstop>ChannelSoloPushButton</tabstop>
   <tabstop>VolumeSlider</tabstop>
   <tabstop>VolumeSpinBox</tabstop>
+  <tabstop>ChannelEditPushButton</tabstop>
  </tabstops>
- <includes>
-  <include location="local" >qsamplerChannel.h</include>
- </includes>
  <resources>
   <include location="../icons/qsampler.qrc" />
  </resources>
- <connections>
-  <connection>
-   <sender>ChannelSetupPushButton</sender>
-   <signal>clicked()</signal>
-   <receiver>qsamplerChannelStrip</receiver>
-   <slot>channelSetup()</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>ChannelMutePushButton</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>qsamplerChannelStrip</receiver>
-   <slot>channelMute(bool)</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>ChannelSoloPushButton</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>qsamplerChannelStrip</receiver>
-   <slot>channelSolo(bool)</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>VolumeSlider</sender>
-   <signal>valueChanged(int)</signal>
-   <receiver>qsamplerChannelStrip</receiver>
-   <slot>volumeChanged(int)</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>VolumeSpinBox</sender>
-   <signal>valueChanged(int)</signal>
-   <receiver>qsamplerChannelStrip</receiver>
-   <slot>volumeChanged(int)</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>ChannelEditPushButton</sender>
-   <signal>clicked()</signal>
-   <receiver>qsamplerChannelStrip</receiver>
-   <slot>channelEdit()</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>