From 2618164fa894404ad74c9e41007923bec984d8d6 Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Tue, 20 Mar 2012 17:10:56 -0500 Subject: [PATCH] move Theme Options from fallback to default; not every theme will have them --- Themes/_fallback/metrics.ini | 4 ++-- Themes/default/metrics.ini | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini index 0fa291971b..d6dddcd25c 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -2631,7 +2631,7 @@ Fallback="ScreenOptionsSimpleService" NextScreen=Branch.AfterInit() PrevScreen=Branch.AfterInit() -LineNames="Sync,GameType,KeyConfig,TestInput,Input,Reload,Arcade,Appearance,Theme,GraphicSound,Profiles,Network,UI,Advanced,Credits" +LineNames="Sync,GameType,KeyConfig,TestInput,Input,Reload,Arcade,Appearance,GraphicSound,Profiles,Network,UI,Advanced,Credits" LineSync="gamecommand;screen,ScreenGameplaySyncMachine;name,Calibrate Machine Sync" LineGameType="gamecommand;screen,ScreenSelectGame;name,Select Game" LineKeyConfig="gamecommand;screen,ScreenMapControllers;name,Key Joy Mappings" @@ -2640,7 +2640,7 @@ LineInput="gamecommand;screen,ScreenOptionsInput;name,Input Options" LineReload="gamecommand;screen,ScreenReloadSongs;name,Reload Songs" LineArcade="gamecommand;screen,ScreenOptionsArcade;name,Arcade Options" LineAppearance="gamecommand;screen,ScreenAppearanceOptions;name,Appearance Options" -LineTheme="gamecommand;screen,ScreenOptionsTheme;name,Theme Options" + LineGraphicSound="gamecommand;screen,ScreenOptionsGraphicsSound;name,Graphics/Sound Options" LineProfiles="gamecommand;screen,ScreenOptionsManageProfiles;name,Profiles" LineNetwork="gamecommand;screen,ScreenNetworkOptions;name,Network Options" diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini index 55f5ffe9ce..1fec3a4847 100644 --- a/Themes/default/metrics.ini +++ b/Themes/default/metrics.ini @@ -1218,6 +1218,9 @@ LineHighlightChangeToExitCommand=linear,0.1;diffuse,Color("Red");diffuseshift;ef [ScreenOptionsService] ShowHeader=false +LineNames="Sync,GameType,KeyConfig,TestInput,Input,Reload,Arcade,Appearance,Theme,GraphicSound,Profiles,Network,UI,Advanced,Credits" +LineTheme="gamecommand;screen,ScreenOptionsTheme;name,Theme Options" + # ScreenOptionsSystemDirection" NumRowsShown=14