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

PDF Office/PDF Master/Class/PDFTools/Merge/MergeNew/View/KMMergeBlankView/KMMergeBlankView.swift

@@ -25,6 +25,11 @@ class KMMergeBlankView: KMBaseXibView {
     }
     
     override func setup() {
+        titleLable.font = NSFont.systemFont(ofSize: 14, weight: .semibold)
+        titleLable.textColor = KMAppearance.Layout.h1Color()
+        subTitleLabel.font = NSFont.systemFont(ofSize: 14)
+        subTitleLabel.textColor = KMAppearance.Layout.h2Color()
+        
         self.titleLable.stringValue = NSLocalizedString("Select Files", comment: "")
         self.subTitleLabel.stringValue = NSLocalizedString("Drop files here or Click Add Files at upper left corner. You can drag files to reorder as you need.", comment: "")
         

PDF Office/PDF Master/Class/PDFTools/Merge/OCPart/KMBlankView.swift

@@ -36,7 +36,9 @@ class KMBlankView: NSView {
         super.awakeFromNib()
         
         titleLabel.font = NSFont.systemFont(ofSize: 14, weight: .semibold)
+        titleLabel.textColor = KMAppearance.Layout.h1Color()
         secondTitleLabel.font = NSFont.systemFont(ofSize: 14)
+        secondTitleLabel.textColor = KMAppearance.Layout.h2Color()
         
         titleLabel.stringValue = ""
         secondTitleLabel.stringValue = ""

PDF Office/PDF Master/Class/PDFWindowController/PDFListView/CPDFListViewExtension/CPDFListView+UndoManager.m

@@ -125,8 +125,7 @@ static NSString *CPDFListViewAnnotationPropertiesObservationContext = @"CPDFList
 
 - (void)PDFPageDidAddAnnotationNotification:(NSNotification *)notification {
     CPDFAnnotation *annotation = [notification object];
-    if (annotation.page &&
-        [annotation isKindOfClass:[CPDFAnnotation class]] &&
+    if ([annotation isKindOfClass:[CPDFAnnotation class]] &&
         ![annotation isKindOfClass:[CPDFLinkAnnotation class]]) {
         [self startObservingNotes:@[annotation]];
     }