Fixed files for new options menu.

Revised everything and have now setup the new options menu for the
default theme in english mode ONLY (as of now). Use of the new options
menu requires theme modification

Themes/_fallback/Languages/en.ini

@@ -1,4 +1,4 @@
-[Common]
+[Common]
 WindowTitle=StepMania
 StepMania=StepMania
 
@@ -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 Options, BGFit, Appearance, UI options.
+Display Options=Graphics/Sound, 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 Prefrences, Sync.
+InputOptions=Key Config, Test Input, Input Options and Audio Sync.
 Insert=Insert
 Insert Credit=Insert Credit
 Invalid=Invalid row definition.
@@ -471,7 +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.
+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.
@@ -500,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.
@@ -650,11 +650,14 @@ 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,6 +666,7 @@ x2.5=2.5x
 4 Times=4 Times
 48th=48th
 4th=4th
+4m=4m
 5=5
 5 Times=5 Times
 6=6
@@ -937,6 +941,7 @@ 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
@@ -965,6 +970,7 @@ 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
@@ -984,6 +990,7 @@ 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
@@ -994,6 +1001,7 @@ 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
@@ -1007,6 +1015,7 @@ 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
@@ -1014,10 +1023,10 @@ 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
+Display Options=Display/Sound Options
 Disqualification=Disqualification
 Duration seconds=Duration seconds
 EasterEggs=Easter Eggs
@@ -1096,7 +1105,7 @@ High Meter=High Meter
 HighResolutionTextures=High-Res Textures
 Holds=Holds
 InputDebounceTime=Input Debounce Time
-InputOptions=Input Options
+InputOptions=Input Options.
 Insert=Insert
 Insert Credit=Insert Credit
 Insert beat and shift down=Insert beat and shift down
@@ -1105,6 +1114,7 @@ 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
@@ -1146,6 +1156,7 @@ 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
@@ -1174,7 +1185,7 @@ Quads=Quads
 Quantize=Quantize
 RandomBackgroundMode=Mode
 RandomModifiers=Modifiers
-Random Options=Random Options
+Random Options=Misc Options
 Rate=Rate
 Record in selection=Record in selection
 RefreshRate=Refresh Rate
@@ -1198,6 +1209,7 @@ Scoreboard=Scoreboard
 ScoringType=Scoring Type
 ScreenFilter=Screen Filter
 Scroll=Scroll
+Scroll segments=Scroll segments
 Secret=Secret
 Secs Remaining=Seconds Remaining
 Server=Server
@@ -1211,6 +1223,8 @@ 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
@@ -1224,8 +1238,10 @@ 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
@@ -1253,7 +1269,9 @@ 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
@@ -1265,13 +1283,14 @@ 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
 
 #
 UI Options=UI Options
-Input Options=Input Options
+Input Options=Advanced Input Options
 Arcade Options=Arcade Options
 Select Game=Select Game
 System Direction=System Direction
@@ -1418,13 +1437,13 @@ HeaderText=Appearance
 HeaderSubText=Customize your game
 
 [ScreenOptionsDisplaySub]
-HeaderText=Display & Sound Options
+HeaderText=Display/Sound Options
 
 [ScreenOptionsInputSub]
 HeaderText=Input Options
 
 [ScreenOptionsRandomSub]
-HeaderText=Random Options
+HeaderText=Misc Options
 
 [ScreenOptionsGraphicsSound]
 HeaderText=Graphics/Sound
@@ -1990,6 +2009,7 @@ 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=
 
@@ -2452,39 +2472,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=??????????
+Byelorussian=Беларуская
-Bulgarian=?????????
+Bulgarian=Български
 Bihari=Bihari
 Bislama=Bislama
 Bengali=Bengali
 Tibetan=Tibetan
 Breton=Breton
-Catalan=Català
+Catalan=Català
 Corsican=Corsican
-Czech=?eština
+Czech=čeština
 Welsh=Cymraeg
 Danish=Dansk
 German=Deutsch
 Bhutani=Bhutani
-Greek=????????
+Greek=Ελληνικά
 English=English
 Esperanto=Esperanto
-Spanish=Español
+Spanish=Español
 Estonian=Eesti
 Basque=euskera
-Persian=?????
+Persian=فارسی
 Finnish=Suomi
 Fiji=Fiji
 Faeroese=Faeroese
-French=Français
+French=Français
 Frisian=Frisian
 Irish=Gaeilge
 Gaelic=Gaelic
@@ -2492,39 +2512,39 @@ Galician=Galego
 Guarani=Guarani
 Gujarati=Gujarati
 Hausa=Hausa
-Hebrew=?????
+Hebrew=עברית
-Hindi=?????
+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=?????
+Hebrew=עברית
-Japanese=???
+Japanese=日本語
 Yiddish=Yiddish
 Javanese=Javanese
 Georgian=Georgian
-Kazakh=?????
+Kazakh=Қазақ
 Greenlandic=Greenlandic
 Cambodian=Cambodian
-Kannada=?????
+Kannada=ಕನ್ನಡ
-Korean=???
+Korean=한국어
 Kashmiri=Kashmiri
 Kurdish=Kurdish
-Kirghiz=??????
+Kirghiz=Кыргыз
 Latin=Latin
 Lingala=Lingala
 Laothian=Laothian
-Lithuanian=Lietuviškai
+Lithuanian=Lietuviškai
-Latvian=Latviešu
+Latvian=Latviešu
 Malagasy=Malagasy
 Maori=Maori
-Macedonian=??????????
+Macedonian=Македонски
 Malayalam=Malayalam
 Mongolian=Mongolian
 Moldavian=Moldavian
@@ -2541,21 +2561,21 @@ Oromo=Oromo
 Oriya=Oriya
 Punjabi=Punjabi
 Polish=Polski
-Pashto=????
+Pashto=پښتو
-Portuguese=Português
+Portuguese=Português
 Quechua=Quechua
 Rhaeto-Romance=Rhaeto-Romance
 Kirundi=Kirundi
-Romanian=Român?
+Romanian=Română
-Russian=Pycc???
+Russian=Pyccĸий
 Kinyarwanda=Kinyarwanda
 Sanskrit=Sanskrit
 Sindhi=Sindhi
 Sangro=Sangro
 Serbo-Croatian=Serbo-Croatian
 Singhalese=Singhalese
-Slovak=Sloven?ina
+Slovak=Slovenčina
-Slovenian=Slovenš?ina
+Slovenian=Slovenščina
 Samoan=Samoan
 Shona=Shona
 Somali=Somali
@@ -2567,28 +2587,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ϋrkçe
 Tsonga=Tsonga
 Tatar=Tatar
 Twi=Twi
-Ukrainian=??????????
+Ukrainian=Українська
-Urdu=????
+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á
+Yoruba=Yorùbá
-Chinese=??
+Chinese=中文
 Zulu=isiZulu
 
 [ScreenPlayerOptions]

Themes/_fallback/metrics.ini

@@ -1,4 +1,4 @@
-# This probably is hard to understand from the way it was made in the first
+# This probably is hard to understand from the way it was made in the first
 # place, so instead just pay attention to each group, which has tons of notes.
 
 # 01 # Global
@@ -2726,25 +2726,27 @@ Fallback="ScreenOptionsSimpleService"
 NextScreen=Branch.AfterInit()
 PrevScreen=Branch.AfterInit()
 
-LineNames="GameType,Sync,KeyConfig,TestInput,Input,Reload,Arcade,Appearance,BGFit,Profiles,Network,UI,Advanced,Credits"
+LineNames="Sync,GameType,KeyConfig,TestInput,Input,Reload,Arcade,Appearance,BGFit,GraphicSound,Profiles,Network,UI,Advanced,Credits,SoundGraphics,InputOptions,Misc"
 
-LineSync="gamecommand;screen,ScreenGameplaySyncMachine"
+LineSync="gamecommand;screen,ScreenGameplaySyncMachine;name,Calibrate Machine Sync"
 LineGameType="gamecommand;screen,ScreenSelectGame;name,Select Game"
-LineTestInput="gamecommand;screen,ScreenOptionsDisplaySub;name,Display Options"
+LineKeyConfig="gamecommand;screen,ScreenMapControllers;name,Key Joy Mappings"
-LineKeyConfig="gamecommand;screen,ScreenOptionsInputSub;name,InputOptions"
+LineTestInput="gamecommand;screen,ScreenTestInput;name,Test Input"
-LineInput="gamecommand;screen,ScreenOptionsInput"
+LineInput="gamecommand;screen,ScreenOptionsInput;name,Input Options"
-LineReload="gamecommand;screen,ScreenOptionsRandomSub;name,Random Options"
+LineReload="gamecommand;screen,ScreenReloadSongs;name,Reload Songs"
 LineArcade="gamecommand;screen,ScreenOptionsArcade;name,Arcade Options"
-LineAppearance="gamecommand;screen,ScreenAppearanceOptions"
+LineAppearance="gamecommand;screen,ScreenAppearanceOptions;name,Appearance Options"
-LineBGFit="gamecommand;screen,ScreenSetBGFit;name"
+LineBGFit="gamecommand;screen,ScreenSetBGFit;name,Set BG Fit Mode"
+LineGraphicSound="gamecommand;screen,ScreenOptionsGraphicsSound;name,Graphics/Sound Options"
 LineProfiles="gamecommand;screen,ScreenOptionsManageProfiles;name,Profiles"
 LineNetwork="gamecommand;screen,ScreenNetworkOptions;name,Network Options"
-LineUI="gamecommand;screen,ScreenOptionsUI"
+LineUI="gamecommand;screen,ScreenOptionsUI;name,UI Options"
-LineCredits="gamecommand;screen,ScreenCredits"
+LineAdvanced="gamecommand;screen,ScreenOptionsAdvanced;name,Advanced Options"
-LineAdvanced="gamecommand;screen,ScreenReloadSongs;name,Reload Songs"
+LineMoreOptions="gamecommand;screen,ScreenOptionsExtended;name,More Options"
-LineGraphicSound="gamecommand;screen,ScreenOptionsGraphicsSound"
+LineCredits="gamecommand;screen,ScreenCredits;name,StepMania Credits"
-LineDisplay="gamecommand;screen,ScreenOptionsExtended"
+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"

Themes/default/metrics.ini

@@ -316,7 +316,7 @@ GradeP2X=110+16
 GradeP2Y=8
 
 [NoteField]
-ShowBoard=true
+ShowBoard=GAMESTATE:GetCurrentGame():GetName() == "kb7"
 
 [PlayerStageStats]
 
@@ -1256,7 +1256,7 @@ ExplanationTogetherOffCommand=stoptweening
 [ScreenOptionsService]
 ShowHeader=true
 
-LineNames="Sync,GameType,KeyConfig,TestInput,Input,Reload,Arcade,Appearance,Theme,BGFit,GraphicSound,Profiles,Network,UI,Advanced,Credits"
+LineNames="GameType,InputOptions,SoundGraphics,Misc,Arcade,Theme,Profiles,Network,Reload"
 LineTheme="gamecommand;screen,ScreenOptionsTheme;name,Theme Options"
 
 # ScreenOptionsSystemDirection"