remove old, redundant NextScreen%d metrics

add new profile screens

stepmania/Themes/default/BGAnimations/ScreenSelectProfileManage background.redir

@@ -0,0 +1 @@
+_shared background normal

stepmania/Themes/default/BGAnimations/ScreenSelectProfileManage in.redir

@@ -0,0 +1 @@
+_options to options

stepmania/Themes/default/BGAnimations/ScreenSelectProfileManage out.redir

@@ -0,0 +1 @@
+_options to options

stepmania/Themes/default/Graphics/ScreenOptionsEditProfile header.redir

@@ -0,0 +1 @@
+_shared options header

stepmania/Themes/default/Graphics/ScreenSelectProfileManage header.redir

@@ -0,0 +1 @@
+_shared options header

stepmania/Themes/default/metrics.ini

@@ -145,20 +145,15 @@ Class=ScreenSelectStyle
 Fallback=ScreenSelect
 ChoiceNames=1,2,3,4,5
 # The "name" here affects the announcer, eg. "ScreenSelectStyle comment single".
-Choice1=Style,single;name,single
+Choice1=Style,single;name,single;screen,ScreenSelectDifficulty
-Choice2=Style,versus;name,versus
+Choice2=Style,versus;name,versus;screen,ScreenSelectDifficulty
-Choice3=Style,couple;name,couple
+Choice3=Style,couple;name,couple;screen,ScreenSelectDifficulty
-Choice4=Style,double;name,double
+Choice4=Style,double;name,double;screen,ScreenSelectDifficulty
-Choice5=Style,solo;name,solo
+Choice5=Style,solo;name,solo;screen,ScreenSelectDifficulty
 TimerSeconds=40
 StyleIcon=1
 IdleCommentSeconds=15
 IdleTimeoutSeconds=0
-NextScreen1=ScreenSelectDifficulty
-NextScreen2=ScreenSelectDifficulty
-NextScreen3=ScreenSelectDifficulty
-NextScreen4=ScreenSelectDifficulty
-NextScreen5=ScreenSelectDifficulty
 PrevScreen=@ScreenTitleBranch()
 PremiumX=SCREEN_CENTER_X+230
 PremiumY=SCREEN_CENTER_Y-156
@@ -256,27 +251,19 @@ CharacterIconP2OffCommand=linear,0.3;diffusealpha,0;sleep,10
 Class=ScreenSelectDifficulty
 Fallback=ScreenSelect
 ChoiceNames=1,2,3,4,5,6,7,8
-Choice1=PlayMode,regular;Difficulty,beginner;name,beginner
+Choice1=PlayMode,regular;Difficulty,beginner;name,beginner;screen,ScreenSelectGroup
-Choice2=PlayMode,regular;Difficulty,easy;name,easy
+Choice2=PlayMode,regular;Difficulty,easy;name,easy;screen,ScreenSelectGroup
-Choice3=PlayMode,regular;Difficulty,medium;name,medium
+Choice3=PlayMode,regular;Difficulty,medium;name,medium;screen,ScreenSelectGroup
-Choice4=PlayMode,regular;Difficulty,hard;name,hard
+Choice4=PlayMode,regular;Difficulty,hard;name,hard;screen,ScreenSelectGroup
-Choice5=PlayMode,nonstop;name,nonstop
+Choice5=@'PlayMode,nonstop;name,nonstop;screen,'..GetScreenInstructions()
-Choice6=PlayMode,oni;name,oni
+Choice6=@'PlayMode,oni;name,oni;screen,'..GetScreenInstructions()
-Choice7=PlayMode,endless;name,endless
+Choice7=@'PlayMode,endless;name,endless;screen,'..GetScreenInstructions()
-Choice8=PlayMode,rave;name,rave
+Choice8=@'PlayMode,rave;name,rave;screen,'..GetScreenInstructions()
 NumChoicesOnPage1=4
 TimerSeconds=40
 StyleIcon=1
 IdleCommentSeconds=15
 IdleTimeoutSeconds=0
-NextScreen1=ScreenSelectGroup
-NextScreen2=ScreenSelectGroup
-NextScreen3=ScreenSelectGroup
-NextScreen4=ScreenSelectGroup
-NextScreen5=@GetScreenInstructions()
-NextScreen6=@GetScreenInstructions()
-NextScreen7=@GetScreenInstructions()
-NextScreen8=@GetScreenInstructions()
 PrevScreen=@ScreenTitleBranch()
 LockInputSeconds=0.8
 SleepAfterChoiceSeconds=0.3
@@ -3179,19 +3166,6 @@ Line1=conf,ResamplingQuality
 Line2=conf,AttractSoundFrequency
 Line3=conf,SoundVolume
 
-[ScreenProfileOptions]
-Class=ScreenProfileOptions
-Fallback=ScreenOptionsSubmenu
-Player1Profile=
-Player2Profile=
-CreateNew=
-Delete=
-Rename=
-CardDirPlayer1=
-CardDirPlayer2=
-StyleIcon=0
-TimerSeconds=0
-
 [ScreenAttract]
 StartScreen=@ScreenTitleBranch()
 Fallback=ScreenWithMenuElementsBlank
@@ -3671,7 +3645,7 @@ Line8=list,Gameplay Options
 Line9=list,Graphic Options
 Line10=list,Machine Options
 Line11=list,Sound Options
-Line12=list,Profile Options
+Line12=list,Profiles
 Line13=list,Other Options
 Line14=list,Network Options
 Line15=list,Reload Songs/Courses
@@ -4100,9 +4074,9 @@ Machine Options,1=screen,ScreenMachineOptions;name,Machine Options
 Sound Options=1;together;SelectNone
 Sound OptionsDefault=
 Sound Options,1=screen,ScreenSoundOptions;name,Sound Options
-Profile Options=1;together;SelectNone
+Profiles=1;together;SelectNone
-Profile OptionsDefault=
+ProfilesDefault=
-Profile Options,1=screen,ScreenProfileOptions;name,Profile Options
+Profiles,1=screen,ScreenSelectProfileManage;name,Profiles
 Reload Songs/Courses=1;together;SelectNone
 Reload Songs/CoursesDefault=
 Reload Songs/Courses,1=screen,ScreenReloadSongs;name,Reload Songs
@@ -4420,7 +4394,9 @@ CursorOnCommand=
 CursorOffCommand=
 
 [ScreenPrompt]
-Fallback=Screen
+Fallback=ScreenWithMenuElementsBlank
+TimerSeconds=0
+
 QuestionX=SCREEN_CENTER_X
 QuestionY=SCREEN_CENTER_Y-60
 QuestionOnCommand=zoom,0.7;wrapwidthpixels,600
@@ -4516,3 +4492,37 @@ TimerSeconds=0
 
 [ProfileManager]
 NewProfileDefaultName=New
+
+[ScreenSelectProfile]
+Class=ScreenSelectProfile
+Fallback=ScreenSelectMaster
+TimerSeconds=0
+
+PrevScreen=ScreenOptionsMenu
+DefaultChoice=
+NumChoicesOnPage1=100
+WrapCursor=1
+AllowRepeatingInput=1
+ChoiceNames=
+CodeNames=
+NextScreen=ScreenOptionsEditProfile
+
+NumIconParts=0
+ShowScroller=1
+ScrollerOnCommand=
+ScrollerOffCommand=
+ScrollerX=SCREEN_CENTER_X-240
+ScrollerY=SCREEN_CENTER_Y-130
+ScrollerTransform=function(self,offset,itemIndex,numItems) self:y(50*offset); end
+ScrollerSecondsPerItem=0
+ScrollerNumItemsToDraw=20
+ScrollLoseFocusCommand=
+
+[ScreenSelectProfileManage]
+Fallback=ScreenSelectProfile
+
+[ScreenOptionsEditProfile]
+Fallback=ScreenOptions
+PrevScreen=ScreenSelectProfileManage
+Class=ScreenOptionsEditProfile
+TimerSeconds=0