--- qsampler/trunk/src/qsamplerMainForm.ui	2005/02/11 15:36:06	371
+++ qsampler/trunk/src/qsamplerMainForm.ui	2005/03/07 17:05:55	428
@@ -1,4 +1,4 @@
-<!DOCTYPE UI><UI version="3.1" stdsetdef="1">
+<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>qsamplerMainForm</class>
 <comment>qsampler - A LinuxSampler Qt GUI Interface.
 
@@ -29,7 +29,7 @@
             <x>0</x>
             <y>0</y>
             <width>472</width>
-            <height>293</height>
+            <height>296</height>
         </rect>
     </property>
     <property name="minimumSize">
@@ -75,6 +75,7 @@
         <action name="editSetupChannelAction"/>
         <separator/>
         <action name="editResetChannelAction"/>
+        <action name="editResetAllChannelsAction"/>
     </item>
     <item text="&amp;View" name="viewMenu">
         <action name="viewMenubarAction"/>
@@ -82,6 +83,7 @@
         <action name="viewStatusbarAction"/>
         <separator/>
         <action name="viewMessagesAction"/>
+        <action name="viewDevicesAction"/>
         <separator/>
         <action name="viewOptionsAction"/>
     </item>
@@ -121,7 +123,9 @@
         <action name="editRemoveChannelAction"/>
         <separator/>
         <action name="editSetupChannelAction"/>
+        <separator/>
         <action name="editResetChannelAction"/>
+        <action name="editResetAllChannelsAction"/>
     </toolbar>
     <toolbar dock="2">
         <property name="name">
@@ -263,7 +267,7 @@
             <string>Restart sampler instance</string>
         </property>
         <property name="accel">
-            <string>Shift+Ctrl+R</string>
+            <string>Ctrl+Shift+R</string>
         </property>
     </action>
     <action>
@@ -331,45 +335,45 @@
     </action>
     <action>
         <property name="name">
-            <cstring>editSetupChannelAction</cstring>
+            <cstring>editResetChannelAction</cstring>
         </property>
         <property name="iconSet">
-            <iconset>editSetupChannel.png</iconset>
+            <iconset>editResetChannel.png</iconset>
         </property>
         <property name="text">
-            <string>Setup</string>
+            <string>Reset</string>
         </property>
         <property name="menuText">
-            <string>&amp;Setup Channel...</string>
+            <string>Re&amp;set Channel</string>
         </property>
         <property name="toolTip">
-            <string>Setup channel</string>
+            <string>Reset channel</string>
         </property>
         <property name="statusTip">
-            <string>Setup current sampler channel</string>
+            <string>Reset current sampler channel</string>
         </property>
         <property name="accel">
-            <string>F2</string>
+            <string></string>
         </property>
     </action>
     <action>
         <property name="name">
-            <cstring>editResetChannelAction</cstring>
+            <cstring>editResetAllChannelsAction</cstring>
         </property>
         <property name="iconSet">
-            <iconset>editResetChannel.png</iconset>
+            <iconset>editResetAllChannels.png</iconset>
         </property>
         <property name="text">
-            <string>Reset</string>
+            <string>Reset All</string>
         </property>
         <property name="menuText">
-            <string>Re&amp;set Channel</string>
+            <string>R&amp;eset All Channels</string>
         </property>
         <property name="toolTip">
-            <string>Reset channel</string>
+            <string>Reset all channels</string>
         </property>
         <property name="statusTip">
-            <string>Reset current sampler channel</string>
+            <string>Reset all sampler channels</string>
         </property>
         <property name="accel">
             <string></string>
@@ -377,6 +381,29 @@
     </action>
     <action>
         <property name="name">
+            <cstring>editSetupChannelAction</cstring>
+        </property>
+        <property name="iconSet">
+            <iconset>editSetupChannel.png</iconset>
+        </property>
+        <property name="text">
+            <string>Setup</string>
+        </property>
+        <property name="menuText">
+            <string>&amp;Setup Channel...</string>
+        </property>
+        <property name="toolTip">
+            <string>Setup channel</string>
+        </property>
+        <property name="statusTip">
+            <string>Setup current sampler channel</string>
+        </property>
+        <property name="accel">
+            <string>F2</string>
+        </property>
+    </action>
+    <action>
+        <property name="name">
             <cstring>viewMenubarAction</cstring>
         </property>
         <property name="toggleAction">
@@ -469,6 +496,26 @@
     </action>
     <action>
         <property name="name">
+            <cstring>viewDevicesAction</cstring>
+        </property>
+        <property name="toggleAction">
+            <bool>true</bool>
+        </property>
+        <property name="text">
+            <string>Devices</string>
+        </property>
+        <property name="menuText">
+            <string>&amp;Devices</string>
+        </property>
+        <property name="toolTip">
+            <string>Device configuration</string>
+        </property>
+        <property name="statusTip">
+            <string>Show/hide the device configuration window</string>
+        </property>
+    </action>
+    <action>
+        <property name="name">
             <cstring>viewOptionsAction</cstring>
         </property>
         <property name="text">
@@ -639,6 +686,12 @@
         <slot>editResetChannel()</slot>
     </connection>
     <connection>
+        <sender>editResetAllChannelsAction</sender>
+        <signal>activated()</signal>
+        <receiver>qsamplerMainForm</receiver>
+        <slot>editResetAllChannels()</slot>
+    </connection>
+    <connection>
         <sender>viewMenubarAction</sender>
         <signal>toggled(bool)</signal>
         <receiver>qsamplerMainForm</receiver>
@@ -663,6 +716,12 @@
         <slot>viewMessages(bool)</slot>
     </connection>
     <connection>
+        <sender>viewDevicesAction</sender>
+        <signal>activated()</signal>
+        <receiver>qsamplerMainForm</receiver>
+        <slot>viewDevices()</slot>
+    </connection>
+    <connection>
         <sender>viewOptionsAction</sender>
         <signal>activated()</signal>
         <receiver>qsamplerMainForm</receiver>
@@ -692,12 +751,6 @@
         <receiver>qsamplerMainForm</receiver>
         <slot>helpAboutQt()</slot>
     </connection>
-    <connection>
-        <sender>channelsMenu</sender>
-        <signal>aboutToShow()</signal>
-        <receiver>qsamplerMainForm</receiver>
-        <slot>channelsMenuAboutToShow()</slot>
-    </connection>
 </connections>
 <includes>
     <include location="global" impldecl="in declaration">lscp/client.h</include>
@@ -711,6 +764,7 @@
     <forward>class qsamplerChannel;</forward>
     <forward>class qsamplerMessages;</forward>
     <forward>class qsamplerChannelStrip;</forward>
+    <forward>class qsamplerDeviceForm;</forward>
 </forwards>
 <variables>
     <variable access="private">qsamplerOptions *m_pOptions;</variable>
@@ -719,39 +773,42 @@
     <variable access="private">QString m_sFilename;</variable>
     <variable access="private">int m_iUntitled;</variable>
     <variable access="private">int m_iDirtyCount;</variable>
-    <variable access="private">int m_iChangeCount;</variable>
     <variable access="private">lscp_client_t *m_pClient;</variable>
     <variable access="private">QProcess *m_pServer;</variable>
     <variable access="private">int m_iStartDelay;</variable>
     <variable access="private">int m_iTimerDelay;</variable>
     <variable access="private">int m_iTimerSlot;</variable>
-    <variable access="private">QLabel *m_status[5];</variable>
+    <variable access="private">QLabel *m_statusItem[5];</variable>
     <variable access="private">QPopupMenu *m_pRecentFilesMenu;</variable>
+    <variable access="private">QPtrList&lt;qsamplerChannelStrip&gt; m_changedStrips;</variable>
+    <variable access="private">qsamplerDeviceForm *m_pDeviceForm;</variable>
 </variables>
 <slots>
     <slot specifier="non virtual">fileNew( void )</slot>
     <slot specifier="non virtual">fileOpen( void )</slot>
+    <slot specifier="non virtual">fileOpenRecent( int iIndex )</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>
     <slot specifier="non virtual">editAddChannel( void )</slot>
     <slot specifier="non virtual">editRemoveChannel( void )</slot>
     <slot specifier="non virtual">editSetupChannel( void )</slot>
     <slot specifier="non virtual">editResetChannel( void )</slot>
+    <slot specifier="non virtual">editResetAllChannels( void )</slot>
     <slot specifier="non virtual">viewMenubar( bool bOn )</slot>
     <slot specifier="non virtual">viewToolbar( bool bOn )</slot>
     <slot specifier="non virtual">viewStatusbar( bool bOn )</slot>
     <slot specifier="non virtual">viewMessages( bool bOn )</slot>
+    <slot specifier="non virtual">viewDevices( void )</slot>
     <slot specifier="non virtual">viewOptions( void )</slot>
     <slot specifier="non virtual">channelsArrange( void )</slot>
     <slot specifier="non virtual">channelsAutoArrange( bool bOn )</slot>
     <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">channelStripChanged( 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>
@@ -764,6 +821,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>
@@ -777,6 +835,7 @@
     <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>
@@ -794,6 +853,7 @@
     <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>