Browse Source

【综合】编辑PDF 暗黑模式,添加文本、图片Icon看不清(已修复)

tangchao 11 months ago
parent
commit
757d5deb9f

+ 10 - 0
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"
     }

+ 107 - 0
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

+ 10 - 0
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"
     }

+ 155 - 0
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

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

@@ -1589,7 +1589,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 +1597,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: "")