--- qsampler/trunk/src/qsamplerMainForm.ui	2005/08/26 23:04:32	757
+++ qsampler/trunk/src/qsamplerMainForm.ui	2007/10/03 11:34:30	1372
@@ -2,7 +2,7 @@
 <class>qsamplerMainForm</class>
 <comment>qsampler - A LinuxSampler Qt GUI Interface.
 
-   Copyright (C) 2004-2005, 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>
@@ -73,6 +73,7 @@
         <action name="editRemoveChannelAction"/>
         <separator/>
         <action name="editSetupChannelAction"/>
+        <action name="editEditChannelAction"/>
         <separator/>
         <action name="editResetChannelAction"/>
         <action name="editResetAllChannelsAction"/>
@@ -83,6 +84,7 @@
         <action name="viewStatusbarAction"/>
         <separator/>
         <action name="viewMessagesAction"/>
+        <action name="viewInstrumentsAction"/>
         <action name="viewDevicesAction"/>
         <separator/>
         <action name="viewOptionsAction"/>
@@ -112,6 +114,7 @@
         <action name="fileResetAction"/>
         <action name="fileRestartAction"/>
         <separator/>
+        <action name="viewInstrumentsAction"/>
         <action name="viewDevicesAction"/>
     </toolbar>
     <toolbar dock="2">
@@ -125,6 +128,7 @@
         <action name="editRemoveChannelAction"/>
         <separator/>
         <action name="editSetupChannelAction"/>
+        <action name="editEditChannelAction"/>
         <separator/>
         <action name="editResetChannelAction"/>
         <action name="editResetAllChannelsAction"/>
@@ -406,6 +410,29 @@
     </action>
     <action>
         <property name="name">
+            <cstring>editEditChannelAction</cstring>
+        </property>
+        <property name="iconSet">
+            <iconset>editEditChannel.png</iconset>
+        </property>
+        <property name="text">
+            <string>Edit</string>
+        </property>
+        <property name="menuText">
+            <string>Ed&amp;it Channel...</string>
+        </property>
+        <property name="toolTip">
+            <string>Edit channel</string>
+        </property>
+        <property name="statusTip">
+            <string>Edit current sampler channel</string>
+        </property>
+        <property name="accel">
+            <string>F9</string>
+        </property>
+    </action>
+    <action>
+        <property name="name">
             <cstring>viewMenubarAction</cstring>
         </property>
         <property name="toggleAction">
@@ -498,6 +525,32 @@
     </action>
     <action>
         <property name="name">
+            <cstring>viewInstrumentsAction</cstring>
+        </property>
+        <property name="iconSet">
+            <iconset>qsamplerInstrument.png</iconset>
+        </property>
+        <property name="toggleAction">
+            <bool>true</bool>
+        </property>
+        <property name="text">
+            <string>Instruments</string>
+        </property>
+        <property name="menuText">
+            <string>&amp;Instruments</string>
+        </property>
+        <property name="toolTip">
+            <string>MIDI instruments configuration</string>
+        </property>
+        <property name="statusTip">
+            <string>Show/hide the MIDI instruments configuration window</string>
+        </property>
+        <property name="accel">
+            <string>F10</string>
+        </property>
+    </action>
+    <action>
+        <property name="name">
             <cstring>viewDevicesAction</cstring>
         </property>
         <property name="iconSet">
@@ -565,7 +618,7 @@
             <string>Line up all channel strips</string>
         </property>
         <property name="accel">
-            <string>F10</string>
+            <string>F5</string>
         </property>
     </action>
     <action>
@@ -688,6 +741,12 @@
         <slot>editSetupChannel()</slot>
     </connection>
     <connection>
+        <sender>editEditChannelAction</sender>
+        <signal>activated()</signal>
+        <receiver>qsamplerMainForm</receiver>
+        <slot>editEditChannel()</slot>
+    </connection>
+    <connection>
         <sender>editResetChannelAction</sender>
         <signal>activated()</signal>
         <receiver>qsamplerMainForm</receiver>
@@ -724,6 +783,12 @@
         <slot>viewMessages(bool)</slot>
     </connection>
     <connection>
+        <sender>viewInstrumentsAction</sender>
+        <signal>activated()</signal>
+        <receiver>qsamplerMainForm</receiver>
+        <slot>viewInstruments()</slot>
+    </connection>
+    <connection>
         <sender>viewDevicesAction</sender>
         <signal>activated()</signal>
         <receiver>qsamplerMainForm</receiver>
@@ -767,11 +832,14 @@
 <forwards>
     <forward>class QWorkspace;</forward>
     <forward>class QProcess;</forward>
+    <forward>class QSlider;</forward>
+    <forward>class QSpinBox;</forward>
     <forward>class QLabel;</forward>
     <forward>class qsamplerOptions;</forward>
     <forward>class qsamplerChannel;</forward>
     <forward>class qsamplerMessages;</forward>
     <forward>class qsamplerChannelStrip;</forward>
+    <forward>class qsamplerInstrumentListForm;</forward>
     <forward>class qsamplerDeviceForm;</forward>
 </forwards>
 <variables>
@@ -785,11 +853,16 @@
     <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">int m_iTimerSlot;</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">qsamplerInstrumentListForm *m_pInstrumentListForm;</variable>
     <variable access="private">qsamplerDeviceForm *m_pDeviceForm;</variable>
+    <variable access="private">static qsamplerMainForm *g_pMainForm;</variable>
+    <variable access="private">QSlider *m_pVolumeSlider;</variable>
+    <variable access="private">QSpinBox *m_pVolumeSpinBox;</variable>
+    <variable access="private">int m_iVolumeChanging;</variable>
 </variables>
 <slots>
     <slot specifier="non virtual">fileNew( void )</slot>
@@ -803,12 +876,14 @@
     <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">editEditChannel( 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">viewInstruments( void )</slot>
     <slot specifier="non virtual">viewDevices( void )</slot>
     <slot specifier="non virtual">viewOptions( void )</slot>
     <slot specifier="non virtual">channelsArrange( void )</slot>
@@ -817,6 +892,7 @@
     <slot specifier="non virtual">helpAbout( void )</slot>
     <slot specifier="non virtual">sessionDirty( void )</slot>
     <slot specifier="non virtual">stabilizeForm( void )</slot>
+    <slot specifier="non virtual">volumeChanged( int iVolume )</slot>
     <slot specifier="non virtual">channelStripChanged( qsamplerChannelStrip *pChannelStrip )</slot>
     <slot specifier="non virtual">channelsMenuAboutToShow()</slot>
     <slot specifier="non virtual">channelsMenuActivated( int iChannel )</slot>
@@ -869,6 +945,7 @@
     <function access="private" specifier="non virtual">stopServer( void )</function>
     <function access="private" specifier="non virtual" returnType="bool">startClient( void )</function>
     <function access="private" specifier="non virtual">stopClient( void )</function>
+    <function specifier="non virtual" returnType="static qsamplerMainForm *">getInstance( void )</function>
 </functions>
 <pixmapinproject/>
 <layoutdefaults spacing="4" margin="8"/>