From 1c0dc2aad842c12003b8db95342aef199a37d542 Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Tue, 6 Dec 2005 04:21:00 +0000
Subject: [PATCH] LABEL_ -> TITLE_

---
 stepmania/src/OptionRow.cpp | 19 +++++++++++--------
 stepmania/src/OptionRow.h   |  8 ++++----
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/stepmania/src/OptionRow.cpp b/stepmania/src/OptionRow.cpp
index 20863caecc..a27cd26769 100644
--- a/stepmania/src/OptionRow.cpp
+++ b/stepmania/src/OptionRow.cpp
@@ -63,6 +63,9 @@ CString OptionRow::OptionTitle( CString s ) const
 	if( m_RowDef.m_bAllowThemeTitle )
 		bTheme = true;
 
+	if( s.empty() )
+		return s;
+
 	return bTheme ? THEME->GetMetric("OptionTitles",s) : s;
 }
 
@@ -123,10 +126,10 @@ void OptionRowType::Load( const CString &sType )
 
 	BULLET_X   						.Load(sType,"BulletX");
 	BULLET_ON_COMMAND   			.Load(sType,"BulletOnCommand");
-	LABELS_X						.Load(sType,"LabelsX");
-	LABELS_ON_COMMAND				.Load(sType,"LabelsOnCommand");
-	LABEL_GAIN_FOCUS_COMMAND		.Load(sType,"LabelGainFocusCommand");
-	LABEL_LOSE_FOCUS_COMMAND		.Load(sType,"LabelLoseFocusCommand");
+	TITLE_X							.Load(sType,"TitleX");
+	TITLE_ON_COMMAND				.Load(sType,"TitleOnCommand");
+	TITLE_GAIN_FOCUS_COMMAND		.Load(sType,"TitleGainFocusCommand");
+	TITLE_LOSE_FOCUS_COMMAND		.Load(sType,"TitleLoseFocusCommand");
 	ITEMS_START_X					.Load(sType,"ItemsStartX");
 	ITEMS_END_X						.Load(sType,"ItemsEndX");
 	ITEMS_GAP_X						.Load(sType,"ItemsGapX");
@@ -399,8 +402,8 @@ void OptionRow::InitText()
 	{
 	case OptionRow::ROW_NORMAL:
 		m_textTitle->SetText( GetRowTitle() );
-		m_textTitle->SetX( m_pParentType->LABELS_X );
-		m_textTitle->RunCommands( m_pParentType->LABELS_ON_COMMAND );
+		m_textTitle->SetX( m_pParentType->TITLE_X );
+		m_textTitle->RunCommands( m_pParentType->TITLE_ON_COMMAND );
 
 		m_sprBullet->SetX( m_pParentType->BULLET_X );
 		m_sprBullet->RunCommands( m_pParentType->BULLET_ON_COMMAND );
@@ -608,9 +611,9 @@ void OptionRow::UpdateEnabledDisabled()
 	}
 
 	if( bThisRowHasFocusByAny )
-		m_textTitle->RunCommands( m_pParentType->LABEL_GAIN_FOCUS_COMMAND );
+		m_textTitle->RunCommands( m_pParentType->TITLE_GAIN_FOCUS_COMMAND );
 	else
-		m_textTitle->RunCommands( m_pParentType->LABEL_LOSE_FOCUS_COMMAND );
+		m_textTitle->RunCommands( m_pParentType->TITLE_LOSE_FOCUS_COMMAND );
 
 	/* Don't tween selection colors at all. */
 	RageColor color;
diff --git a/stepmania/src/OptionRow.h b/stepmania/src/OptionRow.h
index 163e6fd673..782ca4667b 100644
--- a/stepmania/src/OptionRow.h
+++ b/stepmania/src/OptionRow.h
@@ -103,10 +103,10 @@ private:
 	// metrics
 	ThemeMetric<float>				BULLET_X;
 	ThemeMetric<apActorCommands>	BULLET_ON_COMMAND;
-	ThemeMetric<float>				LABELS_X;
-	ThemeMetric<apActorCommands>	LABELS_ON_COMMAND;
-	ThemeMetric<apActorCommands>	LABEL_GAIN_FOCUS_COMMAND;
-	ThemeMetric<apActorCommands>	LABEL_LOSE_FOCUS_COMMAND;
+	ThemeMetric<float>				TITLE_X;
+	ThemeMetric<apActorCommands>	TITLE_ON_COMMAND;
+	ThemeMetric<apActorCommands>	TITLE_GAIN_FOCUS_COMMAND;
+	ThemeMetric<apActorCommands>	TITLE_LOSE_FOCUS_COMMAND;
 	ThemeMetric<float>				ITEMS_START_X;
 	ThemeMetric<float>				ITEMS_END_X;
 	ThemeMetric<float>				ITEMS_GAP_X;