OptionIcon -> ModIcon to reduce confusion between OptionRow, OptionIconRow

stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/default.lua

@@ -48,13 +48,13 @@ t[#t+1] = LoadFont( Var "LoadingScreen", "TimingDifficultyNumber" ) .. {
 	InitCommand=function(self) self:name("TimingDifficultyNumber"); self:settext(GetTimingDifficulty()); ActorUtil.LoadAllCommandsAndSetXY(self,Var "LoadingScreen"); end;
 };
 
-t[#t+1] = Def.OptionIconRow {
+t[#t+1] = Def.ModIconRow {
-		InitCommand=cmd(x,SCREEN_CENTER_X-316;y,SCREEN_CENTER_Y-130;draworder,1;Load,"OptionIconRowEvaluationP1",PLAYER_1,player,PLAYER_1);
+		InitCommand=cmd(x,SCREEN_CENTER_X-316;y,SCREEN_CENTER_Y-130;draworder,1;Load,"ModIconRowEvaluationP1",PLAYER_1,player,PLAYER_1);
 		OnCommand=cmd(zoomy,0;linear,0.5;zoomy,1);
 		OffCommand=cmd(linear,0.5;zoomy,0);
 	};
-t[#t+1] = Def.OptionIconRow {
+t[#t+1] = Def.ModIconRow {
-		InitCommand=cmd(x,SCREEN_CENTER_X+316;y,SCREEN_CENTER_Y-130;draworder,1;Load,"OptionIconRowEvaluationP2",PLAYER_2;player,PLAYER_2);
+		InitCommand=cmd(x,SCREEN_CENTER_X+316;y,SCREEN_CENTER_Y-130;draworder,1;Load,"ModIconRowEvaluationP2",PLAYER_2;player,PLAYER_2);
 		OnCommand=cmd(zoomy,0;linear,0.5;zoomy,1);
 		OffCommand=cmd(linear,0.5;zoomy,0);
 	};

stepmania/Themes/default/BGAnimations/ScreenGameplay decorations/default.lua

@@ -18,13 +18,13 @@ t[#t+1] = LoadActor( THEME:GetPathB('','_standard decoration required'), "LeftFr
 t[#t+1] = LoadActor( THEME:GetPathB('','_standard decoration required'), "RightFrame", "RightFrame" );
 
 
-t[#t+1] = Def.OptionIconRow {
+t[#t+1] = Def.ModIconRow {
-		InitCommand=cmd(x,SCREEN_CENTER_X-300;y,SCREEN_CENTER_Y;Load,"OptionIconRowGameplay",PLAYER_1;player,PLAYER_1;);
+		InitCommand=cmd(x,SCREEN_CENTER_X-300;y,SCREEN_CENTER_Y;Load,"ModIconRowGameplay",PLAYER_1;player,PLAYER_1;);
 		OnCommand=cmd(zoomy,0;linear,0.5;zoomy,1);
 		OffCommand=cmd(linear,0.5;zoomy,0);
 	};
-t[#t+1] = Def.OptionIconRow {
+t[#t+1] = Def.ModIconRow {
-		InitCommand=cmd(x,SCREEN_CENTER_X+300;y,SCREEN_CENTER_Y;Load,"OptionIconRowGameplay",PLAYER_2;player,PLAYER_2;);
+		InitCommand=cmd(x,SCREEN_CENTER_X+300;y,SCREEN_CENTER_Y;Load,"ModIconRowGameplay",PLAYER_2;player,PLAYER_2;);
 		OnCommand=cmd(zoomy,0;linear,0.5;zoomy,1);
 		OffCommand=cmd(linear,0.5;zoomy,0);
 	};

stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua

@@ -45,7 +45,7 @@ end
 local function OptionsArea(pn)
 	local t = Def.ActorFrame {};
 	t[#t+1] = Def.ActorFrame {
-		InitCommand=cmd(x,-1*THEME:GetMetric("OptionIconRowSelectMusic","SpacingX");y,-1*THEME:GetMetric("OptionIconRowSelectMusic","SpacingY"););
+		InitCommand=cmd(x,-1*THEME:GetMetric("ModIconRowSelectMusic","SpacingX");y,-1*THEME:GetMetric("ModIconRowSelectMusic","SpacingY"););
 		LoadActor( "option icon header" ) .. {
 		
 		};
@@ -53,8 +53,8 @@ local function OptionsArea(pn)
 			InitCommand=cmd(y,-4;settext,PlayerNumberToLocalizedString(pn);zoom,0.5;zoom,0.5;diffuse,color("#baa200");shadowlength,0;strokecolor,color("#00000000"););
 		};
 	};
-	t[#t+1] = Def.OptionIconRow {
+	t[#t+1] = Def.ModIconRow {
-		InitCommand=cmd(Load,"OptionIconRowSelectMusic",pn;);
+		InitCommand=cmd(Load,"ModIconRowSelectMusic",pn;);
 		OnCommand=cmd(zoomy,0;linear,0.5;zoomy,1;);
 		OffCommand=cmd(linear,0.5;zoomy,0;);
 	};

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

@@ -1 +0,0 @@
-_option icon

stepmania/Themes/default/Graphics/ModIconSelectMusic Empty.redir

@@ -0,0 +1 @@
+ModIconRow icon filled

stepmania/Themes/default/Graphics/OptionIconRow icon empty.redir

@@ -1 +0,0 @@
-OptionIconRow icon filled

stepmania/Themes/default/Graphics/OptionRow IconEmpty.redir

@@ -0,0 +1 @@
+ModIconRow IconEmpty

stepmania/Themes/default/Graphics/OptionRow IconFilled.redir

@@ -0,0 +1 @@
+ModIconRow IconEmpty

stepmania/Themes/default/Graphics/ScreenOptions RowFrameExit/default.lua

@@ -1,10 +0,0 @@
-return Def.ActorFrame {
-	LoadActor("focus") .. {
-		GainFocusCommand=cmd(visible,true;);
-		LoseFocusCommand=cmd(visible,false;);
-	};
-	LoadActor("nofocus") .. {
-		GainFocusCommand=cmd(visible,false;);
-		LoseFocusCommand=cmd(visible,true;);
-	};
-};

stepmania/Themes/default/Graphics/ScreenOptions RowFrameNormal/default.lua

@@ -1,10 +0,0 @@
-return Def.ActorFrame {
-	LoadActor("focus") .. {
-		GainFocusCommand=cmd(visible,true;);
-		LoseFocusCommand=cmd(visible,false;);
-	};
-	LoadActor("nofocus") .. {
-		GainFocusCommand=cmd(visible,false;);
-		LoseFocusCommand=cmd(visible,true;);
-	};
-};

stepmania/Themes/default/Graphics/ScreenOptions footer.redir

@@ -0,0 +1 @@
+_footer large

stepmania/Themes/default/Graphics/ScreenOptionsService header.redir

@@ -1 +0,0 @@
-_blank

stepmania/Themes/default/Graphics/ScreenOptionsServiceChild header.redir

@@ -1 +0,0 @@
-_blank

stepmania/Themes/default/Languages/en.ini

@@ -1304,6 +1304,8 @@ Off=Off
 Error mounting card: %s=Error mounting card: %s
 
 [ScreenOptionsService]
+HeaderText=Options
+HeaderSubText=You can configure the game here
 HelpText=&UP; &DOWN; to change line   then press START
 
 [ScreenOtherOptions]

stepmania/Themes/default/metrics.ini

@@ -723,14 +723,14 @@ BPMDisplayX=SCREEN_CENTER_X-120
 BPMDisplayY=SCREEN_CENTER_Y+185
 BPMDisplayOnCommand=horizalign,right;shadowlength,0;addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6
 BPMDisplayOffCommand=bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6
-OptionIconsP1X=SCREEN_CENTER_X-300
+ModIconsP1X=SCREEN_CENTER_X-300
-OptionIconsP1Y=SCREEN_CENTER_Y-182
+ModIconsP1Y=SCREEN_CENTER_Y-182
-OptionIconsP1OnCommand=zoomy,0;linear,0.5;zoomy,1
+ModIconsP1OnCommand=zoomy,0;linear,0.5;zoomy,1
-OptionIconsP1OffCommand=linear,0.5;zoomy,0
+ModIconsP1OffCommand=linear,0.5;zoomy,0
-OptionIconsP2X=SCREEN_CENTER_X-300
+ModIconsP2X=SCREEN_CENTER_X-300
-OptionIconsP2Y=SCREEN_CENTER_Y-164
+ModIconsP2Y=SCREEN_CENTER_Y-164
-OptionIconsP2OnCommand=zoomy,0;linear,0.5;zoomy,1
+ModIconsP2OnCommand=zoomy,0;linear,0.5;zoomy,1
-OptionIconsP2OffCommand=linear,0.5;zoomy,0
+ModIconsP2OffCommand=linear,0.5;zoomy,0
 ChatInputBoxY=SCREEN_CENTER_Y+110
 ChatInputBoxX=SCREEN_CENTER_X-157
 ChatInputBoxOnCommand=addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6
@@ -2214,7 +2214,6 @@ ShowScrollBar=false
 ScrollBarHeight=0
 ScrollBarTime=0
 LineHighlightX=SCREEN_CENTER_X
-ShowBpmInSpeedTitle=false
 FrameOnCommand=x,-SCREEN_WIDTH;decelerate,0.3;addx,SCREEN_WIDTH
 FrameOffCommand=accelerate,0.3;addx,SCREEN_WIDTH
 ShowExitRow=true
@@ -2228,17 +2227,20 @@ MoreExitSelectedP2Command=
 MoreExitUnselectedP1Command=
 MoreExitUnselectedP2Command=
 ShowExplanations=true
-ShowOptionIcons=true
-ShowUnderlines=true
-IconsOnCommand=x,-30
 AllowRepeatingChangeValueInput=false
 CursorTweenSeconds=0.3
 WrapValueInRow=true
+OptionRowMetricsGroup="OptionRow"
 
-IconsP1X=SCREEN_CENTER_X-280
+[OptionRow]
-IconsP2X=SCREEN_CENTER_X+280
+ShowModIcons=true
-RowFrameX=SCREEN_CENTER_X-232
+ShowUnderlines=true
-RowFrameOnCommand=
+ShowBpmInSpeedTitle=false
+ModIconP1X=SCREEN_CENTER_X-280
+ModIconP2X=SCREEN_CENTER_X+280
+ModIconOnCommand=x,-30
+FrameX=SCREEN_CENTER_X
+FrameOnCommand=
 TitleX=SCREEN_CENTER_X-180
 TitleOnCommand=zoom,0.7;horizalign,right;shadowlength,0
 TitleGainFocusCommand=
@@ -2259,9 +2261,7 @@ ColorNotSelected=color("0.5,0.5,0.5,1")
 ColorDisabled=color("0.1,0.1,0.1,1")
 CapitalizeAllOptionNames=false
 TweenSeconds=0.3
-
+ModIconMetricsGroup="ModIcon"
-LineExitItem=list,ExitItem
-LineExitTitle=list,ExitTitle
 
 [ScreenMapControllers]
 Class="ScreenMapControllers"
@@ -2625,42 +2625,43 @@ MountainsBaseY=
 MountainWidth=
 MountainHeight=
 
-[OptionIcon]
+[ModIcon]
-TextOffsetX=0
+TextX=0
-TextOffsetY=-2
+TextY=-2
-TextHAlign=1	-- 0,1,2 = left,center,right
+TextOnCommand=zoom,0.5;maxwidth,72;uppercase,true
-TextVAlign=1	-- 0,1,2 = top,middle,bottom
-TextWidth=72
-TextZoom=0.5
-Uppercase=false
 
-[OptionIconRow]
+[ModIconSelectMusic]
-NumOptionIcons=6
+Fallback="ModIcon"
-OptionIconOnCommand=
+
+[ModIconRow]
+NumModIcons=6
+ModIconOnCommand=
 SpacingX=46
 SpacingY=0
+ModIconMetircsGroup="ModIcon"
 
-[OptionIconRowSelectMusic]
+[ModIconRowSelectMusic]
-Fallback="OptionIconRow"
+Fallback="ModIconRow"
+ModIconMetircsGroup="ModIconSelectMusic"
 
-[OptionIconRowGameplay]
+[ModIconRowGameplay]
-Fallback="OptionIconRow"
+Fallback="ModIconRow"
 SpacingX=0
 SpacingY=46
 
-[OptionIconRowGameplayP1]
+[ModIconRowGameplayP1]
-Fallback="OptionIconRowGameplay"
+Fallback="ModIconRowGameplay"
-OptionIconOnCommand=rotationz,-90;
+ModIconOnCommand=rotationz,-90;
 
-[OptionIconRowGameplayP2]
+[ModIconRowGameplayP2]
-Fallback="OptionIconRowGameplay"
+Fallback="ModIconRowGameplay"
-OptionIconOnCommand=rotationz,90;
+ModIconOnCommand=rotationz,90;
 
-[OptionIconRowEvaluationP1]
+[ModIconRowEvaluationP1]
-Fallback="OptionIconRowGameplayP1"
+Fallback="ModIconRowGameplayP1"
 
-[OptionIconRowEvaluationP2]
+[ModIconRowEvaluationP2]
-Fallback="OptionIconRowGameplayP2"
+Fallback="ModIconRowGameplayP2"
 
 [TransitionOniFade]
 BannerWidth=512
@@ -3405,7 +3406,6 @@ PrevScreen=ScreenTitleBranch()
 # when using entries that change the screen; otherwise, the only way to
 # exit the screen when in regular mode is "exit".
 
-IconsOnCommand=x,-30
 TimerOnCommand=visible,false
 ShowStyleIcon=false
 TimerSeconds=-1
@@ -4024,11 +4024,13 @@ HeaderY=SCREEN_TOP+40
 HeaderOnCommand=
 HeaderOffCommand=
 AllowRepeatingChangeValueInput=true
+OptionRowMetricsGroup="OptionRowMiniMenu"
 
+[OptionRowMiniMenu]
 IconsP1X=SCREEN_CENTER_X-280
 IconsP2X=SCREEN_CENTER_X+280
 IconsOnCommand=x,-30
-RowFrameX=SCREEN_CENTER_X-232
+FrameX=SCREEN_CENTER_X-232
 TitleX=SCREEN_CENTER_X-150
 TitleOnCommand=horizalign,left;shadowlength,2
 ItemsStartX=SCREEN_CENTER_X-160
@@ -4196,10 +4198,6 @@ WrapValueInRow=false
 NavigationMode="menu"
 ForceAllPlayers=true
 InputMode="together"
-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
-RowFrameOnCommand=visible,false
 
 [ScreenOptionsManageCourses]
 Class="ScreenOptionsManageCourses"