From e56e0311795430a79c4c46c182db565d8cbc2ac7 Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Fri, 18 Jul 2008 10:10:40 +0000 Subject: [PATCH] added values for displayName-property git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1326 0778d3d1-df1d-0410-868b-ea421aaaa00d --- ChangeLog | 42 +++++++++++++++++++++++++++ include/instrument_sound_shaping.h | 2 +- src/core/instrument_functions.cpp | 8 ++--- src/core/instrument_sound_shaping.cpp | 17 +++++++---- src/core/surround_area.cpp | 2 +- src/gui/widgets/graph.cpp | 2 +- 6 files changed, 60 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7b846d55a..d6adb22f5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,45 @@ +2008-07-18 Tobias Doerffel + + * plugins/bit_invader/bit_invader.cpp: + * plugins/sf2_player/sf2_player.cpp: + * plugins/spectrum_analyzer/spectrum_analyzer.cpp: + fixed compiler warnings + + * plugins/Makefile.am: + removed lb302 from list of plugins to build + + * plugins/midi_import/midi_import.cpp: + improved tempo-automation import + + * include/automatable_model.h: + * include/mv_base.h: + * src/core/automatable_model.cpp: + moved displayName-property from automatableModel to model base-class + + * src/tracks/pattern.cpp: + fixed types + + * src/core/automation_pattern.cpp: + improved behaviour in automationPattern::clear() and + automationPattern::putValue() + + * include/instrument_sound_shaping.h: + * src/core/instrument_functions.cpp: + * src/core/instrument_sound_shaping.cpp: + * src/core/surround_area.cpp: + * src/gui/widgets/graph.cpp: + added values for displayName-property + + * include/track_label_button.h: + * src/gui/widgets/track_label_button.cpp: + * src/tracks/automation_track.cpp: + * src/tracks/bb_track.cpp: + * src/tracks/instrument_track.cpp: + * src/tracks/sample_track.cpp: + * Makefile.am: + - moved name_label.* to track_label_button.* + - bigger icons for trackLabelButtons + 2008-07-17 Tobias Doerffel * src/tracks/automation_track.cpp: diff --git a/include/instrument_sound_shaping.h b/include/instrument_sound_shaping.h index bd4856271..873793f4a 100644 --- a/include/instrument_sound_shaping.h +++ b/include/instrument_sound_shaping.h @@ -83,7 +83,7 @@ private: } ; -extern const QString __targetNames[instrumentSoundShaping::NumTargets][2]; +extern const QString __targetNames[instrumentSoundShaping::NumTargets][3]; #endif diff --git a/src/core/instrument_functions.cpp b/src/core/instrument_functions.cpp index 87506b2db..ff2e0940f 100644 --- a/src/core/instrument_functions.cpp +++ b/src/core/instrument_functions.cpp @@ -157,14 +157,14 @@ chordCreator::chord chordCreator::s_chordTable[] = chordCreator::chordCreator( model * _parent ) : - model( _parent ), + model( _parent, tr( "Chords" ) ), m_chordsEnabledModel( FALSE, this ), m_chordsModel( this, tr( "Chord type" ) ), m_chordRangeModel( 1.0f, 1.0f, 9.0f, 1.0f, this, tr( "Chord range" ) ) { for( int i = 0; s_chordTable[i].interval[0] != -1; ++i ) { - m_chordsModel.addItem( tr( s_chordTable[i].name.toAscii(). + m_chordsModel.addItem( tr( s_chordTable[i].name.toUtf8(). constData() ) ); } } @@ -264,7 +264,7 @@ void chordCreator::loadSettings( const QDomElement & _this ) arpeggiator::arpeggiator( model * _parent ) : - model( _parent ), + model( _parent, tr( "Arpeggio" ) ), m_arpEnabledModel( FALSE ), m_arpModel( this, tr( "Arpeggio type" ) ), m_arpRangeModel( 1.0f, 1.0f, 9.0f, 1.0f, this, tr( "Arpeggio range" ) ), @@ -279,7 +279,7 @@ arpeggiator::arpeggiator( model * _parent ) : { m_arpModel.addItem( chordCreator::tr( chordCreator::s_chordTable[i]. - name.toAscii().constData() ) ); + name.toUtf8().constData() ) ); } m_arpDirectionModel.addItem( tr( "Up" ), diff --git a/src/core/instrument_sound_shaping.cpp b/src/core/instrument_sound_shaping.cpp index d0ff7b4ee..ed601a072 100644 --- a/src/core/instrument_sound_shaping.cpp +++ b/src/core/instrument_sound_shaping.cpp @@ -45,25 +45,28 @@ const float RES_PRECISION = 1000.0f; // names for env- and lfo-targets - first is name being displayed to user // and second one is used internally, e.g. for saving/restoring settings -const QString __targetNames[instrumentSoundShaping::NumTargets][2] = +const QString __targetNames[instrumentSoundShaping::NumTargets][3] = { - { instrumentSoundShaping::tr( "VOLUME" ), "vol" }, + { instrumentSoundShaping::tr( "VOLUME" ), "vol", + instrumentSoundShaping::tr( "Volume" ) }, /* instrumentSoundShaping::tr( "Pan" ), instrumentSoundShaping::tr( "Pitch" ),*/ - { instrumentSoundShaping::tr( "CUTOFF" ), "cut" }, - { instrumentSoundShaping::tr( "Q/RESO" ), "res" } + { instrumentSoundShaping::tr( "CUTOFF" ), "cut", + instrumentSoundShaping::tr( "Cutoff frequency" ) }, + { instrumentSoundShaping::tr( "Q/RESO" ), "res", + instrumentSoundShaping::tr( "Q/Resonance" ) } } ; instrumentSoundShaping::instrumentSoundShaping( instrumentTrack * _instrument_track ) : - model( _instrument_track ), + model( _instrument_track, tr( "Envelopes & LFOs" ) ), m_instrumentTrack( _instrument_track ), m_filterEnabledModel( FALSE, this ), m_filterModel( this, tr( "Filter type" ) ), m_filterCutModel( 14000.0, 1.0, 14000.0, 1.0, this, - tr( "cutoff-frequency" ) ), + tr( "Cutoff frequency" ) ), m_filterResModel( 0.5, basicFilters<>::minQ(), 10.0, 0.01, this, tr( "Q/Resonance" ) ) { @@ -77,6 +80,8 @@ instrumentSoundShaping::instrumentSoundShaping( m_envLFOParameters[i] = new envelopeAndLFOParameters( value_for_zero_amount, this ); + m_envLFOParameters[i]->setDisplayName( + tr( __targetNames[i][2].toUtf8().constData() ) ); } m_filterModel.addItem( tr( "LowPass" ), diff --git a/src/core/surround_area.cpp b/src/core/surround_area.cpp index 729132bb2..97fb9e7dc 100644 --- a/src/core/surround_area.cpp +++ b/src/core/surround_area.cpp @@ -186,7 +186,7 @@ void surroundArea::mouseReleaseEvent( QMouseEvent * ) surroundAreaModel::surroundAreaModel( ::model * _parent, bool _default_constructed ) : - model( _parent, _default_constructed ), + model( _parent, QString::null, _default_constructed ), m_posX( 0, -SURROUND_AREA_SIZE, SURROUND_AREA_SIZE, _parent ), m_posY( 0, -SURROUND_AREA_SIZE, SURROUND_AREA_SIZE, _parent ) { diff --git a/src/gui/widgets/graph.cpp b/src/gui/widgets/graph.cpp index 79890c87a..a24ffe29b 100644 --- a/src/gui/widgets/graph.cpp +++ b/src/gui/widgets/graph.cpp @@ -344,7 +344,7 @@ void graph::updateGraph( void ) graphModel::graphModel( float _min, float _max, int _length, ::model * _parent, bool _default_constructed ) : - model( _parent, _default_constructed ), + model( _parent, tr( "Graph" ), _default_constructed ), m_samples( _length ), m_minValue( _min ), m_maxValue( _max )