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

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

@@ -1190,23 +1190,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "169"
             endingLineNumber = "169"
-            landmarkName = "searchHistoryAction(sender:)"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "6C34232B-E840-4EE0-84A9-54AC2C87F0BF"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "PDF Office/Class/PDFWindowController/Side/LeftSide/Annotation/View/KMNoteTypeImageView.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "151"
-            endingLineNumber = "151"
-            landmarkName = "-noteTypeImageWithType:Color:"
+            landmarkName = "doneSearchAction(_:)"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -1336,38 +1320,6 @@
             endingLineNumber = "336"
             landmarkName = "controlTextDidEndEditing(_:)"
             landmarkType = "7">
-            <Locations>
-               <Location
-                  uuid = "2C17E52E-BF0E-490D-893D-B63D868D354B - db0b3f9b902cdb80"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Office.KMVerificationCodeView.controlTextDidEndEditing(Foundation.Notification) -&gt; ()"
-                  moduleName = "PDF Office"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Office/Class/KMLightMember/Controller/VerificationCode/View/KMVerificationCodeView.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "336"
-                  endingLineNumber = "336"
-                  offsetFromSymbolStart = "412">
-               </Location>
-               <Location
-                  uuid = "2C17E52E-BF0E-490D-893D-B63D868D354B - db0b3f9b902cdb80"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Office.KMVerificationCodeView.controlTextDidEndEditing(Foundation.Notification) -&gt; ()"
-                  moduleName = "PDF Office"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Office/Class/KMLightMember/Controller/VerificationCode/View/KMVerificationCodeView.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "336"
-                  endingLineNumber = "336"
-                  offsetFromSymbolStart = "468">
-               </Location>
-            </Locations>
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -1766,7 +1718,7 @@
                   endingColumnNumber = "9223372036854775807"
                   startingLineNumber = "51"
                   endingLineNumber = "51"
-                  offsetFromSymbolStart = "636">
+                  offsetFromSymbolStart = "652">
                </Location>
                <Location
                   uuid = "802EB275-A192-40DD-AF0B-171366B483DB - afaf0c5627819d46"
@@ -1992,38 +1944,6 @@
             endingLineNumber = "377"
             landmarkName = "verificationCode(account:verifyCode:verifyCodeType:complete:)"
             landmarkType = "7">
-            <Locations>
-               <Location
-                  uuid = "8D44A87B-3C05-4A4F-B870-5EBFDD46B388 - 4eac9e7f493c7258"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "PDF_Office.KMRequestServerManager.verificationCode(account: Swift.String, verifyCode: Swift.String, verifyCodeType: PDF_Office.KMVerifyCodeType, complete: (Swift.Bool, Swift.Optional&lt;PDF_Office.Result&gt;) -&gt; ()) -&gt; ()"
-                  moduleName = "PDF Office"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Office/Class/KMLightMember/Manager/KMRequestServerManager.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "378"
-                  endingLineNumber = "378"
-                  offsetFromSymbolStart = "792">
-               </Location>
-               <Location
-                  uuid = "8D44A87B-3C05-4A4F-B870-5EBFDD46B388 - 1b8111e177ed2acb"
-                  shouldBeEnabled = "Yes"
-                  ignoreCount = "0"
-                  continueAfterRunningActions = "No"
-                  symbolName = "closure #1 (__C.AFHTTPRequestSerializer) -&gt; () in PDF_Office.KMRequestServerManager.verificationCode(account: Swift.String, verifyCode: Swift.String, verifyCodeType: PDF_Office.KMVerifyCodeType, complete: (Swift.Bool, Swift.Optional&lt;PDF_Office.Result&gt;) -&gt; ()) -&gt; ()"
-                  moduleName = "PDF Office"
-                  usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Office/Class/KMLightMember/Manager/KMRequestServerManager.swift"
-                  startingColumnNumber = "9223372036854775807"
-                  endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "379"
-                  endingLineNumber = "379"
-                  offsetFromSymbolStart = "48">
-               </Location>
-            </Locations>
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -2104,6 +2024,38 @@
             endingLineNumber = "143"
             landmarkName = "setup()"
             landmarkType = "7">
+            <Locations>
+               <Location
+                  uuid = "55251357-F3D0-4AAC-B642-8E45CDA2A4FE - 9c9cfd7560da84d6"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "closure #1 (Swift.Bool, Swift.Optional&lt;PDF_Office.Result&gt;) -&gt; () in closure #6 (PDF_Office.KMRegisterView, PDF_Office.KMRegisterModel, __C.NSButton) -&gt; () in PDF_Office.KMLoginWindowController.setup() -&gt; ()"
+                  moduleName = "PDF Office"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Office/Class/KMLightMember/Controller/Login&amp;Register/KMLoginWindowController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "143"
+                  endingLineNumber = "143"
+                  offsetFromSymbolStart = "168">
+               </Location>
+               <Location
+                  uuid = "55251357-F3D0-4AAC-B642-8E45CDA2A4FE - dc23d43999cd4ab3"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "closure #1 (Swift.Bool, Swift.Optional&lt;PDF_Office.Result&gt;) -&gt; () in closure #1 (Swift.Bool, Swift.Optional&lt;PDF_Office.Result&gt;) -&gt; () in closure #6 (PDF_Office.KMRegisterView, PDF_Office.KMRegisterModel, __C.NSButton) -&gt; () in PDF_Office.KMLoginWindowController.setup() -&gt; ()"
+                  moduleName = "PDF Office"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Office/Class/KMLightMember/Controller/Login&amp;Register/KMLoginWindowController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "140"
+                  endingLineNumber = "140"
+                  offsetFromSymbolStart = "120">
+               </Location>
+            </Locations>
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -2186,5 +2138,69 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "F4C9D987-7AEF-4051-AAA6-97D06F357BC3"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Office/Class/PDFWindowController/Side/LeftSide/Annotation/KMAnnotationViewController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "332"
+            endingLineNumber = "332"
+            landmarkName = "escButtonAction(_:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "895DE4D3-D040-4335-ADA9-0ED508133334"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Office/Class/PDFWindowController/Side/LeftSide/Annotation/KMAnnotationViewController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "298"
+            endingLineNumber = "298"
+            landmarkName = "deleteItemAction(_:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "4A9238AC-3EE9-470B-9978-61BDA872CB6F"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Office/Class/PDFWindowController/Side/LeftSide/Annotation/KMAnnotationViewController.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "340"
+            endingLineNumber = "340"
+            landmarkName = "tableView(tableView:deleteRowsWithIndexes:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "ECFC9998-2142-4FBC-93FA-ACCFA6A0DA5E"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Office/Class/PDFWindowController/Side/LeftSide/Annotation/View/KMAnnotationTableRowView.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "22"
+            endingLineNumber = "22"
+            landmarkName = "drawSelection(in:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

PDF Office/PDF Office/Class/PDFTools/Batch/Source/Batch.xcassets/btn_arrow_default_down_s_norm_on.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "ic.pdf",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

PDF Office/PDF Office/Class/PDFTools/Batch/Source/Batch.xcassets/btn_arrow_default_down_s_norm_on.imageset/ic.pdf

@@ -0,0 +1,74 @@
+%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 0.000000 -0.073212 cm
+0.380392 0.392157 0.411765 scn
+5.030269 1.883876 m
+1.060660 5.853485 l
+0.000000 4.792825 l
+4.499939 0.292886 l
+4.792832 -0.000007 5.267706 -0.000007 5.560599 0.292886 c
+10.060537 4.792825 l
+8.999878 5.853485 l
+5.030269 1.883876 l
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  328
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 10.060547 5.780273 ]
+     /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
+0000000418 00000 n
+0000000440 00000 n
+0000000612 00000 n
+0000000686 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+745
+%%EOF

PDF Office/PDF Office/Class/PDFTools/Batch/Source/Batch.xcassets/btn_arrow_default_right_s_norm_on.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "ic.pdf",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

PDF Office/PDF Office/Class/PDFTools/Batch/Source/Batch.xcassets/btn_arrow_default_right_s_norm_on.imageset/ic.pdf

@@ -0,0 +1,74 @@
+%PDF-1.7
+
+1 0 obj
+  << >>
+endobj
+
+2 0 obj
+  << /Length 3 0 R >>
+stream
+/DeviceRGB CS
+/DeviceRGB cs
+q
+0.000000 1.000000 -1.000000 0.000000 10.060623 -0.000000 cm
+0.380392 0.392157 0.411765 scn
+5.030315 6.090969 m
+1.060660 10.060623 l
+0.000000 8.999963 l
+4.499985 4.499978 l
+4.792878 4.207085 5.267752 4.207085 5.560645 4.499978 c
+10.060629 8.999963 l
+8.999969 10.060623 l
+5.030315 6.090969 l
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  329
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 5.780273 10.060623 ]
+     /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
+0000000419 00000 n
+0000000441 00000 n
+0000000613 00000 n
+0000000687 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+746
+%%EOF

PDF Office/PDF Office/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFAnnotationExtensions/CPDFInkAnnotation+PDFListView.m

@@ -118,7 +118,6 @@
         return NO;
     
     CGFloat delta = fmax(4.0, 0.5 * [self lineWidth]);
-    point = CPDFListViewSubstractPoints(point, [self bounds].origin);
     for (NSBezierPath *path in [self bezierPaths]) {
         if (NSPointInRect(point, NSInsetRect([path nonPDFListViewEmptyBounds], -delta, -delta))) {
             NSBezierPathElement elt;

PDF Office/PDF Office/Class/PDFWindowController/PDFListView/CPDFKitExtensions/CPDFAnnotationExtensions/CPDFLineAnnotation+PDFListView.m

@@ -48,7 +48,7 @@
             point = [self endPoint];
             CPDFListViewDrawResizeHandle(context, point, delta, YES);
         } else {
-            NSRect rect = [self borderRecctForView:pdfView];
+            NSRect rect = [self bounds];
             CGFloat lineWidth = [pdfView unitWidthOnPage:[self page]];
             CGContextSaveGState(context);
             CGColorRef color = [CPDFListViewConfig defaultManager].annotationBorderColor.CGColor;
@@ -57,7 +57,7 @@
             if(isHover) {
                 CGFloat length[] = {5,5};
                 CGContextSetLineDash(context, 0, length, 2);
-                CGContextStrokeRectWithWidth(context, CGRectInset(NSRectToCGRect(rect), 0,0), lineWidth);
+                CGContextStrokeRectWithWidth(context, rect, lineWidth);
             } else {
                 CGContextStrokeRectWithWidth(context, CGRectInset(NSRectToCGRect(rect), 0,0), lineWidth);
             }

PDF Office/PDF Office/Class/PDFWindowController/PDFListView/CPDFListView.m

@@ -562,7 +562,7 @@ NSNotificationName const CPDFListViewActiveAnnotationsChangeNotification = @"CPD
         [self addAnnotation:newAnnotation toPage:page];
         [[self undoManager] setActionName:NSLocalizedString(@"Add Note", @"Undo action name")];
         
-        [self addActiveAnnotations:@[newAnnotation]];
+        [self updateActiveAnnotations:@[newAnnotation]];
         [self setNeedsDisplayAnnotation:newAnnotation];
     }
     else NSBeep();
@@ -836,7 +836,7 @@ NSNotificationName const CPDFListViewActiveAnnotationsChangeNotification = @"CPD
         @synchronized (self) {
             CGContextSetLineCap(context, kCGLineCapRound);
             CGContextSetLineWidth(context, 1.0);
-            CGContextSetStrokeColorWithColor(context, [NSColor redColor].CGColor);
+            CGContextSetStrokeColorWithColor(context, [CPDFListViewConfig defaultManager].annotationBorderColor.CGColor);
             CGContextBeginPath(context);
             CGContextMoveToPoint(context, self.multiplSelectBounds.origin.x, self.multiplSelectBounds.origin.y);
             CGContextAddLineToPoint(context, self.multiplSelectBounds.origin.x+ self.multiplSelectBounds.size.width,self.multiplSelectBounds.origin.y);

PDF Office/PDF Office/Class/PDFWindowController/PDFListView/CPDFListViewExtension/CPDFListView+Event.m

@@ -373,25 +373,38 @@ static inline CPDFAreaOfInterest CAreaOfInterestForResizeHandle(CRectEdges mask,
             [menu insertItem:copyItem atIndex:0];
         }
     } else {
-        CPDFAnnotation *annotation = nil;        
-        for (CPDFAnnotation *tAnnotation in page.annotations) {
-            if ([tAnnotation hitTest:pagePoint]) {
-                annotation = tAnnotation;
-                break;
+        CPDFAnnotation *annotation = nil;
+        
+        if (([self toolMode] == CTextToolMode || [self toolMode] == CNoteToolMode || [self toolMode] == CFormToolMode || [self toolMode] == CSelfSignMode || [self toolMode] == CRedactToolMode) && [self hideNotes] == NO) {
+            
+            for (CPDFAnnotation *tAnnotation in page.annotations) {
+                if ([tAnnotation hitTest:pagePoint]) {
+                    annotation = tAnnotation;
+                    break;
+                }
+            }
+            
+            if (annotation && [annotation isKindOfClass:[CPDFWidgetAnnotation class]] ){
+                if(CFormToolMode == self.toolMode)
+                    annotation = nil;
+            }
+            
+            if(annotation) {
+                if(![self.activeAnnotations containsObject:annotation]) {
+                    [self updateActiveAnnotations:@[annotation]];
+                    [self setNeedsDisplayAnnotation:annotation];
+                }
             }
         }
-        
-        if (annotation && [annotation isKindOfClass:[CPDFWidgetAnnotation class]] ){
-            if(CFormToolMode == self.toolMode)
-                annotation = nil;
+                
+        if(annotation && [annotation isKindOfClass:[CPDFWidgetAnnotation class]] && [self toolMode] != CFormToolMode) {
+            annotation = nil;
+        } else if(annotation && [annotation isKindOfClass:[CPDFRedactAnnotation class]] && [self toolMode] != CRedactToolMode) {
+            annotation = nil;
+        } else if (annotation && [annotation isKindOfClass:[CPDFInkAnnotation class]] && [self annotationType] == CAnnotationTypeInk) {
+            annotation = nil;
         }
         
-        if(annotation) {
-            if(![self.activeAnnotations containsObject:annotation]) {
-                [self updateActiveAnnotations:@[annotation]];
-                [self setNeedsDisplayAnnotation:annotation];
-            }
-        }
 
         CPDFSelection *selection = [self creatImageCurrentSelectionForPoint:[event locationInPDFListView:self]];
         if(selection && CPDFSelectionTypeImage == [selection selectionType] && !self.activeAnnotation){
@@ -2589,15 +2602,15 @@ static inline CPDFAreaOfInterest CAreaOfInterestForResizeHandle(CRectEdges mask,
                         startPoint = CGPointMake(startPoint.x - orgBounds.origin.x, startPoint.y - orgBounds.origin.y);
                         endPoint = CGPointMake(endPoint.x - orgBounds.origin.x, endPoint.y - orgBounds.origin.y);
                         
-                        startPoint  = CGPointMake(startPoint.x/orgBounds.size.width * newBounds.size.width, startPoint.y/orgBounds.size.height * newBounds.size.height);
-                        endPoint  = CGPointMake(endPoint.x/orgBounds.size.width * newBounds.size.width, endPoint.y/orgBounds.size.height * newBounds.size.height);
+                        startPoint  = CGPointMake((startPoint.x/orgBounds.size.width) * newBounds.size.width, (startPoint.y/orgBounds.size.height) * newBounds.size.height);
+                        endPoint  = CGPointMake((endPoint.x/orgBounds.size.width) * newBounds.size.width, (endPoint.y/orgBounds.size.height) * newBounds.size.height);
                         
-                        startPoint = CGPointMake(startPoint.x + orgBounds.origin.y, startPoint.y + orgBounds.origin.y);
-                        endPoint = CGPointMake(endPoint.x + orgBounds.origin.x, endPoint.y + orgBounds.origin.y);
+                        startPoint = CGPointMake(startPoint.x + newBounds.origin.x, startPoint.y + newBounds.origin.y);
+                        endPoint = CGPointMake(endPoint.x + newBounds.origin.x, endPoint.y + newBounds.origin.y);
                         
                         [(CPDFLineAnnotation *)dragAnnotation setStartPoint:startPoint];
                         [(CPDFLineAnnotation *)dragAnnotation setEndPoint:endPoint];
-                    } else {
+                    }
                         CGRect rect = CGRectMake(dragAnnotation.bounds.origin.x - orgBounds.origin.x, dragAnnotation.bounds.origin.y - orgBounds.origin.y, dragAnnotation.bounds.size.width, dragAnnotation.bounds.size.height);
                         
                         CGFloat minX = CGRectGetMinX(rect);
@@ -2624,7 +2637,6 @@ static inline CPDFAreaOfInterest CAreaOfInterestForResizeHandle(CRectEdges mask,
                         dragAnnotation.bounds = CGRectMake(rect.origin.x + newBounds.origin.x, rect.origin.y + newBounds.origin.y, rect.size.width, rect.size.height);
                         if ([dragAnnotation isKindOfClass:[CPDFFreeTextAnnotation class]])
                             [self updateAnnotationFreeTextBounds:(CPDFFreeTextAnnotation *)dragAnnotation];
-                    }
                 }
             }
             self.multiplAnnotationObject = nil;
@@ -2954,9 +2966,16 @@ static inline CPDFAreaOfInterest CAreaOfInterestForResizeHandle(CRectEdges mask,
     CGPoint pagePoint = CGPointZero;
     if(sender)
         pagePoint = [sender.representedObject pointValue];
-    else
-        pagePoint = [self convertPoint:CPDFlistViewCenterPoint([self.currentPage boundsForBox:[self displayBox]]) fromPage:self.currentPage];
-    
+    else if (self.activeAnnotation) {
+        pagePoint = self.activeAnnotation.bounds.origin;
+    } else if(self.currentSelection) {
+        pagePoint = self.currentSelection.bounds.origin;
+    } else {
+        CGRect visibleRect = self.scrollView.visibleRect;
+        pagePoint = CPDFlistViewCenterPoint(visibleRect);
+
+        pagePoint = [self convertPoint:pagePoint toPage:self.currentPage];
+    }
     NSPasteboard *pboard = [NSPasteboard generalPasteboard];
     NSDictionary *options = [NSDictionary dictionary];
     NSArray *newAnnotations = nil;
@@ -2970,7 +2989,7 @@ static inline CPDFAreaOfInterest CAreaOfInterestForResizeHandle(CRectEdges mask,
         [self.activeAnnotations removeAllObjects];
         if (newAnnotations.count > 0) {
             for (CPDFAnnotation *newAnnotation in newAnnotations) {
-                NSRect bounds = [newAnnotation bounds];
+                NSRect bounds = CGRectMake(pagePoint.x, pagePoint.y-[newAnnotation bounds].size.height, [newAnnotation bounds].size.width,  [newAnnotation bounds].size.height);
                 bounds = CPDFListViewConstrainRect(bounds, [page boundsForBox:[self displayBox]],[CPDFListViewConfig defaultManager].annotationBorderOffset.floatValue);
                 
                 CGSize pageSize = [page boundsForBox:CPDFDisplayCropBox].size;
@@ -2994,7 +3013,7 @@ static inline CPDFAreaOfInterest CAreaOfInterestForResizeHandle(CRectEdges mask,
         
         if (self.aCopyAnnotations.count > 0 ) {
             for (CPDFAnnotation * an in self.aCopyAnnotations) {
-                NSRect bounds = [an bounds];
+                NSRect bounds = CGRectMake(pagePoint.x, pagePoint.y-[an bounds].size.height, [an bounds].size.width,  [an bounds].size.height);
                 bounds = CPDFListViewConstrainRect(bounds, [page boundsForBox:[self displayBox]],[CPDFListViewConfig defaultManager].annotationBorderOffset.floatValue);
                 CGSize pageSize = [page boundsForBox:CPDFDisplayCropBox].size;
                 
@@ -3129,6 +3148,7 @@ static inline CPDFAreaOfInterest CAreaOfInterestForResizeHandle(CRectEdges mask,
             NSData * data = [pboard dataForType:NSPasteboardTypeTIFF];
             NSImage * image = [[NSImage alloc] initWithData:data];
             if (image) {
+                pagePoint = CGPointMake(pagePoint.x+3 * self.copyCount,pagePoint.y-3 * self.copyCount);
                 [self addAnnotationWithImage:image page:page point:pagePoint];
             } else {
                 NSBeep();

PDF Office/PDF Office/Class/PDFWindowController/PDFListView/CPDFListViewExtension/CPDFListView+Tool.m

@@ -267,12 +267,7 @@
 
 - (void)setNeedsDisplayAnnotation:(CPDFAnnotation *)annotation {
     if (annotation) {
-        if ([annotation isKindOfClass:[CPDFMarkupAnnotation class]] ||
-            [annotation isKindOfClass:[CPDFLinkAnnotation class]]) {
-            [self setNeedsDisplayPageViewForPage:annotation.page];
-        } else {
-            [self setNeedsDisplayAnnotationViewForPage:annotation.page];
-        }
+        [self setNeedsDisplayAnnotationViewForPage:annotation.page];
     } else {
         [self setNeedsDisplayAnnotationViewForVisiblePages];
     }

PDF Office/PDF Office/Class/PDFWindowController/Side/LeftSide/Annotation/KMAnnotationViewController.swift

@@ -30,34 +30,58 @@ class KMAnnotationViewController: KMSideViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         
+        self.setup()
+        self.updateUI()
+        self.updateLanguage()
+        
+        self.initMenu()
+        
+        NotificationCenter.default.addObserver(self, selector: #selector(PDFViewActiveAnnotationDidChangeNotification), name: NSNotification.Name.init(rawValue: "KMHomeFileRectChange"), object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(reloadData), name: NSNotification.Name.init(rawValue: "CPDFPageDidAddAnnotationNotification"), object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(reloadData), name: NSNotification.Name.init(rawValue: "CPDFPageDidRemoveAnnotationNotification"), object: nil)
+    }
+    
+    func setup() {
         self.view.wantsLayer = true
         self.view.layer?.backgroundColor = NSColor(hex: "#F7F8FA").cgColor
         
+        self.topView.wantsLayer = true
+        self.topView.layer?.backgroundColor = NSColor.clear.cgColor
+        
         self.tableView.doubleAction = #selector(tableViewDoubleAction)
         self.tableView.allowsMultipleSelection = true
         self.tableView.wantsLayer = true
         self.tableView.delegate = self
         self.tableView.dataSource = self
-        self.tableView.layer?.backgroundColor = NSColor(hex: "#F7F8FA").cgColor
         
         let menu = NSMenu()
         menu.delegate = self
         self.tableView.menu = menu
+    }
+    
+    func updateUI() {
+        self.markupTitleLabel.font = NSFont.SFProTextSemibold(14.0)
+        self.markupTitleLabel.textColor = NSColor(hex: "#252629")
         
-        self.topView.wantsLayer = true
-        self.topView.layer?.backgroundColor = NSColor.clear.cgColor
+        self.tableView.layer?.backgroundColor = NSColor(hex: "#F7F8FA").cgColor
+        self.tableView.border(NSColor(hex: "#000000", alpha: 0.1), 1, 0)
         
+        self.bigTipLabel.font = NSFont.SFProTextRegular(14.0)
+        self.bigTipLabel.textColor = NSColor(hex: "#616469")
+    }
+    
+    func updateLanguage() {
         self.markupTitleLabel.stringValue = NSLocalizedString("Annotation", comment: "")
-        self.bigTipLabel.stringValue = NSLocalizedString("No Annotations", comment: "")
-        self.tipLabel.stringValue = NSLocalizedString("All annotations will be displayed here.", comment: "")
+        self.bigTipLabel.stringValue = NSLocalizedString("No markup found", comment: "")
         self.filtrateButton.toolTip = NSLocalizedString("Sort", comment: "")
         self.moreButton.toolTip = NSLocalizedString("More", comment: "")
         
-        self.initMenu()
         
-        NotificationCenter.default.addObserver(self, selector: #selector(PDFViewActiveAnnotationDidChangeNotification), name: NSNotification.Name.init(rawValue: "KMHomeFileRectChange"), object: nil)
-        NotificationCenter.default.addObserver(self, selector: #selector(reloadData), name: NSNotification.Name.init(rawValue: "CPDFPageDidAddAnnotationNotification"), object: nil)
-        NotificationCenter.default.addObserver(self, selector: #selector(reloadData), name: NSNotification.Name.init(rawValue: "CPDFPageDidRemoveAnnotationNotification"), object: nil)
+        let title = NSLocalizedString("All comments for this document will be displayed here.", comment: "")
+        let paragraphStyle = NSMutableParagraphStyle()
+        paragraphStyle.lineHeightMultiple = 1.32
+        paragraphStyle.alignment = .center
+        self.tipLabel.attributedStringValue = NSMutableAttributedString(string: title, attributes: [NSAttributedString.Key.paragraphStyle: paragraphStyle, .foregroundColor : NSColor(hex: "#94989C")])
     }
     
     private func initMenu() {
@@ -75,13 +99,13 @@ class KMAnnotationViewController: KMSideViewController {
     }
     
     @objc private func toc_expandAllComments(sender:NSMenuItem) {
-//        if item.tag == 0 {
+//        if sender.tag == 0 {
 //            self.outlineView.reloadData()
 //            self.outlineView.expandItem(nil, expandChildren: true)
-//        } else if item.tag == 1 {
+//        } else if sender.tag == 1 {
 //            self.outlineView.reloadData()
 //            self.outlineView.collapseItem(nil, collapseChildren: true)
-//        } else if item.tag == 2 {
+//        } else if sender.tag == 2 {
 //            let alter = NSAlert()
 //            alter.alertStyle = NSAlert.Style.informational
 //            alter.messageText = NSLocalizedString("This will permanently remove all outlines. Are you sure to continue?", comment: "")
@@ -312,6 +336,11 @@ class KMAnnotationViewController: KMSideViewController {
         }
     }
     
+    
+    @IBAction func escButtonAction(_ sender: Any) {
+        self.tableView.deselectAll(nil)
+    }
+    
     private func tableView(tableView:NSTableView,canDeleteRowsWithIndexes rowindexs : IndexSet) -> Bool {
         return true
     }
@@ -349,7 +378,7 @@ extension KMAnnotationViewController: NSTableViewDelegate,NSTableViewDataSource
         }
         return self.annotations.count
     }
-    
+      
     func tableView(_ tableView: NSTableView, viewFor tableColumn: NSTableColumn?, row: Int) -> NSView? {
         if self.annotations[row] is [String:Any] {
             let cell = tableView.makeView(withIdentifier: NSUserInterfaceItemIdentifier(rawValue: "KMAnnotationHeaderCellView"), owner: self) as! KMAnnotationHeaderCellView
@@ -369,60 +398,61 @@ extension KMAnnotationViewController: NSTableViewDelegate,NSTableViewDataSource
     }
     
     func tableView(_ tableView: NSTableView, rowViewForRow row: Int) -> NSTableRowView? {
-        let rowView = KMBookMarkRowView()
-        
-//        let rightBox = KMCellEmptyView()
-//        rightBox.frame = CGRectInset(rowView.bounds, 10, 10)
-//        rightBox.autoresizingMask = [.width, .height]
-//        rightBox.wantsLayer = true
-//        rightBox.layer?.backgroundColor = NSColor.clear.cgColor
-//        rightBox.itemIndex = row
-//        rightBox.mouseEventHandle = {(mouseEnter: Bool, mouseExit: Bool) -> Void in
-//            if (self.tableView.selectedRowIndexes.contains(rightBox.itemIndex)) {
-//                rightBox.layer?.backgroundColor = NSColor.clear.cgColor
-//            } else {
-//                if (mouseEnter) {
-//                    rightBox.layer?.backgroundColor = NSColor(hex: "#EDEEF0").cgColor
-//                } else if (mouseExit) {
-//                    rightBox.layer?.backgroundColor = NSColor.clear.cgColor
-//                }
-//            }
-//        }
-//        rowView.addSubview(rightBox)
-//        rowView.selectionColor = NSColor(hex: "#CED0D499")
-        return rowView
+        let tableRowView = KMAnnotationTableRowView()
+        tableRowView.selectionColor = NSColor(hex: "#CED0D4", alpha: 0.6)
+        return tableRowView
     }
     
     func tableView(_ tableView: NSTableView, heightOfRow row: Int) -> CGFloat {
         if self.annotations[row] is [String:Any] {
             return 32
         } else if self.annotations[row] is CPDFAnnotation {
-            var height: CGFloat = 56
+            var height: CGFloat = 40
             
+            let paragraphStyle = NSMutableParagraphStyle()
+            paragraphStyle.lineHeightMultiple = 1.32
+            paragraphStyle.alignment = .left
+            let attributes = [NSAttributedString.Key.paragraphStyle: paragraphStyle,
+                              NSAttributedString.Key.font : NSFont.SFProTextRegular(14.0)]
             let annotation = self.annotations[row] as! CPDFAnnotation
+            
             if annotation.isKind(of: CPDFMarkupAnnotation.self) {
-                let text : String = (annotation as! CPDFMarkupAnnotation).markupText()
-                if text.lengthOfBytes(using: String.Encoding(rawValue: String.Encoding.utf16.rawValue)) > 0 {
-                    let size = NSString(string: text).boundingRect(with: NSSize(width: tableView.frame.size.width-28, height: 300), options: NSString.DrawingOptions(rawValue: 3), attributes: [NSAttributedString.Key.font : NSFont.systemFont(ofSize: 14)]).size
-                    height = height + size.height
-                } else {
+                var text : String = (annotation as! CPDFMarkupAnnotation).markupText()
+                if text.count == 0 {
                     let exproString = KMOCToolClass.exproString(self.annotations[row] as? CPDFAnnotation)!
-                    if exproString.lengthOfBytes(using: String.Encoding(rawValue: String.Encoding.utf16.rawValue)) > 0 {
-                        let size = NSString(string: exproString).boundingRect(with: NSSize(width: tableView.frame.size.width-28, height: 300), options: NSString.DrawingOptions(rawValue: 3), attributes: [NSAttributedString.Key.font : NSFont.systemFont(ofSize: 14)]).size
-                        height = height + size.height
+                    if exproString.count > 0 {
+                        text = exproString
                     }
                 }
+                
+                if text.hasPrefix("\n") {
+                    text = text.filter{ $0 != "\n" }
+                }
+                
+                if text.count > 0 {
+                    let size = NSString(string: text).boundingRect(with: NSSize(width: tableView.frame.size.width-28, height: 300), options: NSString.DrawingOptions(rawValue: 3), attributes: attributes).size
+                    height += 4
+                    height = height + size.height
+                }
             } else if (annotation.isKind(of: CPDFInkAnnotation.self)) ||
                         (annotation.isKind(of: CPDFSquareAnnotation.self)) ||
                         (annotation.isKind(of: CPDFLineAnnotation.self)) ||
                         (annotation.isKind(of: CPDFCircleAnnotation.self)) {
-                height += 65
+                height += 4
+                height += 58
             }
             
-            let contentsString : String = annotation.contents ?? ""
-            if contentsString.lengthOfBytes(using: String.Encoding(rawValue: String.Encoding.utf16.rawValue)) > 0 {
-                let size = NSString(string: contentsString).boundingRect(with: NSSize(width: tableView.frame.size.width-28, height: 300), options: NSString.DrawingOptions(rawValue: 3), attributes: [NSAttributedString.Key.font : NSFont.systemFont(ofSize: 14)]).size
+            var contentsString : String = annotation.contents ?? ""
+            if contentsString.count > 0 {
+                if contentsString.hasSuffix("\n") {
+                    contentsString = contentsString.filter{ $0 != "\n" }
+                }
+                
+                let size = NSString(string: contentsString).boundingRect(with: NSSize(width: tableView.frame.size.width-28, height: 300), options: NSString.DrawingOptions(rawValue: 3), attributes: attributes).size
+                height = height + 4
+                height = height + 4
                 height = height + size.height
+                height = height + 4
             }
             
             return height
@@ -438,29 +468,29 @@ extension KMAnnotationViewController: NSTableViewDelegate,NSTableViewDataSource
     }
     
     func tableViewSelectionDidChange(_ notification: Notification) {
-        if self.tableView.selectedRowIndexes.count > 1 {
-            var newAnnonations : [CPDFAnnotation] = []
-            for itemIndex in self.tableView.selectedRowIndexes {
-                let annotation = self.annotations[itemIndex]as! CPDFAnnotation
-                if annotation != nil {
-                    newAnnonations.append(annotation)
-                }
-            }
-            self.listView.updateActiveAnnotations(newAnnonations)
-            self.listView.setNeedsDisplayAnnotationViewForVisiblePages()
-        } else {
-            let selectedRow = self.tableView.selectedRow
-            if selectedRow >= 0 && selectedRow < self.annotations.count {
-                let annotation = self.annotations[selectedRow]
-                if (annotation as AnyObject).isKind(of: CPDFAnnotation.self) {
-                    self.listView.go(to: (annotation as! CPDFAnnotation).bounds, on: (annotation as! CPDFAnnotation).page, animated: true)
-                    
-                    self.listView.updateActiveAnnotations([annotation as! CPDFAnnotation])
-                    self.listView.setNeedsDisplayAnnotationViewForVisiblePages()
-                }
-            }
-        }
-        self.selectedRowIndexs = self.tableView.selectedRowIndexes
+//        if self.tableView.selectedRowIndexes.count > 1 {
+//            var newAnnonations : [CPDFAnnotation] = []
+//            for itemIndex in self.tableView.selectedRowIndexes {
+//                let annotation = self.annotations[itemIndex]as! CPDFAnnotation
+//                if annotation != nil {
+//                    newAnnonations.append(annotation)
+//                }
+//            }
+//            self.listView.updateActiveAnnotations(newAnnonations)
+//            self.listView.setNeedsDisplayAnnotationViewForVisiblePages()
+//        } else {
+//            let selectedRow = self.tableView.selectedRow
+//            if selectedRow >= 0 && selectedRow < self.annotations.count {
+//                let annotation = self.annotations[selectedRow]
+//                if (annotation as AnyObject).isKind(of: CPDFAnnotation.self) {
+//                    self.listView.go(to: (annotation as! CPDFAnnotation).bounds, on: (annotation as! CPDFAnnotation).page, animated: true)
+//
+//                    self.listView.updateActiveAnnotations([annotation as! CPDFAnnotation])
+//                    self.listView.setNeedsDisplayAnnotationViewForVisiblePages()
+//                }
+//            }
+//        }
+//        self.selectedRowIndexs = self.tableView.selectedRowIndexes
     }
     
 }

PDF Office/PDF Office/Class/PDFWindowController/Side/LeftSide/Annotation/KMAnnotationViewController.xib

@@ -21,15 +21,15 @@
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <customView misplaced="YES" id="Hz6-mo-xeY">
-            <rect key="frame" x="0.0" y="0.0" width="300" height="404"/>
+        <customView id="Hz6-mo-xeY">
+            <rect key="frame" x="0.0" y="0.0" width="300" height="503"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="isq-j9-zHz">
                     <rect key="frame" x="0.0" y="451" width="300" height="52"/>
                     <subviews>
                         <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="4eE-LR-JUA">
-                            <rect key="frame" x="8" y="18" width="37" height="16"/>
+                            <rect key="frame" x="14" y="18" width="37" height="16"/>
                             <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="EiJ-9e-kS8">
                                 <font key="font" usesAppearanceFont="YES"/>
                                 <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -60,25 +60,40 @@
                                 <action selector="filtrateButtonAction:" target="-2" id="JeX-L0-xSY"/>
                             </connections>
                         </button>
+                        <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="9CD-g4-TB4">
+                            <rect key="frame" x="150" y="26" width="0.0" height="0.0"/>
+                            <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" alignment="center" imageScaling="proportionallyDown" inset="2" id="T3I-F6-xuB">
+                                <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                <font key="font" metaFont="system"/>
+                                <string key="keyEquivalent" base64-UTF8="YES">
+Gw
+</string>
+                            </buttonCell>
+                            <connections>
+                                <action selector="escButtonAction:" target="-2" id="wdU-eL-csd"/>
+                            </connections>
+                        </button>
                     </subviews>
                     <constraints>
                         <constraint firstAttribute="trailing" secondItem="bAX-dg-nVT" secondAttribute="trailing" constant="8" id="1ZZ-aQ-3bN"/>
                         <constraint firstItem="bAX-dg-nVT" firstAttribute="centerY" secondItem="isq-j9-zHz" secondAttribute="centerY" id="5s2-Ww-EZr"/>
-                        <constraint firstItem="4eE-LR-JUA" firstAttribute="leading" secondItem="isq-j9-zHz" secondAttribute="leading" constant="10" id="7eC-ow-aiB"/>
+                        <constraint firstItem="4eE-LR-JUA" firstAttribute="leading" secondItem="isq-j9-zHz" secondAttribute="leading" constant="16" id="7eC-ow-aiB"/>
                         <constraint firstItem="1zM-AI-isO" firstAttribute="centerY" secondItem="isq-j9-zHz" secondAttribute="centerY" id="AXM-YN-Uhc"/>
                         <constraint firstItem="4eE-LR-JUA" firstAttribute="centerY" secondItem="isq-j9-zHz" secondAttribute="centerY" id="EIy-ou-962"/>
                         <constraint firstAttribute="height" constant="52" id="KD5-zT-k1C"/>
                         <constraint firstItem="bAX-dg-nVT" firstAttribute="leading" secondItem="1zM-AI-isO" secondAttribute="trailing" id="KqW-3w-9AT"/>
+                        <constraint firstItem="9CD-g4-TB4" firstAttribute="centerY" secondItem="isq-j9-zHz" secondAttribute="centerY" id="paG-3e-qe6"/>
+                        <constraint firstItem="9CD-g4-TB4" firstAttribute="centerX" secondItem="isq-j9-zHz" secondAttribute="centerX" id="paf-O8-dES"/>
                     </constraints>
                 </customView>
-                <scrollView misplaced="YES" autohidesScrollers="YES" horizontalLineScroll="160" horizontalPageScroll="0.0" verticalLineScroll="160" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="S0i-Yw-GaA">
-                    <rect key="frame" x="0.0" y="-99" width="300" height="451"/>
+                <scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="160" horizontalPageScroll="0.0" verticalLineScroll="160" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="S0i-Yw-GaA">
+                    <rect key="frame" x="0.0" y="0.0" width="300" height="451"/>
                     <clipView key="contentView" drawsBackground="NO" id="q7c-Du-3Ye">
-                        <rect key="frame" x="1" y="1" width="298" height="449"/>
+                        <rect key="frame" x="0.0" y="0.0" width="300" height="451"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" multipleSelection="NO" autosaveColumns="NO" rowHeight="159" rowSizeStyle="automatic" viewBased="YES" id="m6i-bn-mBa">
-                                <rect key="frame" x="0.0" y="0.0" width="298" height="449"/>
+                            <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" tableStyle="plain" multipleSelection="NO" autosaveColumns="NO" rowHeight="159" rowSizeStyle="automatic" viewBased="YES" id="m6i-bn-mBa">
+                                <rect key="frame" x="0.0" y="0.0" width="300" height="451"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                 <size key="intercellSpacing" width="0.0" height="1"/>
                                 <color key="backgroundColor" red="1" green="0.99843658089999998" blue="0.99619259260000004" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
@@ -97,44 +112,25 @@
                                         <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         <prototypeCellViews>
                                             <tableCellView identifier="KMAnnotationTableCellView" id="qW6-ht-cnq" customClass="KMAnnotationTableCellView" customModule="PDF_Office" customModuleProvider="target">
-                                                <rect key="frame" x="0.0" y="0.0" width="266" height="159"/>
+                                                <rect key="frame" x="0.0" y="0.0" width="254" height="159"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
                                                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="Vk8-QM-RkO">
-                                                        <rect key="frame" x="0.0" y="4" width="266" height="151"/>
+                                                        <rect key="frame" x="0.0" y="4" width="254" height="151"/>
                                                     </customView>
-                                                    <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="mwu-nd-Md5">
-                                                        <rect key="frame" x="10" y="129" width="20" height="20"/>
+                                                    <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="4hF-xO-98b">
+                                                        <rect key="frame" x="56" y="36" width="142" height="58"/>
                                                         <constraints>
-                                                            <constraint firstAttribute="width" constant="20" id="bVG-35-0tD"/>
-                                                            <constraint firstAttribute="height" constant="20" id="gtQ-ig-r99"/>
+                                                            <constraint firstAttribute="width" constant="142" id="3aN-b3-FYE"/>
+                                                            <constraint firstAttribute="height" constant="58" id="Q2p-gX-lGR"/>
                                                         </constraints>
-                                                        <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="QX0-e1-msg"/>
+                                                        <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="bH1-ap-fos"/>
                                                     </imageView>
-                                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Zvu-Cj-cua">
-                                                        <rect key="frame" x="40" y="132" width="218" height="15"/>
-                                                        <constraints>
-                                                            <constraint firstAttribute="height" constant="15" id="toh-xy-7NC"/>
-                                                        </constraints>
-                                                        <textFieldCell key="cell" alignment="right" title="Label" id="GwS-B8-lwu">
-                                                            <font key="font" metaFont="smallSystem"/>
-                                                            <color key="textColor" name="systemGrayColor" catalog="System" colorSpace="catalog"/>
-                                                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                                        </textFieldCell>
-                                                    </textField>
-                                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="IPd-Cv-2oK">
-                                                        <rect key="frame" x="8" y="109" width="250" height="17"/>
-                                                        <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="VLB-in-9Zr">
-                                                            <font key="font" metaFont="system" size="14"/>
-                                                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                                                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                                        </textFieldCell>
-                                                    </textField>
                                                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="HSm-uU-jH1">
-                                                        <rect key="frame" x="8" y="64" width="250" height="40"/>
+                                                        <rect key="frame" x="8" y="0.0" width="238" height="32"/>
                                                         <subviews>
                                                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="aym-Jm-ZIZ">
-                                                                <rect key="frame" x="2" y="4" width="246" height="32"/>
+                                                                <rect key="frame" x="2" y="15" width="234" height="17"/>
                                                                 <textFieldCell key="cell" lineBreakMode="charWrapping" title="label" id="Xv2-Km-XnU">
                                                                     <font key="font" metaFont="system" size="14"/>
                                                                     <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -143,68 +139,132 @@
                                                             </textField>
                                                         </subviews>
                                                         <constraints>
-                                                            <constraint firstAttribute="bottom" secondItem="aym-Jm-ZIZ" secondAttribute="bottom" constant="4" id="Mgl-rA-Q33"/>
                                                             <constraint firstItem="aym-Jm-ZIZ" firstAttribute="leading" secondItem="HSm-uU-jH1" secondAttribute="leading" constant="4" id="X7s-K7-ORX"/>
-                                                            <constraint firstAttribute="height" constant="40" id="d6Z-RV-ig9"/>
+                                                            <constraint firstAttribute="height" constant="32" id="d6Z-RV-ig9"/>
                                                             <constraint firstAttribute="trailing" secondItem="aym-Jm-ZIZ" secondAttribute="trailing" constant="4" id="hHY-kD-EuP"/>
-                                                            <constraint firstItem="aym-Jm-ZIZ" firstAttribute="top" secondItem="HSm-uU-jH1" secondAttribute="top" constant="4" id="hvS-0g-txi"/>
+                                                            <constraint firstItem="aym-Jm-ZIZ" firstAttribute="top" secondItem="HSm-uU-jH1" secondAttribute="top" id="k4n-wF-vry"/>
                                                         </constraints>
                                                     </customView>
-                                                    <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="4hF-xO-98b">
-                                                        <rect key="frame" x="62" y="50" width="142" height="54"/>
+                                                    <customView translatesAutoresizingMaskIntoConstraints="NO" id="I2R-Ha-U7t">
+                                                        <rect key="frame" x="0.0" y="127" width="254" height="24"/>
+                                                        <subviews>
+                                                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Zvu-Cj-cua">
+                                                                <rect key="frame" x="34" y="5" width="214" height="15"/>
+                                                                <constraints>
+                                                                    <constraint firstAttribute="height" constant="15" id="toh-xy-7NC"/>
+                                                                </constraints>
+                                                                <textFieldCell key="cell" alignment="right" title="Label" id="GwS-B8-lwu">
+                                                                    <font key="font" metaFont="smallSystem"/>
+                                                                    <color key="textColor" name="systemGrayColor" catalog="System" colorSpace="catalog"/>
+                                                                    <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                                                </textFieldCell>
+                                                            </textField>
+                                                            <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="mwu-nd-Md5">
+                                                                <rect key="frame" x="8" y="2" width="20" height="20"/>
+                                                                <constraints>
+                                                                    <constraint firstAttribute="width" constant="20" id="bVG-35-0tD"/>
+                                                                    <constraint firstAttribute="height" constant="20" id="gtQ-ig-r99"/>
+                                                                </constraints>
+                                                                <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="QX0-e1-msg"/>
+                                                            </imageView>
+                                                        </subviews>
                                                         <constraints>
-                                                            <constraint firstAttribute="width" constant="142" id="3aN-b3-FYE"/>
-                                                            <constraint firstAttribute="height" constant="54" id="Q2p-gX-lGR"/>
+                                                            <constraint firstAttribute="trailing" secondItem="Zvu-Cj-cua" secondAttribute="trailing" constant="8" id="0eb-m1-MoF"/>
+                                                            <constraint firstItem="Zvu-Cj-cua" firstAttribute="leading" secondItem="mwu-nd-Md5" secondAttribute="trailing" constant="8" id="agj-31-pGp"/>
+                                                            <constraint firstItem="Zvu-Cj-cua" firstAttribute="centerY" secondItem="I2R-Ha-U7t" secondAttribute="centerY" id="cHE-mb-Yhu"/>
+                                                            <constraint firstItem="mwu-nd-Md5" firstAttribute="centerY" secondItem="I2R-Ha-U7t" secondAttribute="centerY" id="dox-wa-6P3"/>
+                                                            <constraint firstItem="mwu-nd-Md5" firstAttribute="leading" secondItem="I2R-Ha-U7t" secondAttribute="leading" constant="8" id="rbH-ST-3Jk"/>
+                                                            <constraint firstAttribute="height" constant="24" id="ubJ-uE-jVY"/>
                                                         </constraints>
-                                                        <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="bH1-ap-fos"/>
-                                                    </imageView>
+                                                    </customView>
+                                                    <customView translatesAutoresizingMaskIntoConstraints="NO" id="oc1-7E-A75">
+                                                        <rect key="frame" x="0.0" y="98" width="254" height="25"/>
+                                                        <subviews>
+                                                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="IPd-Cv-2oK">
+                                                                <rect key="frame" x="6" y="8" width="242" height="17"/>
+                                                                <textFieldCell key="cell" lineBreakMode="charWrapping" title="Label" id="VLB-in-9Zr">
+                                                                    <font key="font" metaFont="system" size="14"/>
+                                                                    <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                                                    <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                                                </textFieldCell>
+                                                            </textField>
+                                                        </subviews>
+                                                        <constraints>
+                                                            <constraint firstItem="IPd-Cv-2oK" firstAttribute="top" secondItem="oc1-7E-A75" secondAttribute="top" id="3b0-8t-geh"/>
+                                                            <constraint firstAttribute="height" constant="25" id="DLj-nd-OFh"/>
+                                                            <constraint firstItem="IPd-Cv-2oK" firstAttribute="leading" secondItem="oc1-7E-A75" secondAttribute="leading" constant="8" id="hTx-kv-5vw"/>
+                                                            <constraint firstAttribute="trailing" secondItem="IPd-Cv-2oK" secondAttribute="trailing" constant="8" id="zer-gi-nE9"/>
+                                                        </constraints>
+                                                    </customView>
                                                 </subviews>
                                                 <constraints>
                                                     <constraint firstItem="Vk8-QM-RkO" firstAttribute="leading" secondItem="qW6-ht-cnq" secondAttribute="leading" id="1Ue-Nk-daz"/>
-                                                    <constraint firstItem="Zvu-Cj-cua" firstAttribute="leading" secondItem="mwu-nd-Md5" secondAttribute="trailing" constant="12" id="1oJ-wF-rVf"/>
-                                                    <constraint firstItem="Zvu-Cj-cua" firstAttribute="leading" secondItem="mwu-nd-Md5" secondAttribute="trailing" constant="12" id="7A4-r0-7WP"/>
-                                                    <constraint firstItem="mwu-nd-Md5" firstAttribute="top" secondItem="qW6-ht-cnq" secondAttribute="top" constant="10" id="Cwk-cy-MRQ"/>
-                                                    <constraint firstItem="4hF-xO-98b" firstAttribute="top" secondItem="Zvu-Cj-cua" secondAttribute="bottom" constant="28" id="FvX-dk-6B7"/>
+                                                    <constraint firstItem="I2R-Ha-U7t" firstAttribute="top" secondItem="qW6-ht-cnq" secondAttribute="top" constant="8" id="3Cw-MV-Ups"/>
+                                                    <constraint firstItem="I2R-Ha-U7t" firstAttribute="leading" secondItem="qW6-ht-cnq" secondAttribute="leading" id="45R-qm-hLF"/>
+                                                    <constraint firstAttribute="trailing" secondItem="oc1-7E-A75" secondAttribute="trailing" id="HS7-eG-YRE"/>
                                                     <constraint firstItem="4hF-xO-98b" firstAttribute="centerX" secondItem="qW6-ht-cnq" secondAttribute="centerX" id="IXd-Sk-ZK3"/>
-                                                    <constraint firstItem="Zvu-Cj-cua" firstAttribute="centerY" secondItem="mwu-nd-Md5" secondAttribute="centerY" id="MuL-nw-sWU"/>
+                                                    <constraint firstItem="4hF-xO-98b" firstAttribute="top" secondItem="oc1-7E-A75" secondAttribute="bottom" constant="4" id="JZY-Nd-fMU"/>
                                                     <constraint firstItem="HSm-uU-jH1" firstAttribute="leading" secondItem="qW6-ht-cnq" secondAttribute="leading" constant="8" id="NEA-uZ-26L"/>
-                                                    <constraint firstItem="IPd-Cv-2oK" firstAttribute="top" secondItem="mwu-nd-Md5" secondAttribute="bottom" constant="3" id="Piz-2P-kCe"/>
-                                                    <constraint firstItem="mwu-nd-Md5" firstAttribute="leading" secondItem="qW6-ht-cnq" secondAttribute="leading" constant="10" id="Tbf-Lo-kn3"/>
+                                                    <constraint firstItem="HSm-uU-jH1" firstAttribute="top" secondItem="4hF-xO-98b" secondAttribute="bottom" constant="4" id="Nxs-79-Eju"/>
+                                                    <constraint firstAttribute="trailing" secondItem="I2R-Ha-U7t" secondAttribute="trailing" id="QC1-GK-w6V"/>
                                                     <constraint firstAttribute="bottom" secondItem="Vk8-QM-RkO" secondAttribute="bottom" constant="4" id="V1M-MZ-bEE"/>
-                                                    <constraint firstItem="HSm-uU-jH1" firstAttribute="top" secondItem="Zvu-Cj-cua" secondAttribute="bottom" constant="28" id="XER-ti-abZ"/>
                                                     <constraint firstAttribute="trailing" secondItem="Vk8-QM-RkO" secondAttribute="trailing" id="gPp-Es-ZqD"/>
                                                     <constraint firstAttribute="trailing" secondItem="HSm-uU-jH1" secondAttribute="trailing" constant="8" id="hOq-oT-7Fx"/>
-                                                    <constraint firstAttribute="trailing" secondItem="Zvu-Cj-cua" secondAttribute="trailing" constant="10" id="hf7-dR-kar"/>
-                                                    <constraint firstItem="IPd-Cv-2oK" firstAttribute="leading" secondItem="mwu-nd-Md5" secondAttribute="leading" id="jFE-wb-R8o"/>
-                                                    <constraint firstItem="IPd-Cv-2oK" firstAttribute="trailing" secondItem="Zvu-Cj-cua" secondAttribute="trailing" id="kRd-p9-TlW"/>
+                                                    <constraint firstItem="oc1-7E-A75" firstAttribute="leading" secondItem="qW6-ht-cnq" secondAttribute="leading" id="rqk-kM-mnz"/>
                                                     <constraint firstItem="Vk8-QM-RkO" firstAttribute="top" secondItem="qW6-ht-cnq" secondAttribute="top" constant="4" id="s1N-Yt-gC3"/>
+                                                    <constraint firstItem="oc1-7E-A75" firstAttribute="top" secondItem="I2R-Ha-U7t" secondAttribute="bottom" constant="4" id="yyT-db-ABE"/>
                                                 </constraints>
                                                 <connections>
                                                     <outlet property="contendView" destination="Vk8-QM-RkO" id="CfS-W8-hxh"/>
                                                     <outlet property="contentBGHeightConst" destination="d6Z-RV-ig9" id="dxZ-il-Z9o"/>
-                                                    <outlet property="contentBGTopConst" destination="XER-ti-abZ" id="MVK-Dw-PNT"/>
+                                                    <outlet property="contentBGTopConst" destination="Nxs-79-Eju" id="Ie6-FO-duc"/>
                                                     <outlet property="contentBGView" destination="HSm-uU-jH1" id="1ex-Fo-rRf"/>
+                                                    <outlet property="contentImageTopConst" destination="JZY-Nd-fMU" id="Hez-la-RC8"/>
+                                                    <outlet property="contentInfoImageHeightConst" destination="Q2p-gX-lGR" id="xhq-2v-2O9"/>
                                                     <outlet property="contentInfoImg" destination="4hF-xO-98b" id="aOY-Ez-yWr"/>
                                                     <outlet property="contentInfoLabel" destination="aym-Jm-ZIZ" id="R9U-A0-xRo"/>
                                                     <outlet property="contentLabel" destination="IPd-Cv-2oK" id="K2O-aw-kFs"/>
+                                                    <outlet property="contentLabelBGView" destination="oc1-7E-A75" id="81X-c0-HF3"/>
+                                                    <outlet property="contentLabelHeightConst" destination="DLj-nd-OFh" id="l1t-AO-IRR"/>
+                                                    <outlet property="contentLabelTopConst" destination="yyT-db-ABE" id="cnF-JU-WJ3"/>
                                                     <outlet property="dateLabel" destination="Zvu-Cj-cua" id="Gql-MC-JYT"/>
                                                     <outlet property="typeImageView" destination="mwu-nd-Md5" id="BMS-K9-iP9"/>
                                                 </connections>
                                             </tableCellView>
                                             <tableCellView identifier="KMAnnotationHeaderCellView" id="xEw-aA-WN9" customClass="KMAnnotationHeaderCellView" customModule="PDF_Office" customModuleProvider="target">
-                                                <rect key="frame" x="0.0" y="160" width="266" height="24"/>
+                                                <rect key="frame" x="0.0" y="160" width="254" height="24"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
+                                                    <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="pRT-Tq-ysR">
+                                                        <rect key="frame" x="226" y="6" width="12" height="12"/>
+                                                        <constraints>
+                                                            <constraint firstAttribute="width" constant="12" id="G5C-fH-9fh"/>
+                                                            <constraint firstAttribute="height" constant="12" id="oIJ-1c-8dC"/>
+                                                        </constraints>
+                                                        <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="btn_arrow_default_down_s_norm_on" id="M2s-R9-lgs"/>
+                                                    </imageView>
+                                                    <customView translatesAutoresizingMaskIntoConstraints="NO" id="E6O-aw-hJu">
+                                                        <rect key="frame" x="0.0" y="23" width="254" height="1"/>
+                                                        <constraints>
+                                                            <constraint firstAttribute="height" constant="1" id="cP9-pW-GGZ"/>
+                                                        </constraints>
+                                                    </customView>
+                                                    <customView translatesAutoresizingMaskIntoConstraints="NO" id="xne-rW-AvE">
+                                                        <rect key="frame" x="0.0" y="0.0" width="254" height="1"/>
+                                                        <constraints>
+                                                            <constraint firstAttribute="height" constant="1" id="yIC-tF-fux"/>
+                                                        </constraints>
+                                                    </customView>
                                                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="iLo-vc-Uqe">
-                                                        <rect key="frame" x="10" y="5" width="35" height="15"/>
+                                                        <rect key="frame" x="14" y="5" width="35" height="15"/>
                                                         <textFieldCell key="cell" lineBreakMode="truncatingTail" title="Label" id="AjX-Vt-t0o">
                                                             <font key="font" metaFont="cellTitle"/>
                                                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                         </textFieldCell>
                                                     </textField>
-                                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="nYV-WM-m34">
-                                                        <rect key="frame" x="221" y="5" width="35" height="15"/>
+                                                    <textField hidden="YES" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="nYV-WM-m34">
+                                                        <rect key="frame" x="209" y="5" width="35" height="15"/>
                                                         <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="0mv-us-OjH">
                                                             <font key="font" metaFont="cellTitle"/>
                                                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -213,15 +273,25 @@
                                                     </textField>
                                                 </subviews>
                                                 <constraints>
+                                                    <constraint firstAttribute="trailing" secondItem="pRT-Tq-ysR" secondAttribute="trailing" constant="16" id="0bk-g4-FiR"/>
                                                     <constraint firstAttribute="trailing" secondItem="nYV-WM-m34" secondAttribute="trailing" constant="12" id="4dB-JX-uB2"/>
+                                                    <constraint firstAttribute="trailing" secondItem="E6O-aw-hJu" secondAttribute="trailing" id="6uE-PX-IqZ"/>
+                                                    <constraint firstItem="E6O-aw-hJu" firstAttribute="leading" secondItem="xEw-aA-WN9" secondAttribute="leading" id="89V-Zd-elG"/>
+                                                    <constraint firstItem="E6O-aw-hJu" firstAttribute="top" secondItem="xEw-aA-WN9" secondAttribute="top" id="Fbw-bv-tI5"/>
+                                                    <constraint firstAttribute="bottom" secondItem="xne-rW-AvE" secondAttribute="bottom" id="Gif-XI-dNf"/>
                                                     <constraint firstItem="nYV-WM-m34" firstAttribute="centerY" secondItem="xEw-aA-WN9" secondAttribute="centerY" id="Ku6-y1-KT9"/>
-                                                    <constraint firstItem="iLo-vc-Uqe" firstAttribute="leading" secondItem="xEw-aA-WN9" secondAttribute="leading" constant="12" id="R0r-JW-W5R"/>
+                                                    <constraint firstAttribute="trailing" secondItem="xne-rW-AvE" secondAttribute="trailing" id="LB7-tp-11I"/>
+                                                    <constraint firstItem="iLo-vc-Uqe" firstAttribute="leading" secondItem="xEw-aA-WN9" secondAttribute="leading" constant="16" id="R0r-JW-W5R"/>
                                                     <constraint firstItem="iLo-vc-Uqe" firstAttribute="centerY" secondItem="xEw-aA-WN9" secondAttribute="centerY" id="UQ5-DJ-KW3"/>
+                                                    <constraint firstItem="xne-rW-AvE" firstAttribute="leading" secondItem="xEw-aA-WN9" secondAttribute="leading" id="geu-q7-WdN"/>
                                                     <constraint firstItem="nYV-WM-m34" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="iLo-vc-Uqe" secondAttribute="trailing" id="vg6-R9-4rc"/>
+                                                    <constraint firstItem="pRT-Tq-ysR" firstAttribute="centerY" secondItem="xEw-aA-WN9" secondAttribute="centerY" id="wP6-b5-ghh"/>
                                                 </constraints>
                                                 <connections>
                                                     <outlet property="currentPageLabel" destination="iLo-vc-Uqe" id="2Zb-XI-OcR"/>
                                                     <outlet property="dateLabel" destination="nYV-WM-m34" id="nRS-3C-9PE"/>
+                                                    <outlet property="line1" destination="E6O-aw-hJu" id="AV0-ug-zzk"/>
+                                                    <outlet property="line2" destination="xne-rW-AvE" id="tUQ-Sa-YL1"/>
                                                 </connections>
                                             </tableCellView>
                                         </prototypeCellViews>
@@ -295,12 +365,13 @@
                 <constraint firstItem="nAQ-GY-tve" firstAttribute="leading" secondItem="S0i-Yw-GaA" secondAttribute="leading" id="rXb-VV-iPG"/>
                 <constraint firstItem="S0i-Yw-GaA" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" id="rmd-wK-74t"/>
             </constraints>
-            <point key="canvasLocation" x="-21" y="227"/>
+            <point key="canvasLocation" x="-21" y="276.5"/>
         </customView>
     </objects>
     <resources>
         <image name="KMHomeMoreTools" width="20" height="20"/>
         <image name="KMImageNameAnnotationsFiltrate" width="16" height="16"/>
         <image name="KMImageNameMarkupEmpty" width="128" height="128"/>
+        <image name="btn_arrow_default_down_s_norm_on" width="10" height="6"/>
     </resources>
 </document>

PDF Office/PDF Office/Class/PDFWindowController/Side/LeftSide/Annotation/View/KMAnnotationTableCellView.swift

@@ -8,16 +8,46 @@
 import Cocoa
 
 class KMAnnotationHeaderCellView: NSTableCellView {
+    
+    @IBOutlet var line1 : NSView!
+    @IBOutlet var line2 : NSView!
     @IBOutlet var currentPageLabel : NSTextField!
+    @IBOutlet var dateLabel : NSTextField!
+    
+    
+    
+    
     var currentPage : Int = 0
     var notes : [CPDFAnnotation] = []
-    @IBOutlet var dateLabel : NSTextField!
+    
+    override func awakeFromNib() {
+        super.awakeFromNib()
+        
+        self.setup()
+        self.updateLanguage()
+        self.updateUI ()
+    }
+    
+    func setup() {
+        
+    }
+    
+    func updateLanguage() {
+        
+    }
+    
+    func updateUI() {
+        self.line1.backgroundColor(NSColor(hex: "#EDEEF0"))
+        self.line2.backgroundColor(NSColor(hex: "#EDEEF0"))
+        
+        self.backgroundColor(NSColor(hex: "#FFFFFF"))
+        self.currentPageLabel.font = NSFont.SFProTextRegular(14.0)
+        self.currentPageLabel.textColor = NSColor(hex: "#252629")
+        
+    }
     
     override func draw(_ dirtyRect: NSRect) {
         super.draw(dirtyRect)
-
-        self.wantsLayer = true
-        self.layer?.backgroundColor = NSColor.clear.cgColor
     }
 
     func updateCellInfo() {
@@ -31,15 +61,23 @@ class KMAnnotationHeaderCellView: NSTableCellView {
 class KMAnnotationTableCellView: NSTableCellView {
     @IBOutlet var contendView : NSView!
     @IBOutlet var contentLabel : NSTextField!
+    @IBOutlet var contentLabelBGView : NSView!
     @IBOutlet var dateLabel : NSTextField!
     @IBOutlet var typeImageView : NSImageView!
     @IBOutlet var contentBGView : NSView!
     @IBOutlet var contentInfoLabel : NSTextField!
     @IBOutlet var contentInfoImg : NSImageView!
     
-    @IBOutlet var contentBGTopConst: NSLayoutConstraint!
+    @IBOutlet var contentInfoImageHeightConst: NSLayoutConstraint!
+    @IBOutlet var contentLabelHeightConst: NSLayoutConstraint!
     @IBOutlet var contentBGHeightConst: NSLayoutConstraint!
     
+    @IBOutlet var contentLabelTopConst: NSLayoutConstraint!
+    @IBOutlet var contentImageTopConst: NSLayoutConstraint!
+    @IBOutlet var contentBGTopConst: NSLayoutConstraint!
+    
+    
+    
     var isSelected : Bool = false
     var itemIndex : NSInteger = 0
     
@@ -53,6 +91,17 @@ class KMAnnotationTableCellView: NSTableCellView {
     override func awakeFromNib() {
         super.awakeFromNib()
         
+        self.updateSelectedState()
+        
+//        self.commonInitializer()
+        
+        self.setup()
+        self.updateLanguage()
+        self.updateUI ()
+        
+    }
+    
+    func setup() {
         self.contendView.wantsLayer = true
         self.contendView.layer?.backgroundColor = NSColor.clear.cgColor;
         self.contendView.layer?.cornerRadius = 4
@@ -70,9 +119,19 @@ class KMAnnotationTableCellView: NSTableCellView {
         self.contentBGView.layer?.borderColor = NSColor(hex: "#DFE1E5").cgColor
         self.contentBGView.layer?.masksToBounds = true
         
-        self.updateSelectedState()
+        self.contentLabel.textColor = NSColor(hex: "#252629")
+        self.contentLabel.font = NSFont.SFProTextRegular(14)
+        
+        self.contentInfoLabel.textColor = NSColor(hex: "#616469")
+        self.contentInfoLabel.font = NSFont.SFProTextRegular(14)
+    }
+    
+    func updateLanguage() {
+        
+    }
+    
+    func updateUI() {
         
-//        self.commonInitializer()
         
     }
     
@@ -83,30 +142,43 @@ class KMAnnotationTableCellView: NSTableCellView {
         formatter.dateFormat = "yyyy-MM-dd hh:mm a"
         dateLabel.stringValue = (annotation.userName() ?? "") + " " + formatter.string(from: annotation.modificationDate())
         
-        self.contentLabel.isHidden = true
-        self.contentInfoImg.isHidden = true
-        self.contentBGTopConst.constant = 40
+        self.contentLabelHeightConst.constant = 0
+        self.contentLabelTopConst.constant = 0
+
+        self.contentInfoImageHeightConst.constant = 0
+        self.contentImageTopConst.constant = 0
+        
+        let paragraphStyle = NSMutableParagraphStyle()
+        paragraphStyle.lineHeightMultiple = 1.32
+        paragraphStyle.alignment = .left
+        let attributes = [NSAttributedString.Key.paragraphStyle: paragraphStyle,
+                          NSAttributedString.Key.font : NSFont.SFProTextRegular(14.0)]
         
         if annotation.isKind(of: CPDFMarkupAnnotation.self) {
             var text : String = (annotation as! CPDFMarkupAnnotation).markupText()
-            if text.lengthOfBytes(using: String.Encoding(rawValue: String.Encoding.utf16.rawValue)) > 0 {
-                contentLabel.isHidden = false;
-                contentLabel.stringValue = text
-            } else {
+            if text.count == 0 {
                 let exproString = KMOCToolClass.exproString(annotation)!
-                if exproString.lengthOfBytes(using: String.Encoding(rawValue: String.Encoding.utf16.rawValue)) > 0 {
+                if exproString.count > 0 {
                     text = exproString
                 }
             }
-            if text.lengthOfBytes(using: String.Encoding(rawValue: String.Encoding.utf16.rawValue)) > 0 {
-                contentLabel.isHidden = false;
-                contentLabel.stringValue = text
+            
+            if text.hasPrefix("\n") {
+                text = text.filter{ $0 != "\n" }
+            }
+            
+            if text.count > 0 {
+                self.contentLabelTopConst.constant = 4
+                let size = NSString(string: text).boundingRect(with: NSSize(width: self.contentBGView.frame.size.width - 28, height: 300), options: NSString.DrawingOptions(rawValue: 3), attributes: attributes).size
+                self.contentLabelHeightConst.constant = size.height
+                contentLabel.attributedStringValue = NSMutableAttributedString(string: text, attributes: attributes)
             }
         } else if (annotation.isKind(of: CPDFInkAnnotation.self)) ||
                     (annotation.isKind(of: CPDFSquareAnnotation.self)) ||
                     (annotation.isKind(of: CPDFLineAnnotation.self)) ||
                     (annotation.isKind(of: CPDFCircleAnnotation.self)) {
-            contentInfoImg.isHidden = false
+            contentInfoImageHeightConst.constant = 58
+            self.contentImageTopConst.constant = 4
             contentInfoImg.image = CPDFAnnotationModel(pdfAnnotations: [annotation]).annotationImage
         }
         
@@ -115,30 +187,22 @@ class KMAnnotationTableCellView: NSTableCellView {
             if contentsString.hasSuffix("\n") {
                contentsString = contentsString.filter{ $0 != "\n" }
             }
-            if contentsString.lengthOfBytes(using: String.Encoding(rawValue: String.Encoding.utf16.rawValue)) > 0 {
-                let size = NSString(string: contentsString).boundingRect(with: NSSize(width: self.contentBGView.frame.size.width-28, height: 300), options: NSString.DrawingOptions(rawValue: 3), attributes: [NSAttributedString.Key.font : NSFont.systemFont(ofSize: 14)]).size
-                self.contentBGHeightConst.constant = size.height + 10
-            }
-            self.contentInfoLabel.stringValue = contentsString
-            self.contentBGView.isHidden = false
             
-            if self.contentLabel.isHidden {
-                self.contentBGTopConst.constant = 8
-            } else {
-                if contentLabel.stringValue.lengthOfBytes(using: String.Encoding(rawValue: String.Encoding.utf16.rawValue)) > 0 {
-                    let size = NSString(string: contentLabel.stringValue).boundingRect(with: NSSize(width: self.contentBGView.frame.size.width-28, height: 300), options: NSString.DrawingOptions(rawValue: 3), attributes: [NSAttributedString.Key.font : NSFont.systemFont(ofSize: 14)]).size
-                    self.contentBGTopConst.constant = size.height + 10
-                }
+            if contentsString.count > 0 {
+                let size = NSString(string: contentsString).boundingRect(with: NSSize(width: self.contentBGView.frame.size.width-28, height: 300), options: NSString.DrawingOptions(rawValue: 3), attributes: attributes).size
+                self.contentBGHeightConst.constant = size.height + 8
             }
+            
+            self.contentInfoLabel.attributedStringValue = NSMutableAttributedString(string: contentsString, attributes: attributes)
+            self.contentBGView.isHidden = false
         } else {
             self.contentBGView.isHidden = true
         }
-        
     }
     
     func updateSelectedState() {
         if (self.isSelected) {
-            self.contendView.layer?.backgroundColor = NSColor(hex: "#CED0D499").cgColor
+            self.contendView.layer?.backgroundColor = NSColor(hex: "#CED0D4", alpha: 0.6).cgColor
             self.contendView.layer?.borderColor = NSColor(hex: "#CED0D4").cgColor
         } else {
             self.contendView.layer?.backgroundColor = NSColor.clear.cgColor

PDF Office/PDF Office/Class/PDFWindowController/Side/LeftSide/Annotation/View/KMAnnotationTableRowView.swift

@@ -8,15 +8,10 @@
 import Cocoa
 
 class KMAnnotationTableRowView: NSTableRowView {
-
     var selectionColor : NSColor!
     
     override func draw(_ dirtyRect: NSRect) {
         super.draw(dirtyRect)
-
-        // Drawing code here.
-        
-        self.wantsLayer = true
     }
     
     override func drawSelection(in dirtyRect: NSRect) {
@@ -24,12 +19,20 @@ class KMAnnotationTableRowView: NSTableRowView {
             super.drawSelection(in: dirtyRect)
         } else {
             if(self.selectionColor != nil) {
+                var rect = self.bounds
+                rect.origin.x = self.bounds.origin.x + 16.0
+                rect.origin.y = self.bounds.origin.y + 2
+                rect.size.height = self.bounds.size.height - 4
+                rect.size.width = self.bounds.size.width - 32.0
+
                 self.selectionColor.setFill()
+                let path = NSBezierPath(roundedRect: rect, xRadius: 4, yRadius: 4)
+                path.fill()
+                
                 __NSRectFill(dirtyRect)
             }  else {
                 super.drawSelection(in: dirtyRect)
             }
         }
     }
-    
 }

PDF Office/PDF Office/Class/PDFWindowController/Side/LeftSide/Annotation/View/KMNoteTypeCollectionViewItem.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="18122" 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="18122"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>

PDF Office/PDF Office/Class/PDFWindowController/Side/LeftSide/KMLeftSideViewController.swift

@@ -17,6 +17,8 @@ class KMLeftSideViewController: NSViewController, KMThumbnailViewControllerDeleg
     var listView : CPDFListView!
     @IBOutlet weak var leftTableview: NSTableView!
     @IBOutlet weak var contentBox: NSBox!
+    @IBOutlet weak var leftBox: NSBox!
+    
     lazy var thumbnailViewController : KMThumbnailViewController = {
         let thumbnailViewController = KMThumbnailViewController()
         return thumbnailViewController
@@ -72,6 +74,11 @@ class KMLeftSideViewController: NSViewController, KMThumbnailViewControllerDeleg
     
     override func viewDidLoad() {
         super.viewDidLoad()
+        
+        self.leftBox.backgroundColor(NSColor(hex: "#F7F8FA"))
+        
+        self.leftTableview.backgroundColor(NSColor(hex: "#F7F8FA"))
+        
         self.addMenuTitle()
         self.refreshShowMethod()
     }
@@ -385,7 +392,7 @@ extension KMLeftSideViewController: NSTableViewDelegate,NSTableViewDataSource {
     func tableView(_ tableView: NSTableView, rowViewForRow row: Int) -> NSTableRowView? {
         let rowView = KMCustomTableRowView()
         rowView.selectionColor = NSColor(calibratedRed: 223.0/255.0, green: 225.0/255.0, blue: 229.0/255.0, alpha: 1.0)
-        rowView.color = NSColor.white
+        rowView.color = NSColor(hex: "#F7F8FA")
         return rowView
     }
     

PDF Office/PDF Office/Class/PDFWindowController/Side/LeftSide/KMLeftSideViewController.xib

@@ -9,30 +9,31 @@
         <customObject id="-2" userLabel="File's Owner" customClass="KMLeftSideViewController" customModule="PDF_Office" customModuleProvider="target">
             <connections>
                 <outlet property="contentBox" destination="AX3-hJ-DWi" id="oqC-h5-UYU"/>
+                <outlet property="leftBox" destination="kP6-mo-Sz6" id="nkH-e0-xHk"/>
                 <outlet property="leftTableview" destination="dGj-Se-plG" id="iGm-XM-W0Q"/>
                 <outlet property="view" destination="Hz6-mo-xeY" id="0bl-1N-x8E"/>
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <customView misplaced="YES" id="Hz6-mo-xeY">
-            <rect key="frame" x="0.0" y="0.0" width="196" height="364"/>
+        <customView id="Hz6-mo-xeY">
+            <rect key="frame" x="0.0" y="0.0" width="196" height="348"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
                 <box boxType="custom" borderWidth="0.0" cornerRadius="4" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="kP6-mo-Sz6">
-                    <rect key="frame" x="0.0" y="0.0" width="48" height="296"/>
+                    <rect key="frame" x="0.0" y="0.0" width="48" height="348"/>
                     <view key="contentView" id="Q4W-NP-64T">
-                        <rect key="frame" x="0.0" y="0.0" width="48" height="296"/>
+                        <rect key="frame" x="0.0" y="0.0" width="48" height="348"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <scrollView autohidesScrollers="YES" horizontalLineScroll="24" horizontalPageScroll="10" verticalLineScroll="24" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aU7-b6-SiZ">
-                                <rect key="frame" x="0.0" y="0.0" width="48" height="296"/>
+                            <scrollView autohidesScrollers="YES" horizontalLineScroll="20" horizontalPageScroll="10" verticalLineScroll="20" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aU7-b6-SiZ">
+                                <rect key="frame" x="0.0" y="0.0" width="48" height="346"/>
                                 <clipView key="contentView" drawsBackground="NO" id="aGL-wm-zkF">
-                                    <rect key="frame" x="1" y="1" width="46" height="294"/>
+                                    <rect key="frame" x="1" y="1" width="46" height="344"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
-                                        <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" tableStyle="plain" multipleSelection="NO" autosaveColumns="NO" rowHeight="24" rowSizeStyle="automatic" viewBased="YES" id="dGj-Se-plG">
-                                            <rect key="frame" x="0.0" y="0.0" width="46" height="294"/>
+                                        <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" tableStyle="plain" multipleSelection="NO" autosaveColumns="NO" rowHeight="20" rowSizeStyle="automatic" viewBased="YES" id="dGj-Se-plG">
+                                            <rect key="frame" x="0.0" y="0.0" width="46" height="344"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <color key="backgroundColor" red="1" green="0.99843658089999998" blue="0.99619259260000004" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                                             <color key="gridColor" red="1" green="0.99843658089999998" blue="0.99619259260000004" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
@@ -49,20 +50,20 @@
                                                     </textFieldCell>
                                                     <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                                     <prototypeCellViews>
-                                                        <tableCellView identifier="KMLiftSideCellView" misplaced="YES" id="mYU-nI-1MW" customClass="KMLiftSideCellView" customModule="PDF_Office" customModuleProvider="target">
-                                                            <rect key="frame" x="0.0" y="0.0" width="46" height="24"/>
-                                                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                                        <tableCellView identifier="KMLiftSideCellView" translatesAutoresizingMaskIntoConstraints="NO" id="mYU-nI-1MW" customClass="KMLiftSideCellView" customModule="PDF_Office" customModuleProvider="target">
+                                                            <rect key="frame" x="0.0" y="0.0" width="48" height="20"/>
                                                             <subviews>
                                                                 <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Ybw-KZ-WjH">
-                                                                    <rect key="frame" x="-4" y="0.0" width="50" height="20"/>
+                                                                    <rect key="frame" x="-4" y="0.0" width="52" height="20"/>
                                                                     <imageCell key="cell" refusesFirstResponder="YES" alignment="left" image="KMImageNameSidebarAnnotationNor" id="Jhb-gj-ABR"/>
                                                                 </imageView>
                                                                 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="bgB-cQ-OUB">
-                                                                    <rect key="frame" x="-4" y="0.0" width="50" height="20"/>
+                                                                    <rect key="frame" x="-4" y="0.0" width="52" height="20"/>
                                                                     <buttonCell key="cell" type="bevel" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="b9y-Sd-KWO">
                                                                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                                         <font key="font" metaFont="system"/>
                                                                     </buttonCell>
+                                                                    <color key="bezelColor" red="1" green="0.99843658089999998" blue="0.99619259260000004" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                                                                     <connections>
                                                                         <action selector="updateLeftStyle:" target="mYU-nI-1MW" id="HIT-wj-P79"/>
                                                                     </connections>
@@ -75,6 +76,7 @@
                                                                 <constraint firstAttribute="bottom" secondItem="Ybw-KZ-WjH" secondAttribute="bottom" id="MD2-nC-AGP"/>
                                                                 <constraint firstItem="Ybw-KZ-WjH" firstAttribute="top" secondItem="mYU-nI-1MW" secondAttribute="top" id="Srf-Cf-9eq"/>
                                                                 <constraint firstItem="bgB-cQ-OUB" firstAttribute="leading" secondItem="mYU-nI-1MW" secondAttribute="leading" constant="-4" id="ap5-Yh-ybL"/>
+                                                                <constraint firstAttribute="width" constant="48" id="b06-6s-fHd"/>
                                                                 <constraint firstAttribute="bottom" secondItem="bgB-cQ-OUB" secondAttribute="bottom" id="onB-7T-2wV"/>
                                                                 <constraint firstAttribute="trailing" secondItem="bgB-cQ-OUB" secondAttribute="trailing" id="w5d-nq-2KS"/>
                                                             </constraints>
@@ -107,7 +109,7 @@
                             </scrollView>
                         </subviews>
                         <constraints>
-                            <constraint firstItem="aU7-b6-SiZ" firstAttribute="top" secondItem="Q4W-NP-64T" secondAttribute="top" id="DT7-44-5zh"/>
+                            <constraint firstItem="aU7-b6-SiZ" firstAttribute="top" secondItem="Q4W-NP-64T" secondAttribute="top" constant="2" id="DT7-44-5zh"/>
                             <constraint firstItem="aU7-b6-SiZ" firstAttribute="leading" secondItem="Q4W-NP-64T" secondAttribute="leading" id="RSe-96-QX3"/>
                             <constraint firstAttribute="bottom" secondItem="aU7-b6-SiZ" secondAttribute="bottom" id="djE-lx-fgn"/>
                             <constraint firstAttribute="trailing" secondItem="aU7-b6-SiZ" secondAttribute="trailing" id="tZz-My-ifY"/>
@@ -116,12 +118,12 @@
                     <constraints>
                         <constraint firstAttribute="width" constant="48" id="Seg-TB-RW8"/>
                     </constraints>
-                    <color key="fillColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    <color key="fillColor" red="1" green="0.99843658089999998" blue="0.99619259260000004" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                 </box>
                 <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="AX3-hJ-DWi">
-                    <rect key="frame" x="48" y="0.0" width="148" height="296"/>
+                    <rect key="frame" x="48" y="0.0" width="148" height="348"/>
                     <view key="contentView" id="hw8-Bc-FEV">
-                        <rect key="frame" x="0.0" y="0.0" width="148" height="296"/>
+                        <rect key="frame" x="0.0" y="0.0" width="148" height="348"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                     </view>
                 </box>
@@ -135,7 +137,7 @@
                 <constraint firstAttribute="bottom" secondItem="kP6-mo-Sz6" secondAttribute="bottom" id="QZ8-Ir-UJG"/>
                 <constraint firstItem="kP6-mo-Sz6" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" id="s6d-iq-NM5"/>
             </constraints>
-            <point key="canvasLocation" x="-56" y="164"/>
+            <point key="canvasLocation" x="-86" y="8"/>
         </customView>
     </objects>
     <resources>