edit mode fixup

2009-04-06 10:52:38 +00:00
parent 25e0fa222f
commit 555d9188e6
29 changed files with 41 additions and 62 deletions
@@ -1 +1 @@
-Common normal
+Common normal
@@ -1 +0,0 @@
-_blank
@@ -1 +0,0 @@
-_blank
@@ -0,0 +1,5 @@
+return Def.ActorFrame {
+	LoadFont( "common normal" ) .. {
+		InitCommand=cmd(shadowlength,0;settext,ScreenString("HeaderText"););
+	};
+};
@@ -1 +0,0 @@
-return LoadFont("Common normal") .. { Text="Area Menu"; };
@@ -1 +0,0 @@
-return LoadFont("Common normal") .. { Text="Background Change"; };
@@ -1 +0,0 @@
-return LoadFont("Common normal") .. { Text="Course Display"; };
@@ -1 +0,0 @@
-return LoadFont("Common normal") .. { Text="Course Options"; };
@@ -1 +0,0 @@
-return LoadFont("Common normal") .. { Text="Help"; };
@@ -1 +0,0 @@
-return LoadFont("Common normal") .. { Text="Insert Attack"; };
@@ -1 +0,0 @@
-return LoadFont("Common normal") .. { Text="Insert Attack"; };
@@ -1 +0,0 @@
-return LoadFont("Common normal") .. { Text="Main Menu"; };
@@ -1 +0,0 @@
-return LoadFont("Common normal") .. { Text="Preferences"; };
@@ -1 +0,0 @@
-return LoadFont("Common normal") .. { Text="Edit Song Info"; };
@@ -1 +0,0 @@
-return LoadFont("Common normal") .. { Text="Steps Information"; };
@@ -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
-	};
-};
@@ -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
@@ -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
+
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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(
				`@@ -1 +0,0 @@`
				`return LoadFont("Common normal") .. { Text="Area Menu"; };`