From a393efdd13d15e48899bd204632db6862ceead8f Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Tue, 7 Apr 2009 00:54:54 +0000 Subject: [PATCH] system message, map controllers cleanup --- .../ScreenSystemLayer overlay.lua | 24 ++++++++++--------- ...dir => ScreenMapControllers devices.redir} | 2 +- .../Fonts/ScreenMapControllers title.redir | 1 + .../ScreenSystemLayer SystemMessage.redir | 1 + .../ScreenMapControllers footer.redir | 1 + ...creenSystemLayer SystemMessageFrame.redir} | 0 stepmania/Themes/default/metrics.ini | 4 ++-- stepmania/src/ScreenMapControllers.cpp | 2 +- 8 files changed, 20 insertions(+), 15 deletions(-) rename stepmania/Themes/default/Fonts/{ScreenSystemLayer message.redir => ScreenMapControllers devices.redir} (93%) create mode 100644 stepmania/Themes/default/Fonts/ScreenMapControllers title.redir create mode 100644 stepmania/Themes/default/Fonts/ScreenSystemLayer SystemMessage.redir create mode 100644 stepmania/Themes/default/Graphics/ScreenMapControllers footer.redir rename stepmania/Themes/default/Graphics/{ScreenSystemLayer MessageFrame.redir => ScreenSystemLayer SystemMessageFrame.redir} (100%) diff --git a/stepmania/Themes/default/BGAnimations/ScreenSystemLayer overlay.lua b/stepmania/Themes/default/BGAnimations/ScreenSystemLayer overlay.lua index f960501a27..b9082f05fb 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenSystemLayer overlay.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenSystemLayer overlay.lua @@ -26,22 +26,24 @@ local function CreditsText( pn ) end local t = Def.ActorFrame { - LoadFont(Var "LoadingScreen","message") .. { - InitCommand=cmd(maxwidth,750; - horizalign,left;vertalign,top; - shadowlength,2;shadowcolor,color("#000000"); - y,SCREEN_TOP+20; - diffusealpha,0 - ); - + Def.ActorFrame { + Def.Quad { + InitCommand=cmd(zoomtowidth,SCREEN_WIDTH;zoomtoheight,30;horizalign,left;vertalign,top;y,SCREEN_TOP;diffusetopedge,color("#FFFFFF");diffusebottomedge,color("#000000");diffusealpha,0;); + OnCommand=cmd(finishtweening;x,SCREEN_LEFT;diffusealpha,0.3;addx,-SCREEN_WIDTH;linear,0.5;addx,SCREEN_WIDTH;); + OffCommand=cmd(sleep,3;linear,0.5;diffusealpha,0;); + }; + LoadFont(Var "LoadingScreen","SystemMessage") .. { + Name="Text"; + InitCommand=cmd(maxwidth,750;horizalign,left;vertalign,top;y,SCREEN_TOP+10;strokecolor,color("#000000");shadowlength,0;diffusealpha,0;); + OnCommand=cmd(finishtweening;x,SCREEN_LEFT+10;diffusealpha,1;addx,-SCREEN_WIDTH;linear,0.5;addx,SCREEN_WIDTH;); + OffCommand=cmd(sleep,3;linear,0.5;diffusealpha,0;); + }; SystemMessageMessageCommand = function(self, params) - self:settext( params.Message ); - local f = cmd(finishtweening;x,SCREEN_LEFT+20;diffusealpha,1;addx,-SCREEN_WIDTH;linear,0.5;addx,SCREEN_WIDTH); f(self); + self:GetChild("Text"):settext( params.Message ); self:playcommand( "On" ); if params.NoAnimate then self:finishtweening(); end - f = cmd(sleep,5;linear,0.5;diffusealpha,0); f(self); self:playcommand( "Off" ); end; HideSystemMessageMessageCommand = cmd(finishtweening); diff --git a/stepmania/Themes/default/Fonts/ScreenSystemLayer message.redir b/stepmania/Themes/default/Fonts/ScreenMapControllers devices.redir similarity index 93% rename from stepmania/Themes/default/Fonts/ScreenSystemLayer message.redir rename to stepmania/Themes/default/Fonts/ScreenMapControllers devices.redir index ce9b8c25f4..3c21a0245a 100644 --- a/stepmania/Themes/default/Fonts/ScreenSystemLayer message.redir +++ b/stepmania/Themes/default/Fonts/ScreenMapControllers devices.redir @@ -1 +1 @@ -Common Normal +Common Normal diff --git a/stepmania/Themes/default/Fonts/ScreenMapControllers title.redir b/stepmania/Themes/default/Fonts/ScreenMapControllers title.redir new file mode 100644 index 0000000000..3c21a0245a --- /dev/null +++ b/stepmania/Themes/default/Fonts/ScreenMapControllers title.redir @@ -0,0 +1 @@ +Common Normal diff --git a/stepmania/Themes/default/Fonts/ScreenSystemLayer SystemMessage.redir b/stepmania/Themes/default/Fonts/ScreenSystemLayer SystemMessage.redir new file mode 100644 index 0000000000..3c21a0245a --- /dev/null +++ b/stepmania/Themes/default/Fonts/ScreenSystemLayer SystemMessage.redir @@ -0,0 +1 @@ +Common Normal diff --git a/stepmania/Themes/default/Graphics/ScreenMapControllers footer.redir b/stepmania/Themes/default/Graphics/ScreenMapControllers footer.redir new file mode 100644 index 0000000000..56cf597902 --- /dev/null +++ b/stepmania/Themes/default/Graphics/ScreenMapControllers footer.redir @@ -0,0 +1 @@ +_blank diff --git a/stepmania/Themes/default/Graphics/ScreenSystemLayer MessageFrame.redir b/stepmania/Themes/default/Graphics/ScreenSystemLayer SystemMessageFrame.redir similarity index 100% rename from stepmania/Themes/default/Graphics/ScreenSystemLayer MessageFrame.redir rename to stepmania/Themes/default/Graphics/ScreenSystemLayer SystemMessageFrame.redir diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index d806b97fec..0966e8f824 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -1874,8 +1874,8 @@ MemoryCardIcons=true CancelTransitionsOut=false HeaderX=SCREEN_CENTER_X HeaderY=SCREEN_TOP+35 -HeaderOnCommand=addy,-50;linear,0.25;addy,50;draworder,1 -HeaderOffCommand=linear,0.25;addy,-90; +HeaderOnCommand= +HeaderOffCommand= FooterX=SCREEN_CENTER_X FooterY=SCREEN_BOTTOM FooterOnCommand=draworder,-1;vertalign,bottom diff --git a/stepmania/src/ScreenMapControllers.cpp b/stepmania/src/ScreenMapControllers.cpp index 85c9dc2805..167c313efd 100644 --- a/stepmania/src/ScreenMapControllers.cpp +++ b/stepmania/src/ScreenMapControllers.cpp @@ -34,7 +34,7 @@ void ScreenMapControllers::Init() m_soundDelete.Load( THEME->GetPathS(m_sName,"delete"), true ); - m_textDevices.LoadFromFont( THEME->GetPathF(m_sName,"normal") ); + m_textDevices.LoadFromFont( THEME->GetPathF(m_sName,"devices") ); m_textDevices.SetName( "Devices" ); LOAD_ALL_COMMANDS_AND_SET_XY( m_textDevices ); this->AddChild( &m_textDevices );