diff --git a/stepmania/Themes/default/Fonts/ScreenMiniMenu title.redir b/stepmania/Themes/default/Fonts/OptionRowMiniMenu title.redir similarity index 93% rename from stepmania/Themes/default/Fonts/ScreenMiniMenu title.redir rename to stepmania/Themes/default/Fonts/OptionRowMiniMenu title.redir index ca24092074..10c0a00716 100644 --- a/stepmania/Themes/default/Fonts/ScreenMiniMenu title.redir +++ b/stepmania/Themes/default/Fonts/OptionRowMiniMenu title.redir @@ -1 +1 @@ -Common normal +Common normal diff --git a/stepmania/Themes/default/Graphics/ScreenMiniMenu icon 3x2.redir b/stepmania/Themes/default/Graphics/OptionRowMiniMenu frame.redir similarity index 100% rename from stepmania/Themes/default/Graphics/ScreenMiniMenu icon 3x2.redir rename to stepmania/Themes/default/Graphics/OptionRowMiniMenu frame.redir diff --git a/stepmania/Themes/default/Graphics/ScreenMiniMenu bullet.redir b/stepmania/Themes/default/Graphics/ScreenMiniMenu bullet.redir deleted file mode 100644 index c700c90d39..0000000000 --- a/stepmania/Themes/default/Graphics/ScreenMiniMenu bullet.redir +++ /dev/null @@ -1 +0,0 @@ -_blank diff --git a/stepmania/Themes/default/Graphics/ScreenMiniMenu cursor 3x2.redir b/stepmania/Themes/default/Graphics/ScreenMiniMenu cursor 3x2.redir deleted file mode 100644 index c700c90d39..0000000000 --- a/stepmania/Themes/default/Graphics/ScreenMiniMenu cursor 3x2.redir +++ /dev/null @@ -1 +0,0 @@ -_blank diff --git a/stepmania/Themes/default/Graphics/ScreenMiniMenu header.lua b/stepmania/Themes/default/Graphics/ScreenMiniMenu header.lua new file mode 100644 index 0000000000..6f44ffa132 --- /dev/null +++ b/stepmania/Themes/default/Graphics/ScreenMiniMenu header.lua @@ -0,0 +1,5 @@ +return Def.ActorFrame { + LoadFont( "common normal" ) .. { + InitCommand=cmd(shadowlength,0;settext,ScreenString("HeaderText");); + }; +}; diff --git a/stepmania/Themes/default/Graphics/ScreenMiniMenuAreaMenu header.lua b/stepmania/Themes/default/Graphics/ScreenMiniMenuAreaMenu header.lua deleted file mode 100644 index 57d7c73820..0000000000 --- a/stepmania/Themes/default/Graphics/ScreenMiniMenuAreaMenu header.lua +++ /dev/null @@ -1 +0,0 @@ -return LoadFont("Common normal") .. { Text="Area Menu"; }; diff --git a/stepmania/Themes/default/Graphics/ScreenMiniMenuBackgroundChange header.lua b/stepmania/Themes/default/Graphics/ScreenMiniMenuBackgroundChange header.lua deleted file mode 100644 index 88475f8eaa..0000000000 --- a/stepmania/Themes/default/Graphics/ScreenMiniMenuBackgroundChange header.lua +++ /dev/null @@ -1 +0,0 @@ -return LoadFont("Common normal") .. { Text="Background Change"; }; diff --git a/stepmania/Themes/default/Graphics/ScreenMiniMenuCourseDisplay header.lua b/stepmania/Themes/default/Graphics/ScreenMiniMenuCourseDisplay header.lua deleted file mode 100644 index 56eb7816f0..0000000000 --- a/stepmania/Themes/default/Graphics/ScreenMiniMenuCourseDisplay header.lua +++ /dev/null @@ -1 +0,0 @@ -return LoadFont("Common normal") .. { Text="Course Display"; }; diff --git a/stepmania/Themes/default/Graphics/ScreenMiniMenuCourseOptions header.lua b/stepmania/Themes/default/Graphics/ScreenMiniMenuCourseOptions header.lua deleted file mode 100644 index d8c2eb6a0e..0000000000 --- a/stepmania/Themes/default/Graphics/ScreenMiniMenuCourseOptions header.lua +++ /dev/null @@ -1 +0,0 @@ -return LoadFont("Common normal") .. { Text="Course Options"; }; diff --git a/stepmania/Themes/default/Graphics/ScreenMiniMenuEditHelp header.lua b/stepmania/Themes/default/Graphics/ScreenMiniMenuEditHelp header.lua deleted file mode 100644 index b095facfb1..0000000000 --- a/stepmania/Themes/default/Graphics/ScreenMiniMenuEditHelp header.lua +++ /dev/null @@ -1 +0,0 @@ -return LoadFont("Common normal") .. { Text="Help"; }; diff --git a/stepmania/Themes/default/Graphics/ScreenMiniMenuInsertCourseAttack header.lua b/stepmania/Themes/default/Graphics/ScreenMiniMenuInsertCourseAttack header.lua deleted file mode 100644 index ac1eb08cdd..0000000000 --- a/stepmania/Themes/default/Graphics/ScreenMiniMenuInsertCourseAttack header.lua +++ /dev/null @@ -1 +0,0 @@ -return LoadFont("Common normal") .. { Text="Insert Attack"; }; diff --git a/stepmania/Themes/default/Graphics/ScreenMiniMenuInsertTapAttack header.lua b/stepmania/Themes/default/Graphics/ScreenMiniMenuInsertTapAttack header.lua deleted file mode 100644 index ac1eb08cdd..0000000000 --- a/stepmania/Themes/default/Graphics/ScreenMiniMenuInsertTapAttack header.lua +++ /dev/null @@ -1 +0,0 @@ -return LoadFont("Common normal") .. { Text="Insert Attack"; }; diff --git a/stepmania/Themes/default/Graphics/ScreenMiniMenuMainMenu header.lua b/stepmania/Themes/default/Graphics/ScreenMiniMenuMainMenu header.lua deleted file mode 100644 index 5b62e366f9..0000000000 --- a/stepmania/Themes/default/Graphics/ScreenMiniMenuMainMenu header.lua +++ /dev/null @@ -1 +0,0 @@ -return LoadFont("Common normal") .. { Text="Main Menu"; }; diff --git a/stepmania/Themes/default/Graphics/ScreenMiniMenuPreferences header.lua b/stepmania/Themes/default/Graphics/ScreenMiniMenuPreferences header.lua deleted file mode 100644 index c0df4778dc..0000000000 --- a/stepmania/Themes/default/Graphics/ScreenMiniMenuPreferences header.lua +++ /dev/null @@ -1 +0,0 @@ -return LoadFont("Common normal") .. { Text="Preferences"; }; diff --git a/stepmania/Themes/default/Graphics/ScreenMiniMenuSongInformation header.lua b/stepmania/Themes/default/Graphics/ScreenMiniMenuSongInformation header.lua deleted file mode 100644 index bfbb8babdb..0000000000 --- a/stepmania/Themes/default/Graphics/ScreenMiniMenuSongInformation header.lua +++ /dev/null @@ -1 +0,0 @@ -return LoadFont("Common normal") .. { Text="Edit Song Info"; }; diff --git a/stepmania/Themes/default/Graphics/ScreenMiniMenuStepsInformation header.lua b/stepmania/Themes/default/Graphics/ScreenMiniMenuStepsInformation header.lua deleted file mode 100644 index ad5c163583..0000000000 --- a/stepmania/Themes/default/Graphics/ScreenMiniMenuStepsInformation header.lua +++ /dev/null @@ -1 +0,0 @@ -return LoadFont("Common normal") .. { Text="Steps Information"; }; diff --git a/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 header/arrow (doubleres).png b/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 header/arrow (doubleres).png deleted file mode 100644 index ddb0679465..0000000000 Binary files a/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 header/arrow (doubleres).png and /dev/null differ diff --git a/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 header/bar (doubleres).png b/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 header/bar (doubleres).png deleted file mode 100644 index 1d48bd5952..0000000000 Binary files a/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 header/bar (doubleres).png and /dev/null differ diff --git a/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 header/default.lua b/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 header/default.lua deleted file mode 100644 index 26f966702f..0000000000 --- a/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 header/default.lua +++ /dev/null @@ -1,37 +0,0 @@ -return Def.ActorFrame { - LoadActor( "top" ) .. { - InitCommand=cmd(); - }; - Def.ActorFrame { - InitCommand=cmd(x,-284;y,-6;); - LoadActor( "bar" ) .. { - InitCommand=cmd(horizalign,left;y,4); - }; - LoadFont( "_sf sports night ns upright 26px header text" ) .. { - InitCommand=cmd(x,64;y,-7;horizalign,left;shadowlength,0;settext,ScreenString("HeaderText");skewx,-0.15;zoomx,1.2;maxwidth,250;); - OnCommand=cmd(faderight,1;cropright,1;linear,.32;faderight,0;cropright,0); - OffCommand=cmd(faderight,0;cropright,0;linear,.32;faderight,1;cropright,1); - Name="HeaderText"; - }; - LoadFont( "_venacti 10px header subtext" ) .. { - InitCommand=cmd(x,64;y,11;horizalign,left;shadowlength,0;settext,ScreenString("HeaderSubText");zoomx,1.2;); - OnCommand=cmd(zoomy,.5;faderight,1;cropright,1;linear,.32;faderight,0;cropright,0;zoomy,1); - OffCommand=cmd(faderight,0;cropright,0;linear,.32;faderight,1;cropright,1); - Name="HeaderSubText"; - }; - LoadActor( "arrow" ) .. { - }; - LoadActor( "ring shadow" ) .. { - InitCommand=cmd(x,-1.5;y,2;spin;effectmagnitude,0,0,10;); - }; - LoadActor( "ring diffuse" ) .. { - InitCommand=cmd(x,-1.5;y,-3;spin;effectmagnitude,0,0,10;); - }; - UpdateScreenHeaderMessageCommand=function(self,params) - local header = self:GetChild("HeaderText"); - local subHeader = self:GetChild("HeaderSubText"); - header:settext( params.Header ); - subHeader:settext( params.Subheader ); - end - }; -}; diff --git a/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 header/ring diffuse (doubleres).png b/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 header/ring diffuse (doubleres).png deleted file mode 100644 index d5238f86c9..0000000000 Binary files a/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 header/ring diffuse (doubleres).png and /dev/null differ diff --git a/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 header/ring shadow (doubleres).png b/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 header/ring shadow (doubleres).png deleted file mode 100644 index f92fbfd8ae..0000000000 Binary files a/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 header/ring shadow (doubleres).png and /dev/null differ diff --git a/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 header/top (doubleres).png b/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 header/top (doubleres).png deleted file mode 100644 index 8704fa527a..0000000000 Binary files a/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 header/top (doubleres).png and /dev/null differ diff --git a/stepmania/Themes/default/Languages/de.ini b/stepmania/Themes/default/Languages/de.ini index 32474b6488..5a33ece728 100644 --- a/stepmania/Themes/default/Languages/de.ini +++ b/stepmania/Themes/default/Languages/de.ini @@ -853,7 +853,6 @@ EditorShowBGChangesPlay=Zeige\nHintergründe Effect=Effekt Entry %d=Eintrag %d EventMode=Wettbewerbsmodus -Exit editor=Editor Beenden Fail=Durchgefallen FastLoad=Schnell\nladen File1 Global BGAnimation=Datei1 Globale HGAnimation diff --git a/stepmania/Themes/default/Languages/en.ini b/stepmania/Themes/default/Languages/en.ini index 8fd5a4c46f..128fab5292 100644 --- a/stepmania/Themes/default/Languages/en.ini +++ b/stepmania/Themes/default/Languages/en.ini @@ -747,7 +747,7 @@ Edit Courses=Edit Courses Edit BPM change=Edit BPM change Edit song info=Edit song info Edit steps information=Edit steps information -Exit editor=Exit editor +Exit Edit Mode=Exit Edit Mode Edit stop=Edit stop Editor options=Options EditorShowBGChangesPlay=Show Backgrounds @@ -1989,3 +1989,31 @@ HeaderSubText=Share your creation with people [ScreenOptionsEdit] HeaderText=Edit/Share HeaderSubText=Show your creativity + +[ScreenMiniMenuEditHelp] +HeaderText=Edit Help + +[ScreenMiniMenuMainMenu] +HeaderText=Main Menu + +[ScreenMiniMenuAreaMenu] +HeaderText=Area Menu + +[ScreenMiniMenuStepsInformation] +HeaderText=Steps Information + +[ScreenMiniMenuSongInformation] +HeaderText=Song Information + +[ScreenMiniMenuBackgroundChange] +HeaderText=Background Change + +[ScreenMiniMenuInsertTapAttack] +HeaderText=Insert Tap Attack + +[ScreenMiniMenuInsertCourseAttack] +HeaderText=Insert Course Attack + +[ScreenMiniMenuCourseDisplay] +HeaderText=Course Display + diff --git a/stepmania/Themes/default/Languages/es.ini b/stepmania/Themes/default/Languages/es.ini index f85c8f0757..d753cb74c4 100644 --- a/stepmania/Themes/default/Languages/es.ini +++ b/stepmania/Themes/default/Languages/es.ini @@ -811,7 +811,6 @@ EditorShowBGChangesPlay=Mostrar\nfondos Effect=Efecto Entry %d=entrada %d EventMode=Modo Evento -Exit editor=Editor de salida Fail=Fallo FastLoad=Carga\nrápida File1 Global BGAnimation=Archivo 1 animación global bg diff --git a/stepmania/Themes/default/Languages/fr.ini b/stepmania/Themes/default/Languages/fr.ini index 1f55462044..cddf648692 100644 --- a/stepmania/Themes/default/Languages/fr.ini +++ b/stepmania/Themes/default/Languages/fr.ini @@ -829,7 +829,6 @@ EditorShowBGChangesPlay=Afficher\nArrière-plans Effect=Effet Entry %d=Entrée %d EventMode=Evénement -Exit editor=Quitter l'editeur Fail=Echec FastLoad=Chargement\nRapide File1 Global BGAnimation=Fichier1 BGAnimation globale diff --git a/stepmania/Themes/default/Languages/it.ini b/stepmania/Themes/default/Languages/it.ini index 7024fd0915..c26d4e601d 100644 --- a/stepmania/Themes/default/Languages/it.ini +++ b/stepmania/Themes/default/Languages/it.ini @@ -824,7 +824,6 @@ EditorShowBGChangesPlay=Mostra\nSfondi Effect=Effetto Entry %d=Entra%d EventMode=Modalità evento -Exit editor=Esci dall'editor Fail=Fallito FastLoad=Caricamento\nVeloce File1 Global BGAnimation=File1 Animazione di sottofondo Globale diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 00a3c4989d..d806b97fec 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -1984,8 +1984,6 @@ ShowScrollBar=false ScrollBarHeight=0 ScrollBarTime=0 LineHighlightX=SCREEN_CENTER_X -FrameOnCommand=x,-SCREEN_WIDTH;decelerate,0.3;addx,SCREEN_WIDTH -FrameOffCommand=accelerate,0.3;addx,SCREEN_WIDTH ShowExitRow=true SeparateExitRow=true SeparateExitRowY=SCREEN_CENTER_Y+140 @@ -3848,8 +3846,8 @@ ShowHelp=false TimerSeconds=-1 ShowExplanations=false ShowExitRow=false -FrameOnCommand= -FrameOffCommand= +ContainerOnCommand= +ContainerOffCommand= NumRowsShown=30 RowPositionTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) local indexOffset = itemIndex-(numItems-1)/2; self:y( SCREEN_CENTER_Y + indexOffset * 20 ); end ShowStyleIcon=false @@ -3858,9 +3856,11 @@ HeaderY=SCREEN_TOP+40 HeaderOnCommand= HeaderOffCommand= AllowRepeatingChangeValueInput=true -OptionRowMetricsGroup="OptionRowMiniMenu" +CursorOnCommand=visible,false +OptionRowNormalMetricsGroup="OptionRowMiniMenu" [OptionRowMiniMenu] +Fallback="OptionRow" IconsP1X=SCREEN_CENTER_X-280 IconsP2X=SCREEN_CENTER_X+280 IconsOnCommand=x,-30 diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp index cec3f9ae9b..cdcca94b09 100644 --- a/stepmania/src/ScreenEdit.cpp +++ b/stepmania/src/ScreenEdit.cpp @@ -491,7 +491,7 @@ static MenuDef g_MainMenu( MenuRowDef( ScreenEdit::edit_bpm, "Edit BPM change", true, EditMode_Full, true, true, 0, NULL ), MenuRowDef( ScreenEdit::edit_stop, "Edit stop", true, EditMode_Full, true, true, 0, NULL ), MenuRowDef( ScreenEdit::play_preview_music, "Play preview music", true, EditMode_Full, true, true, 0, NULL ), - MenuRowDef( ScreenEdit::exit, "Exit editor", true, EditMode_Practice, true, true, 0, NULL ) + MenuRowDef( ScreenEdit::exit, "Exit Edit Mode", true, EditMode_Practice, true, true, 0, NULL ) ); static MenuDef g_AreaMenu(