【PDFull】颜色模块替换处理

PDF Office/PDF Master/Class/Appearance/Color.xcassets/NewColor/KMColor_Else_Tips_BG.colorset/Contents.json

@@ -5,9 +5,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "222",
-          "green" : "219",
-          "red" : "218"
+          "blue" : "246",
+          "green" : "238",
+          "red" : "239"
         }
       },
       "idiom" : "universal"

PDF Office/PDF Master/Class/Appearance/Color.xcassets/NewColor/KMColor_Interactive_A1.colorset/Contents.json

@@ -23,9 +23,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "1.000",
-          "green" : "0.580",
-          "red" : "0.306"
+          "blue" : "215",
+          "green" : "62",
+          "red" : "75"
         }
       },
       "idiom" : "universal"

PDF Office/PDF Master/Class/Appearance/Color.xcassets/NewColor/KMColor_Interactive_A_1.colorset/Contents.json

@@ -23,9 +23,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0.698",
-          "green" : "0.333",
-          "red" : "0.090"
+          "blue" : "215",
+          "green" : "62",
+          "red" : "75"
         }
       },
       "idiom" : "universal"

PDF Office/PDF Master/Class/Appearance/Color.xcassets/NewColor/KMColor_Interactive_M1.colorset/Contents.json

@@ -23,9 +23,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0xD7",
-          "green" : "0x3E",
-          "red" : "0x4B"
+          "blue" : "215",
+          "green" : "62",
+          "red" : "75"
         }
       },
       "idiom" : "universal"

PDF Office/PDF Master/Class/Appearance/Color.xcassets/NewColor/KMColor_Interactive_M_1.colorset/Contents.json

@@ -23,9 +23,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0.596",
-          "green" : "0.345",
-          "red" : "0.212"
+          "blue" : "215",
+          "green" : "62",
+          "red" : "75"
         }
       },
       "idiom" : "universal"

PDF Office/PDF Master/Class/Appearance/Color.xcassets/NewColor/KMColor_Layout_H0.colorset/Contents.json

@@ -5,9 +5,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0x13",
-          "green" : "0x10",
-          "red" : "0x0D"
+          "blue" : "51",
+          "green" : "51",
+          "red" : "51"
         }
       },
       "idiom" : "universal"

PDF Office/PDF Master/Class/Appearance/Color.xcassets/NewColor/KMColor_Layout_H1.colorset/Contents.json

@@ -5,9 +5,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "77",
-          "green" : "70",
-          "red" : "66"
+          "blue" : "51",
+          "green" : "51",
+          "red" : "51"
         }
       },
       "idiom" : "universal"

PDF Office/PDF Master/Class/Appearance/Color.xcassets/NewColor/KMColor_Layout_H2.colorset/Contents.json

@@ -5,9 +5,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "128",
-          "green" : "119",
-          "red" : "117"
+          "blue" : "102",
+          "green" : "102",
+          "red" : "102"
         }
       },
       "idiom" : "universal"

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

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

PDF Office/PDF Master/Class/Appearance/Image.xcassets/Other/UXNewImage/ic_Propertybar/KMImageNameUXIconPropertybarViewPagesingleSel.imageset/ic.pdf

@@ -0,0 +1,72 @@
+%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 6.000000 4.000000 cm
+0.439216 0.392157 1.000000 scn
+0.000000 16.000000 m
+8.000000 16.000000 l
+12.000000 11.800000 l
+12.000000 0.000000 l
+0.000000 0.000000 l
+0.000000 16.000000 l
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  254
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 24.000000 24.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
+0000000344 00000 n
+0000000366 00000 n
+0000000539 00000 n
+0000000613 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+672
+%%EOF

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

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "ic_propertybar_view_splitscreensingle_sel-1.pdf",
+      "filename" : "ic_propertybar_view_splitscreensingle_sel 1.pdf",
       "idiom" : "mac"
     },
     {

PDF Office/PDF Master/Class/Appearance/Image.xcassets/Other/UXNewImage/ic_Propertybar/KMImageNameUXIconPropertybarViewSplitscreensingleSel.imageset/ic_propertybar_view_splitscreensingle_sel 1.pdf

@@ -0,0 +1,93 @@
+%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 3.000000 cm
+0.439216 0.392157 1.000000 scn
+16.000000 18.000000 m
+0.000000 18.000000 l
+0.000000 0.000000 l
+16.000000 0.000000 l
+16.000000 18.000000 l
+h
+15.000000 17.000000 m
+15.000000 1.000000 l
+1.000000 1.000000 l
+1.000000 17.000000 l
+15.000000 17.000000 l
+h
+6.809082 7.000000 m
+7.192871 8.142578 l
+8.810059 8.142578 l
+9.190918 7.000000 l
+9.882324 7.000000 l
+8.355957 11.227539 l
+7.646973 11.227539 l
+6.120605 7.000000 l
+6.809082 7.000000 l
+h
+8.634277 8.669922 m
+7.368652 8.669922 l
+7.975098 10.486328 l
+8.024902 10.486328 l
+8.634277 8.669922 l
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  630
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 24.000000 24.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
+0000000720 00000 n
+0000000742 00000 n
+0000000915 00000 n
+0000000989 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+1048
+%%EOF

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

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "ic_propertybar_view_splitscreenver_sel-1.pdf",
+      "filename" : "ic_propertybar_view_splitscreenver_sel 1.pdf",
       "idiom" : "mac"
     },
     {

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

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

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

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

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

@@ -895,32 +895,16 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "C4564445-AE83-4AFD-9BB4-7AB24B2950E5"
+            uuid = "16992C13-0665-4732-8E9F-2D3CD034BA87"
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "PDF Master/Class/PDFWindowController/Toolbar/KMToolbarController.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "777"
-            endingLineNumber = "777"
-            landmarkName = "toolbarViewController(_:clickMode:toolbar:_:)"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "657FF270-6B8E-4E91-85D3-E33F9969F8A5"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "PDF Master/Class/PDFWindowController/Toolbar/KMToolbarController.swift"
+            filePath = "PDF Master/Class/PDFWindowController/ViewController/KMMainViewController+Action.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "779"
-            endingLineNumber = "779"
-            landmarkName = "toolbarViewController(_:clickMode:toolbar:_:)"
+            startingLineNumber = "155"
+            endingLineNumber = "155"
+            landmarkName = "addText()"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>