[Skim-app-commit] SF.net SVN: skim-app:[12912] trunk

[hofman--- via Skim-app-commit]

Revision: 12912
          http://sourceforge.net/p/skim-app/code/12912
Author:   hofman
Date:     2022-05-10 17:36:33 +0000 (Tue, 10 May 2022)
Log Message:
-----------
remove pageNumber ivar, just passaccessors through currentPage

Modified Paths:
--------------
    trunk/SKMainWindowController.h
    trunk/SKMainWindowController.m
    trunk/SKMainWindowController_UI.m

Modified: trunk/SKMainWindowController.h
===================================================================
--- trunk/SKMainWindowController.h      2022-05-10 17:25:53 UTC (rev 12911)
+++ trunk/SKMainWindowController.h      2022-05-10 17:36:33 UTC (rev 12912)
@@ -143,7 +143,6 @@
     NSMutableArray                      *pageLabels;
     
     NSString                            *pageLabel;
-    NSUInteger                          pageNumber;
     
     NSUInteger                          markedPageIndex;
     NSPoint                             markedPagePoint;

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m      2022-05-10 17:25:53 UTC (rev 12911)
+++ trunk/SKMainWindowController.m      2022-05-10 17:36:33 UTC (rev 12912)
@@ -138,7 +138,6 @@
 #define RELEVANCE_COLUMNID  @"relevance"
 #define RESULTS_COLUMNID    @"results"
 
-#define PAGENUMBER_KEY  @"pageNumber"
 #define PAGELABEL_KEY   @"pageLabel"
 
 #define MAINWINDOWFRAME_KEY         @"windowFrame"
@@ -229,8 +228,8 @@
 
 @implementation SKMainWindowController
 
-@synthesize mainWindow, splitView, centerContentView, pdfSplitView, 
pdfContentView, statusBar, pdfView, secondaryPdfView, leftSideController, 
rightSideController, toolbarController, leftSideContentView, 
rightSideContentView, presentationNotesDocument, presentationNotesOffset, tags, 
rating, pageNumber, pageLabel, interactionMode, placeholderPdfDocument;
-@dynamic pdfDocument, presentationOptions, selectedNotes, widgetProperties, 
autoScales, leftSidePaneState, rightSidePaneState, findPaneState, 
leftSidePaneIsOpen, rightSidePaneIsOpen, recentInfoNeedsUpdate, searchString, 
hasOverview, notesMenu;
+@synthesize mainWindow, splitView, centerContentView, pdfSplitView, 
pdfContentView, statusBar, pdfView, secondaryPdfView, leftSideController, 
rightSideController, toolbarController, leftSideContentView, 
rightSideContentView, presentationNotesDocument, presentationNotesOffset, tags, 
rating, pageLabel, interactionMode, placeholderPdfDocument;
+@dynamic pdfDocument, presentationOptions, selectedNotes, pageNumber, 
widgetProperties, autoScales, leftSidePaneState, rightSidePaneState, 
findPaneState, leftSidePaneIsOpen, rightSidePaneIsOpen, recentInfoNeedsUpdate, 
searchString, hasOverview, notesMenu;
 
 + (void)initialize {
     SKINITIALIZE;
@@ -240,8 +239,6 @@
     [self defineFullScreenGlobalVariables];
 }
 
-+ (BOOL)automaticallyNotifiesObserversOfPageNumber { return NO; }
-
 + (BOOL)automaticallyNotifiesObserversOfPageLabel { return NO; }
 
 - (id)init {
@@ -271,7 +268,6 @@
         mwcFlags.rightSidePaneState = SKSidePaneStateNote;
         mwcFlags.findPaneState = SKFindPaneStateSingular;
         pageLabel = nil;
-        pageNumber = NSNotFound;
         markedPageIndex = NSNotFound;
         markedPagePoint = NSZeroPoint;
         beforeMarkedPageIndex = NSNotFound;
@@ -1208,13 +1204,8 @@
     }
 }
 
-- (void)updatePageNumber {
-    NSUInteger number = [[pdfView currentPage] pageIndex] + 1;
-    if (pageNumber != number) {
-        [self willChangeValueForKey:PAGENUMBER_KEY];
-        pageNumber = number;
-        [self didChangeValueForKey:PAGENUMBER_KEY];
-    }
+- (NSUInteger)pageNumber {
+    return [[pdfView currentPage] pageIndex] + 1;
 }
 
 - (void)setPageNumber:(NSUInteger)number {
@@ -1224,9 +1215,6 @@
         number = pageCount;
     if (number > 0 && [[pdfView currentPage] pageIndex] != number - 1)
         [pdfView goToPage:[[pdfView document] pageAtIndex:number - 1]];
-    if (pageNumber != number) {
-        pageNumber = number;
-    }
 }
 
 - (void)updatePageLabel {

Modified: trunk/SKMainWindowController_UI.m
===================================================================
--- trunk/SKMainWindowController_UI.m   2022-05-10 17:25:53 UTC (rev 12911)
+++ trunk/SKMainWindowController_UI.m   2022-05-10 17:36:33 UTC (rev 12912)
@@ -126,7 +126,6 @@
 
 - (void)goToSelectedOutlineItem:(id)sender;
 
-- (void)updatePageNumber;
 - (void)updatePageLabel;
 
 - (void)updateNoteFilterPredicate;
@@ -1916,7 +1915,6 @@
     [self updateThumbnailHighlights];
     [self updateTocHighlights];
 
-    [self updatePageNumber];
     [self updatePageLabel];
     
     [self updateOutlineSelection];

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.



_______________________________________________
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit