diff --git a/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/default.lua b/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/default.lua index ca9ecea4ed..10f0f1c15c 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/default.lua +++ b/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 { - InitCommand=cmd(x,SCREEN_CENTER_X-316;y,SCREEN_CENTER_Y-130;draworder,1;Load,"OptionIconRowEvaluationP1",PLAYER_1,player,PLAYER_1); +t[#t+1] = Def.ModIconRow { + 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 { - InitCommand=cmd(x,SCREEN_CENTER_X+316;y,SCREEN_CENTER_Y-130;draworder,1;Load,"OptionIconRowEvaluationP2",PLAYER_2;player,PLAYER_2); +t[#t+1] = Def.ModIconRow { + 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); }; diff --git a/stepmania/Themes/default/BGAnimations/ScreenGameplay decorations/default.lua b/stepmania/Themes/default/BGAnimations/ScreenGameplay decorations/default.lua index 7aa5882085..4a8bf01dcb 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenGameplay decorations/default.lua +++ b/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 { - InitCommand=cmd(x,SCREEN_CENTER_X-300;y,SCREEN_CENTER_Y;Load,"OptionIconRowGameplay",PLAYER_1;player,PLAYER_1;); +t[#t+1] = Def.ModIconRow { + 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 { - InitCommand=cmd(x,SCREEN_CENTER_X+300;y,SCREEN_CENTER_Y;Load,"OptionIconRowGameplay",PLAYER_2;player,PLAYER_2;); +t[#t+1] = Def.ModIconRow { + 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); }; diff --git a/stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua b/stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua index bae070dacf..37f7bb50d8 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua +++ b/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 { - InitCommand=cmd(Load,"OptionIconRowSelectMusic",pn;); + t[#t+1] = Def.ModIconRow { + InitCommand=cmd(Load,"ModIconRowSelectMusic",pn;); OnCommand=cmd(zoomy,0;linear,0.5;zoomy,1;); OffCommand=cmd(linear,0.5;zoomy,0;); }; diff --git a/stepmania/Themes/default/Fonts/OptionIconRow icon.redir b/stepmania/Themes/default/Fonts/ModIcon text.redir similarity index 92% rename from stepmania/Themes/default/Fonts/OptionIconRow icon.redir rename to stepmania/Themes/default/Fonts/ModIcon text.redir index e9d2ccd770..8f50bdf9db 100644 --- a/stepmania/Themes/default/Fonts/OptionIconRow icon.redir +++ b/stepmania/Themes/default/Fonts/ModIcon text.redir @@ -1 +1 @@ -_option icon +_option icon diff --git a/stepmania/Themes/default/Fonts/ScreenOptions item.redir b/stepmania/Themes/default/Fonts/OptionRow item.redir similarity index 94% rename from stepmania/Themes/default/Fonts/ScreenOptions item.redir rename to stepmania/Themes/default/Fonts/OptionRow item.redir index c58932a797..a8d7028b1f 100644 --- a/stepmania/Themes/default/Fonts/ScreenOptions item.redir +++ b/stepmania/Themes/default/Fonts/OptionRow item.redir @@ -1 +1 @@ -_Arial 14 shadow +_Arial 14 shadow diff --git a/stepmania/Themes/default/Fonts/ScreenOptions title.redir b/stepmania/Themes/default/Fonts/OptionRow title.redir similarity index 90% rename from stepmania/Themes/default/Fonts/ScreenOptions title.redir rename to stepmania/Themes/default/Fonts/OptionRow title.redir index ba41a9d72b..045e488229 100644 --- a/stepmania/Themes/default/Fonts/ScreenOptions title.redir +++ b/stepmania/Themes/default/Fonts/OptionRow title.redir @@ -1 +1 @@ -_shared2 +_shared2 diff --git a/stepmania/Themes/default/Fonts/ScreenOptions icon.redir b/stepmania/Themes/default/Fonts/ScreenOptions icon.redir deleted file mode 100644 index e9d2ccd770..0000000000 --- a/stepmania/Themes/default/Fonts/ScreenOptions icon.redir +++ /dev/null @@ -1 +0,0 @@ -_option icon diff --git a/stepmania/Themes/default/Graphics/OptionIconRowGameplay icon empty.redir b/stepmania/Themes/default/Graphics/ModIcon Empty.redir similarity index 100% rename from stepmania/Themes/default/Graphics/OptionIconRowGameplay icon empty.redir rename to stepmania/Themes/default/Graphics/ModIcon Empty.redir diff --git a/stepmania/Themes/default/Graphics/ModIcon Filled (doubleres).png b/stepmania/Themes/default/Graphics/ModIcon Filled (doubleres).png new file mode 100644 index 0000000000..874b5f2a5b Binary files /dev/null and b/stepmania/Themes/default/Graphics/ModIcon Filled (doubleres).png differ diff --git a/stepmania/Themes/default/Graphics/ModIconSelectMusic Empty.redir b/stepmania/Themes/default/Graphics/ModIconSelectMusic Empty.redir new file mode 100644 index 0000000000..76b570e983 --- /dev/null +++ b/stepmania/Themes/default/Graphics/ModIconSelectMusic Empty.redir @@ -0,0 +1 @@ +ModIconRow icon filled \ No newline at end of file diff --git a/stepmania/Themes/default/Graphics/OptionIconRow icon filled (doubleres).png b/stepmania/Themes/default/Graphics/ModIconSelectMusic Filled (doubleres).png old mode 100755 new mode 100644 similarity index 100% rename from stepmania/Themes/default/Graphics/OptionIconRow icon filled (doubleres).png rename to stepmania/Themes/default/Graphics/ModIconSelectMusic Filled (doubleres).png diff --git a/stepmania/Themes/default/Graphics/OptionIconRow icon empty.redir b/stepmania/Themes/default/Graphics/OptionIconRow icon empty.redir deleted file mode 100755 index 8c395a284f..0000000000 --- a/stepmania/Themes/default/Graphics/OptionIconRow icon empty.redir +++ /dev/null @@ -1 +0,0 @@ -OptionIconRow icon filled \ No newline at end of file diff --git a/stepmania/Themes/default/Graphics/OptionIconRowGameplay filled (doubleres).png b/stepmania/Themes/default/Graphics/OptionIconRowGameplay filled (doubleres).png deleted file mode 100644 index 4c8f3b705d..0000000000 Binary files a/stepmania/Themes/default/Graphics/OptionIconRowGameplay filled (doubleres).png and /dev/null differ diff --git a/stepmania/Themes/default/Graphics/OptionRow IconEmpty.redir b/stepmania/Themes/default/Graphics/OptionRow IconEmpty.redir new file mode 100644 index 0000000000..70a66198c3 --- /dev/null +++ b/stepmania/Themes/default/Graphics/OptionRow IconEmpty.redir @@ -0,0 +1 @@ +ModIconRow IconEmpty \ No newline at end of file diff --git a/stepmania/Themes/default/Graphics/OptionRow IconFilled.redir b/stepmania/Themes/default/Graphics/OptionRow IconFilled.redir new file mode 100644 index 0000000000..70a66198c3 --- /dev/null +++ b/stepmania/Themes/default/Graphics/OptionRow IconFilled.redir @@ -0,0 +1 @@ +ModIconRow IconEmpty \ No newline at end of file diff --git a/stepmania/Themes/default/Graphics/ScreenOptions underline p1 3x1 (doubleres).png b/stepmania/Themes/default/Graphics/OptionRow underline p1 3x1 (doubleres).png similarity index 100% rename from stepmania/Themes/default/Graphics/ScreenOptions underline p1 3x1 (doubleres).png rename to stepmania/Themes/default/Graphics/OptionRow underline p1 3x1 (doubleres).png diff --git a/stepmania/Themes/default/Graphics/ScreenOptions underline p2 3x1 (doubleres).png b/stepmania/Themes/default/Graphics/OptionRow underline p2 3x1 (doubleres).png similarity index 100% rename from stepmania/Themes/default/Graphics/ScreenOptions underline p2 3x1 (doubleres).png rename to stepmania/Themes/default/Graphics/OptionRow underline p2 3x1 (doubleres).png diff --git a/stepmania/Themes/default/Graphics/ScreenOptions RowFrameExit/Focus (doubleres).png b/stepmania/Themes/default/Graphics/ScreenOptions RowFrameExit/Focus (doubleres).png deleted file mode 100644 index de101c1f9e..0000000000 Binary files a/stepmania/Themes/default/Graphics/ScreenOptions RowFrameExit/Focus (doubleres).png and /dev/null differ diff --git a/stepmania/Themes/default/Graphics/ScreenOptions RowFrameExit/NoFocus (doubleres).png b/stepmania/Themes/default/Graphics/ScreenOptions RowFrameExit/NoFocus (doubleres).png deleted file mode 100644 index 480a79ed81..0000000000 Binary files a/stepmania/Themes/default/Graphics/ScreenOptions RowFrameExit/NoFocus (doubleres).png and /dev/null differ diff --git a/stepmania/Themes/default/Graphics/ScreenOptions RowFrameExit/default.lua b/stepmania/Themes/default/Graphics/ScreenOptions RowFrameExit/default.lua deleted file mode 100644 index 79617a4c34..0000000000 --- a/stepmania/Themes/default/Graphics/ScreenOptions RowFrameExit/default.lua +++ /dev/null @@ -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;); - }; -}; \ No newline at end of file diff --git a/stepmania/Themes/default/Graphics/ScreenOptions RowFrameNormal/Focus (doubleres).png b/stepmania/Themes/default/Graphics/ScreenOptions RowFrameNormal/Focus (doubleres).png deleted file mode 100644 index bd84aa0ea0..0000000000 Binary files a/stepmania/Themes/default/Graphics/ScreenOptions RowFrameNormal/Focus (doubleres).png and /dev/null differ diff --git a/stepmania/Themes/default/Graphics/ScreenOptions RowFrameNormal/NoFocus (doubleres).png b/stepmania/Themes/default/Graphics/ScreenOptions RowFrameNormal/NoFocus (doubleres).png deleted file mode 100644 index 9584cdc8ff..0000000000 Binary files a/stepmania/Themes/default/Graphics/ScreenOptions RowFrameNormal/NoFocus (doubleres).png and /dev/null differ diff --git a/stepmania/Themes/default/Graphics/ScreenOptions RowFrameNormal/default.lua b/stepmania/Themes/default/Graphics/ScreenOptions RowFrameNormal/default.lua deleted file mode 100644 index 79617a4c34..0000000000 --- a/stepmania/Themes/default/Graphics/ScreenOptions RowFrameNormal/default.lua +++ /dev/null @@ -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;); - }; -}; \ No newline at end of file diff --git a/stepmania/Themes/default/Graphics/ScreenOptions footer.redir b/stepmania/Themes/default/Graphics/ScreenOptions footer.redir new file mode 100644 index 0000000000..f4b815b926 --- /dev/null +++ b/stepmania/Themes/default/Graphics/ScreenOptions footer.redir @@ -0,0 +1 @@ +_footer large \ No newline at end of file diff --git a/stepmania/Themes/default/Graphics/ScreenOptionsService header.redir b/stepmania/Themes/default/Graphics/ScreenOptionsService header.redir deleted file mode 100644 index c700c90d39..0000000000 --- a/stepmania/Themes/default/Graphics/ScreenOptionsService header.redir +++ /dev/null @@ -1 +0,0 @@ -_blank diff --git a/stepmania/Themes/default/Graphics/ScreenOptionsServiceChild header.redir b/stepmania/Themes/default/Graphics/ScreenOptionsServiceChild header.redir deleted file mode 100644 index c700c90d39..0000000000 --- a/stepmania/Themes/default/Graphics/ScreenOptionsServiceChild header.redir +++ /dev/null @@ -1 +0,0 @@ -_blank diff --git a/stepmania/Themes/default/Graphics/ScreenOptionsSimple cursor 3x2.redir b/stepmania/Themes/default/Graphics/ScreenOptionsSimple cursor.redir similarity index 100% rename from stepmania/Themes/default/Graphics/ScreenOptionsSimple cursor 3x2.redir rename to stepmania/Themes/default/Graphics/ScreenOptionsSimple cursor.redir diff --git a/stepmania/Themes/default/Languages/en.ini b/stepmania/Themes/default/Languages/en.ini index 605e58cc0a..2bec2393b0 100644 --- a/stepmania/Themes/default/Languages/en.ini +++ b/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] diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index c3ec4eb5b0..714bb50b48 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/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 -OptionIconsP1Y=SCREEN_CENTER_Y-182 -OptionIconsP1OnCommand=zoomy,0;linear,0.5;zoomy,1 -OptionIconsP1OffCommand=linear,0.5;zoomy,0 -OptionIconsP2X=SCREEN_CENTER_X-300 -OptionIconsP2Y=SCREEN_CENTER_Y-164 -OptionIconsP2OnCommand=zoomy,0;linear,0.5;zoomy,1 -OptionIconsP2OffCommand=linear,0.5;zoomy,0 +ModIconsP1X=SCREEN_CENTER_X-300 +ModIconsP1Y=SCREEN_CENTER_Y-182 +ModIconsP1OnCommand=zoomy,0;linear,0.5;zoomy,1 +ModIconsP1OffCommand=linear,0.5;zoomy,0 +ModIconsP2X=SCREEN_CENTER_X-300 +ModIconsP2Y=SCREEN_CENTER_Y-164 +ModIconsP2OnCommand=zoomy,0;linear,0.5;zoomy,1 +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 -IconsP2X=SCREEN_CENTER_X+280 -RowFrameX=SCREEN_CENTER_X-232 -RowFrameOnCommand= +[OptionRow] +ShowModIcons=true +ShowUnderlines=true +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 - -LineExitItem=list,ExitItem -LineExitTitle=list,ExitTitle +ModIconMetricsGroup="ModIcon" [ScreenMapControllers] Class="ScreenMapControllers" @@ -2625,42 +2625,43 @@ MountainsBaseY= MountainWidth= MountainHeight= -[OptionIcon] -TextOffsetX=0 -TextOffsetY=-2 -TextHAlign=1 -- 0,1,2 = left,center,right -TextVAlign=1 -- 0,1,2 = top,middle,bottom -TextWidth=72 -TextZoom=0.5 -Uppercase=false +[ModIcon] +TextX=0 +TextY=-2 +TextOnCommand=zoom,0.5;maxwidth,72;uppercase,true -[OptionIconRow] -NumOptionIcons=6 -OptionIconOnCommand= +[ModIconSelectMusic] +Fallback="ModIcon" + +[ModIconRow] +NumModIcons=6 +ModIconOnCommand= SpacingX=46 SpacingY=0 +ModIconMetircsGroup="ModIcon" -[OptionIconRowSelectMusic] -Fallback="OptionIconRow" +[ModIconRowSelectMusic] +Fallback="ModIconRow" +ModIconMetircsGroup="ModIconSelectMusic" -[OptionIconRowGameplay] -Fallback="OptionIconRow" +[ModIconRowGameplay] +Fallback="ModIconRow" SpacingX=0 SpacingY=46 -[OptionIconRowGameplayP1] -Fallback="OptionIconRowGameplay" -OptionIconOnCommand=rotationz,-90; +[ModIconRowGameplayP1] +Fallback="ModIconRowGameplay" +ModIconOnCommand=rotationz,-90; -[OptionIconRowGameplayP2] -Fallback="OptionIconRowGameplay" -OptionIconOnCommand=rotationz,90; +[ModIconRowGameplayP2] +Fallback="ModIconRowGameplay" +ModIconOnCommand=rotationz,90; -[OptionIconRowEvaluationP1] -Fallback="OptionIconRowGameplayP1" +[ModIconRowEvaluationP1] +Fallback="ModIconRowGameplayP1" -[OptionIconRowEvaluationP2] -Fallback="OptionIconRowGameplayP2" +[ModIconRowEvaluationP2] +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"