[BPMDisplay] add RandomText metric for theming the "..." that appears when BPMs don't cycle and MinBPM == -1.

This commit is contained in:
AJ Kelly
2010-06-02 22:45:42 -05:00
parent 4bbf9b5b3a
commit 3638d13432
4 changed files with 7 additions and 1 deletions
+2
View File
@@ -16,6 +16,8 @@ _____________________________________________________________________________
(StyleType_TwoPlayersSharedSides). (StyleType_TwoPlayersSharedSides).
* Reordered ScreenEdit's main menu (escape) slightly. * Reordered ScreenEdit's main menu (escape) slightly.
* Expand various floats from 3 decimal places to 6 (experimental) [Midiman] * 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 20100601
-------- --------
+1
View File
@@ -169,6 +169,7 @@ RandomCycleSpeed=0.2
Separator="-" Separator="-"
# ??? when it cycles. # ??? when it cycles.
ShowQMarksInRandomCycle=true ShowQMarksInRandomCycle=true
RandomText="..."
# xxx: localize me -aj # xxx: localize me -aj
VariousText="Various" VariousText="Various"
+3 -1
View File
@@ -35,6 +35,8 @@ void BPMDisplay::Load()
SEPARATOR.Load( m_sName, "Separator" ); SEPARATOR.Load( m_sName, "Separator" );
SHOW_QMARKS.Load( m_sName, "ShowQMarksInRandomCycle" ); SHOW_QMARKS.Load( m_sName, "ShowQMarksInRandomCycle" );
NO_BPM_TEXT.Load( m_sName, "NoBpmText" ); 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" ); VARIOUS_TEXT.Load( m_sName, "VariousText" );
RunCommands( SET_NORMAL_COMMAND ); RunCommands( SET_NORMAL_COMMAND );
@@ -121,7 +123,7 @@ void BPMDisplay::SetBPMRange( const DisplayBpms &bpms )
if( MinBPM == MaxBPM ) if( MinBPM == MaxBPM )
{ {
if( MinBPM == -1 ) if( MinBPM == -1 )
SetText( "..." ); // random (todo: let themer customize string -aj) SetText( RANDOM_TEXT ); // random (was "...") -aj
else else
SetText( ssprintf("%i", MinBPM) ); SetText( ssprintf("%i", MinBPM) );
} }
+1
View File
@@ -46,6 +46,7 @@ protected:
ThemeMetric<RString> SEPARATOR; ThemeMetric<RString> SEPARATOR;
ThemeMetric<RString> NO_BPM_TEXT; ThemeMetric<RString> NO_BPM_TEXT;
ThemeMetric<RString> VARIOUS_TEXT; ThemeMetric<RString> VARIOUS_TEXT;
ThemeMetric<RString> RANDOM_TEXT;
float m_fBPMFrom, m_fBPMTo; float m_fBPMFrom, m_fBPMTo;
int m_iCurrentBPM; int m_iCurrentBPM;