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

PDF Office/PDF Master.xcodeproj/xcuserdata/kdanmobile.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -452,37 +452,5 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "27D9F718-64DB-4AF6-94FA-7B5C173D3D8B"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "PDF Master/Class/Document/KMMainDocument.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "136"
-            endingLineNumber = "136"
-            landmarkName = "canClose(withDelegate:shouldClose:contextInfo:)"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "94B0D07D-B34B-488E-8A0B-5F7D84DF550C"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "PDF Master/Class/ChromiumTabs/KMBrowser.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "34"
-            endingLineNumber = "34"
-            landmarkName = "closeTabViewItem()"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

PDF Office/PDF Master/Class/Welcome/OC/WelcomeWindowController.m

@@ -109,7 +109,8 @@ static NSString * const kKMWelcomeRemindMeLaterKey = @"WelcomeRemindMeLaterKey";
     [super awakeFromNib];
     
     NSClipView *clipView = self.scrollView.contentView;
-    self.contentViews = @[self.content1View,self.content2View,self.content3View,self.content4View,self.content5View];
+    // ,self.content4View
+    self.contentViews = @[self.content1View,self.content2View,self.content3View,self.content5View];
     for (int i=0; i<self.contentViews.count; i++) {
         NSView *view = self.contentViews[i];
         view.frame = CGRectMake(i*clipView.bounds.size.width, 0,
@@ -214,9 +215,10 @@ static NSString * const kKMWelcomeRemindMeLaterKey = @"WelcomeRemindMeLaterKey";
     self.signUpButtonVC.action = @selector(signUpButtonAction:);
     [self.signUpButtonVC buttonWithType:TokenButtonTypeCta size:TokenButtonSizeL height:[[NSLayoutConstraint alloc] init]];
     
+    // , self.pageIndicator5
     for (TCPageIndicator *pageindicator in @[self.pageIndicator1, self.pageIndicator2, self.pageIndicator3,
-                                             self.pageIndicator4, self.pageIndicator5]) {
-        pageindicator.numberOfPages = 5;
+                                             self.pageIndicator4]) {
+        pageindicator.numberOfPages = 4;
         pageindicator.selectedColor = [NSColor colorWithRed:39/255.f green:60/255.f blue:98/255.f alpha:1.f];
         pageindicator.normalColor = [NSColor colorWithRed:0/255.f green:0/255.f blue:0/255.f alpha:0.2];
         pageindicator.pageIndicatorSize = NSMakeSize(6, 6);