From 7f7e254f36fe3695a1844e33a372115769af35b6 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Mon, 31 Mar 2008 11:49:26 +0000 Subject: [PATCH] theme cleanup --- .../ScreenGameplay decorations/default.lua | 19 ++-- .../BGAnimations/ScreenLogo underlay.lua | 2 +- .../ScreenSelectMusic decorations/default.lua | 7 +- .../ScreenSelectPlayMode overlay.redir | 1 - .../ScreenSelectStyle2 overlay.redir | 1 - .../default.lua | 10 +- .../ScreenWithMenuElements underlay.lua | 10 -- .../ScreenWithMenuElements underlay.redir} | 0 .../default.lua | 39 -------- .../_frame files 3x1/headers 3x1.png | Bin 1142 -> 0 bytes .../_standard decoration optional.lua | 6 ++ .../_standard decoration required.lua | 15 +++ .../BGAnimations/_standard decoration.lua | 11 --- .../Graphics/ScreenProfileLoad header.redir | 1 - .../Graphics/ScreenSelectGroup header.png | Bin 6279 -> 0 bytes .../Graphics/ScreenSelectMusic header.lua | 1 - .../Graphics/ScreenSelectPlayer header.png | Bin 3752 -> 0 bytes .../_icon OnePlayerOneSide 2x1.png | Bin 532 -> 0 bytes .../_icon OnePlayerTwoSides 2x1.png | Bin 551 -> 0 bytes .../_icon TwoPlayersSharedSides 2x1.png | Bin 516 -> 0 bytes .../_icon TwoPlayersTwoSides 2x1.png | Bin 518 -> 0 bytes .../default.lua | 25 +++-- .../default.lua | 4 +- .../notify (doubleres).png | Bin .../arrow (doubleres).png | Bin .../bar (doubleres).png | Bin .../default.lua | 22 +++++ .../ring (doubleres).png | Bin .../top (doubleres).png | Bin ...reenWithMenuElementsBlank LeftFrame.redir} | 0 ...reenWithMenuElementsBlank RightFrame.redir | 1 + ...erOneSide PlayerNumber_P1 (doubleres).png} | Bin ...erOneSide PlayerNumber_P2 (doubleres).png} | Bin ...rTwoSides PlayerNumber_P1 (doubleres).png} | Bin ...rTwoSides PlayerNumber_P2 (doubleres).png} | Bin ...leType_TwoPlayersTwoSides (doubleres).png} | Bin stepmania/Themes/default/Graphics/_header.lua | 21 ---- stepmania/Themes/default/Scripts/Other.lua | 8 ++ stepmania/Themes/default/metrics.ini | 93 +++++++++--------- 39 files changed, 138 insertions(+), 159 deletions(-) delete mode 100755 stepmania/Themes/default/BGAnimations/ScreenSelectPlayMode overlay.redir delete mode 100755 stepmania/Themes/default/BGAnimations/ScreenSelectStyle2 overlay.redir delete mode 100644 stepmania/Themes/default/BGAnimations/ScreenWithMenuElements underlay.lua rename stepmania/Themes/default/{Graphics/ScreenSelectPlayMode header.redir => BGAnimations/ScreenWithMenuElements underlay.redir} (100%) mode change 100755 => 100644 delete mode 100644 stepmania/Themes/default/BGAnimations/_frame files 3x1/headers 3x1.png create mode 100644 stepmania/Themes/default/BGAnimations/_standard decoration optional.lua create mode 100644 stepmania/Themes/default/BGAnimations/_standard decoration required.lua delete mode 100644 stepmania/Themes/default/BGAnimations/_standard decoration.lua delete mode 100644 stepmania/Themes/default/Graphics/ScreenProfileLoad header.redir delete mode 100644 stepmania/Themes/default/Graphics/ScreenSelectGroup header.png delete mode 100644 stepmania/Themes/default/Graphics/ScreenSelectMusic header.lua delete mode 100644 stepmania/Themes/default/Graphics/ScreenSelectPlayer header.png delete mode 100644 stepmania/Themes/default/Graphics/ScreenWithMenuElements StyleIcon/_icon OnePlayerOneSide 2x1.png delete mode 100644 stepmania/Themes/default/Graphics/ScreenWithMenuElements StyleIcon/_icon OnePlayerTwoSides 2x1.png delete mode 100644 stepmania/Themes/default/Graphics/ScreenWithMenuElements StyleIcon/_icon TwoPlayersSharedSides 2x1.png delete mode 100644 stepmania/Themes/default/Graphics/ScreenWithMenuElements StyleIcon/_icon TwoPlayersTwoSides 2x1.png rename stepmania/Themes/default/{BGAnimations/_menu overlay with player notifications => Graphics/ScreenWithMenuElements footer}/default.lua (80%) mode change 100755 => 100644 rename stepmania/Themes/default/{BGAnimations/_menu overlay with player notifications => Graphics/ScreenWithMenuElements footer}/notify (doubleres).png (100%) mode change 100755 => 100644 rename stepmania/Themes/default/{BGAnimations/ScreenWithMenuElements2 decorations => Graphics/ScreenWithMenuElements2 header}/arrow (doubleres).png (100%) rename stepmania/Themes/default/{BGAnimations/ScreenWithMenuElements2 decorations => Graphics/ScreenWithMenuElements2 header}/bar (doubleres).png (100%) create mode 100644 stepmania/Themes/default/Graphics/ScreenWithMenuElements2 header/default.lua rename stepmania/Themes/default/{BGAnimations/ScreenWithMenuElements2 decorations => Graphics/ScreenWithMenuElements2 header}/ring (doubleres).png (100%) rename stepmania/Themes/default/{BGAnimations/ScreenWithMenuElements2 decorations => Graphics/ScreenWithMenuElements2 header}/top (doubleres).png (100%) rename stepmania/Themes/default/Graphics/{ScreenSelectStyle2 header.redir => ScreenWithMenuElementsBlank LeftFrame.redir} (100%) mode change 100755 => 100644 create mode 100644 stepmania/Themes/default/Graphics/ScreenWithMenuElementsBlank RightFrame.redir rename stepmania/Themes/default/{BGAnimations/ScreenWithMenuElements2 decorations/style StyleType_OnePlayerOneSide PlayerNumber_P1 (doubleres).png => Graphics/_StyleIcon StyleType_OnePlayerOneSide PlayerNumber_P1 (doubleres).png} (100%) rename stepmania/Themes/default/{BGAnimations/ScreenWithMenuElements2 decorations/style StyleType_OnePlayerOneSide PlayerNumber_P2 (doubleres).png => Graphics/_StyleIcon StyleType_OnePlayerOneSide PlayerNumber_P2 (doubleres).png} (100%) rename stepmania/Themes/default/{BGAnimations/ScreenWithMenuElements2 decorations/style StyleType_OnePlayerTwoSides PlayerNumber_P1 (doubleres).png => Graphics/_StyleIcon StyleType_OnePlayerTwoSides PlayerNumber_P1 (doubleres).png} (100%) rename stepmania/Themes/default/{BGAnimations/ScreenWithMenuElements2 decorations/style StyleType_OnePlayerTwoSides PlayerNumber_P2 (doubleres).png => Graphics/_StyleIcon StyleType_OnePlayerTwoSides PlayerNumber_P2 (doubleres).png} (100%) rename stepmania/Themes/default/{BGAnimations/ScreenWithMenuElements2 decorations/style StyleType_TwoPlayersTwoSides.png => Graphics/_StyleIcon StyleType_TwoPlayersTwoSides (doubleres).png} (100%) delete mode 100644 stepmania/Themes/default/Graphics/_header.lua diff --git a/stepmania/Themes/default/BGAnimations/ScreenGameplay decorations/default.lua b/stepmania/Themes/default/BGAnimations/ScreenGameplay decorations/default.lua index 11ebb00ebe..a889aab24e 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenGameplay decorations/default.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenGameplay decorations/default.lua @@ -1,6 +1,6 @@ -local t = LoadActor( THEME:GetPathB("ScreenWithMenuElements","decorations") ); +local t = LoadFallbackB( "decorations" ); -t[#t+1] = LoadActor( THEME:GetPathB('','_standard decoration'), "StageFrame", "StageFrame" ); +t[#t+1] = LoadActor( THEME:GetPathB('','_standard decoration required'), "StageFrame", "StageFrame" ); t[#t+1] = LoadActor("_warning") .. { InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y; @@ -11,21 +11,20 @@ t[#t+1] = LoadActor("_warning") .. { ShowDangerAllMessageCommand=cmd(stoptweening;accelerate,0.3;diffusealpha,1); HideDangerAllMessageCommand=cmd(stoptweening;accelerate,0.3;diffusealpha,0); }; -t[#t+1] = LoadActor( THEME:GetPathB('','_standard decoration'), "LifeFrame", "LifeFrame" ); -t[#t+1] = LoadActor( THEME:GetPathB('','_standard decoration'), "ScoreFrame", "ScoreFrame" ); -t[#t+1] = LoadActor( THEME:GetPathB('','_standard decoration'), "LeftFrame", "LeftFrame" ); -t[#t+1] = LoadActor( THEME:GetPathB('','_standard decoration'), "RightFrame", "RightFrame" ); + +t[#t+1] = LoadActor( THEME:GetPathB('','_standard decoration required'), "LifeFrame", "LifeFrame" ); +t[#t+1] = LoadActor( THEME:GetPathB('','_standard decoration required'), "ScoreFrame", "ScoreFrame" ); +t[#t+1] = LoadActor( THEME:GetPathB('','_standard decoration required'), "LeftFrame", "LeftFrame" ); +t[#t+1] = LoadActor( THEME:GetPathB('','_standard decoration required'), "RightFrame", "RightFrame" ); -t[#t+1] = - Def.OptionIconRow { +t[#t+1] = Def.OptionIconRow { Condition=GAMESTATE:IsHumanPlayer(PLAYER_1); InitCommand=cmd(z,SCREEN_CENTER_X-200;y,SCREEN_CENTER_Y;Load,"OptionIconRowGameplay",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.OptionIconRow { Condition=GAMESTATE:IsHumanPlayer(PLAYER_2); InitCommand=cmd(z,SCREEN_CENTER_X+200;y,SCREEN_CENTER_Y;Load,"OptionIconRowGameplay",PLAYER_2;); OnCommand=cmd(zoomy,0;linear,0.5;zoomy,1); diff --git a/stepmania/Themes/default/BGAnimations/ScreenLogo underlay.lua b/stepmania/Themes/default/BGAnimations/ScreenLogo underlay.lua index 528fb4d034..f7fcd0852d 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenLogo underlay.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenLogo underlay.lua @@ -1,3 +1,3 @@ return Def.ActorFrame { - LoadActor( THEME:GetPathB('','_standard decoration'), "Logo", GAMESTATE:GetCurrentGame():GetName() ); + LoadActor( THEME:GetPathB('','_standard decoration required'), "Logo", GAMESTATE:GetCurrentGame():GetName() ); }; \ No newline at end of file diff --git a/stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua b/stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua index 47f67ded0e..f7f47b5c83 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua @@ -62,12 +62,7 @@ local function OptionsArea(pn) end -local fallback_screen = THEME:GetMetric(Var 'LoadingScreen','Fallback'); -local element = "decorations"; -local fallback_path = THEME:GetPathB(fallback_screen,element); ---Trace('fallback_path ' .. fallback_path ); - -local t = LoadActor( fallback_path ); +local t = LoadFallbackB( "decorations" ); t[#t+1] = Def.ActorFrame { InitCommand=cmd(x,SCREEN_CENTER_X+140;y,SCREEN_CENTER_Y-10); OnCommand=cmd(addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6); diff --git a/stepmania/Themes/default/BGAnimations/ScreenSelectPlayMode overlay.redir b/stepmania/Themes/default/BGAnimations/ScreenSelectPlayMode overlay.redir deleted file mode 100755 index 3f1b9ec3c2..0000000000 --- a/stepmania/Themes/default/BGAnimations/ScreenSelectPlayMode overlay.redir +++ /dev/null @@ -1 +0,0 @@ -_menu overlay with player notifications \ No newline at end of file diff --git a/stepmania/Themes/default/BGAnimations/ScreenSelectStyle2 overlay.redir b/stepmania/Themes/default/BGAnimations/ScreenSelectStyle2 overlay.redir deleted file mode 100755 index 3f1b9ec3c2..0000000000 --- a/stepmania/Themes/default/BGAnimations/ScreenSelectStyle2 overlay.redir +++ /dev/null @@ -1 +0,0 @@ -_menu overlay with player notifications \ No newline at end of file diff --git a/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements decorations/default.lua b/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements decorations/default.lua index 7b8726adca..3df7062bf4 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements decorations/default.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements decorations/default.lua @@ -1,2 +1,10 @@ -- This needs to be an ActorFrame because children will want to load the base and merge their own elements into the table. -return Def.ActorFrame {}; +return Def.ActorFrame { + LoadActor( THEME:GetPathB('','_standard decoration required'), "LeftFrame", "LeftFrame" ); + LoadActor( THEME:GetPathB('','_standard decoration required'), "RightFrame", "RightFrame" ); + LoadActor( THEME:GetPathB('','_standard decoration required'), "Header", "Header" ); + LoadActor( THEME:GetPathB('','_standard decoration required'), "Footer", "Footer" ); + LoadActor( THEME:GetPathB('','_standard decoration optional'), "StyleIcon", "StyleIcon" ); + LoadActor( THEME:GetPathB('','_standard decoration optional'), "StageDisplay", "StageDisplay" ); + +}; diff --git a/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements underlay.lua b/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements underlay.lua deleted file mode 100644 index 756184b9f5..0000000000 --- a/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements underlay.lua +++ /dev/null @@ -1,10 +0,0 @@ -if not THEME:GetMetric(Var "LoadingScreen", "StyleIcon") then - return Def.Actor {}; -end - -local t = LoadActor( THEME:GetPathG(Var "LoadingScreen", "StyleIcon") ) .. { - BeginCommand = cmd(x,SCREEN_CENTER_X+8;y,SCREEN_TOP-11); - OnCommand = cmd(draworder,200;linear,0.25;addy,33); - OffCommand = cmd(linear,0.25;addy,-44); -}; -return t; diff --git a/stepmania/Themes/default/Graphics/ScreenSelectPlayMode header.redir b/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements underlay.redir old mode 100755 new mode 100644 similarity index 100% rename from stepmania/Themes/default/Graphics/ScreenSelectPlayMode header.redir rename to stepmania/Themes/default/BGAnimations/ScreenWithMenuElements underlay.redir diff --git a/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements2 decorations/default.lua b/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements2 decorations/default.lua index eb6840068c..c2fa782991 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements2 decorations/default.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements2 decorations/default.lua @@ -1,43 +1,4 @@ local t = LoadActor( THEME:GetPathB('ScreenWithMenuElements','decorations') ) .. { - LoadActor( THEME:GetPathB('','_standard decoration'), "LeftFrame", "LeftFrame" ); - LoadActor( THEME:GetPathB('','_standard decoration'), "RightFrame", "RightFrame" ); - - LoadActor( "top" ) .. { - InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_TOP;vertalign,top); - }; - Def.ActorFrame { - InitCommand=cmd(x,SCREEN_CENTER_X-284;y,SCREEN_TOP+30); - LoadActor( "bar" ) .. { - InitCommand=cmd(horizalign,left;y,4); - }; - LoadFont( "_sf sports night ns upright 52" ) .. { - InitCommand=cmd(x,64;y,-7;horizalign,left;shadowlength,0;zoom,0.5;settext,"Select Style";skewx,-0.15); - }; - LoadFont( "_venacti 24" ) .. { - InitCommand=cmd(x,64;y,12;horizalign,left;shadowlength,0;zoom,0.5;settext,"I can't wait to see your next moves!"); - }; - LoadActor( "arrow" ) .. { - }; - LoadActor( "ring" ) .. { - InitCommand=cmd(x,-1.5); - }; - }; }; -local style = GAMESTATE:GetCurrentStyle(); -if style then - local master_pn = GAMESTATE:GetMasterPlayerNumber(); - local st = style:GetStyleType(); - local pad_file = ""; - if st == "StyleType_OnePlayerOneSide" or st == "StyleType_OnePlayerTwoSides" then - pad_file = st .. " " .. master_pn; - elseif st == "StyleType_TwoPlayersTwoSides" then - pad_file = st; - end - - t[#t+1] = LoadActor( "style " .. pad_file ) .. { - InitCommand=cmd(x,SCREEN_CENTER_X+170;y,SCREEN_CENTER_Y-202;); - }; -end - return t; \ No newline at end of file diff --git a/stepmania/Themes/default/BGAnimations/_frame files 3x1/headers 3x1.png b/stepmania/Themes/default/BGAnimations/_frame files 3x1/headers 3x1.png deleted file mode 100644 index 128438198ac4ddfa62d6a2e8268f284120c14f14..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1142 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 XdBOtXl<}JMO$4AC2I|$SwxRz4uwAQ= diff --git a/stepmania/Themes/default/Graphics/ScreenWithMenuElements StyleIcon/_icon OnePlayerOneSide 2x1.png b/stepmania/Themes/default/Graphics/ScreenWithMenuElements StyleIcon/_icon OnePlayerOneSide 2x1.png deleted file mode 100644 index 06fe79533a86e85c4418f1e06d5619d786af0c25..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 532 zcmeAS@N?(olHy`uVBq!ia0vp^IY2DM!3HFQWOoVzDfSXiUsv|)to*_n78b!mJU}7N z0*}aI1_rJVAk65r#$*OikR{#G*O7r?V?XzwL{Jj4jv*Dd-p+LNIvgO-roQpf zRvX9jla^Xv6n?^C*{M(>8RK~^P=&iyV3)Ah;>q7aJ)fNQ{{Q4?%g^$MXU`u$?SD&B zZ9#LERD7d*-^EAowi@{t%9LxZTD8dLyr!qnuGRCcpKlKlu(cD6z28w6?l)`M+|QeI zG*26KEjlst@oe?0x$@WMe!ly=&Fp61weQjC=T^lg1Pf1aopgU|U;GULnfo>?`lCMXkqcR zC-$$pn5|9aGG6QbtdEy?=<#o51&F=B^kAZ?{W>YJW1j`Yvey^i*b{P_+4*+G!TgqO zS0~kL$=y2k|6%^DzWI?p%uN-_ELXx#B+9a}l$;a#FVdQ&MBb@06!S=DF6Tf diff --git a/stepmania/Themes/default/Graphics/ScreenWithMenuElements StyleIcon/_icon OnePlayerTwoSides 2x1.png b/stepmania/Themes/default/Graphics/ScreenWithMenuElements StyleIcon/_icon OnePlayerTwoSides 2x1.png deleted file mode 100644 index 22f30254a1c423a84647c67b7432fdb48e5432ba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 551 zcmV+?0@(eDP)WdKukZXhu?AWvg-ATls8G$1fAIx{&sH8~(HFg7qS+MI=H00007bV*G` z2iFA;6DT^?U2`A+000SaNLh0L01EH`01EH{Laa2H00004XF*Lt006O%3;baP0004g zNkl>+^d$En(0k$CNt^GrFe1Mj9Y5n)4mxvHn zKmIOh=QqJ15Cap_U%aXG*8ZWo<>%J4u2BDr|HBYaKmL1;0^_cv74Ftrko4C6p*rr? zEbG$xySQ`9sOFWC)|K!#?E3dw^C#^bB~=%gL`jX%YoY1OFVsD*{`$m3u{>VhbYYg z3UL;AL>4nJaD4z_MyE95jgR3=A9lx&I`xGB7a4c)B=-RNQ(y(>Cu=0ngF7 z4p*}ana*A2-Ku^%@m-*1y}Ibgr&{dr(c*QL5$7iggNN_2Kf|;jaW&t?lpB-uwIHgPiUwf~9dxtgA|zFw4QHPysx`7$;|`&F;6q#y0obfBrSXE3Q3PdUVT`?{QG8 zbec^0#QRq7l=d61dwgNx^=UFJr`f|-owaIZNtSc0%a(Kew+^WISGUZug*Vza79F+g z>Cyg{m=ZJb@ClLM21e^{v`;Jq3l>SV3;ou1;=d?&Z}0Cvv%U)$1H+xc)78&qol`;+ E03%n}SpWb4 diff --git a/stepmania/Themes/default/Graphics/ScreenWithMenuElements StyleIcon/_icon TwoPlayersTwoSides 2x1.png b/stepmania/Themes/default/Graphics/ScreenWithMenuElements StyleIcon/_icon TwoPlayersTwoSides 2x1.png deleted file mode 100644 index 132a4d3ab0e9e7209ac4844d34236a30e5a77eca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 518 zcmeAS@N?(olHy`uVBq!ia0vp^IY2DM!3HFQWOoVzDeV&1h!W?b)Wnj^{5*w_%-mFl z;L~=%1Fv1l;XrNdC7!;n?AKZOg*7bwLzHF# zg*Xd5B8wRqxITa|qthCb89+gnbVpxD28NCO+6mrcfyXt~ zeChR5oJI5AI8`&rA5`aL*>rAI%G;JpuDcCyiu%Y*G05ypG-;kQN&idvv0oW-ha%={ zzF0Kx-TFuJzgcEJp4GB^)hag8+}lByO+v1l?)~<@`8)S7m8jf~WyKfg-+I1b4)4A4 z`0S{B>sfncC;g6iI_r+ukrK8}k59|58J>`+)hU`Pwy@~c#T}=XXk9<7VP#PGYBzt- zPvO_!?jH~Q74hKIuXbCbj#Y9UudNL3xh;CMR#WNX{D|YxmnCY~6t$j7(pxX_RO<(K z^)vNcxru)qZ`mmQ%unrk-O64TYqLdr-IM>-0>1Jm=U3|~tW%c@OXtyg9g`5_em*hc z)nn$%>vlKUd+dJaRp%V@eCcEJ?uSh)&aoZ|{j@=k(Q&prOZ^11evf~5iW>|6R`4-D t{`A|xKyN=klyN>W0bO85jGo9`h9Czf;qHYS!+;^r;OXk;vd$@?2>_#))?fet diff --git a/stepmania/Themes/default/Graphics/ScreenWithMenuElements StyleIcon/default.lua b/stepmania/Themes/default/Graphics/ScreenWithMenuElements StyleIcon/default.lua index a826c6f4f5..c218741427 100644 --- a/stepmania/Themes/default/Graphics/ScreenWithMenuElements StyleIcon/default.lua +++ b/stepmania/Themes/default/Graphics/ScreenWithMenuElements StyleIcon/default.lua @@ -1,12 +1,17 @@ +local t = {}; + local style = GAMESTATE:GetCurrentStyle(); -if not style then return Def.Actor {}; end +if style then + local master_pn = GAMESTATE:GetMasterPlayerNumber(); + local st = style:GetStyleType(); + local pad_file = ""; + if st == "StyleType_OnePlayerOneSide" or st == "StyleType_OnePlayerTwoSides" then + pad_file = st .. " " .. master_pn; + elseif st == "StyleType_TwoPlayersTwoSides" then + pad_file = st; + end -local s = style:GetStyleType(); -local Reverse = PlayerNumber:Reverse(); -s = string.gsub(s, "StyleType_", ""); - -local t = LoadActor("_icon " .. s) .. { - InitCommand = cmd(pause;setstate,Reverse[GAMESTATE:GetMasterPlayerNumber()]); -}; - -return t; + return LoadActor( THEME:GetPathG("","_StyleIcon " .. pad_file ) ) .. {}; +else + return Def.Actor {}; +end diff --git a/stepmania/Themes/default/BGAnimations/_menu overlay with player notifications/default.lua b/stepmania/Themes/default/Graphics/ScreenWithMenuElements footer/default.lua old mode 100755 new mode 100644 similarity index 80% rename from stepmania/Themes/default/BGAnimations/_menu overlay with player notifications/default.lua rename to stepmania/Themes/default/Graphics/ScreenWithMenuElements footer/default.lua index 4c54b30ba0..076e8d745a --- a/stepmania/Themes/default/BGAnimations/_menu overlay with player notifications/default.lua +++ b/stepmania/Themes/default/Graphics/ScreenWithMenuElements footer/default.lua @@ -1,6 +1,6 @@ return LoadActor( THEME:GetPathB("ScreenWithMenuElements2","overlay") ) .. { Def.ActorFrame { - InitCommand=cmd(x,SCREEN_CENTER_X-200;y,SCREEN_BOTTOM-34;); + InitCommand=cmd(x,-200;); LoadActor( "notify" ) .. { OnCommand=cmd(); }; @@ -9,7 +9,7 @@ return LoadActor( THEME:GetPathB("ScreenWithMenuElements2","overlay") ) .. { }; }; Def.ActorFrame { - InitCommand=cmd(x,SCREEN_CENTER_X+200;y,SCREEN_BOTTOM-34;); + InitCommand=cmd(x,200;); LoadActor( "notify" ) .. { OnCommand=cmd(zoomx,-1); }; diff --git a/stepmania/Themes/default/BGAnimations/_menu overlay with player notifications/notify (doubleres).png b/stepmania/Themes/default/Graphics/ScreenWithMenuElements footer/notify (doubleres).png old mode 100755 new mode 100644 similarity index 100% rename from stepmania/Themes/default/BGAnimations/_menu overlay with player notifications/notify (doubleres).png rename to stepmania/Themes/default/Graphics/ScreenWithMenuElements footer/notify (doubleres).png diff --git a/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements2 decorations/arrow (doubleres).png b/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 header/arrow (doubleres).png similarity index 100% rename from stepmania/Themes/default/BGAnimations/ScreenWithMenuElements2 decorations/arrow (doubleres).png rename to stepmania/Themes/default/Graphics/ScreenWithMenuElements2 header/arrow (doubleres).png diff --git a/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements2 decorations/bar (doubleres).png b/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 header/bar (doubleres).png similarity index 100% rename from stepmania/Themes/default/BGAnimations/ScreenWithMenuElements2 decorations/bar (doubleres).png rename to stepmania/Themes/default/Graphics/ScreenWithMenuElements2 header/bar (doubleres).png diff --git a/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 header/default.lua b/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 header/default.lua new file mode 100644 index 0000000000..86dc4a3dd9 --- /dev/null +++ b/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 header/default.lua @@ -0,0 +1,22 @@ +return Def.ActorFrame { + LoadActor( "top" ) .. { + InitCommand=cmd(); + }; + Def.ActorFrame { + InitCommand=cmd(x,-284;y,-6;); + LoadActor( "bar" ) .. { + InitCommand=cmd(horizalign,left;y,4); + }; + LoadFont( "_sf sports night ns upright 52" ) .. { + InitCommand=cmd(x,64;y,-7;horizalign,left;shadowlength,0;zoom,0.5;settext,"Select Style";skewx,-0.15); + }; + LoadFont( "_venacti 24" ) .. { + InitCommand=cmd(x,64;y,12;horizalign,left;shadowlength,0;zoom,0.5;settext,"I can't wait to see your next moves!"); + }; + LoadActor( "arrow" ) .. { + }; + LoadActor( "ring" ) .. { + InitCommand=cmd(x,-1.5); + }; + }; +}; \ No newline at end of file diff --git a/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements2 decorations/ring (doubleres).png b/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 header/ring (doubleres).png similarity index 100% rename from stepmania/Themes/default/BGAnimations/ScreenWithMenuElements2 decorations/ring (doubleres).png rename to stepmania/Themes/default/Graphics/ScreenWithMenuElements2 header/ring (doubleres).png diff --git a/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements2 decorations/top (doubleres).png b/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 header/top (doubleres).png similarity index 100% rename from stepmania/Themes/default/BGAnimations/ScreenWithMenuElements2 decorations/top (doubleres).png rename to stepmania/Themes/default/Graphics/ScreenWithMenuElements2 header/top (doubleres).png diff --git a/stepmania/Themes/default/Graphics/ScreenSelectStyle2 header.redir b/stepmania/Themes/default/Graphics/ScreenWithMenuElementsBlank LeftFrame.redir old mode 100755 new mode 100644 similarity index 100% rename from stepmania/Themes/default/Graphics/ScreenSelectStyle2 header.redir rename to stepmania/Themes/default/Graphics/ScreenWithMenuElementsBlank LeftFrame.redir diff --git a/stepmania/Themes/default/Graphics/ScreenWithMenuElementsBlank RightFrame.redir b/stepmania/Themes/default/Graphics/ScreenWithMenuElementsBlank RightFrame.redir new file mode 100644 index 0000000000..04b2ead777 --- /dev/null +++ b/stepmania/Themes/default/Graphics/ScreenWithMenuElementsBlank RightFrame.redir @@ -0,0 +1 @@ +_blank \ No newline at end of file diff --git a/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements2 decorations/style StyleType_OnePlayerOneSide PlayerNumber_P1 (doubleres).png b/stepmania/Themes/default/Graphics/_StyleIcon StyleType_OnePlayerOneSide PlayerNumber_P1 (doubleres).png similarity index 100% rename from stepmania/Themes/default/BGAnimations/ScreenWithMenuElements2 decorations/style StyleType_OnePlayerOneSide PlayerNumber_P1 (doubleres).png rename to stepmania/Themes/default/Graphics/_StyleIcon StyleType_OnePlayerOneSide PlayerNumber_P1 (doubleres).png diff --git a/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements2 decorations/style StyleType_OnePlayerOneSide PlayerNumber_P2 (doubleres).png b/stepmania/Themes/default/Graphics/_StyleIcon StyleType_OnePlayerOneSide PlayerNumber_P2 (doubleres).png similarity index 100% rename from stepmania/Themes/default/BGAnimations/ScreenWithMenuElements2 decorations/style StyleType_OnePlayerOneSide PlayerNumber_P2 (doubleres).png rename to stepmania/Themes/default/Graphics/_StyleIcon StyleType_OnePlayerOneSide PlayerNumber_P2 (doubleres).png diff --git a/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements2 decorations/style StyleType_OnePlayerTwoSides PlayerNumber_P1 (doubleres).png b/stepmania/Themes/default/Graphics/_StyleIcon StyleType_OnePlayerTwoSides PlayerNumber_P1 (doubleres).png similarity index 100% rename from stepmania/Themes/default/BGAnimations/ScreenWithMenuElements2 decorations/style StyleType_OnePlayerTwoSides PlayerNumber_P1 (doubleres).png rename to stepmania/Themes/default/Graphics/_StyleIcon StyleType_OnePlayerTwoSides PlayerNumber_P1 (doubleres).png diff --git a/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements2 decorations/style StyleType_OnePlayerTwoSides PlayerNumber_P2 (doubleres).png b/stepmania/Themes/default/Graphics/_StyleIcon StyleType_OnePlayerTwoSides PlayerNumber_P2 (doubleres).png similarity index 100% rename from stepmania/Themes/default/BGAnimations/ScreenWithMenuElements2 decorations/style StyleType_OnePlayerTwoSides PlayerNumber_P2 (doubleres).png rename to stepmania/Themes/default/Graphics/_StyleIcon StyleType_OnePlayerTwoSides PlayerNumber_P2 (doubleres).png diff --git a/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements2 decorations/style StyleType_TwoPlayersTwoSides.png b/stepmania/Themes/default/Graphics/_StyleIcon StyleType_TwoPlayersTwoSides (doubleres).png similarity index 100% rename from stepmania/Themes/default/BGAnimations/ScreenWithMenuElements2 decorations/style StyleType_TwoPlayersTwoSides.png rename to stepmania/Themes/default/Graphics/_StyleIcon StyleType_TwoPlayersTwoSides (doubleres).png diff --git a/stepmania/Themes/default/Graphics/_header.lua b/stepmania/Themes/default/Graphics/_header.lua deleted file mode 100644 index 023c8a49f1..0000000000 --- a/stepmania/Themes/default/Graphics/_header.lua +++ /dev/null @@ -1,21 +0,0 @@ -local Text = ... -assert( Text ); - -return Def.ActorFrame{ - -- main header background - LoadActor(THEME:GetPathB("","_frame 3x1"), "headers", SCREEN_WIDTH/2.5); - - -- text - LoadFont("", "_zeroesthree") ..{ - Text=THEME:GetString( 'Headers', Text ); - InitCommand=cmd(horizalign,left;shadowlength,0;x,-128); - OnCommand=cmd(linear,0.25;diffusealpha,1); - OffCommand=cmd(linear,0.25;diffusealpha,0); - }; - - -- timer background - LoadActor(THEME:GetPathB("","_frame 3x1"), "headers", 48)..{ - --InitCommand=cmd( x,SCREEN_CENTER_X+(SCREEN_WIDTH/5.35) ); - InitCommand=cmd( x,SCREEN_RIGHT-(SCREEN_WIDTH/3.1825) ); - }; -}; \ No newline at end of file diff --git a/stepmania/Themes/default/Scripts/Other.lua b/stepmania/Themes/default/Scripts/Other.lua index a81f17a40a..bc02964556 100644 --- a/stepmania/Themes/default/Scripts/Other.lua +++ b/stepmania/Themes/default/Scripts/Other.lua @@ -1,3 +1,11 @@ +function LoadFallbackB( element ) + -- TODO: Remove element parameter and make it a LuaThreadVar + local fallback_screen = THEME:GetMetric(Var 'LoadingScreen','Fallback'); + local fallback_path = THEME:GetPathB(fallback_screen,element); + --Trace('fallback_path ' .. fallback_path ); + return LoadActor( fallback_path ); +end + function FormatNumSongsPlayed( num ) local s = num if s == 1 then diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 272b0b613a..b9baf9ddc9 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -112,7 +112,7 @@ ScrollerY=SCREEN_CENTER_Y+40 ScrollerOnCommand= ScrollerOffCommand= TimerSeconds=-1 -StyleIcon=false +ShowStyleIcon=false HelpX=SCREEN_CENTER_X HelpY=SCREEN_BOTTOM-20 HelpOnCommand=zoom,0.5 @@ -164,7 +164,7 @@ JoinMessageP2X=SCREEN_CENTER_X+200 JoinMessageP2Y=SCREEN_CENTER_Y+96 TimerSeconds=40 TimerStealth=false -StyleIcon=true +ShowStyleIcon=true NextScreen=ScreenSelectGroupBranch() PrevScreen=ScreenTitleBranch() SilentWait=true @@ -173,14 +173,6 @@ FoldOnJoin=true [ScreenWithMenuElements2] Fallback="ScreenWithMenuElements" -LeftFrameX=SCREEN_CENTER_X-320 -LeftFrameY=SCREEN_CENTER_Y -LeftFrameOnCommand= -LeftFrameOffCommand= -RightFrameX=SCREEN_CENTER_X+320 -RightFrameY=SCREEN_CENTER_Y -RightFrameOnCommand= -RightFrameOffCommand= [ScreenSelectStyle2] Fallback="ScreenWithMenuElements2" @@ -296,7 +288,7 @@ Choice3="Style,couple;name,couple;screen,ScreenSelectDifficulty" Choice4="Style,double;name,double;screen,ScreenSelectDifficulty" Choice5="Style,solo;name,solo;screen,ScreenSelectDifficulty" TimerSeconds=40 -StyleIcon=true +ShowStyleIcon=true IdleCommentSeconds=15 IdleTimeoutSeconds=0 PrevScreen=ScreenTitleBranch() @@ -370,7 +362,7 @@ GuideX=SCREEN_CENTER_X+0 GuideY=SCREEN_CENTER_Y+134 TimerSeconds=30 TimerStealth=false -StyleIcon=true +ShowStyleIcon=true NextScreen=ScreenSelectGroupBranch() ScrollingListX=SCREEN_CENTER_X+0 ScrollingListY=SCREEN_CENTER_Y+10 @@ -408,7 +400,7 @@ Choice7="PlayMode,endless;name,endless;screen,"..GetScreenInstructions() Choice8="PlayMode,rave;name,rave;screen,"..GetScreenInstructions() NumChoicesOnPage1=4 TimerSeconds=40 -StyleIcon=true +ShowStyleIcon=true IdleCommentSeconds=15 IdleTimeoutSeconds=0 PrevScreen=ScreenTitleBranch() @@ -551,7 +543,7 @@ MusicListOnCommand= MusicListOffCommand= SleepAfterTweenOffSeconds=0.8 TimerSeconds=40 -StyleIcon=true +ShowStyleIcon=true [GroupList] StartX=0 @@ -588,7 +580,7 @@ Fallback="ScreenWithMenuElements" NextScreen="ScreenSelectCharacter" PrevScreen=ScreenTitleBranch() TimerSeconds=15 -StyleIcon=true +ShowStyleIcon=true [ScreenSelectMusic] Class="ScreenSelectMusic" @@ -641,7 +633,7 @@ MusicWheelY=SCREEN_CENTER_Y-2 MusicWheelOnCommand=draworder,-100 MusicWheelOffCommand= TimerSeconds=60 -StyleIcon=true +ShowStyleIcon=true SampleMusicDelay=0.25 DoRouletteOnMenuTimer=true AlignMusicBeat=false @@ -689,7 +681,7 @@ Class="ScreenSMOnlineLogin" Fallback="ScreenOptionsServiceChild" NextScreen=SMOnlineScreen() PrevScreen=ScreenTitleBranch() -StyleIcon=false +ShowStyleIcon=false TimerSeconds=-1 [ScreenNetRoom] @@ -816,7 +808,7 @@ ChatTextInputWidth=605 NumStylesShow=1 NumSongsShow=4 NumGroupsShow=3 -StyleIcon=false +ShowStyleIcon=false TimerSeconds= PrevScreen=ScreenTitleBranch() NextScreen="ScreenStage" @@ -878,7 +870,7 @@ NextScreen="ScreenStage" NextOptionsScreen=SelectFirstOptionsScreen() TimerSeconds=60 TimerStealth=false -StyleIcon=false +ShowStyleIcon=false [ScreenSplash] Class="ScreenSplash" @@ -1177,7 +1169,7 @@ Summary=false TimerSeconds=15 PlayerOptionsSeparator="," MaxComboNumDigits=4 -StyleIcon=true +ShowStyleIcon=true ShowBannerArea=true ShowJudgmentLabels=true ShowW1=true @@ -1769,7 +1761,7 @@ ExplanationOnCommand=wrapwidthpixels,900;zoom,0.7 NumStepsLoadedFromProfileX=SCREEN_RIGHT-180 NumStepsLoadedFromProfileY=SCREEN_TOP+42 NumStepsLoadedFromProfileOnCommand=visible,false -StyleIcon=false +ShowStyleIcon=false TimerSeconds=-1 [ScreenJukeboxMenu] @@ -1777,7 +1769,7 @@ Class="ScreenOptionsMaster" Fallback="ScreenOptions" NextScreen="ScreenJukebox" PrevScreen=ScreenTitleBranch() -StyleIcon=false +ShowStyleIcon=false TimerSeconds=-1 InputMode="together" ForceAllPlayers=true @@ -2052,19 +2044,19 @@ ShowStepsType=false [ScreenWithMenuElements] Fallback="Screen" AllowDisabledPlayerInput=false -StyleIcon=true +ShowStyleIcon=true ShowStageDisplay=false StageDisplayStageToShow=GAMESTATE:GetCurrentStage() StageDisplayStageIndex=GAMESTATE:GetStageIndex() MemoryCardIcons=true CancelTransitionsOut=false -HeaderX=SCREEN_LEFT+(SCREEN_WIDTH/4.25) -HeaderY=SCREEN_TOP-11 +HeaderX=SCREEN_CENTER_X +HeaderY=SCREEN_TOP+35 HeaderOnCommand=draworder,95;linear,0.25;addy,33 HeaderOffCommand=linear,0.25;addy,-44; FooterX=SCREEN_CENTER_X -FooterY=SCREEN_BOTTOM -FooterOnCommand=vertalign,bottom +FooterY=SCREEN_BOTTOM-34 +FooterOnCommand= FooterOffCommand= HelpX=SCREEN_CENTER_X HelpY=SCREEN_BOTTOM-24 @@ -2091,6 +2083,18 @@ FirstUpdateCommand= PlayMusic=true StopMusicOnBack=true WaitForChildrenBeforeTweeningOut=false +LeftFrameX=SCREEN_CENTER_X-320 +LeftFrameY=SCREEN_CENTER_Y +LeftFrameOnCommand= +LeftFrameOffCommand= +RightFrameX=SCREEN_CENTER_X+320 +RightFrameY=SCREEN_CENTER_Y +RightFrameOnCommand= +RightFrameOffCommand= +StyleIconX=SCREEN_CENTER_X+170 +StyleIconY=SCREEN_CENTER_Y-202 +StyleIconOnCommand= +StyleIconOffCommand= [MenuTimer] WarningStart=6 @@ -2349,7 +2353,7 @@ DownloadStatusX=SCREEN_WIDTH*4.0/7.0 DownloadStatusOnCommand=diffusealpha,0.0;linear,1.0;diffusealpha,1.0 DownloadStatusOffCommand=diffusealpha,1.0;linear,0.6;diffusealpha,0.0 CanDL=true -StyleIcon=false +ShowStyleIcon=false TimerSeconds= PrevScreen=ScreenTitleBranch() NextScreen="ScreenStage" @@ -2904,7 +2908,7 @@ FooterX= FooterY= FooterOnCommand=visible,false FooterOffCommand= -StyleIcon=false +ShowStyleIcon=false TimerSeconds=6 TimerStealth=true ForceTimer=true @@ -2912,6 +2916,7 @@ TimerX= TimerY= TimerOnCommand=visible,false TimerOffCommand= +ShowStyleIcon=false [ScreenSelectBlank] Fallback="ScreenWithMenuElementsBlank" @@ -2931,7 +2936,7 @@ ScrollerSecondsPerItem=0 ScrollerNumItemsToDraw=20 ScrollerTransform=function(self,offset,itemIndex,numItems) end ScrollerSubdivisions=1 -StyleIcon=true +ShowStyleIcon=true OverrideSleepAfterTweenOffSeconds=false SleepAfterTweenOffSeconds=0 NumCodes=0 @@ -3260,7 +3265,7 @@ FakeBeatsPerSec=2.5 ForceTimer=true TimerSeconds=24 TimerStealth=false -StyleIcon=false +ShowStyleIcon=false MaxRankingNameLength=4 NextScreen="ScreenProfileSave" PlayerP1OnePlayerOneSideX=SCREEN_CENTER_X-160 @@ -3313,7 +3318,7 @@ TitleLoseFocusCommand=stopeffect NavigationMode="menu" ForceAllPlayers=true InputMode="together" -StyleIcon=false +ShowStyleIcon=false [ScreenOptionsService] Class="ScreenOptionsMaster" @@ -3331,7 +3336,7 @@ PrevScreen=ScreenTitleBranch() IconsOnCommand=x,-30 TimerOnCommand=visible,false -StyleIcon=false +ShowStyleIcon=false TimerSeconds=-1 AllowOperatorMenuButton=false @@ -3363,7 +3368,7 @@ NavigationMode="normal" InputMode="together" IconsOnCommand=x,-30 TimerOnCommand=visible,false -StyleIcon=false +ShowStyleIcon=false TimerSeconds=-1 AllowOperatorMenuButton=false ForceAllPlayers=true @@ -3408,7 +3413,7 @@ PrevScreen=SongSelectionScreen() NextScreen=ScreenPlayerOptionsNext() PlayMusic=false TimerSeconds=30 -StyleIcon=false +ShowStyleIcon=false LineNames="1,2,3,4,5,6,7,8,9,10,11,12,13,14,15" Line1="list,Speed" Line2="list,Accel" @@ -3432,7 +3437,7 @@ Class="ScreenOptionsMaster" PrevScreen="ScreenSelectMusic" NextScreen="ScreenStage" TimerSeconds=30 -StyleIcon=false +ShowStyleIcon=false LineNames="1,2,3,4,5" Line1="list,Speed" Line2="list,Scroll" @@ -3447,7 +3452,7 @@ PrevScreen=SelectFirstOptionsScreen() NextScreen="ScreenStage" Game=Change the current game type with this option. TimerSeconds=30 -StyleIcon=false +ShowStyleIcon=false PlayMusic=false LineNames="1,2,3,4,5,6,7,8,9" Line1="list,LifeType" @@ -3523,7 +3528,7 @@ IconsP2OnCommand=addx,SCREEN_WIDTH*0.6;bounceend,0.5;addx,-SCREEN_WIDTH*0.6 IconsP2OffCommand=sleep,0.2;bouncebegin,0.5;addx,SCREEN_WIDTH*0.6 SleepAfterTweenOffSeconds=0.8 TimerSeconds=40 -StyleIcon=true +ShowStyleIcon=true PrevScreen=ScreenTitleBranch() NextScreen=SongSelectionScreen() @@ -3807,7 +3812,7 @@ EmptyName="STEP" [ScreenSetTime] Class="ScreenSetTime" -StyleIcon=false +ShowStyleIcon=false TimerSeconds=-1 TimerOnCommand=visible,false Fallback="ScreenWithMenuElements" @@ -3830,7 +3835,7 @@ NextScreen="ScreenEditMenu" PrevScreen="ScreenEditMenu" AllowOperatorMenuButton=false ShowCoinsAndCredits=false -StyleIcon=false +ShowStyleIcon=false TimerSeconds=-1 EditModifiers="" EditHelpX=SCREEN_LEFT+4 @@ -3851,7 +3856,7 @@ PrevScreen="none" CancelTransitionsOut=true PlayMusic=false TimerSeconds=-1 -StyleIcon=false +ShowStyleIcon=false LineNames="1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16" Line1="list,Speed" Line2="list,Accel" @@ -3941,7 +3946,7 @@ FrameOnCommand= FrameOffCommand= NumRowsShown=30 RowPositionTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) local indexOffset = itemIndex-(numItems-1)/2; self:y( SCREEN_CENTER_Y + indexOffset * 20 ); end -StyleIcon=false +ShowStyleIcon=false HeaderX=SCREEN_CENTER_X HeaderY=SCREEN_TOP+40 HeaderOnCommand= @@ -4008,7 +4013,7 @@ Class="ScreenTextEntry" Fallback="ScreenWithMenuElements" PrevScreen= TimerSeconds=-1 -StyleIcon=false +ShowStyleIcon=false RowStartX=SCREEN_LEFT+100 RowStartY=SCREEN_CENTER_Y-30 RowEndX=SCREEN_RIGHT-100 @@ -4163,7 +4168,7 @@ NextScreen="ScreenOptionsService" PrepareScreens="ScreenMiniMenuContext" GroupedScreens="ScreenMiniMenuContext" PersistScreens="ScreenMiniMenuContext" -StyleIcon=false +ShowStyleIcon=false TimerSeconds=-1 [ScreenOptionsEditProfile]