diff --git a/Docs/Changelog_sm-ssc.txt b/Docs/Changelog_sm-ssc.txt index 76dc6a9dfd..84930b5e64 100644 --- a/Docs/Changelog_sm-ssc.txt +++ b/Docs/Changelog_sm-ssc.txt @@ -16,6 +16,8 @@ _____________________________________________________________________________ (StyleType_TwoPlayersSharedSides). * Reordered ScreenEdit's main menu (escape) slightly. * Expand various floats from 3 decimal places to 6 (experimental) [Midiman] +* [BPMDisplay] add RandomText metric for theming the "..." that appears when + BPMs don't cycle and MinBPM == -1. 20100601 -------- diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini index 0bbcd25f8a..842394faeb 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -169,6 +169,7 @@ RandomCycleSpeed=0.2 Separator="-" # ??? when it cycles. ShowQMarksInRandomCycle=true +RandomText="..." # xxx: localize me -aj VariousText="Various" diff --git a/src/BPMDisplay.cpp b/src/BPMDisplay.cpp index cde764a5b8..83d19aecd9 100644 --- a/src/BPMDisplay.cpp +++ b/src/BPMDisplay.cpp @@ -35,6 +35,8 @@ void BPMDisplay::Load() SEPARATOR.Load( m_sName, "Separator" ); SHOW_QMARKS.Load( m_sName, "ShowQMarksInRandomCycle" ); NO_BPM_TEXT.Load( m_sName, "NoBpmText" ); + //QUESTIONMARKS_TEXT.Load( m_sName, "QuestionMarksText" ); + RANDOM_TEXT.Load( m_sName, "RandomText" ); VARIOUS_TEXT.Load( m_sName, "VariousText" ); RunCommands( SET_NORMAL_COMMAND ); @@ -121,7 +123,7 @@ void BPMDisplay::SetBPMRange( const DisplayBpms &bpms ) if( MinBPM == MaxBPM ) { if( MinBPM == -1 ) - SetText( "..." ); // random (todo: let themer customize string -aj) + SetText( RANDOM_TEXT ); // random (was "...") -aj else SetText( ssprintf("%i", MinBPM) ); } diff --git a/src/BPMDisplay.h b/src/BPMDisplay.h index 2124ab522d..726101430b 100644 --- a/src/BPMDisplay.h +++ b/src/BPMDisplay.h @@ -46,6 +46,7 @@ protected: ThemeMetric SEPARATOR; ThemeMetric NO_BPM_TEXT; ThemeMetric VARIOUS_TEXT; + ThemeMetric RANDOM_TEXT; float m_fBPMFrom, m_fBPMTo; int m_iCurrentBPM;