actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

load from m_sName, not hard-coded "TextBanner"

Browse Source
This commit is contained in:
Chris Danford
2005-03-02 03:10:56 +00:00
parent 5cceae246e
commit e4ec896cd7
2 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/TextBanner.cpp
+17 -16
View File
@@ -10,13 +10,6 @@
#include "ThemeMetric.h" #include "ThemeMetric.h"
#include "Command.h" #include "Command.h"
ThemeMetric<CString> ARTIST_PREPEND_STRING ("TextBanner","ArtistPrependString");
ThemeMetric<apActorCommands> TWO_LINES_TITLE_COMMAND ("TextBanner","TwoLinesTitleCommand");
ThemeMetric<apActorCommands> TWO_LINES_SUBTITLE_COMMAND ("TextBanner","TwoLinesSubtitleCommand");
ThemeMetric<apActorCommands> TWO_LINES_ARTIST_COMMAND ("TextBanner","TwoLinesArtistCommand");
ThemeMetric<apActorCommands> THREE_LINES_TITLE_COMMAND ("TextBanner","ThreeLinesTitleCommand");
ThemeMetric<apActorCommands> THREE_LINES_SUBTITLE_COMMAND ("TextBanner","ThreeLinesSubtitleCommand");
ThemeMetric<apActorCommands> THREE_LINES_ARTIST_COMMAND ("TextBanner","ThreeLinesArtistCommand");
void TextBanner::Init() void TextBanner::Init()
{ {
@@ -24,6 +17,14 @@ void TextBanner::Init()
return; return;
m_bInitted = true; m_bInitted = true;
ARTIST_PREPEND_STRING .Load(m_sName,"ArtistPrependString");
TWO_LINES_TITLE_COMMAND .Load(m_sName,"TwoLinesTitleCommand");
TWO_LINES_SUBTITLE_COMMAND .Load(m_sName,"TwoLinesSubtitleCommand");
TWO_LINES_ARTIST_COMMAND .Load(m_sName,"TwoLinesArtistCommand");
THREE_LINES_TITLE_COMMAND .Load(m_sName,"ThreeLinesTitleCommand");
THREE_LINES_SUBTITLE_COMMAND .Load(m_sName,"ThreeLinesSubtitleCommand");
THREE_LINES_ARTIST_COMMAND .Load(m_sName,"ThreeLinesArtistCommand");
ASSERT( m_sName != "" ); ASSERT( m_sName != "" );
SET_XY_AND_ON_COMMAND( m_textTitle ); SET_XY_AND_ON_COMMAND( m_textTitle );
@@ -34,15 +35,15 @@ void TextBanner::Init()
TextBanner::TextBanner() TextBanner::TextBanner()
{ {
m_textTitle.SetName( "Title" ); m_textTitle.SetName( "Title" );
m_textTitle.LoadFromFont( THEME->GetPathF("TextBanner","text") ); m_textTitle.LoadFromFont( THEME->GetPathF(m_sName,"text") );
this->AddChild( &m_textTitle ); this->AddChild( &m_textTitle );
m_textSubTitle.SetName( "Subtitle" ); m_textSubTitle.SetName( "Subtitle" );
m_textSubTitle.LoadFromFont( THEME->GetPathF("TextBanner","text") ); m_textSubTitle.LoadFromFont( THEME->GetPathF(m_sName,"text") );
this->AddChild( &m_textSubTitle ); this->AddChild( &m_textSubTitle );
m_textArtist.SetName( "Artist" ); m_textArtist.SetName( "Artist" );
m_textArtist.LoadFromFont( THEME->GetPathF("TextBanner","text") ); m_textArtist.LoadFromFont( THEME->GetPathF(m_sName,"text") );
this->AddChild( &m_textArtist ); this->AddChild( &m_textArtist );
m_bInitted = false; m_bInitted = false;
@@ -80,12 +81,12 @@ void TextBanner::LoadFromSong( const Song* pSong )
{ {
Init(); Init();
CString sDisplayTitle = pSong ? pSong->GetDisplayMainTitle() : CString(""); CString sDisplayTitle = pSong ? pSong->GetDisplayMainTitle() : CString("");
CString sTranslitTitle = pSong ? pSong->GetTranslitMainTitle() : CString(""); CString sTranslitTitle = pSong ? pSong->GetTranslitMainTitle() : CString("");
CString sDisplaySubTitle = pSong ? pSong->GetDisplaySubTitle() : CString(""); CString sDisplaySubTitle = pSong ? pSong->GetDisplaySubTitle() : CString("");
CString sTranslitSubTitle = pSong ? pSong->GetTranslitSubTitle() : CString(""); CString sTranslitSubTitle = pSong ? pSong->GetTranslitSubTitle() : CString("");
CString sDisplayArtist = pSong ? (CString)ARTIST_PREPEND_STRING + pSong->GetDisplayArtist() : CString(""); CString sDisplayArtist = pSong ? (CString)ARTIST_PREPEND_STRING + pSong->GetDisplayArtist() : CString("");
CString sTranslitArtist = pSong ? (CString)ARTIST_PREPEND_STRING + pSong->GetTranslitArtist() : CString(""); CString sTranslitArtist = pSong ? (CString)ARTIST_PREPEND_STRING + pSong->GetTranslitArtist() : CString("");
LoadFromString( LoadFromString(
sDisplayTitle, sTranslitTitle, sDisplayTitle, sTranslitTitle,
stepmania/src/TextBanner.h
+9
View File
@@ -5,6 +5,7 @@
#include "ActorFrame.h" #include "ActorFrame.h"
#include "BitmapText.h" #include "BitmapText.h"
#include "ThemeMetric.h"
class Song; class Song;
class TextBanner : public ActorFrame class TextBanner : public ActorFrame
@@ -22,6 +23,14 @@ private:
void Init(); void Init();
BitmapText m_textTitle, m_textSubTitle, m_textArtist; BitmapText m_textTitle, m_textSubTitle, m_textArtist;
ThemeMetric<CString> ARTIST_PREPEND_STRING;
ThemeMetric<apActorCommands> TWO_LINES_TITLE_COMMAND;
ThemeMetric<apActorCommands> TWO_LINES_SUBTITLE_COMMAND;
ThemeMetric<apActorCommands> TWO_LINES_ARTIST_COMMAND;
ThemeMetric<apActorCommands> THREE_LINES_TITLE_COMMAND;
ThemeMetric<apActorCommands> THREE_LINES_SUBTITLE_COMMAND;
ThemeMetric<apActorCommands> THREE_LINES_ARTIST_COMMAND;
}; };
#endif #endif