Revision: 24036
http://sourceforge.net/p/bibdesk/svn/24036
Author: hofman
Date: 2019-07-16 22:53:45 +0000 (Tue, 16 Jul 2019)
Log Message:
-----------
use properties for outlets
Modified Paths:
--------------
trunk/bibdesk/BDSKBookmarkController.h
trunk/bibdesk/BDSKBookmarkController.m
trunk/bibdesk/BDSKBookmarkSheetController.h
trunk/bibdesk/BDSKBookmarkSheetController.m
trunk/bibdesk/BDSKCharacterConversion.h
trunk/bibdesk/BDSKCharacterConversion.m
trunk/bibdesk/BDSKComplexStringEditor.h
trunk/bibdesk/BDSKComplexStringEditor.m
trunk/bibdesk/BDSKConditionController.h
trunk/bibdesk/BDSKConditionController.m
trunk/bibdesk/BDSKDocumentInfoWindowController.h
trunk/bibdesk/BDSKDocumentInfoWindowController.m
trunk/bibdesk/BDSKEditor.h
trunk/bibdesk/BDSKEditor.m
trunk/bibdesk/BDSKErrorEditor.h
trunk/bibdesk/BDSKErrorEditor.m
trunk/bibdesk/BDSKErrorObjectController.h
trunk/bibdesk/BDSKErrorObjectController.m
trunk/bibdesk/BDSKFieldSheetController.h
trunk/bibdesk/BDSKFieldSheetController.m
trunk/bibdesk/BDSKFileContentSearchController.h
trunk/bibdesk/BDSKFileContentSearchController.m
trunk/bibdesk/BDSKFileMatchConfigController.h
trunk/bibdesk/BDSKFileMatchConfigController.m
trunk/bibdesk/BDSKFileMatcher.h
trunk/bibdesk/BDSKFileMatcher.m
trunk/bibdesk/BDSKFileMigrationController.h
trunk/bibdesk/BDSKFileMigrationController.m
trunk/bibdesk/BDSKFiler.h
trunk/bibdesk/BDSKFiler.m
trunk/bibdesk/BDSKFilerErrorController.h
trunk/bibdesk/BDSKFilerErrorController.m
trunk/bibdesk/BDSKFilterController.h
trunk/bibdesk/BDSKFilterController.m
trunk/bibdesk/BDSKFindController.h
trunk/bibdesk/BDSKFindController.m
trunk/bibdesk/BDSKMacroWindowController.h
trunk/bibdesk/BDSKMacroWindowController.m
trunk/bibdesk/BDSKNotesWindowController.h
trunk/bibdesk/BDSKNotesWindowController.m
trunk/bibdesk/BDSKOpenAccessoryViewController.h
trunk/bibdesk/BDSKOpenAccessoryViewController.m
trunk/bibdesk/BDSKOrphanedFilesFinder.h
trunk/bibdesk/BDSKOrphanedFilesFinder.m
trunk/bibdesk/BDSKPasswordController.h
trunk/bibdesk/BDSKPasswordController.m
trunk/bibdesk/BDSKPersonController.h
trunk/bibdesk/BDSKPersonController.m
trunk/bibdesk/BDSKPreferenceController.h
trunk/bibdesk/BDSKPreferenceController.m
trunk/bibdesk/BDSKPreviewer.h
trunk/bibdesk/BDSKPreviewer.m
trunk/bibdesk/BDSKReadMeController.h
trunk/bibdesk/BDSKReadMeController.m
trunk/bibdesk/BDSKSaveAccessoryViewController.h
trunk/bibdesk/BDSKSaveAccessoryViewController.m
trunk/bibdesk/BDSKScriptGroupSheetController.h
trunk/bibdesk/BDSKScriptGroupSheetController.m
trunk/bibdesk/BDSKSearchBookmarkController.h
trunk/bibdesk/BDSKSearchBookmarkController.m
trunk/bibdesk/BDSKSearchGroupSheetController.h
trunk/bibdesk/BDSKSearchGroupSheetController.m
trunk/bibdesk/BDSKSearchGroupViewController.h
trunk/bibdesk/BDSKSearchGroupViewController.m
Modified: trunk/bibdesk/BDSKBookmarkController.h
===================================================================
--- trunk/bibdesk/BDSKBookmarkController.h 2019-07-16 06:30:50 UTC (rev
24035)
+++ trunk/bibdesk/BDSKBookmarkController.h 2019-07-16 22:53:45 UTC (rev
24036)
@@ -44,7 +44,7 @@
@class BDSKBookmark, BDSKOutlineView;
@interface BDSKBookmarkController : NSWindowController <NSOutlineViewDelegate,
NSOutlineViewDataSource, NSToolbarDelegate, NSTouchBarDelegate> {
- IBOutlet BDSKOutlineView *outlineView;
+ BDSKOutlineView *outlineView;
BDSKBookmark *bookmarkRoot;
NSUndoManager *undoManager;
NSArray *draggedBookmarks;
@@ -53,6 +53,8 @@
+ (id)sharedBookmarkController;
+@property (nonatomic, assign) IBOutlet BDSKOutlineView *outlineView;
+
@property (nonatomic, readonly) BDSKBookmark *bookmarkRoot;
- (void)addBookmarkWithURL:(NSURL *)aURL proposedName:(NSString *)name
modalForWindow:(NSWindow *)window;
Modified: trunk/bibdesk/BDSKBookmarkController.m
===================================================================
--- trunk/bibdesk/BDSKBookmarkController.m 2019-07-16 06:30:50 UTC (rev
24035)
+++ trunk/bibdesk/BDSKBookmarkController.m 2019-07-16 22:53:45 UTC (rev
24036)
@@ -83,7 +83,7 @@
@implementation BDSKBookmarkController
-@synthesize bookmarkRoot;
+@synthesize outlineView, bookmarkRoot;
@dynamic undoManager;
static id sharedBookmarkController = nil;
Modified: trunk/bibdesk/BDSKBookmarkSheetController.h
===================================================================
--- trunk/bibdesk/BDSKBookmarkSheetController.h 2019-07-16 06:30:50 UTC (rev
24035)
+++ trunk/bibdesk/BDSKBookmarkSheetController.h 2019-07-16 22:53:45 UTC (rev
24036)
@@ -41,13 +41,16 @@
@interface BDSKBookmarkSheetController : NSWindowController
<NSTouchBarDelegate> {
- IBOutlet NSTextField *textField;
- IBOutlet NSPopUpButton *folderPopUp;
- IBOutlet NSButton *okButton;
- IBOutlet NSButton *cancelButton;
+ NSTextField *textField;
+ NSPopUpButton *folderPopUp;
+ NSButton *okButton;
+ NSButton *cancelButton;
}
-@property (nonatomic, readonly) NSTextField *textField;
+@property (nonatomic, assign) IBOutlet NSTextField *textField;
+@property (nonatomic, assign) IBOutlet NSPopUpButton *folderPopUp;
+@property (nonatomic, assign) IBOutlet NSButton *okButton;
+@property (nonatomic, assign) IBOutlet NSButton *cancelButton;
@property (nonatomic, retain) NSString *stringValue;
Modified: trunk/bibdesk/BDSKBookmarkSheetController.m
===================================================================
--- trunk/bibdesk/BDSKBookmarkSheetController.m 2019-07-16 06:30:50 UTC (rev
24035)
+++ trunk/bibdesk/BDSKBookmarkSheetController.m 2019-07-16 22:53:45 UTC (rev
24036)
@@ -43,7 +43,8 @@
@implementation BDSKBookmarkSheetController
-@dynamic textField, stringValue, folderPopUpButton, selectedFolder;
+@synthesize textField, folderPopUp, okButton, cancelButton;
+@dynamic stringValue, folderPopUpButton, selectedFolder;
- (NSString *)windowNibName { return @"BookmarkSheet"; }
Modified: trunk/bibdesk/BDSKCharacterConversion.h
===================================================================
--- trunk/bibdesk/BDSKCharacterConversion.h 2019-07-16 06:30:50 UTC (rev
24035)
+++ trunk/bibdesk/BDSKCharacterConversion.h 2019-07-16 22:53:45 UTC (rev
24036)
@@ -45,11 +45,11 @@
};
@interface BDSKCharacterConversion : NSWindowController <NSTableViewDelegate,
NSTableViewDataSource, NSTouchBarDelegate> {
- IBOutlet NSPopUpButton *listButton;
- IBOutlet NSTableView *tableView;
- IBOutlet NSSegmentedControl *addRemoveButton;
- IBOutlet NSButton *okButton;
- IBOutlet NSButton *cancelButton;
+ NSPopUpButton *listButton;
+ NSTableView *tableView;
+ NSSegmentedControl *addRemoveButton;
+ NSButton *okButton;
+ NSButton *cancelButton;
NSSet *defaultOneWayRomanSet;
NSSet *defaultRomanSet;
NSSet *defaultTexSet;
@@ -67,6 +67,12 @@
+ (BDSKCharacterConversion *)sharedConversionEditor;
+@property (nonatomic, assign) IBOutlet NSPopUpButton *listButton;
+@property (nonatomic, assign) IBOutlet NSTableView *tableView;
+@property (nonatomic, assign) IBOutlet NSSegmentedControl *addRemoveButton;
+@property (nonatomic, assign) IBOutlet NSButton *okButton;
+@property (nonatomic, assign) IBOutlet NSButton *cancelButton;
+
- (void)updateDicts;
- (IBAction)changeList:(id)sender;
Modified: trunk/bibdesk/BDSKCharacterConversion.m
===================================================================
--- trunk/bibdesk/BDSKCharacterConversion.m 2019-07-16 06:30:50 UTC (rev
24035)
+++ trunk/bibdesk/BDSKCharacterConversion.m 2019-07-16 22:53:45 UTC (rev
24036)
@@ -48,6 +48,7 @@
@implementation BDSKCharacterConversion
+@synthesize listButton, tableView, addRemoveButton, okButton, cancelButton;
@dynamic listType, oneWayDict, twoWayDict;
static BDSKCharacterConversion *sharedConversionEditor;
Modified: trunk/bibdesk/BDSKComplexStringEditor.h
===================================================================
--- trunk/bibdesk/BDSKComplexStringEditor.h 2019-07-16 06:30:50 UTC (rev
24035)
+++ trunk/bibdesk/BDSKComplexStringEditor.h 2019-07-16 22:53:45 UTC (rev
24036)
@@ -42,8 +42,8 @@
@class BDSKBackgroundView, BDSKMacroResolver;
@interface BDSKComplexStringEditor : NSWindowController {
- IBOutlet NSTextField *expandedValueTextField;
- IBOutlet BDSKBackgroundView *backgroundView;
+ NSTextField *expandedValueTextField;
+ BDSKBackgroundView *backgroundView;
BDSKMacroResolver *macroResolver;
NSTableView *tableView;
NSInteger row;
@@ -55,6 +55,9 @@
- (BOOL)attachToTableView:(NSTableView *)aTableView atRow:(NSInteger)aRow
column:(NSInteger)aColumn withValue:(NSString *)aString;
+@property (nonatomic, assign) IBOutlet NSTextField *expandedValueTextField;
+@property (nonatomic, assign) IBOutlet BDSKBackgroundView *backgroundView;
+
@property (nonatomic, readonly, getter=isAttached) BOOL attached;
@end
Modified: trunk/bibdesk/BDSKComplexStringEditor.m
===================================================================
--- trunk/bibdesk/BDSKComplexStringEditor.m 2019-07-16 06:30:50 UTC (rev
24035)
+++ trunk/bibdesk/BDSKComplexStringEditor.m 2019-07-16 22:53:45 UTC (rev
24036)
@@ -60,6 +60,7 @@
@implementation BDSKComplexStringEditor
+@synthesize expandedValueTextField, backgroundView;
@dynamic attached;
- (id)initWithMacroResolver:(BDSKMacroResolver *)aMacroResolver
enabled:(BOOL)isEnabled {
Modified: trunk/bibdesk/BDSKConditionController.h
===================================================================
--- trunk/bibdesk/BDSKConditionController.h 2019-07-16 06:30:50 UTC (rev
24035)
+++ trunk/bibdesk/BDSKConditionController.h 2019-07-16 22:53:45 UTC (rev
24036)
@@ -43,26 +43,26 @@
@interface BDSKConditionController : NSViewController {
- IBOutlet NSObjectController *objectController;
- IBOutlet NSComboBox *keyComboBox;
- IBOutlet NSPopUpButton *comparisonPopUp;
- IBOutlet NSPopUpButton *attachmentComparisonPopUp;
- IBOutlet NSPopUpButton *dateComparisonPopUp;
- IBOutlet NSTextField *valueTextField;
- IBOutlet NSTextField *countTextField;
- IBOutlet NSTextField *numberTextField;
- IBOutlet NSTextField *andNumberTextField;
- IBOutlet NSTextField *dateTextField;
- IBOutlet NSTextField *toDateTextField;
- IBOutlet NSTextField *agoText;
- IBOutlet NSPopUpButton *periodPopUp;
- IBOutlet NSButton *booleanButton;
- IBOutlet NSButton *triStateButton;
- IBOutlet BDSKRatingButton *ratingButton;
- IBOutlet NSBox *comparisonBox;
- IBOutlet NSBox *valueBox;
- IBOutlet NSButton *addButton;
- IBOutlet NSButton *removeButton;
+ NSObjectController *objectController;
+ NSComboBox *keyComboBox;
+ NSPopUpButton *comparisonPopUp;
+ NSPopUpButton *attachmentComparisonPopUp;
+ NSPopUpButton *dateComparisonPopUp;
+ NSTextField *valueTextField;
+ NSTextField *countTextField;
+ NSTextField *numberTextField;
+ NSTextField *andNumberTextField;
+ NSTextField *dateTextField;
+ NSTextField *toDateTextField;
+ NSTextField *agoText;
+ NSPopUpButton *periodPopUp;
+ NSButton *booleanButton;
+ NSButton *triStateButton;
+ BDSKRatingButton *ratingButton;
+ NSBox *comparisonBox;
+ NSBox *valueBox;
+ NSButton *addButton;
+ NSButton *removeButton;
NSArray *retainedViews;
BDSKFilterController *filterController;
NSMutableArray *keys;
@@ -70,6 +70,27 @@
BOOL isObserving;
}
+@property (nonatomic, assign) IBOutlet NSObjectController *objectController;
+@property (nonatomic, assign) IBOutlet NSComboBox *keyComboBox;
+@property (nonatomic, assign) IBOutlet NSPopUpButton *comparisonPopUp;
+@property (nonatomic, assign) IBOutlet NSPopUpButton
*attachmentComparisonPopUp;
+@property (nonatomic, assign) IBOutlet NSPopUpButton *dateComparisonPopUp;
+@property (nonatomic, assign) IBOutlet NSTextField *valueTextField;
+@property (nonatomic, assign) IBOutlet NSTextField *countTextField;
+@property (nonatomic, assign) IBOutlet NSTextField *numberTextField;
+@property (nonatomic, assign) IBOutlet NSTextField *andNumberTextField;
+@property (nonatomic, assign) IBOutlet NSTextField *dateTextField;
+@property (nonatomic, assign) IBOutlet NSTextField *toDateTextField;
+@property (nonatomic, assign) IBOutlet NSTextField *agoText;
+@property (nonatomic, assign) IBOutlet NSPopUpButton *periodPopUp;
+@property (nonatomic, assign) IBOutlet NSButton *booleanButton;
+@property (nonatomic, assign) IBOutlet NSButton *triStateButton;
+@property (nonatomic, assign) IBOutlet BDSKRatingButton *ratingButton;
+@property (nonatomic, assign) IBOutlet NSBox *comparisonBox;
+@property (nonatomic, assign) IBOutlet NSBox *valueBox;
+@property (nonatomic, assign) IBOutlet NSButton *addButton;
+@property (nonatomic, assign) IBOutlet NSButton *removeButton;
+
- (id)initWithFilterController:(BDSKFilterController *)aFilterController;
- (id)initWithFilterController:(BDSKFilterController *)aFilterController
condition:(BDSKCondition *)aCondition;
Modified: trunk/bibdesk/BDSKConditionController.m
===================================================================
--- trunk/bibdesk/BDSKConditionController.m 2019-07-16 06:30:50 UTC (rev
24035)
+++ trunk/bibdesk/BDSKConditionController.m 2019-07-16 22:53:45 UTC (rev
24036)
@@ -58,7 +58,7 @@
@implementation BDSKConditionController
-@synthesize canRemove;
+@synthesize objectController, keyComboBox, comparisonPopUp,
attachmentComparisonPopUp, dateComparisonPopUp, valueTextField, countTextField,
numberTextField, andNumberTextField, dateTextField, toDateTextField, agoText,
periodPopUp, booleanButton, triStateButton, ratingButton, comparisonBox,
valueBox, addButton, removeButton, canRemove;
@dynamic condition, keys;
+ (void)initialize
Modified: trunk/bibdesk/BDSKDocumentInfoWindowController.h
===================================================================
--- trunk/bibdesk/BDSKDocumentInfoWindowController.h 2019-07-16 06:30:50 UTC
(rev 24035)
+++ trunk/bibdesk/BDSKDocumentInfoWindowController.h 2019-07-16 22:53:45 UTC
(rev 24036)
@@ -41,15 +41,20 @@
@interface BDSKDocumentInfoWindowController : NSWindowController
<NSTableViewDelegate, NSTableViewDataSource, NSTouchBarDelegate> {
- IBOutlet NSTableView *tableView;
- IBOutlet NSSegmentedControl *addRemoveButton;
- IBOutlet NSButton *okButton;
- IBOutlet NSButton *cancelButton;
+ NSTableView *tableView;
+ NSSegmentedControl *addRemoveButton;
+ NSButton *okButton;
+ NSButton *cancelButton;
NSMutableDictionary *info;
NSMutableArray *keys;
BOOL ignoreEdit;
}
+@property (nonatomic, assign) IBOutlet NSTableView *tableView;
+@property (nonatomic, assign) IBOutlet NSSegmentedControl *addRemoveButton;
+@property (nonatomic, assign) IBOutlet NSButton *okButton;
+@property (nonatomic, assign) IBOutlet NSButton *cancelButton;
+
- (IBAction)addRemoveKey:(id)sender;
@property (nonatomic, copy) NSDictionary *info;
Modified: trunk/bibdesk/BDSKDocumentInfoWindowController.m
===================================================================
--- trunk/bibdesk/BDSKDocumentInfoWindowController.m 2019-07-16 06:30:50 UTC
(rev 24035)
+++ trunk/bibdesk/BDSKDocumentInfoWindowController.m 2019-07-16 22:53:45 UTC
(rev 24036)
@@ -46,7 +46,7 @@
@implementation BDSKDocumentInfoWindowController
-@synthesize info;
+@synthesize tableView, addRemoveButton, okButton, cancelButton, info;
- (id)init {
self = [super initWithWindowNibName:@"DocumentInfoWindow"];
Modified: trunk/bibdesk/BDSKEditor.h
===================================================================
--- trunk/bibdesk/BDSKEditor.h 2019-07-16 06:30:50 UTC (rev 24035)
+++ trunk/bibdesk/BDSKEditor.h 2019-07-16 22:53:45 UTC (rev 24036)
@@ -58,15 +58,15 @@
@discussion Subclass of the NSWindowController class, This handles making,
reversing and keeping track of changes to the BibItem, and displaying a nice
GUI.
*/
@interface BDSKEditor : NSWindowController <NSWindowDelegate,
NSTableViewDelegate, NSTableViewDataSource, NSSplitViewDelegate,
NSControlTextEditingDelegate, BDSKStatusBarDelegate,
BDSKComplexStringFormatterDelegate, BDSKCitationFormatterDelegate,
FVFileViewDelegate, FVFileViewDataSource, QLPreviewPanelDelegate,
QLPreviewPanelDataSource, NSTouchBarDelegate> {
- IBOutlet NSSplitView *mainSplitView;
- IBOutlet NSSplitView *fileSplitView;
- IBOutlet NSPopUpButton *bibTypeButton;
- IBOutlet BDSKEditorTableView *tableView;
- IBOutlet NSMatrix *matrix;
- IBOutlet NSTabView *tabView;
- IBOutlet BDSKEditorTextView *notesView;
- IBOutlet BDSKEditorTextView *abstractView;
- IBOutlet BDSKEditorTextView *rssDescriptionView;
+ NSSplitView *mainSplitView;
+ NSSplitView *fileSplitView;
+ NSPopUpButton *bibTypeButton;
+ BDSKEditorTableView *tableView;
+ NSMatrix *matrix;
+ NSTabView *tabView;
+ BDSKEditorTextView *notesView;
+ BDSKEditorTextView *abstractView;
+ BDSKEditorTextView *rssDescriptionView;
// one of the three previous textviews:
NSTextView *currentEditedView;
@@ -85,11 +85,11 @@
NSButtonCell *triStateButtonCell;
BDSKRatingButtonCell *ratingButtonCell;
- IBOutlet NSTextField *citeKeyField;
- IBOutlet NSTextField *citeKeyTitle;
- IBOutlet NSPopUpButton *actionButton;
- IBOutlet NSButton *addFieldButton;
- IBOutlet NSMenu *contextMenu;
+ NSTextField *citeKeyField;
+ NSTextField *citeKeyTitle;
+ NSPopUpButton *actionButton;
+ NSButton *addFieldButton;
+ NSMenu *contextMenu;
//
----------------------------------------------------------------------------------------
BibItem *publication;
@@ -101,10 +101,10 @@
//
----------------------------------------------------------------------------------------
// status bar stuff
//
----------------------------------------------------------------------------------------
- IBOutlet BDSKStatusBar *statusBar;
+ BDSKStatusBar *statusBar;
// cite-key checking stuff:
- IBOutlet NSButton *citeKeyWarningButton;
+ NSButton *citeKeyWarningButton;
// form cell formatter
BDSKComplexStringFormatter *tableCellFormatter;
@@ -112,7 +112,7 @@
BDSKCitationFormatter *citationFormatter;
// Author tableView
- IBOutlet NSTableView *authorTableView;
+ NSTableView *authorTableView;
// Macro editing stuff
BDSKComplexStringEditor *complexStringEditor;
@@ -119,7 +119,7 @@
NSTextView *dragFieldEditor;
- IBOutlet FVFileView *fileView;
+ FVFileView *fileView;
NSButton *disableAutoFileButton;
@@ -142,6 +142,25 @@
*/
- (id)initWithPublication:(BibItem *)aBib;
+@property (nonatomic, assign) IBOutlet NSSplitView *mainSplitView;
+@property (nonatomic, assign) IBOutlet NSSplitView *fileSplitView;
+@property (nonatomic, assign) IBOutlet NSPopUpButton *bibTypeButton;
+@property (nonatomic, assign) IBOutlet BDSKEditorTableView *tableView;
+@property (nonatomic, assign) IBOutlet NSMatrix *matrix;
+@property (nonatomic, assign) IBOutlet NSTabView *tabView;
+@property (nonatomic, assign) IBOutlet BDSKEditorTextView *notesView;
+@property (nonatomic, assign) IBOutlet BDSKEditorTextView *abstractView;
+@property (nonatomic, assign) IBOutlet BDSKEditorTextView *rssDescriptionView;
+@property (nonatomic, assign) IBOutlet NSTextField *citeKeyField;
+@property (nonatomic, assign) IBOutlet NSTextField *citeKeyTitle;
+@property (nonatomic, assign) IBOutlet NSPopUpButton *actionButton;
+@property (nonatomic, assign) IBOutlet NSButton *addFieldButton;
+@property (nonatomic, assign) IBOutlet NSMenu *contextMenu;
+@property (nonatomic, assign) IBOutlet BDSKStatusBar *statusBar;
+@property (nonatomic, assign) IBOutlet NSButton *citeKeyWarningButton;
+@property (nonatomic, assign) IBOutlet NSTableView *authorTableView;
+@property (nonatomic, assign) IBOutlet FVFileView *fileView;
+
@property (nonatomic, readonly) BibItem *publication;
- (IBAction)chooseLocalFile:(id)sender;
Modified: trunk/bibdesk/BDSKEditor.m
===================================================================
--- trunk/bibdesk/BDSKEditor.m 2019-07-16 06:30:50 UTC (rev 24035)
+++ trunk/bibdesk/BDSKEditor.m 2019-07-16 22:53:45 UTC (rev 24036)
@@ -127,7 +127,7 @@
@implementation BDSKEditor
-@synthesize publication;
+@synthesize mainSplitView, fileSplitView, bibTypeButton, tableView, matrix,
tabView, notesView, abstractView, rssDescriptionView, citeKeyField,
citeKeyTitle, actionButton, addFieldButton, contextMenu, statusBar,
citeKeyWarningButton, authorTableView, fileView, publication;
@dynamic status, recentDownloadsMenu, keyField, undoManager, numberOfPersons,
persons;
+ (void)initialize
Modified: trunk/bibdesk/BDSKErrorEditor.h
===================================================================
--- trunk/bibdesk/BDSKErrorEditor.h 2019-07-16 06:30:50 UTC (rev 24035)
+++ trunk/bibdesk/BDSKErrorEditor.h 2019-07-16 22:53:45 UTC (rev 24036)
@@ -42,11 +42,11 @@
@class BDSKErrorManager, BibDocument;
@interface BDSKErrorEditor : NSWindowController <NSTextStorageDelegate,
NSTouchBarDelegate> {
- IBOutlet NSTextView *textView;
- IBOutlet NSButton *syntaxHighlightCheckbox;
- IBOutlet NSButton *reopenButton;
- IBOutlet NSButton *reloadButton;
- IBOutlet NSTextField *lineNumberField;
+ NSTextView *textView;
+ NSButton *syntaxHighlightCheckbox;
+ NSButton *reopenButton;
+ NSButton *reloadButton;
+ NSTextField *lineNumberField;
BDSKErrorManager *manager;
NSArray *errors;
NSURL *fileURL;
@@ -65,6 +65,13 @@
// for editing Paste/Drag data
- (id)initWithPasteDragData:(NSData *)aData;
+@property (nonatomic, assign) IBOutlet NSTextView *textView;
+@property (nonatomic, assign) IBOutlet NSButton *syntaxHighlightCheckbox;
+@property (nonatomic, assign) IBOutlet NSButton *reopenButton;
+@property (nonatomic, assign) IBOutlet NSButton *reloadButton;
+@property (nonatomic, assign) IBOutlet NSTextField *lineNumberField;
+
+
@property (nonatomic, retain) BDSKErrorManager *manager;
@property (nonatomic, copy) NSArray *errors;
Modified: trunk/bibdesk/BDSKErrorEditor.m
===================================================================
--- trunk/bibdesk/BDSKErrorEditor.m 2019-07-16 06:30:50 UTC (rev 24035)
+++ trunk/bibdesk/BDSKErrorEditor.m 2019-07-16 22:53:45 UTC (rev 24036)
@@ -67,7 +67,7 @@
@implementation BDSKErrorEditor
-@synthesize manager, errors, fileURL, displayName, pasteDragData, isPasteDrag;
+@synthesize textView, syntaxHighlightCheckbox, reopenButton, reloadButton,
lineNumberField, manager, errors, fileURL, displayName, pasteDragData,
isPasteDrag;
static NSColor *quoteColor = nil;
static NSColor *delimColor = nil;
Modified: trunk/bibdesk/BDSKErrorObjectController.h
===================================================================
--- trunk/bibdesk/BDSKErrorObjectController.h 2019-07-16 06:30:50 UTC (rev
24035)
+++ trunk/bibdesk/BDSKErrorObjectController.h 2019-07-16 22:53:45 UTC (rev
24036)
@@ -51,13 +51,17 @@
BOOL hideWarnings;
// error-handling stuff:
- IBOutlet BDSKTableView *errorTableView;
- IBOutlet NSArrayController *errorsController;
+ BDSKTableView *errorTableView;
+ NSArrayController *errorsController;
BOOL handledNonIgnorableError;
}
+ (BDSKErrorObjectController *)sharedErrorObjectController;
+@property (nonatomic, assign) IBOutlet BDSKTableView *errorTableView;
+@property (nonatomic, assign) IBOutlet NSArrayController *errorsController;
+
+
- (NSArray *)errors;
- (NSUInteger)countOfErrors;
- (id)objectInErrorsAtIndex:(NSUInteger)index;
Modified: trunk/bibdesk/BDSKErrorObjectController.m
===================================================================
--- trunk/bibdesk/BDSKErrorObjectController.m 2019-07-16 06:30:50 UTC (rev
24035)
+++ trunk/bibdesk/BDSKErrorObjectController.m 2019-07-16 22:53:45 UTC (rev
24036)
@@ -62,7 +62,7 @@
@implementation BDSKErrorObjectController
-@synthesize filterManager, hideWarnings;
+@synthesize errorTableView, errorsController, filterManager, hideWarnings;
static BDSKErrorObjectController *sharedErrorObjectController = nil;
Modified: trunk/bibdesk/BDSKFieldSheetController.h
===================================================================
--- trunk/bibdesk/BDSKFieldSheetController.h 2019-07-16 06:30:50 UTC (rev
24035)
+++ trunk/bibdesk/BDSKFieldSheetController.h 2019-07-16 22:53:45 UTC (rev
24036)
@@ -41,13 +41,13 @@
@interface BDSKFieldSheetController : NSWindowController <NSTouchBarDelegate>
{
- IBOutlet NSObjectController *objectController;
- IBOutlet NSPopUpButton *selectedFieldPopUpButton;
- IBOutlet NSComboBox *chosenFieldComboBox;
- IBOutlet NSTextField *selectedFieldLabelField;
- IBOutlet NSTextField *chosenFieldLabelField;
- IBOutlet NSButton *defaultButton;
- IBOutlet NSButton *cancelButton;
+ NSObjectController *objectController;
+ NSPopUpButton *selectedFieldPopUpButton;
+ NSComboBox *chosenFieldComboBox;
+ NSTextField *selectedFieldLabelField;
+ NSTextField *chosenFieldLabelField;
+ NSButton *defaultButton;
+ NSButton *cancelButton;
NSString *selectedField;
NSString *selectedFieldLabel;
NSArray *selectableFields;
@@ -62,6 +62,14 @@
+ (id)fieldSheetControllerWithSelectableFields:(NSArray *)selectableFields
label:(NSString *)selectedFieldLabel;
+ (id)fieldSheetControllerWithChoosableFields:(NSArray *)choosableFields
label:(NSString *)chosenFieldLabel;
+@property (nonatomic, assign) IBOutlet NSObjectController *objectController;
+@property (nonatomic, assign) IBOutlet NSPopUpButton *selectedFieldPopUpButton;
+@property (nonatomic, assign) IBOutlet NSComboBox *chosenFieldComboBox;
+@property (nonatomic, assign) IBOutlet NSTextField *selectedFieldLabelField;
+@property (nonatomic, assign) IBOutlet NSTextField *chosenFieldLabelField;
+@property (nonatomic, assign) IBOutlet NSButton *defaultButton;
+@property (nonatomic, assign) IBOutlet NSButton *cancelButton;
+
@property (nonatomic, retain) NSString *selectedField;
@property (nonatomic, retain) NSString *selectedFieldLabel;
@property (nonatomic, copy) NSArray *selectableFields;
Modified: trunk/bibdesk/BDSKFieldSheetController.m
===================================================================
--- trunk/bibdesk/BDSKFieldSheetController.m 2019-07-16 06:30:50 UTC (rev
24035)
+++ trunk/bibdesk/BDSKFieldSheetController.m 2019-07-16 22:53:45 UTC (rev
24036)
@@ -45,7 +45,7 @@
@implementation BDSKFieldSheetController
-@synthesize selectedField, selectedFieldLabel, selectableFields, chosenField,
chosenFieldLabel, choosableFields, defaultButtonTitle, cancelButtonTitle;
+@synthesize objectController, selectedFieldPopUpButton, chosenFieldComboBox,
selectedFieldLabelField, chosenFieldLabelField, defaultButton, cancelButton,
selectedField, selectedFieldLabel, selectableFields, chosenField,
chosenFieldLabel, choosableFields, defaultButtonTitle, cancelButtonTitle;
+ (id)fieldSheetControllerWithSelectableFields:(NSArray *)selectableFields
label:(NSString *)selectedFieldLabel choosableFields:(NSArray *)choosableFields
label:(NSString *)chosenFieldLabel {
BDSKFieldSheetController *controller = [[[self alloc] init] autorelease];
Modified: trunk/bibdesk/BDSKFileContentSearchController.h
===================================================================
--- trunk/bibdesk/BDSKFileContentSearchController.h 2019-07-16 06:30:50 UTC
(rev 24035)
+++ trunk/bibdesk/BDSKFileContentSearchController.h 2019-07-16 22:53:45 UTC
(rev 24036)
@@ -68,13 +68,13 @@
id <BDSKFileContentSearchControllerDelegate> delegate;
- IBOutlet BDSKSelectionPreservingArrayController *resultsArrayController;
- IBOutlet BDSKTableView *tableView;
+ BDSKSelectionPreservingArrayController *resultsArrayController;
+ BDSKTableView *tableView;
- IBOutlet BDSKEdgeView *controlView;
- IBOutlet BDSKCollapsibleView *collapsibleView;
- IBOutlet NSProgressIndicator *indexProgressBar;
- IBOutlet NSTextField *statusField;
+ BDSKEdgeView *controlView;
+ BDSKCollapsibleView *collapsibleView;
+ NSProgressIndicator *indexProgressBar;
+ NSTextField *statusField;
BOOL canceledSearch;
BOOL searchFieldDidEndEditing;
@@ -85,10 +85,16 @@
// Use this method to instantiate a search controller for use within a
document window
- (id)initForOwner:(id<BDSKOwner>)owner;
+@property (nonatomic, assign) IBOutlet BDSKSelectionPreservingArrayController
*resultsArrayController;
+@property (nonatomic, assign) IBOutlet BDSKTableView *tableView;
+@property (nonatomic, assign) IBOutlet BDSKEdgeView *controlView;
+@property (nonatomic, assign) IBOutlet BDSKCollapsibleView *collapsibleView;
+@property (nonatomic, assign) IBOutlet NSProgressIndicator *indexProgressBar;
+@property (nonatomic, assign) IBOutlet NSTextField *statusField;
+
+
@property (nonatomic, assign) id<BDSKFileContentSearchControllerDelegate>
delegate;
-@property (nonatomic, readonly) NSView *controlView;
-@property (nonatomic, readonly) NSTableView *tableView;
// Use this to connect a search field and initiate a search
@property (nonatomic, retain) NSSearchField *searchField;
@property (nonatomic, copy) NSArray *savedRecentSearches;
Modified: trunk/bibdesk/BDSKFileContentSearchController.m
===================================================================
--- trunk/bibdesk/BDSKFileContentSearchController.m 2019-07-16 06:30:50 UTC
(rev 24035)
+++ trunk/bibdesk/BDSKFileContentSearchController.m 2019-07-16 22:53:45 UTC
(rev 24036)
@@ -61,8 +61,8 @@
@implementation BDSKFileContentSearchController
-@synthesize delegate, searchField, savedRecentSearches, results,
filteredResults;
-@dynamic controlView, tableView, shouldShowControlView,
selectedIdentifierURLs, selectedURLs, selectedResults,
clickedOrSelectedIdentifierURLs, clickedOrSelectedURLs,
clickedOrSelectedResults, sortDescriptorData;
+@synthesize resultsArrayController, tableView, controlView, collapsibleView,
indexProgressBar, statusField, delegate, searchField, savedRecentSearches,
results, filteredResults;
+@dynamic shouldShowControlView, selectedIdentifierURLs, selectedURLs,
selectedResults, clickedOrSelectedIdentifierURLs, clickedOrSelectedURLs,
clickedOrSelectedResults, sortDescriptorData;
- (id)initForOwner:(id<BDSKOwner>)owner
{
Modified: trunk/bibdesk/BDSKFileMatchConfigController.h
===================================================================
--- trunk/bibdesk/BDSKFileMatchConfigController.h 2019-07-16 06:30:50 UTC
(rev 24035)
+++ trunk/bibdesk/BDSKFileMatchConfigController.h 2019-07-16 22:53:45 UTC
(rev 24036)
@@ -36,20 +36,28 @@
@interface BDSKFileMatchConfigController : NSWindowController
<NSTableViewDelegate, NSTableViewDataSource, NSTouchBarDelegate>
{
- IBOutlet NSTableView *documentTableView;
- IBOutlet NSTableView *fileTableView;
- IBOutlet NSButton *useOrphansCheckbox;
- IBOutlet NSSegmentedControl *addRemoveButton;
- IBOutlet NSButton *doneButton;
+ NSTableView *documentTableView;
+ NSTableView *fileTableView;
+ NSButton *useOrphansCheckbox;
+ NSSegmentedControl *addRemoveButton;
+ NSButton *doneButton;
NSArray *documents;
NSMutableArray *files;
BOOL useOrphanedFiles;
- IBOutlet NSArrayController *documentArrayController;
- IBOutlet NSArrayController *fileArrayController;
+ NSArrayController *documentArrayController;
+ NSArrayController *fileArrayController;
}
+@property (nonatomic, assign) IBOutlet NSTableView *documentTableView;
+@property (nonatomic, assign) IBOutlet NSTableView *fileTableView;
+@property (nonatomic, assign) IBOutlet NSButton *useOrphansCheckbox;
+@property (nonatomic, assign) IBOutlet NSSegmentedControl *addRemoveButton;
+@property (nonatomic, assign) IBOutlet NSButton *doneButton;
+@property (nonatomic, assign) IBOutlet NSArrayController
*documentArrayController;
+@property (nonatomic, assign) IBOutlet NSArrayController *fileArrayController;
+
- (IBAction)addRemove:(id)sender;
- (IBAction)selectAllDocuments:(id)sender;
Modified: trunk/bibdesk/BDSKFileMatchConfigController.m
===================================================================
--- trunk/bibdesk/BDSKFileMatchConfigController.m 2019-07-16 06:30:50 UTC
(rev 24035)
+++ trunk/bibdesk/BDSKFileMatchConfigController.m 2019-07-16 22:53:45 UTC
(rev 24036)
@@ -48,7 +48,7 @@
@implementation BDSKFileMatchConfigController
-@synthesize documents, useOrphanedFiles;
+@synthesize documentTableView, fileTableView, useOrphansCheckbox,
addRemoveButton, doneButton, documentArrayController, fileArrayController,
documents, useOrphanedFiles;
@dynamic publications;
- (id)init
Modified: trunk/bibdesk/BDSKFileMatcher.h
===================================================================
--- trunk/bibdesk/BDSKFileMatcher.h 2019-07-16 06:30:50 UTC (rev 24035)
+++ trunk/bibdesk/BDSKFileMatcher.h 2019-07-16 22:53:45 UTC (rev 24036)
@@ -44,11 +44,11 @@
@interface BDSKFileMatcher : NSWindowController <NSOutlineViewDelegate,
NSOutlineViewDataSource, QLPreviewPanelDataSource, QLPreviewPanelDelegate>
{
- IBOutlet BDSKGroupingOutlineView *outlineView;
- IBOutlet NSProgressIndicator *progressIndicator;
- IBOutlet NSTextField *statusField;
- IBOutlet NSButton *abortButton;
- IBOutlet NSButton *configureButton;
+ BDSKGroupingOutlineView *outlineView;
+ NSProgressIndicator *progressIndicator;
+ NSTextField *statusField;
+ NSButton *abortButton;
+ NSButton *configureButton;
NSMutableArray *matches;
SKIndexRef searchIndex;
@@ -61,7 +61,15 @@
}
+ (id)sharedInstance;
+
+@property (nonatomic, assign) IBOutlet BDSKGroupingOutlineView *outlineView;
+@property (nonatomic, assign) IBOutlet NSProgressIndicator *progressIndicator;
+@property (nonatomic, assign) IBOutlet NSTextField *statusField;
+@property (nonatomic, assign) IBOutlet NSButton *abortButton;
+@property (nonatomic, assign) IBOutlet NSButton *configureButton;
+
- (void)matchFiles:(NSArray *)absoluteURLs withPublications:(NSArray *)pubs;
+
- (IBAction)openAction:(id)sender;
- (IBAction)abort:(id)sender;
- (IBAction)configure:(id)sender;
Modified: trunk/bibdesk/BDSKFileMatcher.m
===================================================================
--- trunk/bibdesk/BDSKFileMatcher.m 2019-07-16 06:30:50 UTC (rev 24035)
+++ trunk/bibdesk/BDSKFileMatcher.m 2019-07-16 22:53:45 UTC (rev 24036)
@@ -87,6 +87,8 @@
@implementation BDSKFileMatcher
+@synthesize outlineView, progressIndicator, statusField, abortButton,
configureButton;
+
static id sharedInstance = nil;
+ (id)sharedInstance;
Modified: trunk/bibdesk/BDSKFileMigrationController.h
===================================================================
--- trunk/bibdesk/BDSKFileMigrationController.h 2019-07-16 06:30:50 UTC (rev
24035)
+++ trunk/bibdesk/BDSKFileMigrationController.h 2019-07-16 22:53:45 UTC (rev
24036)
@@ -40,10 +40,10 @@
#import "NSTouchBar_BDSKForwardDeclarations.h"
@interface BDSKFileMigrationController : NSWindowController
<NSTableViewDelegate, NSTableViewDataSource, NSTouchBarDelegate> {
- IBOutlet NSTableView *tableView;
- IBOutlet NSButton *migrateButton;
- IBOutlet NSProgressIndicator *progressBar;
- IBOutlet NSTextField *statusField;
+ NSTableView *tableView;
+ NSButton *migrateButton;
+ NSProgressIndicator *progressBar;
+ NSTextField *statusField;
BOOL keepLocalFileFields;
BOOL keepRemoteURLFields;
BOOL useSelection;
@@ -50,6 +50,11 @@
NSMutableArray *results;
}
+@property (nonatomic, assign) IBOutlet NSTableView *tableView;
+@property (nonatomic, assign) IBOutlet NSButton *migrateButton;
+@property (nonatomic, assign) IBOutlet NSProgressIndicator *progressBar;
+@property (nonatomic, assign) IBOutlet NSTextField *statusField;
+
- (IBAction)migrate:(id)sender;
- (IBAction)openParentDirectory:(id)sender;
- (IBAction)editPublication:(id)sender;
Modified: trunk/bibdesk/BDSKFileMigrationController.m
===================================================================
--- trunk/bibdesk/BDSKFileMigrationController.m 2019-07-16 06:30:50 UTC (rev
24035)
+++ trunk/bibdesk/BDSKFileMigrationController.m 2019-07-16 22:53:45 UTC (rev
24036)
@@ -66,6 +66,8 @@
@implementation BDSKFileMigrationController
+@synthesize tableView, migrateButton, progressBar, statusField;
+
+ (void)initialize
{
BDSKINITIALIZE;
Modified: trunk/bibdesk/BDSKFiler.h
===================================================================
--- trunk/bibdesk/BDSKFiler.h 2019-07-16 06:30:50 UTC (rev 24035)
+++ trunk/bibdesk/BDSKFiler.h 2019-07-16 22:53:45 UTC (rev 24036)
@@ -67,11 +67,13 @@
};
@interface BDSKFiler : NSWindowController {
- IBOutlet NSProgressIndicator *progressIndicator;
+ NSProgressIndicator *progressIndicator;
}
+ (BDSKFiler *)sharedFiler;
+@property (nonatomic, assign) IBOutlet NSProgressIndicator *progressIndicator;
+
- (BOOL)checkPapersFolder;
/*!
Modified: trunk/bibdesk/BDSKFiler.m
===================================================================
--- trunk/bibdesk/BDSKFiler.m 2019-07-16 06:30:50 UTC (rev 24035)
+++ trunk/bibdesk/BDSKFiler.m 2019-07-16 22:53:45 UTC (rev 24036)
@@ -59,6 +59,8 @@
@implementation BDSKFiler
+@synthesize progressIndicator;
+
static BDSKFiler *sharedFiler = nil;
+ (BDSKFiler *)sharedFiler{
Modified: trunk/bibdesk/BDSKFilerErrorController.h
===================================================================
--- trunk/bibdesk/BDSKFilerErrorController.h 2019-07-16 06:30:50 UTC (rev
24035)
+++ trunk/bibdesk/BDSKFilerErrorController.h 2019-07-16 22:53:45 UTC (rev
24036)
@@ -41,14 +41,14 @@
@interface BDSKFilerErrorController : NSWindowController <NSTableViewDelegate,
NSTableViewDataSource, NSTouchBarDelegate> {
- IBOutlet NSTableView *tv;
- IBOutlet NSTextField *infoTextField;
- IBOutlet NSImageView *iconView;
- IBOutlet NSButton *forceCheckButton;
- IBOutlet NSMenu *contextMenu;
- IBOutlet NSButton *doneButton;
- IBOutlet NSButton *tryAgainButton;
- IBOutlet NSButton *dumpButton;
+ NSTableView *tv;
+ NSTextField *infoTextField;
+ NSImageView *iconView;
+ NSButton *forceCheckButton;
+ NSMenu *contextMenu;
+ NSButton *doneButton;
+ NSButton *tryAgainButton;
+ NSButton *dumpButton;
NSString *fieldName;
NSInteger options;
@@ -58,6 +58,15 @@
- (id)initWithErrors:(NSArray *)infoDicts forField:(NSString *)field
options:(NSInteger)masks;
+@property (nonatomic, assign) IBOutlet NSTableView *tv;
+@property (nonatomic, assign) IBOutlet NSTextField *infoTextField;
+@property (nonatomic, assign) IBOutlet NSImageView *iconView;
+@property (nonatomic, assign) IBOutlet NSButton *forceCheckButton;
+@property (nonatomic, assign) IBOutlet NSMenu *contextMenu;
+@property (nonatomic, assign) IBOutlet NSButton *doneButton;
+@property (nonatomic, assign) IBOutlet NSButton *tryAgainButton;
+@property (nonatomic, assign) IBOutlet NSButton *dumpButton;
+
- (IBAction)done:(id)sender;
- (IBAction)tryAgain:(id)sender;
- (IBAction)dump:(id)sender;
Modified: trunk/bibdesk/BDSKFilerErrorController.m
===================================================================
--- trunk/bibdesk/BDSKFilerErrorController.m 2019-07-16 06:30:50 UTC (rev
24035)
+++ trunk/bibdesk/BDSKFilerErrorController.m 2019-07-16 22:53:45 UTC (rev
24036)
@@ -55,6 +55,8 @@
@implementation BDSKFilerErrorController
+@synthesize tv, infoTextField, iconView, forceCheckButton, contextMenu,
doneButton, tryAgainButton, dumpButton;
+
+ (void)initialize {
BDSKINITIALIZE;
// register transformer class
Modified: trunk/bibdesk/BDSKFilterController.h
===================================================================
--- trunk/bibdesk/BDSKFilterController.h 2019-07-16 06:30:50 UTC (rev
24035)
+++ trunk/bibdesk/BDSKFilterController.h 2019-07-16 22:53:45 UTC (rev
24036)
@@ -44,12 +44,12 @@
@class BDSKConditionsView;
@interface BDSKFilterController : NSWindowController <NSTouchBarDelegate> {
- IBOutlet NSPopUpButton *conjunctionPopUp;
- IBOutlet BDSKConditionsView *conditionsView;
- IBOutlet NSTextField *messageStartTextField;
- IBOutlet NSTextField *messageEndTextField;
- IBOutlet NSButton *okButton;
- IBOutlet NSButton *cancelButton;
+ NSPopUpButton *conjunctionPopUp;
+ BDSKConditionsView *conditionsView;
+ NSTextField *messageStartTextField;
+ NSTextField *messageEndTextField;
+ NSButton *okButton;
+ NSButton *cancelButton;
NSMutableArray *conditionControllers;
BDSKConjunction conjunction;
NSUndoManager *undoManager;
@@ -57,6 +57,13 @@
- (id)initWithFilter:(BDSKFilter *)aFilter;
+@property (nonatomic, assign) IBOutlet NSPopUpButton *conjunctionPopUp;
+@property (nonatomic, assign) IBOutlet BDSKConditionsView *conditionsView;
+@property (nonatomic, assign) IBOutlet NSTextField *messageStartTextField;
+@property (nonatomic, assign) IBOutlet NSTextField *messageEndTextField;
+@property (nonatomic, assign) IBOutlet NSButton *okButton;
+@property (nonatomic, assign) IBOutlet NSButton *cancelButton;
+
- (void)updateUI;
- (void)insertNewConditionAfter:(BDSKConditionController
*)aConditionController;
Modified: trunk/bibdesk/BDSKFilterController.m
===================================================================
--- trunk/bibdesk/BDSKFilterController.m 2019-07-16 06:30:50 UTC (rev
24035)
+++ trunk/bibdesk/BDSKFilterController.m 2019-07-16 22:53:45 UTC (rev
24036)
@@ -47,7 +47,7 @@
@implementation BDSKFilterController
-@synthesize conjunction;
+@synthesize conjunctionPopUp, conditionsView, messageStartTextField,
messageEndTextField, okButton, cancelButton, conjunction;
@dynamic canRemoveCondition, conditionControllers, conditions;
- (id)init
Modified: trunk/bibdesk/BDSKFindController.h
===================================================================
--- trunk/bibdesk/BDSKFindController.h 2019-07-16 06:30:50 UTC (rev 24035)
+++ trunk/bibdesk/BDSKFindController.h 2019-07-16 22:53:45 UTC (rev 24036)
@@ -64,26 +64,26 @@
@interface BDSKFindController : NSWindowController <NSTouchBarDelegate> {
// outlets
- IBOutlet NSComboBox *fieldToSearchComboBox;
- IBOutlet NSPopUpButton *searchTypePopUpButton;
- IBOutlet NSPopUpButton *searchScopePopUpButton;
- IBOutlet NSButton *ignoreCaseCheckbox;
- IBOutlet NSMatrix *searchSelectionMatrix;
- IBOutlet NSComboBox *findComboBox;
- IBOutlet NSComboBox *replaceComboBox;
- IBOutlet NSButton *findAsMacroCheckbox;
- IBOutlet NSButton *replaceAsMacroCheckbox;
- IBOutlet NSButton *nextButton;
- IBOutlet NSButton *previousButton;
- IBOutlet NSButton *replaceAndFindButton;
- IBOutlet NSButton *replaceButton;
- IBOutlet NSButton *replaceAllButton;
- IBOutlet NSView *controlsView;
- IBOutlet NSButton *shouldSetWhenEmptyCheckbox;
- IBOutlet NSBox *findOptionsBox;
- IBOutlet NSBox *setOptionsBox;
- IBOutlet BDSKStatusBar *statusBar;
- IBOutlet NSObjectController *objectController;
+ NSComboBox *fieldToSearchComboBox;
+ NSPopUpButton *searchTypePopUpButton;
+ NSPopUpButton *searchScopePopUpButton;
+ NSButton *ignoreCaseCheckbox;
+ NSMatrix *searchSelectionMatrix;
+ NSComboBox *findComboBox;
+ NSComboBox *replaceComboBox;
+ NSButton *findAsMacroCheckbox;
+ NSButton *replaceAsMacroCheckbox;
+ NSButton *nextButton;
+ NSButton *previousButton;
+ NSButton *replaceAndFindButton;
+ NSButton *replaceButton;
+ NSButton *replaceAllButton;
+ NSView *controlsView;
+ NSButton *shouldSetWhenEmptyCheckbox;
+ NSBox *findOptionsBox;
+ NSBox *setOptionsBox;
+ BDSKStatusBar *statusBar;
+ NSObjectController *objectController;
NSTextView *findFieldEditor;
NSMutableArray *findHistory;
@@ -112,6 +112,27 @@
*/
+ (BDSKFindController *)sharedFindController;
+@property (nonatomic, assign) IBOutlet NSComboBox *fieldToSearchComboBox;
+@property (nonatomic, assign) IBOutlet NSPopUpButton *searchTypePopUpButton;
+@property (nonatomic, assign) IBOutlet NSPopUpButton *searchScopePopUpButton;
+@property (nonatomic, assign) IBOutlet NSButton *ignoreCaseCheckbox;
+@property (nonatomic, assign) IBOutlet NSMatrix *searchSelectionMatrix;
+@property (nonatomic, assign) IBOutlet NSComboBox *findComboBox;
+@property (nonatomic, assign) IBOutlet NSComboBox *replaceComboBox;
+@property (nonatomic, assign) IBOutlet NSButton *findAsMacroCheckbox;
+@property (nonatomic, assign) IBOutlet NSButton *replaceAsMacroCheckbox;
+@property (nonatomic, assign) IBOutlet NSButton *nextButton;
+@property (nonatomic, assign) IBOutlet NSButton *previousButton;
+@property (nonatomic, assign) IBOutlet NSButton *replaceAndFindButton;
+@property (nonatomic, assign) IBOutlet NSButton *replaceButton;
+@property (nonatomic, assign) IBOutlet NSButton *replaceAllButton;
+@property (nonatomic, assign) IBOutlet NSView *controlsView;
+@property (nonatomic, assign) IBOutlet NSButton *shouldSetWhenEmptyCheckbox;
+@property (nonatomic, assign) IBOutlet NSBox *findOptionsBox;
+@property (nonatomic, assign) IBOutlet NSBox *setOptionsBox;
+@property (nonatomic, assign) IBOutlet BDSKStatusBar *statusBar;
+@property (nonatomic, assign) IBOutlet NSObjectController *objectController;
+
/*!
@method updateUI
@abstract Call this after changing a UI element (button, field, etc); it
performs some validation.
Modified: trunk/bibdesk/BDSKFindController.m
===================================================================
--- trunk/bibdesk/BDSKFindController.m 2019-07-16 06:30:50 UTC (rev 24035)
+++ trunk/bibdesk/BDSKFindController.m 2019-07-16 22:53:45 UTC (rev 24036)
@@ -69,7 +69,7 @@
@implementation BDSKFindController
-@synthesize operation, findString, searchType, searchScope, ignoreCase,
wrapAround, searchSelection, findAsMacro, replaceAsMacro, shouldSetWhenEmpty,
replaceAllTooltip, replaceLabel;
+@synthesize fieldToSearchComboBox, searchTypePopUpButton,
searchScopePopUpButton, ignoreCaseCheckbox, searchSelectionMatrix,
findComboBox, replaceComboBox, findAsMacroCheckbox, replaceAsMacroCheckbox,
nextButton, previousButton, replaceAndFindButton, replaceButton,
replaceAllButton, controlsView, shouldSetWhenEmptyCheckbox, findOptionsBox,
setOptionsBox, statusBar, objectController, operation, findString, searchType,
searchScope, ignoreCase, wrapAround, searchSelection, findAsMacro,
replaceAsMacro, shouldSetWhenEmpty, replaceAllTooltip, replaceLabel;
@dynamic field, replaceString;
+ (BDSKFindController *)sharedFindController{
Modified: trunk/bibdesk/BDSKMacroWindowController.h
===================================================================
--- trunk/bibdesk/BDSKMacroWindowController.h 2019-07-16 06:30:50 UTC (rev
24035)
+++ trunk/bibdesk/BDSKMacroWindowController.h 2019-07-16 22:53:45 UTC (rev
24036)
@@ -43,10 +43,10 @@
@class BDSKMacroResolver, BDSKComplexStringEditor, BDSKMacroTableView;
@interface BDSKMacroWindowController : NSWindowController
<NSTableViewDelegate, NSTableViewDataSource,
BDSKComplexStringFormatterDelegate, NSTouchBarDelegate> {
- IBOutlet NSArrayController *arrayController;
- IBOutlet BDSKMacroTableView *tableView;
- IBOutlet NSButton *closeButton;
- IBOutlet NSSegmentedControl *addRemoveButton;
+ NSArrayController *arrayController;
+ BDSKMacroTableView *tableView;
+ NSButton *closeButton;
+ NSSegmentedControl *addRemoveButton;
BDSKMacroResolver *macroResolver;
NSMutableArray *macros;
BDSKComplexStringFormatter *tableCellFormatter;
@@ -57,6 +57,11 @@
- (id)initWithMacroResolver:(BDSKMacroResolver *)aMacroResolver;
+@property (nonatomic, assign) IBOutlet NSArrayController *arrayController;
+@property (nonatomic, assign) IBOutlet BDSKMacroTableView *tableView;
+@property (nonatomic, assign) IBOutlet NSButton *closeButton;
+@property (nonatomic, assign) IBOutlet NSSegmentedControl *addRemoveButton;
+
@property (nonatomic, readonly) BDSKMacroResolver *macroResolver;
- (NSArray *)macros;
Modified: trunk/bibdesk/BDSKMacroWindowController.m
===================================================================
--- trunk/bibdesk/BDSKMacroWindowController.m 2019-07-16 06:30:50 UTC (rev
24035)
+++ trunk/bibdesk/BDSKMacroWindowController.m 2019-07-16 22:53:45 UTC (rev
24036)
@@ -65,7 +65,7 @@
@implementation BDSKMacroWindowController
-@synthesize macroResolver;
+@synthesize arrayController, tableView, closeButton, addRemoveButton,
macroResolver;
- (id)init {
self = [self initWithMacroResolver:nil];
Modified: trunk/bibdesk/BDSKNotesWindowController.h
===================================================================
--- trunk/bibdesk/BDSKNotesWindowController.h 2019-07-16 06:30:50 UTC (rev
24035)
+++ trunk/bibdesk/BDSKNotesWindowController.h 2019-07-16 22:53:45 UTC (rev
24036)
@@ -47,16 +47,23 @@
NSArray *tags;
double rating;
CGFloat lastTagsHeight;
- IBOutlet NSOutlineView *outlineView;
- IBOutlet NSTokenField *tokenField;
- IBOutlet NSSplitView *splitView;
- IBOutlet NSObjectController *ownerController;
- IBOutlet NSButton *refreshButton;
- IBOutlet NSButton *openInSkimButton;
+ NSOutlineView *outlineView;
+ NSTokenField *tokenField;
+ NSSplitView *splitView;
+ NSObjectController *ownerController;
+ NSButton *refreshButton;
+ NSButton *openInSkimButton;
}
- (id)initWithURL:(NSURL *)aURL;
+@property (nonatomic, assign) IBOutlet NSOutlineView *outlineView;
+@property (nonatomic, assign) IBOutlet NSTokenField *tokenField;
+@property (nonatomic, assign) IBOutlet NSSplitView *splitView;
+@property (nonatomic, assign) IBOutlet NSObjectController *ownerController;
+@property (nonatomic, assign) IBOutlet NSButton *refreshButton;
+@property (nonatomic, assign) IBOutlet NSButton *openInSkimButton;
+
@property (nonatomic, copy) NSArray *tags;
@property (nonatomic) double rating;
Modified: trunk/bibdesk/BDSKNotesWindowController.m
===================================================================
--- trunk/bibdesk/BDSKNotesWindowController.m 2019-07-16 06:30:50 UTC (rev
24035)
+++ trunk/bibdesk/BDSKNotesWindowController.m 2019-07-16 22:53:45 UTC (rev
24036)
@@ -53,7 +53,7 @@
@implementation BDSKNotesWindowController
-@synthesize tags, rating;
+@synthesize outlineView, tokenField, splitView, ownerController,
refreshButton, openInSkimButton, tags, rating;
- (id)initWithURL:(NSURL *)aURL {
self = [super init];
Modified: trunk/bibdesk/BDSKOpenAccessoryViewController.h
===================================================================
--- trunk/bibdesk/BDSKOpenAccessoryViewController.h 2019-07-16 06:30:50 UTC
(rev 24035)
+++ trunk/bibdesk/BDSKOpenAccessoryViewController.h 2019-07-16 22:53:45 UTC
(rev 24036)
@@ -42,13 +42,18 @@
@interface BDSKOpenAccessoryViewController : NSViewController {
// stuff for the accessory view for open text encoding
- IBOutlet BDSKEncodingPopUpButton *openTextEncodingPopupButton;
- IBOutlet NSTextField *encodingLabelField;
+ BDSKEncodingPopUpButton *openTextEncodingPopupButton;
+ NSTextField *encodingLabelField;
// stuff for the accessory view for openUsingFilter
- IBOutlet NSComboBox *openUsingFilterComboBox;
- IBOutlet NSTextField *filterLabelField;
+ NSComboBox *openUsingFilterComboBox;
+ NSTextField *filterLabelField;
}
+@property (nonatomic, assign) IBOutlet BDSKEncodingPopUpButton
*openTextEncodingPopupButton;
+@property (nonatomic, assign) IBOutlet NSTextField *encodingLabelField;
+@property (nonatomic, assign) IBOutlet NSComboBox *openUsingFilterComboBox;
+@property (nonatomic, assign) IBOutlet NSTextField *filterLabelField;
+
@property (nonatomic, readonly) NSView *openTextEncodingAccessoryView;
@property (nonatomic, readonly) NSView *openUsingFilterAccessoryView;
Modified: trunk/bibdesk/BDSKOpenAccessoryViewController.m
===================================================================
--- trunk/bibdesk/BDSKOpenAccessoryViewController.m 2019-07-16 06:30:50 UTC
(rev 24035)
+++ trunk/bibdesk/BDSKOpenAccessoryViewController.m 2019-07-16 22:53:45 UTC
(rev 24036)
@@ -46,6 +46,7 @@
@implementation BDSKOpenAccessoryViewController
+@synthesize openTextEncodingPopupButton, encodingLabelField,
openUsingFilterComboBox, filterLabelField;
@dynamic openUsingFilterAccessoryView, openTextEncodingAccessoryView,
encoding, filterCommand;
- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle
*)nibBundleOrNil {
Modified: trunk/bibdesk/BDSKOrphanedFilesFinder.h
===================================================================
--- trunk/bibdesk/BDSKOrphanedFilesFinder.h 2019-07-16 06:30:50 UTC (rev
24035)
+++ trunk/bibdesk/BDSKOrphanedFilesFinder.h 2019-07-16 22:53:45 UTC (rev
24036)
@@ -43,13 +43,13 @@
@class BDSKTableView;
@interface BDSKOrphanedFilesFinder : NSWindowController <NSTableViewDelegate,
NSTableViewDataSource, QLPreviewPanelDataSource, QLPreviewPanelDelegate> {
- IBOutlet BDSKTableView *tableView;
- IBOutlet NSButton *refreshButton;
- IBOutlet NSArrayController *arrayController;
- IBOutlet NSProgressIndicator *progressIndicator;
- IBOutlet NSTextField *statusField;
- IBOutlet NSMenu *contextMenu;
- IBOutlet NSButton *matchButton;
+ BDSKTableView *tableView;
+ NSButton *refreshButton;
+ NSArrayController *arrayController;
+ NSProgressIndicator *progressIndicator;
+ NSTextField *statusField;
+ NSMenu *contextMenu;
+ NSButton *matchButton;
NSMutableArray *orphanedFiles;
NSString *searchString;
BOOL showsMatches;
@@ -63,6 +63,14 @@
+ (id)sharedFinder;
+@property (nonatomic, assign) IBOutlet BDSKTableView *tableView;
+@property (nonatomic, assign) IBOutlet NSButton *refreshButton;
+@property (nonatomic, assign) IBOutlet NSArrayController *arrayController;
+@property (nonatomic, assign) IBOutlet NSProgressIndicator *progressIndicator;
+@property (nonatomic, assign) IBOutlet NSTextField *statusField;
+@property (nonatomic, assign) IBOutlet NSMenu *contextMenu;
+@property (nonatomic, assign) IBOutlet NSButton *matchButton;
+
// shows the panel and refreshes
- (IBAction)showOrphanedFiles:(id)sender;
- (IBAction)refreshOrphanedFiles:(id)sender;
Modified: trunk/bibdesk/BDSKOrphanedFilesFinder.m
===================================================================
--- trunk/bibdesk/BDSKOrphanedFilesFinder.m 2019-07-16 06:30:50 UTC (rev
24035)
+++ trunk/bibdesk/BDSKOrphanedFilesFinder.m 2019-07-16 22:53:45 UTC (rev
24036)
@@ -77,7 +77,7 @@
@implementation BDSKOrphanedFilesFinder
-@synthesize searchString, wasLaunched;
+@synthesize tableView, refreshButton, arrayController, progressIndicator,
statusField, contextMenu, matchButton, searchString, wasLaunched;
static BDSKOrphanedFilesFinder *sharedFinder = nil;
Modified: trunk/bibdesk/BDSKPasswordController.h
===================================================================
--- trunk/bibdesk/BDSKPasswordController.h 2019-07-16 06:30:50 UTC (rev
24035)
+++ trunk/bibdesk/BDSKPasswordController.h 2019-07-16 22:53:45 UTC (rev
24036)
@@ -42,10 +42,13 @@
@interface BDSKPasswordController : NSWindowController
{
- IBOutlet NSSecureTextField *passwordField;
- IBOutlet NSTextField *statusField;
+ NSSecureTextField *passwordField;
+ NSTextField *statusField;
}
+@property (nonatomic, assign) IBOutlet NSSecureTextField *passwordField;
+@property (nonatomic, assign) IBOutlet NSTextField *statusField;
+
+ (NSData *)passwordForKeychainService:(NSString *)service account:(NSString
*)account name:(NSString *)name;
+ (BOOL)addOrModifyPassword:(NSString *)password forKeychainService:(NSString
*)service account:(NSString *)account name:(NSString *)name;
Modified: trunk/bibdesk/BDSKPasswordController.m
===================================================================
--- trunk/bibdesk/BDSKPasswordController.m 2019-07-16 06:30:50 UTC (rev
24035)
+++ trunk/bibdesk/BDSKPasswordController.m 2019-07-16 22:53:45 UTC (rev
24036)
@@ -44,6 +44,8 @@
@implementation BDSKPasswordController
+@synthesize passwordField, statusField;
+
static inline void logError(NSString *action, OSStatus err) {
if (err != errSecItemNotFound && err != errSecUserCanceled)
NSLog(@"Error %d occurred %@ password: %@", (int)err, action,
[(id)SecCopyErrorMessageString(err, NULL) autorelease]);
Modified: trunk/bibdesk/BDSKPersonController.h
===================================================================
--- trunk/bibdesk/BDSKPersonController.h 2019-07-16 06:30:50 UTC (rev
24035)
+++ trunk/bibdesk/BDSKPersonController.h 2019-07-16 22:53:45 UTC (rev
24036)
@@ -48,21 +48,21 @@
NSMutableArray *publicationItems;
NSSet *names;
NSSet *fields;
- IBOutlet NSTextField *nameTextField;
- IBOutlet BDSKDragImageView *imageView;
- IBOutlet BDSKTableView *publicationTableView;
- IBOutlet NSTableView *nameTableView;
- IBOutlet NSTableView *fieldTableView;
- IBOutlet BDSKCollapsibleView *collapsibleView;
- IBOutlet NSSplitView *splitView;
- IBOutlet NSSplitView *fieldNameSplitView;
- IBOutlet NSArrayController *publicationArrayController;
- IBOutlet NSArrayController *fieldArrayController;
- IBOutlet NSArrayController *nameArrayController;
- IBOutlet NSButton *editButton;
- IBOutlet NSWindow *editSheet;
- IBOutlet NSTextField *editField;
- IBOutlet NSTextField *editMessageField;
+ NSTextField *nameTextField;
+ BDSKDragImageView *imageView;
+ BDSKTableView *publicationTableView;
+ NSTableView *nameTableView;
+ NSTableView *fieldTableView;
+ BDSKCollapsibleView *collapsibleView;
+ NSSplitView *splitView;
+ NSSplitView *fieldNameSplitView;
+ NSArrayController *publicationArrayController;
+ NSArrayController *fieldArrayController;
+ NSArrayController *nameArrayController;
+ NSButton *editButton;
+ NSWindow *editSheet;
+ NSTextField *editField;
+ NSTextField *editMessageField;
BOOL isEditable;
}
@@ -70,6 +70,22 @@
- (id)initWithPerson:(BibAuthor *)aPerson;
#pragma mark accessors
+@property (nonatomic, assign) IBOutlet NSTextField *nameTextField;
+@property (nonatomic, assign) IBOutlet BDSKDragImageView *imageView;
+@property (nonatomic, assign) IBOutlet BDSKTableView *publicationTableView;
+@property (nonatomic, assign) IBOutlet NSTableView *nameTableView;
+@property (nonatomic, assign) IBOutlet NSTableView *fieldTableView;
+@property (nonatomic, assign) IBOutlet BDSKCollapsibleView *collapsibleView;
+@property (nonatomic, assign) IBOutlet NSSplitView *splitView;
+@property (nonatomic, assign) IBOutlet NSSplitView *fieldNameSplitView;
+@property (nonatomic, assign) IBOutlet NSArrayController
*publicationArrayController;
+@property (nonatomic, assign) IBOutlet NSArrayController *fieldArrayController;
+@property (nonatomic, assign) IBOutlet NSArrayController *nameArrayController;
+@property (nonatomic, assign) IBOutlet NSButton *editButton;
+@property (nonatomic, assign) IBOutlet NSWindow *editSheet;
+@property (nonatomic, assign) IBOutlet NSTextField *editField;
+@property (nonatomic, assign) IBOutlet NSTextField *editMessageField;
+
@property (nonatomic, retain) BibAuthor *person;
@property (nonatomic, copy) NSArray *publicationItems;
@property (nonatomic, copy) NSSet *names;
Modified: trunk/bibdesk/BDSKPersonController.m
===================================================================
--- trunk/bibdesk/BDSKPersonController.m 2019-07-16 06:30:50 UTC (rev
24035)
+++ trunk/bibdesk/BDSKPersonController.m 2019-07-16 22:53:45 UTC (rev
24036)
@@ -57,7 +57,7 @@
@implementation BDSKPersonController
-@synthesize person, names, fields, personOwner=owner;
+@synthesize nameTextField, imageView, publicationTableView, nameTableView,
fieldTableView, collapsibleView, splitView, fieldNameSplitView,
publicationArrayController, fieldArrayController, nameArrayController,
editButton, editSheet, editField, editMessageField, person, names, fields,
personOwner=owner;
@dynamic publicationItems, image;
+ (NSSet *)keyPathsForValuesAffectingValueForKey:(NSString *)key {
Modified: trunk/bibdesk/BDSKPreferenceController.h
===================================================================
--- trunk/bibdesk/BDSKPreferenceController.h 2019-07-16 06:30:50 UTC (rev
24035)
+++ trunk/bibdesk/BDSKPreferenceController.h 2019-07-16 22:53:45 UTC (rev
24036)
@@ -42,14 +42,14 @@
@class BDSKPreferenceIconView;
@interface BDSKPreferenceController : NSWindowController <NSToolbarDelegate,
NSWindowDelegate, NSTouchBarDelegate> {
- IBOutlet NSView *controlView;
- IBOutlet NSButton *revertButton;
- IBOutlet NSButton *revertAllButton;
- IBOutlet NSButton *helpButton;
- IBOutlet NSSegmentedControl *iconsButton;
- IBOutlet NSSegmentedControl *goLeftRightButton;
- IBOutlet NSSearchField *searchField;
- IBOutlet NSTextField *titleField;
+ NSView *controlView;
+ NSButton *revertButton;
+ NSButton *revertAllButton;
+ NSButton *helpButton;
+ NSSegmentedControl *iconsButton;
+ NSSegmentedControl *goLeftRightButton;
+ NSSearchField *searchField;
+ NSTextField *titleField;
NSButton *tbRevertButton;
NSButton *tbRevertAllButton;
BDSKPreferenceIconView *iconView;
@@ -65,6 +65,15 @@
+ (id)sharedPreferenceController;
+@property (nonatomic, assign) IBOutlet NSView *controlView;
+@property (nonatomic, assign) IBOutlet NSButton *revertButton;
+@property (nonatomic, assign) IBOutlet NSButton *revertAllButton;
+@property (nonatomic, assign) IBOutlet NSButton *helpButton;
+@property (nonatomic, assign) IBOutlet NSSegmentedControl *iconsButton;
+@property (nonatomic, assign) IBOutlet NSSegmentedControl *goLeftRightButton;
+@property (nonatomic, assign) IBOutlet NSSearchField *searchField;
+@property (nonatomic, assign) IBOutlet NSTextField *titleField;
+
- (NSString *)defaultWindowTitle;
- (IBAction)revertPaneDefaults:(id)sender;
Modified: trunk/bibdesk/BDSKPreferenceController.m
===================================================================
--- trunk/bibdesk/BDSKPreferenceController.m 2019-07-16 06:30:50 UTC (rev
24035)
+++ trunk/bibdesk/BDSKPreferenceController.m 2019-07-16 22:53:45 UTC (rev
24036)
@@ -88,7 +88,7 @@
@implementation BDSKPreferenceController
-@synthesize categories, selectedPaneIdentifier;
+@synthesize controlView, revertButton, revertAllButton, helpButton,
iconsButton, goLeftRightButton, searchField, titleField, categories,
selectedPaneIdentifier;
@dynamic allPaneIdentifiers, selectedPane;
// we want to be able to get the shared instance in MainMenu.nib, which passes
through alloc/init, so we need to be a bit more careful
Modified: trunk/bibdesk/BDSKPreviewer.h
===================================================================
--- trunk/bibdesk/BDSKPreviewer.h 2019-07-16 06:30:50 UTC (rev 24035)
+++ trunk/bibdesk/BDSKPreviewer.h 2019-07-16 22:53:45 UTC (rev 24036)
@@ -56,13 +56,13 @@
@discussion ...
*/
@interface BDSKPreviewer : NSWindowController <BDSKTeXTaskDelegate> {
- IBOutlet BDSKZoomablePDFView *pdfView;
- IBOutlet NSTextView *logView;
- IBOutlet NSTabView *tabView;
- IBOutlet NSProgressIndicator *progressIndicator;
- IBOutlet BDSKOverlayPanel *progressOverlay;
- IBOutlet NSImageView *warningImageView;
- IBOutlet NSView *warningView;
+ BDSKZoomablePDFView *pdfView;
+ NSTextView *logView;
+ NSTabView *tabView;
+ NSProgressIndicator *progressIndicator;
+ BDSKOverlayPanel *progressOverlay;
+ NSImageView *warningImageView;
+ NSView *warningView;
BDSKPreviewState previewState;
BDSKTeXTask *texTask;
@@ -75,15 +75,21 @@
*/
+ (BDSKPreviewer *)sharedPreviewer;
-@property (nonatomic, readonly) PDFView *pdfView;
+@property (nonatomic, assign) IBOutlet BDSKZoomablePDFView *pdfView;
+@property (nonatomic, assign) IBOutlet NSTextView *logView;
+@property (nonatomic, assign) IBOutlet NSTabView *tabView;
+@property (nonatomic, assign) IBOutlet NSProgressIndicator *progressIndicator;
+@property (nonatomic, assign) IBOutlet BDSKOverlayPanel *progressOverlay;
+@property (nonatomic, assign) IBOutlet NSImageView *warningImageView;
+@property (nonatomic, assign) IBOutlet NSView *warningView;
+
@property (nonatomic, readonly) NSView *pdfContentView;
-@property (nonatomic, readonly) BDSKOverlayPanel *progressOverlay;
@property (nonatomic) CGFloat PDFScaleFactor;
- (void)terminate;
-@property (nonatomic, readonly) BOOL isVisible;
+@property (nonatomic, readonly, getter=isVisible) BOOL visible;
- (void)handleMainDocumentDidChangeNotification:(NSNotification *)notification;
- (void)shouldShowTeXPreferences:(NSWindow *)sheet
returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo;
Modified: trunk/bibdesk/BDSKPreviewer.m
===================================================================
--- trunk/bibdesk/BDSKPreviewer.m 2019-07-16 06:30:50 UTC (rev 24035)
+++ trunk/bibdesk/BDSKPreviewer.m 2019-07-16 22:53:45 UTC (rev 24036)
@@ -76,7 +76,8 @@
@implementation BDSKPreviewer
-@dynamic pdfView, pdfContentView, progressOverlay, PDFScaleFactor, isVisible;
+@synthesize pdfView, logView, tabView, progressIndicator, progressOverlay,
warningImageView, warningView;
+@dynamic pdfContentView, PDFScaleFactor, visible;
static BDSKPreviewer *sharedPreviewer = nil;
Modified: trunk/bibdesk/BDSKReadMeController.h
===================================================================
--- trunk/bibdesk/BDSKReadMeController.h 2019-07-16 06:30:50 UTC (rev
24035)
+++ trunk/bibdesk/BDSKReadMeController.h 2019-07-16 22:53:45 UTC (rev
24036)
@@ -40,10 +40,12 @@
@interface BDSKReadMeController : NSWindowController {
- IBOutlet NSTextView *textView;
- IBOutlet NSButton *downloadButton;
+ NSTextView *textView;
+ NSButton *downloadButton;
}
+ (id)sharedReadMeController;
+@property (nonatomic, assign) IBOutlet NSTextView *textView;
+@property (nonatomic, assign) IBOutlet NSButton *downloadButton;
- (IBAction)download:(id)sender;
@end
Modified: trunk/bibdesk/BDSKReadMeController.m
===================================================================
--- trunk/bibdesk/BDSKReadMeController.m 2019-07-16 06:30:50 UTC (rev
24035)
+++ trunk/bibdesk/BDSKReadMeController.m 2019-07-16 22:53:45 UTC (rev
24036)
@@ -50,6 +50,8 @@
@implementation BDSKReadMeController
+@synthesize textView, downloadButton;
+
+ (id)sharedReadMeController {
if (sharedReadMeController == nil)
sharedReadMeController = [[BDSKReadMeController alloc] init];
Modified: trunk/bibdesk/BDSKSaveAccessoryViewController.h
===================================================================
--- trunk/bibdesk/BDSKSaveAccessoryViewController.h 2019-07-16 06:30:50 UTC
(rev 24035)
+++ trunk/bibdesk/BDSKSaveAccessoryViewController.h 2019-07-16 22:53:45 UTC
(rev 24036)
@@ -41,12 +41,17 @@
@class BDSKEncodingPopUpButton;
@interface BDSKSaveAccessoryViewController : NSViewController {
- IBOutlet BDSKEncodingPopUpButton *saveTextEncodingPopupButton;
- IBOutlet NSButton *exportSelectionCheckButton;
- IBOutlet NSTextField *formatLabelField;
- IBOutlet NSTextField *encodingLabelField;
+ BDSKEncodingPopUpButton *saveTextEncodingPopupButton;
+ NSButton *exportSelectionCheckButton;
+ NSTextField *formatLabelField;
+ NSTextField *encodingLabelField;
}
+@property (nonatomic, assign) IBOutlet BDSKEncodingPopUpButton
*saveTextEncodingPopupButton;
+@property (nonatomic, assign) IBOutlet NSButton *exportSelectionCheckButton;
+@property (nonatomic, assign) IBOutlet NSTextField *formatLabelField;
+@property (nonatomic, assign) IBOutlet NSTextField *encodingLabelField;
+
@property (nonatomic, readonly) NSView *saveAccessoryView;
@property (nonatomic, readonly) NSView *exportAccessoryView;
Modified: trunk/bibdesk/BDSKSaveAccessoryViewController.m
===================================================================
--- trunk/bibdesk/BDSKSaveAccessoryViewController.m 2019-07-16 06:30:50 UTC
(rev 24035)
+++ trunk/bibdesk/BDSKSaveAccessoryViewController.m 2019-07-16 22:53:45 UTC
(rev 24036)
@@ -42,6 +42,7 @@
@implementation BDSKSaveAccessoryViewController
+@synthesize saveTextEncodingPopupButton, exportSelectionCheckButton,
formatLabelField, encodingLabelField;
@dynamic saveAccessoryView, exportAccessoryView, saveTextEncoding,
exportSelection,saveTextEncodingPopupButtonEnabled,
exportSelectionCheckButtonEnabled;
- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle
*)nibBundleOrNil {
Modified: trunk/bibdesk/BDSKScriptGroupSheetController.h
===================================================================
--- trunk/bibdesk/BDSKScriptGroupSheetController.h 2019-07-16 06:30:50 UTC
(rev 24035)
+++ trunk/bibdesk/BDSKScriptGroupSheetController.h 2019-07-16 22:53:45 UTC
(rev 24036)
@@ -43,10 +43,10 @@
@interface BDSKScriptGroupSheetController : NSWindowController
<NSOpenSavePanelDelegate, NSTouchBarDelegate>
{
- IBOutlet BDSKDragTextField *pathField;
- IBOutlet NSObjectController *objectController;
- IBOutlet NSButton *okButton;
- IBOutlet NSButton *cancelButton;
+ BDSKDragTextField *pathField;
+ NSObjectController *objectController;
+ NSButton *okButton;
+ NSButton *cancelButton;
NSString *path;
NSString *arguments;
NSUndoManager *undoManager;
@@ -55,6 +55,11 @@
- (id)initWithPath:(NSString *)aPath arguments:(NSString *)anArguments;
+@property (nonatomic, assign) IBOutlet BDSKDragTextField *pathField;
+@property (nonatomic, assign) IBOutlet NSObjectController *objectController;
+@property (nonatomic, assign) IBOutlet NSButton *okButton;
+@property (nonatomic, assign) IBOutlet NSButton *cancelButton;
+
@property (nonatomic, retain) NSString *path;
@property (nonatomic, retain) NSString *arguments;
Modified: trunk/bibdesk/BDSKScriptGroupSheetController.m
===================================================================
--- trunk/bibdesk/BDSKScriptGroupSheetController.m 2019-07-16 06:30:50 UTC
(rev 24035)
+++ trunk/bibdesk/BDSKScriptGroupSheetController.m 2019-07-16 22:53:45 UTC
(rev 24036)
@@ -49,7 +49,7 @@
@implementation BDSKScriptGroupSheetController
-@synthesize path, arguments;
+@synthesize pathField, objectController, okButton, cancelButton, path,
arguments;
@dynamic undoManager;
- (id)init {
Modified: trunk/bibdesk/BDSKSearchBookmarkController.h
===================================================================
--- trunk/bibdesk/BDSKSearchBookmarkController.h 2019-07-16 06:30:50 UTC
(rev 24035)
+++ trunk/bibdesk/BDSKSearchBookmarkController.h 2019-07-16 22:53:45 UTC
(rev 24036)
@@ -43,7 +43,7 @@
@class BDSKSearchBookmark, BDSKOutlineView;
@interface BDSKSearchBookmarkController : NSWindowController
<NSOutlineViewDelegate, NSOutlineViewDataSource, NSToolbarDelegate,
NSTouchBarDelegate> {
- IBOutlet BDSKOutlineView *outlineView;
+ BDSKOutlineView *outlineView;
BDSKSearchBookmark *bookmarkRoot;
NSArray *draggedBookmarks;
NSMutableDictionary *toolbarItems;
@@ -52,6 +52,8 @@
+ (id)sharedBookmarkController;
+@property (nonatomic, assign) BDSKOutlineView *outlineView;
+
- (BDSKSearchBookmark *)bookmarkRoot;
- (IBAction)insertBookmarkFolder:(id)sender;
Modified: trunk/bibdesk/BDSKSearchBookmarkController.m
===================================================================
--- trunk/bibdesk/BDSKSearchBookmarkController.m 2019-07-16 06:30:50 UTC
(rev 24035)
+++ trunk/bibdesk/BDSKSearchBookmarkController.m 2019-07-16 22:53:45 UTC
(rev 24036)
@@ -78,6 +78,7 @@
@implementation BDSKSearchBookmarkController
+@synthesize outlineView;
@dynamic undoManager;
static BDSKSearchBookmarkController *sharedBookmarkController = nil;
Modified: trunk/bibdesk/BDSKSearchGroupSheetController.h
===================================================================
--- trunk/bibdesk/BDSKSearchGroupSheetController.h 2019-07-16 06:30:50 UTC
(rev 24035)
+++ trunk/bibdesk/BDSKSearchGroupSheetController.h 2019-07-16 22:53:45 UTC
(rev 24036)
@@ -49,34 +49,54 @@
BOOL isCustom;
BOOL isEditable;
- IBOutlet NSPopUpButton *serverPopup;
- IBOutlet NSMatrix *typeMatrix;
+ NSPopUpButton *serverPopup;
+ NSMatrix *typeMatrix;
- IBOutlet NSTextField *nameField;
- IBOutlet NSTextField *addressField;
- IBOutlet NSTextField *portField;
- IBOutlet NSTextField *databaseField;
- IBOutlet NSSecureTextField *passwordField;
- IBOutlet NSTextField *userField;
- IBOutlet NSPopUpButton *syntaxPopup;
- IBOutlet NSComboBox *encodingComboBox;
- IBOutlet NSButton *removeDiacriticsButton;
- IBOutlet NSButton *liteButton;
+ NSTextField *nameField;
+ NSTextField *addressField;
+ NSTextField *portField;
+ NSTextField *databaseField;
+ NSSecureTextField *passwordField;
+ NSTextField *userField;
+ NSPopUpButton *syntaxPopup;
+ NSComboBox *encodingComboBox;
+ NSButton *removeDiacriticsButton;
+ NSButton *liteButton;
- IBOutlet NSButton *editButton;
- IBOutlet NSButton *addRemoveButton;
+ NSButton *editButton;
+ NSButton *addRemoveButton;
- IBOutlet BDSKCollapsibleView *serverView;
- IBOutlet NSButton *revealButton;
+ BDSKCollapsibleView *serverView;
+ NSButton *revealButton;
- IBOutlet NSButton *okButton;
- IBOutlet NSButton *cancelButton;
+ NSButton *okButton;
+ NSButton *cancelButton;
- IBOutlet NSObjectController *objectController;
+ NSObjectController *objectController;
}
- (id)initWithServerInfo:(BDSKServerInfo *)aServerInfo;
+@property (nonatomic, assign) IBOutlet NSPopUpButton *serverPopup;
+@property (nonatomic, assign) IBOutlet NSMatrix *typeMatrix;
+@property (nonatomic, assign) IBOutlet NSTextField *nameField;
+@property (nonatomic, assign) IBOutlet NSTextField *addressField;
+@property (nonatomic, assign) IBOutlet NSTextField *portField;
+@property (nonatomic, assign) IBOutlet NSTextField *databaseField;
+@property (nonatomic, assign) IBOutlet NSSecureTextField *passwordField;
+@property (nonatomic, assign) IBOutlet NSTextField *userField;
+@property (nonatomic, assign) IBOutlet NSPopUpButton *syntaxPopup;
+@property (nonatomic, assign) IBOutlet NSComboBox *encodingComboBox;
+@property (nonatomic, assign) IBOutlet NSButton *removeDiacriticsButton;
+@property (nonatomic, assign) IBOutlet NSButton *liteButton;
+@property (nonatomic, assign) IBOutlet NSButton *editButton;
+@property (nonatomic, assign) IBOutlet NSButton *addRemoveButton;
+@property (nonatomic, assign) IBOutlet BDSKCollapsibleView *serverView;
+@property (nonatomic, assign) IBOutlet NSButton *revealButton;
+@property (nonatomic, assign) IBOutlet NSButton *okButton;
+@property (nonatomic, assign) IBOutlet NSButton *cancelButton;
+@property (nonatomic, assign) IBOutlet NSObjectController *objectController;
+
- (IBAction)selectPredefinedServer:(id)sender;
- (IBAction)selectSyntax:(id)sender;
Modified: trunk/bibdesk/BDSKSearchGroupSheetController.m
===================================================================
--- trunk/bibdesk/BDSKSearchGroupSheetController.m 2019-07-16 06:30:50 UTC
(rev 24035)
+++ trunk/bibdesk/BDSKSearchGroupSheetController.m 2019-07-16 22:53:45 UTC
(rev 24036)
@@ -53,7 +53,7 @@
@implementation BDSKSearchGroupSheetController
-@synthesize custom, editable;
+@synthesize serverPopup, typeMatrix, nameField, addressField, portField,
databaseField, passwordField, userField, syntaxPopup, encodingComboBox,
removeDiacriticsButton, liteButton, editButton, addRemoveButton, serverView,
revealButton, okButton, cancelButton, objectController, custom, editable;
@dynamic zoom, ISI, zoomOrISI, typeTag, serverInfo, undoManager;
+ (NSSet *)keyPathsForValuesAffectingValueForKey:(NSString *)key {
Modified: trunk/bibdesk/BDSKSearchGroupViewController.h
===================================================================
--- trunk/bibdesk/BDSKSearchGroupViewController.h 2019-07-16 06:30:50 UTC
(rev 24035)
+++ trunk/bibdesk/BDSKSearchGroupViewController.h 2019-07-16 22:53:45 UTC
(rev 24036)
@@ -41,11 +41,15 @@
@class BDSKCollapsibleView, BDSKSearchGroup;
@interface BDSKSearchGroupViewController : NSViewController {
- IBOutlet BDSKCollapsibleView *collapsibleView;
- IBOutlet NSSearchField *searchField;
- IBOutlet NSButton *searchButton;
+ BDSKCollapsibleView *collapsibleView;
+ NSSearchField *searchField;
+ NSButton *searchButton;
}
+@property (nonatomic, assign) IBOutlet BDSKCollapsibleView *collapsibleView;
+@property (nonatomic, assign) IBOutlet NSSearchField *searchField;
+@property (nonatomic, assign) IBOutlet NSButton *searchButton;
+
@property (nonatomic, retain) BDSKSearchGroup *group;
- (IBAction)changeSearchTerm:(id)sender;
Modified: trunk/bibdesk/BDSKSearchGroupViewController.m
===================================================================
--- trunk/bibdesk/BDSKSearchGroupViewController.m 2019-07-16 06:30:50 UTC
(rev 24035)
+++ trunk/bibdesk/BDSKSearchGroupViewController.m 2019-07-16 22:53:45 UTC
(rev 24036)
@@ -44,6 +44,7 @@
@implementation BDSKSearchGroupViewController
+@synthesize collapsibleView, searchField, searchButton;
@dynamic group;
- (id)init {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Bibdesk-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
