From e4ec896cd79c5cf4798c6031d33fa1ccf63043b7 Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Wed, 2 Mar 2005 03:10:56 +0000
Subject: [PATCH] load from m_sName, not hard-coded "TextBanner"

---
 stepmania/src/TextBanner.cpp | 33 +++++++++++++++++----------------
 stepmania/src/TextBanner.h   |  9 +++++++++
 2 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/stepmania/src/TextBanner.cpp b/stepmania/src/TextBanner.cpp
index d1e140610f..04b7b3e759 100644
--- a/stepmania/src/TextBanner.cpp
+++ b/stepmania/src/TextBanner.cpp
@@ -10,13 +10,6 @@
 #include "ThemeMetric.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()
 {
@@ -24,6 +17,14 @@ void TextBanner::Init()
 		return;
 	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 != "" );
 
 	SET_XY_AND_ON_COMMAND( m_textTitle );
@@ -34,15 +35,15 @@ void TextBanner::Init()
 TextBanner::TextBanner()
 {
 	m_textTitle.SetName( "Title" );
-	m_textTitle.LoadFromFont( THEME->GetPathF("TextBanner","text") );
+	m_textTitle.LoadFromFont( THEME->GetPathF(m_sName,"text") );
 	this->AddChild( &m_textTitle );
 
 	m_textSubTitle.SetName( "Subtitle" );
-	m_textSubTitle.LoadFromFont( THEME->GetPathF("TextBanner","text") );
+	m_textSubTitle.LoadFromFont( THEME->GetPathF(m_sName,"text") );
 	this->AddChild( &m_textSubTitle );
 
 	m_textArtist.SetName( "Artist" );
-	m_textArtist.LoadFromFont( THEME->GetPathF("TextBanner","text") );
+	m_textArtist.LoadFromFont( THEME->GetPathF(m_sName,"text") );
 	this->AddChild( &m_textArtist );
 
 	m_bInitted = false;
@@ -80,12 +81,12 @@ void TextBanner::LoadFromSong( const Song* pSong )
 {
 	Init();
 
-	CString sDisplayTitle = pSong ? pSong->GetDisplayMainTitle() : CString("");
-	CString sTranslitTitle = pSong ? pSong->GetTranslitMainTitle() : CString("");
-	CString sDisplaySubTitle = pSong ? pSong->GetDisplaySubTitle() : CString("");
-	CString sTranslitSubTitle = pSong ? pSong->GetTranslitSubTitle() : CString("");
-	CString sDisplayArtist = pSong ? (CString)ARTIST_PREPEND_STRING + pSong->GetDisplayArtist() : CString("");
-	CString sTranslitArtist = pSong ? (CString)ARTIST_PREPEND_STRING + pSong->GetTranslitArtist() : CString("");
+	CString sDisplayTitle		= pSong ? pSong->GetDisplayMainTitle() : CString("");
+	CString sTranslitTitle		= pSong ? pSong->GetTranslitMainTitle() : CString("");
+	CString sDisplaySubTitle	= pSong ? pSong->GetDisplaySubTitle() : CString("");
+	CString sTranslitSubTitle	= pSong ? pSong->GetTranslitSubTitle() : CString("");
+	CString sDisplayArtist		= pSong ? (CString)ARTIST_PREPEND_STRING + pSong->GetDisplayArtist() : CString("");
+	CString sTranslitArtist		= pSong ? (CString)ARTIST_PREPEND_STRING + pSong->GetTranslitArtist() : CString("");
 
 	LoadFromString( 
 		sDisplayTitle, sTranslitTitle, 
diff --git a/stepmania/src/TextBanner.h b/stepmania/src/TextBanner.h
index d2a31e0782..7fac354ee3 100644
--- a/stepmania/src/TextBanner.h
+++ b/stepmania/src/TextBanner.h
@@ -5,6 +5,7 @@
 
 #include "ActorFrame.h"
 #include "BitmapText.h"
+#include "ThemeMetric.h"
 class Song;
 
 class TextBanner : public ActorFrame
@@ -22,6 +23,14 @@ private:
 	void Init();
 
 	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