From 14fc0839d528dd39105bd51c405d83009799442b Mon Sep 17 00:00:00 2001
From: Jason Felds <jafelds@gmail.com>
Date: Thu, 12 May 2011 23:11:42 -0400
Subject: [PATCH] [splittiming] Prepare right side of editor.

Now, what key on the keyboard can be used for switching...
---
 Themes/_fallback/Languages/en.ini | 3 +++
 Themes/_fallback/metrics.ini      | 1 +
 src/ScreenEdit.cpp                | 9 +++++++++
 3 files changed, 13 insertions(+)

diff --git a/Themes/_fallback/Languages/en.ini b/Themes/_fallback/Languages/en.ini
index b4f91ef808..98a6d9c2e7 100644
--- a/Themes/_fallback/Languages/en.ini
+++ b/Themes/_fallback/Languages/en.ini
@@ -1276,6 +1276,9 @@ Mines=Mines
 Rolls=Rolls
 Lifts=Lifts
 Fakes=Fakes
+Timing Mode=Timing Mode
+Step Timing=Step Timing
+Song Timing=Song Timing
 Beat 0 offset=Beat 0 offset
 Preview Start=Preview Start
 Preview Length=Preview Length
diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini
index ecac994d7e..9423e563fb 100644
--- a/Themes/_fallback/metrics.ini
+++ b/Themes/_fallback/metrics.ini
@@ -3627,6 +3627,7 @@ NumHandsFormat="%s: %d\n"
 NumRollsFormat="%s: %d\n"
 NumLiftsFormat="%s: %d\n"
 NumFakesFormat="%s: %d\n"
+TimingModeFormat="%:\n  %s\n"
 Beat0OffsetFormat="%s:\n  %.5f secs\n"
 PreviewStartFormat="%s:\n  %.5f secs\n"
 PreviewLengthFormat="%s:\n  %.5f secs\n"
diff --git a/src/ScreenEdit.cpp b/src/ScreenEdit.cpp
index 0113f41682..d05063d0ad 100644
--- a/src/ScreenEdit.cpp
+++ b/src/ScreenEdit.cpp
@@ -1035,6 +1035,9 @@ static LocalizedString MINES("ScreenEdit", "Mines");
 static LocalizedString ROLLS("ScreenEdit", "Rolls");
 static LocalizedString LIFTS("ScreenEdit", "Lifts");
 static LocalizedString FAKES("ScreenEdit", "Fakes");
+static LocalizedString TIMING_MODE("ScreenEdit", "Timing Mode");
+static LocalizedString STEP_TIMING("ScreenEdit", "Step Timing");
+static LocalizedString SONG_TIMING("ScreenEdit", "Song Timing");
 static LocalizedString BEAT_0_OFFSET("ScreenEdit", "Beat 0 offset");
 static LocalizedString PREVIEW_START("ScreenEdit", "Preview Start");
 static LocalizedString PREVIEW_LENGTH("ScreenEdit", "Preview Length");
@@ -1060,6 +1063,7 @@ static ThemeMetric<RString> NUM_HANDS_FORMAT("ScreenEdit", "NumHandsFormat");
 static ThemeMetric<RString> NUM_ROLLS_FORMAT("ScreenEdit", "NumRollsFormat");
 static ThemeMetric<RString> NUM_LIFTS_FORMAT("ScreenEdit", "NumLiftsFormat");
 static ThemeMetric<RString> NUM_FAKES_FORMAT("ScreenEdit", "NumFakesFormat");
+static ThemeMetric<RString> TIMING_MODE_FORMAT("ScreenEdit", "TimingModeFormat");
 static ThemeMetric<RString> BEAT_0_OFFSET_FORMAT("ScreenEdit", "Beat0OffsetFormat");
 static ThemeMetric<RString> PREVIEW_START_FORMAT("ScreenEdit", "PreviewStartFormat");
 static ThemeMetric<RString> PREVIEW_LENGTH_FORMAT("ScreenEdit", "PreviewLengthFormat");
@@ -1139,6 +1143,11 @@ void ScreenEdit::UpdateTextInfo()
 	case EditMode_Home:
 		break;
 	case EditMode_Full:
+		sText += ssprintf( TIMING_MODE_FORMAT.GetValue(),
+				  TIMING_MODE.GetValue().c_str(),
+				  ( GAMESTATE->m_bIsEditorStepTiming ?
+				   STEP_TIMING.GetValue().c_str() :
+				   SONG_TIMING.GetValue().c_str() ) );
 		sText += ssprintf( BEAT_0_OFFSET_FORMAT.GetValue(), 
 				  BEAT_0_OFFSET.GetValue().c_str(), 
 				  GetAppropriateTiming().m_fBeat0OffsetInSeconds );