Revision: 15561
http://sourceforge.net/p/skim-app/code/15561
Author: hofman
Date: 2025-06-29 14:37:59 +0000 (Sun, 29 Jun 2025)
Log Message:
-----------
rename mainWindowController property to primaryWindowController
Modified Paths:
--------------
trunk/SKMainDocument.h
trunk/SKMainDocument.m
trunk/SKNoteWindowController.m
Modified: trunk/SKMainDocument.h
===================================================================
--- trunk/SKMainDocument.h 2025-06-29 14:35:24 UTC (rev 15560)
+++ trunk/SKMainDocument.h 2025-06-29 14:37:59 UTC (rev 15561)
@@ -47,7 +47,7 @@
@interface SKMainDocument : NSDocument <SKPDFSynchronizerDelegate>
{
- SKMainWindowController *mainWindowController;
+ SKMainWindowController *primaryWindowController;
// variables to be saved:
NSData *pdfData;
@@ -77,7 +77,7 @@
- (IBAction)readNotes:(nullable id)sender;
- (IBAction)convertNotes:(nullable id)sender;
-@property (nonatomic, nullable, readonly) SKMainWindowController
*mainWindowController;
+@property (nonatomic, nullable, readonly) SKMainWindowController
*primaryWindowController;
@property (nonatomic, nullable, readonly) PDFDocument *pdfDocument;
@property (nonatomic, nullable, readonly) SKPDFView *pdfView;
Modified: trunk/SKMainDocument.m
===================================================================
--- trunk/SKMainDocument.m 2025-06-29 14:35:24 UTC (rev 15560)
+++ trunk/SKMainDocument.m 2025-06-29 14:37:59 UTC (rev 15561)
@@ -157,7 +157,7 @@
@implementation SKMainDocument
-@synthesize mainWindowController;
+@synthesize primaryWindowController;
@dynamic pdfDocument, pdfView, synchronizer, snapshots, presentationOptions,
tags, rating, notes, currentPage, activeNote, richText, selectionSpecifier,
selectionQDRect, selectionPage, pdfViewSettings;
+ (BOOL)isPDFDocument { return YES; }
@@ -174,10 +174,10 @@
}
- (void)makeWindowControllers{
- if (mainWindowController == nil) {
- mainWindowController = [[SKMainWindowController alloc] init];
- [mainWindowController setShouldCloseDocument:YES];
- [self addWindowController:mainWindowController];
+ if (primaryWindowController == nil) {
+ primaryWindowController = [[SKMainWindowController alloc] init];
+ [primaryWindowController setShouldCloseDocument:YES];
+ [self addWindowController:primaryWindowController];
}
}
@@ -195,13 +195,13 @@
[[self undoManager] disableUndoRegistration];
- [[self mainWindowController] setPdfDocument:pdfDoc
addAnnotationsWithProperties:[tmpData noteDicts]];
+ [[self primaryWindowController] setPdfDocument:pdfDoc
addAnnotationsWithProperties:[tmpData noteDicts]];
[self setPresentationOptions:[tmpData presentationOptions]];
- [[self mainWindowController] setTags:[tmpData openMetaTags]];
+ [[self primaryWindowController] setTags:[tmpData openMetaTags]];
- [[self mainWindowController] setRating:[tmpData openMetaRating]];
+ [[self primaryWindowController] setRating:[tmpData openMetaRating]];
[[self undoManager] enableUndoRegistration];
@@ -220,7 +220,7 @@
}
- (void)showWindows{
- if ([[self mainWindowController] isWindowLoaded] && [[[self
mainWindowController] window] isVisible]) {
+ if ([[self primaryWindowController] isWindowLoaded] && [[[self
primaryWindowController] window] isVisible]) {
for (NSWindowController *wc in [self windowControllers]) {
if ([[wc window] isVisible])
[wc showWindow:nil];
@@ -232,25 +232,25 @@
}
- (void)removeWindowController:(NSWindowController *)windowController {
- if ([windowController isEqual:mainWindowController])
- mainWindowController = nil;
+ if ([windowController isEqual:primaryWindowController])
+ primaryWindowController = nil;
[super removeWindowController:windowController];
}
- (void)saveRecentDocumentInfo {
- if ([[mainWindowController window] delegate] == nil)
+ if ([[primaryWindowController window] delegate] == nil)
return;
NSURL *fileURL = [self fileURL];
NSUInteger pageIndex = [[[self pdfView] currentPage] pageIndex];
- NSArray *snapshots = [[[self mainWindowController] snapshots]
valueForKey:SKSnapshotCurrentSetupKey];
+ NSArray *snapshots = [[[self primaryWindowController] snapshots]
valueForKey:SKSnapshotCurrentSetupKey];
if ([[SKBookmarkController sharedBookmarkController]
addRecentDocumentForURL:fileURL pageIndex:pageIndex snapshots:[snapshots count]
> 0 ? snapshots : nil])
[self setRecentInfoNeedsUpdate:NO];
}
- (void)applySetup:(NSDictionary *)setup {
- if ([self mainWindowController] == nil)
+ if ([self primaryWindowController] == nil)
[self makeWindowControllers];
- [[self mainWindowController] applySetup:setup];
+ [[self primaryWindowController] applySetup:setup];
}
- (void)applyOptions:(NSDictionary *)options {
@@ -281,7 +281,7 @@
}
}
if ([searchString length] > 0) {
- [[self mainWindowController] setSearchString:searchString];
+ [[self primaryWindowController] setSearchString:searchString];
}
}
@@ -307,26 +307,26 @@
}
- (SKInteractionMode)interactionMode {
- return [[self mainWindowController] interactionMode];
+ return [[self primaryWindowController] interactionMode];
}
- (void)setInteractionMode:(SKInteractionMode)mode {
if (mode == SKNormalMode) {
- if ([[self mainWindowController] canExitFullscreen])
- [[self mainWindowController] exitFullscreen];
- else if ([[self mainWindowController] canExitPresentation])
- [[self mainWindowController] exitPresentation];
+ if ([[self primaryWindowController] canExitFullscreen])
+ [[self primaryWindowController] exitFullscreen];
+ else if ([[self primaryWindowController] canExitPresentation])
+ [[self primaryWindowController] exitPresentation];
} else if (mode == SKFullScreenMode) {
- if ([[self mainWindowController] canEnterFullscreen])
- [[self mainWindowController] enterFullscreen];
+ if ([[self primaryWindowController] canEnterFullscreen])
+ [[self primaryWindowController] enterFullscreen];
} else if (mode == SKPresentationMode) {
- if ([[self mainWindowController] canEnterPresentation])
- [[self mainWindowController] enterPresentation];
+ if ([[self primaryWindowController] canEnterPresentation])
+ [[self primaryWindowController] enterPresentation];
}
}
- (BOOL)canExitPresentation {
- return [[self mainWindowController] canExitPresentation];
+ return [[self primaryWindowController] canExitPresentation];
}
#pragma mark Writing
@@ -478,7 +478,7 @@
- (NSArray *)SkimNoteProperties {
NSArray *array = [super SkimNoteProperties];
- NSArray *widgetProperties = [[self mainWindowController] widgetProperties];
+ NSArray *widgetProperties = [[self primaryWindowController]
widgetProperties];
if ([widgetProperties count])
array = [array arrayByAddingObjectsFromArray:widgetProperties];
if (pageOffsets != nil) {
@@ -1015,7 +1015,7 @@
}
- (BOOL)revertToContentsOfURL:(NSURL *)absoluteURL ofType:(NSString *)typeName
error:(NSError **)outError{
- NSWindow *primaryWindow = [[self mainWindowController] window];
+ NSWindow *primaryWindow = [[self primaryWindowController] window];
NSWindow *modalwindow = nil;
NSModalSession session;
@@ -1084,7 +1084,7 @@
- (IBAction)copyURL:(id)sender {
NSURL *skimURL = [[[self pdfView] currentPage] skimURL];
if (skimURL) {
- NSString *searchString = [mainWindowController searchString];
+ NSString *searchString = [primaryWindowController searchString];
if ([searchString length] > 0) {
searchString = [searchString
stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet
URLQueryAllowedCharacterSet]];
NSURLComponents *components = [[NSURLComponents alloc]
initWithURL:skimURL resolvingAgainstBaseURL:NO];
@@ -1114,7 +1114,7 @@
}
if (array) {
- [[self mainWindowController] addAnnotationsWithProperties:array
replacing:replace];
+ [[self primaryWindowController] addAnnotationsWithProperties:array
replacing:replace];
[[self undoManager] setActionName:replace ?
NSLocalizedString(@"Replace Notes", @"Undo action name") :
NSLocalizedString(@"Add Notes", @"Undo action name")];
} else
NSBeep();
@@ -1158,7 +1158,7 @@
}
- (void)convertNotesUsingPDFDocument:(PDFDocument *)pdfDocWithoutNotes
completionHandler:(void (^)(void))completionHandler {
- [[self mainWindowController]
beginProgressSheetWithMessage:[NSLocalizedString(@"Converting notes", @"Message
for progress sheet") stringByAppendingEllipsis] maxValue:0];
+ [[self primaryWindowController]
beginProgressSheetWithMessage:[NSLocalizedString(@"Converting notes", @"Message
for progress sheet") stringByAppendingEllipsis] maxValue:0];
NSMapTable *offsets = nil;
NSMutableArray *annotations = nil;
@@ -1208,13 +1208,13 @@
dispatch_async(dispatch_get_main_queue(), ^{
- [[self mainWindowController]
addConvertedAnnotationsWithProperties:noteDicts removeAnnotations:annotations];
+ [[self primaryWindowController]
addConvertedAnnotationsWithProperties:noteDicts removeAnnotations:annotations];
[self setPDFData:data pageOffsets:offsets];
[[self undoManager] setActionName:NSLocalizedString(@"Convert
Notes", @"Undo action name")];
- [[self mainWindowController] dismissProgressSheet];
+ [[self primaryWindowController] dismissProgressSheet];
if (completionHandler)
completionHandler();
@@ -1225,7 +1225,7 @@
} else {
- [[self mainWindowController] dismissProgressSheet];
+ [[self primaryWindowController] dismissProgressSheet];
if (completionHandler)
completionHandler();
@@ -1238,7 +1238,7 @@
SKTextFieldSheetController *passwordSheetController =
[[SKTextFieldSheetController alloc] initWithWindowNibName:@"PasswordSheet"];
[passwordSheetController setInformativeText:NSLocalizedString(@"The
document requires a password to be converted", @"Informative text")];
- [passwordSheetController beginSheetModalForWindow:[[self
mainWindowController] window] completionHandler:^(NSModalResponse result) {
+ [passwordSheetController beginSheetModalForWindow:[[self
primaryWindowController] window] completionHandler:^(NSModalResponse result) {
if (result == NSModalResponseOK) {
[[passwordSheetController window] orderOut:nil];
@@ -1377,7 +1377,7 @@
[alert setInformativeText:NSLocalizedString(@"Your current
changes will be lost.", @"Informative text in alert dialog")];
[alert addButtonWithTitle:NSLocalizedString(@"Revert", @"Button
title")];
[alert addButtonWithTitle:NSLocalizedString(@"Cancel", @"Button
title")];
- [alert beginSheetModalForWindow:[[self mainWindowController]
window] completionHandler:^(NSModalResponse returnCode){
+ [alert beginSheetModalForWindow:[[self primaryWindowController]
window] completionHandler:^(NSModalResponse returnCode){
if (returnCode == NSAlertFirstButtonReturn) {
NSError *error = nil;
if (NO == [self revertToContentsOfURL:[self fileURL]
ofType:[self fileType] error:&error] && [error isUserCancelledError] == NO) {
@@ -1393,12 +1393,12 @@
}
- (void)performFindPanelAction:(id)sender {
- [[self mainWindowController] performFindPanelAction:sender];
+ [[self primaryWindowController] performFindPanelAction:sender];
}
- (BOOL)validateUserInterfaceItem:(id <NSValidatedUserInterfaceItem>)anItem {
if ([anItem action] == @selector(revertDocumentToSaved:)) {
- if ([self fileURL] == nil || [[self fileURL]
checkResourceIsReachableAndReturnError:NULL] == NO || [[self
mainWindowController] interactionMode] == SKPresentationMode)
+ if ([self fileURL] == nil || [[self fileURL]
checkResourceIsReachableAndReturnError:NULL] == NO || [[self
primaryWindowController] interactionMode] == SKPresentationMode)
return NO;
if ([self isDocumentEdited] || [fileUpdateChecker fileChangedOnDisk] ||
NSOrderedAscending == [[self fileModificationDate]
compare:fileModificationDate([self fileURL])])
@@ -1409,7 +1409,7 @@
} else if ([anItem action] == @selector(readNotes:)) {
return [[self pdfDocument] allowsNotes];
} else if ([anItem action] == @selector(performFindPanelAction:)) {
- if ([[self mainWindowController] interactionMode] ==
SKPresentationMode)
+ if ([[self primaryWindowController] interactionMode] ==
SKPresentationMode)
return NO;
switch ([anItem tag]) {
case NSFindPanelActionShowFindPanel:
@@ -1429,7 +1429,7 @@
}
- (void)remoteButtonPressed:(NSEvent *)theEvent {
- [[self mainWindowController] remoteButtonPressed:theEvent];
+ [[self primaryWindowController] remoteButtonPressed:theEvent];
}
- (void)printDocument:(id)sender {
@@ -1440,7 +1440,7 @@
SKTextFieldSheetController *passwordSheetController =
[[SKTextFieldSheetController alloc] initWithWindowNibName:@"PasswordSheet"];
[passwordSheetController setInformativeText:NSLocalizedString(@"The
document requires a password to be printed", @"Informative text")];
- [passwordSheetController beginSheetModalForWindow:[[self
mainWindowController] window] completionHandler:^(NSModalResponse result) {
+ [passwordSheetController beginSheetModalForWindow:[[self
primaryWindowController] window] completionHandler:^(NSModalResponse result) {
if (result == NSModalResponseOK) {
[[passwordSheetController window] orderOut:nil];
[pdfDoc unlockWithPassword:[passwordSheetController
stringValue]];
@@ -1598,26 +1598,26 @@
#pragma mark Accessors
- (NSWindow *)primaryWindow {
- return [mainWindowController window];
+ return [primaryWindowController window];
}
- (PDFDocument *)pdfDocument{
- return [[self mainWindowController] pdfDocument];
+ return [[self primaryWindowController] pdfDocument];
}
- (PDFDocument *)placeholderPdfDocument{
- return [[self mainWindowController] placeholderPdfDocument];
+ return [[self primaryWindowController] placeholderPdfDocument];
}
- (NSDictionary *)currentDocumentSetup {
NSMutableDictionary *setup = [[super currentDocumentSetup] mutableCopy];
if ([setup count])
- [setup addEntriesFromDictionary:[[self mainWindowController]
currentSetup]];
+ [setup addEntriesFromDictionary:[[self primaryWindowController]
currentSetup]];
return setup;
}
- (SKPDFView *)pdfView {
- return [[self mainWindowController] pdfView];
+ return [[self primaryWindowController] pdfView];
}
- (BOOL)recentInfoNeedsUpdate {
@@ -1629,7 +1629,7 @@
}
- (NSDictionary *)presentationOptions {
- SKTransitionController *transitions = [[self mainWindowController]
transitionControllerCreating:NO];
+ SKTransitionController *transitions = [[self primaryWindowController]
transitionControllerCreating:NO];
SKTransitionInfo *transition = [transitions transition];
NSArray *pageTransitions = [transitions pageTransitions];
NSMutableDictionary *options = nil;
@@ -1641,7 +1641,7 @@
}
- (void)setPresentationOptions:(NSDictionary *)dictionary {
- SKTransitionController *transitions = [[self mainWindowController]
transitionControllerCreating:dictionary != nil];
+ SKTransitionController *transitions = [[self primaryWindowController]
transitionControllerCreating:dictionary != nil];
if (dictionary == nil) {
NSUInteger count = [[transitions pageTransitions] count];
if (count == 0 || count + 1 == [[self pdfDocument] pageCount])
@@ -1653,19 +1653,19 @@
}
- (NSArray *)snapshots {
- return [[self mainWindowController] snapshots];
+ return [[self primaryWindowController] snapshots];
}
- (NSArray *)tags {
- return [[self mainWindowController] tags] ?: @[];
+ return [[self primaryWindowController] tags] ?: @[];
}
- (double)rating {
- return [[self mainWindowController] rating];
+ return [[self primaryWindowController] rating];
}
- (NSMenu *)notesMenu {
- return [[self mainWindowController] notesMenu];
+ return [[self primaryWindowController] notesMenu];
}
#pragma mark Passwords
@@ -1721,15 +1721,15 @@
#pragma mark Scripting support
- (BOOL)hasNotes {
- return [[self mainWindowController] hasNotes];
+ return [[self primaryWindowController] hasNotes];
}
- (NSArray *)notes {
- return [[self mainWindowController] notes];
+ return [[self primaryWindowController] notes];
}
- (PDFAnnotation *)valueInNotesWithUniqueID:(NSString *)aUniqueID {
- for (PDFAnnotation *annotation in [[self mainWindowController] notes]) {
+ for (PDFAnnotation *annotation in [[self primaryWindowController] notes]) {
if ([[annotation uniqueID] isEqualToString:aUniqueID])
return annotation;
}
@@ -1767,19 +1767,19 @@
}
- (BOOL)isOutlineExpanded:(PDFOutline *)outline {
- return [[self mainWindowController] isOutlineExpanded:outline];
+ return [[self primaryWindowController] isOutlineExpanded:outline];
}
- (void)setExpanded:(BOOL)flag forOutline:(PDFOutline *)outline {
- [[self mainWindowController] setExpanded:flag forOutline:outline];
+ [[self primaryWindowController] setExpanded:flag forOutline:outline];
}
- (PDFPage *)currentPage {
- return [mainWindowController currentPage];
+ return [primaryWindowController currentPage];
}
- (void)setCurrentPage:(PDFPage *)page {
- [mainWindowController setCurrentPage:page];
+ [primaryWindowController setCurrentPage:page];
}
- (NSData *)currentQDPoint {
@@ -1847,11 +1847,11 @@
}
- (NSArray *)noteSelection {
- return [[self mainWindowController] selectedNotes];
+ return [[self primaryWindowController] selectedNotes];
}
- (void)setNoteSelection:(NSArray *)newNoteSelection {
- return [[self mainWindowController] setSelectedNotes:newNoteSelection];
+ return [[self primaryWindowController] setSelectedNotes:newNoteSelection];
}
- (NSDictionary *)pdfViewSettings {
@@ -1878,23 +1878,23 @@
}
- (NSDocument *)presentationNotesDocument {
- return [[self mainWindowController] presentationNotesDocument];
+ return [[self primaryWindowController] presentationNotesDocument];
}
- (void)setPresentationNotesDocument:(NSDocument *)document {
if ([document isPDFDocument] && [document countOfPages] == [self
countOfPages]) {
- [[self mainWindowController] setPresentationNotesDocument:document];
+ [[self primaryWindowController] setPresentationNotesDocument:document];
if (document != self)
- [[self mainWindowController] setPresentationNotesOffset:0];
+ [[self primaryWindowController] setPresentationNotesOffset:0];
}
}
- (NSInteger)presentationNotesOffset {
- return [[self mainWindowController] presentationNotesOffset];
+ return [[self primaryWindowController] presentationNotesOffset];
}
- (void)setPresentationNotesOffset:(NSInteger)offset {
- [[self mainWindowController] setPresentationNotesOffset:offset];
+ [[self primaryWindowController] setPresentationNotesOffset:offset];
}
- (BOOL)isPDFDocument {
@@ -2045,8 +2045,8 @@
if ([location isKindOfClass:[PDFPage class]]) {
id pointData = [args objectForKey:@"At"];
- if ([mainWindowController interactionMode] == SKPresentationMode) {
- [mainWindowController setCurrentPage:(PDFPage *)location];
+ if ([primaryWindowController interactionMode] == SKPresentationMode) {
+ [primaryWindowController setCurrentPage:(PDFPage *)location];
} else if ([pointData isKindOfClass:[NSData class]]) {
NSPoint point = [(NSData *)pointData pointValueAsQDPoint];
[[self pdfView] goToDestination:[[PDFDestination alloc]
initWithPage:(PDFPage *)location atPoint:point]];
@@ -2053,7 +2053,7 @@
} else {
[[self pdfView] goToCurrentPage:(PDFPage *)location];
}
- } else if ([mainWindowController interactionMode] == SKPresentationMode) {
+ } else if ([primaryWindowController interactionMode] ==
SKPresentationMode) {
} else if ([location isKindOfClass:[PDFAnnotation class]]) {
[[self pdfView] scrollAnnotationToVisible:(PDFAnnotation *)location];
} else if ([location isKindOfClass:[PDFOutline class]]) {
Modified: trunk/SKNoteWindowController.m
===================================================================
--- trunk/SKNoteWindowController.m 2025-06-29 14:35:24 UTC (rev 15560)
+++ trunk/SKNoteWindowController.m 2025-06-29 14:37:59 UTC (rev 15561)
@@ -257,9 +257,9 @@
if ([self commitEditing] == NO)
[self discardEditing];
if ([[self window] isKeyWindow])
- [[[[self document] mainWindowController] window] makeKeyWindow];
+ [[[[self document] primaryWindowController] window] makeKeyWindow];
else if ([[self window] isMainWindow])
- [[[[self document] mainWindowController] window] makeMainWindow];
+ [[[[self document] primaryWindowController] window] makeMainWindow];
if (previewURL)
[self endPreviewPanelControl:nil];
@try { [textView unbind:[self isNoteType] ? @"attributedString" :
@"value"]; }
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
