Revision: 13896
http://sourceforge.net/p/skim-app/code/13896
Author: hofman
Date: 2023-12-12 14:55:12 +0000 (Tue, 12 Dec 2023)
Log Message:
-----------
type sheet callback using NSModalResponse
Modified Paths:
--------------
trunk/NSDocument_SKExtensions.m
trunk/NSWindowController_SKExtensions.h
trunk/NSWindowController_SKExtensions.m
trunk/SKBookmarkController.m
trunk/SKDownloadPreferenceController.m
trunk/SKFileUpdateChecker.m
trunk/SKGeneralPreferences.m
trunk/SKMainDocument.m
trunk/SKMainToolbarController.m
trunk/SKMainWindowController.m
trunk/SKMainWindowController_Actions.m
trunk/SKNoteTypeSheetController.m
trunk/SKPreferenceController.m
trunk/SKProgressController.m
Modified: trunk/NSDocument_SKExtensions.m
===================================================================
--- trunk/NSDocument_SKExtensions.m 2023-12-11 23:16:23 UTC (rev 13895)
+++ trunk/NSDocument_SKExtensions.m 2023-12-12 14:55:12 UTC (rev 13896)
@@ -136,7 +136,7 @@
NSInteger addBookmarkType = [sender tag];
SKBookmarkSheetController *bookmarkSheetController =
[[[SKBookmarkSheetController alloc] init] autorelease];
[bookmarkSheetController setStringValue:[self displayName]];
- [bookmarkSheetController beginSheetModalForWindow:[self windowForSheet]
completionHandler:^(NSInteger result) {
+ [bookmarkSheetController beginSheetModalForWindow:[self windowForSheet]
completionHandler:^(NSModalResponse result) {
if (result == NSModalResponseOK) {
NSString *label = [bookmarkSheetController stringValue];
SKBookmark *folder = [bookmarkSheetController selectedFolder]
?: [[SKBookmarkController sharedBookmarkController] bookmarkRoot];
@@ -174,7 +174,7 @@
[alert setInformativeText:[NSString
stringWithFormat:NSLocalizedString(@"An item named \"%@\" already exists in
this location. Do you want to replace it with this bookmark?", @"Informative
text in alert dialog when getting duplicate bookmark label"), [bookmark
label]]];
[alert
addButtonWithTitle:NSLocalizedString(@"Replace", @"button title")];
[alert addButtonWithTitle:NSLocalizedString(@"Add",
@"button title")];
- [alert beginSheetModalForWindow:[self windowForSheet]
completionHandler:^(NSInteger returnCode){
+ [alert beginSheetModalForWindow:[self windowForSheet]
completionHandler:^(NSModalResponse returnCode){
if (returnCode == NSAlertFirstButtonReturn)
[bookmarks replaceBookmarkAtIndex:i
ofBookmark:folder withBookmark:bookmark animate:YES];
else
Modified: trunk/NSWindowController_SKExtensions.h
===================================================================
--- trunk/NSWindowController_SKExtensions.h 2023-12-11 23:16:23 UTC (rev
13895)
+++ trunk/NSWindowController_SKExtensions.h 2023-12-12 14:55:12 UTC (rev
13896)
@@ -45,7 +45,7 @@
@property (nonatomic, readonly, getter=isNoteWindowController) BOOL
noteWindowController;
-- (void)beginSheetModalForWindow:(NSWindow *)window completionHandler:(void
(^)(NSInteger result))handler;
+- (void)beginSheetModalForWindow:(NSWindow *)window completionHandler:(void
(^)(NSModalResponse result))handler;
- (IBAction)dismissSheet:(id)sender;
Modified: trunk/NSWindowController_SKExtensions.m
===================================================================
--- trunk/NSWindowController_SKExtensions.m 2023-12-11 23:16:23 UTC (rev
13895)
+++ trunk/NSWindowController_SKExtensions.m 2023-12-12 14:55:12 UTC (rev
13896)
@@ -66,7 +66,7 @@
- (BOOL)isNoteWindowController { return NO; }
-- (void)beginSheetModalForWindow:(NSWindow *)window completionHandler:(void
(^)(NSInteger result))handler {
+- (void)beginSheetModalForWindow:(NSWindow *)window completionHandler:(void
(^)(NSModalResponse result))handler {
[self retain]; // make sure we stay around long enough
[window beginSheet:[self window] completionHandler:handler];
}
Modified: trunk/SKBookmarkController.m
===================================================================
--- trunk/SKBookmarkController.m 2023-12-11 23:16:23 UTC (rev 13895)
+++ trunk/SKBookmarkController.m 2023-12-12 14:55:12 UTC (rev 13896)
@@ -496,7 +496,7 @@
[openPanel setAllowsMultipleSelection:YES];
[openPanel setCanChooseDirectories:YES];
[openPanel setAllowedFileTypes:types];
- [openPanel beginSheetModalForWindow:[self window]
completionHandler:^(NSInteger result){
+ [openPanel beginSheetModalForWindow:[self window]
completionHandler:^(NSModalResponse result){
if (result == NSModalResponseOK) {
NSArray *newBookmarks = [SKBookmark
bookmarksForURLs:[openPanel URLs]];
if ([newBookmarks count] > 0) {
@@ -576,7 +576,7 @@
[oPanel setAllowedFileTypes:@[SKPDFDocumentType, SKPDFBundleDocumentType,
SKPostScriptDocumentType, SKEncapsulatedPostScriptDocumentType,
SKDVIDocumentType, SKXDVDocumentType, SKNotesDocumentType]];
if (oldURL)
[oPanel setDirectoryURL:[oldURL URLByDeletingLastPathComponent]];
- [oPanel beginSheetModalForWindow:[self window]
completionHandler:^(NSInteger result){
+ [oPanel beginSheetModalForWindow:[self window]
completionHandler:^(NSModalResponse result){
if (result == NSModalResponseOK) {
NSURL *fileURL = [[oPanel URLs] firstObject];
if (fileURL)
Modified: trunk/SKDownloadPreferenceController.m
===================================================================
--- trunk/SKDownloadPreferenceController.m 2023-12-11 23:16:23 UTC (rev
13895)
+++ trunk/SKDownloadPreferenceController.m 2023-12-12 14:55:12 UTC (rev
13896)
@@ -80,7 +80,7 @@
[openPanel setCanChooseFiles:NO];
[openPanel setPrompt:NSLocalizedString(@"Select", @"Button title")];
[openPanel setDirectoryURL:downloadsFolderURL];
- [openPanel beginSheetModalForWindow:[self window]
completionHandler:^(NSInteger result){
+ [openPanel beginSheetModalForWindow:[self window]
completionHandler:^(NSModalResponse result){
if (result == NSModalResponseOK) {
[[NSUserDefaults standardUserDefaults]
setObject:[[[openPanel URL] path] stringByAbbreviatingWithTildeInPath]
forKey:SKDownloadsDirectoryKey];
[self updateDownloadsFolderPopUp];
Modified: trunk/SKFileUpdateChecker.m
===================================================================
--- trunk/SKFileUpdateChecker.m 2023-12-11 23:16:23 UTC (rev 13895)
+++ trunk/SKFileUpdateChecker.m 2023-12-12 14:55:12 UTC (rev 13896)
@@ -236,7 +236,7 @@
[alert addButtonWithTitle:NSLocalizedString(@"No", @"Button
title")];
if (fucFlags.autoUpdate == NO)
[alert addButtonWithTitle:NSLocalizedString(@"Auto",
@"Button title")];
- [alert beginSheetModalForWindow:docWindow
completionHandler:^(NSInteger returnCode){
+ [alert beginSheetModalForWindow:docWindow
completionHandler:^(NSModalResponse returnCode){
[[alert window] orderOut:nil];
[self updateWithOption:returnCode];
}];
Modified: trunk/SKGeneralPreferences.m
===================================================================
--- trunk/SKGeneralPreferences.m 2023-12-11 23:16:23 UTC (rev 13895)
+++ trunk/SKGeneralPreferences.m 2023-12-12 14:55:12 UTC (rev 13896)
@@ -105,7 +105,7 @@
NSDictionary *defaultSettings = fullScreen ? [sud
dictionaryForKey:SKDefaultPDFDisplaySettingsKey] : nil;
SKViewSettingsController *viewSettings = [[[SKViewSettingsController
alloc] initWithSettings:settings defaultSettings:defaultSettings] autorelease];
- [viewSettings beginSheetModalForWindow:[[self view] window]
completionHandler:^(NSInteger result){
+ [viewSettings beginSheetModalForWindow:[[self view] window]
completionHandler:^(NSModalResponse result){
if (result == NSModalResponseOK) {
[sud setObject:[viewSettings settings] forKey:key];
if (fullScreen == NO)
Modified: trunk/SKMainDocument.m
===================================================================
--- trunk/SKMainDocument.m 2023-12-11 23:16:23 UTC (rev 13895)
+++ trunk/SKMainDocument.m 2023-12-12 14:55:12 UTC (rev 13896)
@@ -1110,7 +1110,7 @@
[oPanel setDirectoryURL:[fileURL URLByDeletingLastPathComponent]];
[oPanel setAllowedFileTypes:@[SKNotesDocumentType]];
- [oPanel beginSheetModalForWindow:[self windowForSheet]
completionHandler:^(NSInteger result){
+ [oPanel beginSheetModalForWindow:[self windowForSheet]
completionHandler:^(NSModalResponse result){
if (result == NSModalResponseOK) {
NSURL *notesURL = [[oPanel URLs] objectAtIndex:0];
BOOL replace = (replaceNotesCheckButton &&
[replaceNotesCheckButton state] == NSOnState);
@@ -1217,7 +1217,7 @@
- (void)beginConvertNotesPasswordSheetForPDFDocument:(PDFDocument *)pdfDoc {
SKTextFieldSheetController *passwordSheetController =
[[[SKTextFieldSheetController alloc] initWithWindowNibName:@"PasswordSheet"]
autorelease];
- [passwordSheetController beginSheetModalForWindow:[[self
mainWindowController] window] completionHandler:^(NSInteger result) {
+ [passwordSheetController beginSheetModalForWindow:[[self
mainWindowController] window] completionHandler:^(NSModalResponse result) {
if (result == NSModalResponseOK) {
[[passwordSheetController window] orderOut:nil];
@@ -1271,7 +1271,7 @@
[alert setInformativeText:NSLocalizedString(@"This will convert PDF
annotations to Skim notes. Do you want to proceed?", @"Informative text in
alert dialog")];
[alert addButtonWithTitle:NSLocalizedString(@"OK", @"Button title")];
[alert addButtonWithTitle:NSLocalizedString(@"Cancel", @"Button title")];
- [alert beginSheetModalForWindow:[self windowForSheet]
completionHandler:^(NSInteger returnCode){
+ [alert beginSheetModalForWindow:[self windowForSheet]
completionHandler:^(NSModalResponse returnCode){
if (returnCode == NSAlertFirstButtonReturn) {
// remove the sheet, to make place for either the password or
progress sheet
[[alert window] orderOut:nil];
@@ -1359,7 +1359,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:^(NSInteger returnCode){
+ [alert beginSheetModalForWindow:[[self mainWindowController]
window] completionHandler:^(NSModalResponse returnCode){
if (returnCode == NSAlertFirstButtonReturn) {
NSError *error = nil;
if (NO == [self revertToContentsOfURL:[self fileURL]
ofType:[self fileType] error:&error] && [error isUserCancelledError] == NO) {
Modified: trunk/SKMainToolbarController.m
===================================================================
--- trunk/SKMainToolbarController.m 2023-12-11 23:16:23 UTC (rev 13895)
+++ trunk/SKMainToolbarController.m 2023-12-12 14:55:12 UTC (rev 13896)
@@ -1097,7 +1097,7 @@
[(NSNumberFormatter *)[[scaleSheetController textField] formatter]
setMaximum:[NSNumber numberWithDouble:[mainController.pdfView maxScaleFactor]]];
[[scaleSheetController textField] setDoubleValue:[mainController.pdfView
scaleFactor]];
- [scaleSheetController beginSheetModalForWindow:[mainController window]
completionHandler:^(NSInteger result) {
+ [scaleSheetController beginSheetModalForWindow:[mainController window]
completionHandler:^(NSModalResponse result) {
if (result == NSModalResponseOK)
[mainController.pdfView setScaleFactor:[[scaleSheetController
textField] doubleValue]];
}];
@@ -1265,7 +1265,7 @@
[[speedSheetController textField] setObjectValue:[NSNumber
numberWithDouble:[mainController.pdfView pacerSpeed]]];
- [speedSheetController beginSheetModalForWindow:[mainController window]
completionHandler:^(NSInteger result) {
+ [speedSheetController beginSheetModalForWindow:[mainController window]
completionHandler:^(NSModalResponse result) {
if (result == NSModalResponseOK)
[mainController.pdfView setPacerSpeed:[[speedSheetController
textField] doubleValue]];
}];
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2023-12-11 23:16:23 UTC (rev 13895)
+++ trunk/SKMainWindowController.m 2023-12-12 14:55:12 UTC (rev 13896)
@@ -2210,7 +2210,7 @@
[alert addButtonWithTitle:NSLocalizedString(@"No", @"Button title")];
NSWindow *window = [self window];
if ([window attachedSheet] == nil)
- [alert beginSheetModalForWindow:window
completionHandler:^(NSInteger returnCode){
+ [alert beginSheetModalForWindow:window
completionHandler:^(NSModalResponse returnCode){
if (returnCode == NSAlertFirstButtonReturn)
[[self document] savePasswordInKeychain:password];
}];
Modified: trunk/SKMainWindowController_Actions.m
===================================================================
--- trunk/SKMainWindowController_Actions.m 2023-12-11 23:16:23 UTC (rev
13895)
+++ trunk/SKMainWindowController_Actions.m 2023-12-12 14:55:12 UTC (rev
13896)
@@ -366,7 +366,7 @@
[(NSComboBox *)[pageSheetController textField]
addItemsWithObjectValues:pageLabels];
[pageSheetController setStringValue:[self pageLabel]];
- [pageSheetController beginSheetModalForWindow:[self window]
completionHandler:^(NSInteger result) {
+ [pageSheetController beginSheetModalForWindow:[self window]
completionHandler:^(NSModalResponse result) {
if (result == NSModalResponseOK)
[self setPageLabel:[pageSheetController stringValue]];
}];
@@ -918,7 +918,7 @@
- (IBAction)password:(id)sender {
SKTextFieldSheetController *passwordSheetController =
[[[SKTextFieldSheetController alloc] initWithWindowNibName:@"PasswordSheet"]
autorelease];
- [passwordSheetController beginSheetModalForWindow:[self window]
completionHandler:^(NSInteger result) {
+ [passwordSheetController beginSheetModalForWindow:[self window]
completionHandler:^(NSModalResponse result) {
if (result == NSModalResponseOK) {
[[passwordSheetController window] orderOut:nil];
[[pdfView document]
unlockWithPassword:[passwordSheetController stringValue]];
@@ -955,7 +955,7 @@
- (IBAction)chooseTransition:(id)sender {
presentationSheetController = [[SKPresentationOptionsSheetController
alloc] initForController:self];
- [presentationSheetController beginSheetModalForWindow:[self window]
completionHandler:^(NSInteger result) {
+ [presentationSheetController beginSheetModalForWindow:[self window]
completionHandler:^(NSModalResponse result) {
SKDESTROY(presentationSheetController);
}];
}
Modified: trunk/SKNoteTypeSheetController.m
===================================================================
--- trunk/SKNoteTypeSheetController.m 2023-12-11 23:16:23 UTC (rev 13895)
+++ trunk/SKNoteTypeSheetController.m 2023-12-12 14:55:12 UTC (rev 13896)
@@ -164,7 +164,7 @@
for (i = 0; i < NOTETYPES_COUNT; i++)
[[self switchForTag:i] setState:[[noteTypeMenu itemAtIndex:i] state]];
- [self beginSheetModalForWindow:[delegate windowForNoteTypeSheetController]
completionHandler:^(NSInteger result) {
+ [self beginSheetModalForWindow:[delegate windowForNoteTypeSheetController]
completionHandler:^(NSModalResponse result) {
if (result == NSModalResponseOK) {
NSInteger idx;
for (idx = 0; idx < NOTETYPES_COUNT; idx++)
Modified: trunk/SKPreferenceController.m
===================================================================
--- trunk/SKPreferenceController.m 2023-12-11 23:16:23 UTC (rev 13895)
+++ trunk/SKPreferenceController.m 2023-12-12 14:55:12 UTC (rev 13896)
@@ -252,7 +252,7 @@
[alert setInformativeText:NSLocalizedString(@"Choosing Reset will restore
all settings to the state they were in when Skim was first installed.",
@"Informative text in alert dialog when pressing Reset All button")];
[alert addButtonWithTitle:NSLocalizedString(@"Reset", @"Button title")];
[alert addButtonWithTitle:NSLocalizedString(@"Cancel", @"Button title")];
- [alert beginSheetModalForWindow:[self window]
completionHandler:^(NSInteger returnCode){
+ [alert beginSheetModalForWindow:[self window]
completionHandler:^(NSModalResponse returnCode){
if (returnCode == NSAlertFirstButtonReturn) {
[[NSUserDefaultsController sharedUserDefaultsController]
revertToInitialValues:nil];
for (NSViewController<SKPreferencePane> *pane in preferencePanes) {
@@ -274,7 +274,7 @@
[alert setInformativeText:[NSString
stringWithFormat:NSLocalizedString(@"Choosing Reset will restore all settings
in this pane to the state they were in when Skim was first installed.",
@"Informative text in alert dialog when pressing Reset All button"), label]];
[alert addButtonWithTitle:NSLocalizedString(@"Reset", @"Button title")];
[alert addButtonWithTitle:NSLocalizedString(@"Cancel", @"Button title")];
- [alert beginSheetModalForWindow:[self window]
completionHandler:^(NSInteger returnCode){
+ [alert beginSheetModalForWindow:[self window]
completionHandler:^(NSModalResponse returnCode){
if (returnCode == NSAlertFirstButtonReturn) {
NSURL *initialUserDefaultsURL = [[NSBundle mainBundle]
URLForResource:INITIALUSERDEFAULTS_KEY withExtension:@"plist"];
NSArray *resettableKeys = [[[NSDictionary
dictionaryWithContentsOfURL:initialUserDefaultsURL]
objectForKey:RESETTABLEKEYS_KEY] objectForKey:[currentPane nibName]];
Modified: trunk/SKProgressController.m
===================================================================
--- trunk/SKProgressController.m 2023-12-11 23:16:23 UTC (rev 13895)
+++ trunk/SKProgressController.m 2023-12-12 14:55:12 UTC (rev 13896)
@@ -107,7 +107,7 @@
[[self progressBar] displayIfNeeded];
}
-- (void)beginSheetModalForWindow:(NSWindow *)window completionHandler:(void
(^)(NSInteger result))handler {
+- (void)beginSheetModalForWindow:(NSWindow *)window completionHandler:(void
(^)(NSModalResponse result))handler {
[[self progressBar] startAnimation:self];
[(SKApplication *)NSApp setUserAttentionDisabled:YES];
[super beginSheetModalForWindow:window completionHandler:handler];
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
