From aa196c99194316c701f50bb19640d108e36c7288 Mon Sep 17 00:00:00 2001 From: tuxdude143 Date: Mon, 20 Apr 2015 08:59:23 +1200 Subject: [PATCH] Catagory options menu v.2.0 Version 2 of the new options menu. --- Themes/_fallback/Languages/en.ini | 8 +++----- Themes/_fallback/metrics.ini | 31 ++++++++++--------------------- Themes/default/metrics.ini | 2 +- 3 files changed, 14 insertions(+), 27 deletions(-) diff --git a/Themes/_fallback/Languages/en.ini b/Themes/_fallback/Languages/en.ini index d78a01ac4a..459634032b 100644 --- a/Themes/_fallback/Languages/en.ini +++ b/Themes/_fallback/Languages/en.ini @@ -392,7 +392,7 @@ Difficulty= DisplayAspectRatio=Change the width-to-height ratio of graphics in the game. Most modern displays are either 16:9 or 16:10. DisplayColorDepth=Choose the color depth of the window. This option may not take effect in windowed mode. DisplayResolution=Choose the output resolution. A higher resolution will show more detail, but requires a faster video card. -Display Options=Graphics/Sound, BGFit, Appearance and UI options. +Display Options=BGFit, Appearance and UI options. Disqualification=If turned off, players cannot be disqualified from scoring. EasterEggs=Enable or disable some special easter eggs. Edit Courses=Edit Courses @@ -425,7 +425,7 @@ HiddenSongs=Some songs are only playable during Oni courses and with roulette. Hide=Hide Holds=Holds InputDebounceTime=Time that a panel takes to depress. Use this to deal with ghost steps that occur a few milliseconds after a real step. -InputOptions=Key Config, Test Input, Input Options and Audio Sync. +InputOptions=Test Input, Advanced Input Options and Audio Sync. Insert=Insert Insert Credit=Insert Credit Invalid=Invalid row definition. @@ -471,7 +471,6 @@ ProTiming=ProTiming RandomBackgroundMode=Choose background style. &oq;Animations&cq; uses random items in the BGAnimations folder; &oq;Random Movies&cq; cycles through movies in the RandomMovies folder. More Options=Access more advanced options here. RandomModifiers= -Random Options=Advanced Options, Stepmania Credits. Rate=Rate RefreshRate=Controls how many times per second the screen will refresh. Only has an effect when Display Mode is set to &oq;Full Screen&cq;. Reload Songs=Reload all songs and courses. @@ -1026,7 +1025,7 @@ Display BPM=Display BPM DisplayAspectRatio=Aspect Ratio DisplayColorDepth=Display Color DisplayResolution=Display Resolution -Display Options=Display/Sound Options +Display Options=Display Options Disqualification=Disqualification Duration seconds=Duration seconds EasterEggs=Easter Eggs @@ -1185,7 +1184,6 @@ Quads=Quads Quantize=Quantize RandomBackgroundMode=Mode RandomModifiers=Modifiers -Random Options=Misc Options Rate=Rate Record in selection=Record in selection RefreshRate=Refresh Rate diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini index 9288cf33b7..79f17245c7 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -2726,7 +2726,7 @@ Fallback="ScreenOptionsSimpleService" NextScreen=Branch.AfterInit() PrevScreen=Branch.AfterInit() -LineNames="GameType,InputOptions,SoundGraphics,Misc,Arcade,Profiles,Network,Reload" +LineNames="GameType,Arcade,GraphicSound,KeyConfig,InputOptions,SoundGraphics,Profiles,Network,Advanced,Reload,Credits" LineSync="gamecommand;screen,ScreenGameplaySyncMachine;name,Calibrate Machine Sync" LineGameType="gamecommand;screen,ScreenSelectGame;name,Select Game" @@ -2746,7 +2746,6 @@ LineMoreOptions="gamecommand;screen,ScreenOptionsExtended;name,More Options" LineCredits="gamecommand;screen,ScreenCredits;name,StepMania Credits" LineSoundGraphics="gamecommand;screen,ScreenOptionsDisplaySub;name,Display Options" LineInputOptions="gamecommand;screen,ScreenOptionsInputSub;name,InputOptions" -LineMisc="gamecommand;screen,ScreenOptionsRandomSub;name,Random Options" # Old #LineNames="SystemDirection,KeyConfig,GameType,6,8,Reload,Credits,MoreOptions" @@ -2771,8 +2770,7 @@ LineMisc="gamecommand;screen,ScreenOptionsRandomSub;name,Random Options" Fallback="ScreenOptionsService" NextScreen="ScreenOptionsService" PrevScreen="ScreenOptionsService" -LineNames="KeyConfig,TestInput,Input,Sync" -LineKeyConfig="gamecommand;screen,ScreenMapControllers;name,Key Joy Mappings" +LineNames="TestInput,Input,Sync" LineTestInput="gamecommand;screen,ScreenTestInput;name,Test Input" LineInput="gamecommand;screen,ScreenOptionsInput;name,Input Options" LineSync="gamecommand;screen,ScreenGameplaySyncMachine;name,Calibrate Machine Sync" @@ -2785,21 +2783,12 @@ LineSync="gamecommand;screen,ScreenGameplaySyncMachine;name,Calibrate Machine Sy Fallback="ScreenOptionsService" NextScreen="ScreenOptionsService" PrevScreen="ScreenOptionsService" -LineNames="GraphicSound,BGFit,Appearance,UI" -LineGraphicSound="gamecommand;screen,ScreenOptionsGraphicsSound;name,Graphics/Sound Options" +LineNames="BGFit,Appearance,UI" LineAppearance="gamecommand;screen,ScreenAppearanceOptions;name,Appearance Options" LineBGFit="gamecommand;screen,ScreenSetBGFit;name,Set BG Fit Mode" LineUI="gamecommand;screen,ScreenOptionsUI;name,UI Options" -[ScreenOptionsRandomSub] -Fallback="ScreenOptionsService" -NextScreen="ScreenOptionsService" -PrevScreen="ScreenOptionsService" -LineNames="Advanced,Credits" -LineAdvanced="gamecommand;screen,ScreenOptionsAdvanced;name,Advanced Options" -LineCredits="gamecommand;screen,ScreenCredits;name,StepMania Credits" - [ScreenOptionsExtended] Fallback="ScreenOptionsService" @@ -2903,7 +2892,7 @@ TitleX=-54 [ScreenMapControllers] Class="ScreenMapControllers" Fallback="ScreenOptionsServiceChild" -NextScreen="ScreenOptionsInputSub" +NextScreen="ScreenOptionsService" HelpText=Screen.String("HelpTextMapControllers") # # This locks the input when the screen starts. @@ -3023,8 +3012,8 @@ Line22="conf,EventMode" [ScreenOptionsGraphicsSound] Fallback="ScreenOptionsServiceChild" -NextScreen="ScreenOptionsDisplaySub" -PrevScreen="ScreenOptionsDisplaySub" +NextScreen="ScreenOptionsService" +PrevScreen="ScreenOptionsService" LineNames="1,2,3,4,5,6,7,8,9,10,11,12,13,FNR,14,17,18,19,20" Line1="conf,Windowed" Line2="conf,DisplayResolution" @@ -3050,8 +3039,8 @@ Line20="conf,VisualDelaySeconds" [ScreenOptionsAdvanced] Fallback="ScreenOptionsServiceChild" -NextScreen="ScreenOptionsRandomSub" -PrevScreen="ScreenOptionsRandomSub" +NextScreen="ScreenOptionsService" +PrevScreen="ScreenOptionsService LineNames="3,4,8,SI,SM,HN,11,13,14,15,16,28,29,30,31,32,ECPT" #LineScore="lua,UserPrefScoringMode()" Line3="conf,TimingWindowScale" @@ -3123,8 +3112,8 @@ Line14="conf,ShowSongOptions" [ScreenOptionsInput] Fallback="ScreenOptionsServiceChild" -NextScreen="ScreenOptionsInputSub" -PrevScreen="ScreenOptionsInputSub" +NextScreen="ScreenOptionsService" +PrevScreen="ScreenOptionsService" LineNames="1,2,3,4,5,6,7" Line1="conf,AutoMapOnJoyChange" Line2="conf,OnlyDedicatedMenuButtons" diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini index 35bab46e40..a9ffb5ebbe 100644 --- a/Themes/default/metrics.ini +++ b/Themes/default/metrics.ini @@ -1256,7 +1256,7 @@ ExplanationTogetherOffCommand=stoptweening [ScreenOptionsService] ShowHeader=true -LineNames="GameType,InputOptions,SoundGraphics,Misc,Arcade,Theme,Profiles,Network,Reload" +LineNames="GameType,Arcade,GraphicSound,KeyConfig,InputOptions,SoundGraphics,Theme,Profiles,Network,Advanced,Reload,Credits" LineTheme="gamecommand;screen,ScreenOptionsTheme;name,Theme Options" # ScreenOptionsSystemDirection"