Update v0.8.5-beta.

LilyStilson · Oct 1, 2020 · ab79d96 · ab79d96
1 parent 2a560e9
commit ab79d96
Show file tree

Hide file tree

Showing 15 changed files with 2,232 additions and 1,855 deletions.
diff --git a/lang/en-US.aerlang b/lang/en-US.aerlang
@@ -138,6 +138,7 @@
             "outputIsEmpty": "Output path is not specified",
             "compositionIsEmpty": "Composition name is not specified",
             "multiCompIsEmpty": "Not all compositions names are specified in composition list",
+            "tooManyThreads": "Too many rendering threads selected (limit is 128)",
             "isCurrentlyRendering": "Rendering is already in progress! Wait untill current rendering finshes. Rendering progress window will open.",
             "IncompatibleFile": "Selected file is not compatible with AErender Launcher. Please, provide proper .aer / .xml file for import!"
         }

diff --git a/lang/lang-template.aerlang b/lang/lang-template.aerlang
@@ -138,6 +138,7 @@
             "outputIsEmpty": "",
             "compositionIsEmpty": "",
             "multiCompIsEmpty": "",
+            "tooManyThreads": "",
             "isCurrentlyRendering": "",
             "IncompatibleFile": ""
         }

diff --git a/lang/ru-RU.aerlang b/lang/ru-RU.aerlang
@@ -138,6 +138,7 @@
             "outputIsEmpty": "Выходной путь не указан",
             "compositionIsEmpty": "Название композиции не указано",
             "multiCompIsEmpty": "Названия не всех композиций указаны в списке",
+            "tooManyThreads": "Слишком много потоков рендеринга указано (максимум - 128)",
             "isCurrentlyRendering": "Рендеринг уже в процессе! Дождитесь, пока текущий рендеринг завершится. Окно прогресса будет открыто.",
             "IncompatibleFile": "Выбранный файл несовместим с AErender Launcher. Пожалуйста, укажите корректный .aer / .xml файл для импорта!"
         }

diff --git a/src/AErender_Launcher.deployproj b/src/AErender_Launcher.deployproj
@@ -25,7 +25,7 @@
             <RemoteCommand/>
             <Overwrite>True</Overwrite>
         </DeployFile>
-        <DeployFile Include="..\icons\png\uwp\icon_uwp_44.png" Condition="'$(Config)'=='Beta'">
+        <DeployFile Include="..\icons\png\resized_uwp\icon_uwp_44.png" Condition="'$(Config)'=='Beta'">
             <RemoteDir>AErender_Launcher\Assets\</RemoteDir>
             <RemoteName>Logo44x44.png</RemoteName>
             <DeployClass>UWP_DelphiLogo44</DeployClass>
@@ -34,6 +34,15 @@
             <RemoteCommand/>
             <Overwrite>True</Overwrite>
         </DeployFile>
+        <DeployFile Include="..\icons\png\resized_uwp\icon_uwp_150.png" Condition="'$(Config)'=='Beta'">
+            <RemoteDir>AErender_Launcher\Assets\</RemoteDir>
+            <RemoteName>Logo150x150.png</RemoteName>
+            <DeployClass>UWP_DelphiLogo150</DeployClass>
+            <Operation>1</Operation>
+            <LocalCommand/>
+            <RemoteCommand/>
+            <Overwrite>True</Overwrite>
+        </DeployFile>
         <DeployFile Include="..\lang\en-US.aerlang" Condition="'$(Config)'=='Beta'">
             <RemoteDir>AErender_Launcher\</RemoteDir>
             <RemoteName>en-US.aerlang</RemoteName>
@@ -53,18 +62,9 @@
             <Overwrite>True</Overwrite>
             <Required>True</Required>
         </DeployFile>
-        <DeployFile Include="..\icons\png\uwp\icon_uwp_150.png" Condition="'$(Config)'=='Beta'">
-            <RemoteDir>AErender_Launcher\Assets\</RemoteDir>
-            <RemoteName>Logo150x150.png</RemoteName>
-            <DeployClass>UWP_DelphiLogo150</DeployClass>
-            <Operation>1</Operation>
-            <LocalCommand/>
-            <RemoteCommand/>
-            <Overwrite>True</Overwrite>
-        </DeployFile>
     </ItemGroup>
     <ItemGroup Condition="'$(Platform)'=='Win32'">
-        <DeployFile Include="..\icons\png\uwp\icon_uwp_150.png" Condition="'$(Config)'=='Beta'">
+        <DeployFile Include="..\icons\png\resized_uwp\icon_uwp_150.png" Condition="'$(Config)'=='Beta'">
             <RemoteDir>AErender_Launcher\Assets\</RemoteDir>
             <RemoteName>Logo150x150.png</RemoteName>
             <DeployClass>UWP_DelphiLogo150</DeployClass>
@@ -73,15 +73,6 @@
             <RemoteCommand/>
             <Overwrite>True</Overwrite>
         </DeployFile>
-        <DeployFile Include="E:\AErender CC\icon_UWP_44.png" Condition="'$(Config)'=='Release'">
-            <RemoteDir>AErender_Launcher\Assets\</RemoteDir>
-            <RemoteName>Logo44x44.png</RemoteName>
-            <DeployClass>UWP_DelphiLogo44</DeployClass>
-            <Operation>1</Operation>
-            <LocalCommand/>
-            <RemoteCommand/>
-            <Overwrite>True</Overwrite>
-        </DeployFile>
         <DeployFile Include="..\lang\en-US.aerlang" Condition="'$(Config)'=='Beta'">
             <RemoteDir>AErender_Launcher\</RemoteDir>
             <RemoteName>en-US.aerlang</RemoteName>
@@ -91,7 +82,7 @@
             <RemoteCommand/>
             <Overwrite>True</Overwrite>
         </DeployFile>
-        <DeployFile Include="..\icons\png\uwp\icon_uwp_44.png" Condition="'$(Config)'=='Beta'">
+        <DeployFile Include="..\icons\png\resized_uwp\icon_uwp_44.png" Condition="'$(Config)'=='Beta'">
             <RemoteDir>AErender_Launcher\Assets\</RemoteDir>
             <RemoteName>Logo44x44.png</RemoteName>
             <DeployClass>UWP_DelphiLogo44</DeployClass>
@@ -109,15 +100,6 @@
             <RemoteCommand/>
             <Overwrite>True</Overwrite>
         </DeployFile>
-        <DeployFile Include="E:\AErender CC\icon_UWP_150.png" Condition="'$(Config)'=='Release'">
-            <RemoteDir>AErender_Launcher\Assets\</RemoteDir>
-            <RemoteName>Logo150x150.png</RemoteName>
-            <DeployClass>UWP_DelphiLogo150</DeployClass>
-            <Operation>1</Operation>
-            <LocalCommand/>
-            <RemoteCommand/>
-            <Overwrite>True</Overwrite>
-        </DeployFile>
         <DeployFile Include="Win32\Beta\AErender_Launcher.exe" Condition="'$(Config)'=='Beta'">
             <RemoteDir>AErender_Launcher\</RemoteDir>
             <RemoteName>AErender_Launcher.exe</RemoteName>
@@ -231,15 +213,6 @@
             <RemoteCommand/>
             <Overwrite>True</Overwrite>
         </DeployFile>
-        <DeployFile Include="E:\AErender CC\AErender.icns" Condition="'$(Config)'=='Debug'">
-            <RemoteDir>AErender_Launcher.app\Contents\Resources\</RemoteDir>
-            <RemoteName>AErenderLauncher.icns</RemoteName>
-            <DeployClass>ProjectOSXResource</DeployClass>
-            <Operation>1</Operation>
-            <LocalCommand/>
-            <RemoteCommand/>
-            <Overwrite>True</Overwrite>
-        </DeployFile>
         <DeployFile Include="$(BDS)\Redist\osx64\libcgsqlite3.dylib">
             <RemoteDir>AErender_Launcher.app\Contents\MacOS\</RemoteDir>
             <RemoteName>libcgsqlite3.dylib</RemoteName>

diff --git a/src/AErender_Launcher.dpr b/src/AErender_Launcher.dpr
@@ -44,17 +44,14 @@ uses
   OutputModuleEditorUnit in 'OutputModuleEditorUnit.pas' {OutputModuleEditorForm},
   {$IFDEF MACOS}
   Mac.CodeBlocks in 'lib\Mac.CodeBlocks.pas',
-  Mac.NativeNotifications in 'lib\Mac.NativeNotifications.pas',
-  MacApi.Dialogs in 'lib\MacApi.Dialogs.pas',
-  Macapi.Notifications in 'lib\Macapi.Notifications.pas',
   {$ENDIF MACOS}
   {$IFDEF 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';
-
+  AErenderLauncherLocalization in 'lib\AErenderLauncherLocalization.pas',
+  MacApi.Dialogs in 'lib\MacApi.Dialogs.pas';
 
 {$R *.res}
 

diff --git a/src/AErender_Launcher.dproj b/src/AErender_Launcher.dproj
@@ -5,7 +5,7 @@
         <Config Condition="'$(Config)'==''">Beta</Config>
         <FrameworkType>FMX</FrameworkType>
         <MainSource>AErender_Launcher.dpr</MainSource>
-        <Platform Condition="'$(Platform)'==''">Win64</Platform>
+        <Platform Condition="'$(Platform)'==''">Win32</Platform>
         <ProjectGuid>{C2DB1030-533B-41FD-8468-632CB85028C7}</ProjectGuid>
         <ProjectVersion>19.0</ProjectVersion>
         <TargetedPlatforms>4099</TargetedPlatforms>
@@ -299,7 +299,7 @@
         <Manifest_File>..\(None)</Manifest_File>
         <VerInfo_Build>5</VerInfo_Build>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
-        <VerInfo_Keys>CFBundleVersion=0.8.5;NSHighResolutionCapable=true;NSCalendarsUsageDescription=Not used;NSRemindersUsageDescription=Not used;NSCameraUsageDescription=Not used;NSMicrophoneUsageDescription=Not used;NSMotionUsageDescription=Not used;NSDesktopFolderUsageDescription=Not used;NSDocumentsFolderUsageDescription=Not used;NSDownloadsFolderUsageDescription=Not used;NSNetworkVolumesUsageDescription=Not used;NSRemovableVolumesUsageDescription=Not used;NSSpeechRecognitionUsageDescription=Not used;CFBundleShortVersionString=0.8.5</VerInfo_Keys>
+        <VerInfo_Keys>CFBundleVersion=0.8.5;NSHighResolutionCapable=true;NSCalendarsUsageDescription=Not used;NSRemindersUsageDescription=Not used;NSCameraUsageDescription=Not used;NSMicrophoneUsageDescription=Not used;NSMotionUsageDescription=Not used;NSDesktopFolderUsageDescription=Not used;NSDocumentsFolderUsageDescription=Data saving;NSDownloadsFolderUsageDescription=Not used;NSNetworkVolumesUsageDescription=Not used;NSRemovableVolumesUsageDescription=Not used;NSSpeechRecognitionUsageDescription=Not used;CFBundleShortVersionString=0.8.5</VerInfo_Keys>
         <VerInfo_MajorVer>0</VerInfo_MajorVer>
         <VerInfo_MinorVer>8</VerInfo_MinorVer>
     </PropertyGroup>
@@ -308,10 +308,10 @@
         <Icns_MainIcns>..\icons\platform\Launcher2020.icns</Icns_MainIcns>
         <Icon_MainIcon>..\icons\platform\Launcher2020.ico</Icon_MainIcon>
         <VerInfo_AutoIncVersion>true</VerInfo_AutoIncVersion>
-        <VerInfo_Build>19</VerInfo_Build>
+        <VerInfo_Build>23</VerInfo_Build>
         <VerInfo_Debug>true</VerInfo_Debug>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
-        <VerInfo_Keys>CompanyName=Night Sky Studio;FileDescription=AErender Launcher;FileVersion=0.8.5.19;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.NightSkyStudio.AErenderLauncher;ProductName=AErender Launcher;ProductVersion=0.8.0;Comments=;PrivateBuild=v0.8.0-beta</VerInfo_Keys>
+        <VerInfo_Keys>CompanyName=Night Sky Studio;FileDescription=AErender Launcher;FileVersion=0.8.5.23;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.NightSkyStudio.AErenderLauncher;ProductName=AErender Launcher;ProductVersion=0.8.0;Comments=;PrivateBuild=v0.8.0-beta</VerInfo_Keys>
         <VerInfo_Locale>1033</VerInfo_Locale>
         <VerInfo_MajorVer>0</VerInfo_MajorVer>
         <VerInfo_MinorVer>8</VerInfo_MinorVer>
@@ -327,9 +327,9 @@
         <Icon_MainIcon>..\icons\platform\Launcher2020.ico</Icon_MainIcon>
         <Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
         <VerInfo_AutoIncVersion>true</VerInfo_AutoIncVersion>
-        <VerInfo_Build>4</VerInfo_Build>
+        <VerInfo_Build>7</VerInfo_Build>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
-        <VerInfo_Keys>CompanyName=Night Sky Studio;FileDescription=AErender Launcher;FileVersion=0.8.5.4;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.NightSkyStudio.AErenderLauncher;ProductName=AErender Launcher;ProductVersion=0.8.5;Comments=;PrivateBuild=v0.8.5-beta</VerInfo_Keys>
+        <VerInfo_Keys>CompanyName=Night Sky Studio;FileDescription=AErender Launcher;FileVersion=0.8.5.7;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.NightSkyStudio.AErenderLauncher;ProductName=AErender Launcher;ProductVersion=0.8.5;Comments=;PrivateBuild=v0.8.5-beta</VerInfo_Keys>
         <VerInfo_Locale>1033</VerInfo_Locale>
         <VerInfo_MajorVer>0</VerInfo_MajorVer>
         <VerInfo_MinorVer>8</VerInfo_MinorVer>
@@ -404,6 +404,7 @@
         <DCCReference Include="MathExpParser.pas"/>
         <DCCReference Include="..\..\AErender Parser\AErenderDataParser.pas"/>
         <DCCReference Include="lib\AErenderLauncherLocalization.pas"/>
+        <DCCReference Include="lib\MacApi.Dialogs.pas"/>
         <RcItem Include="..\lang\en-US.aerlang">
             <ContainerId>ResourceItem</ContainerId>
             <ResourceType>RCDATA</ResourceType>
@@ -453,6 +454,12 @@
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
+                <DeployFile LocalName="..\icons\platform\Launcher2020.icns" Configuration="Beta" Class="ProjectOSXResource">
+                    <Platform Name="OSX64">
+                        <RemoteName>AErender_Launcher.icns</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
                 <DeployFile LocalName="..\icons\png\resized_uwp\icon_uwp_150.png" Configuration="Beta" Class="UWP_DelphiLogo150">
                     <Platform Name="Win32">
                         <RemoteDir>Assets\</RemoteDir>

diff --git a/src/AErender_Launcher.res b/src/AErender_Launcher.res
diff --git a/src/ImportUnit.fmx b/src/ImportUnit.fmx
@@ -166,8 +166,8 @@ object ImportForm: TImportForm
         ShowCheckboxes = True
         OnChange = compositionsChange
         OnChangeCheck = compositionsChangeCheck
-        Viewport.Width = 302.000000000000000000
-        Viewport.Height = 269.000000000000000000
+        Viewport.Width = 306.000000000000000000
+        Viewport.Height = 273.000000000000000000
       end
     end
   end
@@ -201,7 +201,7 @@ object ImportForm: TImportForm
         Size.Height = 17.000000000000000000
         Size.PlatformDefault = False
         Text = 'Name: '
-        TabOrder = 6
+        TabOrder = 5
       end
       object compResolution: TLabel
         Align = Top

diff --git a/src/ImportUnit.pas b/src/ImportUnit.pas
@@ -298,7 +298,11 @@ procedure TImportForm.FormShow(Sender: TObject);
       end
     else
       begin
+        {$IFDEF MSWINDOWS}
         XMLFile.Text := ExtractFileName(MainForm.XMLOpenDialog.FileName);
+        {$ELSE}
+        XMLFile.Text := ExtractFileName(ImportedPath);
+        {$ENDIF}
         XMLDocument.LoadFromFile(MainForm.XMLOpenDialog.FileName);
       end;
 
@@ -314,8 +318,8 @@ procedure TImportForm.FormShow(Sender: TObject);
       compositions.Items.Add(RootNode.ChildNodes['compositions'].ChildNodes[i].ChildNodes['name'].Text);
   except
     on Exception do begin
-      if TDialogServiceSync.MessageDialog(Language[LANG].Errors.IncompatibleFile, TMsgDlgType.mtError, [TMsgDlgBtn.mbOK], TMsgDlgBtn.mbOK, 0) = 0 then
-        ImportForm.Close;
+      TDialogServiceSync.MessageDialog(Language[LANG].Errors.IncompatibleFile, TMsgDlgType.mtError, [TMsgDlgBtn.mbOK], TMsgDlgBtn.mbOK, 0);
+      ImportForm.Close;
     end;
   end;
 end;