From 0cdefdbc338d4d164d9b899c33ebbb0dc48df0cd Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Thu, 14 Jul 2005 05:52:17 +0000 Subject: [PATCH] name cleanup: ScreenOptionsMenu -> ScreenOptionsService ScreenOptionsSubMenu -> ScreenOptionsServiceChild --- .../ScreenOptionsService in.redir | 1 + .../ScreenOptionsService out.redir | 1 + .../ScreenOptionsServiceChild in.redir | 1 + .../ScreenOptionsServiceChild out.redir | 1 + .../ScreenOptionsService header.redir | 1 + .../ScreenOptionsServiceChild header.redir | 1 + stepmania/Themes/default/Scripts/Other.lua | 2 +- stepmania/Themes/default/metrics.ini | 128 +++++++++--------- 8 files changed, 71 insertions(+), 65 deletions(-) create mode 100644 stepmania/Themes/default/BGAnimations/ScreenOptionsService in.redir create mode 100644 stepmania/Themes/default/BGAnimations/ScreenOptionsService out.redir create mode 100644 stepmania/Themes/default/BGAnimations/ScreenOptionsServiceChild in.redir create mode 100644 stepmania/Themes/default/BGAnimations/ScreenOptionsServiceChild out.redir create mode 100644 stepmania/Themes/default/Graphics/ScreenOptionsService header.redir create mode 100644 stepmania/Themes/default/Graphics/ScreenOptionsServiceChild header.redir diff --git a/stepmania/Themes/default/BGAnimations/ScreenOptionsService in.redir b/stepmania/Themes/default/BGAnimations/ScreenOptionsService in.redir new file mode 100644 index 0000000000..0f6547301b --- /dev/null +++ b/stepmania/Themes/default/BGAnimations/ScreenOptionsService in.redir @@ -0,0 +1 @@ +_options to options \ No newline at end of file diff --git a/stepmania/Themes/default/BGAnimations/ScreenOptionsService out.redir b/stepmania/Themes/default/BGAnimations/ScreenOptionsService out.redir new file mode 100644 index 0000000000..0f6547301b --- /dev/null +++ b/stepmania/Themes/default/BGAnimations/ScreenOptionsService out.redir @@ -0,0 +1 @@ +_options to options \ No newline at end of file diff --git a/stepmania/Themes/default/BGAnimations/ScreenOptionsServiceChild in.redir b/stepmania/Themes/default/BGAnimations/ScreenOptionsServiceChild in.redir new file mode 100644 index 0000000000..0f6547301b --- /dev/null +++ b/stepmania/Themes/default/BGAnimations/ScreenOptionsServiceChild in.redir @@ -0,0 +1 @@ +_options to options \ No newline at end of file diff --git a/stepmania/Themes/default/BGAnimations/ScreenOptionsServiceChild out.redir b/stepmania/Themes/default/BGAnimations/ScreenOptionsServiceChild out.redir new file mode 100644 index 0000000000..0f6547301b --- /dev/null +++ b/stepmania/Themes/default/BGAnimations/ScreenOptionsServiceChild out.redir @@ -0,0 +1 @@ +_options to options \ No newline at end of file diff --git a/stepmania/Themes/default/Graphics/ScreenOptionsService header.redir b/stepmania/Themes/default/Graphics/ScreenOptionsService header.redir new file mode 100644 index 0000000000..c700c90d39 --- /dev/null +++ b/stepmania/Themes/default/Graphics/ScreenOptionsService header.redir @@ -0,0 +1 @@ +_blank diff --git a/stepmania/Themes/default/Graphics/ScreenOptionsServiceChild header.redir b/stepmania/Themes/default/Graphics/ScreenOptionsServiceChild header.redir new file mode 100644 index 0000000000..c700c90d39 --- /dev/null +++ b/stepmania/Themes/default/Graphics/ScreenOptionsServiceChild header.redir @@ -0,0 +1 @@ +_blank diff --git a/stepmania/Themes/default/Scripts/Other.lua b/stepmania/Themes/default/Scripts/Other.lua index 73a854a690..6b029ba834 100644 --- a/stepmania/Themes/default/Scripts/Other.lua +++ b/stepmania/Themes/default/Scripts/Other.lua @@ -5,7 +5,7 @@ function FormatNumSongsPlayed( num ) else s = s .. ' songs played' end - return ret + return s end -- (c) 2005 Chris Danford diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 0485a1a017..0f63792b12 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -75,7 +75,7 @@ WrapCursor=1 AllowRepeatingInput=1 Choice1=@"ApplyDefaultOptions;screen,"..ScreenCautionBranch() Choice2=screen,ScreenSelectGame -Choice3=screen,ScreenOptionsMenu +Choice3=screen,ScreenOptionsService Choice4=screen,ScreenEditMenu Choice5=screen,ScreenCourseManager Choice6=screen,ScreenJukeboxMenu @@ -667,7 +667,7 @@ DefaultSort=Endless [ScreenSMOnlineLogin] Class=ScreenSMOnlineLogin -Fallback=ScreenOptionsSubmenu +Fallback=ScreenOptionsServiceChild NextScreen=ScreenNetRoom PrevScreen=@ScreenTitleBranch() HelpText= @@ -2503,8 +2503,8 @@ TweenSeconds=0.3 [ScreenMapControllers] Class=ScreenMapControllers -Fallback=ScreenOperatorMenu -NextScreen=ScreenOptionsMenu +Fallback=ScreenOptionsServiceChildChild +NextScreen=ScreenOptionsService AllowOperatorMenuButton=0 EvenLineIn=addx,-SCREEN_WIDTH;decelerate,0.5;addx,SCREEN_WIDTH; OddLineIn=addx,SCREEN_WIDTH;decelerate,0.5;addx,-SCREEN_WIDTH; @@ -2513,23 +2513,23 @@ OddLineOut=stoptweening;accelerate,0.3;addx,SCREEN_WIDTH; [ScreenCenterImage] Class=ScreenCenterImage -Fallback=ScreenOperatorMenu +Fallback=ScreenOptionsServiceChild AllowResize=1 TimerOnCommand=hidden,1 -NextScreen=ScreenOptionsMenu -PrevScreen=ScreenOptionsMenu +NextScreen=ScreenOptionsService +PrevScreen=ScreenOptionsService [ScreenTestInput] Class=ScreenTestInput -Fallback=ScreenOperatorMenu -NextScreen=ScreenOptionsMenu -PrevScreen=ScreenOptionsMenu +Fallback=ScreenOptionsServiceChild +NextScreen=ScreenOptionsService +PrevScreen=ScreenOptionsService [ScreenTestLights] Class=ScreenTestLights -Fallback=ScreenOperatorMenu -NextScreen=ScreenOptionsMenu -PrevScreen=ScreenOptionsMenu +Fallback=ScreenOptionsServiceChild +NextScreen=ScreenOptionsService +PrevScreen=ScreenOptionsService TextX=SCREEN_CENTER_X-200 TextY=SCREEN_CENTER_Y TextOnCommand= @@ -2537,15 +2537,15 @@ TextOffCommand= [ScreenNetworkOptions] Class=ScreenNetworkOptions -Fallback=ScreenOptionsSubmenu -NextScreen=ScreenOptionsMenu -PrevScreen=ScreenOptionsMenu +Fallback=ScreenOptionsServiceChild +NextScreen=ScreenOptionsService +PrevScreen=ScreenOptionsService [ScreenBookkeeping] Class=ScreenBookkeeping -Fallback=ScreenOperatorMenu -NextScreen=ScreenOptionsMenu -PrevScreen=ScreenOptionsMenu +Fallback=ScreenOptionsServiceChild +NextScreen=ScreenOptionsService +PrevScreen=ScreenOptionsService AllTimeX=SCREEN_CENTER_X AllTimeY=110 AllTimeOnCommand=zoom,0.7;diffuseshift;EffectColor1,0.5,0.5,0.5,1 @@ -3037,24 +3037,8 @@ MorePage2OffCommand= IdleCommentSeconds=0 IdleTimeoutSeconds=0 -[ScreenOptionsSubmenu] -AllowOperatorMenuButton=0 -Fallback=ScreenOperatorMenu -Class=ScreenOptionsMaster -ThemeItems=0 -ThemeTitles=1 -IconsOnCommand=x,-30 - -[ScreenOperatorMenu] -Fallback=ScreenOptionsMaster -TimerOnCommand=hidden,1 -StyleIcon=0 -TimerSeconds=0 -PrevScreen=ScreenOptionsMenu -NextScreen=ScreenOptionsMenu - [ScreenInputOptions] -Fallback=ScreenOptionsSubmenu +Fallback=ScreenOptionsServiceChild LineNames=1,2,3,4,5,6 OptionMenuFlags=together;explanations Line1=conf,AutoMapOnJoyChange @@ -3065,7 +3049,7 @@ Line5=conf,OptionsNavigation Line6=conf,WheelSpeed [ScreenCoinOptions] -Fallback=ScreenOptionsSubmenu +Fallback=ScreenOptionsServiceChild LineNames=1,2,3,4,5 OptionMenuFlags=together;explanations Line1=conf,CoinMode @@ -3075,7 +3059,7 @@ Line4=conf,Premium Line5=conf,EventMode [ScreenMachineOptions] -Fallback=ScreenOptionsSubmenu +Fallback=ScreenOptionsServiceChild LineNames=1,2,3,4,5,6,7,8,9,10,11 OptionMenuFlags=together;explanations Line1=conf,MenuTimer @@ -3092,7 +3076,7 @@ Line11=conf,MarvelousTiming [ScreenGraphicOptions] -Fallback=ScreenOptionsSubmenu +Fallback=ScreenOptionsServiceChild LineNames=1,2,3,4,5,6,7,8,9,10,11,12 OptionMenuFlags=together;explanations Line1=conf,Windowed @@ -3110,7 +3094,7 @@ Line12=conf,ShowStats Line13=conf,ShowBanners [ScreenGameplayOptions] -Fallback=ScreenOptionsSubmenu +Fallback=ScreenOptionsServiceChild LineNames=1,2,3,4,5,6 OptionMenuFlags=together;explanations Line1=conf,SoloSingles @@ -3121,7 +3105,7 @@ Line5=conf,PickExtraStage Line6=conf,UnlockSystem [ScreenBackgroundOptions] -Fallback=ScreenOptionsSubmenu +Fallback=ScreenOptionsServiceChild LineNames=1,2,3,4,5,6 OptionMenuFlags=together;explanations Line1=conf,BackgroundMode @@ -3132,7 +3116,7 @@ Line5=conf,BeginnerHelper Line6=conf,RandomBackgrounds [ScreenAppearanceOptions] -Fallback=ScreenOptionsSubmenu +Fallback=ScreenOptionsServiceChild LineNames=1,2,3,4,5,6,7,8,9,10,11,12,13,14 OptionMenuFlags=together;explanations Line1=conf,Language @@ -3151,7 +3135,7 @@ Line13=conf,Lyrics Line14=conf,AspectRatio [ScreenOtherOptions] -Fallback=ScreenOptionsSubmenu +Fallback=ScreenOptionsServiceChild LineNames=1,2,3 OptionMenuFlags=together;explanations Line1=conf,AutogenSteps @@ -3159,7 +3143,7 @@ Line2=conf,AutogenGroupCourses Line3=conf,FastLoad [ScreenSoundOptions] -Fallback=ScreenOptionsSubmenu +Fallback=ScreenOptionsServiceChild LineNames=1,2,3 OptionMenuFlags=together;explanations Line1=conf,ResamplingQuality @@ -3612,8 +3596,9 @@ Row8Y=SCREEN_CENTER_Y+120 [EditCoursesSongMenu] Fallback=EditCoursesMenu -[ScreenOptionsMenu] -Fallback=ScreenOptionsSubmenu +[ScreenOptionsService] +Class=ScreenOptionsMaster +Fallback=ScreenOptions NextScreen=@ScreenTitleBranch() PrevScreen=@ScreenTitleBranch() # "Rows" sets the number of rows; this field is required. @@ -3630,6 +3615,15 @@ PrevScreen=@ScreenTitleBranch() # when using entries that change the screen; otherwise, the only way to # exit the screen when in regular mode is "exit". +ThemeItems=0 +ThemeTitles=1 +IconsOnCommand=x,-30 + +Fallback=ScreenOptionsMaster +TimerOnCommand=hidden,1 +StyleIcon=0 +TimerSeconds=0 + AllowOperatorMenuButton=0 LineNames=1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16 OptionMenuFlags=together;forceallplayers;smnavigation @@ -3653,10 +3647,15 @@ Line16=list,Test Input ThemeTitles=1 ThemeItems=1 +[ScreenOptionsServiceChild] +Fallback=ScreenOptionsService +PrevScreen=ScreenOptionsService +NextScreen=ScreenOptionsService + [ScreenOptionsTestMenu] -Fallback=ScreenOptionsSubmenu -NextScreen=ScreenOptionsMenu -PrevScreen=ScreenOptionsMenu +Fallback=ScreenOptionsServiceChild +NextScreen=ScreenOptionsService +PrevScreen=ScreenOptionsService LineNames=1 Line1=lua,OptionsRowTest() HelpText= @@ -3711,7 +3710,7 @@ TipShowTime=1 TipOnCommand= [ScreenSelectGame] -Fallback=ScreenOptionsSubmenu +Fallback=ScreenOptionsServiceChild PrevScreen=@ScreenTitleBranch() NextScreen=@ScreenTitleBranch() LineNames=1 @@ -4022,7 +4021,7 @@ SaveScoresDefault= SaveScores,1=mod,no savescore;name,Off SaveScores,2=mod,savescore;name,On -# ScreenOptionsMenu +# ScreenOptionsService Appearance Options=1;together;SelectNone Appearance OptionsDefault= Appearance Options,1=screen,ScreenAppearanceOptions;name,Appearance Options @@ -4049,19 +4048,19 @@ Config Key/Joy MappingsDefault= Config Key/Joy Mappings,1=screen,ScreenMapControllers;name,Key Joy Mappings Clear Machine Stats=1;together;SelectNone Clear Machine StatsDefault= -Clear Machine Stats,1=ClearMachineStats;screen,ScreenOptionsMenu;name,Clear Machine Stats +Clear Machine Stats,1=ClearMachineStats;screen,ScreenOptionsService;name,Clear Machine Stats Clear Machine Edits=1;together;SelectNone Clear Machine EditsDefault= -Clear Machine Edits,1=ClearMachineEdits;screen,ScreenOptionsMenu;name,Clear Machine Edits +Clear Machine Edits,1=ClearMachineEdits;screen,ScreenOptionsService;name,Clear Machine Edits Fill Machine Stats=1;together;SelectNone Fill Machine StatsDefault= -Fill Machine Stats,1=screen,ScreenOptionsMenu;FillMachineStats;name,Fill Machine Stats +Fill Machine Stats,1=screen,ScreenOptionsService;FillMachineStats;name,Fill Machine Stats Input Options=1;together;SelectNone Input OptionsDefault= Input Options,1=screen,ScreenInputOptions;name,Input Options Insert Credit=1;together;SelectNone Insert CreditDefault= -Insert Credit,1=screen,ScreenOptionsMenu;InsertCredit;name,Insert Credit +Insert Credit,1=screen,ScreenOptionsService;InsertCredit;name,Insert Credit Gameplay Options=1;together;SelectNone Gameplay OptionsDefault= Gameplay Options,1=screen,ScreenGameplayOptions;name,Gameplay Options @@ -4082,7 +4081,7 @@ Reload Songs/CoursesDefault= Reload Songs/Courses,1=screen,ScreenReloadSongs;name,Reload Songs Reset To Defaults=1;together;SelectNone Reset To DefaultsDefault= -Reset To Defaults,1=ResetToFactoryDefaults;screen,ScreenOptionsMenu;name,Reset To Defaults +Reset To Defaults,1=ResetToFactoryDefaults;screen,ScreenOptionsService;name,Reset To Defaults Test Input=1;together;SelectNone Test InputDefault= Test Input,1=screen,ScreenTestInput;name,Test Input @@ -4091,16 +4090,16 @@ Test LightsDefault= Test Lights,1=screen,ScreenTestLights;name,Test Lights Transfer Stats From Machine=1;together;SelectNone Transfer Stats From MachineDefault= -Transfer Stats From Machine,1=TransferStatsFromMachine;screen,ScreenOptionsMenu;name,Transfer Stats From Machine +Transfer Stats From Machine,1=TransferStatsFromMachine;screen,ScreenOptionsService;name,Transfer Stats From Machine Transfer Stats To Machine=1;together;SelectNone Transfer Stats To MachineDefault= -Transfer Stats To Machine,1=TransferStatsToMachine;screen,ScreenOptionsMenu;name,Transfer Stats To Machine +Transfer Stats To Machine,1=TransferStatsToMachine;screen,ScreenOptionsService;name,Transfer Stats To Machine Copy Edits To Machine=1;together;SelectNone Copy Edits To MachineDefault= -Copy Edits To Machine,1=CopyEditsToMachine;screen,ScreenOptionsMenu;name,Copy Edits To Machine +Copy Edits To Machine,1=CopyEditsToMachine;screen,ScreenOptionsService;name,Copy Edits To Machine Copy Edits From Machine=1;together;SelectNone Copy Edits From MachineDefault= -Copy Edits From Machine,1=CopyEditsFromMachine;screen,ScreenOptionsMenu;name,Copy Edits From Machine +Copy Edits From Machine,1=CopyEditsFromMachine;screen,ScreenOptionsService;name,Copy Edits From Machine Set Machine Time=1;together;SelectNone Set Machine TimeDefault= Set Machine Time,1=screen,ScreenSetTime;name,Set Machine Time @@ -4177,8 +4176,8 @@ StyleIcon=0 TimerSeconds=0 TimerOnCommand=hidden,1 Fallback=ScreenWithMenuElements -NextScreen=ScreenOptionsMenu -PrevScreen=ScreenOptionsMenu +NextScreen=ScreenOptionsService +PrevScreen=ScreenOptionsService [Banner] ScrollRandom=1 @@ -4486,7 +4485,7 @@ Fallback=ScreenContextMenu [ScreenOptionsProfiles] Class=ScreenOptionsProfiles -Fallback=ScreenOptionsSubmenu +Fallback=ScreenOptionsServiceChild StyleIcon=0 TimerSeconds=0 @@ -4498,7 +4497,7 @@ Class=ScreenSelectProfile Fallback=ScreenSelectMaster TimerSeconds=0 -PrevScreen=ScreenOptionsMenu +PrevScreen=ScreenOptionsService DefaultChoice= NumChoicesOnPage1=100 WrapCursor=1 @@ -4524,5 +4523,6 @@ Fallback=ScreenSelectProfile [ScreenOptionsEditProfile] Fallback=ScreenOptions PrevScreen=ScreenSelectProfileManage +NextScreen=ScreenSelectProfileManage Class=ScreenOptionsEditProfile TimerSeconds=0