From 0a6257a0aa51be69e5c0173afee6d423e2d46b10 Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Fri, 3 Apr 2009 09:18:10 +0000
Subject: [PATCH] theme cleanup

---
 .../default/BGAnimations/ScreenLogo background/default.lua  | 4 ++--
 .../Graphics/ScreenWithMenuElements header/default.lua      | 2 +-
 stepmania/Themes/default/metrics.ini                        | 6 ++----
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/stepmania/Themes/default/BGAnimations/ScreenLogo background/default.lua b/stepmania/Themes/default/BGAnimations/ScreenLogo background/default.lua
index 59db344850..58a16288e1 100644
--- a/stepmania/Themes/default/BGAnimations/ScreenLogo background/default.lua	
+++ b/stepmania/Themes/default/BGAnimations/ScreenLogo background/default.lua	
@@ -7,9 +7,9 @@ return Def.ActorFrame {
 		InitCommand=cmd(x,SCREEN_LEFT;y,SCREEN_BOTTOM;horizalign,left;vertalign,bottom;blend,"BlendMode_Add";diffusealpha,0.4;);
 	};
 	LoadActor( "ring orange" ) .. {
-		InitCommand=cmd(x,SCREEN_CENTER_X+50;y,SCREEN_CENTER_Y;diffusealpha,0.5;spin;rotationx,-20;rotationy,28;rotationz,20;effectmagnitude,0,0,5;);
+		InitCommand=cmd(x,SCREEN_CENTER_X+50;y,SCREEN_CENTER_Y;diffusealpha,0.5;zoom,0.9;spin;rotationx,-20;rotationy,28;rotationz,20;effectmagnitude,0,0,5;);
 	};
 	LoadActor( "ring blue" ) .. {
-		InitCommand=cmd(x,SCREEN_CENTER_X-100;y,SCREEN_CENTER_Y+50;diffusealpha,0.5;spin;rotationx,-60;rotationy,-20;rotationz,-50;effectmagnitude,0,0,-5;);
+		InitCommand=cmd(x,SCREEN_CENTER_X-100;y,SCREEN_CENTER_Y+50;diffusealpha,0.5;zoom,0.8;spin;rotationx,-60;rotationy,-20;rotationz,-50;effectmagnitude,0,0,-5;);
 	};
 };
\ No newline at end of file
diff --git a/stepmania/Themes/default/Graphics/ScreenWithMenuElements header/default.lua b/stepmania/Themes/default/Graphics/ScreenWithMenuElements header/default.lua
index 26f966702f..cab40d8253 100644
--- a/stepmania/Themes/default/Graphics/ScreenWithMenuElements header/default.lua	
+++ b/stepmania/Themes/default/Graphics/ScreenWithMenuElements header/default.lua	
@@ -25,7 +25,7 @@ return Def.ActorFrame {
 			InitCommand=cmd(x,-1.5;y,2;spin;effectmagnitude,0,0,10;);
 		};
 		LoadActor( "ring diffuse" ) .. {
-			InitCommand=cmd(x,-1.5;y,-3;spin;effectmagnitude,0,0,10;);
+			InitCommand=cmd(x,-1.5;y,-3;spin;effectmagnitude,0,0,20;);
 		};
 		UpdateScreenHeaderMessageCommand=function(self,params)
 			local header = self:GetChild("HeaderText");
diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 4dfbd9584d..39efadc5b1 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -165,7 +165,7 @@ Class="ScreenSelectMaster"
 HelpText=ScreenString("HelpTextNormal")
 IdleCommentSeconds=0
 IdleTimeoutSeconds=0
-TimerSeconds=0
+TimerSeconds=30
 UpdateOnMessage=""
 PrevScreen="ScreenTitleMenu"
 ChoiceNames="1,2,3"
@@ -218,7 +218,7 @@ Class="ScreenSelectMaster"
 HelpText=ScreenString("HelpTextNormal")
 IdleCommentSeconds=0
 IdleTimeoutSeconds=0
-TimerSeconds=0
+TimerSeconds=30
 UpdateOnMessage=""
 PrevScreen="ScreenTitleMenu"
 ChoiceNames="1,2,3,4,5"
@@ -430,8 +430,6 @@ OptionsAreaP2OnCommand=
 OptionsAreaP2OffCommand=
 SelectMenuChangesDifficulty=true
 WrapChangeSteps=false
-HeaderOnCommand=draworder,110
-;over the group thing
 
 [ScreenSelectCourse]
 Class="ScreenSelectMusic"