From 8bb5dddd06b3e4db95e025b66308a7d06bc6ef36 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Fri, 10 Apr 2009 22:27:18 +0000 Subject: [PATCH] ScreenSelectStyle2 -> ScreenSelectStyle --- .../default/BGAnimations/ScreenSelectStyle background.redir | 1 - .../Themes/default/BGAnimations/ScreenSelectStyle in.redir | 2 +- .../Themes/default/BGAnimations/ScreenSelectStyle out.redir | 1 - .../Themes/default/BGAnimations/ScreenSelectStyle2 in.redir | 1 - stepmania/Themes/default/Languages/en.ini | 2 +- stepmania/Themes/default/Scripts/Branches.lua | 2 +- ...ctStyle2 change.redir => ScreenSelectStyle change.redir} | 0 ...lectStyle2 music.redir => ScreenSelectStyle music.redir} | 0 ...lectStyle2 start.redir => ScreenSelectStyle start.redir} | 0 stepmania/Themes/default/metrics.ini | 6 +++--- 10 files changed, 6 insertions(+), 9 deletions(-) delete mode 100644 stepmania/Themes/default/BGAnimations/ScreenSelectStyle background.redir delete mode 100644 stepmania/Themes/default/BGAnimations/ScreenSelectStyle out.redir delete mode 100644 stepmania/Themes/default/BGAnimations/ScreenSelectStyle2 in.redir rename stepmania/Themes/default/Sounds/{ScreenSelectStyle2 change.redir => ScreenSelectStyle change.redir} (100%) mode change 100755 => 100644 rename stepmania/Themes/default/Sounds/{ScreenSelectStyle2 music.redir => ScreenSelectStyle music.redir} (100%) rename stepmania/Themes/default/Sounds/{ScreenSelectStyle2 start.redir => ScreenSelectStyle start.redir} (100%) mode change 100755 => 100644 diff --git a/stepmania/Themes/default/BGAnimations/ScreenSelectStyle background.redir b/stepmania/Themes/default/BGAnimations/ScreenSelectStyle background.redir deleted file mode 100644 index f98a6ace22..0000000000 --- a/stepmania/Themes/default/BGAnimations/ScreenSelectStyle background.redir +++ /dev/null @@ -1 +0,0 @@ -ScreenWithMenuElements background \ No newline at end of file diff --git a/stepmania/Themes/default/BGAnimations/ScreenSelectStyle in.redir b/stepmania/Themes/default/BGAnimations/ScreenSelectStyle in.redir index 20f5042bcb..7c2c062086 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenSelectStyle in.redir +++ b/stepmania/Themes/default/BGAnimations/ScreenSelectStyle in.redir @@ -1 +1 @@ -_menu in \ No newline at end of file +_fade in normal \ No newline at end of file diff --git a/stepmania/Themes/default/BGAnimations/ScreenSelectStyle out.redir b/stepmania/Themes/default/BGAnimations/ScreenSelectStyle out.redir deleted file mode 100644 index dbd8790a88..0000000000 --- a/stepmania/Themes/default/BGAnimations/ScreenSelectStyle out.redir +++ /dev/null @@ -1 +0,0 @@ -_menu out \ No newline at end of file diff --git a/stepmania/Themes/default/BGAnimations/ScreenSelectStyle2 in.redir b/stepmania/Themes/default/BGAnimations/ScreenSelectStyle2 in.redir deleted file mode 100644 index 7c2c062086..0000000000 --- a/stepmania/Themes/default/BGAnimations/ScreenSelectStyle2 in.redir +++ /dev/null @@ -1 +0,0 @@ -_fade in normal \ No newline at end of file diff --git a/stepmania/Themes/default/Languages/en.ini b/stepmania/Themes/default/Languages/en.ini index 128fab5292..4fd6e0ec62 100644 --- a/stepmania/Themes/default/Languages/en.ini +++ b/stepmania/Themes/default/Languages/en.ini @@ -1330,7 +1330,7 @@ ALL MUSIC=ALL MUSIC HeaderText=Select Music HeaderSubText=You will pick a cool song! -[ScreenSelectStyle2] +[ScreenSelectStyle] HeaderText=Select Style HeaderSubText=I can't wait to see your next moves! diff --git a/stepmania/Themes/default/Scripts/Branches.lua b/stepmania/Themes/default/Scripts/Branches.lua index 6fcbac739f..9ae08921f9 100644 --- a/stepmania/Themes/default/Scripts/Branches.lua +++ b/stepmania/Themes/default/Scripts/Branches.lua @@ -11,7 +11,7 @@ end function ScreenCautionBranch() if PREFSMAN:GetPreference("ShowCaution") then return "ScreenCaution" end - return "ScreenSelectStyle2" + return "ScreenSelectStyle" end function ScreenSelectGroupBranch() diff --git a/stepmania/Themes/default/Sounds/ScreenSelectStyle2 change.redir b/stepmania/Themes/default/Sounds/ScreenSelectStyle change.redir old mode 100755 new mode 100644 similarity index 100% rename from stepmania/Themes/default/Sounds/ScreenSelectStyle2 change.redir rename to stepmania/Themes/default/Sounds/ScreenSelectStyle change.redir diff --git a/stepmania/Themes/default/Sounds/ScreenSelectStyle2 music.redir b/stepmania/Themes/default/Sounds/ScreenSelectStyle music.redir similarity index 100% rename from stepmania/Themes/default/Sounds/ScreenSelectStyle2 music.redir rename to stepmania/Themes/default/Sounds/ScreenSelectStyle music.redir diff --git a/stepmania/Themes/default/Sounds/ScreenSelectStyle2 start.redir b/stepmania/Themes/default/Sounds/ScreenSelectStyle start.redir old mode 100755 new mode 100644 similarity index 100% rename from stepmania/Themes/default/Sounds/ScreenSelectStyle2 start.redir rename to stepmania/Themes/default/Sounds/ScreenSelectStyle start.redir diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index e900d9f7db..5e2e368310 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -132,8 +132,8 @@ ChoiceNames="1" [ScreenCaution] Fallback="ScreenSplash" -PrepareScreen="ScreenSelectStyle2" -NextScreen="ScreenSelectStyle2" +PrepareScreen="ScreenSelectStyle" +NextScreen="ScreenSelectStyle" PrevScreen=ScreenTitleBranch() TimerSeconds=3 AllowStartToSkip=true @@ -155,7 +155,7 @@ PrevScreen=ScreenTitleBranch() TimerSeconds=-1 ShowHelp=false -[ScreenSelectStyle2] +[ScreenSelectStyle] Fallback="ScreenWithMenuElements" Class="ScreenSelectMaster" HelpText=ScreenString("HelpTextNormal")