options fixup

stepmania/Themes/default/Fonts/OptionRow item.redir

@@ -1 +1 @@
-_Arial 14 shadow
+_Arial 14 shadow

stepmania/Themes/default/Fonts/OptionRow title.redir

@@ -1 +1 @@
-_shared2
+_terminator two 32

stepmania/Themes/default/Fonts/ScreenOptions explanation.redir

@@ -1 +1 @@
-_Arial 14 shadow
+_venacti bold 24

stepmania/Themes/default/Fonts/_terminator two 32.ini

@@ -6,6 +6,7 @@ DrawExtraPixelsLeft=4
 DrawExtraPixelsRight=4
 AdvanceExtraPixels=0
 FontBaseZoom=0.5
+DefaultStrokeColor=#00000077
 0=8
 1=8
 2=8

stepmania/Themes/default/Languages/en.ini

@@ -1002,6 +1002,8 @@ Players=Players
 Could not find '%s'.=Could not find '%s'.
 
 [ScreenAppearanceOptions]
+HeaderText=Appearance Options
+HeaderSubText=Make the game play your way
 HelpText=&UP; &DOWN; to change line   &LEFT; &RIGHT; to select between options::START to accept changes   BACK to discard changes
 
 [ScreenBackgroundOptions]

stepmania/Themes/default/metrics.ini

@@ -2179,17 +2179,17 @@ InputMode="individual"
 ForceAllPlayers=false
 RepeatRate=12
 RepeatDelay=0.25
-NumRowsShown=10
+NumRowsShown=8
 RowInitCommand=
 RowOnCommand=
 RowOffCommand=
-RowPositionTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) self:y(SCREEN_CENTER_Y-152+34*offsetFromCenter) end
+RowPositionTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) self:y(SCREEN_CENTER_Y-136+35*offsetFromCenter) end
 ExplanationP1X=SCREEN_CENTER_X-250
 ExplanationP1Y=SCREEN_CENTER_Y+172
 ExplanationP2X=SCREEN_CENTER_X+250
 ExplanationP2Y=SCREEN_CENTER_Y+172
-ExplanationTogetherX=SCREEN_CENTER_X-250
-ExplanationTogetherY=SCREEN_CENTER_Y+172
+ExplanationTogetherX=SCREEN_CENTER_X-280
+ExplanationTogetherY=SCREEN_CENTER_Y+210
 ExplanationTogetherOnCommand=shadowlength,0;wrapwidthpixels,1000;horizalign,left;cropright,1;linear,0.5;cropright,0
 ExplanationTogetherOffCommand=
 ExplanationP1OnCommand=shadowlength,0;wrapwidthpixels,500;horizalign,left;cropright,1;linear,0.5;cropright,0
@@ -2205,7 +2205,7 @@ DisqualifyP2Y=
 DisqualifyP2OnCommand=visible,false
 DisqualifyP2OffCommand=
 PageX=SCREEN_CENTER_X
-PageY=SCREEN_CENTER_Y
+PageY=SCREEN_CENTER_Y+8
 PageOnCommand=
 CursorOnCommand=
 LineHighlightOnCommand=
@@ -2218,8 +2218,8 @@ LineHighlightX=SCREEN_CENTER_X
 FrameOnCommand=x,-SCREEN_WIDTH;decelerate,0.3;addx,SCREEN_WIDTH
 FrameOffCommand=accelerate,0.3;addx,SCREEN_WIDTH
 ShowExitRow=true
-SeparateExitRow=false
-SeparateExitRowY=0
+SeparateExitRow=true
+SeparateExitRowY=SCREEN_CENTER_Y+140
 MoreX=
 MoreY=
 MoreOnCommand=visible,false
@@ -2240,29 +2240,84 @@ ShowBpmInSpeedTitle=false
 ModIconP1X=SCREEN_CENTER_X-280
 ModIconP2X=SCREEN_CENTER_X+280
 ModIconOnCommand=x,-30
-FrameX=SCREEN_CENTER_X
+FrameX=SCREEN_CENTER_X-222
 FrameOnCommand=
-TitleX=SCREEN_CENTER_X-180
-TitleOnCommand=zoom,0.7;horizalign,right;shadowlength,0
-TitleGainFocusCommand=
-TitleLoseFocusCommand=
-ItemsStartX=SCREEN_CENTER_X-160
+TitleX=SCREEN_CENTER_X-222
+TitleOnCommand=shadowlength,0;uppercase,true;wrapwidthpixels,250;
+TitleGainFocusCommand=diffuse,color("#fff600");strokecolor,color("#7f6739");
+TitleLoseFocusCommand=diffuse,color("#ffffff");strokecolor,color("#37537d");
+ItemsStartX=SCREEN_CENTER_X-140
 ItemsEndX=SCREEN_CENTER_X+280
 ItemsGapX=14
 ItemsMinBaseZoom=0.6
 ItemsLongRowP1X=SCREEN_CENTER_X-60
 ItemsLongRowP2X=SCREEN_CENTER_X+100
 ItemsLongRowSharedX=SCREEN_CENTER_X+20
-ItemsOnCommand=
+ItemOnCommand=zoom,0.5;shadowlength,0;
 ItemGainFocusCommand=
 ItemLoseFocusCommand=
 ExitHideItem=false
-ColorSelected=color("1,1,1,1")
-ColorNotSelected=color("0.5,0.5,0.5,1")
-ColorDisabled=color("0.1,0.1,0.1,1")
-CapitalizeAllOptionNames=false
-TweenSeconds=0.3
+TweenSeconds=0.2
 ModIconMetricsGroup="ModIcon"
+ColorSelected=color("1,1,1,1")
+ColorNotSelected=color("0.9,0.9,0.9,1")
+ColorDisabled=color("0.5,0.5,0.5,1")
+
+[OptionsCursor]
+LeftX=
+LeftY=
+LeftOnCommand=horizalign,right;
+MiddleX=
+MiddleY=
+MiddleOnCommand=
+RightX=
+RightY=
+RightOnCommand=horizalign,left;
+CanGoLeftX=
+CanGoLeftY=
+CanGoLeftOnCommand=horizalign,right;
+CanGoRightX=
+CanGoRightY=
+CanGoRightOnCommand=horizalign,left;
+
+[OptionsCursorP1]
+Fallback="OptionsCursor"
+LeftX=-4
+MiddleX=-4
+RightX=-4
+LeftY=-4
+MiddleY=-4
+RightY=-4
+
+[OptionsCursorP2]
+Fallback="OptionsCursor"
+LeftX=4
+MiddleX=4
+RightX=4
+LeftY=4
+MiddleY=4
+RightY=4
+
+[OptionsUnderline]
+Fallback="OptionsCursor"
+
+[OptionsUnderlineP1]
+Fallback="OptionsUnderline"
+LeftX=-2
+MiddleX=-2
+RightX=-2
+LeftY=12-2
+MiddleY=12-2
+RightY=12-2
+
+[OptionsUnderlineP2]
+Fallback="OptionsUnderline"
+LeftX=2
+MiddleX=2
+RightX=2
+LeftY=12+2
+MiddleY=12+2
+RightY=12+2
 
 [ScreenMapControllers]
 Class="ScreenMapControllers"
@@ -3392,12 +3447,18 @@ Fallback="EditCoursesMenu"
 Fallback="ScreenOptionsMaster"
 TitleX=SCREEN_CENTER_X-180
 TitleOnCommand=horizalign,left;shadowlength,0
-TitleGainFocusCommand=diffuseshift;effectcolor1,1.3,1.3,1.3,1;effectcolor2,0.3,0.3,0.3,1
-TitleLoseFocusCommand=stopeffect
 NavigationMode="menu"
 ForceAllPlayers=true
 InputMode="together"
 ShowStyleIcon=false
+OptionRowMetricsGroup="OptionRowSimple"
+CursorOnCommand=visible,false
+
+[OptionRowSimple]
+Fallback="OptionRow"
+FrameX=SCREEN_CENTER_X
+TitleX=SCREEN_CENTER_X
+TitleOnCommand=shadowlength,0;uppercase,true
 
 [ScreenOptionsService]
 Class="ScreenOptionsMaster"
@@ -4047,17 +4108,16 @@ IconsOnCommand=x,-30
 FrameX=SCREEN_CENTER_X-232
 TitleX=SCREEN_CENTER_X-150
 TitleOnCommand=horizalign,left;shadowlength,2
-ItemsStartX=SCREEN_CENTER_X-160
+ItemsStartX=SCREEN_CENTER_X-150
 ItemsEndX=SCREEN_CENTER_X+280
 ItemsGapX=14
 ItemsLongRowP1X=SCREEN_CENTER_X-60
 ItemsLongRowP2X=SCREEN_CENTER_X+100
 ItemsLongRowSharedX=SCREEN_CENTER_X+150
-ItemsOnCommand=
+ItemOnCommand=
 ColorSelected=color("0.5,1,0.5,1")
 ColorNotSelected=color("1,1,1,1")
 ColorDisabled=color("0.5,0.5,0.5,1")
-CapitalizeAllOptionNames=false
 TweenSeconds=0
 
 [ScreenMiniMenuEditHelp]
@@ -4184,7 +4244,6 @@ ColorNotSelected=color("0.7,0.7,0.7,1")
 [ScreenOptionsManage]
 Fallback="ScreenOptionsSimple"
 TimerSeconds=-1
-CapitalizeAllOptionNames=false
 AllowRepeatingChangeValueInput=true
 
 [ScreenOptionsManageEditSteps]
@@ -4206,7 +4265,6 @@ GroupedScreens="ScreenMiniMenuContext"
 PersistScreens="ScreenMiniMenuContext"
 TimerSeconds=-1
 ShowExplanations=false
-CapitalizeAllOptionNames=false
 AllowRepeatingChangeValueInput=true
 WrapValueInRow=false
 NavigationMode="menu"
@@ -4262,7 +4320,6 @@ PrevScreen="ScreenOptionsManageProfiles"
 NextScreen="ScreenOptionsManageProfiles"
 TimerSeconds=-1
 ShowExplanations=false
-CapitalizeAllOptionNames=false
 AllowRepeatingChangeValueInput=true
 WrapValueInRow=0