Added to the MSI installer a property to set the default PDF version …

…in the settings panel combo box
torakiki · Oct 25, 2024 · e8e9496 · e8e9496
1 parent b97bf1c
commit e8e9496
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/pdfsam-basic/src/msi/CA/AddLine/AddLine/CustomAction.cs b/pdfsam-basic/src/msi/CA/AddLine/AddLine/CustomAction.cs
@@ -21,13 +21,20 @@ public static ActionResult AddLine(Session session)
                     File.AppendAllText(path, "java-options=-Dorg.pdfsam.default.fetch.premium.modules=" + session.CustomActionData["premium"] + Environment.NewLine);
                     File.AppendAllText(path, "java-options=-Dorg.pdfsam.default.compression=" + session.CustomActionData["compression"] + Environment.NewLine);
                     File.AppendAllText(path, "java-options=-Dorg.pdfsam.default.output.overwrite=" + session.CustomActionData["overwrite"] + Environment.NewLine);
-                    if (session.CustomActionData.ContainsKey("prefix")) { 
+                    if (session.CustomActionData.ContainsKey("prefix")) {
                         string prefix = session.CustomActionData["prefix"];
                         if (!string.IsNullOrEmpty(prefix))
                         {
                             File.AppendAllText(path, "java-options=-Dorg.pdfsam.default.prefix=" + prefix + Environment.NewLine);
                         }
                     }
+                    if (session.CustomActionData.ContainsKey("pdfversion")) {
+                        string pdfversion = session.CustomActionData["pdfversion"];
+                        if (!string.IsNullOrEmpty(pdfversion))
+                        {
+                            File.AppendAllText(path, "java-options=-Dorg.pdfsam.default.pdf.version=" + pdfversion + Environment.NewLine);
+                        }
+                    }
             }
             else   
                 {

diff --git a/pdfsam-basic/src/msi/SignDll.cmd b/pdfsam-basic/src/msi/SignDll.cmd
@@ -2,7 +2,7 @@ ECHO OFF
 
 IF NOT EXIST "AddLine.CA.dll" GOTO error
 attrib -r "AddLine.CA.dll"
-"signtool.exe" sign /v /debug /fd sha256 /td sha256 /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp /sha1 "%SIGN_CERT_FINGERPRINT%" "AddLine.CA.dll"
+"signtool.exe" sign /v /debug /fd sha256 /td sha256 /tr http://timestamp.sectigo.com /sha1 "%SIGN_CERT_FINGERPRINT%" "AddLine.CA.dll"
 if %ERRORLEVEL% NEQ 0 goto error
 ECHO "Dll signed"
 

diff --git a/pdfsam-basic/src/msi/pdfsam.wxs b/pdfsam-basic/src/msi/pdfsam.wxs
@@ -22,10 +22,11 @@
 		<Property Id="PDF_COMPRESSION" Value="true" Secure="yes"/>
 		<Property Id="OVERWRITE_OUTPUT" Value="false" Secure="yes"/>
 		<Property Id="PREFIX" Secure="yes"/>
+		<Property Id="PDF_VERSION" Secure="yes"/>
 
 	    <Icon Id="pdfsam.ico" SourceFile="$(var.ProductIcon)" />
 		<Binary Id="AddLine.dll" SourceFile="AddLine.CA.dll" />
-		<CustomAction Id="SetCustomActionDataValue" Return="check" Property="CustomActions.AddLine" Value="locale=[LOCALE_CODE];updates=[CHECK_FOR_UPDATES];sounds=[PLAY_SOUNDS];news=[CHECK_FOR_NEWS];premium=[PREMIUM_MODULES];donate=[DONATE_NOTIFICATION];folder=[APPLICATIONFOLDER];compression=[PDF_COMPRESSION];overwrite=[OVERWRITE_OUTPUT];prefix=[PREFIX]" />
+		<CustomAction Id="SetCustomActionDataValue" Return="check" Property="CustomActions.AddLine" Value="locale=[LOCALE_CODE];updates=[CHECK_FOR_UPDATES];sounds=[PLAY_SOUNDS];news=[CHECK_FOR_NEWS];premium=[PREMIUM_MODULES];donate=[DONATE_NOTIFICATION];folder=[APPLICATIONFOLDER];compression=[PDF_COMPRESSION];overwrite=[OVERWRITE_OUTPUT];prefix=[PREFIX];pdfversion=[PDF_VERSION]" />
 		<CustomAction Id="CustomActions.AddLine" Return="check" Execute="deferred" BinaryKey="AddLine.dll" DllEntry="AddLine" Impersonate="no"/>
 
 		<MajorUpgrade DowngradeErrorMessage="A newer version of PDFsam Basic is already installed. Setup will now exit." />