From a63ee3e5e31fdfbd8ddc9aec07ed0501c6133a35 Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Mon, 21 Mar 2005 00:09:51 +0000
Subject: [PATCH] add missing elements/metrics

---
 .../default/Fonts/OptionIconRow icon.redir    |   1 +
 .../default/Fonts/ScreenOptions icon.redir    |   1 +
 .../default/Fonts/_option icon 16x16.png      | Bin 0 -> 8062 bytes
 .../Themes/default/Fonts/_option icon.ini     | 257 ++++++++++++++++++
 .../Graphics/OptionIconRow icon 3x2.redir     |   1 +
 .../Graphics/ScreenMiniMenu icon 3x2.redir    |   2 +-
 .../Graphics/ScreenOptions icon 3x2.redir     |   1 +
 .../default/Graphics/_option icon 3x2.png     | Bin 0 -> 5528 bytes
 stepmania/Themes/default/metrics.ini          |  62 +++--
 9 files changed, 295 insertions(+), 30 deletions(-)
 create mode 100644 stepmania/Themes/default/Fonts/OptionIconRow icon.redir
 create mode 100644 stepmania/Themes/default/Fonts/ScreenOptions icon.redir
 create mode 100644 stepmania/Themes/default/Fonts/_option icon 16x16.png
 create mode 100644 stepmania/Themes/default/Fonts/_option icon.ini
 create mode 100644 stepmania/Themes/default/Graphics/OptionIconRow icon 3x2.redir
 create mode 100644 stepmania/Themes/default/Graphics/ScreenOptions icon 3x2.redir
 create mode 100644 stepmania/Themes/default/Graphics/_option icon 3x2.png

diff --git a/stepmania/Themes/default/Fonts/OptionIconRow icon.redir b/stepmania/Themes/default/Fonts/OptionIconRow icon.redir
new file mode 100644
index 0000000000..e9d2ccd770
--- /dev/null
+++ b/stepmania/Themes/default/Fonts/OptionIconRow icon.redir	
@@ -0,0 +1 @@
+_option icon
diff --git a/stepmania/Themes/default/Fonts/ScreenOptions icon.redir b/stepmania/Themes/default/Fonts/ScreenOptions icon.redir
new file mode 100644
index 0000000000..e9d2ccd770
--- /dev/null
+++ b/stepmania/Themes/default/Fonts/ScreenOptions icon.redir	
@@ -0,0 +1 @@
+_option icon
diff --git a/stepmania/Themes/default/Fonts/_option icon 16x16.png b/stepmania/Themes/default/Fonts/_option icon 16x16.png
new file mode 100644
index 0000000000000000000000000000000000000000..30027cbd6220ea2677a7528ff7b830b09d511bec
GIT binary patch
literal 8062
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
b!Yc?B6Y1BhGP9fruYfbB&RdpRc-{Ut#QL9=

literal 0
HcmV?d00001

diff --git a/stepmania/Themes/default/Fonts/_option icon.ini b/stepmania/Themes/default/Fonts/_option icon.ini
new file mode 100644
index 0000000000..725a87928c
--- /dev/null
+++ b/stepmania/Themes/default/Fonts/_option icon.ini	
@@ -0,0 +1,257 @@
+[Char Widths]
+0=11
+1=11
+2=11
+3=11
+4=11
+5=11
+6=11
+7=11
+8=11
+9=72
+10=0
+11=11
+12=11
+13=0
+14=11
+15=11
+16=11
+17=11
+18=11
+19=11
+20=11
+21=11
+22=11
+23=11
+24=11
+25=11
+26=11
+27=11
+28=0
+29=0
+30=0
+31=0
+32=4
+33=6
+34=8
+35=13
+36=12
+37=15
+38=12
+39=4
+40=7
+41=7
+42=6
+43=11
+44=4
+45=6
+46=4
+47=8
+48=11
+49=8
+50=11
+51=11
+52=10
+53=11
+54=11
+55=8
+56=11
+57=11
+58=4
+59=4
+60=11
+61=11
+62=11
+63=11
+64=16
+65=10
+66=12
+67=12
+68=12
+69=9
+70=8
+71=12
+72=12
+73=6
+74=7
+75=11
+76=8
+77=15
+78=11
+79=11
+80=11
+81=11
+82=11
+83=11
+84=10
+85=11
+86=10
+87=16
+88=10
+89=10
+90=8
+91=6
+92=8
+93=6
+94=10
+95=12
+96=7
+97=11
+98=11
+99=10
+100=11
+101=11
+102=6
+103=11
+104=11
+105=5
+106=5
+107=10
+108=5
+109=15
+110=11
+111=11
+112=11
+113=11
+114=8
+115=10
+116=6
+117=11
+118=9
+119=13
+120=9
+121=9
+122=7
+123=8
+124=6
+125=8
+126=11
+127=11
+128=11
+129=6
+130=4
+131=9
+132=7
+133=12
+134=11
+135=11
+136=7
+137=22
+138=11
+139=4
+140=14
+141=6
+142=8
+143=6
+144=6
+145=4
+146=4
+147=7
+148=7
+149=7
+150=11
+151=21
+152=7
+153=16
+154=10
+155=4
+156=16
+157=6
+158=7
+159=10
+160=4
+161=6
+162=11
+163=11
+164=12
+165=10
+166=6
+167=10
+168=7
+169=16
+170=7
+171=8
+172=11
+173=6
+174=16
+175=12
+176=7
+177=11
+178=7
+179=7
+180=7
+181=10
+182=12
+183=7
+184=7
+185=5
+186=7
+187=8
+188=13
+189=14
+190=15
+191=11
+192=10
+193=10
+194=10
+195=10
+196=10
+197=10
+198=15
+199=12
+200=9
+201=9
+202=9
+203=9
+204=6
+205=6
+206=6
+207=6
+208=12
+209=11
+210=11
+211=11
+212=11
+213=11
+214=11
+215=11
+216=11
+217=11
+218=11
+219=11
+220=11
+221=10
+222=11
+223=12
+224=11
+225=11
+226=11
+227=11
+228=11
+229=11
+230=16
+231=10
+232=11
+233=11
+234=11
+235=11
+236=5
+237=5
+238=5
+239=5
+240=11
+241=11
+242=11
+243=11
+244=11
+245=11
+246=11
+247=11
+248=11
+249=11
+250=11
+251=11
+252=11
+253=9
+254=11
+255=9
diff --git a/stepmania/Themes/default/Graphics/OptionIconRow icon 3x2.redir b/stepmania/Themes/default/Graphics/OptionIconRow icon 3x2.redir
new file mode 100644
index 0000000000..981679ace0
--- /dev/null
+++ b/stepmania/Themes/default/Graphics/OptionIconRow icon 3x2.redir	
@@ -0,0 +1 @@
+_option icon 3x2
\ No newline at end of file
diff --git a/stepmania/Themes/default/Graphics/ScreenMiniMenu icon 3x2.redir b/stepmania/Themes/default/Graphics/ScreenMiniMenu icon 3x2.redir
index c700c90d39..981679ace0 100644
--- a/stepmania/Themes/default/Graphics/ScreenMiniMenu icon 3x2.redir	
+++ b/stepmania/Themes/default/Graphics/ScreenMiniMenu icon 3x2.redir	
@@ -1 +1 @@
-_blank
+_option icon 3x2
\ No newline at end of file
diff --git a/stepmania/Themes/default/Graphics/ScreenOptions icon 3x2.redir b/stepmania/Themes/default/Graphics/ScreenOptions icon 3x2.redir
new file mode 100644
index 0000000000..981679ace0
--- /dev/null
+++ b/stepmania/Themes/default/Graphics/ScreenOptions icon 3x2.redir	
@@ -0,0 +1 @@
+_option icon 3x2
\ No newline at end of file
diff --git a/stepmania/Themes/default/Graphics/_option icon 3x2.png b/stepmania/Themes/default/Graphics/_option icon 3x2.png
new file mode 100644
index 0000000000000000000000000000000000000000..3de58f1cad27f615afa46f2d30e37d36ade3daf7
GIT binary patch
literal 5528
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
a^Zy5&E!Tve&weEU0000<MNUMnLSTaYYPUiF

literal 0
HcmV?d00001

diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 1d4ca862aa..f1e5f7ffc6 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -960,6 +960,7 @@ PrepareScreen=0
 
 [ScreenStage]
 Class=ScreenStage
+Fallback=Screen
 NextScreen=@SelectGameplayScreen()
 PrevScreen=@SongSelectionScreen()
 // This is the minimum delay after the "in" transition before the
@@ -995,6 +996,7 @@ OverlayOffCommand=
 
 [ScreenGameplay]
 Class=ScreenGameplay
+Fallback=Screen
 ShowEvaluationOnFail=0
 StaticBGY=SCREEN_CENTER_Y+0
 StaticBGX=SCREEN_CENTER_X+0
@@ -2534,7 +2536,7 @@ Fallback=ScreenOperatorMenu
 
 [ScreenNetworkOptions]
 Class=ScreenNetworkOptions
-Fallback=ScreenOperatorMenu
+Fallback=ScreenOptionsSubmenu
 
 [ScreenBookkeeping]
 Class=ScreenBookkeeping
@@ -3031,6 +3033,8 @@ IdleTimeoutSeconds=0
 AllowOperatorMenuButton=0
 Fallback=ScreenOperatorMenu
 Class=ScreenOptionsMaster
+ThemeItems=0
+ThemeTitles=1
 
 [ScreenOperatorMenu]
 Fallback=ScreenOptionsMaster
@@ -3040,8 +3044,6 @@ MemoryCardIcons=0
 TimerSeconds=0
 PrevScreen=ScreenOptionsMenu
 NextScreen=ScreenOptionsMenu
-ThemeTitles=0
-ThemeItems=0
 
 [ScreenInputOptions]
 Fallback=ScreenOptionsSubmenu
@@ -3159,7 +3161,7 @@ Line3=conf,SoundVolume
 
 [ScreenProfileOptions]
 Class=ScreenProfileOptions
-Fallback=ScreenOperatorMenu
+Fallback=ScreenOptionsSubmenu
 Player1Profile=
 Player2Profile=
 CreateNew=
@@ -3651,8 +3653,9 @@ Line13=list,Other Options
 Line14=list,Network Options
 Line15=list,Reload Songs/Courses
 Line16=list,Test Input
-
-ShowUnderlines=1
+ThemeTitles=1
+ThemeItems=1
+ShowUnderlines=0
 
 [ScreenOptionsTestMenu]
 Fallback=ScreenOptionsSubmenu
@@ -3779,6 +3782,7 @@ Game=Change the current game type with this option.
 TimerSeconds=30
 StyleIcon=0
 MemoryCardIcons=0
+PlayMusic=0
 LineNames=1,2,3,4,5,6,7,8
 OptionMenuFlags=
 Line1=list,LifeType
@@ -4034,76 +4038,76 @@ SaveScores,2=mod,savescore;name,On
 # ScreenOptionsMenu
 Appearance Options=1;together;SelectNone
 Appearance OptionsDefault=
-Appearance Options,1=screen,ScreenAppearanceOptions;name,AppearanceOptions
+Appearance Options,1=screen,ScreenAppearanceOptions;name,Appearance Options
 Other Options=1;together;SelectNone
 Other OptionsDefault=
-Other Options,1=screen,ScreenOtherOptions;name,OtherOptions
+Other Options,1=screen,ScreenOtherOptions;name,Other Options
 Background Options=1;together;SelectNone
 Background OptionsDefault=
-Background Options,1=screen,ScreenBackgroundOptions;name,BackgroundOptions
+Background Options,1=screen,ScreenBackgroundOptions;name,Background Options
 Bookkeeping=1;together;SelectNone
 BookkeepingDefault=
 Bookkeeping,1=screen,ScreenBookkeeping;name,Bookkeeping
 Clear Bookkeeping Data=1;together;SelectNone
 Clear Bookkeeping DataDefault=
-Clear Bookkeeping Data,1=ClearBookkeepingData;name,ClearBookkeepingData
+Clear Bookkeeping Data,1=ClearBookkeepingData;name,Clear Bookkeeping Data
 Center Image=1;together;SelectNone
 Center ImageDefault=
-Center Image,1=screen,ScreenCenterImage;name,CenterImage
+Center Image,1=screen,ScreenCenterImage;name,Center Image
 Coin Options=1;together;SelectNone
 Coin OptionsDefault=
-Coin Options,1=screen,ScreenCoinOptions;name,CoinOptions
+Coin Options,1=screen,ScreenCoinOptions;name,Coin Options
 Config Key/Joy Mappings=1;together;SelectNone
 Config Key/Joy MappingsDefault=
-Config Key/Joy Mappings,1=screen,ScreenMapControllers;name,KeyJoyMappings
+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;name,ClearMachineStats;screen,ScreenOptionsMenu
+Clear Machine Stats,1=ClearMachineStats;name,ClearMachineStats;screen,Screen Options Menu
 Input Options=1;together;SelectNone
 Input OptionsDefault=
-Input Options,1=screen,ScreenInputOptions;name,InputOptions
+Input Options,1=screen,ScreenInputOptions;name,Input Options
 Insert Credit=1;together;SelectNone
 Insert CreditDefault=
-Insert Credit,1=InsertCredit;name,InsertCredit;screen,ScreenOptionsMenu
+Insert Credit,1=screen,ScreenOptionsMenu;InsertCredit;name,Insert Credit
 Gameplay Options=1;together;SelectNone
 Gameplay OptionsDefault=
-Gameplay Options,1=screen,ScreenGameplayOptions;name,GameplayOptions
+Gameplay Options,1=screen,ScreenGameplayOptions;name,Gameplay Options
 Graphic Options=1;together;SelectNone
 Graphic OptionsDefault=
-Graphic Options,1=screen,ScreenGraphicOptions;name,GraphicOptions
+Graphic Options,1=screen,ScreenGraphicOptions;name,Graphic Options
 Machine Options=1;together;SelectNone
 Machine OptionsDefault=
-Machine Options,1=screen,ScreenMachineOptions;name,MachineOptions
+Machine Options,1=screen,ScreenMachineOptions;name,Machine Options
 Sound Options=1;together;SelectNone
 Sound OptionsDefault=
-Sound Options,1=screen,ScreenSoundOptions;name,SoundOptions
+Sound Options,1=screen,ScreenSoundOptions;name,Sound Options
 Profile Options=1;together;SelectNone
 Profile OptionsDefault=
-Profile Options,1=screen,ScreenProfileOptions;name,ProfileOptions
+Profile Options,1=screen,ScreenProfileOptions;name,Profile Options
 Reload Songs/Courses=1;together;SelectNone
 Reload Songs/CoursesDefault=
-Reload Songs/Courses,1=screen,ScreenReloadSongs;name,ReloadSongs
+Reload Songs/Courses,1=screen,ScreenReloadSongs;name,Reload Songs
 Reset To Defaults=1;together;SelectNone
 Reset To DefaultsDefault=
-Reset To Defaults,1=ResetToFactoryDefaults;name,ResetToDefaults;screen,ScreenOptionsMenu
+Reset To Defaults,1=ResetToFactoryDefaults;screen,ScreenOptionsMenu;name,Reset To Defaults
 Test Input=1;together;SelectNone
 Test InputDefault=
-Test Input,1=screen,ScreenTestInput;name,TestInput
+Test Input,1=screen,ScreenTestInput;name,Test Input
 Test Lights=1;together;SelectNone
 Test LightsDefault=
-Test Lights,1=screen,ScreenTestLights;name,TestLights
+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;name,TransferStatsFromMachine;screen,ScreenOptionsMenu
+Transfer Stats From Machine,1=TransferStatsFromMachine;screen,ScreenOptionsMenu;name,Transfer Stats From Machine
 Transfer Stats To Machine=1;together;SelectNone
 Transfer Stats To MachineDefault=
-Transfer Stats To Machine,1=TransferStatsToMachine;name,TransferStatsToMachine;screen,ScreenOptionsMenu
+Transfer Stats To Machine,1=TransferStatsToMachine;screen,ScreenOptionsMenu;name,Transfer Stats To Machine
 Set Machine Time=1;together;SelectNone
 Set Machine TimeDefault=
-Set Machine Time,1=screen,ScreenSetTime;name,SetMachineTime
+Set Machine Time,1=screen,ScreenSetTime;name,Set Machine Time
 Network Options=1;together;SelectNone
 Network OptionsDefault=
-Network Options,1=screen,ScreenNetworkOptions;name,NetworkOptions
+Network Options,1=screen,ScreenNetworkOptions;name,Network Options
 
 #ScreenJukeboxMenu
 RandomModifiers=2;together