From cec3ebb5ba7d3e11b5a368a1c31d8461ad5f56c5 Mon Sep 17 00:00:00 2001
From: AJ Kelly <aj187@ajworld.net>
Date: Fri, 25 Mar 2011 02:56:40 -0500
Subject: [PATCH] remove unused ScreenQuickSetup and related items

---
 Themes/_fallback/Languages/en.ini        | 12 ----
 Themes/_fallback/Scripts/02 Branches.lua |  6 --
 Themes/_fallback/metrics.ini             | 85 +-----------------------
 3 files changed, 1 insertion(+), 102 deletions(-)

diff --git a/Themes/_fallback/Languages/en.ini b/Themes/_fallback/Languages/en.ini
index 44ee600478..4e465f8675 100644
--- a/Themes/_fallback/Languages/en.ini
+++ b/Themes/_fallback/Languages/en.ini
@@ -2225,18 +2225,6 @@ HeaderText=Edit Course
 HelpText=&MENUUP;&MENUDOWN; Move &MENULEFT;&MENURIGHT; Change Value
 [ScreenOptionsCourseOverview]
 HeaderText=Course Overview
-[ScreenQuickSetupOverview]
-HeaderText=Quick Setup - Welcome!
-[ScreenQuickSetupPhaseOne]
-HeaderText=Quick Setup - Page 1: Profile
-[ScreenQuickSetupPhaseTwo]
-HeaderText=Quick Setup - Page 2: Gameplay
-[ScreenQuickSetupPhaseThree]
-HeaderText=Quick Setup - Page 3: Appearance
-[ScreenQuickSetupPhaseFour]
-HeaderText=Quick Setup - Page 4: Extra
-[ScreenQuickSetupFinished]
-HeaderText=Quick Setup - Finished!
 [ScreenSelectProfile]
 HeaderText=Select Profile
 [ScreenSelectPlayStyle]
diff --git a/Themes/_fallback/Scripts/02 Branches.lua b/Themes/_fallback/Scripts/02 Branches.lua
index 471e9bd30e..f10f448946 100644
--- a/Themes/_fallback/Scripts/02 Branches.lua	
+++ b/Themes/_fallback/Scripts/02 Branches.lua	
@@ -193,10 +193,4 @@ Branch = {
 	Network = function()
 		return IsNetConnected() and "ScreenTitleMenu" or "ScreenTitleMenu"
 	end,
-	QuickSetupStart = "ScreenQuickSetupOverview",
-	QuickSetupA = "ScreenQuickSetupPhaseOne",
-	QuickSetupB = "ScreenQuickSetupPhaseTwo",
-	QuickSetupC = "ScreenQuickSetupPhaseThree",
-	QuickSetupD = "ScreenQuickSetupPhaseFour",
-	QuickSetupFinished = "ScreenQuickSetupFinished"
 }
diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini
index b37ce668a6..c92fd40354 100644
--- a/Themes/_fallback/metrics.ini
+++ b/Themes/_fallback/metrics.ini
@@ -1661,9 +1661,7 @@ Choice5="text,Edit/Share;screen,"..Branch.OptionsEdit()
 Choice6="screen,ScreenJukeboxMenu;text,Jukebox"
 Choice7="screen,ScreenExit;text,Exit"
 Choice8="screen,ScreenTest;text,Sandbox"
-Choice9="screen,ScreenQuickSetupOverview;text,Setup"
 # Aliases for the future.
-ChoiceSetup="screen,ScreenQuickSetupOverview;text,Setup"
 ChoiceGameStart="applydefaultoptions;text,Game Start;screen,"..Branch.StartGame()
 ChoiceOnline="screen,ScreenNetworkOptions;text,Play Online"
 ChoiceGameSelect="screen,ScreenSelectGame;text,Select Game"
@@ -1671,7 +1669,6 @@ ChoiceOptions="screen,ScreenOptionsSystemDirection;text,Options"
 ChoiceEdit="text,Edit/Share;screen,"..Branch.OptionsEdit()
 ChoiceJukebox="screen,ScreenJukeboxMenu;text,Jukebox"
 ChoiceSandbox="screen,ScreenTest;text,Sandbox"
-ChoiceSetup="screen,ScreenQuickSetupOverview;text,Setup"
 ChoiceExit="screen,ScreenExit;text,Exit"
 #
 AllowRepeatingInput=true
@@ -1720,87 +1717,7 @@ LogoX=SCREEN_CENTER_X
 LogoY=SCREEN_CENTER_Y-80
 LogoOnCommand=bob;effectperiod,4;effectmagnitude,0,8,0;zoom,0;bounceend,0.35;zoom,1
 LogoOffCommand=
-[ScreenQuickSetupOverview]
-Class="ScreenSelectMaster"
-Fallback="ScreenSelectMaster"
-#
-NextScreen=Branch.QuickSetupA
-PrevScreen=Branch.TitleMenu()
-#
-TimerSeconds=-1
-#
-DefaultChoice="Start"
-ChoiceNames="Start,Back"
-#
-ChoiceStart="name,Start;screen,".. Branch.QuickSetupA
-ChoiceBack="name,Back;screen,".. Branch.TitleMenu
-#
-PerChoiceScrollElement=false
-PerChoiceIconElement=false
-#
-ShowScroller=true
-WrapScroller=false
-ShowIcon=true
-[ScreenQuickSetupPhaseOne]
-Class="ScreenSelectMaster"
-Fallback="ScreenQuickSetupOverview"
-#
-NextScreen=Branch.QuickSetupBl
-PrevScreen=Branch.QuickSetupStart
-#
-DefaultChoice="Set"
-ChoiceNames="Set,Back"
-#
-ChoiceSet="name,Set;screen,".. Branch.QuickSetupB
-ChoiceBack="name,Back;screen,".. Branch.QuickSetupStart
-[ScreenQuickSetupPhaseTwo]
-Class="ScreenSelectMaster"
-Fallback="ScreenQuickSetupOverview"
-#
-NextScreen=Branch.QuickSetupC
-PrevScreen=Branch.QuickSetupA
-#
-DefaultChoice="Set"
-ChoiceNames="Set,Back"
-#
-ChoiceSet="name,Set;screen,".. Branch.QuickSetupC
-ChoiceBack="name,Back;screen,".. Branch.QuickSetupA
-[ScreenQuickSetupPhaseThree]
-Class="ScreenSelectMaster"
-Fallback="ScreenQuickSetupOverview"
-#
-NextScreen=Branch.QuickSetupD
-PrevScreen=Branch.QuickSetupB
-#
-DefaultChoice="Set"
-ChoiceNames="Set,Back"
-#
-ChoiceSet="name,Set;screen,".. Branch.QuickSetupD
-ChoiceBack="name,Back;screen,".. Branch.QuickSetupB
-[ScreenQuickSetupPhaseFour]
-Class="ScreenSelectMaster"
-Fallback="ScreenQuickSetupOverview"
-#
-NextScreen=Branch.QuickSetupFinished
-PrevScreen=Branch.QuickSetupC
-#
-DefaultChoice="Set"
-ChoiceNames="Set,Back"
-#
-ChoiceSet="name,Set;screen,".. Branch.QuickSetupFinished
-ChoiceBack="name,Back;screen,".. Branch.QuickSetupC
-[ScreenQuickSetupFinished]
-Class="ScreenSelectMaster"
-Fallback="ScreenQuickSetupOverview"
-#
-NextScreen=Branch.TitleMenu()
-PrevScreen=Branch.QuickSetupD
-#
-DefaultChoice="Set"
-ChoiceNames="Set,Back"
-#
-ChoiceSet="name,Set;screen,".. Branch.TitleMenu
-ChoiceBack="name,Back;screen,".. Branch.QuickSetupD
+
 [ScreenProfileLoad]
 Class="ScreenProfileLoad"
 Fallback="ScreenWithMenuElementsBlank"