make options menus go back to the proper screen (e.g. UI Options goes back to "More Options" instead of ScreenOptionsService)

This commit is contained in:
AJ Kelly
2010-12-21 16:58:36 -06:00
parent 04081a821f
commit a14ab84dc7
+19 -7
View File
@@ -2550,13 +2550,13 @@ ShowExitRow=true
[ScreenTestInput] [ScreenTestInput]
Class="ScreenTestInput" Class="ScreenTestInput"
Fallback="ScreenOptionsServiceChild" Fallback="ScreenOptionsServiceChild"
NextScreen="ScreenOptionsService" NextScreen="ScreenOptionsExtended"
PrevScreen="ScreenOptionsService" PrevScreen="ScreenOptionsExtended"
[ScreenOptionsSystemDirection] [ScreenOptionsSystemDirection]
Fallback="ScreenOptionsServiceChild" Fallback="ScreenOptionsServiceChild"
PrevScreen=Branch.TitleMenu() PrevScreen="ScreenOptionsService"
NextScreen=Branch.TitleMenu() NextScreen="ScreenOptionsService"
LineNames="1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22" LineNames="1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22"
Line1="conf,Windowed" Line1="conf,Windowed"
Line2="conf,DisplayResolution" Line2="conf,DisplayResolution"
@@ -2583,6 +2583,8 @@ Line22="conf,EventMode"
[ScreenOptionsGraphicsSound] [ScreenOptionsGraphicsSound]
Fallback="ScreenOptionsServiceChild" Fallback="ScreenOptionsServiceChild"
NextScreen="ScreenOptionsExtended"
PrevScreen="ScreenOptionsExtended"
LineNames="1,2,3,4,5,6,7,8,9,10,11,12,13,14,17,18,19,20" LineNames="1,2,3,4,5,6,7,8,9,10,11,12,13,14,17,18,19,20"
Line1="conf,Windowed" Line1="conf,Windowed"
Line2="conf,DisplayResolution" Line2="conf,DisplayResolution"
@@ -2607,6 +2609,8 @@ Line20="conf,VisualDelaySeconds"
[ScreenOptionsAdvanced] [ScreenOptionsAdvanced]
Fallback="ScreenOptionsServiceChild" Fallback="ScreenOptionsServiceChild"
NextScreen="ScreenOptionsExtended"
PrevScreen="ScreenOptionsExtended"
LineNames="2,3,4,8,11,13,14,15,16,28,29,30" LineNames="2,3,4,8,11,13,14,15,16,28,29,30"
Line2="conf,ScoringType" Line2="conf,ScoringType"
Line3="conf,TimingWindowScale" Line3="conf,TimingWindowScale"
@@ -2630,6 +2634,8 @@ Line30="conf,FastLoad"
[ScreenAppearanceOptions] [ScreenAppearanceOptions]
Fallback="ScreenOptionsServiceChild" Fallback="ScreenOptionsServiceChild"
NextScreen="ScreenOptionsExtended"
PrevScreen="ScreenOptionsExtended"
LineNames="1,2,3,4,5,14,15,17,18,19" LineNames="1,2,3,4,5,14,15,17,18,19"
Line1="conf,Language" Line1="conf,Language"
Line2="conf,Announcer" Line2="conf,Announcer"
@@ -2646,6 +2652,8 @@ Line19="conf,NumBackgrounds"
# user interface options that aren't related to themes, etc. # user interface options that aren't related to themes, etc.
# (some don't get used/modified too often) # (some don't get used/modified too often)
Fallback="ScreenOptionsServiceChild" Fallback="ScreenOptionsServiceChild"
NextScreen="ScreenOptionsExtended"
PrevScreen="ScreenOptionsExtended"
LineNames="1,3,4,6,7,9,10,11,12,14" LineNames="1,3,4,6,7,9,10,11,12,14"
Line1="conf,Center1Player" Line1="conf,Center1Player"
Line3="conf,DancePointsForOni" Line3="conf,DancePointsForOni"
@@ -2665,7 +2673,8 @@ Line14="conf,ShowSongOptions"
[ScreenOptionsInput] [ScreenOptionsInput]
Fallback="ScreenOptionsServiceChild" Fallback="ScreenOptionsServiceChild"
# should we put map/test input in this section too? NextScreen="ScreenOptionsExtended"
PrevScreen="ScreenOptionsExtended"
LineNames="1,2,3,4,5" LineNames="1,2,3,4,5"
Line1="conf,AutoMapOnJoyChange" Line1="conf,AutoMapOnJoyChange"
Line2="conf,OnlyDedicatedMenuButtons" Line2="conf,OnlyDedicatedMenuButtons"
@@ -2674,8 +2683,10 @@ Line4="conf,ArcadeOptionsNavigation"
Line5="conf,MusicWheelSwitchSpeed" Line5="conf,MusicWheelSwitchSpeed"
[ScreenOptionsArcade] [ScreenOptionsArcade]
# shit that's tied to arcade features
Fallback="ScreenOptionsServiceChild" Fallback="ScreenOptionsServiceChild"
NextScreen="ScreenOptionsExtended"
PrevScreen="ScreenOptionsExtended"
# stuff tied to arcade features
LineNames="1,2,3,4,5,6" LineNames="1,2,3,4,5,6"
Line1="conf,GetRankingName" Line1="conf,GetRankingName"
Line2="conf,CoinMode" Line2="conf,CoinMode"
@@ -3445,7 +3456,7 @@ Fallback="TextBanner"
Fallback="ScreenWithMenuElements" Fallback="ScreenWithMenuElements"
Class="ScreenEditMenu" Class="ScreenEditMenu"
NextScreen="ScreenEdit" NextScreen="ScreenEdit"
PrevScreen=Branch.TitleMenu() PrevScreen="ScreenOptionsEdit"
EditMenuType="EditMenu" EditMenuType="EditMenu"
ExplanationX=SCREEN_CENTER_X ExplanationX=SCREEN_CENTER_X
ExplanationY=SCREEN_BOTTOM-56 ExplanationY=SCREEN_BOTTOM-56
@@ -3489,6 +3500,7 @@ Fallback="ScreenEditMenu"
Class="ScreenEditMenu" Class="ScreenEditMenu"
# #
NextScreen="ScreenPractice" NextScreen="ScreenPractice"
PrevScreen="ScreenOptionsEdit"
EditMenuType="PracticeMenu" EditMenuType="PracticeMenu"
[PracticeMenu] [PracticeMenu]