Pārlūkot izejas kodu

【PDFull】图片替换

niehaoyu 2 mēneši atpakaļ
vecāks
revīzija
79a3b04f2c
22 mainītis faili ar 306 papildinājumiem un 452 dzēšanām
  1. 1 1
      PDF Office/PDF Master/Class/Appearance/Image.xcassets/LeftSide/KMImageNameStikeoutIcon.imageset/Contents.json
  2. 88 0
      PDF Office/PDF Master/Class/Appearance/Image.xcassets/LeftSide/KMImageNameStikeoutIcon.imageset/ic_subtoolbar_mytools_highlight.pdf
  3. 0 79
      PDF Office/PDF Master/Class/Appearance/Image.xcassets/LeftSide/KMImageNameStikeoutIcon.imageset/light_ic_sidebar_annotation_stikeout.pdf
  4. 2 11
      PDF Office/PDF Master/Class/Appearance/Image.xcassets/LeftSide/Sidetabbar/KMImageNameAnnotationStrikeout.imageset/Contents.json
  5. 25 24
      PDF Office/PDF Master/Class/Appearance/Image.xcassets/LeftSide/Sidetabbar/KMImageNameAnnotationUnderline.imageset/underline.pdf
  6. 0 85
      PDF Office/PDF Master/Class/Appearance/Image.xcassets/LeftSide/Sidetabbar/KMImageNameAnnotationStrikeout.imageset/strikethrough.pdf
  7. 2 11
      PDF Office/PDF Master/Class/Appearance/Image.xcassets/LeftSide/Sidetabbar/KMImageNameAnnotationUnderline.imageset/Contents.json
  8. 88 0
      PDF Office/PDF Master/Class/Appearance/Image.xcassets/LeftSide/Sidetabbar/KMImageNameAnnotationUnderline.imageset/ic_subtoolbar_mytools_underline.pdf
  9. 1 1
      PDF Office/PDF Master/Class/Appearance/Image.xcassets/Other/UXNewImage/Other/KMImageNameButtonEidtPDFImage.imageset/Contents.json
  10. 0 107
      PDF Office/PDF Master/Class/Appearance/Image.xcassets/Other/UXNewImage/Other/KMImageNameButtonEidtPDFImage.imageset/addpicture.pdf
  11. BIN
      PDF Office/PDF Master/Class/Appearance/Image.xcassets/Other/UXNewImage/Other/KMImageNameButtonEidtPDFImage.imageset/ic 1.pdf
  12. 1 1
      PDF Office/PDF Master/Class/Appearance/Image.xcassets/Other/UXNewImage/Other/KMImageNameButtonEidtPDFText.imageset/Contents.json
  13. 4 4
      PDF Office/PDF Master/Class/Appearance/Image.xcassets/Other/UXNewImage/Other/KMImageNameButtonEidtPDFText.imageset/addtext.pdf
  14. 2 2
      PDF Office/PDF Master/Class/Batch/WindowController/VC/KMBatchOperateConvertViewController.xib
  15. 1 1
      PDF Office/PDF Master/Class/PDFTools/Convert/NewController/KMConvertWindowController.swift
  16. 3 3
      PDF Office/PDF Master/Class/PDFTools/Convert/NewController/KMConvertWindowController.xib
  17. 2 2
      PDF Office/PDF Master/Class/PDFWindowController/Side/LeftSide/Annotation/View/KMNoteTypeImageView.swift
  18. 5 0
      PDF Office/PDF Master/Class/PDFWindowController/Toolbar/KMToolbarController.swift
  19. 8 6
      PDF Office/PDF Master/Class/PDFWindowController/Toolbar/KMToolbarItemView.swift
  20. 2 0
      PDF Office/PDF Master/Class/PDFWindowController/Toolbar/KMToolbarViewController.swift
  21. 1 1
      PDF Office/PDF Master/Class/PDFWindowController/Toolbar/View/KMToolbarCustomItemView.swift
  22. 70 113
      PDF Office/PDF Reader Pro.xcodeproj/xcuserdata/kdanmobile.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

+ 1 - 1
PDF Office/PDF Master/Class/Appearance/Image.xcassets/LeftSide/KMImageNameStikeoutIcon.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "light_ic_sidebar_annotation_stikeout.pdf",
+      "filename" : "ic_subtoolbar_mytools_highlight.pdf",
       "idiom" : "universal"
     },
     {

+ 88 - 0
PDF Office/PDF Master/Class/Appearance/Image.xcassets/LeftSide/KMImageNameStikeoutIcon.imageset/ic_subtoolbar_mytools_highlight.pdf

@@ -0,0 +1,88 @@
+%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 3.000000 3.500000 cm
+1.000000 1.000000 1.000000 scn
+12.607775 1.000021 m
+7.696358 13.278564 l
+6.303642 13.278564 l
+1.392225 1.000021 l
+0.000000 1.000021 l
+0.000000 0.000021 l
+4.000000 0.000021 l
+4.000000 1.000021 l
+3.007762 1.000021 l
+4.107717 3.750021 l
+9.892282 3.750021 l
+10.992238 1.000021 l
+10.000000 1.000021 l
+10.000000 0.000021 l
+14.000000 0.000021 l
+14.000000 1.000021 l
+12.607775 1.000021 l
+h
+9.492299 4.750021 m
+7.000000 10.981022 l
+4.507701 4.750021 l
+9.492299 4.750021 l
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  560
+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
+0000000650 00000 n
+0000000672 00000 n
+0000000845 00000 n
+0000000919 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+978
+%%EOF

+ 0 - 79
PDF Office/PDF Master/Class/Appearance/Image.xcassets/LeftSide/KMImageNameStikeoutIcon.imageset/light_ic_sidebar_annotation_stikeout.pdf

@@ -1,79 +0,0 @@
-%PDF-1.3
-%ÿÿÿÿ
-7 0 obj
-<<
-/Type /ExtGState
-/ca 1
->>
-endobj
-6 0 obj
-<<
-/Type /Page
-/Parent 1 0 R
-/MediaBox [0 0 16 16]
-/Contents 4 0 R
-/Resources 5 0 R
->>
-endobj
-5 0 obj
-<<
-/ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
-/ExtGState <<
-/Gs1 7 0 R
->>
->>
-endobj
-8 0 obj
-<<
-/Producer (PDFKit)
-/Creator (PDFKit)
-/CreationDate (D:20201219095125Z)
->>
-endobj
-3 0 obj
-<<
->>
-endobj
-2 0 obj
-<<
-/Type /Catalog
-/Pages 1 0 R
->>
-endobj
-1 0 obj
-<<
-/Type /Pages
-/Count 1
-/Kids [6 0 R]
->>
-endobj
-4 0 obj
-<<
-/Length 264
-/Filter /FlateDecode
->>
-stream
-xœu’ËjÃ0E÷ú
-­™hzmK!ëvÓ0éÜ@0ôû{U·X¶d4¾ÝÑõ`öëÀØ8ùáË]ÿ¢yØÈ«k/À	elÏèÂ\>Ü«¿ì-wÁAƒáv^ó†A÷vÚ‡$»yÉñéüý9œ_N�~˜\ ŽR�9'Ë!–"NÑ
ÓbÊš%Z
\ûi¸¸ãibÿ>¹B©&�Å3ea‹¹MB¨TE\Ö†0›¥IIR;(fˆz�öV&Éyݹ³øŠ(u&ar@V¦Hhˆþ«æìrÈVu%iÕ7“M&Ë@ÆCj?FñF(–ˆ·,q+|PþÏ6ßÛƒ{Þ¬RáˆÈ
-endstream
-endobj
-xref
-0 9
-0000000000 65535 f 
-0000000418 00000 n 
-0000000369 00000 n 
-0000000348 00000 n 
-0000000475 00000 n 
-0000000161 00000 n 
-0000000059 00000 n 
-0000000015 00000 n 
-0000000256 00000 n 
-trailer
-<<
-/Size 9
-/Root 2 0 R
-/Info 8 0 R
->>
-startxref
-811
-%%EOF

+ 2 - 11
PDF Office/PDF Master/Class/Appearance/Image.xcassets/LeftSide/Sidetabbar/KMImageNameAnnotationStrikeout.imageset/Contents.json

@@ -1,17 +1,8 @@
 {
   "images" : [
     {
-      "filename" : "strikethrough.pdf",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "filename" : "ic_subtoolbar_mytools_strikeout.pdf",
+      "idiom" : "universal"
     }
   ],
   "info" : {

+ 25 - 24
PDF Office/PDF Master/Class/Appearance/Image.xcassets/LeftSide/Sidetabbar/KMImageNameAnnotationUnderline.imageset/underline.pdf

@@ -10,25 +10,26 @@ stream
 /DeviceRGB CS
 /DeviceRGB cs
 q
-1.000000 0.000000 -0.000000 1.000000 3.416992 4.000000 cm
-0.152941 0.235294 0.384314 scn
-0.000000 0.000000 m
-2.409668 0.000000 l
-3.752930 3.999023 l
-9.413086 3.999023 l
-10.746094 0.000000 l
-13.166016 0.000000 l
-7.823730 14.796387 l
-5.342285 14.796387 l
-0.000000 0.000000 l
+1.000000 0.000000 -0.000000 1.000000 2.500000 3.607178 cm
+0.439216 0.392157 1.000000 scn
+11.849380 0.999987 m
+10.714286 0.999987 l
+10.714286 -0.000013 l
+15.000000 -0.000013 l
+15.000000 0.999987 l
+13.464917 0.999987 l
+8.196358 14.171387 l
+6.803642 14.171387 l
+1.535083 0.999987 l
+0.000000 0.999987 l
+0.000000 -0.000013 l
+4.285714 -0.000013 l
+4.285714 0.999987 l
+3.150620 0.999987 l
+7.500000 11.873844 l
+11.849380 0.999987 l
 h
-6.490723 12.202148 m
-6.665039 12.202148 l
-8.797852 5.844727 l
-4.368164 5.844727 l
-6.490723 12.202148 l
-h
-f
+f*
 n
 Q
 
@@ -36,7 +37,7 @@ endstream
 endobj
 
 3 0 obj
-  416
+  462
 endobj
 
 4 0 obj
@@ -67,15 +68,15 @@ xref
 0000000000 65535 f
 0000000010 00000 n
 0000000034 00000 n
-0000000506 00000 n
-0000000528 00000 n
-0000000701 00000 n
-0000000775 00000 n
+0000000552 00000 n
+0000000574 00000 n
+0000000747 00000 n
+0000000821 00000 n
 trailer
 << /ID [ (some) (id) ]
    /Root 6 0 R
    /Size 7
 >>
 startxref
-834
+880
 %%EOF

+ 0 - 85
PDF Office/PDF Master/Class/Appearance/Image.xcassets/LeftSide/Sidetabbar/KMImageNameAnnotationStrikeout.imageset/strikethrough.pdf

@@ -1,85 +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 2.476562 2.000000 cm
-0.152941 0.235294 0.384314 scn
-2.753906 0.000000 m
-0.000000 0.000000 l
-1.985795 5.500005 l
-13.061080 5.500005 l
-15.046875 0.000000 l
-12.281250 0.000000 l
-10.757812 4.570312 l
-4.289062 4.570312 l
-2.753906 0.000000 l
-h
-12.459324 7.166672 m
-8.941406 16.910156 l
-6.105469 16.910156 l
-2.587551 7.166672 l
-5.154778 7.166672 l
-7.417969 13.945312 l
-7.617188 13.945312 l
-9.891313 7.166672 l
-12.459324 7.166672 l
-h
-f*
-n
-Q
-
-endstream
-endobj
-
-3 0 obj
-  500
-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
-0000000590 00000 n
-0000000612 00000 n
-0000000785 00000 n
-0000000859 00000 n
-trailer
-<< /ID [ (some) (id) ]
-   /Root 6 0 R
-   /Size 7
->>
-startxref
-918
-%%EOF

+ 2 - 11
PDF Office/PDF Master/Class/Appearance/Image.xcassets/LeftSide/Sidetabbar/KMImageNameAnnotationUnderline.imageset/Contents.json

@@ -1,17 +1,8 @@
 {
   "images" : [
     {
-      "filename" : "underline.pdf",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
+      "filename" : "ic_subtoolbar_mytools_underline.pdf",
+      "idiom" : "universal"
     }
   ],
   "info" : {

+ 88 - 0
PDF Office/PDF Master/Class/Appearance/Image.xcassets/LeftSide/Sidetabbar/KMImageNameAnnotationUnderline.imageset/ic_subtoolbar_mytools_underline.pdf

@@ -0,0 +1,88 @@
+%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 3.000000 5.000000 cm
+0.439216 0.392157 1.000000 scn
+10.000000 1.000021 m
+10.992238 1.000021 l
+9.892282 3.750021 l
+4.107718 3.750021 l
+3.007762 1.000021 l
+4.000000 1.000021 l
+4.000000 0.000021 l
+0.000000 0.000021 l
+0.000000 1.000021 l
+1.392225 1.000021 l
+6.303642 13.278564 l
+7.696358 13.278564 l
+12.607775 1.000021 l
+14.000000 1.000021 l
+14.000000 0.000021 l
+10.000000 0.000021 l
+10.000000 1.000021 l
+h
+4.507701 4.750021 m
+9.492299 4.750021 l
+7.000000 10.981022 l
+4.507701 4.750021 l
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  560
+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
+0000000650 00000 n
+0000000672 00000 n
+0000000845 00000 n
+0000000919 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+978
+%%EOF

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

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "addpicture.pdf",
+      "filename" : "ic 1.pdf",
       "idiom" : "universal"
     },
     {

+ 0 - 107
PDF Office/PDF Master/Class/Appearance/Image.xcassets/Other/UXNewImage/Other/KMImageNameButtonEidtPDFImage.imageset/addpicture.pdf

@@ -1,107 +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 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

BIN
PDF Office/PDF Master/Class/Appearance/Image.xcassets/Other/UXNewImage/Other/KMImageNameButtonEidtPDFImage.imageset/ic 1.pdf


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

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "addtext.pdf",
+      "filename" : "edit 1.pdf",
       "idiom" : "universal"
     },
     {

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

@@ -11,7 +11,7 @@ stream
 /DeviceRGB cs
 q
 1.000000 0.000000 -0.000000 1.000000 4.000000 5.500000 cm
-0.152276 0.234759 0.385445 scn
+1.000000 1.000000 1.000000 scn
 8.000000 9.000000 m
 8.000000 6.500000 l
 6.500000 6.500000 l
@@ -35,7 +35,7 @@ n
 Q
 q
 1.000000 0.000000 -0.000000 1.000000 1.750000 2.250000 cm
-0.152276 0.234759 0.385445 scn
+1.000000 1.000000 1.000000 scn
 16.500000 1.500000 m
 16.500000 0.750000 l
 17.250000 0.750000 l
@@ -83,7 +83,7 @@ n
 Q
 q
 1.000000 0.000000 -0.000000 1.000000 14.000000 12.500000 cm
-0.152276 0.234759 0.385445 scn
+1.000000 1.000000 1.000000 scn
 0.000000 0.750000 m
 6.000000 0.750000 l
 6.000000 2.250000 l
@@ -95,7 +95,7 @@ n
 Q
 q
 -0.000000 -1.000000 1.000000 -0.000000 11.000000 17.000000 cm
-0.152276 0.234759 0.385445 scn
+1.000000 1.000000 1.000000 scn
 0.000000 5.250000 m
 6.000000 5.250000 l
 6.000000 6.750000 l

+ 2 - 2
PDF Office/PDF Master/Class/Batch/WindowController/VC/KMBatchOperateConvertViewController.xib

@@ -1,8 +1,8 @@
 <?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="22505" 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="22505"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>

+ 1 - 1
PDF Office/PDF Master/Class/PDFTools/Convert/NewController/KMConvertWindowController.swift

@@ -464,7 +464,7 @@ let kConvertFileSavePath = (kTempSavePath?.stringByAppendingPathComponent("conve
                 let newR: NSRange = moreLabelString.nsRange(from: range)!
                 let attributedStr = NSMutableAttributedString(string: moreLabelString)
                 attributedStr.addAttribute(.foregroundColor, value: NSColor.labelColor, range: NSRange(location: 0, length: newR.location - 1))
-                attributedStr.addAttribute(.foregroundColor, value: NSColor(red: 8/255, green: 124/255, blue: 1, alpha: 1), range: newR)
+                attributedStr.addAttribute(.foregroundColor, value: NSColor(red: 112/255, green: 110/255, blue: 1, alpha: 1), range: newR)
                 attributedStr.addAttribute(.underlineStyle, value: NSUnderlineStyle.single.rawValue, range: newR)
                 moreConvertLabel.attributedStringValue = attributedStr
             }

+ 3 - 3
PDF Office/PDF Master/Class/PDFTools/Convert/NewController/KMConvertWindowController.xib

@@ -1,8 +1,8 @@
 <?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="22505" 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="22505"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -57,7 +57,7 @@
             <windowStyleMask key="styleMask" titled="YES" closable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="196" y="240" width="740" height="461"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1415"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1055"/>
             <value key="minSize" type="size" width="700" height="524"/>
             <value key="maxSize" type="size" width="700" height="524"/>
             <view key="contentView" wantsLayer="YES" id="se5-gp-TjO">

+ 2 - 2
PDF Office/PDF Master/Class/PDFWindowController/Side/LeftSide/Annotation/View/KMNoteTypeImageView.swift

@@ -135,7 +135,7 @@ class KMNoteTypeImageView: NSImageView {
                 image?.unlockFocus()
             }
         } else if type == SKNUnderlineString {
-            if let baseImage = NSImage(named: highlight) {
+            if let baseImage = NSImage(named: underline) {
                 var size = NSMakeSize(20, 20)
                 image = NSImage(size: size)
                 image?.lockFocus()
@@ -153,7 +153,7 @@ class KMNoteTypeImageView: NSImageView {
                 image?.unlockFocus()
             }
         } else if type == SKNStrikeOutString {
-            if let strikeImage = NSImage(named: highlight) {
+            if let strikeImage = NSImage(named: strikePath) {
                 var size = NSMakeSize(20, 20)
                 image = NSImage(size: size)
                 image?.lockFocus()

+ 5 - 0
PDF Office/PDF Master/Class/PDFWindowController/Toolbar/KMToolbarController.swift

@@ -773,6 +773,11 @@ extension KMToolbarController: KMToolbarViewControllerDelegate {
             }
         }
         self.toolbarType = toolMode
+        if toolMode == .editPDF {
+            childToolBarView?.view.layer?.backgroundColor = KMAppearance.Interactive.a0Color().cgColor
+        } else {
+            childToolBarView?.view.layer?.backgroundColor = NSColor.km_init(hex: "#F7F8FA").cgColor
+        }
         
         self.delegate?.mainToolDidClicked?(self, beforeModel, toolMode, toolbarItem, pages)
     }

+ 8 - 6
PDF Office/PDF Master/Class/PDFWindowController/Toolbar/KMToolbarItemView.swift

@@ -59,7 +59,7 @@ extension KMToolbarItemView {
                         }
                     }
                     if (self.nameBtn.superview != nil) {
-                        self.nameBtn.setTitleColor(color: Self.fetchTextSelectedColor())
+                        self.nameBtn.setTitleColor(color: normalTextColor)
                     }
                     if(self.needExpandAction) {
                         self.needExpandButton.image = NSImage(named: "KMImageNameUXIconBtnTriDownSel")
@@ -72,7 +72,7 @@ extension KMToolbarItemView {
                         self.imageViewBtn.image = data
                     }
                     if (self.nameBtn.superview != nil) {
-                        self.nameBtn.setTitleColor(color: Self.fetchTextNormalColor())
+                        self.nameBtn.setTitleColor(color: normalTextColor)
                     }
                 }
                 self.updateSelectBackground()
@@ -113,7 +113,7 @@ extension KMToolbarItemView {
     var titleName: String? {
         didSet {
             self.nameBtn.title = self.titleName ?? " "
-            self.nameBtn.setTitleColor(color: Self.fetchTextNormalColor())
+            self.nameBtn.setTitleColor(color: normalTextColor)
             
             self.itemWidth = self._calculateWidth()
         }
@@ -188,6 +188,8 @@ extension KMToolbarItemView {
     var selectedBackgroundColor: NSColor = KMAppearance.Status.selColor()
     var selectBackgroundType: KMToolbarItemViewSelectBackgroundType = .none
     
+    var normalTextColor: NSColor = KMAppearance.titleColor()
+    
     var itemWidth: CGFloat = 0
     var itemHeight: CGFloat = 0
     var isPopToolTip = false
@@ -364,7 +366,7 @@ extension KMToolbarItemView {
                 self._kNormalImage = self.image
                 self.imageViewBtn.image = self.alternateImage
                 if(self.nameBtn.superview != nil) {
-                    self.nameBtn.setTitleColor(color: Self.fetchTextNormalColor())
+                    self.nameBtn.setTitleColor(color: normalTextColor)
                 }
             }
         }
@@ -404,7 +406,7 @@ extension KMToolbarItemView {
         }
         
         if(self.nameBtn.superview != nil && !self.isSelected) {
-            self.nameBtn.setTitleColor(color: Self.fetchTextNormalColor())
+            self.nameBtn.setTitleColor(color: normalTextColor)
         }
     }
     
@@ -433,7 +435,7 @@ extension KMToolbarItemView {
     override func interfaceThemeDidChanged(_ appearance: NSAppearance.Name) {
         super.interfaceThemeDidChanged(appearance)
         
-        self.nameBtn.setTitleColor(Self.fetchTextNormalColor())
+        self.nameBtn.setTitleColor(normalTextColor)
     }
 }
 

+ 2 - 0
PDF Office/PDF Master/Class/PDFWindowController/Toolbar/KMToolbarViewController.swift

@@ -1769,6 +1769,7 @@ extension KMToolbarViewController {
             item?.target = self
             item?.btnTag = CAnnotationType.addText.rawValue
             item?.toolTip = NSLocalizedString("Add Text", comment: "")
+            item?.normalTextColor = NSColor.white
             item?.titleName = NSLocalizedString("Add Text", comment: "")
             item?.boxImagePosition = .imageLeft
             item?.btnAction = #selector(changeAnnotationMode)
@@ -1776,6 +1777,7 @@ extension KMToolbarViewController {
             item?.image = NSImage(named: "KMImageNameButtonEidtPDFImage")
             item?.target = self
             item?.btnTag = CAnnotationType.addImage.rawValue
+            item?.normalTextColor = NSColor.white
             item?.toolTip = NSLocalizedString("Add Image", comment: "")
             item?.titleName = NSLocalizedString("Add Image", comment: "")
             item?.boxImagePosition = .imageLeft

+ 1 - 1
PDF Office/PDF Master/Class/PDFWindowController/Toolbar/View/KMToolbarCustomItemView.swift

@@ -87,7 +87,7 @@ class KMToolbarCustomItemView: KMToolbarItemView {
         }
         
         if(self.nameBtn.superview != nil && !self.isSelected) {
-            self.nameBtn.setTitleColor(color: Self.fetchTextNormalColor())
+            self.nameBtn.setTitleColor(color: normalTextColor)
         }
         if self.isPopToolTip {
             NSObject.cancelPreviousPerformRequests(withTarget: self, selector: #selector(_showHUDHint), object: nil)

+ 70 - 113
PDF Office/PDF Reader Pro.xcodeproj/xcuserdata/kdanmobile.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -374,117 +374,10 @@
             filePath = "PDF Master/Class/PDFWindowController/Toolbar/KMToolbarViewController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2226"
-            endingLineNumber = "2226"
+            startingLineNumber = "2228"
+            endingLineNumber = "2228"
             landmarkName = "_setupToolItem(_:)"
             landmarkType = "7">
-            <Locations>
-               <Location
-                  uuid = "3311C608-322A-4CAD-BDFD-4F18E5699056 - e3032856f66af2ed"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDFull.KMToolbarViewController._setupToolItem(Swift.Optional&lt;PDFull.KMToolbarItemView&gt;) -&gt; ()"
-                  moduleName = "PDFull"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Toolbar/KMToolbarViewController.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "2226"
-                  endingLineNumber = "2226"
-                  offsetFromSymbolStart = "8524">
-               </Location>
-               <Location
-                  uuid = "3311C608-322A-4CAD-BDFD-4F18E5699056 - e3032856f66af2ed"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDFull.KMToolbarViewController._setupToolItem(Swift.Optional&lt;PDFull.KMToolbarItemView&gt;) -&gt; ()"
-                  moduleName = "PDFull"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Toolbar/KMToolbarViewController.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "2226"
-                  endingLineNumber = "2226"
-                  offsetFromSymbolStart = "8816">
-               </Location>
-               <Location
-                  uuid = "3311C608-322A-4CAD-BDFD-4F18E5699056 - 8d98cba2b92fcd28"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "LynxPDF_Editor.KMToolbarViewController.validateMenuItem(__C.NSMenuItem) -&gt; Swift.Bool"
-                  moduleName = "LynxPDF Editor"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Toolbar/KMToolbarViewController.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "2226"
-                  endingLineNumber = "2226"
-                  offsetFromSymbolStart = "1016">
-               </Location>
-               <Location
-                  uuid = "3311C608-322A-4CAD-BDFD-4F18E5699056 - 7f6f2ad327e66e2b"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Reader_Pro.KMToolbarViewController._setupToolItem(Swift.Optional&lt;PDF_Reader_Pro.KMToolbarItemView&gt;) -&gt; ()"
-                  moduleName = "PDF Reader Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Toolbar/KMToolbarViewController.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "2226"
-                  endingLineNumber = "2226"
-                  offsetFromSymbolStart = "8524">
-               </Location>
-               <Location
-                  uuid = "3311C608-322A-4CAD-BDFD-4F18E5699056 - e3032856f66af269"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDFull.KMToolbarViewController._setupToolItem(Swift.Optional&lt;PDFull.KMToolbarItemView&gt;) -&gt; ()"
-                  moduleName = "PDFull"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Toolbar/KMToolbarViewController.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "2230"
-                  endingLineNumber = "2230"
-                  offsetFromSymbolStart = "8496">
-               </Location>
-               <Location
-                  uuid = "3311C608-322A-4CAD-BDFD-4F18E5699056 - 7f6f2ad327e66eaf"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Reader_Pro.KMToolbarViewController._setupToolItem(Swift.Optional&lt;PDF_Reader_Pro.KMToolbarItemView&gt;) -&gt; ()"
-                  moduleName = "PDF Reader Pro"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Toolbar/KMToolbarViewController.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "2230"
-                  endingLineNumber = "2230"
-                  offsetFromSymbolStart = "8496">
-               </Location>
-               <Location
-                  uuid = "3311C608-322A-4CAD-BDFD-4F18E5699056 - e3032856f66af269"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDFull.KMToolbarViewController._setupToolItem(Swift.Optional&lt;PDFull.KMToolbarItemView&gt;) -&gt; ()"
-                  moduleName = "PDFull"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/kdanmobile/Documents/Git/PDF_Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/Toolbar/KMToolbarViewController.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "2230"
-                  endingLineNumber = "2230"
-                  offsetFromSymbolStart = "8404">
-               </Location>
-            </Locations>
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -634,16 +527,80 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "B5706306-7D65-4004-B2A9-3C4E6740A518"
+            uuid = "4E2CDECA-2B96-441E-94B0-C79D4726B91D"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/PDFWindowController/ViewController/KMMainViewController+Action.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "150"
+            endingLineNumber = "150"
+            landmarkName = "editAddBlanMenu(menu:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "DFE7612C-6ABD-4EA9-87C7-A03D218AAE85"
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "PDF Master/Class/PDFWindowController/Toolbar/KMToolbarViewController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "203"
-            endingLineNumber = "203"
-            landmarkName = "changeAnnotationMode(item:)"
+            startingLineNumber = "1974"
+            endingLineNumber = "1974"
+            landmarkName = "_setupFillSignItem(_:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "6BA5FC10-A784-4174-92DE-69500C4C09D6"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/ViewController/FormProperties/KMAnnotationButtonWidgetAppearanceViewController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "49"
+            endingLineNumber = "49"
+            landmarkName = "loadView()"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "8A0B7BCE-6EDD-4491-A5D5-7899C99171DD"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/PDFWindowController/Toolbar/KMToolbarItemView.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "369"
+            endingLineNumber = "369"
+            landmarkName = "mouseEntered(with:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "716324BF-FFE0-4183-B513-3AB5095364DA"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/PDFWindowController/Toolbar/View/KMToolbarCustomItemView.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "90"
+            endingLineNumber = "90"
+            landmarkName = "mouseExited(with:)"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>