From 3869c690988f03470e5c575925b918fe7c8540a8 Mon Sep 17 00:00:00 2001
From: AJ Kelly <aj187@ajworld.net>
Date: Sat, 30 Apr 2011 03:45:16 -0500
Subject: [PATCH] [ScreenOptions] Renamed "ScreenOptions LineHighlight" to
 "ScreenOptions LineHighlight P#", making it load per-player.

---
 Docs/Changelog_sm-ssc.txt                     |  7 ++++-
 ...r => ScreenOptions LineHighlight P1.redir} |  0
 .../ScreenOptions LineHighlight P2.redir      |  1 +
 Themes/_fallback/metrics.ini                  | 29 +++++++++++++------
 src/ScreenOptions.cpp                         |  6 ++--
 5 files changed, 30 insertions(+), 13 deletions(-)
 rename Themes/_fallback/Graphics/{ScreenOptions LineHighlight.redir => ScreenOptions LineHighlight P1.redir} (100%)
 create mode 100644 Themes/_fallback/Graphics/ScreenOptions LineHighlight P2.redir

diff --git a/Docs/Changelog_sm-ssc.txt b/Docs/Changelog_sm-ssc.txt
index d1126c8c48..5e94e7ad26 100644
--- a/Docs/Changelog_sm-ssc.txt
+++ b/Docs/Changelog_sm-ssc.txt
@@ -10,9 +10,14 @@ supported but exist anyways.)
 _____________________________________________________________________________
 
 ================================================================================
-sm-ssc v1.2.5 | 201104??
+sm-ssc v1.2.5 | 20110???
 --------------------------------------------------------------------------------
 
+20110430
+--------
+* [ScreenOptions] Renamed "ScreenOptions LineHighlight" to "ScreenOptions
+  LineHighlight P#", making it load per-player. [AJ]
+
 20110428
 --------
 * [BeginnerHelper] Various changes: [AJ]
diff --git a/Themes/_fallback/Graphics/ScreenOptions LineHighlight.redir b/Themes/_fallback/Graphics/ScreenOptions LineHighlight P1.redir
similarity index 100%
rename from Themes/_fallback/Graphics/ScreenOptions LineHighlight.redir
rename to Themes/_fallback/Graphics/ScreenOptions LineHighlight P1.redir
diff --git a/Themes/_fallback/Graphics/ScreenOptions LineHighlight P2.redir b/Themes/_fallback/Graphics/ScreenOptions LineHighlight P2.redir
new file mode 100644
index 0000000000..04b2ead777
--- /dev/null
+++ b/Themes/_fallback/Graphics/ScreenOptions LineHighlight P2.redir	
@@ -0,0 +1 @@
+_blank
\ No newline at end of file
diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini
index 2a9707d593..11d8c16f2b 100644
--- a/Themes/_fallback/metrics.ini
+++ b/Themes/_fallback/metrics.ini
@@ -2082,9 +2082,12 @@ PageOnCommand=
 ContainerOnCommand=
 ContainerOffCommand=
 CursorOnCommand=
-LineHighlightOnCommand=
-LineHighlightChangeCommand=
-LineHighlightChangeToExitCommand=
+LineHighlightP1OnCommand=
+LineHighlightP1ChangeCommand=
+LineHighlightP1ChangeToExitCommand=
+LineHighlightP2OnCommand=
+LineHighlightP2ChangeCommand=
+LineHighlightP2ChangeToExitCommand=
 ShowScrollBar=false
 ScrollBarHeight=0
 ScrollBarTime=0
@@ -2472,9 +2475,13 @@ Fallback="ScreenOptionsSimple"
 
 OptionRowNormalMetricsGroup="OptionRowService"
 
-LineHighlightOnCommand=visible,false
-LineHighlightChangeCommand=
-LineHighlightChangeToExitCommand=
+LineHighlightP1OnCommand=visible,false
+LineHighlightP1ChangeCommand=
+LineHighlightP1ChangeToExitCommand=
+
+LineHighlightP2OnCommand=visible,false
+LineHighlightP2ChangeCommand=
+LineHighlightP2ChangeToExitCommand=
 
 CursorOnCommand=visible,false
 
@@ -2531,9 +2538,13 @@ PrevScreen="ScreenOptionsService"
 NextScreen="ScreenOptionsService"
 HelpText=Screen.String("HelpTextOptionsAndBack")
 
-LineHighlightOnCommand=visible,false
-LineHighlightChangeCommand=
-LineHighlightChangeToExitCommand=
+LineHighlightP1OnCommand=visible,false
+LineHighlightP1ChangeCommand=
+LineHighlightP1ChangeToExitCommand=
+
+LineHighlightP2OnCommand=visible,false
+LineHighlightP2ChangeCommand=
+LineHighlightP2ChangeToExitCommand=
 #
 ExplanationTogetherX=SCREEN_CENTER_X
 ExplanationTogetherY=SCREEN_CENTER_Y+174
diff --git a/src/ScreenOptions.cpp b/src/ScreenOptions.cpp
index f41afe9dfd..ad90be30ee 100644
--- a/src/ScreenOptions.cpp
+++ b/src/ScreenOptions.cpp
@@ -131,11 +131,11 @@ void ScreenOptions::Init()
 	LOAD_ALL_COMMANDS_AND_SET_XY( m_sprPage );
 	m_frameContainer.AddChild( m_sprPage );
 
-	// init line line highlights
+	// init line highlights
 	FOREACH_PlayerNumber( p )
 	{
-		m_sprLineHighlight[p].Load( THEME->GetPathG(m_sName,"LineHighlight") );
-		m_sprLineHighlight[p]->SetName( "LineHighlight" );
+		m_sprLineHighlight[p].Load( THEME->GetPathG(m_sName, ssprintf("LineHighlight P%d",p+1)) );
+		m_sprLineHighlight[p]->SetName( ssprintf("LineHighlightP%d",p+1) );
 		m_sprLineHighlight[p]->SetX( LINE_HIGHLIGHT_X );
 		LOAD_ALL_COMMANDS( m_sprLineHighlight[p] );
 		m_frameContainer.AddChild( m_sprLineHighlight[p] );