From 25e0fa222fe48da5b3db12cc64a9fbe804a22d4b Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Sun, 5 Apr 2009 22:30:51 +0000
Subject: [PATCH] edit cleanup

---
 .../ScreenEdit decorations/default.lua        |  34 +++++++++++++++++
 .../ScreenEdit underlay/default.lua           |  22 -----------
 .../BGAnimations/ScreenEdit underlay/help.png | Bin 2262 -> 0 bytes
 .../BGAnimations/ScreenEdit underlay/info.png | Bin 2237 -> 0 bytes
 stepmania/Themes/default/Languages/en.ini     |   2 +
 stepmania/Themes/default/metrics.ini          |  36 ++++++++----------
 6 files changed, 51 insertions(+), 43 deletions(-)
 create mode 100644 stepmania/Themes/default/BGAnimations/ScreenEdit decorations/default.lua
 delete mode 100755 stepmania/Themes/default/BGAnimations/ScreenEdit underlay/default.lua
 delete mode 100644 stepmania/Themes/default/BGAnimations/ScreenEdit underlay/help.png
 delete mode 100644 stepmania/Themes/default/BGAnimations/ScreenEdit underlay/info.png

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 80a401a0e37b3df311b1bd1fafce13734501c0ee..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2262
zcmd^9`#;oq7yp<U-|sh;r`Q_0tZg4wtw#x2<C086F1gJj<2oCYrjoJ9pkai@W!!J&
zZf&B5T0-v9<d#b_W`@aSRHBygphrc;Gy8Y!d7blmpYwX1_xa(x&if=gJDyfj*sA~l
zP_nfl5M{^&KyDU6%Q8>@Jgf{bftC)I0Q{ML?Xydctp48LhUfr5l$NYF9)OK)8NLG`
zTn~W1$N-q!1OOYH?f29g05otu<7y@2Y;SKPsX_pK2b49j`!xa91nf2dJAVYKIzZ(x
z&>;e?(_r6m><>D?ktGyQ0slL|EgNk?g<Ml$j|`ZY2s_5$>BSbb?32M+Ya3hOIv>P5
z2bVa&@-o0*1jar<&j}nRpm5$OoEMTjfyDEW>%&OQAVTkwKXn<Q)*yj@KsF(WTN2{V
zLWprY+*pbMMM^foO2)4GMKcD)Ge#vdww$*v_vY+NMxD!fF6I2;m&=0r)y9q<kT?dS
zyMb2*z<B~)Yw!~uXqn0-3FP7i<*snhvgC*jCTUDQZBjl(D4#4q8M&d36QL9VoFal*
z&tcXmoHz{M7={y`!SMso)kcU`i*aFK9Ktd7VQ6z7w5cbOE=JNO5cW8dEJ9L62wR9G
z3y~B7lFUbvcnIq`A{!Fd2Q#^FOb^WHh8bOObSE6$0Y|pN^ha>`Ln!zzbfpHORzT-V
zp@2epFSa}>S^jJy#*T(L9fTwfAqj&>d_TgJc^|@j3Wqhop%37YI>`SPM9ziCIgoEQ
zBx4a{F?b5b(jRle4`c2te<oDkJ``i-gE94noT3!dM9OU8ztSg^lX*MrXy0azt7ney
z&6-fp;P1~7t4Gxz%zv@dnxbUnpi?wySRpYipWc1a!>~|bkUM0M+KI1{Sl^zsuAH#0
z95;+8v#XI<mGiC2_*SJn%j|Bu+hVK2LA#1ExB3N}{2uQ|OWw_kK8<hvT9$m9-&wOb
z<i>gDtY&?$Pz!1tAt-^~{T5G+J#p?T{sJQ~?|v$G?m}jDVEXO+VJW*!=uC~sdopz{
z^2V<b@qVGP&C~CjgbPvWg*S?;d*?nh@m@BK&Ip$_8v6Lj1!WD~k*233jZdC&nmc$?
zuec)u6%!{FV|x`tYpj{`F-Db7^MV%MB`_}ITolXiw`;kzts(JjW=6qN!4#*ZyS}UU
z)0eHa51(3kde_!JsP9%)$L>*6Q<Gi3dw~=u6BP&}I{qRn|H%e^`3TGY2G~KfA%y~<
zsQP!vfx==n*`G1AC0M%BUr0q%+P79}y{i<AxVrjKX*o&(S^<^6T|yzdcCwGC=%p;B
zAInNe6C=BjRa8BfM#t<5c67n?yo^&&u$Fu5g%eb(v9-%zSrV3(#gwM*pAHA{H9lEr
zY)YFqYsG#J!;Wcpaw@`>jr}v&3-GDPT84Xd8m2wq(1G)tUvxFetrcdazlv9tFtZm=
zt&;N1tJWi<&GK6&{JqKo)M$@avFcFq@kzaMaThAvNi}O9DW^nan;pHUB!`;I`KUZJ
z{k_TqU3<};%R&<p<-g{sBLkdLvAqsCL^rFA<&n>!j8}^WHn*Zje-G7HvWO(=kmK4f
z4CpG8->m3kS7w6je-GrfNJ`?jOym^bXcZNg=4vh${kvdrZB_Z!S`U_DfLj{r*na=#
zxoPzgkrMs&#>RUJ<K8D6DJrb%%pcS^l-bSs5n){$iQ|XGgrl2$JzWki7P=^`Ocs=-
z<|YWGk7C<Rn?FcPRA^soTjh8J;8=ISqv<I5(y5j!t&9mv$o1^@LH&afFFQe=kK|n!
z+AoO<PHfWJ`sW^)EQ%TmlANSEv9+8pZ~A5`8!ga{8A++Ba{Jvs(y|P0+-o2ie5V>|
zBkiiayZPht5X>irqoX9psKjr`lctLVUyZvXF`KhKS-6XmO0U<w@zx8HyqbM_bnc^&
z&*llcBYNBO@@rxVgXUINPp*G`*tx?m6We)o>Ek^tubQ$P?3*p(1-W<rXM7)D-#~X#
zq(Gk^yRV{pCrO*}I-kp3dlgw9Ucb>AI9>JS^QfShF>4XaWIoF<9bD`<+kRzH<K21{
zd+7%+?R989tSGmxk1!t=n;F1Tw71uuC%MmX`TU-hlVX!wp2Z7Bi5nYPxM}8)pxF7)
zO$v$h*!ht5`gyU*z=1-k5e^N>xM;qVDLHCkQhfJ?4XSC<_%rjX2DqxZZM?c2x^lwq
zc=i77n|qzEg_`c6;nTD$DD4N()f;EbSEm}r98h%^!?$qiKdWQtW*LtC57JP7dDAON
z-OH7#oBxwu+PN}b=47$9Vwl664&T!l9Fd4)_Sf9MO796&p$+Qj9O>limFvpX^v^Sv
g(d^tCofn6@C2jo=(>?UIoBrN`t(7C84o|-Re`;1D@c;k-

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 e06c8fc0f36a095811820e0355265e5ffe9c84ae..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2237
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
Q&A-ddjI1cNWRLj2032}|4FCWD

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"