Update v0.8.9-beta

LilyStilson · May 3, 2021 · 8b2f31b · 8b2f31b
1 parent 784ff4e
commit 8b2f31b
Show file tree

Hide file tree

Showing 22 changed files with 14,922 additions and 11,991 deletions.
diff --git a/src/AErender_Launcher.deployproj b/src/AErender_Launcher.deployproj
@@ -3,19 +3,14 @@
     <ProjectExtensions>
         <ProjectFileVersion>12</ProjectFileVersion>
     </ProjectExtensions>
-    <PropertyGroup/>
+    <PropertyGroup>
+        <DeviceId Condition="'$(Platform)'=='Android'"/>
+        <DeviceId Condition="'$(Platform)'=='Android64'"/>
+        <DeviceId Condition="'$(Platform)'=='iOSDevice64'"/>
+        <DeviceId Condition="'$(Platform)'=='iOSSimulator'"/>
+    </PropertyGroup>
     <ItemGroup Condition="'$(Platform)'=='iOSDevice64'"/>
     <ItemGroup Condition="'$(Platform)'=='Win64'">
-        <DeployFile Include="Win64\Beta\AErender_Launcher.exe" Condition="'$(Config)'=='Beta'">
-            <RemoteDir>AErender_Launcher\</RemoteDir>
-            <RemoteName>AErender_Launcher.exe</RemoteName>
-            <DeployClass>ProjectOutput</DeployClass>
-            <Operation>0</Operation>
-            <LocalCommand/>
-            <RemoteCommand/>
-            <Overwrite>True</Overwrite>
-            <Required>True</Required>
-        </DeployFile>
         <DeployFile Include="..\lang\ru-RU.aerlang" Condition="'$(Config)'=='Beta'">
             <RemoteDir>AErender_Launcher\</RemoteDir>
             <RemoteName>ru-RU.aerlang</RemoteName>
@@ -62,6 +57,16 @@
             <Overwrite>True</Overwrite>
             <Required>True</Required>
         </DeployFile>
+        <DeployFile Include="Win64\Beta\AErender_Launcher.exe" Condition="'$(Config)'=='Beta'">
+            <RemoteDir>AErender_Launcher\</RemoteDir>
+            <RemoteName>AErender_Launcher.exe</RemoteName>
+            <DeployClass>ProjectOutput</DeployClass>
+            <Operation>0</Operation>
+            <LocalCommand/>
+            <RemoteCommand/>
+            <Overwrite>True</Overwrite>
+            <Required>True</Required>
+        </DeployFile>
     </ItemGroup>
     <ItemGroup Condition="'$(Platform)'=='Win32'">
         <DeployFile Include="..\icons\png\resized_uwp\icon_uwp_150.png" Condition="'$(Config)'=='Beta'">

diff --git a/src/AErender_Launcher.dpr b/src/AErender_Launcher.dpr
@@ -44,14 +44,13 @@ uses
   OutputModuleEditorUnit in 'OutputModuleEditorUnit.pas' {OutputModuleEditorForm},
   {$IFDEF MACOS}
   Mac.CodeBlocks in 'lib\Mac.CodeBlocks.pas',
-  {$ENDIF MACOS}
-  {$IFDEF MSWINDOWS}
+  Macapi.Dialogs in 'lib\Macapi.Dialogs.pas',
+  {$ELSE MSWINDOWS}
   FMX.Taskbar in 'lib\FMX.Taskbar.pas',
-  {$ENDIF MSWINDOWS}
-  MathExpParser in 'MathExpParser.pas',
-  AErenderDataParser in '..\..\AErender Parser\AErenderDataParser.pas',
-  AErenderLauncherLocalization in 'lib\AErenderLauncherLocalization.pas',
-  MacApi.Dialogs in 'lib\MacApi.Dialogs.pas';
+  {$ENDIF}
+  AErenderLauncher.Localization in 'lib\AErenderLauncher.Localization.pas',
+  AErenderLauncher.AerenderParser in 'lib\AErenderLauncher.AerenderParser.pas',
+  AErenderLauncher.Math.ExpParser in 'lib\AErenderLauncher.Math.ExpParser.pas';
 
 {$R *.res}
 

diff --git a/src/AErender_Launcher.dproj b/src/AErender_Launcher.dproj
diff --git a/src/AErender_Launcher.res b/src/AErender_Launcher.res
diff --git a/src/AboutUnit.fmx b/src/AboutUnit.fmx
diff --git a/src/AboutUnit.pas b/src/AboutUnit.pas
@@ -54,7 +54,6 @@ interface
 type
   TAboutForm = class(TForm)
     Image1: TImage;
-    LauncherLabel: TLabel;
     AuthorsLabel: TLabel;
     DescriptionLabel: TLabel;
     FromRussiaWithLoveLabel: TLabel;
@@ -64,6 +63,9 @@   TAboutForm = class(TForm)
     GridPanelLayout1: TGridPanelLayout;
     GridPanelLayout2: TGridPanelLayout;
     LogoRotationAnim: TFloatAnimation;
+    Layout1: TLayout;
+    Path2: TPath;
+    LauncherLabel: TLabel;
     procedure WebsiteLabelClick(Sender: TObject);
     procedure FormShow(Sender: TObject);
     procedure Image1DblClick(Sender: TObject);
@@ -111,7 +113,7 @@ procedure TAboutForm.SetLanguage(LanguageCode: Integer);
 
 procedure TAboutForm.FormShow(Sender: TObject);
 begin
-  LauncherLabel.Text := 'AErender Launcher (' + APPVERSION + ')';
+  LauncherLabel.Text := '(' + APPVERSION + ')';
   if MainUnit.FFMPEG then
     begin
       FFmpegLabel.FontColor := $FF1E90FF;
@@ -132,10 +134,10 @@ procedure TAboutForm.Image1DblClick(Sender: TObject);
 procedure TAboutForm.WebsiteLabelClick(Sender: TObject);
 begin
   {$IFDEF MSWINDOWS}
-    ShellExecute(0, 'open', PWideChar('http://aerenderlauncher.com'), nil, nil, SW_SHOW);
+    ShellExecute(0, 'open', PWideChar('https://aerenderlauncher.com'), nil, nil, SW_SHOW);
   {$ENDIF MSWINDOWS}
   {$IFDEF MACOS}
-    _system(PAnsiChar('open ' + AnsiString('"' + 'http://aerenderlauncher.com' + '"')));
+    _system(PAnsiChar('open ' + AnsiString('"' + 'https://aerenderlauncher.com' + '"')));
   {$ENDIF MACOS}
 end;
 

diff --git a/src/HelpUnit.fmx b/src/HelpUnit.fmx
@@ -30,18 +30,18 @@ object HelpForm: THelpForm
   end
   object Contents: TListBox
     Align = Left
-    Position.Y = 33.000000000000000000
+    Position.Y = 32.000000000000000000
     Size.Width = 200.000000000000000000
-    Size.Height = 567.000000000000000000
+    Size.Height = 568.000000000000000000
     Size.PlatformDefault = False
     TabOrder = 3
     DisableFocusEffect = True
     DefaultItemStyles.ItemStyle = ''
     DefaultItemStyles.GroupHeaderStyle = ''
     DefaultItemStyles.GroupFooterStyle = ''
     OnChange = ContentsChange
-    Viewport.Width = 200.000000000000000000
-    Viewport.Height = 567.000000000000000000
+    Viewport.Width = 196.000000000000000000
+    Viewport.Height = 564.000000000000000000
     object ListBoxGroupHeader1: TListBoxGroupHeader
       Selectable = False
       TabOrder = 0
@@ -128,23 +128,23 @@ object HelpForm: THelpForm
   end
   object WebBrowser1: TWebBrowser
     Align = Client
-    Size.Width = 750.000000000000000000
-    Size.Height = 567.000000000000000000
+    Size.Width = 734.000000000000000000
+    Size.Height = 568.000000000000000000
     Size.PlatformDefault = False
   end
   object Toolbar: TToolBar
     Size.Width = 960.000000000000000000
-    Size.Height = 33.000000000000000000
+    Size.Height = 32.000000000000000000
     Size.PlatformDefault = False
     TabOrder = 6
     object Title: TLabel
       Align = Left
       AutoSize = True
       StyledSettings = [Family, FontColor]
-      Margins.Left = 20.000000000000000000
-      Position.X = 20.000000000000000000
+      Margins.Left = 16.000000000000000000
+      Position.X = 16.000000000000000000
       Size.Width = 183.000000000000000000
-      Size.Height = 33.000000000000000000
+      Size.Height = 32.000000000000000000
       Size.PlatformDefault = False
       TextSettings.Font.Size = 16.000000000000000000
       TextSettings.Font.StyleExt = {00070000000000000004000000}
@@ -159,10 +159,12 @@ object HelpForm: THelpForm
     Align = Left
     Cursor = crHSplit
     MinSize = 20.000000000000000000
-    Position.X = 200.000000000000000000
-    Position.Y = 33.000000000000000000
+    Margins.Left = 8.000000000000000000
+    Margins.Right = 8.000000000000000000
+    Position.X = 208.000000000000000000
+    Position.Y = 32.000000000000000000
     Size.Width = 10.000000000000000000
-    Size.Height = 567.000000000000000000
+    Size.Height = 568.000000000000000000
     Size.PlatformDefault = False
   end
 end