Skip to content

Commit 536d3aa

Browse files
committed
BookMacster 1.22.9 Release Candidate
If no Bookmarkshelf document is open to receive a new bookmark being landed from another app, after the user selects a document and it opens, the new bookmark is now added to the document immediately.
1 parent 87a749d commit 536d3aa

File tree

3 files changed

+19
-6
lines changed

3 files changed

+19
-6
lines changed

SSYAlert.h

+7
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,13 @@ enum {
88
SSYAlertIconInformational /*!< Alert will have "informational" (yellow) icon */
99
} ;
1010

11+
enum SSYAlertMode_enum {
12+
SSYAlertModeNonBlocking,
13+
SSYAlertModeModalSession,
14+
SSYAlertModeModalDialog
15+
};
16+
typedef enum SSYAlertMode_enum SSYAlertMode ;
17+
1118
/*!
1219
@brief This is an addition to Apple's anonymous enumeration containing
1320
NSAlertDefaultReturn, NSAlertAlternateReturn, NSAlertOtherReturn and NSAlertErrorReturn.

SSYListPicker.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#import <Cocoa/Cocoa.h>
22

3-
@class SSYAlert ;
3+
#import "SSYAlert.h"
44

55
@interface SSYListPicker : NSObject {
66
SSYAlert* m_alert ;
@@ -67,7 +67,7 @@
6767
initialPicks:(NSIndexSet*)initialPicks
6868
windowTitle:(NSString*)windowTitle
6969
alert:(SSYAlert*)alert
70-
runModal:(BOOL)runModal
70+
mode:(SSYAlertMode)mode
7171
didEndTarget:(id)didEndTarget
7272
didEndSelector:(SEL)didEndSelector
7373
didEndUserInfo:(id)didEndUserInfo

SSYListPicker.m

+10-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#import "SSYListPicker.h"
2-
#import "SSYAlert.h"
32
#import "SSYLabelledList.h"
43
#import "NSString+LocalizeSSY.h"
54
#import "NS(Attributed)String+Geometrics.h"
@@ -40,7 +39,7 @@ - (void)userPickFromList:(NSArray*)displayNames
4039
initialPicks:(NSIndexSet*)initialPicks
4140
windowTitle:(NSString*)windowTitle
4241
alert:(SSYAlert*)alert
43-
runModal:(BOOL)runModal
42+
mode:(SSYAlertMode)mode
4443
didEndTarget:(id)didEndTarget
4544
didEndSelector:(SEL)didEndSelector
4645
didEndUserInfo:(id)didEndUserInfo
@@ -109,8 +108,15 @@ - (void)userPickFromList:(NSArray*)displayNames
109108
forKey:constKeyDidCancelInvocation] ;
110109
[alert setClickObject:didEndInfo] ;
111110
[alert display] ;
112-
if (runModal) {
113-
[alert runModalSession] ;
111+
switch (mode) {
112+
case SSYAlertModeNonBlocking:
113+
break ;
114+
case SSYAlertModeModalSession:
115+
[alert runModalSession] ;
116+
break ;
117+
case SSYAlertModeModalDialog:
118+
[alert runModalDialog] ;
119+
break ;
114120
}
115121
}
116122

0 commit comments

Comments
 (0)