diff --git a/stepmania/Themes/default/BGAnimations/ScreenEdit decorations/default.lua b/stepmania/Themes/default/BGAnimations/ScreenEdit decorations/default.lua new file mode 100644 index 0000000000..ff5aa1806a --- /dev/null +++ b/stepmania/Themes/default/BGAnimations/ScreenEdit decorations/default.lua @@ -0,0 +1,34 @@ +return Def.ActorFrame { + Def.ActorFrame { + Def.Quad { + InitCommand=cmd(horizalign,left;zoomtowidth,120;zoomtoheight,SCREEN_HEIGHT;diffuse,color("#000000");diffuserightedge,color("#00000011");); + OnCommand=cmd(); + }; + LoadFont("common normal") .. { + InitCommand=cmd(x,60;y,-220;settext,ScreenString("Help");strokecolor,color("#00000077");); + }; + InitCommand=cmd(x,SCREEN_LEFT;y,SCREEN_CENTER_Y;); + EditCommand=cmd(playcommand,"Show"); + PlayingCommand=cmd(playcommand,"Hide"); + RecordCommand=cmd(playcommand,"Hide"); + RecordPausedCommand=cmd(playcommand,"Hide"); + ShowCommand=cmd(stoptweening;accelerate,0.25;x,SCREEN_LEFT;); + HideCommand=cmd(stoptweening;accelerate,0.25;x,SCREEN_LEFT-192;); + }; + Def.ActorFrame { + Def.Quad { + InitCommand=cmd(horizalign,right;zoomtowidth,120;zoomtoheight,SCREEN_HEIGHT;diffuse,color("#000000");diffuseleftedge,color("#00000011");); + OnCommand=cmd(); + }; + LoadFont("common normal") .. { + InitCommand=cmd(x,-60;y,-220;settext,ScreenString("Info");strokecolor,color("#00000077");); + }; + InitCommand=cmd(x,SCREEN_RIGHT;y,SCREEN_CENTER_Y;); + EditCommand=cmd(playcommand,"Show"); + PlayingCommand=cmd(playcommand,"Hide"); + RecordCommand=cmd(playcommand,"Hide"); + RecordPausedCommand=cmd(playcommand,"Hide"); + ShowCommand=cmd(stoptweening;accelerate,0.25;x,SCREEN_RIGHT;); + HideCommand=cmd(stoptweening;accelerate,0.25;x,SCREEN_RIGHT+192;); + }; +}; diff --git a/stepmania/Themes/default/BGAnimations/ScreenEdit underlay/default.lua b/stepmania/Themes/default/BGAnimations/ScreenEdit underlay/default.lua deleted file mode 100755 index 14c1d00769..0000000000 --- a/stepmania/Themes/default/BGAnimations/ScreenEdit underlay/default.lua +++ /dev/null @@ -1,22 +0,0 @@ -return Def.ActorFrame { - LoadActor("help.png") .. { - InitCommand=cmd(y,SCREEN_CENTER_Y); - OnCommand=cmd(horizalign,left;finishtweening); - EditCommand=cmd(playcommand,"Show"); - PlayingCommand=cmd(playcommand,"Hide"); - RecordCommand=cmd(playcommand,"Hide"); - RecordPausedCommand=cmd(playcommand,"Hide"); - ShowCommand=cmd(stoptweening;accelerate,0.25;x,SCREEN_LEFT); - HideCommand=cmd(stoptweening;accelerate,0.25;x,SCREEN_LEFT-192); - }; - LoadActor("info.png") .. { - InitCommand=cmd(y,SCREEN_CENTER_Y); - OnCommand=cmd(horizalign,right;finishtweening); - EditCommand=cmd(playcommand,"Show"); - PlayingCommand=cmd(playcommand,"Hide"); - RecordCommand=cmd(playcommand,"Hide"); - RecordPausedCommand=cmd(playcommand,"Hide"); - ShowCommand=cmd(stoptweening;accelerate,0.25;x,SCREEN_RIGHT); - HideCommand=cmd(stoptweening;accelerate,0.25;x,SCREEN_RIGHT+192); - }; -}; diff --git a/stepmania/Themes/default/BGAnimations/ScreenEdit underlay/help.png b/stepmania/Themes/default/BGAnimations/ScreenEdit underlay/help.png deleted file mode 100644 index 80a401a0e3..0000000000 Binary files a/stepmania/Themes/default/BGAnimations/ScreenEdit underlay/help.png and /dev/null differ diff --git a/stepmania/Themes/default/BGAnimations/ScreenEdit underlay/info.png b/stepmania/Themes/default/BGAnimations/ScreenEdit underlay/info.png deleted file mode 100644 index e06c8fc0f3..0000000000 Binary files a/stepmania/Themes/default/BGAnimations/ScreenEdit underlay/info.png and /dev/null differ diff --git a/stepmania/Themes/default/Languages/en.ini b/stepmania/Themes/default/Languages/en.ini index d0075c2559..8fd5a4c46f 100644 --- a/stepmania/Themes/default/Languages/en.ini +++ b/stepmania/Themes/default/Languages/en.ini @@ -1127,6 +1127,8 @@ Rolls=Rolls Beat 0 offset=Beat 0 offset Preview Start=Preview Start Preview Length=Preview Length +Help=Help +Info=Info [ScreenEditMenu] HeaderText=Edit Song/Steps diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index c7b0e2b255..00a3c4989d 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -1520,19 +1520,19 @@ Arrows2X=SCREEN_CENTER_X+270 ArrowsEnabledCommand=diffuse,1,1,1,1 ArrowsDisabledCommand=diffuse,0.2,0.2,0.2,1 SongBannerX=SCREEN_CENTER_X+170 -SongBannerY=SCREEN_CENTER_Y-110 +SongBannerY=SCREEN_CENTER_Y-90 SongBannerWidth=130 SongBannerHeight=40 -SongTextBannerX=SCREEN_CENTER_X -SongTextBannerY=SCREEN_CENTER_Y-110 +SongTextBannerX=SCREEN_CENTER_X-30 +SongTextBannerY=SCREEN_CENTER_Y-90 GroupBannerX=SCREEN_CENTER_X+170 -GroupBannerY=SCREEN_CENTER_Y-160 +GroupBannerY=SCREEN_CENTER_Y-140 GroupBannerWidth=130 GroupBannerHeight=40 -MeterX=SCREEN_CENTER_X+170 -MeterY=SCREEN_CENTER_Y-20 -SourceMeterX=SCREEN_CENTER_X+170 -SourceMeterY=SCREEN_CENTER_Y+60 +StepsDisplayX=SCREEN_CENTER_X+170 +StepsDisplayY=SCREEN_CENTER_Y-0 +StepsDisplaySourceX=SCREEN_CENTER_X+170 +StepsDisplaySourceY=SCREEN_CENTER_Y+80 RowLabelsX=SCREEN_CENTER_X-250 RowLabelOnCommand=shadowlength,2; RowValue1X=SCREEN_CENTER_X @@ -1543,13 +1543,13 @@ RowValue5X=SCREEN_CENTER_X+60 RowValue6X=SCREEN_CENTER_X RowValue7X=SCREEN_CENTER_X+60 RowValueOnCommand=shadowlength,2; -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 +Row1Y=SCREEN_CENTER_Y-140 +Row2Y=SCREEN_CENTER_Y-90 +Row3Y=SCREEN_CENTER_Y-40 +Row4Y=SCREEN_CENTER_Y-0 +Row5Y=SCREEN_CENTER_Y+40 +Row6Y=SCREEN_CENTER_Y+80 +Row7Y=SCREEN_CENTER_Y+120 [ScreenEditMenu] Fallback="ScreenWithMenuElements" @@ -1818,12 +1818,6 @@ StepsTypeOnCommand= [StepsDisplayEdit] Fallback="StepsDisplay" -ShowMeter=true -MeterX=-70 -MeterY=0 -MeterOnCommand=shadowlength,2;zoom,0.7 -MeterOffCommand= -ZeroMeterString= [StepsDisplayListRow] Fallback="StepsDisplay"