split some metrics from ScreenOptions into OptionRow

stepmania/Themes/default/metrics.ini

@@ -766,7 +766,6 @@ Class=ScreenSMOnlineLogin
 Fallback=ScreenOperatorMenu
 NextScreen=ScreenNetRoom
 PrevScreen=@ScreenTitleBranch()
-CapitalizeAllOptionNames=0
 HelpText=
 StyleIcon=0
 MemoryCardIcons=0
@@ -2208,15 +2207,23 @@ TextZoom=0.8
 NextScreen=ScreenRanking
 
 [ScreenEditMenu]
-Class=ScreenEditMenu
+Class=ScreenOptionsMaster
-Fallback=ScreenWithMenuElements
+Fallback=ScreenOptions
+NextScreen=ScreenEdit
 PrevScreen=@ScreenTitleBranch()
-ExplanationX=SCREEN_CENTER_X+0
-ExplanationY=SCREEN_CENTER_Y+170
-ExplanationOnCommand=wrapwidthpixels,900;zoom,0.7
 StyleIcon=0
-MemoryCardIcons=0
+MemoryCardIcons=1
 TimerSeconds=0
+ShowScrollBar=0
+OptionMenuFlags=together;forceallplayers;explanations
+LineNames=1,2,3,4,5,6
+Line1=list,SongsInCurrentSongGroup
+Line2=StepsType,EditStepsType
+Line3=Steps,EditSteps
+Line4=StepsType,EditSourceStepsType
+Line5=Steps,EditSourceSteps
+Line6=EditMenuAction,EditMenuAction
+ShowUnderlines=0
 
 [ScreenJukeboxMenu]
 Class=ScreenOptionsMaster
@@ -2226,7 +2233,6 @@ PrevScreen=@ScreenTitleBranch()
 StyleIcon=0
 MemoryCardIcons=1
 TimerSeconds=0
-CapitalizeAllOptionNames=1
 OptionMenuFlags=together;forceallplayers;explanations
 LineNames=1,2,3,4
 Line1=list,Styles
@@ -2426,11 +2432,6 @@ WarningCommand0=stoptweening;stopeffect;linear,0.2;zoomx,1
 
 [ScreenOptions]
 Fallback=ScreenWithMenuElements
-IconsP1X=SCREEN_CENTER_X-280
-IconsP2X=SCREEN_CENTER_X+280
-ArrowsX=SCREEN_CENTER_X-232
-LabelsX=SCREEN_CENTER_X-180
-LabelsOnCommand=zoom,0.7;horizalign,right;ShadowLength,0
 NumRowsShown=10
 RowYOffScreenTop=SCREEN_CENTER_Y-152+34*(-0.5)
 Row1Y=SCREEN_CENTER_Y-152+34*0
@@ -2445,13 +2446,6 @@ Row8Y=SCREEN_CENTER_Y-152+34*7
 Row9Y=SCREEN_CENTER_Y-152+34*8
 Row10Y=SCREEN_CENTER_Y-152+34*9
 RowYOffScreenBottom=SCREEN_CENTER_Y-152+34*9.5
-ItemsZoom=0.5
-ItemsStartX=SCREEN_CENTER_X-160
-ItemsEndX=SCREEN_CENTER_X+280
-ItemsGapX=14
-ItemsLongRowP1X=260
-ItemsLongRowP2X=420
-ItemsLongRowSharedX=340
 ExplanationP1X=SCREEN_CENTER_X-250
 ExplanationP1Y=SCREEN_CENTER_Y+172
 ExplanationP2X=SCREEN_CENTER_X+250
@@ -2476,9 +2470,6 @@ PageOnCommand=
 LineHighlightOnCommand=
 LineHighlightChangeCommand=
 LineHighlightChangeToExitCommand=
-ColorSelected=1,1,1,1
-ColorNotSelected=0.5,0.5,0.5,1
-ColorDisabled=1,1,1,0
 ShowScrollBar=0
 ScrollBarHeight=0
 ScrollBarTime=0
@@ -2496,6 +2487,25 @@ MoreExitSelectedP1Command=
 MoreExitSelectedP2Command=
 MoreExitUnselectedP1Command=
 MoreExitUnselectedP2Command=
+OptionRowType=OptionRow
+
+[OptionRow]
+IconsP1X=SCREEN_CENTER_X-280
+IconsP2X=SCREEN_CENTER_X+280
+ArrowsX=SCREEN_CENTER_X-232
+LabelsX=SCREEN_CENTER_X-180
+LabelsOnCommand=zoom,0.7;horizalign,right;ShadowLength,0
+ItemsZoom=0.5
+ItemsStartX=SCREEN_CENTER_X-160
+ItemsEndX=SCREEN_CENTER_X+280
+ItemsGapX=14
+ItemsLongRowP1X=260
+ItemsLongRowP2X=420
+ItemsLongRowSharedX=340
+ColorSelected=1,1,1,1
+ColorNotSelected=0.5,0.5,0.5,1
+ColorDisabled=1,1,1,0
+CapitalizeAllOptionNames=0
 ShowUnderlines=1
 TweenSeconds=0.3
 
@@ -3025,7 +3035,6 @@ MemoryCardIcons=0
 TimerSeconds=0
 PrevScreen=ScreenOptionsMenu
 NextScreen=ScreenOptionsMenu
-CapitalizeAllOptionNames=0
 
 [ScreenInputOptions]
 Fallback=ScreenOptionsSubmenu
@@ -3151,7 +3160,6 @@ Delete=
 Rename=
 CardDirPlayer1=
 CardDirPlayer2=
-CapitalizeAllOptionNames=0
 StyleIcon=0
 MemoryCardIcons=0
 TimerSeconds=0
@@ -3445,40 +3453,6 @@ PlayerP2TwoPlayersTwoSidesX=SCREEN_CENTER_X+160
 PlayerP1OnePlayerTwoSidesX=SCREEN_CENTER_X
 PlayerP2OnePlayerTwoSidesX=SCREEN_CENTER_X
 
-[EditMenu]
-PrevScreen=@ScreenTitleBranch()
-Arrows1X=SCREEN_CENTER_X-130
-Arrows2X=SCREEN_CENTER_X+270
-SongBannerX=SCREEN_CENTER_X+170
-SongBannerY=SCREEN_CENTER_Y-110
-SongBannerWidth=130
-SongBannerHeight=40
-SongTextBannerX=SCREEN_CENTER_X+0
-SongTextBannerY=SCREEN_CENTER_Y-110
-GroupBannerX=SCREEN_CENTER_X+170
-GroupBannerY=SCREEN_CENTER_Y-160
-GroupBannerWidth=130
-GroupBannerHeight=40
-MeterX=SCREEN_CENTER_X+170
-MeterY=SCREEN_CENTER_Y-20
-SourceMeterX=SCREEN_CENTER_X+170
-SourceMeterY=SCREEN_CENTER_Y+60
-RowLabelsX=SCREEN_CENTER_X-300
-RowValue1X=SCREEN_CENTER_X+0
-RowValue2X=SCREEN_CENTER_X+60
-RowValue3X=SCREEN_CENTER_X+60
-RowValue4X=SCREEN_CENTER_X+0
-RowValue5X=SCREEN_CENTER_X+60
-RowValue6X=SCREEN_CENTER_X+0
-RowValue7X=SCREEN_CENTER_X+60
-Row1Y=SCREEN_CENTER_Y-160
-Row2Y=SCREEN_CENTER_Y-110
-Row3Y=SCREEN_CENTER_Y-60
-Row4Y=SCREEN_CENTER_Y-20
-Row5Y=SCREEN_CENTER_Y+20
-Row6Y=SCREEN_CENTER_Y+60
-Row7Y=SCREEN_CENTER_Y+100
-
 [EditCoursesMenu]
 Arrows1X=SCREEN_CENTER_X-130
 Arrows2X=SCREEN_CENTER_X+270
@@ -3625,7 +3599,6 @@ NextScreen=ScreenSongOptions
 TimerSeconds=30
 StyleIcon=0
 MemoryCardIcons=0
-CapitalizeAllOptionNames=0
 LineNames=1,2,3,4,5,6,7,8,9,10,11,12,13,14,15
 OptionMenuFlags=
 Line1=list,Speed
@@ -3660,7 +3633,6 @@ NextScreen=ScreenStage
 TimerSeconds=30
 StyleIcon=0
 MemoryCardIcons=0
-CapitalizeAllOptionNames=0
 LineNames=1,2,3,4,5
 OptionMenuFlags=
 Line1=list,Speed
@@ -3678,7 +3650,6 @@ Game=Change the current game type with this option.
 TimerSeconds=30
 StyleIcon=0
 MemoryCardIcons=0
-CapitalizeAllOptionNames=1
 LineNames=1,2,3,4,5,6,7,8
 OptionMenuFlags=
 Line1=list,LifeType
@@ -4147,3 +4118,5 @@ SortLevel5Color=0,1,0,1
 [Inventory]
 ItemUseRateSeconds=0
 
+[OptionRowHandler]
+StepsTypesToHide=

stepmania/src/ScreenOptions.cpp

@@ -92,7 +92,8 @@ ScreenOptions::ScreenOptions( CString sClassName ) : ScreenWithMenuElements(sCla
 	FRAME_ON_COMMAND				(m_sName,"FrameOnCommand"),
 	FRAME_OFF_COMMAND				(m_sName,"FrameOffCommand"),
 	SEPARATE_EXIT_ROW				(m_sName,"SeparateExitRow"),
-	SEPARATE_EXIT_ROW_Y				(m_sName,"SeparateExitRowY")
+	SEPARATE_EXIT_ROW_Y				(m_sName,"SeparateExitRowY"),
+	OPTION_ROW_TYPE					(m_sName,"OptionRowType")
 {
 	LOG->Trace( "ScreenOptions::ScreenOptions()" );
 }
@@ -145,7 +146,7 @@ void ScreenOptions::InitMenu( InputMode im, const vector<OptionRowDefinition> &v
 		
 		bool bFirstRowGoesDown = m_OptionsNavigation==NAV_TOGGLE_THREE_KEY;
 
-		row.LoadMetrics( m_sName );
+		row.LoadMetrics( OPTION_ROW_TYPE );
 		row.LoadNormal( vDefs[r], vHands[r], bFirstRowGoesDown );
 
 		this->ImportOptions( r );
@@ -193,7 +194,7 @@ void ScreenOptions::InitMenu( InputMode im, const vector<OptionRowDefinition> &v
 	// TRICKY:  Add one more item.  This will be "EXIT"
 	m_Rows.push_back( new OptionRow() );
 	OptionRow &row = *m_Rows.back();
-	row.LoadMetrics( m_sName );
+	row.LoadMetrics( OPTION_ROW_TYPE );
 	row.LoadExit();
 
 	m_framePage.AddChild( &row );

stepmania/src/ScreenOptions.h

@@ -135,6 +135,7 @@ protected:
 	ThemeMetric<apActorCommands>	FRAME_OFF_COMMAND;
 	ThemeMetric<bool>				SEPARATE_EXIT_ROW;
 	ThemeMetric<float>				SEPARATE_EXIT_ROW_Y;
+	ThemeMetric<CString>			OPTION_ROW_TYPE;
 };
 
 #endif