Revert "Some more of default. Not yet done."
This reverts commit 162b626e3e.
This commit is contained in:
@@ -7,14 +7,8 @@ local previewHeight = SCREEN_CENTER_Y;
|
||||
|
||||
local t = Def.ActorFrame{
|
||||
Name="PreviewFrame";
|
||||
InitCommand=function(self)
|
||||
self:x(SCREEN_CENTER_X * 1.5);
|
||||
self:y(SCREEN_CENTER_Y * 0.85);
|
||||
end;
|
||||
OffCommand=function(self)
|
||||
self:bouncebegin(0.25);
|
||||
self:addx(SCREEN_CENTER_X);
|
||||
end;
|
||||
InitCommand=cmd(x,SCREEN_CENTER_X*1.5;y,SCREEN_CENTER_Y*0.85);
|
||||
OffCommand=cmd(bouncebegin,0.25;addx,SCREEN_CENTER_X);
|
||||
};
|
||||
|
||||
local function TitleMenuItem(text,focused)
|
||||
@@ -22,231 +16,92 @@ local function TitleMenuItem(text,focused)
|
||||
local textColor = focused and color("#FFFFFF") or color("#888888");
|
||||
return LoadFont("Common Normal")..{
|
||||
Text=text;
|
||||
InitCommand=function(self)
|
||||
self:zoom(0.45);
|
||||
self:strokecolor(Color("Outline"));
|
||||
self:diffuse(textColor);
|
||||
end;
|
||||
GainFocusCommand=function(self)
|
||||
self:stoptweening();
|
||||
self:decelerate(0.5);
|
||||
self:diffusealpha(1);
|
||||
end;
|
||||
LoseFocusCommand=function(self)
|
||||
self:stoptweening();
|
||||
self:accelerate(0.5);
|
||||
self:diffusealpha(0);
|
||||
end;
|
||||
InitCommand=cmd(zoom,0.45;strokecolor,Color("Outline");diffuse,textColor);
|
||||
GainFocusCommand=cmd(stoptweening;decelerate,0.5;diffusealpha,1);
|
||||
LoseFocusCommand=cmd(stoptweening;accelerate,0.5;diffusealpha,0);
|
||||
};
|
||||
end;
|
||||
|
||||
local previews = {
|
||||
WhereToFind = Def.ActorFrame{
|
||||
LoadActor(THEME:GetPathG("_howto","find"))..{
|
||||
InitCommand=function(self)
|
||||
self:zoomto(previewWidth, previewHeight);
|
||||
end;
|
||||
GainFocusCommand=function(self)
|
||||
self:stoptweening();
|
||||
self:decelerate(0.5);
|
||||
self:diffusealpha(1);
|
||||
end;
|
||||
LoseFocusCommand=function(self)
|
||||
self:stoptweening();
|
||||
self:accelerate(0.5);
|
||||
self:diffusealpha(0);
|
||||
end;
|
||||
InitCommand=cmd(zoomto,previewWidth,previewHeight);
|
||||
GainFocusCommand=cmd(stoptweening;decelerate,0.5;diffusealpha,1);
|
||||
LoseFocusCommand=cmd(stoptweening;accelerate,0.5;diffusealpha,0);
|
||||
};
|
||||
};
|
||||
HowToInstall = Def.ActorFrame{
|
||||
LoadActor(THEME:GetPathG("_howto","install"))..{
|
||||
InitCommand=function(self)
|
||||
self:zoomto(previewWidth, previewHeight);
|
||||
end;
|
||||
GainFocusCommand=function(self)
|
||||
self:stoptweening();
|
||||
self:decelerate(0.5);
|
||||
self:diffusealpha(1);
|
||||
end;
|
||||
LoseFocusCommand=function(self)
|
||||
self:stoptweening();
|
||||
self:accelerate(0.5);
|
||||
self:diffusealpha(0);
|
||||
end;
|
||||
InitCommand=cmd(zoomto,previewWidth,previewHeight);
|
||||
GainFocusCommand=cmd(stoptweening;decelerate,0.5;diffusealpha,1);
|
||||
LoseFocusCommand=cmd(stoptweening;accelerate,0.5;diffusealpha,0);
|
||||
};
|
||||
};
|
||||
AdditionalFolders = Def.ActorFrame{
|
||||
Def.Quad{
|
||||
InitCommand=function(self)
|
||||
self:zoomto(previewWidth, previewHeight);
|
||||
end;
|
||||
GainFocusCommand=function(self)
|
||||
self:stoptweening();
|
||||
self:decelerate(0.5);
|
||||
self:diffusealpha(1);
|
||||
end;
|
||||
LoseFocusCommand=function(self)
|
||||
self:stoptweening();
|
||||
self:accelerate(0.5);
|
||||
self:diffusealpha(0);
|
||||
end;
|
||||
InitCommand=cmd(zoomto,previewWidth,previewHeight);
|
||||
GainFocusCommand=cmd(stoptweening;decelerate,0.5;diffusealpha,1);
|
||||
LoseFocusCommand=cmd(stoptweening;accelerate,0.5;diffusealpha,0);
|
||||
};
|
||||
Def.Quad{
|
||||
InitCommand=function(self)
|
||||
self:y(-previewHeight * 0.45);
|
||||
self:diffuse(color("#E0F0F0"));
|
||||
self:zoomto(previewWidth, previewHeight * 0.1);
|
||||
end;
|
||||
GainFocusCommand=function(self)
|
||||
self:stoptweening();
|
||||
self:decelerate(0.5);
|
||||
self:diffusealpha(1);
|
||||
end;
|
||||
LoseFocusCommand=function(self)
|
||||
self:stoptweening();
|
||||
self:accelerate(0.5);
|
||||
self:diffusealpha(0);
|
||||
end;
|
||||
InitCommand=cmd(y,-previewHeight*0.45;diffuse,color("#E0F0F0");zoomto,previewWidth,previewHeight*0.1;);
|
||||
GainFocusCommand=cmd(stoptweening;decelerate,0.5;diffusealpha,1);
|
||||
LoseFocusCommand=cmd(stoptweening;accelerate,0.5;diffusealpha,0);
|
||||
};
|
||||
LoadFont("Common normal")..{
|
||||
InitCommand=function(self)
|
||||
self:x(SCREEN_CENTER_X * -0.4);
|
||||
self:y(SCREEN_CENTER_Y * -0.475);
|
||||
self:zoom(0.625);
|
||||
self:halign(0);
|
||||
self:valign(0);
|
||||
self:diffuse(color("#000000"));
|
||||
end;
|
||||
InitCommand=cmd(x,-(SCREEN_CENTER_X*0.4);y,-(SCREEN_CENTER_Y*0.475);zoom,0.625;halign,0;valign,0;diffuse,color("#000000"));
|
||||
BeginCommand=function(self)
|
||||
local text = "Preferences.ini";
|
||||
self:settext(text);
|
||||
end;
|
||||
GainFocusCommand=function(self)
|
||||
self:stoptweening();
|
||||
self:decelerate(0.5);
|
||||
self:diffusealpha(1);
|
||||
end;
|
||||
LoseFocusCommand=function(self)
|
||||
self:stoptweening();
|
||||
self:accelerate(0.5);
|
||||
self:diffusealpha(0);
|
||||
end;
|
||||
GainFocusCommand=cmd(stoptweening;decelerate,0.5;diffusealpha,1);
|
||||
LoseFocusCommand=cmd(stoptweening;accelerate,0.5;diffusealpha,0);
|
||||
};
|
||||
LoadFont("Common normal")..{
|
||||
Text="[Options]\nAdditionalCourseFolders=\nAdditionalFolders=\nAdditionalSongFolders=";
|
||||
InitCommand=function(self)
|
||||
self:x(SCREEN_CENTER_X * -0.4);
|
||||
self:y(SCREEN_CENTER_Y * -0.35);
|
||||
self:zoom(0.75);
|
||||
self:halign(0);
|
||||
self:valign(0);
|
||||
self:diffuse(color("#000000"));
|
||||
end;
|
||||
GainFocusCommand=function(self)
|
||||
self:stoptweening();
|
||||
self:decelerate(0.5);
|
||||
self:diffusealpha(1);
|
||||
end;
|
||||
LoseFocusCommand=function(self)
|
||||
self:stoptweening();
|
||||
self:accelerate(0.5);
|
||||
self:diffusealpha(0);
|
||||
end;
|
||||
InitCommand=cmd(x,-(SCREEN_CENTER_X*0.4);y,-(SCREEN_CENTER_Y*0.35);zoom,0.75;halign,0;valign,0;diffuse,color("#000000"));
|
||||
GainFocusCommand=cmd(stoptweening;decelerate,0.5;diffusealpha,1);
|
||||
LoseFocusCommand=cmd(stoptweening;accelerate,0.5;diffusealpha,0);
|
||||
};
|
||||
};
|
||||
ReloadSongs = Def.ActorFrame{
|
||||
LoadActor(THEME:GetPathB("ScreenTitleMenu","background/_bg"))..{
|
||||
InitCommand=function(self)
|
||||
self:zoomto(previewWidth, previewHeight);
|
||||
self:halign(0.5);
|
||||
self:valign(0.5);
|
||||
end;
|
||||
GainFocusCommand=function(self)
|
||||
self:stoptweening();
|
||||
self:decelerate(0.5);
|
||||
self:diffusealpha(1);
|
||||
end;
|
||||
LoseFocusCommand=function(self)
|
||||
self:stoptweening();
|
||||
self:accelerate(0.5);
|
||||
self:diffusealpha(0);
|
||||
end;
|
||||
InitCommand=cmd(zoomto,previewWidth,previewHeight;halign,0.5;valign,0.5);
|
||||
GainFocusCommand=cmd(stoptweening;decelerate,0.5;diffusealpha,1);
|
||||
LoseFocusCommand=cmd(stoptweening;accelerate,0.5;diffusealpha,0);
|
||||
};
|
||||
LoadFont("Common normal")..{
|
||||
InitCommand=function(self)
|
||||
self:zoom(0.4);
|
||||
self:maxwidth((previewWidth * 1.6) - 8);
|
||||
end;
|
||||
InitCommand=cmd(zoom,0.4;maxwidth,(previewWidth*1.6)-8);
|
||||
BeginCommand=function(self)
|
||||
local song = SONGMAN:GetRandomSong();
|
||||
self:settext("Loading songs...\n"..song:GetGroupName().."\n"..song:GetDisplayFullTitle());
|
||||
end;
|
||||
GainFocusCommand=function(self)
|
||||
self:stoptweening();
|
||||
self:decelerate(0.5);
|
||||
self:diffusealpha(1);
|
||||
end;
|
||||
LoseFocusCommand=function(self)
|
||||
self:stoptweening();
|
||||
self:accelerate(0.5);
|
||||
self:diffusealpha(0);
|
||||
end;
|
||||
GainFocusCommand=cmd(stoptweening;decelerate,0.5;diffusealpha,1);
|
||||
LoseFocusCommand=cmd(stoptweening;accelerate,0.5;diffusealpha,0);
|
||||
};
|
||||
};
|
||||
Exit = Def.ActorFrame{
|
||||
LoadActor(THEME:GetPathB("ScreenTitleMenu","background/_bg"))..{
|
||||
InitCommand=function(self)
|
||||
self:zoomto(previewWidth, previewHeight);
|
||||
self:halign(0.5);
|
||||
self:valign(0.5);
|
||||
end;
|
||||
GainFocusCommand=function(self)
|
||||
self:stoptweening();
|
||||
self:decelerate(0.5);
|
||||
self:diffusealpha(1);
|
||||
end;
|
||||
LoseFocusCommand=function(self)
|
||||
self:stoptweening();
|
||||
self:accelerate(0.5);
|
||||
self:diffusealpha(0);
|
||||
end;
|
||||
InitCommand=cmd(zoomto,previewWidth,previewHeight;halign,0.5;valign,0.5);
|
||||
GainFocusCommand=cmd(stoptweening;decelerate,0.5;diffusealpha,1);
|
||||
LoseFocusCommand=cmd(stoptweening;accelerate,0.5;diffusealpha,0);
|
||||
};
|
||||
LoadActor(THEME:GetPathG("ScreenTitleMenu","logo"))..{
|
||||
InitCommand=function(self)
|
||||
self:y(-28);
|
||||
self:zoom(0.35);
|
||||
self:propagate(true);
|
||||
end;
|
||||
GainFocusCommand=function(self)
|
||||
self:stoptweening();
|
||||
self:decelerate(0.5);
|
||||
self:diffusealpha(1);
|
||||
end;
|
||||
LoseFocusCommand=function(self)
|
||||
self:stoptweening();
|
||||
self:accelerate(0.5);
|
||||
self:diffusealpha(0);
|
||||
end;
|
||||
InitCommand=cmd(y,-28;zoom,0.35;propagate,true);
|
||||
GainFocusCommand=cmd(stoptweening;decelerate,0.5;diffusealpha,1);
|
||||
LoseFocusCommand=cmd(stoptweening;accelerate,0.5;diffusealpha,0);
|
||||
};
|
||||
TitleMenuItem("Game Start",true)..{
|
||||
InitCommand=function(self)
|
||||
self:y(20);
|
||||
end;
|
||||
InitCommand=cmd(y,20);
|
||||
};
|
||||
TitleMenuItem("Options")..{
|
||||
InitCommand=function(self)
|
||||
self:y(32);
|
||||
end;
|
||||
InitCommand=cmd(y,32);
|
||||
};
|
||||
TitleMenuItem("Edit/Share")..{
|
||||
InitCommand=function(self)
|
||||
self:y(44);
|
||||
end;
|
||||
InitCommand=cmd(y,44);
|
||||
};
|
||||
TitleMenuItem("Exit")..{
|
||||
InitCommand=function(self)
|
||||
self:y(56);
|
||||
end;
|
||||
InitCommand=cmd(y,56);
|
||||
};
|
||||
};
|
||||
};
|
||||
@@ -258,26 +113,9 @@ t[#t+1] = LoadFont("Common normal")..{
|
||||
--Text="The quick brown fox jumps over the lazy dog ".. Index .." times.";
|
||||
Text=Screen.String("Explanation-"..Name);
|
||||
-- was x,-(SCREEN_CENTER_X*0.4);y,SCREEN_CENTER_Y*0.525;
|
||||
InitCommand=function(self)
|
||||
self:x(SCREEN_CENTER_X * -0.8);
|
||||
self:y(SCREEN_CENTER_Y * 0.8);
|
||||
self:halign(0);
|
||||
self:valign(0);
|
||||
self:zoom(0.65);
|
||||
self:wrapwidthpixels((SCREEN_WIDTH * 0.55) * 1.75);
|
||||
self:NoStroke();
|
||||
self:shadowlength(1);
|
||||
end;
|
||||
GainFocusCommand=function(self)
|
||||
self:stoptweening();
|
||||
self:decelerate(0.5);
|
||||
self:diffusealpha(1);
|
||||
end;
|
||||
LoseFocusCommand=function(self)
|
||||
self:stoptweening();
|
||||
self:accelerate(0.5);
|
||||
self:diffusealpha(0);
|
||||
end;
|
||||
InitCommand=cmd(x,-(SCREEN_CENTER_X*0.8);y,SCREEN_CENTER_Y*0.8;halign,0;valign,0;zoom,0.65;wrapwidthpixels,(SCREEN_WIDTH*0.55)*1.75;NoStroke;shadowlength,1);
|
||||
GainFocusCommand=cmd(stoptweening;decelerate,0.5;diffusealpha,1);
|
||||
LoseFocusCommand=cmd(stoptweening;accelerate,0.5;diffusealpha,0);
|
||||
};
|
||||
|
||||
return t;
|
||||
Reference in New Issue
Block a user