From 01039d048b2cb1313b00e6fbeeba6f72f042691d Mon Sep 17 00:00:00 2001 From: tuxdude143 Date: Sat, 18 Apr 2015 21:08:15 +1200 Subject: [PATCH] Files for a catagorised options menu --- Themes/_fallback/Languages/en.ini | 115 ++++++++++++++---------------- Themes/_fallback/metrics.ini | 100 +++++++++++++++++--------- 2 files changed, 122 insertions(+), 93 deletions(-) diff --git a/Themes/_fallback/Languages/en.ini b/Themes/_fallback/Languages/en.ini index 091d55a73c..5c7f4b077e 100644 --- a/Themes/_fallback/Languages/en.ini +++ b/Themes/_fallback/Languages/en.ini @@ -1,4 +1,4 @@ -[Common] +[Common] WindowTitle=StepMania StepMania=StepMania @@ -392,6 +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 Options, BGFit, Appearance, UI options. Disqualification=If turned off, players cannot be disqualified from scoring. EasterEggs=Enable or disable some special easter eggs. Edit Courses=Edit Courses @@ -424,6 +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 Prefrences, Sync. Insert=Insert Insert Credit=Insert Credit Invalid=Invalid row definition. @@ -469,6 +471,7 @@ 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. Other options. 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. @@ -497,7 +500,7 @@ ShowDancingCharacters=Turn this option &oq;OFF&cq; to disable the dancing charac ShowDanger=Turn this option &oq;OFF&cq; to disable the flashing &oq;Danger&cq; background that shows when you're about to drop to 0% health. ShowInstructions=Toggle whether the Instructions screen is shown. ShowLyrics=Toggle the display of song lyrics if available. (via .LRC file) -ShowNativeLanguage=Choose between displaying song titles in their native language (日本語), or transliterating them when possible. +ShowNativeLanguage=Choose between displaying song titles in their native language (???), or transliterating them when possible. ShowSelectGroup=Toggle whether the Select Group screen is shown. ShowSongOptions=Toggle display of the Song Options screen. When set to ASK, it can be accessed by pressing START a second time after Player Options. ShowStats=Display performance statistics in the upper right corner of the screen and show skips in the lower right corner. FPS = frames per second. TPF = triangles per frame. DPF = draws per frame. @@ -647,14 +650,11 @@ x2.5=2.5x 16bit=16bit 16th=16th 192nd=192nd -1m=1m 2=2 2 Players for 1 Credit=2 Players for 1 Credit 2 Times=2 Times 2.0x=2.0x 24th=24th -2m=2m -2nd=2nd 3=3 3 Times=3 Times 32bit=32bit @@ -663,7 +663,6 @@ x2.5=2.5x 4 Times=4 Times 48th=48th 4th=4th -4m=4m 5=5 5 Times=5 Times 6=6 @@ -938,7 +937,6 @@ Add/Edit Background Change=Add/Edit Background Change Add Attack=Add Attack Add Mod=Add Mod Air=Air -All timing=All timing AllowExtraStage=Allow Extra Stage AllowSongDeletion=Allow Song Deletion AllowW1=Fantastic Timing @@ -967,7 +965,6 @@ BatLives=Bat Lives Base Difficulty=Base Difficulty Beat 0 Offset=Beat 0 Offset Bookkeeping=Bookkeeping -BPM changes=BPM changes Calibrate Machine Sync=Calibrate Audio Sync CPUSkill=CPU Skill CelShadeModels=Cel-shaded Models @@ -987,7 +984,6 @@ CoinMode=Coin Mode CoinModeNoHome=Coin Mode CoinsPerCredit=Coins Per Credit ComboContinuesBetweenSongs=Carry Combo -Combo segments=Combo segments Connection=Connection Convert pause to beats=Convert stop to beats Convert delay to beats=Convert delay to beats @@ -998,7 +994,6 @@ Convert selection to warp=Convert selection to Warp Segment Convert selection to fake=Convert selection to Fake Segment Copy=Copy Copy timing data=Copy timing data -Copy timing in region=Copy timing in region Copy Partial Timing=Copy Selected Timing Data CourseSortOrder=Course Sort Create New=Create New @@ -1012,7 +1007,6 @@ DefaultFailTypeNoOff=Default Fail Type DefaultNoteSkin=Default NoteSkin DelayedBack=Back Delayed DelayedTextureDelete=Keep Textures In Memory -Delays=Delays Delete=Delete Delete beat and shift up=Delete beat and shift up Description=Description @@ -1020,6 +1014,7 @@ Designate as Music Preview=Designate as Music Preview Designate last second at current beat=Designate last second at current beat Difficulty=Difficulty Display BPM=Display BPM +Display Options=Display & Sound Options DisplayAspectRatio=Aspect Ratio DisplayColorDepth=Display Color DisplayResolution=Display Resolution @@ -1101,6 +1096,7 @@ High Meter=High Meter HighResolutionTextures=High-Res Textures Holds=Holds InputDebounceTime=Input Debounce Time +InputOptions=Input Options Insert=Insert Insert Credit=Insert Credit Insert beat and shift down=Insert beat and shift down @@ -1109,7 +1105,6 @@ Invalid=Invalid Invert notes' player=Invert player notes (routine only) Jumps=Jumps Key Joy Mappings=Config Key/Joy Mappings -Labels=Labels Language=Language Last second hint=Last second hint Layer=Layer @@ -1151,7 +1146,6 @@ OsMountPlayer2=OS Mount Player2 Paste at begin marker=Paste at begin marker Paste at current beat=Paste at current beat Paste timing data=Paste timing data -Paste timing from clipboard=Paste timing from clipboard Paste Partial Timing at current beat=Paste Partial Timing at current beat Persp=Perspective Play current beat to end=Play current beat to end @@ -1180,6 +1174,7 @@ Quads=Quads Quantize=Quantize RandomBackgroundMode=Mode RandomModifiers=Modifiers +Random Options=Random Options Rate=Rate Record in selection=Record in selection RefreshRate=Refresh Rate @@ -1203,7 +1198,6 @@ Scoreboard=Scoreboard ScoringType=Scoring Type ScreenFilter=Screen Filter Scroll=Scroll -Scroll segments=Scroll segments Secret=Secret Secs Remaining=Seconds Remaining Server=Server @@ -1217,8 +1211,6 @@ Set selection start=Set selection start Set selection end=Set selection end Shift all timing changes down=Shift all timing changes down Shift all timing changes up=Shift all timing changes up -Shift timing in region down=Shift timing in region down -Shift timing in region up=Shift timing in region up ShowBanners=Show Banners ShowBeginnerHelper=Beginner Helper ShowCaution=Caution @@ -1232,10 +1224,8 @@ ShowSongOptions=Show Song Options ShowStats=Show Stats SmoothLines=SmoothLines SoundEffect=Sound Effect -Speed segments=Speed segments Starting Time=Starting Time StepMania Credits=StepMania Credits -Stops=Stops Center1Player=Center 1 Player Song=Song Song Group=Song Group @@ -1263,9 +1253,7 @@ Test Lights=Test Lights TextureColorDepth=Texture Color Theme=Theme ThreeKeyNavigation=Menu Navigation -Tickcount=Tickcount TimingWindowScale=Judge Difficulty -Time Signatures=Time Signatures Transform=Transform Transfer Edits to USB=Transfer Edits to USB Transfer Edits from USB=Transfer Edits from USB @@ -1277,7 +1265,6 @@ View steps data=View Steps Data VisualDelaySeconds=Visual Delay Voltage=Voltage Vsync=Wait For Vsync -Warps=Warps WideScreen16_9=Widescreen WideScreen16_10=Widescreen Windowed=Display Mode @@ -1430,6 +1417,15 @@ HelpText= HeaderText=Appearance HeaderSubText=Customize your game +[ScreenOptionsDisplaySub] +HeaderText=Display & Sound Options + +[ScreenOptionsInputSub] +HeaderText=Input Options + +[ScreenOptionsRandomSub] +HeaderText=Random Options + [ScreenOptionsGraphicsSound] HeaderText=Graphics/Sound HeaderSubText=Get the best performance @@ -1994,7 +1990,6 @@ Done=Done HeaderText= Space=Space "%s" is an invalid floating point value.="%s" is an invalid floating point value. -"%s" is an invalid integer value.="%s" is an invalid integer value. AnswerCaret=_ AnswerBlank= @@ -2457,39 +2452,39 @@ Miss=Miss [NativeLanguageNames] Afar=Afar -Abkhazian=аҧсуа бызшәа +Abkhazian=????? ?????? Afrikaans=Afrikaans Amharic=Amharic -Arabic=العربية +Arabic=??????? Assamese=Assamese Aymara=Aymara -Azerbaijani=azərbaycan +Azerbaijani=az?rbaycan Bashkir=Bashkir -Byelorussian=Беларуская -Bulgarian=Български +Byelorussian=?????????? +Bulgarian=????????? Bihari=Bihari Bislama=Bislama Bengali=Bengali Tibetan=Tibetan Breton=Breton -Catalan=Català +Catalan=Catal Corsican=Corsican -Czech=čeština +Czech=?etina Welsh=Cymraeg Danish=Dansk German=Deutsch Bhutani=Bhutani -Greek=Ελληνικά +Greek=???????? English=English Esperanto=Esperanto -Spanish=Español +Spanish=Espaol Estonian=Eesti Basque=euskera -Persian=فارسی +Persian=????? Finnish=Suomi Fiji=Fiji Faeroese=Faeroese -French=Français +French=Franais Frisian=Frisian Irish=Gaeilge Gaelic=Gaelic @@ -2497,39 +2492,39 @@ Galician=Galego Guarani=Guarani Gujarati=Gujarati Hausa=Hausa -Hebrew=עברית -Hindi=हिंदी +Hebrew=????? +Hindi=????? Croatian=Hrvatski Hungarian=Magyar -Armenian=Հայերեն +Armenian=??????? Interlingua=Interlingua Indonesian=Bahasa indonesia Interlingue=Interlingue Inupiak=Inupiak Indonesian=Bahasa indonesia -Icelandic=Íslenska +Icelandic=slenska Italian=Italiano -Hebrew=עברית -Japanese=日本語 +Hebrew=????? +Japanese=??? Yiddish=Yiddish Javanese=Javanese Georgian=Georgian -Kazakh=Қазақ +Kazakh=????? Greenlandic=Greenlandic Cambodian=Cambodian -Kannada=ಕನ್ನಡ -Korean=한국어 +Kannada=????? +Korean=??? Kashmiri=Kashmiri Kurdish=Kurdish -Kirghiz=Кыргыз +Kirghiz=?????? Latin=Latin Lingala=Lingala Laothian=Laothian -Lithuanian=Lietuviškai -Latvian=Latviešu +Lithuanian=Lietuvikai +Latvian=Latvieu Malagasy=Malagasy Maori=Maori -Macedonian=Македонски +Macedonian=?????????? Malayalam=Malayalam Mongolian=Mongolian Moldavian=Moldavian @@ -2546,21 +2541,21 @@ Oromo=Oromo Oriya=Oriya Punjabi=Punjabi Polish=Polski -Pashto=پښتو -Portuguese=Português +Pashto=???? +Portuguese=Portugus Quechua=Quechua Rhaeto-Romance=Rhaeto-Romance Kirundi=Kirundi -Romanian=Română -Russian=Pyccĸий +Romanian=Romn? +Russian=Pycc??? Kinyarwanda=Kinyarwanda Sanskrit=Sanskrit Sindhi=Sindhi Sangro=Sangro Serbo-Croatian=Serbo-Croatian Singhalese=Singhalese -Slovak=Slovenčina -Slovenian=Slovenščina +Slovak=Sloven?ina +Slovenian=Sloven?ina Samoan=Samoan Shona=Shona Somali=Somali @@ -2572,28 +2567,28 @@ Sudanese=Sudanese Swedish=svenska Swahili=Kiswahili Tamil=Tamil -Tegulu=తెలుగు +Tegulu=?????? Tajik=Tajik -Thai=ภาษาไทย +Thai=??????? Tigrinya=Tigrinya Turkmen=Turkmen Tagalog=Tagalog Setswana=Setswana Tonga=Tonga -Turkish=Tϋrkçe +Turkish=T?rke Tsonga=Tsonga Tatar=Tatar Twi=Twi -Ukrainian=Українська -Urdu=اردو +Ukrainian=?????????? +Urdu=???? Uzbek=o'zbek -Vietnamese=Tiếng Việt +Vietnamese=Ti?ng Vi?t Volapuk=Volapuk Wolof=Wolof Xhosa=isiXhosa Yiddish=Yiddish -Yoruba=Yorùbá -Chinese=中文 +Yoruba=Yorb +Chinese=?? Zulu=isiZulu [ScreenPlayerOptions] diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini index f07e1cb122..e6ea211fc9 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -1659,7 +1659,7 @@ TimerOffCommand= [ScreenSetBGFit] Class="ScreenWithMenuElements" Fallback="ScreenWithMenuElements" -NextScreen="ScreenOptionsService" +NextScreen="ScreenOptionsDisplaySub" RepeatRate=10 RepeatDelay=.25 @@ -2726,23 +2726,24 @@ Fallback="ScreenOptionsSimpleService" NextScreen=Branch.AfterInit() PrevScreen=Branch.AfterInit() -LineNames="Sync,GameType,KeyConfig,TestInput,Input,Reload,Arcade,Appearance,BGFit,GraphicSound,Profiles,Network,UI,Advanced,Credits" -LineSync="gamecommand;screen,ScreenGameplaySyncMachine;name,Calibrate Machine Sync" +LineNames="GameType,Display,Sync,KeyConfig,TestInput,Input,Reload,Arcade,Appearance,BGFit,Profiles,Network,UI,Advanced,Credits" + +LineSync="gamecommand;screen,ScreenGameplaySyncMachine" LineGameType="gamecommand;screen,ScreenSelectGame;name,Select Game" -LineKeyConfig="gamecommand;screen,ScreenMapControllers;name,Key Joy Mappings" -LineTestInput="gamecommand;screen,ScreenTestInput;name,Test Input" -LineInput="gamecommand;screen,ScreenOptionsInput;name,Input Options" -LineReload="gamecommand;screen,ScreenReloadSongs;name,Reload Songs" +LineTestInput="gamecommand;screen,ScreenOptionsDisplaySub;name,Display Options" +LineKeyConfig="gamecommand;screen,ScreenOptionsInputSub;name,InputOptions" +LineInput="gamecommand;screen,ScreenOptionsInput" +LineReload="gamecommand;screen,ScreenOptionsRandomSub;name,Random Options" LineArcade="gamecommand;screen,ScreenOptionsArcade;name,Arcade Options" -LineAppearance="gamecommand;screen,ScreenAppearanceOptions;name,Appearance Options" -LineBGFit="gamecommand;screen,ScreenSetBGFit;name,Set BG Fit Mode" -LineGraphicSound="gamecommand;screen,ScreenOptionsGraphicsSound;name,Graphics/Sound Options" +LineAppearance="gamecommand;screen,ScreenAppearanceOptions" +LineBGFit="gamecommand;screen,ScreenSetBGFit;name" LineProfiles="gamecommand;screen,ScreenOptionsManageProfiles;name,Profiles" LineNetwork="gamecommand;screen,ScreenNetworkOptions;name,Network Options" -LineUI="gamecommand;screen,ScreenOptionsUI;name,UI Options" -LineAdvanced="gamecommand;screen,ScreenOptionsAdvanced;name,Advanced Options" -LineMoreOptions="gamecommand;screen,ScreenOptionsExtended;name,More Options" -LineCredits="gamecommand;screen,ScreenCredits;name,StepMania Credits" +LineUI="gamecommand;screen,ScreenOptionsUI" +LineCredits="gamecommand;screen,ScreenCredits" +LineAdvanced="gamecommand;screen,ScreenReloadSongs;name,Reload Songs" +LineGraphicSound="gamecommand;screen,ScreenOptionsGraphicsSound" + # Old #LineNames="SystemDirection,KeyConfig,GameType,6,8,Reload,Credits,MoreOptions" @@ -2763,12 +2764,48 @@ LineCredits="gamecommand;screen,ScreenCredits;name,StepMania Credits" #LineMoreOptions="gamecommand;screen,ScreenOptionsExtended;name,More Options" #LineCredits="gamecommand;screen,ScreenCredits;name,StepMania Credits" +[ScreenOptionsInputSub] +Fallback="ScreenOptionsService" +NextScreen="ScreenOptionsService" +PrevScreen="ScreenOptionsService" +LineNames="KeyConfig,TestInput,Input,Sync" +LineKeyConfig="gamecommand;screen,ScreenMapControllers;name,Key Joy Mappings" +LineTestInput="gamecommand;screen,ScreenTestInput;name,Test Input" +LineInput="gamecommand;screen,ScreenOptionsInput;name,Input Options" +LineSync="gamecommand;screen,ScreenGameplaySyncMachine;name,Calibrate Machine Sync" + + + + + +[ScreenOptionsDisplaySub] +Fallback="ScreenOptionsService" +NextScreen="ScreenOptionsService" +PrevScreen="ScreenOptionsService" +LineNames="GraphicSound,BGFit,Appearance,UI" +LineGraphicSound="gamecommand;screen,ScreenOptionsGraphicsSound;name,Graphics/Sound Options" +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" NextScreen="ScreenOptionsService" PrevScreen="ScreenOptionsService" # LineNames="TestInput,Sync,Appearance,UI,Input,GraphicSound,Arcade,Advanced" +LineUI="gamecommand;screen,ScreenOptionsUI;name,UI Options" + [ScreenOptionsServiceChild] Fallback="ScreenOptionsMaster" @@ -2863,7 +2900,7 @@ TitleX=-54 [ScreenMapControllers] Class="ScreenMapControllers" Fallback="ScreenOptionsServiceChild" -NextScreen="ScreenOptionsService" +NextScreen="ScreenOptionsInputSub" HelpText=Screen.String("HelpTextMapControllers") # # This locks the input when the screen starts. @@ -2948,8 +2985,8 @@ SecondaryOnCommand=x,SCREEN_CENTER_X;y,6;zoom,0.5;shadowlength,1;ztest,true [ScreenTestInput] Class="ScreenTestInput" Fallback="ScreenOptionsServiceChild" -NextScreen="ScreenOptionsService" -PrevScreen="ScreenOptionsService" +NextScreen="ScreenOptionsInputSub" +PrevScreen="ScreenOptionsInputSub" [ScreenOptionsSystemDirection] Fallback="ScreenOptionsServiceChild" @@ -2983,8 +3020,8 @@ Line22="conf,EventMode" [ScreenOptionsGraphicsSound] Fallback="ScreenOptionsServiceChild" -NextScreen="ScreenOptionsService" -PrevScreen="ScreenOptionsService" +NextScreen="ScreenOptionsDisplaySub" +PrevScreen="ScreenOptionsDisplaySub" 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" @@ -3010,8 +3047,8 @@ Line20="conf,VisualDelaySeconds" [ScreenOptionsAdvanced] Fallback="ScreenOptionsServiceChild" -NextScreen="ScreenOptionsService" -PrevScreen="ScreenOptionsService" +NextScreen="ScreenOptionsRandomSub" +PrevScreen="ScreenOptionsRandomSub" LineNames="3,4,8,SI,SM,HN,11,13,14,15,16,28,29,30,31,32,ECPT" #LineScore="lua,UserPrefScoringMode()" Line3="conf,TimingWindowScale" @@ -3043,8 +3080,8 @@ LineECPT="conf,EditClearPromptThreshold" [ScreenAppearanceOptions] Fallback="ScreenOptionsServiceChild" -NextScreen="ScreenOptionsService" -PrevScreen="ScreenOptionsService" +NextScreen="ScreenOptionsDisplaySub" +PrevScreen="ScreenOptionsDisplaySub" LineNames="1,2,3,4,5,14,15,SB,17,18,19" Line1="conf,Language" Line2="conf,Announcer" @@ -3062,8 +3099,8 @@ Line19="conf,NumBackgrounds" # user interface options that aren't related to themes, etc. # (some don't get used/modified too often) Fallback="ScreenOptionsServiceChild" -NextScreen="ScreenOptionsService" -PrevScreen="ScreenOptionsService" +NextScreen="ScreenOptionsDisplaySub" +PrevScreen="ScreenOptionsDisplaySub" LineNames="1,3,4,6,7,8,9,10,11,12,14" Line1="conf,Center1Player" Line3="conf,DancePointsForOni" @@ -3083,8 +3120,8 @@ Line14="conf,ShowSongOptions" [ScreenOptionsInput] Fallback="ScreenOptionsServiceChild" -NextScreen="ScreenOptionsService" -PrevScreen="ScreenOptionsService" +NextScreen="ScreenOptionsInputSub" +PrevScreen="ScreenOptionsInputSub" LineNames="1,2,3,4,5,6,7" Line1="conf,AutoMapOnJoyChange" Line2="conf,OnlyDedicatedMenuButtons" @@ -3122,7 +3159,7 @@ Fallback="ScreenOptionsServiceChild" [ScreenSelectGame] Fallback="ScreenOptionsServiceChild" PrevScreen="ScreenOptionsService" -NextScreen="ScreenOptionsService" +NextScreen=Branch.TitleMenu() LineNames="1" Line1="conf,Game" @@ -4227,9 +4264,6 @@ Fallback="ScreenMiniMenu" [ScreenMiniMenuTimingDataInformation] Fallback="ScreenMiniMenu" -[ScreenMiniMenuTimingDataChangeInformation] -Fallback="ScreenMiniMenu" - [ScreenMiniMenuBackgroundChange] Fallback="ScreenMiniMenu" @@ -4324,8 +4358,8 @@ OptionRowNormalMetricsGroup="OptionRowCourseOverview" [ScreenGameplaySyncMachine] Class="ScreenGameplaySyncMachine" Fallback="ScreenGameplay" -PrevScreen="ScreenOptionsService" -NextScreen="ScreenOptionsService" +PrevScreen="ScreenOptionsInputSub" +NextScreen="ScreenOptionsInputSub" PlayerType="PlayerSyncMachine" #AllowCenter1Player=false