more displayName updates, minor change to controller dialog

git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1103 0778d3d1-df1d-0410-868b-ea421aaaa00d

Author: pgiblock

ChangeLog

@@ -3,6 +3,37 @@
 	* src/gui/widgets/graph.cpp:
 	Fix graph widget
 
+	* include/mv_base.h:
+	* src/core/mv_base.cpp:
+	Add recursive fullDisplayName function
+
+	* include/combobox_model.h:
+	* src/gui/widgets/automatable_button.cpp:
+	* src/gui/widgets/combobox.cpp:
+	* src/gui/widgets/tempo_sync_knob.cpp:
+	* src/gui/widgets/effect_view.cpp:
+	* src/gui/lfo_controller_dialog.cpp:
+	* src/core/midi/midi_port.cpp:
+	* src/core/fx_mixer.cpp:
+	* src/core/lfo_controller.cpp:
+	* src/core/effect.cpp:
+	extend more models and views for displayName
+
+	* include/instrument.h:
+	* src/gui/widgets/instrument_sound_shaping_view.cpp:
+	* src/gui/widgets/envelope_and_lfo_view.cpp:
+	* src/gui/widgets/instrument_function_views.cpp:
+	* src/gui/widgets/instrument_midi_io_view.cpp:
+	* src/core/envelope_and_lfo_parameters.cpp:
+	* src/core/instrument_sound_shaping.cpp:
+	* src/core/instrument_functions.cpp:
+	* src/core/instrument.cpp:
+	extend instrument stuff for displayName
+
+	* include/controller_connection_dialog.h:
+	* src/gui/controller_connection_dialog.cpp:
+	improve interface slightly
+
 2008-06-08	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
 
 	* plugins/ladspa_effect/tap/tap_deesser.c:

include/combobox_model.h

@@ -39,8 +39,8 @@ class comboBoxModel : public intModel
 {
 	Q_OBJECT
 public:
-	comboBoxModel( ::model * _parent = NULL ) :
-		intModel( 0, 0, 0, _parent )
+	comboBoxModel( ::model * _parent = NULL, const QString & _display_name = QString::null ) :
+		intModel( 0, 0, 0, _parent, _display_name )
 	{
 	}
 

include/controller_connection_dialog.h

@@ -41,6 +41,7 @@ class QScrollArea;
 class autoDetectMidiController;
 class comboBox;
 class groupBox;
+class tabWidget;
 class lcdSpinBox;
 class ledCheckBox;
 class midiPortMenu;
@@ -72,16 +73,20 @@ protected slots:
 
 
 private:
+	// Midi
 	groupBox * m_midiGroupBox;
 	lcdSpinBox * m_midiChannelSpinBox;
 	lcdSpinBox * m_midiControllerSpinBox;
 	ledCheckBox * m_midiAutoDetectCheckBox;
 	midiPortMenu * m_readablePorts;
 	boolModel m_midiAutoDetect;
 
+	// User
 	groupBox * m_userGroupBox;
 	comboBox * m_userController;
 
+	// Mapping
+	tabWidget * m_mappingBox;
 	QLineEdit * m_mappingFunction;
 
 	controller * m_controller;

include/instrument.h

@@ -106,6 +106,7 @@ class EXPORT instrument : public plugin
 		return( FALSE );
 	}
 
+	virtual QString fullDisplayName( void ) const;
 
 	// --------------------------------------------------------------------
 	// provided functions:

include/mv_base.h

@@ -53,6 +53,11 @@ class EXPORT model : public QObject
 		return( m_defaultConstructed );
 	}
 
+	inline model * parentModel( void ) const
+	{
+		return static_cast<model *>( parent() );
+	}
+
 	virtual QString displayName( void ) const
 	{
 		return QString();
@@ -62,6 +67,7 @@ class EXPORT model : public QObject
 	{
 	}
 
+	virtual QString fullDisplayName( void ) const;
 
 private:
 	bool m_defaultConstructed;

src/core/effect.cpp

@@ -42,10 +42,10 @@ effect::effect( const plugin::descriptor * _desc,
 	m_noRun( FALSE ),
 	m_running( FALSE ),
 	m_bufferCount( 0 ),
-	m_enabledModel( TRUE, this ),
-	m_wetDryModel( 1.0f, 0.0f, 1.0f, 0.01f, this ),
-	m_gateModel( 0.0f, 0.0f, 1.0f, 0.01f, this ),
-	m_autoQuitModel( 1.0f, 1.0f, 8000.0f, 100.0f, 1.0f, this )
+	m_enabledModel( TRUE, this, tr( "Effect enabled" ) ),
+	m_wetDryModel( 1.0f, -1.0f, 1.0f, 0.01f, this, tr( "Wet/Dry mix" ) ),
+	m_gateModel( 0.0f, 0.0f, 1.0f, 0.01f, this, tr( "Gate" ) ),
+	m_autoQuitModel( 1.0f, 1.0f, 8000.0f, 100.0f, 1.0f, this, tr( "Decay" ) )
 {
 	m_srcState[0] = m_srcState[1] = NULL;
 	reinitSRC();

src/core/envelope_and_lfo_parameters.cpp

@@ -53,23 +53,27 @@ envelopeAndLFOParameters::envelopeAndLFOParameters(
 							model * _parent ) :
 	model( _parent ),
 	m_used( FALSE ),
-	m_predelayModel( 0.0, 0.0, 1.0, 0.001, this ),
-	m_attackModel( 0.0, 0.0, 1.0, 0.001, this ),
-	m_holdModel( 0.5, 0.0, 1.0, 0.001, this ),
-	m_decayModel( 0.5, 0.0, 1.0, 0.001, this ),
-	m_sustainModel( 0.5, 0.0, 1.0, 0.001, this ),
-	m_releaseModel( 0.1, 0.0, 1.0, 0.001, this ),
-	m_amountModel( 0.0, -1.0, 1.0, 0.005, this ),
+	m_predelayModel( 0.0, 0.0, 1.0, 0.001, this, tr( "Predelay-time" ) ),
+	m_attackModel( 0.0, 0.0, 1.0, 0.001, this, tr( "Attack-time" ) ),
+	m_holdModel( 0.5, 0.0, 1.0, 0.001, this, tr( "Hold-time" ) ),
+	m_decayModel( 0.5, 0.0, 1.0, 0.001, this, tr( "Decay-time" ) ),
+	m_sustainModel( 0.5, 0.0, 1.0, 0.001, this, tr( "Sustain-level" ) ),
+	m_releaseModel( 0.1, 0.0, 1.0, 0.001, this, tr( "Release-time" ) ),
+	m_amountModel( 0.0, -1.0, 1.0, 0.005, this, tr( "Modulation amount" ) ),
 	m_valueForZeroAmount( _value_for_zero_amount ),
 	m_pahdEnv( NULL ),
 	m_rEnv( NULL ),
-	m_lfoPredelayModel( 0.0, 0.0, 1.0, 0.001, this ),
-	m_lfoAttackModel( 0.0, 0.0, 1.0, 0.001, this ),
-	m_lfoSpeedModel( 0.1, 0.01, 1.0, 0.0001, 20000.0, this ),
-	m_lfoAmountModel( 0.0, -1.0, 1.0, 0.005, this ),
-	m_lfoWaveModel( SineWave, 0, NumLfoShapes, this ),
-	m_x100Model( FALSE, this ),
-	m_controlEnvAmountModel( FALSE, this ),
+	m_lfoPredelayModel( 0.0, 0.0, 1.0, 0.001, this,
+			tr( "LFO-predelay-time" ) ),
+	m_lfoAttackModel( 0.0, 0.0, 1.0, 0.001, this, tr( "LFO-attack-time" ) ),
+	m_lfoSpeedModel( 0.1, 0.01, 1.0, 0.0001, 20000.0, this,
+			tr( "LFO-speed" ) ),
+	m_lfoAmountModel( 0.0, -1.0, 1.0, 0.005, this,
+			tr( "LFO-modulation-amount" ) ),
+	m_lfoWaveModel( SineWave, 0, NumLfoShapes, this,
+			tr( "LFO wave shape" ) ),
+	m_x100Model( FALSE, this, tr( "Freq x 100" ) ),
+	m_controlEnvAmountModel( FALSE, this, tr( "Modulate Env-Amount" ) ),
 	m_lfoFrame( 0 ),
 	m_lfoAmountIsZero( FALSE ),
 	m_lfoShapeData( NULL )

src/core/fx_mixer.cpp

@@ -192,7 +192,9 @@ void fxMixer::clear()
 		m_fxChannels[i]->m_fxChain.clear();
 		m_fxChannels[i]->m_volumeModel.setValue( 1.0f );
 		m_fxChannels[i]->m_name = ( i == 0 ) ?
-					tr( "Master" ) : tr( "FX %1" ).arg( i );
+				tr( "Master" ) : tr( "FX %1" ).arg( i );
+		m_fxChannels[i]->m_volumeModel.setDisplayName( 
+				m_fxChannels[i]->m_name );
 
 	}
 }

src/core/instrument.cpp

@@ -123,6 +123,13 @@ void instrument::applyRelease( sampleFrame * buf, const notePlayHandle * _n )
 
 
 
+QString instrument::fullDisplayName( void ) const
+{
+	return getInstrumentTrack()->displayName();
+}
+
+
+
 
 
 

src/core/instrument_functions.cpp

@@ -170,8 +170,8 @@ const int ARP_GROUPBOX_HEIGHT = 240 - ARP_GROUPBOX_Y;
 chordCreator::chordCreator( instrumentTrack * _instrument_track ) :
 	model( _instrument_track ),
 	m_chordsEnabledModel( FALSE, this ),
-	m_chordsModel( this ),
-	m_chordRangeModel( 1.0f, 1.0f, 9.0f, 1.0f, this )
+	m_chordsModel( this, tr( "Chord type" ) ),
+	m_chordRangeModel( 1.0f, 1.0f, 9.0f, 1.0f, this, tr( "Chord range" ) )
 {
 	m_chordsEnabledModel.setTrack( _instrument_track );
 
@@ -283,12 +283,12 @@ void chordCreator::loadSettings( const QDomElement & _this )
 arpeggiator::arpeggiator( instrumentTrack * _instrument_track ) :
 	model( _instrument_track ),
 	m_arpEnabledModel( FALSE ),
-	m_arpModel( this ),
-	m_arpRangeModel( 1.0f, 1.0f, 9.0f, 1.0f, this ),
-	m_arpTimeModel( 100.0f, 25.0f, 2000.0f, 1.0f, 1.0, this ),
-	m_arpGateModel( 100.0f, 1.0f, 200.0f, 1.0f, this ),
-	m_arpDirectionModel( 0, 0, NumArpDirections, this ),
-	m_arpModeModel( this )
+	m_arpModel( this, tr( "Arpeggio type" ) ),
+	m_arpRangeModel( 1.0f, 1.0f, 9.0f, 1.0f, this, tr( "Arpeggio range" ) ),
+	m_arpTimeModel( 100.0f, 25.0f, 2000.0f, 1.0f, 1.0, this, tr( "Arpeggio time" ) ),
+	m_arpGateModel( 100.0f, 1.0f, 200.0f, 1.0f, this, tr( "Arpeggio gate" ) ),
+	m_arpDirectionModel( 0, 0, NumArpDirections, this, tr( "Arpeggio direction" ) ),
+	m_arpModeModel( this, tr( "Arpeggio mode" ) )
 {
 	m_arpEnabledModel.setTrack( _instrument_track );