--- qsampler/trunk/src/qsamplerChannelStrip.ui	2004/10/06 15:42:59	267
+++ qsampler/trunk/src/qsamplerChannelStrip.ui	2007/10/01 22:03:35	1367
@@ -2,7 +2,7 @@
 <class>qsamplerChannelStrip</class>
 <comment>qsampler - A LinuxSampler Qt GUI Interface.
 
-   Copyright (C) 2004, rncbc aka Rui Nuno Capela. All rights reserved.
+   Copyright (C) 2004-2007, 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>694</width>
-            <height>47</height>
+            <width>795</width>
+            <height>56</height>
         </rect>
     </property>
     <property name="sizePolicy">
@@ -41,7 +41,7 @@
         </sizepolicy>
     </property>
     <property name="caption">
-        <string>Channel</string>
+        <string>Qsampler: Channel</string>
     </property>
     <property name="icon">
         <pixmap>qsamplerChannel.png</pixmap>
@@ -182,7 +182,7 @@
                         <string>--</string>
                     </property>
                     <property name="toolTip" stdset="0">
-                        <string>Instrument file [index]</string>
+                        <string>Instrument name</string>
                     </property>
                 </widget>
                 <widget class="QLabel" row="0" column="1">
@@ -209,13 +209,13 @@
                         <enum>ParentOrigin</enum>
                     </property>
                     <property name="text">
-                        <string>--/--</string>
+                        <string>-- / --</string>
                     </property>
                     <property name="alignment">
                         <set>AlignTop|AlignHCenter</set>
                     </property>
                     <property name="toolTip" stdset="0">
-                        <string>MIDI Port/Channel</string>
+                        <string>MIDI port / channel</string>
                     </property>
                 </widget>
                 <widget class="QLabel" row="1" column="1">
@@ -248,18 +248,64 @@
                         <set>AlignCenter</set>
                     </property>
                     <property name="toolTip" stdset="0">
-                        <string>IInstrument load status</string>
+                        <string>Instrument load status</string>
                     </property>
                 </widget>
             </grid>
         </widget>
+        <widget class="QPushButton">
+            <property name="name">
+                <cstring>ChannelMutePushButton</cstring>
+            </property>
+            <property name="maximumSize">
+                <size>
+                    <width>48</width>
+                    <height>64</height>
+                </size>
+            </property>
+            <property name="text">
+                <string>&amp;Mute</string>
+            </property>
+            <property name="accel">
+                <string>Alt+M</string>
+            </property>
+            <property name="toggleButton">
+                <bool>true</bool>
+            </property>
+            <property name="toolTip" stdset="0">
+                <string>Channel mute</string>
+            </property>
+        </widget>
+        <widget class="QPushButton">
+            <property name="name">
+                <cstring>ChannelSoloPushButton</cstring>
+            </property>
+            <property name="maximumSize">
+                <size>
+                    <width>48</width>
+                    <height>64</height>
+                </size>
+            </property>
+            <property name="text">
+                <string>&amp;Solo</string>
+            </property>
+            <property name="accel">
+                <string>Alt+S</string>
+            </property>
+            <property name="toggleButton">
+                <bool>true</bool>
+            </property>
+            <property name="toolTip" stdset="0">
+                <string>Channel solo</string>
+            </property>
+        </widget>
         <widget class="QSlider">
             <property name="name">
                 <cstring>VolumeSlider</cstring>
             </property>
             <property name="minimumSize">
                 <size>
-                    <width>180</width>
+                    <width>120</width>
                     <height>0</height>
                 </size>
             </property>
@@ -305,6 +351,23 @@
                 <string>Channel volume</string>
             </property>
         </widget>
+        <widget class="QPushButton">
+            <property name="name">
+                <cstring>ChannelEditPushButton</cstring>
+            </property>
+            <property name="maximumSize">
+                <size>
+                    <width>48</width>
+                    <height>64</height>
+                </size>
+            </property>
+            <property name="text">
+                <string>&amp;Edit</string>
+            </property>
+            <property name="accel">
+                <string>Alt+E</string>
+            </property>
+        </widget>
         <widget class="QProgressBar">
             <property name="name">
                 <cstring>StreamUsageProgressBar</cstring>
@@ -392,6 +455,18 @@
         <slot>channelSetup()</slot>
     </connection>
     <connection>
+        <sender>ChannelMutePushButton</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>qsamplerChannelStrip</receiver>
+        <slot>channelMute(bool)</slot>
+    </connection>
+    <connection>
+        <sender>ChannelSoloPushButton</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>qsamplerChannelStrip</receiver>
+        <slot>channelSolo(bool)</slot>
+    </connection>
+    <connection>
         <sender>VolumeSlider</sender>
         <signal>valueChanged(int)</signal>
         <receiver>qsamplerChannelStrip</receiver>
@@ -403,9 +478,17 @@
         <receiver>qsamplerChannelStrip</receiver>
         <slot>volumeChanged(int)</slot>
     </connection>
+    <connection>
+        <sender>ChannelEditPushButton</sender>
+        <signal>clicked()</signal>
+        <receiver>qsamplerChannelStrip</receiver>
+        <slot>channelEdit()</slot>
+    </connection>
 </connections>
 <tabstops>
     <tabstop>ChannelSetupPushButton</tabstop>
+    <tabstop>ChannelMutePushButton</tabstop>
+    <tabstop>ChannelSoloPushButton</tabstop>
     <tabstop>VolumeSlider</tabstop>
     <tabstop>VolumeSpinBox</tabstop>
 </tabstops>
@@ -414,32 +497,40 @@
     <include location="local" impldecl="in implementation">qsamplerChannelStrip.ui.h</include>
 </includes>
 <variables>
-    <variable access="private">qsamplerMainForm *m_pMainForm;</variable>
     <variable access="private">qsamplerChannel *m_pChannel;</variable>
     <variable access="private">int m_iDirtyChange;</variable>
+    <variable access="private">int m_iErrorCount;</variable>
 </variables>
 <signals>
     <signal>channelChanged( qsamplerChannelStrip * )</signal>
 </signals>
 <slots>
-    <slot specifier="non virtual">volumeChanged(int)</slot>
-    <slot specifier="non virtual">channelSetup()</slot>
+    <slot specifier="non virtual" returnType="bool">channelSetup()</slot>
+    <slot specifier="non virtual" returnType="bool">channelMute( bool bMute )</slot>
+    <slot specifier="non virtual" returnType="bool">channelSolo( bool bSolo )</slot>
+    <slot>channelEdit()</slot>
+    <slot specifier="non virtual" returnType="bool">channelReset()</slot>
+    <slot specifier="non virtual">volumeChanged( int iVolume )</slot>
 </slots>
 <functions>
     <function access="private" specifier="non virtual">init()</function>
     <function access="private" specifier="non virtual">destroy()</function>
-    <function specifier="non virtual">setup( qsamplerMainForm *pMainForm, int iChannelID )</function>
-    <function specifier="non virtual" returnType="qsamplerChannel *">channel ( void )</function>
-    <function specifier="non virtual" returnType="QFont">displayFont( void )</function>
+    <function access="private" specifier="non virtual" returnType="bool">decodeDragFile( const QMimeSource * pEvent, QString &amp; sInstrumentFile )</function>
+    <function access="private" specifier="non virtual">dragEnterEvent( QDragEnterEvent * pDragEnterEvent )</function>
+    <function access="private" specifier="non virtual">dropEvent( QDropEvent * pDropEvent )</function>
+    <function specifier="non virtual">setup( qsamplerChannel * pChannel )</function>
+    <function specifier="non virtual" returnType="qsamplerChannel *">channel()</function>
+    <function specifier="non virtual" returnType="QFont">displayFont()</function>
     <function specifier="non virtual">setDisplayFont( const QFont &amp; font )</function>
     <function specifier="non virtual">setDisplayEffect( bool bDisplayEffect )</function>
     <function specifier="non virtual">setDisplayBackground( const QPixmap &amp; pm )</function>
-    <function specifier="non virtual">updateChannelInfo( void )</function>
-    <function specifier="non virtual">updateChannelVolume( void )</function>
-    <function specifier="non virtual">updateChannelUsage( void )</function>
-    <function specifier="non virtual">contextMenuEvent( QContextMenuEvent *pEvent )</function>
     <function specifier="non virtual">setMaxVolume( int iMaxVolume )</function>
-    <function specifier="non virtual">showChannelSetup( bool bNew )</function>
+    <function specifier="non virtual" returnType="bool">updateInstrumentName( bool bForce )</function>
+    <function specifier="non virtual" returnType="bool">updateChannelVolume()</function>
+    <function specifier="non virtual" returnType="bool">updateChannelInfo()</function>
+    <function specifier="non virtual" returnType="bool">updateChannelUsage()</function>
+    <function access="private" specifier="non virtual">contextMenuEvent( QContextMenuEvent * pEvent )</function>
+    <function specifier="non virtual">resetErrorCount()</function>
 </functions>
 <pixmapinproject/>
 <layoutdefaults spacing="0" margin="0"/>