Merge branch 'develop_PDFReaderProNew' of git.kdan.cc:Mac_PDF/PDF_Office into develop_PDFReaderProNew

PDF Office/PDF Master/Class/ChromiumTabs/KMBrowserWindowController.swift

@@ -1562,9 +1562,9 @@ extension KMBrowserWindowController: KMSystemFileMenuProtocol {
             }
         }
     }
-    @IBAction func screenShot_FullScreenDelay(_ sender: Any?) {
+    @IBAction func screenShot_FullScreenDelay(_ sender: Any?) {//不延迟
         KMPrint("screenShot_FullScreenDelay")
-        KMScreenShotHandler.beginScreenShot_FullSreenWithDelayTime(3) { ima in
+        KMScreenShotHandler.beginScreenShot_FullSreenWithDelayTime(0) { ima in
             if let image = ima {
                 DispatchQueue.main.asyncAfter(deadline: .now() + 0.01) {
                     let folderPath = self.createBaseFoldPath()
@@ -1586,9 +1586,9 @@ extension KMBrowserWindowController: KMSystemFileMenuProtocol {
             }
         }
     }
-    @IBAction func screenShot_FullScreen(_ sender: Any?) {
+    @IBAction func screenShot_FullScreen(_ sender: Any?) {//延迟3秒
         KMPrint("screenShot_FullScreen")
-        KMScreenShotHandler.beginScreenShot_FullSreenWithDelayTime(0) { ima in
+        KMScreenShotHandler.beginScreenShot_FullSreenWithDelayTime(3) { ima in
             if let image = ima {
                 DispatchQueue.main.asyncAfter(deadline: .now() + 0.01) {
                     let folderPath = self.createBaseFoldPath()

PDF Office/PDF Master/Class/Common/OC/StatusBar/KMStatusBar.m

@@ -206,7 +206,7 @@
 }
 
 - (void)screenshotFromEntireItemAction:(id)sender {
-    [[self fetchBrowserWindowC] screenShot_FullScreen:nil];
+    [[self fetchBrowserWindowC] screenShot_FullScreenDelay:nil];
 }
 
 - (void)preferencesItemAction:(id)sender {

PDF Office/PDF Master/Strings/de.lproj/Localizable.strings

@@ -2797,3 +2797,5 @@
 /* Class = "NSTabViewItem"; label = "Summary"; ObjectID = "94"; */
 "Summary" = "Zusammenfassung";
 
+"This PDF has password protect." = "Dies ist ein verschlüsseltes Dokument.";
+"The password is invalid !" = "Ungültiges Passwort";

PDF Office/PDF Master/Strings/en.lproj/Localizable.strings

@@ -4020,3 +4020,6 @@
 "Strikethrough" = "Strikethrough";
 "Line" = "Line";
 "Close Current Tab" = "Close Tab";
+
+"This PDF has password protect." = "This PDF has password protect.";
+"The password is invalid !" = "The password is invalid !";

PDF Office/PDF Master/Strings/es.lproj/Localizable.strings

@@ -2888,3 +2888,7 @@
 
 /* Class = "NSTabViewItem"; label = "Summary"; ObjectID = "94"; */
 "Summary" = "Resumen";
+
+
+"This PDF has password protect." = "Este es un documento cifrado.";
+"The password is invalid !" = "Contraseña invalida";

PDF Office/PDF Master/Strings/fr.lproj/Localizable.strings

@@ -2759,3 +2759,6 @@
 
 /* Class = "NSTabViewItem"; label = "Summary"; ObjectID = "94"; */
 "Summary" = "Récapitulatif";
+
+"This PDF has password protect." = "Il s'agit d'un document crypté.";
+"The password is invalid !" = "Mot de passe incorrect";

PDF Office/PDF Master/Strings/it.lproj/Localizable.strings

@@ -2685,3 +2685,6 @@
 /* Class = "NSTabViewItem"; label = "Summary"; ObjectID = "94"; */
 "Summary" = "Riepilogo";
 
+
+"This PDF has password protect." = "Questo è un documento crittografato.";
+"The password is invalid !" = "Password non valida";

PDF Office/PDF Master/Strings/ja.lproj/Localizable.strings

@@ -2951,3 +2951,7 @@
 
 // Class = "NSTabViewItem"; label = "Summary"; ObjectID = "94";
 "Summary" = "概要";
+
+
+"This PDF has password protect." = "これは暗号化された文書です。";
+"The password is invalid !" = "無効なパスワード";

PDF Office/PDF Master/Strings/nl.lproj/Localizable.strings

@@ -2962,3 +2962,6 @@
 
 /* Class = "NSTabViewItem"; label = "Summary"; ObjectID = "94"; */
 "Summary" = "Samenvatting";
+
+"This PDF has password protect." = "Dit is een gecodeerd document.";
+"The password is invalid !" = "Ongeldig wachtwoord";

PDF Office/PDF Master/Strings/pl.lproj/Localizable.strings

@@ -2900,3 +2900,7 @@
 
 /* Class = "NSTabViewItem"; label = "Summary"; ObjectID = "94"; */
 "Summary" = "Podsumowanie";
+
+
+"This PDF has password protect." = "Este é um documento criptografado.";
+"The password is invalid !" = "Senha inválida";

PDF Office/PDF Master/Strings/ru.lproj/Localizable.strings

@@ -2825,3 +2825,7 @@
 
 /* Class = "NSTabViewItem"; label = "Summary"; ObjectID = "94"; */
 "Summary" = "Основные";
+
+
+"This PDF has password protect." = "Это зашифрованный документ.";
+"The password is invalid !" = "Неверный пароль";

PDF Office/PDF Master/Strings/zh-Hans.lproj/Localizable.strings

@@ -3864,3 +3864,6 @@
 
 /* Class = "NSTabViewItem"; label = "Summary"; ObjectID = "94"; */
 "Summary" = "摘要";
+
+"This PDF has password protect." = "这是一个加密文档。";
+"The password is invalid !" = "密码无效";

PDF Office/PDF Master/Strings/zh-Hant.lproj/Localizable.strings

@@ -3995,3 +3995,6 @@
 
 /* Class = "NSTabViewItem"; label = "Summary"; ObjectID = "94"; */
 "Summary" = "摘要";
+
+"This PDF has password protect." = "這是一個加密文檔。";
+"The password is invalid !" = "密碼無效";

PDF Office/PDF Master/Third Pard Library/Sparkle/generate_keys

@@ -0,0 +1,24 @@
+#!/bin/bash
+set -e
+for file in "dsaparam.pem" "dsa_priv.pem" "dsa_pub.pem"; do
+  if [ -e "$file" ]; then
+    echo "There's already a $file here! Move it aside or be more careful!"
+    exit 1
+  fi
+done
+
+openssl="/usr/bin/openssl"
+$openssl gendsa <($openssl dsaparam 4096) -out dsa_priv.pem
+chmod 0400 dsa_priv.pem
+$openssl dsa -in dsa_priv.pem -pubout -out dsa_pub.pem
+
+echo "
+Generated two files:
+dsa_priv.pem: your private key. Keep it secret and don't share it!
+dsa_pub.pem: public counterpart to include in the app bundle.
+
+BACK UP YOUR PRIVATE KEY AND KEEP IT SAFE!
+If you lose it, your users will be unable to upgrade!
+"
+
+open -R dsa_priv.pem

PDF Office/PDF Master/Third Pard Library/Sparkle/pdfreaderprocast.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<rss version="2.0" xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle"  xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <channel>
+    <title>PDF Reader Pro's Changelog</title>
+    <link>https://www.pdfreaderpro.com/downloads/pdfreaderprocast.xml</link>
+    <description>Most recent changes with links to updates.</description>
+    <language>en</language>
+      <item>
+        <title>Version 2.8.19.1</title>
+        <description>
+            <![CDATA[
+            <ul>
+              <h3>Welcome you to the all-in-one PDF Reader Pro, fully compatible with macOS Ventura to boost your productivity! it's just like a great Mac app.</h3>
+              <li>Extract tables: extract tables and data as Excel (.xlsx) or CSV accurately and efficiently</li>
+              <li>Convert PDFs to editable Word format while retaining your page layout or text flow easily</li>
+              <li>Compatible with macOS Ventura (version 13), making you work smarter</li>
+              <li>Other optimizations make stability and compatibility improved</li>
+              <h4>Have any feedback, comments or issues? Please drop a line at support@pdfreaderpro.com </h4>
+            </ul>
+            ]]>
+        </description>
+        <pubDate>Frisday, 11 Nov 2022 15:20:11 +0000</pubDate>
+        <enclosure url="https://www.pdfreaderpro.com/downloads/PDFReaderPro.dmg" sparkle:version="2.8.19.1" length="54846955" type="application/octet-stream" sparkle:dsaSignature="MEQCIAghsEXZgBI4IAI1RACrlnj+dRqwPJpMCNiJCEurFW5aAiAQ3/2Ov0dGQBBF
+ARvm4ybbl227DDwQgFv8qI3YMB+Fsw=="/>
+      </item>
+  </channel>
+</rss>

PDF Office/PDF Master/Third Pard Library/Sparkle_master/dsa_priv.pem

@@ -0,0 +1,36 @@
+-----BEGIN DSA PRIVATE KEY-----
+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
+-----END DSA PRIVATE KEY-----

PDF Office/PDF Master/Third Pard Library/Sparkle_master/dsa_pub.pem

@@ -0,0 +1,36 @@
+-----BEGIN PUBLIC KEY-----
+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
+FelLD+kveKCuTVwf0uHbuEaKZurIinyCVdQ=
+-----END PUBLIC KEY-----

PDF Office/PDF Master/Third Pard Library/Sparkle_master/sign_update

@@ -0,0 +1,9 @@
+#!/bin/bash
+set -e
+set -o pipefail
+if [ "$#" -ne 2 ]; then
+  echo "Usage: $0 update_archive private_key"
+  exit 1
+fi
+openssl=/usr/bin/openssl
+$openssl dgst -sha1 -binary < "$1" | $openssl dgst -sha1 -sign "$2" | $openssl enc -base64