--- qsampler/trunk/src/qsamplerMainForm.ui 2004/06/14 21:05:20 127 +++ qsampler/trunk/src/qsamplerMainForm.ui 2005/03/13 22:06:59 452 @@ -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-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 @@ -29,7 +29,7 @@ 0 0 472 - 293 + 296 @@ -63,6 +63,7 @@ + @@ -74,6 +75,7 @@ + @@ -81,6 +83,7 @@ + @@ -106,6 +109,7 @@ + @@ -119,7 +123,9 @@ + + @@ -220,6 +226,29 @@ + fileResetAction + + + fileReset.png + + + Reset + + + Rese&t + + + Reset instance + + + Reset sampler instance + + + Ctrl+R + + + + fileRestartAction @@ -238,7 +267,7 @@ Restart sampler instance - Ctrl+R + Ctrl+Shift+R @@ -306,45 +335,45 @@ - editSetupChannelAction + editResetChannelAction - editSetupChannel.png + editResetChannel.png - Setup + Reset - &Setup Channel... + Re&set Channel - Setup channel + Reset channel - Setup current sampler channel + Reset current sampler channel - F2 + - editResetChannelAction + editResetAllChannelsAction - editResetChannel.png + editResetAllChannels.png - Reset + Reset All - Re&set Channel + R&eset All Channels - Reset channel + Reset all channels - Reset current sampler channel + Reset all sampler channels @@ -352,6 +381,29 @@ + editSetupChannelAction + + + editSetupChannel.png + + + Setup + + + &Setup Channel... + + + Setup channel + + + Setup current sampler channel + + + F2 + + + + viewMenubarAction @@ -444,6 +496,32 @@ + viewDevicesAction + + + qsamplerDevice.png + + + true + + + Devices + + + &Devices + + + Device configuration + + + Show/hide the device configuration window + + + F11 + + + + viewOptionsAction @@ -572,6 +650,12 @@ fileSaveAs() + fileResetAction + activated() + qsamplerMainForm + fileReset() + + fileRestartAction activated() qsamplerMainForm @@ -608,6 +692,12 @@ editResetChannel() + editResetAllChannelsAction + activated() + qsamplerMainForm + editResetAllChannels() + + viewMenubarAction toggled(bool) qsamplerMainForm @@ -632,6 +722,12 @@ viewMessages(bool) + viewDevicesAction + activated() + qsamplerMainForm + viewDevices() + + viewOptionsAction activated() qsamplerMainForm @@ -661,12 +757,6 @@ qsamplerMainForm helpAboutQt() - - channelsMenu - aboutToShow() - qsamplerMainForm - channelsMenuAboutToShow() - lscp/client.h @@ -677,8 +767,10 @@ class QProcess; class QLabel; class qsamplerOptions; + class qsamplerChannel; class qsamplerMessages; class qsamplerChannelStrip; + class qsamplerDeviceForm; qsamplerOptions *m_pOptions; @@ -692,32 +784,38 @@ int m_iStartDelay; int m_iTimerDelay; int m_iTimerSlot; - QLabel *m_status[5]; + QLabel *m_statusItem[5]; QPopupMenu *m_pRecentFilesMenu; + QPtrList<qsamplerChannelStrip> m_changedStrips; + qsamplerDeviceForm *m_pDeviceForm; 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 ) editResetChannel( void ) + editResetAllChannels( void ) viewMenubar( bool bOn ) viewToolbar( bool bOn ) viewStatusbar( bool bOn ) viewMessages( bool bOn ) + viewDevices( void ) viewOptions( void ) channelsArrange( void ) channelsAutoArrange( bool bOn ) helpAboutQt( void ) helpAbout( void ) + sessionDirty( void ) stabilizeForm( void ) - channelChanged( qsamplerChannelStrip * ) + channelStripChanged( qsamplerChannelStrip *pChannelStrip ) channelsMenuAboutToShow() channelsMenuActivated( int iChannel ) timerSlot( void ) @@ -730,8 +828,10 @@ 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 ) @@ -742,9 +842,12 @@ 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 ) @@ -754,9 +857,10 @@ 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 )