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

# Conflicts:
#	PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/Signature/KMSignatureWindowController.swift

PDF Office/PDF Master/Class/Appearance/Image.xcassets/Other/UXNewImage/Other/KMImageNameButtonEidtPDFImage.imageset/Contents.json

@@ -1,6 +1,16 @@
 {
   "images" : [
     {
+      "filename" : "addpicture.pdf",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
       "filename" : "ic.pdf",
       "idiom" : "universal"
     }

PDF Office/PDF Master/Class/Appearance/Image.xcassets/Other/UXNewImage/Other/KMImageNameButtonEidtPDFImage.imageset/addpicture.pdf

@@ -0,0 +1,107 @@
+%PDF-1.7
+
+1 0 obj
+  << >>
+endobj
+
+2 0 obj
+  << /Length 3 0 R >>
+stream
+/DeviceRGB CS
+/DeviceRGB cs
+q
+1.000000 0.000000 -0.000000 1.000000 1.250000 2.750000 cm
+0.152276 0.234759 0.385445 scn
+15.000000 8.250000 m
+15.000000 10.500000 l
+12.750000 10.500000 l
+12.750000 12.000000 l
+15.000000 12.000000 l
+15.000000 14.250000 l
+16.500000 14.250000 l
+16.500000 12.000000 l
+18.750000 12.000000 l
+18.750000 10.500000 l
+16.500000 10.500000 l
+16.500000 8.250000 l
+15.000000 8.250000 l
+h
+0.000000 14.000000 m
+0.750000 14.000000 l
+12.000000 14.000000 l
+12.000000 12.500000 l
+1.500000 12.500000 l
+1.500000 4.040523 l
+4.544956 7.250000 l
+8.814282 3.750000 l
+11.121848 6.182244 l
+16.464727 1.500000 l
+16.500000 1.500000 l
+16.500000 7.000000 l
+18.000000 7.000000 l
+18.000000 0.750000 l
+18.000000 0.000000 l
+17.250000 0.000000 l
+0.750000 0.000000 l
+0.000000 0.000000 l
+0.000000 0.750000 l
+0.000000 13.250000 l
+0.000000 14.000000 l
+h
+11.250000 7.250000 m
+12.078427 7.250000 12.750000 7.921573 12.750000 8.750000 c
+12.750000 9.578427 12.078427 10.250000 11.250000 10.250000 c
+10.421573 10.250000 9.750000 9.578427 9.750000 8.750000 c
+9.750000 7.921573 10.421573 7.250000 11.250000 7.250000 c
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  1109
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 20.000000 20.000000 ]
+     /Resources 1 0 R
+     /Contents 2 0 R
+     /Parent 5 0 R
+  >>
+endobj
+
+5 0 obj
+  << /Kids [ 4 0 R ]
+     /Count 1
+     /Type /Pages
+  >>
+endobj
+
+6 0 obj
+  << /Pages 5 0 R
+     /Type /Catalog
+  >>
+endobj
+
+xref
+0 7
+0000000000 65535 f
+0000000010 00000 n
+0000000034 00000 n
+0000001199 00000 n
+0000001222 00000 n
+0000001395 00000 n
+0000001469 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+1528
+%%EOF

PDF Office/PDF Master/Class/Appearance/Image.xcassets/Other/UXNewImage/Other/KMImageNameButtonEidtPDFText.imageset/Contents.json

@@ -1,6 +1,16 @@
 {
   "images" : [
     {
+      "filename" : "addtext.pdf",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
       "filename" : "edit.pdf",
       "idiom" : "universal"
     }

PDF Office/PDF Master/Class/Appearance/Image.xcassets/Other/UXNewImage/Other/KMImageNameButtonEidtPDFText.imageset/addtext.pdf

@@ -0,0 +1,155 @@
+%PDF-1.7
+
+1 0 obj
+  << >>
+endobj
+
+2 0 obj
+  << /Length 3 0 R >>
+stream
+/DeviceRGB CS
+/DeviceRGB cs
+q
+1.000000 0.000000 -0.000000 1.000000 4.000000 5.500000 cm
+0.152276 0.234759 0.385445 scn
+8.000000 9.000000 m
+8.000000 6.500000 l
+6.500000 6.500000 l
+6.500000 7.500000 l
+4.750000 7.500000 l
+4.750000 1.500000 l
+5.500000 1.500000 l
+5.500000 0.000000 l
+2.500000 0.000000 l
+2.500000 1.500000 l
+3.250000 1.500000 l
+3.250000 7.500000 l
+1.500000 7.500000 l
+1.500000 6.500000 l
+0.000000 6.500000 l
+0.000000 9.000000 l
+8.000000 9.000000 l
+h
+f*
+n
+Q
+q
+1.000000 0.000000 -0.000000 1.000000 1.750000 2.250000 cm
+0.152276 0.234759 0.385445 scn
+16.500000 1.500000 m
+16.500000 0.750000 l
+17.250000 0.750000 l
+17.250000 1.500000 l
+16.500000 1.500000 l
+h
+0.000000 1.500000 m
+-0.750000 1.500000 l
+-0.750000 0.750000 l
+0.000000 0.750000 l
+0.000000 1.500000 l
+h
+0.000000 14.000000 m
+0.000000 14.750000 l
+-0.750000 14.750000 l
+-0.750000 14.000000 l
+0.000000 14.000000 l
+h
+16.500000 2.250000 m
+0.000000 2.250000 l
+0.000000 0.750000 l
+16.500000 0.750000 l
+16.500000 2.250000 l
+h
+0.750000 1.500000 m
+0.750000 14.000000 l
+-0.750000 14.000000 l
+-0.750000 1.500000 l
+0.750000 1.500000 l
+h
+0.000000 13.250000 m
+11.250000 13.250000 l
+11.250000 14.750000 l
+0.000000 14.750000 l
+0.000000 13.250000 l
+h
+15.750000 7.750000 m
+15.750000 1.500000 l
+17.250000 1.500000 l
+17.250000 7.750000 l
+15.750000 7.750000 l
+h
+f
+n
+Q
+q
+1.000000 0.000000 -0.000000 1.000000 14.000000 12.500000 cm
+0.152276 0.234759 0.385445 scn
+0.000000 0.750000 m
+6.000000 0.750000 l
+6.000000 2.250000 l
+0.000000 2.250000 l
+0.000000 0.750000 l
+h
+f
+n
+Q
+q
+-0.000000 -1.000000 1.000000 -0.000000 11.000000 17.000000 cm
+0.152276 0.234759 0.385445 scn
+0.000000 5.250000 m
+6.000000 5.250000 l
+6.000000 6.750000 l
+-0.000000 6.750000 l
+0.000000 5.250000 l
+h
+f
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  1717
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 20.000000 20.000000 ]
+     /Resources 1 0 R
+     /Contents 2 0 R
+     /Parent 5 0 R
+  >>
+endobj
+
+5 0 obj
+  << /Kids [ 4 0 R ]
+     /Count 1
+     /Type /Pages
+  >>
+endobj
+
+6 0 obj
+  << /Pages 5 0 R
+     /Type /Catalog
+  >>
+endobj
+
+xref
+0 7
+0000000000 65535 f
+0000000010 00000 n
+0000000034 00000 n
+0000001807 00000 n
+0000001830 00000 n
+0000002003 00000 n
+0000002077 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+2136
+%%EOF

PDF Office/PDF Master/Class/Appearance/Image.xcassets/RightSide/KMImageNamePropertyLinkEmpty.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "no link.pdf",
-      "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "filename" : "no link 1.pdf",
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

PDF Office/PDF Master/Class/Appearance/Image.xcassets/RightSide/KMImageNamePropertyLinkEmpty.imageset/no link 1.pdf

@@ -1,534 +0,0 @@
-%PDF-1.7
-
-1 0 obj
-  << /ExtGState << /E1 << /ca 0.300000 >> >> >>
-endobj
-
-2 0 obj
-  << /Length 3 0 R >>
-stream
-/DeviceRGB CS
-/DeviceRGB cs
-q
-1.000000 0.000000 -0.000000 1.000000 18.428833 6.427734 cm
-0.807843 0.815686 0.831373 scn
-88.342857 111.000000 m
-3.657143 111.000000 l
-3.294210 111.000000 3.000000 110.705788 3.000000 110.342857 c
-3.000000 3.657143 l
-3.000000 3.294212 3.294213 3.000000 3.657141 3.000000 c
-88.342857 3.000000 l
-88.705788 3.000000 89.000000 3.294212 89.000000 3.657143 c
-89.000000 110.342857 l
-89.000000 110.705788 88.705788 111.000000 88.342857 111.000000 c
-h
-3.657143 114.000000 m
-1.637359 114.000000 0.000000 112.362648 0.000000 110.342857 c
-0.000000 3.657143 l
-0.000000 1.637360 1.637357 0.000000 3.657141 0.000000 c
-88.342857 0.000000 l
-90.362640 0.000000 92.000000 1.637352 92.000000 3.657143 c
-92.000000 110.342857 l
-92.000000 112.362640 90.362640 114.000000 88.342857 114.000000 c
-3.657143 114.000000 l
-h
-26.371166 89.072266 m
-13.571167 89.072266 l
-13.571167 92.072266 l
-26.371166 92.072266 l
-26.371166 89.072266 l
-h
-30.028442 89.072266 m
-65.685585 89.072266 l
-65.685585 92.072266 l
-30.028442 92.072266 l
-30.028442 89.072266 l
-h
-13.571289 79.929199 m
-13.571167 79.929199 l
-13.571167 82.929199 l
-13.571289 82.929199 l
-49.228310 82.929199 l
-49.228432 82.929199 l
-49.228432 79.929199 l
-49.228310 79.929199 l
-13.571289 79.929199 l
-h
-13.571167 43.357910 m
-62.942596 43.357910 l
-62.942596 46.357910 l
-13.571167 46.357910 l
-13.571167 43.357910 l
-h
-54.714024 61.643555 m
-13.571167 61.643555 l
-13.571167 64.643555 l
-54.714024 64.643555 l
-54.714024 61.643555 l
-h
-58.371216 61.643555 m
-70.256927 61.643555 l
-70.256927 64.643555 l
-58.371216 64.643555 l
-58.371216 61.643555 l
-h
-50.571289 34.072266 m
-13.571289 34.072266 l
-13.571289 37.072266 l
-50.571289 37.072266 l
-50.571289 34.072266 l
-h
-13.571289 52.500488 m
-40.999863 52.500488 l
-40.999863 55.500488 l
-13.571289 55.500488 l
-13.571289 52.500488 l
-h
-45.571289 25.072266 m
-13.571289 25.072266 l
-13.571289 28.072266 l
-45.571289 28.072266 l
-45.571289 25.072266 l
-h
-13.571289 16.072266 m
-62.571289 16.072266 l
-62.571289 19.072266 l
-13.571289 19.072266 l
-13.571289 16.072266 l
-h
-77.571289 70.786621 m
-13.571289 70.786621 l
-13.571289 73.786621 l
-77.571289 73.786621 l
-77.571289 70.786621 l
-h
-f*
-n
-Q
-q
-/E1 gs
-1.000000 0.000000 -0.000000 1.000000 28.000000 55.000000 cm
-0.741176 0.874510 0.992157 scn
-0.000000 19.000000 m
-0.000000 19.552284 0.447715 20.000000 1.000000 20.000000 c
-71.000000 20.000000 l
-71.552284 20.000000 72.000000 19.552284 72.000000 19.000000 c
-72.000000 1.000000 l
-72.000000 0.447716 71.552284 0.000000 71.000000 0.000000 c
-1.000000 0.000000 l
-0.447716 0.000000 0.000000 0.447716 0.000000 1.000000 c
-0.000000 19.000000 l
-h
-f
-n
-Q
-q
-1.000000 0.000000 -0.000000 1.000000 28.000000 52.000000 cm
-0.741176 0.874510 0.992157 scn
-1.500000 6.250000 m
-1.500000 7.078427 0.828427 7.750000 0.000000 7.750000 c
--0.828427 7.750000 -1.500000 7.078427 -1.500000 6.250000 c
-1.500000 6.250000 l
-h
--1.500000 10.750000 m
--1.500000 9.921573 -0.828427 9.250000 0.000000 9.250000 c
-0.828427 9.250000 1.500000 9.921573 1.500000 10.750000 c
--1.500000 10.750000 l
-h
-1.500000 15.250000 m
-1.500000 16.078426 0.828427 16.750000 0.000000 16.750000 c
--0.828427 16.750000 -1.500000 16.078426 -1.500000 15.250000 c
-1.500000 15.250000 l
-h
--1.500000 19.750000 m
--1.500000 18.921574 -0.828427 18.250000 0.000000 18.250000 c
-0.828427 18.250000 1.500000 18.921574 1.500000 19.750000 c
--1.500000 19.750000 l
-h
-3.916667 21.500000 m
-4.745094 21.500000 5.416667 22.171574 5.416667 23.000000 c
-5.416667 23.828426 4.745094 24.500000 3.916667 24.500000 c
-3.916667 21.500000 l
-h
-9.750000 24.500000 m
-8.921573 24.500000 8.250000 23.828426 8.250000 23.000000 c
-8.250000 22.171574 8.921573 21.500000 9.750000 21.500000 c
-9.750000 24.500000 l
-h
-15.583334 21.500000 m
-16.411760 21.500000 17.083334 22.171574 17.083334 23.000000 c
-17.083334 23.828426 16.411760 24.500000 15.583334 24.500000 c
-15.583334 21.500000 l
-h
-21.416668 24.500000 m
-20.588242 24.500000 19.916668 23.828426 19.916668 23.000000 c
-19.916668 22.171574 20.588242 21.500000 21.416668 21.500000 c
-21.416668 24.500000 l
-h
-27.250002 21.500000 m
-28.078428 21.500000 28.750002 22.171574 28.750002 23.000000 c
-28.750002 23.828426 28.078428 24.500000 27.250002 24.500000 c
-27.250002 21.500000 l
-h
-33.083336 24.500000 m
-32.254910 24.500000 31.583336 23.828426 31.583336 23.000000 c
-31.583336 22.171574 32.254910 21.500000 33.083336 21.500000 c
-33.083336 24.500000 l
-h
-38.916668 21.500000 m
-39.745094 21.500000 40.416668 22.171574 40.416668 23.000000 c
-40.416668 23.828426 39.745094 24.500000 38.916668 24.500000 c
-38.916668 21.500000 l
-h
-44.750000 24.500000 m
-43.921574 24.500000 43.250000 23.828426 43.250000 23.000000 c
-43.250000 22.171574 43.921574 21.500000 44.750000 21.500000 c
-44.750000 24.500000 l
-h
-50.583332 21.500000 m
-51.411758 21.500000 52.083332 22.171574 52.083332 23.000000 c
-52.083332 23.828426 51.411758 24.500000 50.583332 24.500000 c
-50.583332 21.500000 l
-h
-56.416664 24.500000 m
-55.588238 24.500000 54.916664 23.828426 54.916664 23.000000 c
-54.916664 22.171574 55.588238 21.500000 56.416664 21.500000 c
-56.416664 24.500000 l
-h
-62.249996 21.500000 m
-63.078423 21.500000 63.749996 22.171574 63.749996 23.000000 c
-63.749996 23.828426 63.078423 24.500000 62.249996 24.500000 c
-62.249996 21.500000 l
-h
-68.083328 24.500000 m
-67.254898 24.500000 66.583328 23.828426 66.583328 23.000000 c
-66.583328 22.171574 67.254898 21.500000 68.083328 21.500000 c
-68.083328 24.500000 l
-h
-70.500000 19.750000 m
-70.500000 18.921574 71.171570 18.250000 72.000000 18.250000 c
-72.828430 18.250000 73.500000 18.921574 73.500000 19.750000 c
-70.500000 19.750000 l
-h
-73.500000 15.250000 m
-73.500000 16.078426 72.828430 16.750000 72.000000 16.750000 c
-71.171570 16.750000 70.500000 16.078426 70.500000 15.250000 c
-73.500000 15.250000 l
-h
-70.500000 10.750000 m
-70.500000 9.921573 71.171570 9.250000 72.000000 9.250000 c
-72.828430 9.250000 73.500000 9.921573 73.500000 10.750000 c
-70.500000 10.750000 l
-h
-73.500000 6.250000 m
-73.500000 7.078427 72.828430 7.750000 72.000000 7.750000 c
-71.171570 7.750000 70.500000 7.078427 70.500000 6.250000 c
-73.500000 6.250000 l
-h
-68.083336 4.500000 m
-67.254906 4.500000 66.583336 3.828426 66.583336 3.000000 c
-66.583336 2.171574 67.254906 1.500000 68.083336 1.500000 c
-68.083336 4.500000 l
-h
-62.250000 1.500000 m
-63.078426 1.500000 63.750000 2.171574 63.750000 3.000000 c
-63.750000 3.828426 63.078426 4.500000 62.250000 4.500000 c
-62.250000 1.500000 l
-h
-56.416668 4.500000 m
-55.588238 4.500000 54.916668 3.828426 54.916668 3.000000 c
-54.916668 2.171574 55.588238 1.500000 56.416668 1.500000 c
-56.416668 4.500000 l
-h
-50.583332 1.500000 m
-51.411758 1.500000 52.083332 2.171574 52.083332 3.000000 c
-52.083332 3.828426 51.411758 4.500000 50.583332 4.500000 c
-50.583332 1.500000 l
-h
-44.749996 4.500000 m
-43.921570 4.500000 43.249996 3.828426 43.249996 3.000000 c
-43.249996 2.171574 43.921570 1.500000 44.749996 1.500000 c
-44.749996 4.500000 l
-h
-38.916664 1.500000 m
-39.745090 1.500000 40.416664 2.171574 40.416664 3.000000 c
-40.416664 3.828426 39.745090 4.500000 38.916664 4.500000 c
-38.916664 1.500000 l
-h
-33.083332 4.500000 m
-32.254906 4.500000 31.583332 3.828426 31.583332 3.000000 c
-31.583332 2.171574 32.254906 1.500000 33.083332 1.500000 c
-33.083332 4.500000 l
-h
-27.250000 1.500000 m
-28.078428 1.500000 28.750000 2.171574 28.750000 3.000000 c
-28.750000 3.828426 28.078428 4.500000 27.250000 4.500000 c
-27.250000 1.500000 l
-h
-21.416668 4.500000 m
-20.588242 4.500000 19.916668 3.828426 19.916668 3.000000 c
-19.916668 2.171574 20.588242 1.500000 21.416668 1.500000 c
-21.416668 4.500000 l
-h
-15.583337 1.500000 m
-16.411764 1.500000 17.083336 2.171574 17.083336 3.000000 c
-17.083336 3.828426 16.411764 4.500000 15.583337 4.500000 c
-15.583337 1.500000 l
-h
-9.750005 4.500000 m
-8.921577 4.500000 8.250005 3.828426 8.250005 3.000000 c
-8.250005 2.171574 8.921577 1.500000 9.750005 1.500000 c
-9.750005 4.500000 l
-h
-3.916673 1.500000 m
-4.745100 1.500000 5.416673 2.171574 5.416673 3.000000 c
-5.416673 3.828426 4.745100 4.500000 3.916673 4.500000 c
-3.916673 1.500000 l
-h
-1.000000 4.500000 m
-1.276142 4.500000 1.500000 4.276144 1.500000 4.000000 c
--1.500000 4.000000 l
--1.500000 2.619287 -0.380710 1.500000 1.000000 1.500000 c
-1.000000 4.500000 l
-h
-1.500000 4.000000 m
-1.500000 6.250000 l
--1.500000 6.250000 l
--1.500000 4.000000 l
-1.500000 4.000000 l
-h
-1.500000 10.750000 m
-1.500000 15.250000 l
--1.500000 15.250000 l
--1.500000 10.750000 l
-1.500000 10.750000 l
-h
-1.500000 19.750000 m
-1.500000 22.000000 l
--1.500000 22.000000 l
--1.500000 19.750000 l
-1.500000 19.750000 l
-h
-1.500000 22.000000 m
-1.500000 21.723858 1.276143 21.500000 1.000000 21.500000 c
-1.000000 24.500000 l
--0.380712 24.500000 -1.500000 23.380711 -1.500000 22.000000 c
-1.500000 22.000000 l
-h
-1.000000 21.500000 m
-3.916667 21.500000 l
-3.916667 24.500000 l
-1.000000 24.500000 l
-1.000000 21.500000 l
-h
-9.750000 21.500000 m
-15.583334 21.500000 l
-15.583334 24.500000 l
-9.750000 24.500000 l
-9.750000 21.500000 l
-h
-21.416668 21.500000 m
-27.250002 21.500000 l
-27.250002 24.500000 l
-21.416668 24.500000 l
-21.416668 21.500000 l
-h
-33.083336 21.500000 m
-38.916668 21.500000 l
-38.916668 24.500000 l
-33.083336 24.500000 l
-33.083336 21.500000 l
-h
-44.750000 21.500000 m
-50.583332 21.500000 l
-50.583332 24.500000 l
-44.750000 24.500000 l
-44.750000 21.500000 l
-h
-56.416664 21.500000 m
-62.249996 21.500000 l
-62.249996 24.500000 l
-56.416664 24.500000 l
-56.416664 21.500000 l
-h
-68.083328 21.500000 m
-71.000000 21.500000 l
-71.000000 24.500000 l
-68.083328 24.500000 l
-68.083328 21.500000 l
-h
-71.000000 21.500000 m
-70.723862 21.500000 70.500000 21.723856 70.500000 22.000000 c
-73.500000 22.000000 l
-73.500000 23.380713 72.380707 24.500000 71.000000 24.500000 c
-71.000000 21.500000 l
-h
-70.500000 22.000000 m
-70.500000 19.750000 l
-73.500000 19.750000 l
-73.500000 22.000000 l
-70.500000 22.000000 l
-h
-70.500000 15.250000 m
-70.500000 10.750000 l
-73.500000 10.750000 l
-73.500000 15.250000 l
-70.500000 15.250000 l
-h
-70.500000 6.250000 m
-70.500000 4.000000 l
-73.500000 4.000000 l
-73.500000 6.250000 l
-70.500000 6.250000 l
-h
-70.500000 4.000000 m
-70.500000 4.276142 70.723854 4.500000 71.000000 4.500000 c
-71.000000 1.500000 l
-72.380714 1.500000 73.500000 2.619289 73.500000 4.000000 c
-70.500000 4.000000 l
-h
-71.000000 4.500000 m
-68.083336 4.500000 l
-68.083336 1.500000 l
-71.000000 1.500000 l
-71.000000 4.500000 l
-h
-62.250000 4.500000 m
-56.416668 4.500000 l
-56.416668 1.500000 l
-62.250000 1.500000 l
-62.250000 4.500000 l
-h
-50.583332 4.500000 m
-44.749996 4.500000 l
-44.749996 1.500000 l
-50.583332 1.500000 l
-50.583332 4.500000 l
-h
-38.916664 4.500000 m
-33.083332 4.500000 l
-33.083332 1.500000 l
-38.916664 1.500000 l
-38.916664 4.500000 l
-h
-27.250000 4.500000 m
-21.416668 4.500000 l
-21.416668 1.500000 l
-27.250000 1.500000 l
-27.250000 4.500000 l
-h
-15.583337 4.500000 m
-9.750005 4.500000 l
-9.750005 1.500000 l
-15.583337 1.500000 l
-15.583337 4.500000 l
-h
-3.916673 4.500000 m
-1.000000 4.500000 l
-1.000000 1.500000 l
-3.916673 1.500000 l
-3.916673 4.500000 l
-h
-f
-n
-Q
-q
-1.000000 0.000000 -0.000000 1.000000 90.000000 30.000000 cm
-0.741176 0.874510 0.992157 scn
-0.000000 16.000000 m
-0.000000 24.836555 7.163444 32.000000 16.000000 32.000000 c
-16.000000 32.000000 l
-24.836555 32.000000 32.000000 24.836555 32.000000 16.000000 c
-32.000000 16.000000 l
-32.000000 7.163445 24.836555 0.000000 16.000000 0.000000 c
-16.000000 0.000000 l
-7.163444 0.000000 0.000000 7.163445 0.000000 16.000000 c
-0.000000 16.000000 l
-h
-f
-n
-Q
-q
-1.000000 0.000000 -0.000000 1.000000 97.359375 36.464844 cm
-1.000000 1.000000 1.000000 scn
-6.471609 3.596714 m
-8.828284 5.953390 l
-10.185929 4.595745 l
-7.829254 2.239069 l
-6.038204 0.448019 3.134338 0.448019 1.343288 2.239070 c
--0.447762 4.030120 -0.447763 6.933986 1.343287 8.725036 c
-3.699963 11.081712 l
-5.057608 9.724067 l
-2.700932 7.367391 l
-1.659689 6.326147 1.659689 4.637959 2.700933 3.596715 c
-3.742177 2.555470 5.430367 2.555470 6.471609 3.596714 c
-h
-13.580042 7.989858 m
-12.222397 9.347503 l
-14.579067 11.704172 l
-15.620311 12.745417 15.620311 14.433605 14.579067 15.474849 c
-13.537824 16.516092 11.849633 16.516092 10.808391 15.474849 c
-8.451720 13.118179 l
-7.094075 14.475824 l
-9.450746 16.832495 l
-11.241796 18.623545 14.145662 18.623543 15.936712 16.832493 c
-17.727762 15.041444 17.727762 12.137577 15.936712 10.346527 c
-13.580042 7.989858 l
-h
-10.841346 13.094539 m
-5.081270 7.334903 l
-6.438863 5.977206 l
-12.198938 11.736842 l
-10.841346 13.094539 l
-h
-f*
-n
-Q
-
-endstream
-endobj
-
-3 0 obj
-  12299
-endobj
-
-4 0 obj
-  << /Annots []
-     /Type /Page
-     /MediaBox [ 0.000000 0.000000 128.000000 128.000000 ]
-     /Resources 1 0 R
-     /Contents 2 0 R
-     /Parent 5 0 R
-  >>
-endobj
-
-5 0 obj
-  << /Kids [ 4 0 R ]
-     /Count 1
-     /Type /Pages
-  >>
-endobj
-
-6 0 obj
-  << /Pages 5 0 R
-     /Type /Catalog
-  >>
-endobj
-
-xref
-0 7
-0000000000 65535 f
-0000000010 00000 n
-0000000074 00000 n
-0000012429 00000 n
-0000012453 00000 n
-0000012628 00000 n
-0000012702 00000 n
-trailer
-<< /ID [ (some) (id) ]
-   /Root 6 0 R
-   /Size 7
->>
-startxref
-12761
-%%EOF

PDF Office/PDF Master/Class/Appearance/Image.xcassets/RightSide/KMImageNamePropertyLinkEmpty.imageset/no link.pdf

@@ -1,534 +0,0 @@
-%PDF-1.7
-
-1 0 obj
-  << /ExtGState << /E1 << /ca 0.300000 >> >> >>
-endobj
-
-2 0 obj
-  << /Length 3 0 R >>
-stream
-/DeviceRGB CS
-/DeviceRGB cs
-q
-1.000000 0.000000 -0.000000 1.000000 18.428833 6.427734 cm
-0.807843 0.815686 0.831373 scn
-88.342857 111.000000 m
-3.657143 111.000000 l
-3.294210 111.000000 3.000000 110.705788 3.000000 110.342857 c
-3.000000 3.657143 l
-3.000000 3.294212 3.294213 3.000000 3.657141 3.000000 c
-88.342857 3.000000 l
-88.705788 3.000000 89.000000 3.294212 89.000000 3.657143 c
-89.000000 110.342857 l
-89.000000 110.705788 88.705788 111.000000 88.342857 111.000000 c
-h
-3.657143 114.000000 m
-1.637359 114.000000 0.000000 112.362648 0.000000 110.342857 c
-0.000000 3.657143 l
-0.000000 1.637360 1.637357 0.000000 3.657141 0.000000 c
-88.342857 0.000000 l
-90.362640 0.000000 92.000000 1.637352 92.000000 3.657143 c
-92.000000 110.342857 l
-92.000000 112.362640 90.362640 114.000000 88.342857 114.000000 c
-3.657143 114.000000 l
-h
-26.371166 89.072266 m
-13.571167 89.072266 l
-13.571167 92.072266 l
-26.371166 92.072266 l
-26.371166 89.072266 l
-h
-30.028442 89.072266 m
-65.685585 89.072266 l
-65.685585 92.072266 l
-30.028442 92.072266 l
-30.028442 89.072266 l
-h
-13.571289 79.929199 m
-13.571167 79.929199 l
-13.571167 82.929199 l
-13.571289 82.929199 l
-49.228310 82.929199 l
-49.228432 82.929199 l
-49.228432 79.929199 l
-49.228310 79.929199 l
-13.571289 79.929199 l
-h
-13.571167 43.357910 m
-62.942596 43.357910 l
-62.942596 46.357910 l
-13.571167 46.357910 l
-13.571167 43.357910 l
-h
-54.714024 61.643555 m
-13.571167 61.643555 l
-13.571167 64.643555 l
-54.714024 64.643555 l
-54.714024 61.643555 l
-h
-58.371216 61.643555 m
-70.256927 61.643555 l
-70.256927 64.643555 l
-58.371216 64.643555 l
-58.371216 61.643555 l
-h
-50.571289 34.072266 m
-13.571289 34.072266 l
-13.571289 37.072266 l
-50.571289 37.072266 l
-50.571289 34.072266 l
-h
-13.571289 52.500488 m
-40.999863 52.500488 l
-40.999863 55.500488 l
-13.571289 55.500488 l
-13.571289 52.500488 l
-h
-45.571289 25.072266 m
-13.571289 25.072266 l
-13.571289 28.072266 l
-45.571289 28.072266 l
-45.571289 25.072266 l
-h
-13.571289 16.072266 m
-62.571289 16.072266 l
-62.571289 19.072266 l
-13.571289 19.072266 l
-13.571289 16.072266 l
-h
-77.571289 70.786621 m
-13.571289 70.786621 l
-13.571289 73.786621 l
-77.571289 73.786621 l
-77.571289 70.786621 l
-h
-f*
-n
-Q
-q
-/E1 gs
-1.000000 0.000000 -0.000000 1.000000 28.000000 55.000000 cm
-0.741176 0.874510 0.992157 scn
-0.000000 19.000000 m
-0.000000 19.552284 0.447715 20.000000 1.000000 20.000000 c
-71.000000 20.000000 l
-71.552284 20.000000 72.000000 19.552284 72.000000 19.000000 c
-72.000000 1.000000 l
-72.000000 0.447716 71.552284 0.000000 71.000000 0.000000 c
-1.000000 0.000000 l
-0.447716 0.000000 0.000000 0.447716 0.000000 1.000000 c
-0.000000 19.000000 l
-h
-f
-n
-Q
-q
-1.000000 0.000000 -0.000000 1.000000 28.000000 52.000000 cm
-0.741176 0.874510 0.992157 scn
-1.500000 6.250000 m
-1.500000 7.078427 0.828427 7.750000 0.000000 7.750000 c
--0.828427 7.750000 -1.500000 7.078427 -1.500000 6.250000 c
-1.500000 6.250000 l
-h
--1.500000 10.750000 m
--1.500000 9.921573 -0.828427 9.250000 0.000000 9.250000 c
-0.828427 9.250000 1.500000 9.921573 1.500000 10.750000 c
--1.500000 10.750000 l
-h
-1.500000 15.250000 m
-1.500000 16.078426 0.828427 16.750000 0.000000 16.750000 c
--0.828427 16.750000 -1.500000 16.078426 -1.500000 15.250000 c
-1.500000 15.250000 l
-h
--1.500000 19.750000 m
--1.500000 18.921574 -0.828427 18.250000 0.000000 18.250000 c
-0.828427 18.250000 1.500000 18.921574 1.500000 19.750000 c
--1.500000 19.750000 l
-h
-3.916667 21.500000 m
-4.745094 21.500000 5.416667 22.171574 5.416667 23.000000 c
-5.416667 23.828426 4.745094 24.500000 3.916667 24.500000 c
-3.916667 21.500000 l
-h
-9.750000 24.500000 m
-8.921573 24.500000 8.250000 23.828426 8.250000 23.000000 c
-8.250000 22.171574 8.921573 21.500000 9.750000 21.500000 c
-9.750000 24.500000 l
-h
-15.583334 21.500000 m
-16.411760 21.500000 17.083334 22.171574 17.083334 23.000000 c
-17.083334 23.828426 16.411760 24.500000 15.583334 24.500000 c
-15.583334 21.500000 l
-h
-21.416668 24.500000 m
-20.588242 24.500000 19.916668 23.828426 19.916668 23.000000 c
-19.916668 22.171574 20.588242 21.500000 21.416668 21.500000 c
-21.416668 24.500000 l
-h
-27.250002 21.500000 m
-28.078428 21.500000 28.750002 22.171574 28.750002 23.000000 c
-28.750002 23.828426 28.078428 24.500000 27.250002 24.500000 c
-27.250002 21.500000 l
-h
-33.083336 24.500000 m
-32.254910 24.500000 31.583336 23.828426 31.583336 23.000000 c
-31.583336 22.171574 32.254910 21.500000 33.083336 21.500000 c
-33.083336 24.500000 l
-h
-38.916668 21.500000 m
-39.745094 21.500000 40.416668 22.171574 40.416668 23.000000 c
-40.416668 23.828426 39.745094 24.500000 38.916668 24.500000 c
-38.916668 21.500000 l
-h
-44.750000 24.500000 m
-43.921574 24.500000 43.250000 23.828426 43.250000 23.000000 c
-43.250000 22.171574 43.921574 21.500000 44.750000 21.500000 c
-44.750000 24.500000 l
-h
-50.583332 21.500000 m
-51.411758 21.500000 52.083332 22.171574 52.083332 23.000000 c
-52.083332 23.828426 51.411758 24.500000 50.583332 24.500000 c
-50.583332 21.500000 l
-h
-56.416664 24.500000 m
-55.588238 24.500000 54.916664 23.828426 54.916664 23.000000 c
-54.916664 22.171574 55.588238 21.500000 56.416664 21.500000 c
-56.416664 24.500000 l
-h
-62.249996 21.500000 m
-63.078423 21.500000 63.749996 22.171574 63.749996 23.000000 c
-63.749996 23.828426 63.078423 24.500000 62.249996 24.500000 c
-62.249996 21.500000 l
-h
-68.083328 24.500000 m
-67.254898 24.500000 66.583328 23.828426 66.583328 23.000000 c
-66.583328 22.171574 67.254898 21.500000 68.083328 21.500000 c
-68.083328 24.500000 l
-h
-70.500000 19.750000 m
-70.500000 18.921574 71.171570 18.250000 72.000000 18.250000 c
-72.828430 18.250000 73.500000 18.921574 73.500000 19.750000 c
-70.500000 19.750000 l
-h
-73.500000 15.250000 m
-73.500000 16.078426 72.828430 16.750000 72.000000 16.750000 c
-71.171570 16.750000 70.500000 16.078426 70.500000 15.250000 c
-73.500000 15.250000 l
-h
-70.500000 10.750000 m
-70.500000 9.921573 71.171570 9.250000 72.000000 9.250000 c
-72.828430 9.250000 73.500000 9.921573 73.500000 10.750000 c
-70.500000 10.750000 l
-h
-73.500000 6.250000 m
-73.500000 7.078427 72.828430 7.750000 72.000000 7.750000 c
-71.171570 7.750000 70.500000 7.078427 70.500000 6.250000 c
-73.500000 6.250000 l
-h
-68.083336 4.500000 m
-67.254906 4.500000 66.583336 3.828426 66.583336 3.000000 c
-66.583336 2.171574 67.254906 1.500000 68.083336 1.500000 c
-68.083336 4.500000 l
-h
-62.250000 1.500000 m
-63.078426 1.500000 63.750000 2.171574 63.750000 3.000000 c
-63.750000 3.828426 63.078426 4.500000 62.250000 4.500000 c
-62.250000 1.500000 l
-h
-56.416668 4.500000 m
-55.588238 4.500000 54.916668 3.828426 54.916668 3.000000 c
-54.916668 2.171574 55.588238 1.500000 56.416668 1.500000 c
-56.416668 4.500000 l
-h
-50.583332 1.500000 m
-51.411758 1.500000 52.083332 2.171574 52.083332 3.000000 c
-52.083332 3.828426 51.411758 4.500000 50.583332 4.500000 c
-50.583332 1.500000 l
-h
-44.749996 4.500000 m
-43.921570 4.500000 43.249996 3.828426 43.249996 3.000000 c
-43.249996 2.171574 43.921570 1.500000 44.749996 1.500000 c
-44.749996 4.500000 l
-h
-38.916664 1.500000 m
-39.745090 1.500000 40.416664 2.171574 40.416664 3.000000 c
-40.416664 3.828426 39.745090 4.500000 38.916664 4.500000 c
-38.916664 1.500000 l
-h
-33.083332 4.500000 m
-32.254906 4.500000 31.583332 3.828426 31.583332 3.000000 c
-31.583332 2.171574 32.254906 1.500000 33.083332 1.500000 c
-33.083332 4.500000 l
-h
-27.250000 1.500000 m
-28.078428 1.500000 28.750000 2.171574 28.750000 3.000000 c
-28.750000 3.828426 28.078428 4.500000 27.250000 4.500000 c
-27.250000 1.500000 l
-h
-21.416668 4.500000 m
-20.588242 4.500000 19.916668 3.828426 19.916668 3.000000 c
-19.916668 2.171574 20.588242 1.500000 21.416668 1.500000 c
-21.416668 4.500000 l
-h
-15.583337 1.500000 m
-16.411764 1.500000 17.083336 2.171574 17.083336 3.000000 c
-17.083336 3.828426 16.411764 4.500000 15.583337 4.500000 c
-15.583337 1.500000 l
-h
-9.750005 4.500000 m
-8.921577 4.500000 8.250005 3.828426 8.250005 3.000000 c
-8.250005 2.171574 8.921577 1.500000 9.750005 1.500000 c
-9.750005 4.500000 l
-h
-3.916673 1.500000 m
-4.745100 1.500000 5.416673 2.171574 5.416673 3.000000 c
-5.416673 3.828426 4.745100 4.500000 3.916673 4.500000 c
-3.916673 1.500000 l
-h
-1.000000 4.500000 m
-1.276142 4.500000 1.500000 4.276144 1.500000 4.000000 c
--1.500000 4.000000 l
--1.500000 2.619287 -0.380710 1.500000 1.000000 1.500000 c
-1.000000 4.500000 l
-h
-1.500000 4.000000 m
-1.500000 6.250000 l
--1.500000 6.250000 l
--1.500000 4.000000 l
-1.500000 4.000000 l
-h
-1.500000 10.750000 m
-1.500000 15.250000 l
--1.500000 15.250000 l
--1.500000 10.750000 l
-1.500000 10.750000 l
-h
-1.500000 19.750000 m
-1.500000 22.000000 l
--1.500000 22.000000 l
--1.500000 19.750000 l
-1.500000 19.750000 l
-h
-1.500000 22.000000 m
-1.500000 21.723858 1.276143 21.500000 1.000000 21.500000 c
-1.000000 24.500000 l
--0.380712 24.500000 -1.500000 23.380711 -1.500000 22.000000 c
-1.500000 22.000000 l
-h
-1.000000 21.500000 m
-3.916667 21.500000 l
-3.916667 24.500000 l
-1.000000 24.500000 l
-1.000000 21.500000 l
-h
-9.750000 21.500000 m
-15.583334 21.500000 l
-15.583334 24.500000 l
-9.750000 24.500000 l
-9.750000 21.500000 l
-h
-21.416668 21.500000 m
-27.250002 21.500000 l
-27.250002 24.500000 l
-21.416668 24.500000 l
-21.416668 21.500000 l
-h
-33.083336 21.500000 m
-38.916668 21.500000 l
-38.916668 24.500000 l
-33.083336 24.500000 l
-33.083336 21.500000 l
-h
-44.750000 21.500000 m
-50.583332 21.500000 l
-50.583332 24.500000 l
-44.750000 24.500000 l
-44.750000 21.500000 l
-h
-56.416664 21.500000 m
-62.249996 21.500000 l
-62.249996 24.500000 l
-56.416664 24.500000 l
-56.416664 21.500000 l
-h
-68.083328 21.500000 m
-71.000000 21.500000 l
-71.000000 24.500000 l
-68.083328 24.500000 l
-68.083328 21.500000 l
-h
-71.000000 21.500000 m
-70.723862 21.500000 70.500000 21.723856 70.500000 22.000000 c
-73.500000 22.000000 l
-73.500000 23.380713 72.380707 24.500000 71.000000 24.500000 c
-71.000000 21.500000 l
-h
-70.500000 22.000000 m
-70.500000 19.750000 l
-73.500000 19.750000 l
-73.500000 22.000000 l
-70.500000 22.000000 l
-h
-70.500000 15.250000 m
-70.500000 10.750000 l
-73.500000 10.750000 l
-73.500000 15.250000 l
-70.500000 15.250000 l
-h
-70.500000 6.250000 m
-70.500000 4.000000 l
-73.500000 4.000000 l
-73.500000 6.250000 l
-70.500000 6.250000 l
-h
-70.500000 4.000000 m
-70.500000 4.276142 70.723854 4.500000 71.000000 4.500000 c
-71.000000 1.500000 l
-72.380714 1.500000 73.500000 2.619289 73.500000 4.000000 c
-70.500000 4.000000 l
-h
-71.000000 4.500000 m
-68.083336 4.500000 l
-68.083336 1.500000 l
-71.000000 1.500000 l
-71.000000 4.500000 l
-h
-62.250000 4.500000 m
-56.416668 4.500000 l
-56.416668 1.500000 l
-62.250000 1.500000 l
-62.250000 4.500000 l
-h
-50.583332 4.500000 m
-44.749996 4.500000 l
-44.749996 1.500000 l
-50.583332 1.500000 l
-50.583332 4.500000 l
-h
-38.916664 4.500000 m
-33.083332 4.500000 l
-33.083332 1.500000 l
-38.916664 1.500000 l
-38.916664 4.500000 l
-h
-27.250000 4.500000 m
-21.416668 4.500000 l
-21.416668 1.500000 l
-27.250000 1.500000 l
-27.250000 4.500000 l
-h
-15.583337 4.500000 m
-9.750005 4.500000 l
-9.750005 1.500000 l
-15.583337 1.500000 l
-15.583337 4.500000 l
-h
-3.916673 4.500000 m
-1.000000 4.500000 l
-1.000000 1.500000 l
-3.916673 1.500000 l
-3.916673 4.500000 l
-h
-f
-n
-Q
-q
-1.000000 0.000000 -0.000000 1.000000 90.000000 30.000000 cm
-0.741176 0.874510 0.992157 scn
-0.000000 16.000000 m
-0.000000 24.836555 7.163444 32.000000 16.000000 32.000000 c
-16.000000 32.000000 l
-24.836555 32.000000 32.000000 24.836555 32.000000 16.000000 c
-32.000000 16.000000 l
-32.000000 7.163445 24.836555 0.000000 16.000000 0.000000 c
-16.000000 0.000000 l
-7.163444 0.000000 0.000000 7.163445 0.000000 16.000000 c
-0.000000 16.000000 l
-h
-f
-n
-Q
-q
-1.000000 0.000000 -0.000000 1.000000 97.359375 36.464844 cm
-1.000000 1.000000 1.000000 scn
-6.471609 3.596714 m
-8.828284 5.953390 l
-10.185929 4.595745 l
-7.829254 2.239069 l
-6.038204 0.448019 3.134338 0.448019 1.343288 2.239070 c
--0.447762 4.030120 -0.447763 6.933986 1.343287 8.725036 c
-3.699963 11.081712 l
-5.057608 9.724067 l
-2.700932 7.367391 l
-1.659689 6.326147 1.659689 4.637959 2.700933 3.596715 c
-3.742177 2.555470 5.430367 2.555470 6.471609 3.596714 c
-h
-13.580042 7.989858 m
-12.222397 9.347503 l
-14.579067 11.704172 l
-15.620311 12.745417 15.620311 14.433605 14.579067 15.474849 c
-13.537824 16.516092 11.849633 16.516092 10.808391 15.474849 c
-8.451720 13.118179 l
-7.094075 14.475824 l
-9.450746 16.832495 l
-11.241796 18.623545 14.145662 18.623543 15.936712 16.832493 c
-17.727762 15.041444 17.727762 12.137577 15.936712 10.346527 c
-13.580042 7.989858 l
-h
-10.841346 13.094539 m
-5.081270 7.334903 l
-6.438863 5.977206 l
-12.198938 11.736842 l
-10.841346 13.094539 l
-h
-f*
-n
-Q
-
-endstream
-endobj
-
-3 0 obj
-  12299
-endobj
-
-4 0 obj
-  << /Annots []
-     /Type /Page
-     /MediaBox [ 0.000000 0.000000 128.000000 128.000000 ]
-     /Resources 1 0 R
-     /Contents 2 0 R
-     /Parent 5 0 R
-  >>
-endobj
-
-5 0 obj
-  << /Kids [ 4 0 R ]
-     /Count 1
-     /Type /Pages
-  >>
-endobj
-
-6 0 obj
-  << /Pages 5 0 R
-     /Type /Catalog
-  >>
-endobj
-
-xref
-0 7
-0000000000 65535 f
-0000000010 00000 n
-0000000074 00000 n
-0000012429 00000 n
-0000012453 00000 n
-0000012628 00000 n
-0000012702 00000 n
-trailer
-<< /ID [ (some) (id) ]
-   /Root 6 0 R
-   /Size 7
->>
-startxref
-12761
-%%EOF

PDF Office/PDF Master/Class/Appearance/Image.xcassets/RightSide/icon_btn_viewbtn_icon_empty_nomarkup.imageset/Contents.json

@@ -1,12 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "no markup.pdf",
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

PDF Office/PDF Master/Class/Appearance/Image.xcassets/RightSide/icon_btn_viewbtn_icon_empty_nomarkup.imageset/no markup.pdf

@@ -1,420 +0,0 @@
-%PDF-1.7
-
-1 0 obj
-  << >>
-endobj
-
-2 0 obj
-  << /Length 3 0 R >>
-stream
-/DeviceRGB CS
-/DeviceRGB cs
-q
-1.000000 0.000000 -0.000000 1.000000 18.428711 6.427734 cm
-0.807843 0.815686 0.831373 scn
-3.657143 111.000000 m
-88.342857 111.000000 l
-88.705788 111.000000 89.000000 110.705788 89.000000 110.342857 c
-89.000000 3.657143 l
-89.000000 3.294212 88.705788 3.000000 88.342857 3.000000 c
-3.657141 3.000000 l
-3.294213 3.000000 3.000000 3.294212 3.000000 3.657143 c
-3.000000 110.342857 l
-3.000000 110.705788 3.294210 111.000000 3.657143 111.000000 c
-h
-0.000000 110.342857 m
-0.000000 112.362648 1.637359 114.000000 3.657143 114.000000 c
-88.342857 114.000000 l
-90.362640 114.000000 92.000000 112.362640 92.000000 110.342857 c
-92.000000 3.657143 l
-92.000000 1.637352 90.362640 0.000000 88.342857 0.000000 c
-3.657141 0.000000 l
-1.637357 0.000000 0.000000 1.637360 0.000000 3.657143 c
-0.000000 110.342857 l
-h
-13.571167 89.072266 m
-26.371166 89.072266 l
-26.371166 92.072266 l
-13.571167 92.072266 l
-13.571167 89.072266 l
-h
-65.685585 89.072266 m
-30.028442 89.072266 l
-30.028442 92.072266 l
-65.685585 92.072266 l
-65.685585 89.072266 l
-h
-13.571167 79.929199 m
-49.228310 79.929199 l
-49.228310 82.929199 l
-13.571167 82.929199 l
-13.571167 79.929199 l
-h
-62.942596 43.357910 m
-13.571167 43.357910 l
-13.571167 46.357910 l
-62.942596 46.357910 l
-62.942596 43.357910 l
-h
-13.571167 61.643555 m
-54.714024 61.643555 l
-54.714024 64.643555 l
-13.571167 64.643555 l
-13.571167 61.643555 l
-h
-70.256927 61.643555 m
-58.371216 61.643555 l
-58.371216 64.643555 l
-70.256927 64.643555 l
-70.256927 61.643555 l
-h
-13.571167 34.214844 m
-45.571167 34.214844 l
-45.571167 37.214844 l
-13.571167 37.214844 l
-13.571167 34.214844 l
-h
-f*
-n
-Q
-q
-1.000000 0.000000 -0.000000 1.000000 32.000000 57.428223 cm
-0.741176 0.874510 0.992157 scn
-0.000000 1.500000 m
-27.428572 1.500000 l
-27.428572 4.500000 l
-0.000000 4.500000 l
-0.000000 1.500000 l
-h
-f
-n
-Q
-q
-1.000000 0.000000 -0.000000 1.000000 32.000000 75.714355 cm
-0.741176 0.874510 0.992157 scn
-0.000000 1.500000 m
-64.000000 1.500000 l
-64.000000 4.500000 l
-0.000000 4.500000 l
-0.000000 1.500000 l
-h
-f
-n
-Q
-q
-1.000000 0.000000 -0.000000 1.000000 32.000000 84.856934 cm
-0.741176 0.874510 0.992157 scn
-0.000000 1.500000 m
-35.657143 1.500000 l
-35.657143 4.500000 l
-0.000000 4.500000 l
-0.000000 1.500000 l
-h
-f
-n
-Q
-q
-1.000000 0.000000 -0.000000 1.000000 74.000000 8.382568 cm
-0.741176 0.874510 0.992157 scn
-6.909121 36.936455 m
-6.147676 36.610123 5.794949 35.728306 6.121283 34.966858 c
-6.447616 34.205414 7.329434 33.852688 8.090879 34.179024 c
-6.909121 36.936455 l
-h
-31.611111 42.335518 m
-31.347425 43.812157 l
-31.611111 42.335518 l
-h
-28.500000 27.557739 m
-27.213760 28.329483 l
-27.183294 28.278706 l
-27.156925 28.225685 l
-28.500000 27.557739 l
-h
-16.666666 5.002186 m
-17.924332 4.184704 l
-17.924332 4.184704 l
-16.666666 5.002186 l
-h
-13.722221 9.002186 m
-15.216819 9.129387 l
-13.722221 9.002186 l
-h
-15.777779 49.057739 m
-17.135006 49.696434 l
-17.135006 49.696434 l
-15.777779 49.057739 l
-h
-36.000000 10.557739 m
-37.384617 11.134663 l
-37.373112 11.162273 l
-37.360512 11.189407 l
-36.000000 10.557739 l
-h
-21.500000 16.557739 m
-20.554111 15.393570 l
-21.500000 16.557739 l
-h
-0.987757 35.686604 m
-0.364302 36.232128 -0.583342 36.168953 -1.128865 35.545494 c
--1.674388 34.922043 -1.611212 33.974396 -0.987757 33.428875 c
-0.987757 35.686604 l
-h
-8.090879 34.179024 m
-15.323940 37.278904 24.049341 39.461472 31.874796 40.858875 c
-31.347425 43.812157 l
-23.405291 42.393921 14.433543 40.161209 6.909121 36.936455 c
-8.090879 34.179024 l
-h
-31.874796 40.858875 m
-32.704632 41.007061 33.193905 40.984936 33.450100 40.925903 c
-33.657784 40.878048 33.609203 40.837177 33.566692 40.914242 c
-33.556973 40.931866 33.627224 40.811882 33.576813 40.400520 c
-33.528061 40.002708 33.383049 39.471306 33.121090 38.800072 c
-32.041645 36.034134 29.531816 32.192909 27.213760 28.329483 c
-29.786240 26.785995 l
-31.968184 30.422569 34.714436 34.631042 35.915806 37.709396 c
-36.224052 38.499233 36.463291 39.291069 36.554535 40.035603 c
-36.644115 40.766594 36.610104 41.608074 36.193565 42.363224 c
-35.744236 43.177818 34.986279 43.650543 34.123722 43.849297 c
-33.309681 44.036873 32.367851 43.994377 31.347425 43.812157 c
-31.874796 40.858875 l
-h
-27.156925 28.225685 m
-23.705814 21.286354 19.535950 12.168819 15.409000 5.819668 c
-17.924332 4.184704 l
-22.175884 10.725555 26.472799 20.113005 29.843075 26.889793 c
-27.156925 28.225685 l
-h
-15.409000 5.819668 m
-15.045051 5.259747 14.773107 4.921307 14.586165 4.732567 c
-14.365344 4.509621 14.398689 4.632957 14.663114 4.679039 c
-15.110507 4.757011 15.462280 4.514668 15.596972 4.345524 c
-15.665335 4.259678 15.627647 4.263603 15.565712 4.509201 c
-15.449396 4.970444 15.385062 5.693172 15.341676 6.586193 c
-15.302126 7.400253 15.279515 8.392704 15.216819 9.129387 c
-12.227624 8.874985 l
-12.284662 8.204788 12.298976 7.392262 12.345210 6.440613 c
-12.387609 5.567921 12.457920 4.564205 12.656783 3.775627 c
-12.752438 3.396320 12.917473 2.894493 13.250149 2.476723 c
-13.649156 1.975655 14.326836 1.575214 15.178186 1.723587 c
-15.846569 1.840073 16.361923 2.262310 16.717621 2.621429 c
-17.107199 3.014755 17.506283 3.541553 17.924332 4.184704 c
-15.409000 5.819668 l
-h
-15.216819 9.129387 m
-14.353909 19.268574 15.000000 29.566454 15.000000 39.946629 c
-12.000000 39.946629 l
-12.000000 29.823500 11.350729 19.178509 12.227624 8.874985 c
-15.216819 9.129387 l
-h
-15.000000 39.946629 m
-15.000000 40.621738 14.885940 42.125618 14.791362 43.692078 c
-14.692861 45.323513 14.606874 47.126232 14.640316 48.573441 c
-14.657182 49.303307 14.703580 49.883717 14.776879 50.284084 c
-14.813871 50.486134 14.848269 50.587982 14.861737 50.619987 c
-14.887888 50.682125 14.825809 50.482994 14.561678 50.308975 c
-14.187595 50.062515 13.762521 50.086224 13.493927 50.201157 c
-13.314978 50.277729 13.283905 50.357586 13.391068 50.231804 c
-13.591265 49.996822 13.932779 49.455559 14.420550 48.419044 c
-17.135006 49.696434 l
-16.623997 50.782333 16.145243 51.625015 15.674665 52.177357 c
-15.446441 52.445236 15.117353 52.769600 14.674135 52.959255 c
-14.141273 53.187271 13.485673 53.192635 12.911184 52.814144 c
-12.446646 52.508087 12.214278 52.063229 12.096629 51.783676 c
-11.966297 51.473988 11.883385 51.138184 11.825928 50.824348 c
-11.710330 50.192944 11.659278 49.428658 11.641116 48.642746 c
-11.604506 47.058403 11.698160 45.145252 11.796815 43.511276 c
-11.899392 41.812321 12.000000 40.501244 12.000000 39.946629 c
-15.000000 39.946629 l
-h
-14.420550 48.419044 m
-17.630047 41.598862 21.086447 35.428741 24.529066 29.253183 c
-27.977661 23.066904 31.415783 16.869434 34.639488 9.926071 c
-37.360512 11.189407 l
-34.084217 18.246044 30.595032 24.532991 27.149418 30.713923 c
-23.697826 36.905575 20.293116 42.985451 17.135006 49.696434 c
-14.420550 48.419044 l
-h
-34.615383 9.980816 m
-34.781166 9.582943 34.852776 9.318554 34.877666 9.161556 c
-34.904644 8.991390 34.860435 9.052486 34.928562 9.218830 c
-35.022038 9.447056 35.217350 9.612465 35.399292 9.680161 c
-35.523434 9.726349 35.553726 9.695412 35.399521 9.713341 c
-35.087204 9.749657 34.540226 9.918835 33.753716 10.279690 c
-32.996906 10.626915 32.122597 11.102165 31.188665 11.657715 c
-27.433598 13.891415 23.100784 17.189808 22.445889 17.721909 c
-20.554111 15.393570 l
-21.281944 14.802204 25.736843 11.410084 29.654951 9.079395 c
-30.639313 8.493847 31.613640 7.960880 32.502689 7.552982 c
-33.362038 7.158710 34.258141 6.825848 35.053013 6.733421 c
-35.452400 6.686981 35.952316 6.684994 36.445465 6.868484 c
-36.996414 7.073483 37.460121 7.484539 37.704739 8.081791 c
-37.924007 8.617161 37.913689 9.170658 37.840664 9.631290 c
-37.765549 10.105095 37.603264 10.609909 37.384617 11.134663 c
-34.615383 9.980816 l
-h
-22.445889 17.721909 m
-14.449553 24.218933 8.966637 28.705084 0.987757 35.686604 c
--0.987757 33.428875 l
-7.033363 26.410395 12.550447 21.896545 20.554111 15.393570 c
-22.445889 17.721909 l
-h
-f
-n
-Q
-q
-1.000000 0.000000 -0.000000 1.000000 10.000000 7.729309 cm
-0.741176 0.874510 0.992157 scn
--1.414032 4.771204 m
--1.690458 3.990255 -1.281462 3.133085 -0.500514 2.856659 c
-0.280434 2.580233 1.137605 2.989227 1.414032 3.770176 c
--1.414032 4.771204 l
-h
-11.920430 19.190746 m
-11.096071 20.443914 l
-11.920430 19.190746 l
-h
-25.534946 21.563398 m
-25.006783 20.159460 l
-25.534946 21.563398 l
-h
-34.623657 17.167440 m
-35.500271 18.384628 l
-35.500271 18.384628 l
-34.623657 17.167440 l
-h
-43.304302 10.646284 m
-42.524216 9.365087 l
-43.304302 10.646284 l
-h
-54.754837 9.772915 m
-55.463898 8.451085 l
-54.754837 9.772915 l
-h
-63.113979 12.902488 m
-63.636635 14.308487 l
-63.636635 14.308487 l
-63.113979 12.902488 l
-h
-67.120430 10.355162 m
-68.094177 11.496135 l
-68.094177 11.496135 l
-67.120430 10.355162 l
-h
-67.619385 8.138449 m
-67.943260 7.375954 68.823929 7.020381 69.586426 7.344254 c
-70.348923 7.668128 70.704491 8.548802 70.380623 9.311297 c
-67.619385 8.138449 l
-h
-1.414032 3.770176 m
-3.458888 9.547219 8.123463 14.897581 12.744788 17.937576 c
-11.096071 20.443914 l
-6.008070 17.096931 0.879184 11.249902 -1.414032 4.771204 c
-1.414032 3.770176 l
-h
-12.744788 17.937576 m
-16.473021 20.390078 21.233128 21.579119 25.006783 20.159460 c
-26.063112 22.967337 l
-21.056204 24.850948 15.270406 23.189871 11.096071 20.443914 c
-12.744788 17.937576 l
-h
-25.006783 20.159460 m
-28.101793 18.995110 31.168697 17.807167 33.747040 15.950253 c
-35.500271 18.384628 l
-32.549904 20.509476 29.111954 21.820354 26.063112 22.967337 c
-25.006783 20.159460 l
-h
-33.747040 15.950253 m
-35.184177 14.915230 36.530296 13.796801 37.973980 12.644245 c
-39.396698 11.508428 40.889618 10.360345 42.524216 9.365087 c
-44.084385 11.927483 l
-42.620388 12.818867 41.250099 13.867550 39.845699 14.988745 c
-38.462265 16.093201 37.017357 17.292027 35.500271 18.384628 c
-33.747040 15.950253 l
-h
-42.524216 9.365087 m
-46.199036 7.127597 51.250221 6.190775 55.463898 8.451085 c
-54.045776 11.094746 l
-51.051292 9.488435 47.162556 10.053274 44.084385 11.927483 c
-42.524216 9.365087 l
-h
-55.463898 8.451085 m
-56.149303 8.818752 56.859203 9.288332 57.511978 9.715146 c
-58.189854 10.158373 58.831165 10.572711 59.471367 10.912008 c
-60.785213 11.608329 61.760212 11.805440 62.591328 11.496489 c
-63.636635 14.308487 l
-61.565346 15.078449 59.591351 14.370883 58.066517 13.562743 c
-57.287373 13.149810 56.536922 12.661972 55.870228 12.226053 c
-55.178429 11.773723 54.590946 11.387187 54.045776 11.094746 c
-55.463898 8.451085 l
-h
-62.591328 11.496489 m
-63.704117 11.082829 65.043808 10.155426 66.146690 9.214188 c
-68.094177 11.496135 l
-66.896294 12.518453 65.239624 13.712605 63.636635 14.308487 c
-62.591328 11.496489 l
-h
-66.146690 9.214188 m
-66.313065 9.072199 66.522644 8.918654 66.694443 8.793429 c
-66.885521 8.654161 67.065567 8.524524 67.239883 8.390882 c
-67.415649 8.256126 67.547867 8.145634 67.636772 8.059432 c
-67.755547 7.944264 67.688324 7.976144 67.619385 8.138449 c
-70.380623 9.311297 l
-70.205025 9.724704 69.906967 10.036900 69.725121 10.213218 c
-69.513405 10.418502 69.275223 10.610664 69.065201 10.771686 c
-68.853722 10.933821 68.632599 11.093082 68.461502 11.217789 c
-68.271141 11.356540 68.157555 11.442045 68.094177 11.496135 c
-66.146690 9.214188 l
-h
-f
-n
-Q
-
-endstream
-endobj
-
-3 0 obj
-  10947
-endobj
-
-4 0 obj
-  << /Annots []
-     /Type /Page
-     /MediaBox [ 0.000000 0.000000 128.000000 128.000000 ]
-     /Resources 1 0 R
-     /Contents 2 0 R
-     /Parent 5 0 R
-  >>
-endobj
-
-5 0 obj
-  << /Kids [ 4 0 R ]
-     /Count 1
-     /Type /Pages
-  >>
-endobj
-
-6 0 obj
-  << /Pages 5 0 R
-     /Type /Catalog
-  >>
-endobj
-
-xref
-0 7
-0000000000 65535 f
-0000000010 00000 n
-0000000034 00000 n
-0000011037 00000 n
-0000011061 00000 n
-0000011236 00000 n
-0000011310 00000 n
-trailer
-<< /ID [ (some) (id) ]
-   /Root 6 0 R
-   /Size 7
->>
-startxref
-11369
-%%EOF

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

@@ -294,6 +294,15 @@ import Cocoa
                 self.rightMessageVC.frameUpdateHandle = { [weak self] rect in
                     var superRect = self?.rightToolbarItemView?.frame
                     superRect?.size.width = (self?.rightMessageVC.view.frame.size.width)! + 8
+                    
+                    if self?.rightToolbarItemView.superview != nil {
+                        let viewRect = self?.rightToolbarItemView.superview?.frame
+                        if (superRect?.origin.x)! + (superRect?.size.width)! > (viewRect?.origin.x)! + (viewRect?.size.width)!{
+                            let offsetValue = ((superRect?.origin.x)! + (superRect?.size.width)! - (viewRect?.origin.x)! - (viewRect?.size.width)! )
+                            superRect?.origin.x -= offsetValue
+                        }
+                    }
+                    
                     self?.rightToolbarItemView.frame = superRect!;
                 }
                 var rect = self.rightMessageVC.view.frame;

PDF Office/PDF Master/Class/Home/ViewController/KMHomePopViewController.swift

@@ -68,6 +68,8 @@ typealias popCellViewDownCallback = (_ downEntered: Bool, _ count: String) -> Vo
     // MARK: Private
     
     func updateUI() {
+        customBox.fillColor = background
+        
         var widthMax: Float = 0;
         let subViews: [NSView] = self.customBox.contentView!.subviews
         for subView in subViews {

PDF Office/PDF Master/Class/Home/ViewController/customViewController/KMDesignSelect.swift

@@ -157,6 +157,9 @@ class KMSelectCell: NSTextFieldCell {
     var createFilePopover: NSPopover = NSPopover.init()
     var popoverBehavior: NSPopover.Behavior = .semitransient
     var popViewController: KMHomePopViewController?
+    var popViewControllerBackground: NSColor?
+    var popViewControllerTextColor: NSColor?
+    var popViewControllerEnterFillColor: NSColor?
     
     init(withType type: SelectType) {
         super.init(nibName: "KMDesignSelect", bundle: nil)
@@ -414,6 +417,8 @@ class KMSelectCell: NSTextFieldCell {
         textField.isEditable = editable
 //        textField.placeholderString = placeholderString
         textField.lineBreakMode = lineBreakMode
+        
+        popViewController?.updateUI()
     }
     
     func removeAllItems() {
@@ -445,6 +450,19 @@ class KMSelectCell: NSTextFieldCell {
             } else {
                 vc = KMHomePopViewController()
             }
+            
+            if (self.popViewControllerBackground != nil) {
+                vc?.background = self.popViewControllerBackground!
+            }
+            
+            if self.popViewControllerBackground != nil {
+                vc?.textColor = self.popViewControllerTextColor!
+            }
+            
+            if self.popViewControllerBackground != nil {
+                vc?.enterFillColor = self.popViewControllerEnterFillColor!
+            }
+            
             let _ = vc?.initWithPopViewDataArr(items)
             self.popViewController = vc
             

PDF Office/PDF Master/Class/PDFTools/PageEdit/Controller/KMPDFEditViewController.swift

@@ -149,7 +149,12 @@ class KMPDFEditViewController: KMPDFThumbViewBaseController {
 //        self.thumbnailView.dragMoveEffectAnimated = true
 //        self.thumbnailView.collectionView.backgroundColor(NSColor.km_init(hex: "#CED0D4"))
         self.thumbnailView.collectionView.wantsLayer = true
-        self.thumbnailView.collectionView.layer?.backgroundColor = KMAppearance.PDFViewBackgroundColor().cgColor
+//        self.thumbnailView.collectionView.layer?.backgroundColor = KMAppearance.PDFViewBackgroundColor().cgColor
+        if KMAppearance.isDarkMode() {
+            self.thumbnailView.collectionView.layer?.backgroundColor = NSColor.km_init(hex: "#5F5F60").cgColor
+        } else {
+            self.thumbnailView.collectionView.layer?.backgroundColor = NSColor.km_init(hex: "#DADBDE").cgColor
+        }
         
         self.thumbnailSizeView.wantsLayer = true
         self.thumbnailSizeView.layer?.backgroundColor = KMAppearance.Layout.b80Color().cgColor
@@ -253,7 +258,7 @@ class KMPDFEditViewController: KMPDFThumbViewBaseController {
             indexs.sort(){$0 < $1}
             self.toolBar.setPageRangeString(KMPageRangeTools.newParseSelectedIndexs(selectedIndex: indexs))
             
-            if let view = self.listView { // 存储阅读视图的当前页面索引
+            if self.listView != nil { // 存储阅读视图的当前页面索引
                 if indexs.count != 0 {
                     self._listViewCurrentIndex = indexs.last!
                 }
@@ -261,6 +266,22 @@ class KMPDFEditViewController: KMPDFThumbViewBaseController {
         }
     }
     
+    override func interfaceThemeDidChanged(_ appearance: NSAppearance.Name) {
+        super.interfaceThemeDidChanged(appearance)
+        
+        self.thumbnailView.collectionView.wantsLayer = true
+        if KMAppearance.isDarkMode() {
+            self.thumbnailView.collectionView.layer?.backgroundColor = NSColor.km_init(hex: "#5F5F60").cgColor
+        } else {
+            self.thumbnailView.collectionView.layer?.backgroundColor = NSColor.km_init(hex: "#DADBDE").cgColor
+        }
+        Task { @MainActor in
+            let ips = self.thumbnailView.selectionIndexPaths
+            self.thumbnailView.collectionView.reloadData()
+            self.thumbnailView.selectionIndexPaths = ips
+        }
+    }
+    
     // MARK: Private Methods
     
     private func getSelecteIndex() -> Int {

PDF Office/PDF Master/Class/PDFTools/PageEdit/View/KMPageEditThumbnailItem.swift

@@ -146,7 +146,11 @@ class KMPageEditThumbnailItem: NSCollectionViewItem {
 //                 self.backgroundView.layer?.borderColor = NSColor.km_init(hex: "#1770F4").cgColor
                  self.pageTextLabel.textColor = .white
                  self.pageTextLabel.layer?.backgroundColor = NSColor.systemBlue.cgColor
-                 self.pageBox.layer?.backgroundColor = NSColor(white: 192.0/255.0, alpha: 1.0).cgColor
+                 if KMAppearance.isDarkMode() {
+                     self.pageBox.layer?.backgroundColor = NSColor(white: 84.0/255.0, alpha: 1.0).cgColor
+                 } else {
+                     self.pageBox.layer?.backgroundColor = NSColor(white: 192.0/255.0, alpha: 1.0).cgColor
+                 }
              } else {
 //                 self.backgroundView.layer?.backgroundColor = NSColor.clear.cgColor
 //                 self.backgroundView.layer?.borderColor = NSColor.clear.cgColor

PDF Office/PDF Master/Class/PDFWindowController/OC_Tool/KMOCToolClass.swift

@@ -164,7 +164,7 @@ class KMOCToolClass {
                 
                 let dic: [NSAttributedString.Key: Any] = [
                     .font: NSFont(name: "SFProText-Regular", size: 14.0)!,
-                    .foregroundColor: NSColor(red: 0.145, green: 0.149, blue: 0.161, alpha: 1),
+//                    .foregroundColor: NSColor(red: 0.145, green: 0.149, blue: 0.161, alpha: 1),
                     .paragraphStyle: paragraphStyle
                 ]
                 
@@ -173,7 +173,7 @@ class KMOCToolClass {
                 
                 // Highlight string
                 let highlightDic: [NSAttributedString.Key: Any] = [
-                    .backgroundColor: NSColor(red: 1.0, green: 0.9, blue: 0.0, alpha: 1.0)
+                    .backgroundColor: KMAppearance.KM_FFF700_Color60()
                 ]
                 
                 if attributed.length > tRange.length + tRange.location {

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/AppKitCategories/CPDFListEditAnnotationViewController.swift

@@ -67,7 +67,7 @@ class CPDFListEditAnnotationViewController: NSViewController, NSTextViewDelegate
             box?.borderColor = NSColor.white
             self.contentTextView.insertionPointColor = NSColor.black
         }
-        box?.fillColor = NSColor.white
+        box?.fillColor = KMAppearance.KMColor_Layout_L1()
         self.colors.removeAll()
         var i = 0
         for color in KMAnnotationPropertiesColorManager.manager.anchoredNoteColors {

PDF Office/PDF Master/Class/PDFWindowController/Side/LeftSide/KMLeftSideEmptyFileViewController.swift

@@ -44,7 +44,8 @@ class KMLeftSideEmptyFileViewController: NSViewController {
         self.notCreateOutLine.stringValue = KMLocalizedString("No outlines", nil)
         self.notCreateOutLine.textColor = KMAppearance.Layout.h0Color()
         self.emptyAnnotationLabel.stringValue = KMLocalizedString("No Annotations",nil)
-        self.emptyAnnotationLabel.textColor = KMAppearance.Layout.h0Color()
+//        self.emptyAnnotationLabel.textColor = KMAppearance.Layout.h0Color()
+        self.emptyAnnotationLabel.textColor = NSColor.km_init(hex: "#94989C")
         self.emptySnapLabel.stringValue = KMLocalizedString("To create snapshot select an area in contents, right click it and select \"Snapshot\" .",nil)
         self.emptySnapLabel.textColor = KMAppearance.Layout.h2Color()
         self.snapshotNotCreatedLabel.stringValue = KMLocalizedString("No Snapshots", nil)
@@ -74,8 +75,6 @@ class KMLeftSideEmptyFileViewController: NSViewController {
         self.emptyAnnotationView.layer?.backgroundColor = .clear
         self.emptyOutlineView.wantsLayer = true
         self.emptyOutlineView.layer?.backgroundColor = .clear
-        
-        var ss: [Int] = [Int](repeating: 0, count: 0)
     }
 
     override func viewDidLoad() {

PDF Office/PDF Master/Class/PDFWindowController/Side/LeftSide/KMLeftSideViewController+Action.swift

@@ -160,8 +160,16 @@ extension KMLeftSideViewController {
     override func interfaceThemeDidChanged(_ appearance: NSAppearance.Name) {
         super.interfaceThemeDidChanged(appearance)
         
-        self.updateViewColor()
-        self.leftView.interfaceThemeDidChanged(appearance)
+        Task { @MainActor in
+            self.updateViewColor()
+            self.leftView.interfaceThemeDidChanged(appearance)
+            
+            if self.type.methodType == .Search {
+                if self.findPaneState == .singular {
+                    self.findTableView.reloadData()
+                }
+            }
+        }
     }
 }
 

PDF Office/PDF Master/Class/PDFWindowController/Side/LeftSide/View/KMSegmentedControl.swift

@@ -109,7 +109,12 @@ class KMSegmentedControl: NSControl {
                     return
                 }
                 if action == .enter {
-                    cbtn.layer?.backgroundColor = NSColor(hex: "DFE1E5").cgColor
+                    if KMAppearance.isDarkMode() {
+                        cbtn.layer?.backgroundColor = NSColor(hex: "282A2D").cgColor
+                    } else {
+                        cbtn.layer?.backgroundColor = NSColor(hex: "DFE1E5").cgColor
+                    }
+                    
                 } else if action == .exit {
                     cbtn.layer?.backgroundColor = .clear
                 }

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMGeneralAnnotationViewController.swift

@@ -2012,9 +2012,9 @@ let KMColorPickerViewHeight: CGFloat = 64
                 } else if tAnnotation is KMSelfSignAnnotationFreeText {
                     let newAnnotation = (tAnnotation as! KMSelfSignAnnotationFreeText)
                     if let font = newAnnotation.font {
-                        if let fontSize = font.fontDescriptor.object(forKey: NSFontDescriptor.AttributeName.size) as? String {
+                        if let fontSize = font.fontDescriptor.object(forKey: NSFontDescriptor.AttributeName.size) as? Int {
                             let attributeFontDescriptor = NSFontDescriptor(fontAttributes: [NSFontDescriptor.AttributeName.family: familyString, NSFontDescriptor.AttributeName.face: styleString])
-                            if let newFont = NSFont(descriptor: attributeFontDescriptor, size: fontSize.stringToCGFloat()) {
+                            if let newFont = NSFont(descriptor: attributeFontDescriptor, size: CGFloat(fontSize)) {
                                 newAnnotation.font = newFont
                             }
                         }
@@ -2105,11 +2105,11 @@ let KMColorPickerViewHeight: CGFloat = 64
                     if tAnnotation is CPDFFreeTextAnnotation {
                         let newAnnotation = (tAnnotation as! CPDFFreeTextAnnotation)
                         if let font = newAnnotation.font {
-                            if let fontSize = font.fontDescriptor.object(forKey: NSFontDescriptor.AttributeName.size) as? String,
+                            if let fontSize = font.fontDescriptor.object(forKey: NSFontDescriptor.AttributeName.size) as? Int,
                                let familyString = font.fontDescriptor.object(forKey: NSFontDescriptor.AttributeName.family) as? String {
                                 
                                 let attributeFontDescriptor = NSFontDescriptor(fontAttributes: [NSFontDescriptor.AttributeName.family: familyString, NSFontDescriptor.AttributeName.face: styleString])
-                                if let newFont = NSFont(descriptor: attributeFontDescriptor, size: fontSize.stringToCGFloat()) {
+                                if let newFont = NSFont(descriptor: attributeFontDescriptor, size: CGFloat(fontSize)) {
                                     newAnnotation.font = newFont
                                 }
                             }
@@ -2117,11 +2117,11 @@ let KMColorPickerViewHeight: CGFloat = 64
                     } else if tAnnotation is KMSelfSignAnnotationFreeText {
                         let newAnnotation = (tAnnotation as! KMSelfSignAnnotationFreeText)
                         if let font = newAnnotation.font {
-                            if let fontSize = font.fontDescriptor.object(forKey: NSFontDescriptor.AttributeName.size) as? String,
+                            if let fontSize = font.fontDescriptor.object(forKey: NSFontDescriptor.AttributeName.size) as? Int,
                                let familyString = font.fontDescriptor.object(forKey: NSFontDescriptor.AttributeName.family) as? String {
                                 
                                 let attributeFontDescriptor = NSFontDescriptor(fontAttributes: [NSFontDescriptor.AttributeName.family: familyString, NSFontDescriptor.AttributeName.face: styleString])
-                                if let newFont = NSFont(descriptor: attributeFontDescriptor, size: fontSize.stringToCGFloat()) {
+                                if let newFont = NSFont(descriptor: attributeFontDescriptor, size: CGFloat(fontSize)) {
                                     newAnnotation.font = newFont
                                 }
                                 newAnnotation.updateBounds()
@@ -2132,11 +2132,11 @@ let KMColorPickerViewHeight: CGFloat = 64
             } else {
                 if annotationType == .freeText || annotationType == .signText || annotationType == .signDate {
                     let font = NSFont(name: (annotationModel?.fontName())!, size: (annotationModel?.fontSize())!) ?? NSFont.systemFont(ofSize: 16)
-                    if let fontSize = font.fontDescriptor.object(forKey: NSFontDescriptor.AttributeName.size) as? String,
+                    if let fontSize = font.fontDescriptor.object(forKey: NSFontDescriptor.AttributeName.size) as? Int,
                        let familyString = font.fontDescriptor.object(forKey: NSFontDescriptor.AttributeName.family) as? String {
                         
                         let attributeFontDescriptor = NSFontDescriptor(fontAttributes: [NSFontDescriptor.AttributeName.family: familyString, NSFontDescriptor.AttributeName.face: styleString])
-                        if let newFont = NSFont(descriptor: attributeFontDescriptor, size: fontSize.stringToCGFloat()) {
+                        if let newFont = NSFont(descriptor: attributeFontDescriptor, size: CGFloat(fontSize)) {
                             annotationModel?.setFontName(newFont.fontName)
                             annotationModel?.setFontSize(newFont.pointSize)
                         }

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/ViewController/KMFillSignTextPanel.swift

@@ -149,9 +149,9 @@ class KMFillSignTextPanel: KMPropertiesPanelSubViewController {
     }
     
     func initializeUI() {
-        previewBox.borderColor = NSColor.km_init(hex: "#DFE1E5")
+        previewBox.borderColor = KMAppearance.Interactive.s0Color()
         previewBox.borderWidth = 1.0
-        previewBox.fillColor = NSColor.km_init(hex: "#FFFFFF")
+        previewBox.fillColor = KMAppearance.KMColor_Layout_L1()
         previewBox.cornerRadius = 4.0
         
         fontLabel.font = NSFont.SFProTextSemiboldFont(12.0)
@@ -170,6 +170,17 @@ class KMFillSignTextPanel: KMPropertiesPanelSubViewController {
         fontNameVC.addItems(withObjectValues: fontNames)
         fontNameVC.selectItem(at: 0)
         fontNameVC.delete = self
+        fontNameVC.borderColor = KMAppearance.Interactive.s0Color()
+        fontNameVC?.background = KMAppearance.Layout.l1Color()
+        fontNameVC?.background_hov = KMAppearance.Layout.l1Color()
+        fontNameVC?.background_focus = KMAppearance.Layout.l1Color()
+        fontNameVC?.textColor = KMAppearance.Layout.h1Color()
+        fontNameVC?.textColor_hov = KMAppearance.Layout.h1Color()
+        fontNameVC?.textColor_focus = KMAppearance.Layout.h1Color()
+        fontNameVC?.popViewControllerBackground = KMAppearance.Layout.bgColor()
+        fontNameVC?.popViewControllerTextColor = KMAppearance.Layout.h0Color()
+        fontNameVC?.popViewControllerEnterFillColor = KMAppearance.Interactive.s0Color()
+        fontNameVC?.updateUI()
         
         let fontnames = annotationModel.fontName().components(separatedBy: "-")
         let currentFont: NSFont?
@@ -185,6 +196,17 @@ class KMFillSignTextPanel: KMPropertiesPanelSubViewController {
         fontWeightVC.addItems(withObjectValues: styles)
         fontWeightVC.selectItem(at: 0)
         fontWeightVC.delete = self
+        fontWeightVC.borderColor = KMAppearance.Interactive.s0Color()
+        fontWeightVC?.background = KMAppearance.Layout.l1Color()
+        fontWeightVC?.background_hov = KMAppearance.Layout.l1Color()
+        fontWeightVC?.background_focus = KMAppearance.Layout.l1Color()
+        fontWeightVC?.textColor = KMAppearance.Layout.h1Color()
+        fontWeightVC?.textColor_hov = KMAppearance.Layout.h1Color()
+        fontWeightVC?.textColor_focus = KMAppearance.Layout.h1Color()
+        fontWeightVC?.popViewControllerBackground = KMAppearance.Layout.bgColor()
+        fontWeightVC?.popViewControllerTextColor = KMAppearance.Layout.h0Color()
+        fontWeightVC?.popViewControllerEnterFillColor = KMAppearance.Interactive.s0Color()
+        fontWeightVC?.updateUI()
 
         fontSizeBox.fillColor = .clear
         fontSizeBox.contentView = fontSizeVC.view
@@ -192,6 +214,17 @@ class KMFillSignTextPanel: KMPropertiesPanelSubViewController {
         fontSizeVC.addItems(withObjectValues: ["8pt", "9pt", "10pt", "11pt", "12pt", "14pt", "16pt", "18pt", "20pt", "22pt", "24pt", "26pt", "28pt", "36pt", "48pt", "72pt"])
         fontSizeVC.selectItem(at: 0)
         fontSizeVC.delete = self
+        fontSizeVC.borderColor = KMAppearance.Interactive.s0Color()
+        fontSizeVC?.background = KMAppearance.Layout.l1Color()
+        fontSizeVC?.background_hov = KMAppearance.Layout.l1Color()
+        fontSizeVC?.background_focus = KMAppearance.Layout.l1Color()
+        fontSizeVC?.textColor = KMAppearance.Layout.h1Color()
+        fontSizeVC?.textColor_hov = KMAppearance.Layout.h1Color()
+        fontSizeVC?.textColor_focus = KMAppearance.Layout.h1Color()
+        fontSizeVC?.popViewControllerBackground = KMAppearance.Layout.bgColor()
+        fontSizeVC?.popViewControllerTextColor = KMAppearance.Layout.h0Color()
+        fontSizeVC?.popViewControllerEnterFillColor = KMAppearance.Interactive.s0Color()
+        fontSizeVC?.updateUI()
 
         leftAlignBox.fillColor = .clear
         leftAlignBox.contentView = leftVC.view
@@ -211,8 +244,10 @@ class KMFillSignTextPanel: KMPropertiesPanelSubViewController {
         rightVC.action = #selector(fontAlignAction(_:))
         rightVC.image = NSImage(named: "icon_propertybar_fontAlign_right")!
         
-        customBox.borderColor = NSColor.km_init(hex: "#DFE1E5")
-        fillCustomBox.borderColor = NSColor.km_init(hex: "#DFE1E5")
+//        customBox.borderColor = NSColor.km_init(hex: "#DFE1E5")
+//        fillCustomBox.borderColor = NSColor.km_init(hex: "#DFE1E5")
+        customBox.borderColor = KMAppearance.Interactive.s0Color()
+        fillCustomBox.borderColor = KMAppearance.Interactive.s0Color()
         customColorBox1.fillColor = .clear
         customColorBox1.contentView = customVC1.view
         customVC1.mainBox.cornerRadius = customVC1.mainBox.frame.width/2
@@ -232,7 +267,6 @@ class KMFillSignTextPanel: KMPropertiesPanelSubViewController {
         fillOpacity.action = #selector(showOpacityView(_:))
         fillOpacity.image = NSImage(named: "KMImagePropertPanelOpacityButtonImage")!
 
-        customBox.borderColor = NSColor.km_init(hex: "#DFE1E5")
         fillColorBox1.fillColor = .clear
         fillColorBox1.contentView = colorVC1.view
         colorVC1.target = self
@@ -288,6 +322,17 @@ class KMFillSignTextPanel: KMPropertiesPanelSubViewController {
         dateTypeVC.addItems(withObjectValues: self.dateTypes)
         dateTypeVC.selectItem(at: 0)
         dateTypeVC.delete = self
+        dateTypeVC.borderColor = KMAppearance.Interactive.s0Color()
+        dateTypeVC?.background = KMAppearance.Layout.l1Color()
+        dateTypeVC?.background_hov = KMAppearance.Layout.l1Color()
+        dateTypeVC?.background_focus = KMAppearance.Layout.l1Color()
+        dateTypeVC?.textColor = KMAppearance.Layout.h1Color()
+        dateTypeVC?.textColor_hov = KMAppearance.Layout.h1Color()
+        dateTypeVC?.textColor_focus = KMAppearance.Layout.h1Color()
+        dateTypeVC?.popViewControllerBackground = KMAppearance.Layout.bgColor()
+        dateTypeVC?.popViewControllerTextColor = KMAppearance.Layout.h0Color()
+        dateTypeVC?.popViewControllerEnterFillColor = KMAppearance.Interactive.s0Color()
+        dateTypeVC?.updateUI()
         
         showTimeBox.fillColor = .clear
         showTimeBox.contentView = showTimeVC.view
@@ -296,12 +341,22 @@ class KMFillSignTextPanel: KMPropertiesPanelSubViewController {
         showTimeVC.target = self
         showTimeVC.action = #selector(showTimeAction(_:))
         showTimeVC.state = .Norm
+//        showTimeVC.borderColor = KMAppearance.Interactive.s0Color()
+//        showTimeVC?.background = KMAppearance.Layout.l1Color()
+//        showTimeVC?.background_hov = KMAppearance.Layout.l1Color()
+//        showTimeVC?.background_focus = KMAppearance.Layout.l1Color()
+        showTimeVC?.textColor = KMAppearance.Layout.h1Color()
+        showTimeVC?.textColor_hov = KMAppearance.Layout.h1Color()
+        showTimeVC?.textColor_focus = KMAppearance.Layout.h1Color()
+        showTimeVC?.textColor_sel = KMAppearance.Layout.h1Color()
+        showTimeVC?.textColor_checked = KMAppearance.Layout.h1Color()
+        showTimeVC?.updateUI()
     }
     
     func initLocalization() {
         fontLabel.stringValue = NSLocalizedString("Font", comment: "")
         fillLabel.stringValue = NSLocalizedString("Fill Color", comment: "")
-        dateTypeLabel.stringValue = NSLocalizedString("Date Type", comment: "")
+        dateTypeLabel.stringValue = NSLocalizedString("Date", comment: "")
         showTimeVC.stringValue = NSLocalizedString("Show Time", comment: "")
         showTimeVC.updateUI()
     }

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/EditPDF/KMEditImagePropertyViewController.swift

@@ -115,8 +115,10 @@ class KMEditImagePropertyViewController: NSViewController {
         let isDarkModel = KMAdvertisementConfig.isDarkModel()
         if isDarkModel {
             self.backgroundView.backgroundColor(NSColor.km_init(hex: "#252526"))
+            self.noBackgroundView.backgroundColor(NSColor.km_init(hex: "#252526"))
         } else {
             self.backgroundView.backgroundColor(NSColor.km_init(hex: "#FAFAFA"))
+            self.noBackgroundView.backgroundColor(NSColor.km_init(hex: "#F7F8FA"))
         }
     }
     

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/EditPDF/KMEditPDFTextPropertyViewController.swift

@@ -187,6 +187,7 @@ class KMEditPDFTextPropertyViewController: NSViewController {
         centerAlignmentVC?.action = #selector(centerAlignmentAction)
         centerAlignmentVC?.image = NSImage(named: "KMImageNameEditPDFAlignCenter")!
         centerAlignmentVC?.image_sel = NSImage(named: "KMImageNameEditPDFAlignCenterSelect")!
+        centerAlignmentVC?.updateUI()
         
         rightAlignmentVC = KMDesignPropertySelector.init(withType: .Icon_Btn)
         rightAlignmentBox.contentView = rightAlignmentVC?.view
@@ -195,23 +196,28 @@ class KMEditPDFTextPropertyViewController: NSViewController {
         rightAlignmentVC?.action = #selector(rightAlignmentAction)
         rightAlignmentVC?.image = NSImage(named: "KMImageNameEditPDFAlignRight")!
         rightAlignmentVC?.image_sel = NSImage(named: "KMImageNameEditPDFAlignRightSelect")!
-        
-        //font
-//        var fontNameArray: [String] = []
-//        for font in CPDFAnnotationModel.supportFonts() {
-//            let fontName = (font as? NSDictionary)!.allKeys.first
-//            fontNameArray.append(fontName as! String)
-//        }
+        rightAlignmentVC?.updateUI()
         
         var fontNameArray = KMEditPDFTextManager.manager.fetchTextFontNames()
         
         fontNameVC = KMDesignSelect.init(withType: .PopButton)
-        fontNameVC?.isScrollPop = true
+//        fontNameVC?.isScrollPop = true
         fontNameBox.contentView = fontNameVC?.view
         fontNameBox.fillColor = NSColor.clear
         fontNameVC?.addItems(withObjectValues: fontNameArray)
         fontNameVC?.selectItem(at: 0)
         fontNameVC?.delete = self
+        fontNameVC?.borderColor = KMAppearance.Interactive.s0Color()
+        fontNameVC?.background = KMAppearance.Layout.l1Color()
+        fontNameVC?.background_hov = KMAppearance.Layout.l1Color()
+        fontNameVC?.background_focus = KMAppearance.Layout.l1Color()
+        fontNameVC?.textColor = KMAppearance.Layout.h1Color()
+        fontNameVC?.textColor_hov = KMAppearance.Layout.h1Color()
+        fontNameVC?.textColor_focus = KMAppearance.Layout.h1Color()
+        fontNameVC?.popViewControllerBackground = KMAppearance.Layout.bgColor()
+        fontNameVC?.popViewControllerTextColor = KMAppearance.Layout.h0Color()
+        fontNameVC?.popViewControllerEnterFillColor = KMAppearance.Interactive.s0Color()
+        fontNameVC?.updateUI()
         
         let styleArray = defaultFontStyles //KMEditPDFTextManager.manager.fetchFontStyleWithFontName(fontName: fontName)
         fontStyleVC = KMDesignSelect.init(withType: .PopButton)
@@ -220,6 +226,17 @@ class KMEditPDFTextPropertyViewController: NSViewController {
         fontStyleVC?.addItems(withObjectValues: styleArray)
         fontStyleVC?.selectItem(at: 0)
         fontStyleVC?.delete = self
+        fontStyleVC?.borderColor = KMAppearance.Interactive.s0Color()
+        fontStyleVC?.background = KMAppearance.Layout.l1Color()
+        fontStyleVC?.background_hov = KMAppearance.Layout.l1Color()
+        fontStyleVC?.background_focus = KMAppearance.Layout.l1Color()
+        fontStyleVC?.textColor = KMAppearance.Layout.h1Color()
+        fontStyleVC?.textColor_hov = KMAppearance.Layout.h1Color()
+        fontStyleVC?.textColor_focus = KMAppearance.Layout.h1Color()
+        fontStyleVC?.popViewControllerBackground = KMAppearance.Layout.bgColor()
+        fontStyleVC?.popViewControllerTextColor = KMAppearance.Layout.h0Color()
+        fontStyleVC?.popViewControllerEnterFillColor = KMAppearance.Interactive.s0Color()
+        fontStyleVC?.updateUI()
         
         fontSizeVC = KMDesignSelect.init(withType: .PopButton)
         fontSizeBox.contentView = fontSizeVC?.view
@@ -228,6 +245,17 @@ class KMEditPDFTextPropertyViewController: NSViewController {
         fontSizeVC?.addItems(withObjectValues: self.supportFontSize())
         fontSizeVC?.selectItem(at: 0)
         fontSizeVC?.delete = self
+        fontSizeVC?.borderColor = KMAppearance.Interactive.s0Color()
+        fontSizeVC?.background = KMAppearance.Layout.l1Color()
+        fontSizeVC?.background_hov = KMAppearance.Layout.l1Color()
+        fontSizeVC?.background_focus = KMAppearance.Layout.l1Color()
+        fontSizeVC?.textColor = KMAppearance.Layout.h1Color()
+        fontSizeVC?.textColor_hov = KMAppearance.Layout.h1Color()
+        fontSizeVC?.textColor_focus = KMAppearance.Layout.h1Color()
+        fontSizeVC?.popViewControllerBackground = KMAppearance.Layout.bgColor()
+        fontSizeVC?.popViewControllerTextColor = KMAppearance.Layout.h0Color()
+        fontSizeVC?.popViewControllerEnterFillColor = KMAppearance.Interactive.s0Color()
+        fontSizeVC?.updateUI()
         
         //textPresupposition
         textPresuppositionVC = KMDesignSelect.init(withType: .PopButton)
@@ -236,6 +264,17 @@ class KMEditPDFTextPropertyViewController: NSViewController {
         textPresuppositionVC?.addItems(withObjectValues: KMEditPDFTextManager.manager.updateTextPresuppositionFontNameArray())
         textPresuppositionVC?.selectItem(at: 0)
         textPresuppositionVC?.delete = self
+        textPresuppositionVC?.borderColor = KMAppearance.Interactive.s0Color()
+        textPresuppositionVC?.background = KMAppearance.Layout.l1Color()
+        textPresuppositionVC?.background_hov = KMAppearance.Layout.l1Color()
+        textPresuppositionVC?.background_focus = KMAppearance.Layout.l1Color()
+        textPresuppositionVC?.textColor = KMAppearance.Layout.h1Color()
+        textPresuppositionVC?.textColor_hov = KMAppearance.Layout.h1Color()
+        textPresuppositionVC?.textColor_focus = KMAppearance.Layout.h1Color()
+        textPresuppositionVC?.popViewControllerBackground = KMAppearance.Layout.bgColor()
+        textPresuppositionVC?.popViewControllerTextColor = KMAppearance.Layout.h0Color()
+        textPresuppositionVC?.popViewControllerEnterFillColor = KMAppearance.Interactive.s0Color()
+        textPresuppositionVC?.updateUI()
         
         textPresuppositionResetVC = KMDesignPropertySelector.init(withType: .Icon_Btn)
         resetTextPresuppositionBox.contentView = textPresuppositionResetVC?.view
@@ -469,6 +508,10 @@ extension KMEditPDFTextPropertyViewController {
         }
         
         let vc: KMHomePopViewController = KMHomePopViewController().initWithPopViewDataArr(popViewDataArr)
+        vc.background = KMAppearance.Layout.bgColor()
+        vc.textColor = KMAppearance.Layout.h0Color()
+        vc.enterFillColor = KMAppearance.Interactive.s0Color()
+        
         vc.disItems = disItems
         let createFilePopover: NSPopover = NSPopover.init()
         createFilePopover.contentViewController = vc

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/EditPDF/Manager/KMEditPDFTextManager.swift

@@ -126,10 +126,18 @@ extension KMEditPDFTextManager {
     
     func updateTextFontNames(listView: CPDFListView?) -> [String] {
         if textFontNames.count == 0 {
-            if listView != nil {
-                textFontNames = listView!.getEditFontList() as? [String] ?? []
-                textFontNames.sort()
+            
+            var fontNameArray: [String] = []
+            for font in CPDFAnnotationModel.supportFonts() {
+                let fontName = (font as? NSDictionary)!.allKeys.first
+                fontNameArray.append(fontName as! String)
             }
+            textFontNames = fontNameArray
+            
+//            if listView != nil {
+//                textFontNames = listView!.getEditFontList() as? [String] ?? []
+//                textFontNames.sort()
+//            }
         }
         return textFontNames
     }

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/KMLinkAnnotationPropertyEmptyController.swift

@@ -33,9 +33,9 @@ class KMLinkAnnotationPropertyEmptyController: KMRightSideEmptyVC {
         let titleLabelY: CGFloat = 12
         self.titleLabel.frame = NSMakeRect(titleLabelX, NSHeight(self.view.bounds)-titleLabelH-titleLabelY, NSWidth(self.view.bounds)-titleLabelX, titleLabelH)
         self.titleLabel.autoresizingMask = [.width, .minYMargin]
-        self.titleLabel.stringValue = NSLocalizedString("Link", comment: "")
+        self.titleLabel.stringValue = NSLocalizedString("Link", comment: "") 
         
-        self.emptyImageView.image = NSImage(named: "KMImageNamePropertyLinkEmpty")
+        self.emptyImageView.image = NSImage(named: "KMImageNameEmptyLink")
     }
     
     override func initLocalization() {

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/KMRightSideEmptyVC.xib

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22155" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22155"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <customObject id="-2" userLabel="File's Owner" customClass="KMRightSideEmptyVC" customModule="PDF_Master" customModuleProvider="target">
+        <customObject id="-2" userLabel="File's Owner" customClass="KMRightSideEmptyVC" customModule="PDF_Reader_Pro" customModuleProvider="target">
             <connections>
                 <outlet property="emptyImageView" destination="9PW-14-bKa" id="O4X-3K-alP"/>
                 <outlet property="emptyLabel" destination="cwY-ba-Aw0" id="DWG-LH-t2p"/>
@@ -25,7 +25,7 @@
                         <customView translatesAutoresizingMaskIntoConstraints="NO" id="6q6-Ub-zoO">
                             <rect key="frame" x="0.0" y="0.0" width="168" height="40"/>
                             <subviews>
-                                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="cwY-ba-Aw0">
+                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="cwY-ba-Aw0">
                                     <rect key="frame" x="-2" y="0.0" width="172" height="32"/>
                                     <textFieldCell key="cell" alignment="center" title="Label" id="o6y-4P-ieZ">
                                         <font key="font" usesAppearanceFont="YES"/>
@@ -51,7 +51,7 @@
                                         <constraint firstAttribute="width" constant="128" id="6bs-H0-K2b"/>
                                         <constraint firstAttribute="height" constant="128" id="f0J-uF-Caz"/>
                                     </constraints>
-                                    <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="icon_btn_viewbtn_icon_empty_nomarkup" id="dKj-bI-Pbr"/>
+                                    <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="KMImageNameEmptyProperty" id="dKj-bI-Pbr"/>
                                 </imageView>
                             </subviews>
                             <constraints>
@@ -81,6 +81,6 @@
         </customView>
     </objects>
     <resources>
-        <image name="icon_btn_viewbtn_icon_empty_nomarkup" width="128" height="128"/>
+        <image name="KMImageNameEmptyProperty" width="140" height="140"/>
     </resources>
 </document>

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/Signature/KMSignatureAnnotationViewController.m

@@ -42,11 +42,14 @@ KMSigntureViewItemDelegate>
     
     [self setup];
     [self updateLanguage];
+    
+    [self insertSignatureButton_Click:nil];
 }
 
 - (void)setup {
     self.signatureLabel.font = [NSFont SFProTextSemiboldFont: 14.0];
-    self.signatureLabel.textColor = [NSColor km_initWithHex:@"#252629" alpha:1];
+    self.signatureLabel.textColor = [KMAppearance KMColor_Layout_H0];
+//    [NSColor km_initWithHex:@"#252629" alpha:1];
     
     self.emptyTipLabel.font = [NSFont SFProTextRegularFont: 14.0];
     self.emptyTipLabel.textColor = [NSColor km_initWithHex:@"#616469" alpha:1];
@@ -249,8 +252,7 @@ KMSigntureViewItemDelegate>
 
 - (void)deleteAllCustomizeStamp {
     NSAlert *alert = [[NSAlert alloc] init];
-    alert.messageText = NSLocalizedString(@"All signatures will disappear from the list", nil);
-    alert.informativeText = NSLocalizedString(@"All signatures will disappear from the list", nil);
+    alert.messageText = NSLocalizedString(@"Are you sure to delete all signatures?", nil);
     [alert addButtonWithTitle:NSLocalizedString(@"Delete", nil)];
     [alert addButtonWithTitle:NSLocalizedString(@"Cancel", nil)];
     if ([alert runModal] != NSAlertFirstButtonReturn) { /// 取消

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/Signature/KMSignatureAnnotationViewController.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22154" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22154"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -30,19 +30,19 @@
                             <subviews>
                                 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="KUF-xf-qzQ">
                                     <rect key="frame" x="195" y="17" width="16" height="16"/>
-                                    <buttonCell key="cell" type="bevel" bezelStyle="rounded" image="signlist_add" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="nVD-Gp-kLW">
-                                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                        <font key="font" metaFont="system"/>
-                                    </buttonCell>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="16" id="Po6-HM-leo"/>
                                         <constraint firstAttribute="width" constant="16" id="mwE-re-iZv"/>
                                     </constraints>
+                                    <buttonCell key="cell" type="bevel" bezelStyle="rounded" image="signlist_add" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="nVD-Gp-kLW">
+                                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                        <font key="font" metaFont="system"/>
+                                    </buttonCell>
                                     <connections>
                                         <action selector="insertSignatureButton_Click:" target="-2" id="mFv-NR-mrz"/>
                                     </connections>
                                 </button>
-                                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2BZ-Qt-bmp">
+                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2BZ-Qt-bmp">
                                     <rect key="frame" x="14" y="17" width="62" height="16"/>
                                     <textFieldCell key="cell" lineBreakMode="clipping" title="Signature" id="d1y-xG-Jfy">
                                         <font key="font" usesAppearanceFont="YES"/>
@@ -86,13 +86,13 @@
                             </scroller>
                         </scrollView>
                         <box borderType="none" title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="ban-ci-oTA">
-                            <rect key="frame" x="0.0" y="0.0" width="227" height="415"/>
+                            <rect key="frame" x="-3" y="-4" width="233" height="421"/>
                             <view key="contentView" id="dqW-kL-zjA">
-                                <rect key="frame" x="0.0" y="0.0" width="227" height="415"/>
+                                <rect key="frame" x="0.0" y="0.0" width="233" height="421"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                 <subviews>
                                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="7KQ-E7-UO5">
-                                        <rect key="frame" x="30" y="-5" width="168" height="220"/>
+                                        <rect key="frame" x="33" y="1" width="168" height="220"/>
                                         <subviews>
                                             <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="ODp-k8-Vi6">
                                                 <rect key="frame" x="20" y="92" width="128" height="128"/>
@@ -100,9 +100,9 @@
                                                     <constraint firstAttribute="width" constant="128" id="Otw-eg-ksB"/>
                                                     <constraint firstAttribute="height" constant="128" id="vXx-j3-fAR"/>
                                                 </constraints>
-                                                <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="nosign" id="rfd-We-aPr"/>
+                                                <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="KMImageNameEmptySign" id="rfd-We-aPr"/>
                                             </imageView>
-                                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Tbj-Oa-HOw">
+                                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Tbj-Oa-HOw">
                                                 <rect key="frame" x="39" y="68" width="90" height="16"/>
                                                 <textFieldCell key="cell" lineBreakMode="clipping" title="No Signatures" id="K2k-0V-W78">
                                                     <font key="font" metaFont="system"/>
@@ -110,7 +110,7 @@
                                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                 </textFieldCell>
                                             </textField>
-                                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="vd7-mZ-jin">
+                                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="vd7-mZ-jin">
                                                 <rect key="frame" x="-2" y="18" width="172" height="48"/>
                                                 <constraints>
                                                     <constraint firstAttribute="width" constant="168" id="WK4-mV-ZGn"/>
@@ -166,7 +166,7 @@
         </customView>
     </objects>
     <resources>
-        <image name="nosign" width="128" height="128"/>
+        <image name="KMImageNameEmptySign" width="140" height="140"/>
         <image name="signlist_add" width="16" height="16"/>
     </resources>
 </document>

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/Signature/KMSignatureWindowController.swift

@@ -0,0 +1,909 @@
+//
+//  KMSignatureWindowController.swift
+//  PDF Reader Pro
+//
+//  Created by lizhe on 2023/10/10.
+//
+
+import Cocoa
+
+var recentlyFonts: [String] = []
+
+class KMSignatureColorButton: NSButton {
+    var circleColor: NSColor?
+    var drawImage: NSImage?
+
+    override init(frame frameRect: NSRect) {
+        super.init(frame: frameRect)
+        wantsLayer = true
+        layer?.cornerRadius = 12
+        layer?.masksToBounds = true
+        layer?.borderWidth = 1.5
+    }
+
+    required init?(coder: NSCoder) {
+        super.init(coder: coder)
+        wantsLayer = true
+        layer?.cornerRadius = 12
+        layer?.masksToBounds = true
+        layer?.borderWidth = 1.5
+    }
+
+    override func draw(_ dirtyRect: NSRect) {
+        super.draw(dirtyRect)
+
+        if let circleColor = circleColor {
+            let path = NSBezierPath(ovalIn: NSRect(x: 3, y: 3, width: dirtyRect.size.width - 6, height: dirtyRect.size.height - 6))
+            circleColor.set()
+            path.fill()
+        } else if let drawImage = drawImage {
+            drawImage.draw(in: NSRect(x: 3, y: 3, width: dirtyRect.size.width - 6, height: dirtyRect.size.height - 6), from: NSZeroRect, operation: .sourceOver, fraction: 1.0)
+        }
+    }
+}
+
+class KMSignatureButton: NSButton {
+    override func menu(for event: NSEvent) -> NSMenu? {
+        let menu = NSMenu(title: "")
+        let deleteItem = menu.addItem(withTitle: NSLocalizedString("Delete", comment: ""), action: #selector(deleteSignature), keyEquivalent: "")
+        deleteItem.target = self
+        
+        let exportItem = menu.addItem(withTitle: NSLocalizedString("Export", comment: ""), action: nil, keyEquivalent: "")
+        
+        let submenu = NSMenu()
+        let pngItem = submenu.insertItem(withTitle: NSLocalizedString("PNG", comment: ""), action: #selector(export(_:)), keyEquivalent: "", at: 0)
+        pngItem.tag = 0
+        
+        let jpgItem = submenu.insertItem(withTitle: NSLocalizedString("JPG", comment: ""), action: #selector(export(_:)), keyEquivalent: "", at: 1)
+        jpgItem.tag = 1
+        
+        let pdfItem = submenu.insertItem(withTitle: NSLocalizedString("PDF", comment: ""), action: #selector(export(_:)), keyEquivalent: "", at: 2)
+        pdfItem.tag = 2
+        
+        exportItem.submenu = submenu
+        
+        return menu
+    }
+
+    @objc private func deleteSignature() {
+        NotificationCenter.default.post(name: NSNotification.Name("kKMSignatureDeleteNotification"), object: NSNumber(value: self.tag))
+    }
+    
+    @objc private func export(_ sender: NSMenuItem) {
+        let index = self.tag
+        let type = sender.tag
+        
+        let signatureManager = KMSignatureManager()
+        signatureManager.loadAllSignatureList()
+        let signature = signatureManager.signatureList[index]
+        let image = signature.pathsImage
+        
+        if type == 0 {
+            if let tiffData = image.tiffRepresentation,
+               let imageRep = NSBitmapImageRep(data: tiffData) {
+                imageRep.size = image.size
+                if let imageData = imageRep.representation(using: .png, properties: [:]) {
+                    let savePanel = NSSavePanel()
+                    savePanel.allowedFileTypes = ["png"]
+                    savePanel.beginSheetModal(for: self.window!) { response in
+                        if response.rawValue == NSApplication.ModalResponse.OK.rawValue,
+                           let url = savePanel.url {
+                            do {
+                                try imageData.write(to: url, options: .atomic)
+                                NSWorkspace.shared.selectFile(url.path, inFileViewerRootedAtPath: "")
+                            } catch {
+                                // Handle error
+                            }
+                        }
+                    }
+                }
+            }
+        } else if type == 1 {
+            if let tiffData = image.tiffRepresentation,
+               let imageRep = NSBitmapImageRep(data: tiffData) {
+                imageRep.size = image.size
+                if let imageData = imageRep.representation(using: .jpeg, properties: [:]) {
+                    let savePanel = NSSavePanel()
+                    savePanel.allowedFileTypes = ["jpg"]
+                    savePanel.beginSheetModal(for: self.window!) { response in
+                        if response.rawValue == NSApplication.ModalResponse.OK.rawValue,
+                           let url = savePanel.url {
+                            do {
+                                try imageData.write(to: url, options: .atomic)
+                                NSWorkspace.shared.selectFile(url.path, inFileViewerRootedAtPath: "")
+                            } catch {
+                                // Handle error
+                            }
+                        }
+                    }
+                }
+            }
+        } else {
+            let pdf = CPDFDocument()
+            let signatureImagePath = (NSSearchPathForDirectoriesInDomains(.documentDirectory, .userDomainMask, true)[0] as NSString).appendingPathComponent("signatureImage.png")
+            if let tiffData = image.tiffRepresentation {
+                try? tiffData.write(to: URL(fileURLWithPath: signatureImagePath), options: .atomic)
+            }
+            pdf!.insertPage(image.size, withImage: signatureImagePath, at: 0)
+            
+            let savePanel = NSSavePanel()
+            savePanel.allowedFileTypes = ["pdf"]
+            savePanel.beginSheetModal(for: NSApp.mainWindow!) { response in
+                if response.rawValue == NSApplication.ModalResponse.OK.rawValue,
+                   let url = savePanel.url {
+                    do {
+                        try pdf!.write(to: url)
+                        NSWorkspace.shared.selectFile(url.path, inFileViewerRootedAtPath: "")
+                    } catch {
+                        // Handle error
+                    }
+                }
+            }
+        }
+    }
+}
+
+var windowController_signature: KMSignatureWindowController?
+
+@objcMembers class KMSignatureWindowController: NSWindowController, KMDrawViewDelegate, KMSelectPopButtonDelegate, KMChangeSignatureTextDelegate {
+    @IBOutlet weak var cancelBtton: NSButton!
+    @IBOutlet weak var applyButton: NSButton!
+    
+    var cancelButtonVC: KMDesignButton!
+    var applyButtonVC: KMDesignButton!
+    
+    @IBOutlet weak var clearButton: NSButton!
+    @IBOutlet var signTypeView: NSView!
+    @IBOutlet weak var inputButton: NSButton!
+    @IBOutlet weak var drawingButton: NSButton!
+    @IBOutlet weak var pictureButton: NSButton!
+    @IBOutlet var signTypeBackView: NSView!
+    
+    @IBOutlet weak var trackpadLabel: NSTextField!
+    @IBOutlet weak var contentBox: NSBox!
+    @IBOutlet weak var titleLabel: NSTextField!
+    
+    // Keyboard
+    @IBOutlet var inputView: NSView!
+    @IBOutlet weak var keyboardView: KMPDFSignatureTextView!
+    @IBOutlet weak var fontBox: NSPopUpButton!
+    @IBOutlet var keyboardColorBtn1: NSButton!
+    @IBOutlet var keyboardColorBtn2: NSButton!
+    @IBOutlet var keyboardColorBtn3: NSButton!
+    @IBOutlet var keyboardColorBtn4: NSButton!
+    @IBOutlet var keyboardColorSelView: NSView!
+    @IBOutlet weak var textColorButton: KMSignatureColorButton!
+    
+    var fontVC: KMDesignSelect!
+    var fontValues: [String] = []
+    var fontDefaultValue: String = "Helvetica"
+    
+    // Draw
+    @IBOutlet var drawingView: NSView!
+    @IBOutlet weak var drawView: KMDrawView!
+    @IBOutlet weak var trackpadButton: NSButton!
+    var trackpadButtonVC: KMDesignButton!
+    
+    @IBOutlet var drawSizeBox: NSPopUpButton!
+    @IBOutlet var colorBGView: NSView!
+    @IBOutlet var drawColorSelView: NSView!
+    @IBOutlet var drawColorBtn1: NSButton!
+    @IBOutlet var drawColorBtn2: NSButton!
+    @IBOutlet var drawColorBtn3: NSButton!
+    @IBOutlet var drawColorBtn4: NSButton!
+    
+    var drawSizeVC: KMDesignSelect!
+    var drawSizeValues = ["1.0","2.0","4.0","6.0","8.0"]
+    var drawSizeDefaultValue: String = "2.0"
+    
+    @IBOutlet var drawTipView: NSView!
+    @IBOutlet var drawTipLabel: NSTextField!
+    
+    // Picture
+    @IBOutlet var pictureView: NSView!
+    @IBOutlet weak var pictureBackView: KMPDFSignatureImageView!
+    @IBOutlet var pictureClearBackBtn: NSButton!
+    
+    var pictureClearBackBtnVC: KMDesignButton!
+    @IBOutlet weak var pictureHelpButton: KMCoverButton!
+    
+    var selectedSignature: KMSignature!
+    var selectItem: NSMenuItem!
+    var type: KMPDFSignatureType! {
+        didSet {
+            self.setType(type)
+        }
+    }
+    var handler: ((KMSignature) -> Void)!
+    
+    var popover: NSPopover!
+    
+    override func windowDidLoad() {
+        super.windowDidLoad()
+
+        weak var weakSelf = self
+
+        self.type = .text
+
+        self.cancelBtton.title = ""
+        self.cancelButtonVC = KMDesignButton(withType: .Text)
+        self.cancelBtton.addSubview(self.cancelButtonVC.view)
+        self.cancelButtonVC.view.frame = self.cancelBtton.bounds
+        self.cancelButtonVC.view.autoresizingMask = [.width, .height]
+        self.cancelButtonVC.stringValue = NSLocalizedString("Cancel", comment: "")
+        self.cancelButtonVC.target = self
+        self.cancelButtonVC.action = #selector(dismissSheet(_:))
+        self.cancelButtonVC.button(type: .Sec_Icon, size: .m)
+        
+        self.clearButton.target = self
+        self.clearButton.action = #selector(clearButton_Click(_:))
+        self.clearButton.isHidden = true
+
+        self.applyButton.title = ""
+        self.applyButtonVC = KMDesignButton(withType: .Text)
+        self.applyButton.addSubview(self.applyButtonVC.view)
+        self.applyButtonVC.view.frame = self.applyButton.bounds
+        self.applyButtonVC.view.autoresizingMask = [.width, .height]
+        self.applyButtonVC.stringValue = NSLocalizedString("Save", comment: "")
+        self.applyButtonVC.target = self
+        self.applyButtonVC.action = #selector(applyButton_Click(_:))
+        self.applyButtonVC.button(type: .Cta, size: .m)
+        self.applyButtonVC.enabled = false
+
+        self.contentBox.wantsLayer = true
+        self.contentBox.layer?.backgroundColor = NSColor.clear.cgColor
+        self.contentBox.borderType = .noBorder
+
+        self.inputButton.isBordered = false
+        self.drawingButton.isBordered = false
+        self.pictureButton.isBordered = false
+
+        // Keyboard
+        self.inputView.wantsLayer = true
+        self.inputView.layer?.backgroundColor = NSColor.white.cgColor
+
+        self.keyboardView.wantsLayer = true
+        self.keyboardView.layer?.backgroundColor = NSColor(red: 247/255.0, green: 248/255.0, blue: 250/255.0, alpha: 1.0).cgColor
+        self.keyboardView.changeSignatureTextCallback = { isTrue in
+            if isTrue {
+                weakSelf?.clearButton.isHidden = false
+                weakSelf?.clearButton.title = NSLocalizedString("Clear", comment: "")
+            } else {
+                weakSelf?.clearButton.isHidden = true
+            }
+        }
+
+        keyboardColorBtn1.wantsLayer = true
+        keyboardColorBtn2.wantsLayer = true
+        keyboardColorBtn3.wantsLayer = true
+        keyboardColorBtn4.wantsLayer = true
+
+        keyboardColorBtn1.layer?.backgroundColor = NSColor(red: 0, green: 0, blue: 0, alpha: 1.0).cgColor
+        keyboardColorBtn2.layer?.backgroundColor = NSColor(red: 252/255.0, green: 31/255.0, blue: 31/255.0, alpha: 1.0).cgColor
+        keyboardColorBtn3.layer?.backgroundColor = NSColor(red: 39/255.0, green: 60/255.0, blue: 98/255.0, alpha: 1.0).cgColor
+        keyboardColorBtn4.layer?.backgroundColor = NSColor(red: 148/255.0, green: 152/255.0, blue: 156/255.0, alpha: 1.0).cgColor
+
+        let cornerRadius: CGFloat = 10.0
+
+        keyboardColorBtn1.layer?.cornerRadius = cornerRadius
+        keyboardColorBtn2.layer?.cornerRadius = cornerRadius
+        keyboardColorBtn3.layer?.cornerRadius = cornerRadius
+        keyboardColorBtn4.layer?.cornerRadius = cornerRadius
+
+        keyboardColorBtn1.layer?.masksToBounds = true
+        keyboardColorBtn2.layer?.masksToBounds = true
+        keyboardColorBtn3.layer?.masksToBounds = true
+        keyboardColorBtn4.layer?.masksToBounds = true
+
+        keyboardColorSelView.wantsLayer = true
+        keyboardColorSelView.layer?.backgroundColor = NSColor(red: 206/255.0, green: 208/255.0, blue: 212/255.0, alpha: 0.6).cgColor
+        keyboardColorSelView.layer?.borderWidth = 1.0
+        keyboardColorSelView.layer?.borderColor = NSColor(red: 206/255.0, green: 208/255.0, blue: 212/255.0, alpha: 1.0).cgColor
+        keyboardColorSelView.layer?.cornerRadius = 4.0
+        keyboardColorSelView.layer?.masksToBounds = true
+
+        self.colorTextButtonAction(self.keyboardColorBtn1)
+
+        // Draw
+        self.drawView.delegate = self
+        self.drawView.wantsLayer = true
+        self.drawView.strokeRadius = CGFloat(((self.drawSizeDefaultValue as? NSString) ?? "0") .floatValue)
+        self.drawView.layer?.cornerRadius = 4.0
+        self.drawView.layer?.masksToBounds = true
+        self.drawView.layer?.borderWidth = 1.0
+        self.drawView.layer?.borderColor = NSColor(red: 223/255.0, green: 225/255.0, blue: 229/255.0, alpha: 1.0).cgColor
+        self.drawView.layer?.backgroundColor = NSColor(red: 247/255.0, green: 248/255.0, blue: 250/255.0, alpha: 1.0).cgColor
+
+        drawColorBtn1.wantsLayer = true
+        drawColorBtn2.wantsLayer = true
+        drawColorBtn3.wantsLayer = true
+        drawColorBtn4.wantsLayer = true
+
+        drawColorBtn1.layer?.backgroundColor = NSColor(red: 37/255.0, green: 38/255.0, blue: 41/255.0, alpha: 1.0).cgColor
+        drawColorBtn2.layer?.backgroundColor = NSColor(red: 252/255.0, green: 31/255.0, blue: 31/255.0, alpha: 1.0).cgColor
+        drawColorBtn3.layer?.backgroundColor = NSColor(red: 39/255.0, green: 60/255.0, blue: 98/255.0, alpha: 1.0).cgColor
+        drawColorBtn4.layer?.backgroundColor = NSColor(red: 148/255.0, green: 152/255.0, blue: 156/255.0, alpha: 1.0).cgColor
+
+
+        drawColorBtn1.layer?.cornerRadius = cornerRadius
+        drawColorBtn2.layer?.cornerRadius = cornerRadius
+        drawColorBtn3.layer?.cornerRadius = cornerRadius
+        drawColorBtn4.layer?.cornerRadius = cornerRadius
+
+        drawColorBtn1.layer?.masksToBounds = true
+        drawColorBtn2.layer?.masksToBounds = true
+        drawColorBtn3.layer?.masksToBounds = true
+        drawColorBtn4.layer?.masksToBounds = true
+
+        drawColorSelView.wantsLayer = true
+        drawColorSelView.layer?.backgroundColor = NSColor(red: 206/255.0, green: 208/255.0, blue: 212/255.0, alpha: 0.6).cgColor
+        drawColorSelView.layer?.borderWidth = 1.0
+        drawColorSelView.layer?.borderColor = NSColor(red: 206/255.0, green: 208/255.0, blue: 212/255.0, alpha: 1.0).cgColor
+        drawColorSelView.layer?.cornerRadius = 4.0
+        drawColorSelView.layer?.masksToBounds = true
+
+
+        self.drawColorBtnClicked(self.drawColorBtn1)
+
+        for pxSize in ["0.5", "1.0", "1.5", "2.0", "2.5", "3.0"] {
+            let attrited: [NSAttributedString.Key: Any] = [.font: NSFont.systemFont(ofSize: 14)]
+            let string = NSAttributedString(string: pxSize, attributes: attrited)
+            let item = NSMenuItem()
+            item.attributedTitle = string
+            self.drawSizeBox.menu?.addItem(item)
+        }
+        self.drawSizeBox.selectItem(at: 1)
+        self.drawSizeBox.title = "1.0 pt"
+
+        // Picture
+        self.pictureView.wantsLayer = true
+        self.pictureView.layer?.backgroundColor = NSColor.white.cgColor
+
+        self.pictureBackView.wantsLayer = true
+        self.pictureBackView.layer?.cornerRadius = 4.0
+        self.pictureBackView.layer?.masksToBounds = true
+        self.pictureBackView.layer?.borderWidth = 1.0
+        self.pictureBackView.layer?.borderColor = NSColor(red: 223/255.0, green: 225/255.0, blue: 229/255.0, alpha: 1.0).cgColor
+        self.pictureBackView.layer?.backgroundColor = NSColor(red: 247/255.0, green: 248/255.0, blue: 250/255.0, alpha: 1.0).cgColor
+        self.pictureBackView.changeSignatureImageCallback = { isTrue in
+            if isTrue {
+                weakSelf?.applyButtonVC.enabled = true
+            } else {
+                weakSelf?.applyButtonVC.enabled = false
+            }
+            if let image = weakSelf?.pictureBackView.signatureImage {
+                weakSelf?.clearButton.isHidden = false
+                weakSelf?.clearButton.title = NSLocalizedString("Reselect", comment: "")
+            } else {
+                weakSelf?.clearButton.isHidden = true
+            }
+        }
+
+        self.trackpadLabel.isHidden = true
+        self.drawTipView.isHidden = true
+
+        self.keyboardView.delegate = self
+        self.drawView.changeDrawCallback = { isTrue in
+            if isTrue {
+                weakSelf?.applyButtonVC.enabled = true
+            } else {
+                weakSelf?.applyButtonVC.enabled = false
+            }
+        }
+        self.drawView.touchEndCallback = { isClear in
+            if isClear {
+                weakSelf?.clearButton.isHidden = true
+            } else {
+                weakSelf?.clearButton.isHidden = false
+                weakSelf?.clearButton.title = NSLocalizedString("Clear", comment: "")
+            }
+        }
+
+        self.inputButton_Click(self.inputButton)
+
+        self.pictureHelpButton.image = NSImage(named: "KMImageNameHelpNormal")
+        self.pictureHelpButton.toolTip = "Remove white background from images"
+        self.pictureHelpButton.action = #selector(showHelpTip(_:))
+        self.pictureHelpButton.coverAction = { button, action in
+            if action == .enter {
+                button.image = NSImage(named: "KMImageNameHelpHover")
+                // [weakSelf showHelpTip:button]
+            } else if action == .exit {
+                button.image = NSImage(named: "KMImageNameHelpNormal")
+                // [weakSelf dismissHelpTip]
+            }
+        }
+
+        localizedString()
+        setupUI()
+    }
+    
+    func setupUI() {
+        let fontName = "SFProText-Regular"
+        
+        titleLabel.font = NSFont(name: "SFProText-Semibold", size: 16)
+        titleLabel.textColor = NSColor(red: 37/255.0, green: 38/255.0, blue: 41/255.0, alpha: 1.0)
+        
+        signTypeView.wantsLayer = true
+        signTypeView.layer?.backgroundColor = NSColor(red: 223/255.0, green: 225/255.0, blue: 229/255.0, alpha: 1.0).cgColor
+        signTypeView.layer?.cornerRadius = 4.0
+        signTypeView.layer?.masksToBounds = true
+        signTypeBackView.wantsLayer = true
+        signTypeBackView.layer?.cornerRadius = 2.0
+        signTypeBackView.layer?.masksToBounds = true
+        signTypeBackView.layer?.backgroundColor = NSColor.white.cgColor
+        
+        for button in [inputButton, drawingButton, pictureButton] {
+            button?.setTitleColor(NSColor(red: 37/255.0, green: 38/255.0, blue: 41/255.0, alpha: 1.0))
+            button?.font = NSFont(name: fontName, size: 12)
+        }
+        
+        let fonts = CPDFAnnotationModel.supportFonts().compactMap { ($0 as AnyObject).allKeys.first }
+        self.fontValues = fonts
+        
+        // Input
+        fontVC = KMDesignSelect(withType: .Combox)
+        fontBox.superview?.addSubview(fontVC.view)
+        fontVC.view.translatesAutoresizingMaskIntoConstraints = false
+        fontVC.view.leftAnchor.constraint(equalTo: fontBox.leftAnchor).isActive = true
+        fontVC.view.centerYAnchor.constraint(equalTo: fontBox.centerYAnchor).isActive = true
+        fontVC.view.widthAnchor.constraint(equalToConstant: 200).isActive = true
+        fontBox.isHidden = true
+        fontVC.delete = self
+        fontVC.addItems(withObjectValues: fontValues)
+        fontVC.stringValue = fontDefaultValue
+        
+        // Drawing
+        drawSizeVC = KMDesignSelect(withType: .Combox)
+        drawingView.addSubview(drawSizeVC.view)
+        drawSizeVC.view.translatesAutoresizingMaskIntoConstraints = false
+        drawSizeVC.view.leftAnchor.constraint(equalTo: drawSizeBox.leftAnchor).isActive = true
+        drawSizeVC.view.centerYAnchor.constraint(equalTo: drawSizeBox.centerYAnchor).isActive = true
+        drawSizeVC.view.widthAnchor.constraint(equalToConstant: 85).isActive = true
+        drawSizeBox.isHidden = true
+        drawSizeVC.delete = self
+        var drawSizes = [String]()
+        for value in drawSizeValues {
+            drawSizes.append("\(value) pt")
+        }
+        drawSizeVC.addItems(withObjectValues: drawSizes)
+        drawSizeVC.stringValue = "\(String(describing: drawSizeDefaultValue)) pt"
+        
+        trackpadButton.title = NSLocalizedString("Trackpad", comment: "")
+        trackpadButton.setTitleColor(NSColor.clear)
+        trackpadButtonVC = KMDesignButton(withType: .CheckBox)
+        trackpadButton.addSubview(trackpadButtonVC.view)
+        trackpadButtonVC.stringValue = NSLocalizedString("Trackpad", comment: "")
+        trackpadButtonVC.state = .Norm
+        trackpadButtonVC.checkbox_radio(imageHeight: NSLayoutConstraint())
+        trackpadButtonVC.target = self
+        trackpadButtonVC.action = #selector(trackpadButton_Click)
+        var rect = trackpadButtonVC.view.frame
+        rect.origin.y = rect.origin.y - 8
+        trackpadButtonVC.view.frame = rect
+        
+//        trackpadButtonVC.view.translatesAutoresizingMaskIntoConstraints = false
+//        trackpadButtonVC.view.leftAnchor.constraint(equalTo: trackpadButton.leftAnchor).isActive = true
+//        trackpadButtonVC.view.centerYAnchor.constraint(equalTo: drawSizeVC.view.centerYAnchor).isActive = true
+//        trackpadButtonVC.view.widthAnchor.constraint(equalToConstant: 120).isActive = true
+//        trackpadButton.isHidden = true
+        
+        drawTipView.wantsLayer = true
+        drawTipView.layer?.backgroundColor = NSColor(red: 189/255.0, green: 223/255.0, blue: 253/255.0, alpha: 1.0).cgColor
+        drawTipLabel.stringValue = NSLocalizedString("Press any key to disable the touchpad", comment: "")
+        drawTipLabel.textColor = NSColor(red: 37/255.0, green: 38/255.0, blue: 41/255.0, alpha: 1.0)
+        drawTipLabel.font = NSFont(name: "SFProText-Regular", size: 14)
+        
+        // Picture
+        pictureBackView.emptyTipLbl.textColor = NSColor(red: 148/255.0, green: 152/255.0, blue: 156/255.0, alpha: 1.0)
+        pictureBackView.emptyTipLbl.font = NSFont(name: fontName, size: 14)
+        
+        pictureClearBackBtn.title = NSLocalizedString("Clear background", comment: "")
+        pictureClearBackBtn.setTitleColor(.clear)
+        pictureClearBackBtnVC = KMDesignButton(withType: .CheckBox)
+        pictureClearBackBtn.addSubview(pictureClearBackBtnVC.view)
+        pictureClearBackBtnVC.stringValue = NSLocalizedString("Clear background", comment: "")
+        pictureClearBackBtnVC.state = .Norm
+        pictureClearBackBtnVC.checkbox_radio(imageHeight: NSLayoutConstraint())
+        pictureClearBackBtnVC.target = self
+        pictureClearBackBtnVC.action = #selector(pictureClearBackBtnAction(_:))
+        
+        pictureClearBackBtnVC.view.translatesAutoresizingMaskIntoConstraints = false
+        pictureClearBackBtnVC.view.mas_makeConstraints { make in
+            make?.edges.equalTo()
+        }
+    }
+    
+    func setType(_ type: KMPDFSignatureType) {
+//        self.type = type
+        
+        var rect = self.signTypeBackView.frame
+        if type == .text {
+            rect.origin.x = 1
+        } else if type == .ink {
+            rect.origin.x = 2 + 75
+        } else if type == .image {
+            rect.origin.x = 2 + 75 * 2
+        }
+        rect.origin.y = (self.signTypeBackView.superview!.frame.height - self.signTypeBackView.frame.height) / 2.0
+        self.signTypeBackView.frame = rect
+        
+        self.clearButton.isHidden = true
+        if type == .text {
+            
+        } else if type == .ink {
+            
+        } else if type == .image {
+            if self.pictureBackView.signatureImage != nil {
+                self.clearButton.title = NSLocalizedString("Reselect", comment: "")
+                self.clearButton.isHidden = false
+            }
+        }
+    }
+
+    override func mouseDown(with event: NSEvent) {
+        dismissHelpTip()
+    }
+
+    func localizedString() {
+        self.titleLabel.stringValue = NSLocalizedString("Create Signature", comment: "")
+        
+        self.trackpadButton.title = (NSLocalizedString("Trackpad", comment: ""))
+        self.clearButton.title = (NSLocalizedString("Clear", comment: ""))
+        self.trackpadLabel.stringValue = NSLocalizedString("Press \"esc\" to disable the Trackpad.", comment: "")
+        
+        let selectorFonts = ["Mistral", "Bradley Hand", "Brush Script MT", "SignPainter", "Edwardian Script ITC", "American Typewriter", "Baoli SC", "Snell Roundhand", "Apple Chancery", "Monotype Corsiva"]
+        
+        let fonts = NSFontManager.shared.availableFontFamilies
+        for fontName in fonts {
+            let attributes: [NSAttributedString.Key: Any] = [.font: NSFont(name: fontName, size: 12.0)!]
+            let attributedString = NSAttributedString(string: fontName, attributes: attributes)
+            let item = NSMenuItem()
+            item.attributedTitle = attributedString
+            self.fontBox.menu?.addItem(item)
+        }
+        
+        var fontName: String? = nil
+        
+        if recentlyFonts.count < 1 {
+            for name in selectorFonts {
+                if fonts.contains(name) {
+                    fontName = name
+                    break
+                }
+            }
+            if let fontName = fontName {
+                recentlyFonts.append(fontName)
+            }
+        } else {
+            fontName = recentlyFonts.first
+        }
+        
+        self.keyboardView.fontName = self.fontDefaultValue ?? ""
+        
+        for (index, fontName) in recentlyFonts.enumerated() {
+            let attributes: [NSAttributedString.Key: Any] = [.font: NSFont(name: fontName, size: 12.0)!]
+            let attributedString = NSAttributedString(string: fontName, attributes: attributes)
+            let item = NSMenuItem()
+            item.attributedTitle = attributedString
+            self.fontBox.menu?.insertItem(item, at: 1 + index)
+        }
+        let sep = NSMenuItem.separator()
+        self.fontBox.menu?.insertItem(sep, at: recentlyFonts.count + 1)
+        
+        self.selectItem = self.fontBox.menu?.item(at: 1)
+        self.selectItem?.state = .on
+        self.inputButton.title = NSLocalizedString("Keyboard", comment: "")
+        self.drawingButton.title = NSLocalizedString("Trackpad", comment: "")
+        self.pictureButton.title = NSLocalizedString("Image", comment: "")
+    }
+
+    @objc func showHelpTip(_ sender: NSButton) {
+        if self.popover != nil {
+            dismissHelpTip()
+            return
+        }
+        
+        let pop = NSPopover()
+        self.popover = pop
+        let controller = KMSignatureHelpViewController()
+        pop.contentViewController = controller
+        controller.tipString = NSLocalizedString("Remove white background from images", comment: "")
+        pop.setValue(true, forKey: "shouldHideAnchor")
+        
+        pop.show(relativeTo: NSMakeRect(0, -8, sender.bounds.width, sender.bounds.height), of: sender, preferredEdge: .maxY)
+    }
+
+    func dismissHelpTip() {
+        self.popover?.close()
+        self.popover = nil
+    }
+
+    @IBAction func inputButton_Click(_ sender: Any) {
+        self.contentBox.contentView = self.inputView
+        self.type = .text
+    }
+
+    @IBAction func drawingButton_Click(_ sender: Any) {
+        self.contentBox.contentView = self.drawingView
+        self.type = .ink
+    }
+
+    @IBAction func pictureButton_Click(_ sender: Any) {
+        self.contentBox.contentView = self.pictureView
+        self.type = .image
+    }
+
+    @objc func clearButton_Click(_ sender: Any) {
+        if self.type == .image {
+            self.pictureBackView.reSelectImage()
+        } else if self.type == .ink {
+            self.drawView.clearImage()
+        } else if self.type == .text {
+            self.keyboardView.clearImage()
+        }
+        self.applyButtonVC.enabled = false
+    }
+
+    @objc func applyButton_Click(_ sender: Any) {
+        let signature = KMSignature()
+        
+        if self.type == .text {
+            if let image = self.keyboardView.signatureImage() {
+                signature.pathsImage = image
+                signature.signatureType = .text
+                let signatureManager = KMSignatureManager()
+                signatureManager.loadAllSignatureList()
+                signatureManager.addSignature(signature)
+                signatureManager.saveSingaturesToFile()
+            } else {
+                let alert = NSAlert()
+                alert.alertStyle = .critical
+                alert.messageText = NSLocalizedString("Unable to add new signatures. Please try again.", comment: "")
+                alert.runModal()
+                return
+            }
+        } else if self.type == .image {
+            if let image = self.pictureBackView.signatureImage() {
+                signature.pathsImage = image
+                signature.signatureType = .image
+                let signatureManager = KMSignatureManager()
+                signatureManager.loadAllSignatureList()
+                signatureManager.addSignature(signature)
+                signatureManager.saveSingaturesToFile()
+            } else {
+                let alert = NSAlert()
+                alert.alertStyle = .critical
+                alert.messageText = NSLocalizedString("Unable to add new signatures. Please try again.", comment: "")
+                alert.runModal()
+                return
+            }
+        } else {
+            if let image = self.drawView.signatureImage() {
+                signature.addPath(self.drawView.drawBezierPath)
+                signature.signatureType = .ink
+                signature.signatureColor = self.drawView.drawColor
+                signature.pathsImage = image
+                let signatureManager = KMSignatureManager()
+                signatureManager.loadAllSignatureList()
+                signatureManager.addSignature(signature)
+                signatureManager.saveSingaturesToFile()
+            } else {
+                let alert = NSAlert()
+                alert.alertStyle = .critical
+                alert.messageText = NSLocalizedString("Unable to add new signatures. Please try again.", comment: "")
+                alert.runModal()
+                return
+            }
+        }
+        self.selectedSignature = signature
+        dismissSheet(nil)
+    }
+
+    @IBAction func trackpadButton_Click(_ sender: Any) {
+        if self.trackpadButtonVC.state == .Checked {
+            self.trackpadButtonVC.state = .Norm
+            self.trackpadLabel.isHidden = true
+            self.drawTipView.isHidden = true
+            self.drawView.isAcceptsTouch = false
+        } else {
+            self.trackpadButtonVC.state = .Checked
+            self.trackpadLabel.isHidden = true
+            self.drawTipView.isHidden = false
+            self.drawView.isAcceptsTouch = true
+            
+            DispatchQueue.main.asyncAfter(deadline: .now() + 3.0) {
+                self.drawTipView.isHidden = true
+            }
+        }
+    }
+
+    @IBAction func boxItemClicked_Font(_ sender: Any) {
+        if let name = self.fontBox.selectedItem?.title {
+            self.fontBox.title = name
+            self.keyboardView.fontName = name
+            
+            if recentlyFonts.contains(name) {
+                if let index = recentlyFonts.firstIndex(of: name) {
+                    recentlyFonts.remove(at: index)
+                    self.fontBox.menu?.removeItem(at: index + 1)
+                }
+            }
+            if recentlyFonts.count > 0 {
+                recentlyFonts.insert(name, at: 0)
+            } else {
+                recentlyFonts.append(name)
+            }
+
+            if recentlyFonts.count > 5 {
+                recentlyFonts.removeLast()
+                self.fontBox.menu?.removeItem(at: recentlyFonts.count)
+            }
+
+            let attributes: [NSAttributedString.Key: Any] = [.font: NSFont(name: name, size: 12.0)!]
+            let attributedString = NSAttributedString(string: name, attributes: attributes)
+            let item = NSMenuItem()
+            item.attributedTitle = attributedString
+            self.fontBox.menu?.insertItem(item, at: 1)
+            
+            self.selectItem?.state = .off
+            self.selectItem = self.fontBox.menu?.item(at: 1)
+            self.selectItem?.state = .on
+        }
+    }
+
+    @IBAction func colorTextButtonAction(_ sender: Any) {
+        if let button = sender as? NSButton {
+            if button == self.keyboardColorBtn1 || button == self.keyboardColorBtn2 || button == self.keyboardColorBtn3 || button == self.keyboardColorBtn4 {
+                if let color = NSColor(cgColor: button.layer!.backgroundColor!) {
+                    self.keyboardView.keyboardColor = color
+                    var rect = self.keyboardView.frame
+                    rect.origin.y = button.frame.midY - 16
+                    rect.origin.x = button.frame.midX - 16
+                    rect.size.width = 32
+                    rect.size.height = 32
+                    self.keyboardColorSelView.frame = rect
+                }
+            } else {
+                NSColorPanel.shared.setTarget(self)
+                NSColorPanel.shared.setAction(#selector(keyboardColorPanelColorDidChange(_:)))
+                NSColorPanel.shared.orderFront(nil)
+            }
+        }
+    }
+
+    @IBAction func drawColorBtnClicked(_ sender: NSButton) {
+        if sender == self.drawColorBtn1 || sender == self.drawColorBtn2 || sender == self.drawColorBtn3 || sender == self.drawColorBtn4 {
+            if let color = NSColor(cgColor: sender.layer!.backgroundColor!) {
+                self.drawView.drawColor = color
+                var rect = self.drawColorSelView.frame
+                rect.origin.y = sender.frame.midY - 16
+                rect.origin.x = sender.frame.midX - 16
+                rect.size.width = 32
+                rect.size.height = 32
+                self.drawColorSelView.frame = rect
+            }
+        }
+    }
+
+    @IBAction func drawSizeBtnClicked(_ sender: NSPopUpButton) {
+        let name = self.drawSizeBox.selectedItem?.title
+        self.drawSizeBox.title = name ?? ""
+        let array = [0.5, 1.0, 1.5, 2.0, 2.5, 3.0]
+        let index = self.drawSizeBox.indexOfSelectedItem - 1
+        self.drawView.strokeRadius = array[index]
+    }
+
+    @objc @IBAction func pictureClearBackBtnAction(_ sender: NSButton) {
+        var clearBack = true
+        if self.pictureClearBackBtnVC.state == .Checked {
+            self.pictureClearBackBtnVC.state = .Norm
+            clearBack = false
+        } else {
+            self.pictureClearBackBtnVC.state = .Checked
+            clearBack = true
+        }
+        self.pictureBackView.clearBackground = clearBack
+    }
+
+    @objc func keyboardColorPanelColorDidChange(_ sender: Any) {
+        self.textColorButton.layer?.borderColor = NSColor.clear.cgColor
+        let color = NSColorPanel.shared.color
+        let red = CGFloat(color.redComponent)
+        let green = CGFloat(color.greenComponent)
+        let blue = CGFloat(color.blueComponent)
+        let alpha = CGFloat(color.alphaComponent)
+        self.keyboardView.keyboardColor = color
+        self.textColorButton.layer?.borderColor = NSColor(red: 33.0/255.0, green: 124.0/255.0, blue: 234.0/255.0, alpha: 1.0).cgColor
+    }
+
+    func drawViewDidFinishTouchMode(_ view: KMDrawView) {
+        self.trackpadButtonVC.state = .Norm
+        self.trackpadLabel.isHidden = true
+        self.drawTipView.isHidden = true
+    }
+
+    func changeSignatureText(_ isTrue: Bool) {
+        self.applyButtonVC.enabled = isTrue
+    }
+
+    @objc func didEndSheet(_ sheet: NSWindow?, returnCode: Int, contextInfo: UnsafeMutableRawPointer?) {
+        if contextInfo != nil && self.handler != nil {
+            self.handler!(self.selectedSignature)
+        }
+    }
+    
+    func beginSheetModal(for window: NSWindow?, completionHandler handler: ((KMSignature) -> Void)?) {
+        windowController_signature = self
+        
+        if window != nil {
+            window!.beginSheet(self.window!) { ModalResponse in
+                if self.selectedSignature != nil {
+                    self.handler?(self.selectedSignature)
+                }
+            }
+        }
+        self.handler = handler
+    }
+
+
+    @objc func dismissSheet(_ sender: Any?) {
+        windowController_signature = nil
+        
+        if sender != nil {
+            NSApp.endSheet(self.window!, returnCode: 0)
+        } else {
+            NSApp.endSheet(self.window!, returnCode: 1)
+        }
+        self.window?.orderOut(self)
+    }
+
+    func km_comboBoxSelectionDidChange(_ obj: KMDesignSelect) {
+        if obj == fontVC {
+            var index = fontVC.indexOfSelectedItem
+            if index < 0 {
+                index = 0
+            }
+            
+            keyboardView.fontName = fontVC.items[index]
+        } else if obj == drawSizeVC {
+            var index = drawSizeVC.indexOfSelectedItem
+            if index < 0 {
+                index = 0
+            }
+            
+            drawView.strokeRadius = CGFloat((drawSizeValues[index] as! NSString).floatValue)
+        }
+    }
+    
+    func tabView(_ tabView: NSTabView, shouldSelect tabViewItem: NSTabViewItem?) -> Bool {
+        return true
+    }
+
+    func tabView(_ tabView: NSTabView, didSelect tabViewItem: NSTabViewItem?) {
+        var isImage = false
+        if tabView.indexOfTabViewItem(tabViewItem!) == 0 {
+            self.type = .text
+            if self.keyboardView.signatureImage() != nil {
+                isImage = true
+            }
+        } else if tabView.indexOfTabViewItem(tabViewItem!) == 1 {
+            self.type = .ink
+            if self.drawView.signatureImage() != nil {
+                isImage = true
+            }
+        } else if tabView.indexOfTabViewItem(tabViewItem!) == 2 {
+            self.type = .image
+            if self.pictureBackView.signatureImage() != nil {
+                isImage = true
+            }
+        }
+        
+        if isImage {
+            self.applyButtonVC.enabled = true
+        } else {
+            self.applyButtonVC.enabled = false
+        }
+    }
+
+}

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/Signature/KMSigntureViewItem.swift

@@ -36,7 +36,7 @@ import Cocoa
 
     func tableViewMenu() {
         let menu = NSMenu()
-        let item = menu.addItem(withTitle: NSLocalizedString("Export stamp", comment: ""), action: nil, keyEquivalent: "")
+        let item = menu.addItem(withTitle: NSLocalizedString("Output", comment: ""), action: nil, keyEquivalent: "")
         let tSubMenu = NSMenu()
         var tMenuItem = tSubMenu.insertItem(withTitle: NSLocalizedString("PNG", comment: ""), action: #selector(exportCustomizeStamp(_:)), keyEquivalent: "", at: 0)
         tMenuItem.tag = 0
@@ -47,8 +47,8 @@ import Cocoa
         item.submenu = tSubMenu
 
         menu.addItem(NSMenuItem.separator())
-        menu.addItem(withTitle: NSLocalizedString("Delete stamp", comment: ""), action: #selector(deleteCustomizeStamp), keyEquivalent: "")
-        menu.addItem(withTitle: NSLocalizedString("Delete All stamp", comment: ""), action: #selector(deleteAllCustomizeStamp), keyEquivalent: "")
+        menu.addItem(withTitle: NSLocalizedString("Remove", comment: ""), action: #selector(deleteCustomizeStamp), keyEquivalent: "")
+        menu.addItem(withTitle: NSLocalizedString("Remove All", comment: ""), action: #selector(deleteAllCustomizeStamp), keyEquivalent: "")
 
         self.view.menu = menu
     }

PDF Office/PDF Master/Class/PDFWindowController/Toolbar/KMToolbarController.swift

@@ -180,7 +180,6 @@ class KMToolbarController: NSViewController {
         toolbarType = .None
         mainToolBarView?.toolbarType = .Main
         mainToolBarView?.reloadateToolbar()
-        addObserverForAppearanceChange()
         
         NotificationCenter.default.addObserver(self, selector: #selector(selectedShapAnnotationChangeNotification(_:)), name: NSNotification.Name.init(rawValue: "KMSelectedShapAnnotationChangeNotification"), object: nil)
         NotificationCenter.default.addObserver(self, selector: #selector(PDFChangedNotification(_:)), name: NSNotification.Name.init(rawValue: "PDFChangedNotification"), object: nil)
@@ -248,12 +247,6 @@ class KMToolbarController: NSViewController {
         }
     }
     
-    // MARK: Dark&Light
-    
-    func addObserverForAppearanceChange() -> Void {
-        
-    }
-    
     // MARK: -
     // MARK: Public Methods
     
@@ -584,6 +577,7 @@ class KMToolbarController: NSViewController {
         super.interfaceThemeDidChanged(appearance)
         
         self.mainToolBarView?.interfaceThemeDidChanged(appearance)
+        self.childToolBarView?.interfaceThemeDidChanged(appearance)
     }
 }
 

PDF Office/PDF Master/Class/PDFWindowController/Toolbar/KMToolbarViewController.swift

@@ -554,6 +554,12 @@ class KMToolbarViewController: NSViewController, NSTextFieldDelegate {
         super.interfaceThemeDidChanged(appearance)
         
         self.toolbar?.appearance = .init(named: appearance)
+        self.bottomLine.wantsLayer = true
+        if KMAppearance.isDarkMode() {
+            self.bottomLine.layer?.backgroundColor = NSColor.km_init(hex: "#393B3E", alpha: 1).cgColor
+        } else {
+            self.bottomLine.layer?.backgroundColor = NSColor.km_init(hex: "#0000001A").cgColor
+        }
     }
 }
 
@@ -1589,7 +1595,7 @@ extension KMToolbarViewController {
     private func _setupEditItem(_ item: KMToolbarItemView?) {
         let identifier = item?.itemIdentifier
         if identifier == KMToolbarAddTextEditPDFItemIdentifier {
-            item?.image = NSImage(named: "KMImageNameMainToolFreeText")
+            item?.image = NSImage(named: "KMImageNameButtonEidtPDFText")
             item?.target = self
             item?.btnTag = CAnnotationType.addText.rawValue
             item?.toolTip = NSLocalizedString("Add Text", comment: "")
@@ -1597,7 +1603,7 @@ extension KMToolbarViewController {
             item?.boxImagePosition = .imageLeft
             item?.btnAction = #selector(changeAnnotationMode)
         }  else if identifier == KMToolbarAddImageEditPDFItemIdentifier {
-            item?.image = NSImage(named: "KMImageNameMainToolEditImage")
+            item?.image = NSImage(named: "KMImageNameButtonEidtPDFImage")
             item?.target = self
             item?.btnTag = CAnnotationType.addImage.rawValue
             item?.toolTip = NSLocalizedString("Add Image", comment: "")

PDF Office/PDF Master/Class/PDFWindowController/ViewController/KMMainViewController+UI.swift

@@ -104,6 +104,8 @@ extension KMMainViewController {
         self.leftSideViewController.interfaceThemeDidChanged(appearance)
         self.rightSideViewController.interfaceThemeDidChanged(appearance)
         
+        self.pdfEditController?.interfaceThemeDidChanged(appearance)
+        
         self.mianSplitView.superview?.wantsLayer = true
 //        let sView = self.listView.documentView()
         if KMAppearance.isDarkMode() {

PDF Office/PDF Master/Strings/InfoPlist.strings

@@ -5,4 +5,4 @@
   Created by wanjun on 2023/4/27.
   
 */
-NSHumanReadableCopyright = "© 2014-2023 PDF Technologies, Inc. All Rights Reserved.";
+NSHumanReadableCopyright = "© 2014-2024 PDF Technologies, Inc. All Rights Reserved.";

PDF Office/PDF Reader Pro.xcodeproj/xcuserdata/lizhe.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -3075,160 +3075,72 @@
             endingLineNumber = "486"
             landmarkName = "exitWatermarkAdjective()"
             landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "1AF3B805-B517-40CB-AE32-A1D58876A59C"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "PDF Master/Class/PDFWindowController/Side/RightSide/EditPDF/KMEditImagePropertyViewController.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "368"
-            endingLineNumber = "368"
-            landmarkName = "reloadData()"
-            landmarkType = "7">
             <Locations>
                <Location
-                  uuid = "1AF3B805-B517-40CB-AE32-A1D58876A59C - e19efda6990b0b36"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Master.KMEditImagePropertyViewController.changeAreasAlign(areas: Swift.Array&lt;Any&gt;, newBounds: Swift.Array&lt;Swift.String&gt;) -&gt; ()"
-                  moduleName = "PDF Master"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/EditPDF/KMEditImagePropertyViewController.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "368"
-                  endingLineNumber = "368"
-                  offsetFromSymbolStart = "568">
-               </Location>
-               <Location
-                  uuid = "1AF3B805-B517-40CB-AE32-A1D58876A59C - 204604f9ce1f91e3"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Master_DMG.KMEditImagePropertyViewController.changeAreasAlign(areas: Swift.Array&lt;Any&gt;, newBounds: Swift.Array&lt;Swift.String&gt;) -&gt; ()"
-                  moduleName = "PDF Master DMG"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/EditPDF/KMEditImagePropertyViewController.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "368"
-                  endingLineNumber = "368"
-                  offsetFromSymbolStart = "568">
-               </Location>
-               <Location
-                  uuid = "1AF3B805-B517-40CB-AE32-A1D58876A59C - 204604f9ce1f91e3"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Master_DMG.KMEditImagePropertyViewController.changeAreasAlign(areas: Swift.Array&lt;Any&gt;, newBounds: Swift.Array&lt;Swift.String&gt;) -&gt; ()"
-                  moduleName = "PDF Master DMG"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/EditPDF/KMEditImagePropertyViewController.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "368"
-                  endingLineNumber = "368"
-                  offsetFromSymbolStart = "644">
-               </Location>
-               <Location
-                  uuid = "1AF3B805-B517-40CB-AE32-A1D58876A59C - e19efda6990b0b36"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Master.KMEditImagePropertyViewController.changeAreasAlign(areas: Swift.Array&lt;Any&gt;, newBounds: Swift.Array&lt;Swift.String&gt;) -&gt; ()"
-                  moduleName = "PDF Master"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/EditPDF/KMEditImagePropertyViewController.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "368"
-                  endingLineNumber = "368"
-                  offsetFromSymbolStart = "644">
-               </Location>
-               <Location
-                  uuid = "1AF3B805-B517-40CB-AE32-A1D58876A59C - 79c1d4772d89820a"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Master.KMEditImagePropertyViewController.updateImageAreasOpacity(opacity: CoreGraphics.CGFloat, state: PDF_Master.KMOperationState, needListView: Swift.Bool) -&gt; ()"
-                  moduleName = "PDF Master"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/EditPDF/KMEditImagePropertyViewController.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "368"
-                  endingLineNumber = "368"
-                  offsetFromSymbolStart = "164">
-               </Location>
-               <Location
-                  uuid = "1AF3B805-B517-40CB-AE32-A1D58876A59C - bcb1603fbcd99c85"
+                  uuid = "5B80F998-3B3F-4A3F-842D-1EDB32380522 - 271bb4e7b0b48f12"
                   shouldBeEnabled = "Yes"
                   ignoreCount = "0"
                   continueAfterRunningActions = "No"
-                  symbolName = "PDF_Reader_Pro.KMEditImagePropertyViewController.updateImageAreasOpacity(opacity: CoreGraphics.CGFloat, state: PDF_Reader_Pro.KMOperationState, needListView: Swift.Bool) -&gt; ()"
+                  symbolName = "PDF_Reader_Pro.KMToolbarController.exitWatermarkAdjective() -&gt; ()"
                   moduleName = "PDF Reader Pro"
                   usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/EditPDF/KMEditImagePropertyViewController.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "368"
-                  endingLineNumber = "368"
-                  offsetFromSymbolStart = "164">
-               </Location>
-               <Location
-                  uuid = "1AF3B805-B517-40CB-AE32-A1D58876A59C - e730159921ee3d90"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Reader_Pro_Edition.KMEditImagePropertyViewController.updateImageAreasOpacity(opacity: CoreGraphics.CGFloat, state: PDF_Reader_Pro_Edition.KMOperationState, needListView: Swift.Bool) -&gt; ()"
-                  moduleName = "PDF Reader Pro Edition"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/EditPDF/KMEditImagePropertyViewController.swift"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Toolbar/KMToolbarController.swift"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "368"
-                  endingLineNumber = "368"
-                  offsetFromSymbolStart = "192">
+                  startingLineNumber = "486"
+                  endingLineNumber = "486"
+                  offsetFromSymbolStart = "996">
                </Location>
                <Location
-                  uuid = "1AF3B805-B517-40CB-AE32-A1D58876A59C - d98b203de53c751c"
+                  uuid = "5B80F998-3B3F-4A3F-842D-1EDB32380522 - 20fe7c205c89951e"
                   shouldBeEnabled = "Yes"
                   ignoreCount = "0"
                   continueAfterRunningActions = "No"
-                  symbolName = "PDF_Reaer_Pro.KMEditImagePropertyViewController.updateImageAreasOpacity(opacity: CoreGraphics.CGFloat, state: PDF_Reaer_Pro.KMOperationState, needListView: Swift.Bool) -&gt; ()"
-                  moduleName = "PDF Reaer Pro"
+                  symbolName = "PDF_Reader_Pro.KMToolbarController.fetchTopBarView() -&gt; Swift.Optional&lt;__C.NSView&gt;"
+                  moduleName = "PDF Reader Pro"
                   usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/EditPDF/KMEditImagePropertyViewController.swift"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Toolbar/KMToolbarController.swift"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "368"
-                  endingLineNumber = "368"
-                  offsetFromSymbolStart = "192">
+                  startingLineNumber = "486"
+                  endingLineNumber = "486"
+                  offsetFromSymbolStart = "584">
                </Location>
+            </Locations>
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "1AF3B805-B517-40CB-AE32-A1D58876A59C"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/PDFWindowController/Side/RightSide/EditPDF/KMEditImagePropertyViewController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "370"
+            endingLineNumber = "370"
+            landmarkName = "reloadData()"
+            landmarkType = "7">
+            <Locations>
                <Location
-                  uuid = "1AF3B805-B517-40CB-AE32-A1D58876A59C - bcb1603fbcd99c85"
+                  uuid = "1AF3B805-B517-40CB-AE32-A1D58876A59C - c8876923c90d9afe"
                   shouldBeEnabled = "Yes"
                   ignoreCount = "0"
                   continueAfterRunningActions = "No"
-                  symbolName = "PDF_Reader_Pro.KMEditImagePropertyViewController.updateImageAreasOpacity(opacity: CoreGraphics.CGFloat, state: PDF_Reader_Pro.KMOperationState, needListView: Swift.Bool) -&gt; ()"
+                  symbolName = "PDF_Reader_Pro.KMEditImagePropertyViewController.reloadData() -&gt; ()"
                   moduleName = "PDF Reader Pro"
                   usesParentBreakpointCondition = "Yes"
                   urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/EditPDF/KMEditImagePropertyViewController.swift"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "368"
-                  endingLineNumber = "368"
-                  offsetFromSymbolStart = "192">
+                  startingLineNumber = "370"
+                  endingLineNumber = "370"
+                  offsetFromSymbolStart = "7668">
                </Location>
                <Location
-                  uuid = "1AF3B805-B517-40CB-AE32-A1D58876A59C - c8876923c90d9ab8"
+                  uuid = "1AF3B805-B517-40CB-AE32-A1D58876A59C - c8876923c90d9afe"
                   shouldBeEnabled = "Yes"
                   ignoreCount = "0"
                   continueAfterRunningActions = "No"
@@ -3238,8 +3150,8 @@
                   urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/EditPDF/KMEditImagePropertyViewController.swift"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "368"
-                  endingLineNumber = "368"
+                  startingLineNumber = "370"
+                  endingLineNumber = "370"
                   offsetFromSymbolStart = "7308">
                </Location>
             </Locations>
@@ -3843,178 +3755,28 @@
             filePath = "PDF Master/Class/PDFWindowController/Side/RightSide/EditPDF/KMEditImagePropertyViewController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "477"
-            endingLineNumber = "477"
+            startingLineNumber = "479"
+            endingLineNumber = "479"
             landmarkName = "km_comboBoxSelectionDidChange(_:)"
             landmarkType = "7">
             <Locations>
                <Location
-                  uuid = "E31A3A13-7945-4237-826F-AD99F8B12799 - a52cdaf2098bd7e3"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Master_DMG.KMEditImagePropertyViewController.flipVerticalImageAction(Any) -&gt; ()"
-                  moduleName = "PDF Master DMG"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/EditPDF/KMEditImagePropertyViewController.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "474"
-                  endingLineNumber = "474"
-                  offsetFromSymbolStart = "1376">
-               </Location>
-               <Location
-                  uuid = "E31A3A13-7945-4237-826F-AD99F8B12799 - fe2da5be3abf47a4"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Master.KMEditImagePropertyViewController.flipVerticalImageAction(Any) -&gt; ()"
-                  moduleName = "PDF Master"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/EditPDF/KMEditImagePropertyViewController.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "474"
-                  endingLineNumber = "474"
-                  offsetFromSymbolStart = "1376">
-               </Location>
-               <Location
-                  uuid = "E31A3A13-7945-4237-826F-AD99F8B12799 - fe2da5be3abf4647"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Master.KMEditImagePropertyViewController.flipVerticalImageAction(Any) -&gt; ()"
-                  moduleName = "PDF Master"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/EditPDF/KMEditImagePropertyViewController.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "477"
-                  endingLineNumber = "477"
-                  offsetFromSymbolStart = "1376">
-               </Location>
-               <Location
-                  uuid = "E31A3A13-7945-4237-826F-AD99F8B12799 - a52cdaf2098bd600"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Master_DMG.KMEditImagePropertyViewController.flipVerticalImageAction(Any) -&gt; ()"
-                  moduleName = "PDF Master DMG"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/EditPDF/KMEditImagePropertyViewController.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "477"
-                  endingLineNumber = "477"
-                  offsetFromSymbolStart = "1376">
-               </Location>
-               <Location
-                  uuid = "E31A3A13-7945-4237-826F-AD99F8B12799 - a52cdaf2098bd600"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Master_DMG.KMEditImagePropertyViewController.flipVerticalImageAction(Any) -&gt; ()"
-                  moduleName = "PDF Master DMG"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/EditPDF/KMEditImagePropertyViewController.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "477"
-                  endingLineNumber = "477"
-                  offsetFromSymbolStart = "1304">
-               </Location>
-               <Location
-                  uuid = "E31A3A13-7945-4237-826F-AD99F8B12799 - fe2da5be3abf4647"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Master.KMEditImagePropertyViewController.flipVerticalImageAction(Any) -&gt; ()"
-                  moduleName = "PDF Master"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/EditPDF/KMEditImagePropertyViewController.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "477"
-                  endingLineNumber = "477"
-                  offsetFromSymbolStart = "1304">
-               </Location>
-               <Location
-                  uuid = "E31A3A13-7945-4237-826F-AD99F8B12799 - 5b1560a8bef02255"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Master.KMEditImagePropertyViewController.flipHorizontalImageAction(Any) -&gt; ()"
-                  moduleName = "PDF Master"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/EditPDF/KMEditImagePropertyViewController.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "477"
-                  endingLineNumber = "477"
-                  offsetFromSymbolStart = "1604">
-               </Location>
-               <Location
-                  uuid = "E31A3A13-7945-4237-826F-AD99F8B12799 - b3d51cfd16591cf6"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Reader_Pro.KMEditImagePropertyViewController.flipHorizontalImageAction(Any) -&gt; ()"
-                  moduleName = "PDF Reader Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/EditPDF/KMEditImagePropertyViewController.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "477"
-                  endingLineNumber = "477"
-                  offsetFromSymbolStart = "1604">
-               </Location>
-               <Location
-                  uuid = "E31A3A13-7945-4237-826F-AD99F8B12799 - 7b4848126c999a37"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Reader_Pro_Edition.KMEditImagePropertyViewController.flipHorizontalImageAction(Any) -&gt; ()"
-                  moduleName = "PDF Reader Pro Edition"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/EditPDF/KMEditImagePropertyViewController.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "477"
-                  endingLineNumber = "477"
-                  offsetFromSymbolStart = "1712">
-               </Location>
-               <Location
-                  uuid = "E31A3A13-7945-4237-826F-AD99F8B12799 - b53175af4bab6d78"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Reaer_Pro.KMEditImagePropertyViewController.flipHorizontalImageAction(Any) -&gt; ()"
-                  moduleName = "PDF Reaer Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/EditPDF/KMEditImagePropertyViewController.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "477"
-                  endingLineNumber = "477"
-                  offsetFromSymbolStart = "1712">
-               </Location>
-               <Location
-                  uuid = "E31A3A13-7945-4237-826F-AD99F8B12799 - b3d51cfd16591cf6"
+                  uuid = "E31A3A13-7945-4237-826F-AD99F8B12799 - e00d7a7bac9a30b6"
                   shouldBeEnabled = "Yes"
                   ignoreCount = "0"
                   continueAfterRunningActions = "No"
-                  symbolName = "PDF_Reader_Pro.KMEditImagePropertyViewController.flipHorizontalImageAction(Any) -&gt; ()"
+                  symbolName = "PDF_Reader_Pro.KMEditImagePropertyViewController.km_controlTextDidEndEditing(PDF_Reader_Pro.KMDesignSelect) -&gt; ()"
                   moduleName = "PDF Reader Pro"
                   usesParentBreakpointCondition = "Yes"
                   urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/EditPDF/KMEditImagePropertyViewController.swift"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "477"
-                  endingLineNumber = "477"
-                  offsetFromSymbolStart = "1712">
+                  startingLineNumber = "479"
+                  endingLineNumber = "479"
+                  offsetFromSymbolStart = "156">
                </Location>
                <Location
-                  uuid = "E31A3A13-7945-4237-826F-AD99F8B12799 - d8b4594eca357bd1"
+                  uuid = "E31A3A13-7945-4237-826F-AD99F8B12799 - d8b4594eca357b9f"
                   shouldBeEnabled = "Yes"
                   ignoreCount = "0"
                   continueAfterRunningActions = "No"
@@ -4024,8 +3786,8 @@
                   urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/EditPDF/KMEditImagePropertyViewController.swift"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "477"
-                  endingLineNumber = "477"
+                  startingLineNumber = "479"
+                  endingLineNumber = "479"
                   offsetFromSymbolStart = "1328">
                </Location>
             </Locations>
@@ -9274,6 +9036,21 @@
                   endingLineNumber = "938"
                   offsetFromSymbolStart = "3052">
                </Location>
+               <Location
+                  uuid = "D90BE850-75C0-4F2E-9249-D1327B0B0904 - 30f40ecc3dcc7cba"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Reader_Pro.KMPDFEditViewController.zoomInButtonAction(sender: Swift.Optional&lt;__C.NSButton&gt;) -&gt; ()"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFTools/PageEdit/Controller/KMPDFEditViewController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "940"
+                  endingLineNumber = "940"
+                  offsetFromSymbolStart = "1212">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -16223,6 +16000,21 @@
                   endingLineNumber = "328"
                   offsetFromSymbolStart = "380">
                </Location>
+               <Location
+                  uuid = "74AE27F3-3720-4A5C-BD76-C104EE4130F9 - a56cf30ab1bad551"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Reader_Pro.KMBrowserWindowController.commandDispatch(Any) -&gt; ()"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/ChromiumTabs/KMBrowserWindowController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "328"
+                  endingLineNumber = "328"
+                  offsetFromSymbolStart = "124">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -16428,6 +16220,21 @@
                   endingLineNumber = "429"
                   offsetFromSymbolStart = "6008">
                </Location>
+               <Location
+                  uuid = "27C96972-7D5A-4797-9A0E-B4151DBC90F3 - 2e95762172ecdc2b"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "closure #1 (Swift.Optional&lt;__C.NSDocument&gt;, Swift.Bool, Swift.Optional&lt;Swift.Error&gt;) -&gt; () in closure #1 (PDF_Reader_Pro.KMPasswordInputWindowResult, Swift.Optional&lt;Swift.String&gt;) -&gt; () in PDF_Reader_Pro.KMBrowserWindowController.openNewWindow(Any) -&gt; ()"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/ChromiumTabs/KMBrowserWindowController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "429"
+                  endingLineNumber = "429"
+                  offsetFromSymbolStart = "584">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -16933,7 +16740,22 @@
                   endingLineNumber = "1413"
                   offsetFromSymbolStart = "52">
                </Location>
-            </Locations>
+               <Location
+                  uuid = "8F3BEE12-BA94-4ACE-99AB-DA2F80A2266E - 138ba8e5ecccab0b"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Reader_Pro.KMBrowserWindowController.newDocumentFromClipboard(Swift.Optional&lt;Any&gt;) -&gt; ()"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/ChromiumTabs/KMBrowserWindowController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "1412"
+                  endingLineNumber = "1412"
+                  offsetFromSymbolStart = "140">
+               </Location>
+            </Locations>
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -17056,6 +16878,21 @@
                   endingLineNumber = "1431"
                   offsetFromSymbolStart = "228">
                </Location>
+               <Location
+                  uuid = "595DC1AE-BCE1-46B2-8104-C46AE0BA20F8 - a50bfeb5be145c92"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Reader_Pro.KMBrowserWindowController.importFromWebPage(Swift.Optional&lt;Any&gt;) -&gt; ()"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/ChromiumTabs/KMBrowserWindowController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "1431"
+                  endingLineNumber = "1431"
+                  offsetFromSymbolStart = "668">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -17149,6 +16986,21 @@
                   endingLineNumber = "1450"
                   offsetFromSymbolStart = "136">
                </Location>
+               <Location
+                  uuid = "C853951B-3A36-4840-BD49-B0C6EB59E638 - 4c98b16462968c7"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "closure #1 @Swift.MainActor () -&gt; () in closure #1 (Swift.Optional&lt;__C.NSImage&gt;) -&gt; () in PDF_Reader_Pro.KMBrowserWindowController.screenShot_SelectArea(Swift.Optional&lt;Any&gt;) -&gt; ()"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/ChromiumTabs/KMBrowserWindowController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "1450"
+                  endingLineNumber = "1450"
+                  offsetFromSymbolStart = "1920">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -17242,6 +17094,21 @@
                   endingLineNumber = "1469"
                   offsetFromSymbolStart = "2052">
                </Location>
+               <Location
+                  uuid = "DD5A13D9-C900-4FA4-9800-151BE6270C17 - 1bad6b27eaf8ca8d"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "closure #1 (Swift.Bool) -&gt; () in PDF_Reader_Pro.KMBrowserWindowController.checkOpenNewDocument(path: Swift.String) -&gt; Swift.Bool"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/ChromiumTabs/KMBrowserWindowController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "1469"
+                  endingLineNumber = "1469"
+                  offsetFromSymbolStart = "104">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -17335,6 +17202,21 @@
                   endingLineNumber = "1570"
                   offsetFromSymbolStart = "1288">
                </Location>
+               <Location
+                  uuid = "5D40682D-E517-4F7D-9F72-B0EA692D79A1 - d4351849f882aebf"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "closure #1 @Swift.MainActor () -&gt; () in closure #1 (Swift.Optional&lt;__C.NSImage&gt;) -&gt; () in PDF_Reader_Pro.KMBrowserWindowController.screenShot_FullScreen(Swift.Optional&lt;Any&gt;) -&gt; ()"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/ChromiumTabs/KMBrowserWindowController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "1570"
+                  endingLineNumber = "1570"
+                  offsetFromSymbolStart = "1912">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -17542,6 +17424,21 @@
                   endingLineNumber = "1153"
                   offsetFromSymbolStart = "336">
                </Location>
+               <Location
+                  uuid = "A081FA35-34FF-4E7B-9C98-38304EFF398E - 61ec80c33d804a2f"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Reader_Pro.KMPDFEditViewController.printItemAction(menu: __C.NSMenuItem) -&gt; ()"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFTools/PageEdit/Controller/KMPDFEditViewController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "1153"
+                  endingLineNumber = "1153"
+                  offsetFromSymbolStart = "980">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -17845,54 +17742,6 @@
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "41BA37DD-5C5C-43CE-9117-46DFDEBE6546"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "PDF Master/Class/PDFWindowController/Side/RightSide/Signature/KMSignatureManager.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "19"
-            endingLineNumber = "19"
-            landmarkName = "loadAllSignatureList()"
-            landmarkType = "7">
-            <Locations>
-               <Location
-                  uuid = "41BA37DD-5C5C-43CE-9117-46DFDEBE6546 - f95ad65359c24fba"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Reader_Pro.KMSignatureManager.loadAllSignatureList() -&gt; ()"
-                  moduleName = "PDF Reader Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/Signature/KMSignatureManager.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "19"
-                  endingLineNumber = "19"
-                  offsetFromSymbolStart = "576">
-               </Location>
-               <Location
-                  uuid = "41BA37DD-5C5C-43CE-9117-46DFDEBE6546 - f95ad65359c24fba"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Reader_Pro.KMSignatureManager.loadAllSignatureList() -&gt; ()"
-                  moduleName = "PDF Reader Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/Signature/KMSignatureManager.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "19"
-                  endingLineNumber = "19"
-                  offsetFromSymbolStart = "912">
-               </Location>
-            </Locations>
-         </BreakpointContent>
-      </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
@@ -20399,6 +20248,21 @@
                   endingLineNumber = "635"
                   offsetFromSymbolStart = "2056">
                </Location>
+               <Location
+                  uuid = "523778F9-8A2B-4A24-88A8-C4164D33BBE9 - 80799893d85f5d1d"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Reader_Pro.KMMainViewController.openReadModel() -&gt; ()"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/ViewController/KMMainViewController+UI.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "635"
+                  endingLineNumber = "635"
+                  offsetFromSymbolStart = "1416">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -20412,13 +20276,13 @@
             filePath = "PDF Master/Class/PDFWindowController/Side/RightSide/EditPDF/KMEditPDFTextPropertyViewController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "482"
-            endingLineNumber = "482"
+            startingLineNumber = "525"
+            endingLineNumber = "525"
             landmarkName = "resetTextPresuppositionButtonAction(sender:)"
             landmarkType = "7">
             <Locations>
                <Location
-                  uuid = "D656AD8E-5684-41FE-BE1F-728AB0726912 - 52f9a5c3b33cf4eb"
+                  uuid = "D656AD8E-5684-41FE-BE1F-728AB0726912 - 52f9a5c3b33cf192"
                   shouldBeEnabled = "Yes"
                   ignoreCount = "0"
                   continueAfterRunningActions = "No"
@@ -20428,12 +20292,12 @@
                   urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/EditPDF/KMEditPDFTextPropertyViewController.swift"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "482"
-                  endingLineNumber = "482"
-                  offsetFromSymbolStart = "236">
+                  startingLineNumber = "521"
+                  endingLineNumber = "521"
+                  offsetFromSymbolStart = "112">
                </Location>
                <Location
-                  uuid = "D656AD8E-5684-41FE-BE1F-728AB0726912 - 52f9a5c3b33cf4eb"
+                  uuid = "D656AD8E-5684-41FE-BE1F-728AB0726912 - 52f9a5c3b33cfe16"
                   shouldBeEnabled = "Yes"
                   ignoreCount = "0"
                   continueAfterRunningActions = "No"
@@ -20443,8 +20307,8 @@
                   urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/EditPDF/KMEditPDFTextPropertyViewController.swift"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "482"
-                  endingLineNumber = "482"
+                  startingLineNumber = "525"
+                  endingLineNumber = "525"
                   offsetFromSymbolStart = "112">
                </Location>
             </Locations>
@@ -20875,6 +20739,21 @@
                   endingLineNumber = "609"
                   offsetFromSymbolStart = "232">
                </Location>
+               <Location
+                  uuid = "988E37CF-A5E9-4723-BA0A-6E14BC0B3708 - 752259418103d436"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Reader_Pro.KMToolbarController.showFindString(forward: Swift.Bool) -&gt; ()"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Toolbar/KMToolbarController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "609"
+                  endingLineNumber = "609"
+                  offsetFromSymbolStart = "124">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -20923,6 +20802,36 @@
                   endingLineNumber = "602"
                   offsetFromSymbolStart = "364">
                </Location>
+               <Location
+                  uuid = "0CE5511B-CEF5-477A-A6DA-791AC1D026EC - a9c06ffe67283743"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Reader_Pro.KMToolbarController.showFindBar() -&gt; ()"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Toolbar/KMToolbarController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "602"
+                  endingLineNumber = "602"
+                  offsetFromSymbolStart = "1484">
+               </Location>
+               <Location
+                  uuid = "0CE5511B-CEF5-477A-A6DA-791AC1D026EC - 9719205d4ffb7247"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "closure #3 (PDF_Reader_Pro.KMSearchFindView, Swift.String, Swift.Bool) -&gt; () in PDF_Reader_Pro.KMToolbarController.showFindBar() -&gt; ()"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Toolbar/KMToolbarController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "602"
+                  endingLineNumber = "602"
+                  offsetFromSymbolStart = "92">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -22077,6 +21986,21 @@
                   endingLineNumber = "1990"
                   offsetFromSymbolStart = "1712">
                </Location>
+               <Location
+                  uuid = "BD5008E4-AEFE-4BBD-AD1F-1A9C24417F81 - ac42bd2665afa7e4"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Reader_Pro.KMGeneralAnnotationViewController.fontPopUpButtonAction(__C.NSPopUpButton) -&gt; ()"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMGeneralAnnotationViewController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "1990"
+                  endingLineNumber = "1990"
+                  offsetFromSymbolStart = "1708">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -22421,10 +22345,42 @@
             filePath = "PDF Master/Class/PDFWindowController/Side/RightSide/EditPDF/Manager/KMEditPDFTextManager.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "376"
-            endingLineNumber = "376"
+            startingLineNumber = "384"
+            endingLineNumber = "384"
             landmarkName = "fetchFontName(fontName:)"
             landmarkType = "7">
+            <Locations>
+               <Location
+                  uuid = "AA34DD7C-BC4D-45CB-8890-5451870EEDFA - c9a929de2b9916e8"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Reader_Pro.KMEditPDFTextManager.fetchFontName(fontName: Swift.String) -&gt; Swift.String"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/EditPDF/Manager/KMEditPDFTextManager.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "376"
+                  endingLineNumber = "376"
+                  offsetFromSymbolStart = "276">
+               </Location>
+               <Location
+                  uuid = "AA34DD7C-BC4D-45CB-8890-5451870EEDFA - c9a929de2b991910"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Reader_Pro.KMEditPDFTextManager.fetchFontName(fontName: Swift.String) -&gt; Swift.String"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/EditPDF/Manager/KMEditPDFTextManager.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "384"
+                  endingLineNumber = "384"
+                  offsetFromSymbolStart = "276">
+               </Location>
+            </Locations>
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -22601,5 +22557,116 @@
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "F7D5FD09-AC4F-484F-9D0E-3BD9C053A738"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/PDFWindowController/Side/RightSide/EditPDF/KMEditPDFTextPropertyViewController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "216"
+            endingLineNumber = "216"
+            landmarkName = "setup()"
+            landmarkType = "7">
+            <Locations>
+               <Location
+                  uuid = "F7D5FD09-AC4F-484F-9D0E-3BD9C053A738 - f62cc9db05e555b7"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Reader_Pro.KMEditPDFTextPropertyViewController.setup() -&gt; ()"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/EditPDF/KMEditPDFTextPropertyViewController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "220"
+                  endingLineNumber = "220"
+                  offsetFromSymbolStart = "8028">
+               </Location>
+               <Location
+                  uuid = "F7D5FD09-AC4F-484F-9D0E-3BD9C053A738 - f62cc9db05e55512"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Reader_Pro.KMEditPDFTextPropertyViewController.setup() -&gt; ()"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/EditPDF/KMEditPDFTextPropertyViewController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "215"
+                  endingLineNumber = "215"
+                  offsetFromSymbolStart = "8140">
+               </Location>
+               <Location
+                  uuid = "F7D5FD09-AC4F-484F-9D0E-3BD9C053A738 - f62cc9db05e55533"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Reader_Pro.KMEditPDFTextPropertyViewController.setup() -&gt; ()"
+                  moduleName = "PDF Reader Pro"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Side/RightSide/EditPDF/KMEditPDFTextPropertyViewController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "216"
+                  endingLineNumber = "216"
+                  offsetFromSymbolStart = "8264">
+               </Location>
+            </Locations>
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "81BFD94F-A5BB-4951-AAA8-B38DB478D5A3"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/PDFWindowController/Side/RightSide/EditPDF/Manager/KMEditPDFTextManager.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "279"
+            endingLineNumber = "279"
+            landmarkName = "fetchTextImage(textString:alignment:fontName:fontSize:color:imageSize:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "9F2672CC-090C-4181-AA50-57C8A79632BF"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/PDFWindowController/PDFListView/AppKitCategories/CPDFListAnnotationNoteWindowController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "81"
+            endingLineNumber = "81"
+            landmarkName = "windowDidLoad()"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "35016D6B-ABD9-4F02-BFAA-C029DCAF1D0C"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/PDFWindowController/PDFListView/AppKitCategories/CPDFListEditAnnotationViewController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "62"
+            endingLineNumber = "62"
+            landmarkName = "viewDidLoad()"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>