--- qsampler/trunk/src/qsamplerChannelStrip.ui	2007/11/23 09:32:06	1513
+++ qsampler/trunk/src/qsamplerChannelStrip.ui	2010/01/06 09:52:32	2036
@@ -2,8 +2,8 @@
  <author>rncbc aka Rui Nuno Capela</author>
  <comment>qsampler - A LinuxSampler Qt GUI Interface.
 
-   Copyright (C) 2004-2007, rncbc aka Rui Nuno Capela. All rights reserved.
-   Copyright (C) 2007, Christian Schoenebeck
+   Copyright (C) 2004-2010, rncbc aka Rui Nuno Capela. All rights reserved.
+   Copyright (C) 2007, 2008 Christian Schoenebeck
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License
@@ -26,14 +26,12 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>795</width>
-    <height>56</height>
+    <width>815</width>
+    <height>52</height>
    </rect>
   </property>
   <property name="sizePolicy" >
-   <sizepolicy>
-    <hsizetype>7</hsizetype>
-    <vsizetype>1</vsizetype>
+   <sizepolicy vsizetype="Minimum" hsizetype="Expanding" >
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -48,10 +46,10 @@
    <iconset resource="../icons/qsampler.qrc" >:/icons/qsamplerChannel.png</iconset>
   </property>
   <layout class="QHBoxLayout" >
-   <property name="margin" >
+   <property name="spacing" >
     <number>4</number>
    </property>
-   <property name="spacing" >
+   <property name="margin" >
     <number>4</number>
    </property>
    <item>
@@ -64,7 +62,7 @@
      </property>
      <property name="maximumSize" >
       <size>
-       <width>140</width>
+       <width>120</width>
        <height>32</height>
       </size>
      </property>
@@ -85,16 +83,14 @@
    <item>
     <widget class="QFrame" name="ChannelInfoFrame" >
      <property name="sizePolicy" >
-      <sizepolicy>
-       <hsizetype>5</hsizetype>
-       <vsizetype>5</vsizetype>
+      <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="minimumSize" >
       <size>
-       <width>200</width>
+       <width>180</width>
        <height>0</height>
       </size>
      </property>
@@ -114,21 +110,16 @@
       <enum>QFrame::Sunken</enum>
      </property>
      <layout class="QGridLayout" >
-      <property name="margin" >
-       <number>2</number>
-      </property>
       <property name="spacing" >
        <number>0</number>
       </property>
+      <property name="margin" >
+       <number>2</number>
+      </property>
       <item row="0" column="0" >
        <widget class="QLabel" name="EngineNameTextLabel" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>7</hsizetype>
-          <vsizetype>5</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
+        <property name="text" >
+         <string>--</string>
         </property>
        </widget>
       </item>
@@ -145,8 +136,14 @@
         </property>
        </widget>
       </item>
-      <item row="0" column="1" >
+      <item row="0" column="2" >
        <widget class="QLabel" name="MidiPortChannelTextLabel" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Preferred" hsizetype="Fixed" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
         <property name="minimumSize" >
          <size>
           <width>20</width>
@@ -167,7 +164,7 @@
         </property>
        </widget>
       </item>
-      <item row="1" column="1" >
+      <item row="1" column="2" >
        <widget class="QLabel" name="InstrumentStatusTextLabel" >
         <property name="minimumSize" >
          <size>
@@ -189,6 +186,49 @@
         </property>
        </widget>
       </item>
+      <item row="0" column="1" >
+       <widget class="QLabel" name="MidiActivityLabel" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Maximum" hsizetype="Maximum" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimumSize" >
+         <size>
+          <width>16</width>
+          <height>16</height>
+         </size>
+        </property>
+        <property name="maximumSize" >
+         <size>
+          <width>16</width>
+          <height>16</height>
+         </size>
+        </property>
+        <property name="baseSize" >
+         <size>
+          <width>16</width>
+          <height>16</height>
+         </size>
+        </property>
+        <property name="toolTip" >
+         <string>MIDI activity</string>
+        </property>
+        <property name="frameShape" >
+         <enum>QFrame::NoFrame</enum>
+        </property>
+        <property name="frameShadow" >
+         <enum>QFrame::Plain</enum>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignCenter</set>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
@@ -240,7 +280,7 @@
     <widget class="QSlider" name="VolumeSlider" >
      <property name="minimumSize" >
       <size>
-       <width>120</width>
+       <width>100</width>
        <height>0</height>
       </size>
      </property>
@@ -278,7 +318,7 @@
      <property name="maximumSize" >
       <size>
        <width>120</width>
-       <height>32</height>
+       <height>24</height>
       </size>
      </property>
      <property name="toolTip" >
@@ -293,6 +333,25 @@
     </widget>
    </item>
    <item>
+    <widget class="QPushButton" name="FxPushButton" >
+     <property name="maximumSize" >
+      <size>
+       <width>48</width>
+       <height>32</height>
+      </size>
+     </property>
+     <property name="toolTip" >
+      <string>Edit Channel's Effect Settings</string>
+     </property>
+     <property name="text" >
+      <string>&amp;FX</string>
+     </property>
+     <property name="shortcut" >
+      <string>Alt+F</string>
+     </property>
+    </widget>
+   </item>
+   <item>
     <widget class="QPushButton" name="ChannelEditPushButton" >
      <property name="maximumSize" >
       <size>
@@ -314,23 +373,21 @@
    <item>
     <widget class="QProgressBar" name="StreamUsageProgressBar" >
      <property name="sizePolicy" >
-      <sizepolicy>
-       <hsizetype>1</hsizetype>
-       <vsizetype>0</vsizetype>
+      <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="minimumSize" >
       <size>
-       <width>100</width>
+       <width>64</width>
        <height>0</height>
       </size>
      </property>
      <property name="maximumSize" >
       <size>
        <width>32767</width>
-       <height>32</height>
+       <height>24</height>
       </size>
      </property>
      <property name="toolTip" >
@@ -345,7 +402,7 @@
     <widget class="QLabel" name="StreamVoiceCountTextLabel" >
      <property name="minimumSize" >
       <size>
-       <width>60</width>
+       <width>48</width>
        <height>0</height>
       </size>
      </property>
@@ -392,4 +449,5 @@
  <resources>
   <include location="../icons/qsampler.qrc" />
  </resources>
+ <connections/>
 </ui>