Fix icons for installer images

iakov · iakov · commit 5da2f831983c · 2020-04-17T03:26:51.000-07:00
diff --git a/installer/config/trik-studio-linux-gnu64.xml b/installer/config/trik-studio-linux-gnu64.xml
@@ -8,8 +8,9 @@
 
     <ControlScript>../controlScript.qs</ControlScript>
 
-    <InstallerWindowIcon>../images/trik-studio.ico</InstallerWindowIcon>
-    <InstallerApplicationIcon>../images/trik-studio.ico</InstallerApplicationIcon>
+    <WizardStyle>Modern</WizardStyle>
+    <InstallerWindowIcon>../images/trik-studio-logo</InstallerWindowIcon>
+    <InstallerApplicationIcon>../images/trik-studio-logo</InstallerApplicationIcon>
     <Logo>../images/trik-studio-logo.png</Logo>
     <Watermark>../images/trik-studio-watermark.png</Watermark>
 
diff --git a/installer/config/trik-studio-mac.xml b/installer/config/trik-studio-mac.xml
@@ -8,8 +8,9 @@
 
     <ControlScript>../controlScript.qs</ControlScript>
 
-    <InstallerWindowIcon>../images/trik-studio.ico</InstallerWindowIcon>
-    <InstallerApplicationIcon>../images/trik-studio.ico</InstallerApplicationIcon>
+    <WizardStyle>Modern</WizardStyle>
+    <InstallerWindowIcon>../images/trik-studio</InstallerWindowIcon>
+    <InstallerApplicationIcon>../images/trik-studio</InstallerApplicationIcon>
     <Logo>../images/trik-studio-logo.png</Logo>
     <Watermark>../images/trik-studio-watermark.png</Watermark>
 
diff --git a/installer/config/trik-studio-win32.xml b/installer/config/trik-studio-win32.xml
@@ -8,8 +8,9 @@
 
     <ControlScript>../controlScript.qs</ControlScript>
 
-    <InstallerWindowIcon>../images/trik-studio.ico</InstallerWindowIcon>
-    <InstallerApplicationIcon>../images/trik-studio.ico</InstallerApplicationIcon>
+    <WizardStyle>Modern</WizardStyle>
+    <InstallerWindowIcon>../images/trik-studio</InstallerWindowIcon>
+    <InstallerApplicationIcon>../images/trik-studio</InstallerApplicationIcon>
     <Logo>../images/trik-studio-logo.png</Logo>
     <Watermark>../images/trik-studio-watermark.png</Watermark>
 
diff --git a/installer/images/trik-studio.icns b/installer/images/trik-studio.icns
diff --git a/installer/packages/qreal-base/ru.qreal.root/meta/installscript.qs b/installer/packages/qreal-base/ru.qreal.root/meta/installscript.qs
@@ -88,7 +88,7 @@ Component.prototype.createOperations = function()
 				, "--clear-conf");
 	} else if (installer.value("os") == "mac") {
 		component.addOperation("Execute"
-				, "@TargetDir@/" + installer.value("ProductName") + ".app/Contents/MacOS/" + installer.executableName, "--platform minimal --clear-conf");
+				, "@TargetDir@/" + installer.value("ProductName") + ".app/Contents/MacOS/" + installer.executableName, "--clear-conf");
 	} else {
 		component.addOperation("Execute"
 				, "bash"
