From fd16ad74fb46348de1a334e2baf00956642ea1ac Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Sat, 5 Mar 2005 09:11:56 +0000 Subject: [PATCH] make themeable --- stepmania/Themes/default/Fonts/EditMenu title.redir | 1 + stepmania/Themes/default/Fonts/EditMenu value.redir | 1 + .../default/Fonts/ScreenEditMenu explanation.redir | 1 + stepmania/src/EditMenu.cpp | 5 ++--- stepmania/src/ScreenEditMenu.cpp | 10 +++++----- 5 files changed, 10 insertions(+), 8 deletions(-) create mode 100644 stepmania/Themes/default/Fonts/EditMenu title.redir create mode 100644 stepmania/Themes/default/Fonts/EditMenu value.redir create mode 100644 stepmania/Themes/default/Fonts/ScreenEditMenu explanation.redir diff --git a/stepmania/Themes/default/Fonts/EditMenu title.redir b/stepmania/Themes/default/Fonts/EditMenu title.redir new file mode 100644 index 0000000000..ba41a9d72b --- /dev/null +++ b/stepmania/Themes/default/Fonts/EditMenu title.redir @@ -0,0 +1 @@ +_shared2 diff --git a/stepmania/Themes/default/Fonts/EditMenu value.redir b/stepmania/Themes/default/Fonts/EditMenu value.redir new file mode 100644 index 0000000000..8b94917099 --- /dev/null +++ b/stepmania/Themes/default/Fonts/EditMenu value.redir @@ -0,0 +1 @@ +Common normal \ No newline at end of file diff --git a/stepmania/Themes/default/Fonts/ScreenEditMenu explanation.redir b/stepmania/Themes/default/Fonts/ScreenEditMenu explanation.redir new file mode 100644 index 0000000000..8b94917099 --- /dev/null +++ b/stepmania/Themes/default/Fonts/ScreenEditMenu explanation.redir @@ -0,0 +1 @@ +Common normal \ No newline at end of file diff --git a/stepmania/src/EditMenu.cpp b/stepmania/src/EditMenu.cpp index e7eb29040c..c1d3289bea 100644 --- a/stepmania/src/EditMenu.cpp +++ b/stepmania/src/EditMenu.cpp @@ -55,14 +55,14 @@ EditMenu::EditMenu() for( int i=0; iGetPathF("Common","title") ); + m_textLabel[i].LoadFromFont( THEME->GetPathF("EditMenu","title") ); m_textLabel[i].SetXY( ROW_LABELS_X, ROW_Y(i) ); m_textLabel[i].SetText( RowToString((Row)i) ); m_textLabel[i].SetZoom( 0.8f ); m_textLabel[i].SetHorizAlign( Actor::align_left ); this->AddChild( &m_textLabel[i] ); - m_textValue[i].LoadFromFont( THEME->GetPathF("Common","normal") ); + m_textValue[i].LoadFromFont( THEME->GetPathF("EditMenu","value") ); m_textValue[i].SetXY( ROW_VALUE_X(i), ROW_Y(i) ); m_textValue[i].SetText( "blah" ); m_textValue[i].SetZoom( 0.8f ); @@ -129,7 +129,6 @@ EditMenu::EditMenu() } } } - } } diff --git a/stepmania/src/ScreenEditMenu.cpp b/stepmania/src/ScreenEditMenu.cpp index 3e7b5778f7..7502b487a3 100644 --- a/stepmania/src/ScreenEditMenu.cpp +++ b/stepmania/src/ScreenEditMenu.cpp @@ -39,14 +39,14 @@ void ScreenEditMenu::Init() m_textExplanation.SetName( "Explanation" ); - m_textExplanation.LoadFromFont( THEME->GetPathF("Common","normal") ); + m_textExplanation.LoadFromFont( THEME->GetPathF(m_sName,"explanation") ); SET_XY_AND_ON_COMMAND( m_textExplanation ); m_textExplanation.SetText( EXPLANATION_TEXT ); this->AddChild( &m_textExplanation ); this->SortByDrawOrder(); - SOUND->PlayMusic( THEME->GetPathS("ScreenEditMenu","music") ); + SOUND->PlayMusic( THEME->GetPathS(m_sName,"music") ); } void ScreenEditMenu::HandleScreenMessage( const ScreenMessage SM ) @@ -150,7 +150,7 @@ void ScreenEditMenu::MenuStart( PlayerNumber pn ) pSong->AddSteps( pNewNotes ); SCREENMAN->SystemMessage( "Steps created from copy." ); - SOUND->PlayOnce( THEME->GetPathS("ScreenEditMenu","create") ); + SOUND->PlayOnce( THEME->GetPathS(m_sName,"create") ); m_Selector.RefreshNotes(); pSong->Save(); } @@ -168,7 +168,7 @@ void ScreenEditMenu::MenuStart( PlayerNumber pn ) pSong->AddSteps( pNewNotes ); SCREENMAN->SystemMessage( "Steps created from AutoGen." ); - SOUND->PlayOnce( THEME->GetPathS("ScreenEditMenu","create") ); + SOUND->PlayOnce( THEME->GetPathS(m_sName,"create") ); m_Selector.RefreshNotes(); pSong->Save(); } @@ -185,7 +185,7 @@ void ScreenEditMenu::MenuStart( PlayerNumber pn ) pSong->AddSteps( pNewNotes ); SCREENMAN->SystemMessage( "Blank Steps created." ); - SOUND->PlayOnce( THEME->GetPathS("ScreenEditMenu","create") ); + SOUND->PlayOnce( THEME->GetPathS(m_sName,"create") ); m_Selector.RefreshNotes(); pSong->Save(); }