--- qsampler/trunk/src/qsamplerMainForm.ui	2004/06/26 14:27:25	149
+++ qsampler/trunk/src/qsamplerMainForm.ui	2005/02/21 15:02:58	400
@@ -2,7 +2,7 @@
 <class>qsamplerMainForm</class>
 <comment>qsampler - A LinuxSampler Qt GUI Interface.
 
-   Copyright (C) 2004, rncbc aka Rui Nuno Capela. All rights reserved.
+   Copyright (C) 2004-2005, 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
@@ -63,6 +63,7 @@
         <action name="fileSaveAction"/>
         <action name="fileSaveAsAction"/>
         <separator/>
+        <action name="fileResetAction"/>
         <action name="fileRestartAction"/>
         <separator/>
         <action name="fileExitAction"/>
@@ -106,6 +107,7 @@
         <action name="fileOpenAction"/>
         <action name="fileSaveAction"/>
         <separator/>
+        <action name="fileResetAction"/>
         <action name="fileRestartAction"/>
     </toolbar>
     <toolbar dock="2">
@@ -220,6 +222,29 @@
     </action>
     <action>
         <property name="name">
+            <cstring>fileResetAction</cstring>
+        </property>
+        <property name="iconSet">
+            <iconset>fileReset.png</iconset>
+        </property>
+        <property name="text">
+            <string>Reset</string>
+        </property>
+        <property name="menuText">
+            <string>Rese&amp;t</string>
+        </property>
+        <property name="toolTip">
+            <string>Reset instance</string>
+        </property>
+        <property name="statusTip">
+            <string>Reset sampler instance</string>
+        </property>
+        <property name="accel">
+            <string>Ctrl+R</string>
+        </property>
+    </action>
+    <action>
+        <property name="name">
             <cstring>fileRestartAction</cstring>
         </property>
         <property name="iconSet">
@@ -238,7 +263,7 @@
             <string>Restart sampler instance</string>
         </property>
         <property name="accel">
-            <string>Ctrl+R</string>
+            <string>Shift+Ctrl+R</string>
         </property>
     </action>
     <action>
@@ -572,6 +597,12 @@
         <slot>fileSaveAs()</slot>
     </connection>
     <connection>
+        <sender>fileResetAction</sender>
+        <signal>activated()</signal>
+        <receiver>qsamplerMainForm</receiver>
+        <slot>fileReset()</slot>
+    </connection>
+    <connection>
         <sender>fileRestartAction</sender>
         <signal>activated()</signal>
         <receiver>qsamplerMainForm</receiver>
@@ -677,6 +708,7 @@
     <forward>class QProcess;</forward>
     <forward>class QLabel;</forward>
     <forward>class qsamplerOptions;</forward>
+    <forward>class qsamplerChannel;</forward>
     <forward>class qsamplerMessages;</forward>
     <forward>class qsamplerChannelStrip;</forward>
 </forwards>
@@ -694,12 +726,14 @@
     <variable access="private">int m_iTimerSlot;</variable>
     <variable access="private">QLabel *m_status[5];</variable>
     <variable access="private">QPopupMenu *m_pRecentFilesMenu;</variable>
+    <variable access="private">QPtrList&lt;qsamplerChannelStrip&gt; m_changedStrips;</variable>
 </variables>
 <slots>
     <slot specifier="non virtual">fileNew( void )</slot>
     <slot specifier="non virtual">fileOpen( void )</slot>
     <slot specifier="non virtual">fileSave( void )</slot>
     <slot specifier="non virtual">fileSaveAs( void )</slot>
+    <slot specifier="non virtual">fileReset( void )</slot>
     <slot specifier="non virtual">fileRestart( void )</slot>
     <slot specifier="non virtual">fileExit( void )</slot>
     <slot specifier="non virtual">fileOpenRecent( int iIndex )</slot>
@@ -717,7 +751,7 @@
     <slot specifier="non virtual">helpAboutQt( void )</slot>
     <slot specifier="non virtual">helpAbout( void )</slot>
     <slot specifier="non virtual">stabilizeForm( void )</slot>
-    <slot specifier="non virtual">channelChanged( qsamplerChannelStrip * )</slot>
+    <slot specifier="non virtual">channelStripChanged( qsamplerChannelStrip *pChannelStrip )</slot>
     <slot specifier="non virtual">channelsMenuAboutToShow()</slot>
     <slot specifier="non virtual">channelsMenuActivated( int iChannel )</slot>
     <slot specifier="non virtual">timerSlot( void )</slot>
@@ -730,6 +764,7 @@
     <function specifier="non virtual">setup( qsamplerOptions * pOptions )</function>
     <function access="private" specifier="non virtual" returnType="bool">queryClose( void )</function>
     <function access="private" specifier="non virtual">closeEvent( QCloseEvent * pCloseEvent )</function>
+    <function access="private" specifier="non virtual" returnType="bool">decodeDragFiles( const QMimeSource * pEvent, QStringList &amp; files )</function>
     <function access="private" specifier="non virtual">dragEnterEvent( QDragEnterEvent *pDragEnterEvent )</function>
     <function access="private" specifier="non virtual">dropEvent( QDropEvent *pDropEvent )</function>
     <function access="private" specifier="non virtual">customEvent( QCustomEvent *pCustomEvent )</function>
@@ -743,9 +778,12 @@
     <function access="private" specifier="non virtual" returnType="bool">closeSession( bool bForce )</function>
     <function access="private" specifier="non virtual" returnType="bool">loadSessionFile( const QString &amp; sFilename )</function>
     <function access="private" specifier="non virtual" returnType="bool">saveSessionFile( const QString &amp; sFilename )</function>
+    <function access="private" specifier="non virtual">updateSession()</function>
     <function access="private" specifier="non virtual">updateRecentFiles( const QString &amp; sFilename )</function>
     <function access="private" specifier="non virtual">updateRecentFilesMenu( void )</function>
+    <function access="private" specifier="non virtual">updateInstrumentNames( void )</function>
     <function access="private" specifier="non virtual">updateDisplayFont( void )</function>
+    <function access="private" specifier="non virtual">updateDisplayEffect( void )</function>
     <function access="private" specifier="non virtual">updateMaxVolume( void )</function>
     <function specifier="non virtual">appendMessages( const QString &amp; s )</function>
     <function specifier="non virtual">appendMessagesColor( const QString &amp; s, const QString &amp; c )</function>
@@ -755,9 +793,10 @@
     <function access="private" specifier="non virtual">updateMessagesFont( void )</function>
     <function access="private" specifier="non virtual">updateMessagesLimit( void )</function>
     <function access="private" specifier="non virtual">updateMessagesCapture( void )</function>
-    <function specifier="non virtual">createChannel( int iChannelID, bool bPrompt )</function>
-    <function specifier="non virtual" returnType="qsamplerChannelStrip *">activeChannel( void )</function>
-    <function specifier="non virtual" returnType="qsamplerChannelStrip *">channelAt( int iChannel )</function>
+    <function specifier="non virtual" returnType="qsamplerChannelStrip *">createChannelStrip( qsamplerChannel *pChannel )</function>
+    <function specifier="non virtual" returnType="qsamplerChannelStrip *">activeChannelStrip( void )</function>
+    <function specifier="non virtual" returnType="qsamplerChannelStrip *">channelStripAt( int iChannel )</function>
+    <function specifier="non virtual" returnType="qsamplerChannelStrip *">channelStrip( int iChannelID )</function>
     <function access="private" specifier="non virtual">startSchedule( int iStartDelay )</function>
     <function access="private" specifier="non virtual">stopSchedule( void )</function>
     <function access="private" specifier="non virtual">startServer( void )</function>