--- qsampler/trunk/src/qsamplerMainForm.ui 2004/06/03 16:43:48 101 +++ qsampler/trunk/src/qsamplerMainForm.ui 2007/10/03 11:34:30 1372 @@ -2,7 +2,7 @@ qsamplerMainForm 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. rncbc aka Rui Nuno Capela @@ -29,7 +29,7 @@ 0 0 472 - 293 + 296 @@ -39,7 +39,7 @@ - qsampler + Qsampler qsampler.png @@ -63,6 +63,7 @@ + @@ -72,8 +73,10 @@ + + @@ -81,6 +84,8 @@ + + @@ -106,7 +111,11 @@ + + + + @@ -119,7 +128,10 @@ + + + @@ -220,6 +232,29 @@ + fileResetAction + + + fileReset.png + + + Reset + + + Rese&t + + + Reset instance + + + Reset sampler instance + + + Ctrl+R + + + + fileRestartAction @@ -238,7 +273,7 @@ Restart sampler instance - Ctrl+R + Ctrl+Shift+R @@ -306,6 +341,52 @@ + editResetChannelAction + + + editResetChannel.png + + + Reset + + + Re&set Channel + + + Reset channel + + + Reset current sampler channel + + + + + + + + editResetAllChannelsAction + + + editResetAllChannels.png + + + Reset All + + + R&eset All Channels + + + Reset all channels + + + Reset all sampler channels + + + + + + + editSetupChannelAction @@ -329,25 +410,25 @@ - editResetChannelAction + editEditChannelAction - editResetChannel.png + editEditChannel.png - Reset + Edit - Re&set Channel + Ed&it Channel... - Reset channel + Edit channel - Reset current sampler channel + Edit current sampler channel - + F9 @@ -444,6 +525,58 @@ + viewInstrumentsAction + + + qsamplerInstrument.png + + + true + + + Instruments + + + &Instruments + + + MIDI instruments configuration + + + Show/hide the MIDI instruments configuration window + + + F10 + + + + + viewDevicesAction + + + qsamplerDevice.png + + + true + + + Devices + + + &Devices + + + Device configuration + + + Show/hide the device configuration window + + + F11 + + + + viewOptionsAction @@ -485,7 +618,7 @@ Line up all channel strips - F10 + F5 @@ -572,6 +705,12 @@ fileSaveAs() + fileResetAction + activated() + qsamplerMainForm + fileReset() + + fileRestartAction activated() qsamplerMainForm @@ -602,12 +741,24 @@ editSetupChannel() + editEditChannelAction + activated() + qsamplerMainForm + editEditChannel() + + editResetChannelAction activated() qsamplerMainForm editResetChannel() + editResetAllChannelsAction + activated() + qsamplerMainForm + editResetAllChannels() + + viewMenubarAction toggled(bool) qsamplerMainForm @@ -632,6 +783,18 @@ viewMessages(bool) + viewInstrumentsAction + activated() + qsamplerMainForm + viewInstruments() + + + viewDevicesAction + activated() + qsamplerMainForm + viewDevices() + + viewOptionsAction activated() qsamplerMainForm @@ -661,12 +824,6 @@ qsamplerMainForm helpAboutQt() - - channelsMenu - aboutToShow() - qsamplerMainForm - channelsMenuAboutToShow() - lscp/client.h @@ -675,10 +832,15 @@ class QWorkspace; class QProcess; + class QSlider; + class QSpinBox; class QLabel; class qsamplerOptions; + class qsamplerChannel; class qsamplerMessages; class qsamplerChannelStrip; + class qsamplerInstrumentListForm; + class qsamplerDeviceForm; qsamplerOptions *m_pOptions; @@ -691,33 +853,47 @@ QProcess *m_pServer; int m_iStartDelay; int m_iTimerDelay; - int m_iTimerSlot; - QLabel *m_status[5]; + int m_iTimerSlot; + QLabel *m_statusItem[5]; QPopupMenu *m_pRecentFilesMenu; + QPtrList<qsamplerChannelStrip> m_changedStrips; + qsamplerInstrumentListForm *m_pInstrumentListForm; + qsamplerDeviceForm *m_pDeviceForm; + static qsamplerMainForm *g_pMainForm; + QSlider *m_pVolumeSlider; + QSpinBox *m_pVolumeSpinBox; + int m_iVolumeChanging; fileNew( void ) fileOpen( void ) + fileOpenRecent( int iIndex ) fileSave( void ) fileSaveAs( void ) + fileReset( void ) fileRestart( void ) fileExit( void ) - fileOpenRecent( int iIndex ) editAddChannel( void ) editRemoveChannel( void ) editSetupChannel( void ) + editEditChannel( void ) editResetChannel( void ) + editResetAllChannels( void ) viewMenubar( bool bOn ) viewToolbar( bool bOn ) viewStatusbar( bool bOn ) viewMessages( bool bOn ) + viewInstruments( void ) + viewDevices( void ) viewOptions( void ) channelsArrange( void ) channelsAutoArrange( bool bOn ) helpAboutQt( void ) helpAbout( void ) + sessionDirty( void ) stabilizeForm( void ) - channelChanged( qsamplerChannelStrip * ) + volumeChanged( int iVolume ) + channelStripChanged( qsamplerChannelStrip *pChannelStrip ) channelsMenuAboutToShow() channelsMenuActivated( int iChannel ) timerSlot( void ) @@ -730,8 +906,11 @@ setup( qsamplerOptions * pOptions ) queryClose( void ) closeEvent( QCloseEvent * pCloseEvent ) + decodeDragFiles( const QMimeSource * pEvent, QStringList & files ) dragEnterEvent( QDragEnterEvent *pDragEnterEvent ) dropEvent( QDropEvent *pDropEvent ) + customEvent( QCustomEvent *pCustomEvent ) + contextMenuEvent( QContextMenuEvent *pEvent ) options( void ) client( void ) sessionName( const QString & sFilename ) @@ -741,9 +920,13 @@ closeSession( bool bForce ) loadSessionFile( const QString & sFilename ) saveSessionFile( const QString & sFilename ) + updateSession() updateRecentFiles( const QString & sFilename ) updateRecentFilesMenu( void ) + updateInstrumentNames( void ) updateDisplayFont( void ) + updateDisplayEffect( void ) + updateMaxVolume( void ) appendMessages( const QString & s ) appendMessagesColor( const QString & s, const QString & c ) appendMessagesText( const QString & s ) @@ -752,15 +935,17 @@ updateMessagesFont( void ) updateMessagesLimit( void ) updateMessagesCapture( void ) - createChannel( int iChannelID, bool bPrompt ) - activeChannel( void ) - channelAt( int iChannel ) + createChannelStrip( qsamplerChannel *pChannel ) + activeChannelStrip( void ) + channelStripAt( int iChannel ) + channelStrip( int iChannelID ) startSchedule( int iStartDelay ) stopSchedule( void ) startServer( void ) stopServer( void ) startClient( void ) stopClient( void ) + getInstance( void )