From 5149c661b9a8b103a6d9193b4dfe2694d384da15 Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Thu, 22 Jul 2010 15:51:37 -0500 Subject: [PATCH] toy with autogen style; fix an annoying (non-fatal) error on stagedisplay --- Themes/_Installer/Languages/en.ini | 1 + .../Graphics/ScreenWithMenuElements StageDisplay.lua | 10 ++++++---- Themes/default/metrics.ini | 3 ++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Themes/_Installer/Languages/en.ini b/Themes/_Installer/Languages/en.ini index f0390b7aff..302f4c85b2 100644 --- a/Themes/_Installer/Languages/en.ini +++ b/Themes/_Installer/Languages/en.ini @@ -3,6 +3,7 @@ TEXT_IO_CHECK_FOR_UPDATES=Check for Updates TEXT_IO_RUN=${PRODUCT_DISPLAY} TEXT_IO_RUN_WITHOUT_SSE2=${PRODUCT_DISPLAY} (non-SSE2) TEXT_IO_OPEN_PROGRAM_FOLDER=Open ${PRODUCT_ID} Program Folder +TEXT_IO_OPEN_SETTINGS_FOLDER=Open ${PRODUCT_ID} Settings Folder TEXT_IO_MANUAL=${PRODUCT_ID} Manual TEXT_IO_TOOLS=${PRODUCT_ID} Tools TEXT_IO_WEB_SITE=${PRODUCT_ID} Web Site diff --git a/Themes/default/Graphics/ScreenWithMenuElements StageDisplay.lua b/Themes/default/Graphics/ScreenWithMenuElements StageDisplay.lua index 899f82eb43..cc9f4f6a8a 100644 --- a/Themes/default/Graphics/ScreenWithMenuElements StageDisplay.lua +++ b/Themes/default/Graphics/ScreenWithMenuElements StageDisplay.lua @@ -62,13 +62,15 @@ if not PREFSMAN:GetPreference("EventMode") then else stages[#stages+1] = MakeBitmapTest() .. { SetCommand=function(self,params) - local Offset = THEME:GetMetric(Var "LoadingScreen","StageDisplayNumberOffset"); - local Stage = GAMESTATE:GetCurrentStageIndex(); - local RealStage = Stage + Offset; - self:settextf( "Stage %03i", RealStage); + if Var "LoadingScreen" then + local Offset = THEME:GetMetric(Var "LoadingScreen","StageDisplayNumberOffset"); + local Stage = GAMESTATE:GetCurrentStageIndex(); + local RealStage = Stage + Offset; + self:settextf( "Stage %03i", RealStage); self:diffuse( StageToColor('Stage_1st') ); self:diffusebottomedge( ColorMidTone(StageToColor('Stage_1st')) ); self:strokecolor( Colors.Alpha( ColorDarkTone(StageToColor('Stage_1st')), 0.75) ); + end; end; } end diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini index a062bf5f06..eaa145175e 100644 --- a/Themes/default/metrics.ini +++ b/Themes/default/metrics.ini @@ -628,7 +628,8 @@ end; ShowAutogen=true AutogenX=0 AutogenY=0 -AutogenOnCommand=diffuseshift;effectcolor1,Colors.Alpha( Color("Green") , 0.5 );effectcolor2,ColorLightTone( Color("Green") ); +#AutogenOnCommand=diffuseshift;effectcolor1,Colors.Alpha( Color("Green") , 0.5 );effectcolor2,ColorLightTone( Color("Green") ); +AutogenOnCommand=blend,Blend.Add;diffuseshift;effectcolor1,color("#FFCC00FF");effectcolor2,color("#FFCC0088"); AutogenSetCommand= # ShowStepsType=GetUserPrefB("UserPrefAutoSetStyle")