Revision: 24038
http://sourceforge.net/p/bibdesk/svn/24038
Author: hofman
Date: 2019-07-17 09:58:25 +0000 (Wed, 17 Jul 2019)
Log Message:
-----------
use properties for outlets
Modified Paths:
--------------
trunk/bibdesk/BDSKAuthenticationController.h
trunk/bibdesk/BDSKAuthenticationController.m
trunk/bibdesk/BDSKStringEncodingManager.h
trunk/bibdesk/BDSKStringEncodingManager.m
trunk/bibdesk/BDSKTemplateDocument.h
trunk/bibdesk/BDSKTemplateDocument.m
trunk/bibdesk/BDSKTextImportController.h
trunk/bibdesk/BDSKTextImportController.m
trunk/bibdesk/BDSKTypeInfoEditor.h
trunk/bibdesk/BDSKTypeInfoEditor.m
trunk/bibdesk/BDSKURLGroupSheetController.h
trunk/bibdesk/BDSKURLGroupSheetController.m
trunk/bibdesk/BDSKURLSheetController.h
trunk/bibdesk/BDSKURLSheetController.m
trunk/bibdesk/BDSKWebGroupViewController.h
trunk/bibdesk/BDSKWebGroupViewController.m
trunk/bibdesk/BibDocument.h
trunk/bibdesk/BibDocument.m
trunk/bibdesk/BibDocument_UI.m
trunk/bibdesk/BibPref_AutoFile.h
trunk/bibdesk/BibPref_AutoFile.m
trunk/bibdesk/BibPref_Cite.h
trunk/bibdesk/BibPref_Cite.m
trunk/bibdesk/BibPref_CiteKey.h
trunk/bibdesk/BibPref_CiteKey.m
trunk/bibdesk/BibPref_Crossref.h
trunk/bibdesk/BibPref_Crossref.m
trunk/bibdesk/BibPref_Defaults.h
trunk/bibdesk/BibPref_Defaults.m
trunk/bibdesk/BibPref_Display.h
trunk/bibdesk/BibPref_Display.m
trunk/bibdesk/BibPref_Export.h
trunk/bibdesk/BibPref_Export.m
trunk/bibdesk/BibPref_Files.h
trunk/bibdesk/BibPref_Files.m
trunk/bibdesk/BibPref_General.h
trunk/bibdesk/BibPref_General.m
trunk/bibdesk/BibPref_ScriptHooks.h
trunk/bibdesk/BibPref_ScriptHooks.m
trunk/bibdesk/BibPref_Sharing.h
trunk/bibdesk/BibPref_Sharing.m
trunk/bibdesk/BibPref_TeX.h
trunk/bibdesk/BibPref_TeX.m
trunk/bibdesk/English.lproj/BibDocument.xib
trunk/bibdesk/French.lproj/BibDocument.xib
trunk/bibdesk/German.lproj/BibDocument.xib
Modified: trunk/bibdesk/BDSKAuthenticationController.h
===================================================================
--- trunk/bibdesk/BDSKAuthenticationController.h 2019-07-17 06:30:15 UTC
(rev 24037)
+++ trunk/bibdesk/BDSKAuthenticationController.h 2019-07-17 09:58:25 UTC
(rev 24038)
@@ -41,15 +41,22 @@
@interface BDSKAuthenticationController : NSWindowController {
- IBOutlet NSTextField *mainLabelField;
- IBOutlet NSTextField *smallLabelField;
- IBOutlet NSTextField *separateRealmLabelField;
- IBOutlet NSTextField *passwordField;
- IBOutlet NSTextField *userField;
- IBOutlet NSButton *rememberButton;
+ NSTextField *mainLabelField;
+ NSTextField *smallLabelField;
+ NSTextField *separateRealmLabelField;
+ NSTextField *passwordField;
+ NSTextField *userField;
+ NSButton *rememberButton;
BOOL usingSheet;
}
+@property (nonatomic, assign) IBOutlet NSTextField *mainLabelField;
+@property (nonatomic, assign) IBOutlet NSTextField *smallLabelField;
+@property (nonatomic, assign) IBOutlet NSTextField *separateRealmLabelField;
+@property (nonatomic, assign) IBOutlet NSTextField *passwordField;
+@property (nonatomic, assign) IBOutlet NSTextField *userField;
+@property (nonatomic, assign) IBOutlet NSButton *rememberButton;
+
- (void)runAuthentication:(NSURLAuthenticationChallenge *)challenge
window:(NSWindow *)window completionHandler:(void
(^)(BDSKDownloaderAuthChallengeDisposition disposition, NSURLCredential
*credential))completionHandler;
@end
Modified: trunk/bibdesk/BDSKAuthenticationController.m
===================================================================
--- trunk/bibdesk/BDSKAuthenticationController.m 2019-07-17 06:30:15 UTC
(rev 24037)
+++ trunk/bibdesk/BDSKAuthenticationController.m 2019-07-17 09:58:25 UTC
(rev 24038)
@@ -42,6 +42,8 @@
@implementation BDSKAuthenticationController
+@synthesize mainLabelField, smallLabelField, separateRealmLabelField,
passwordField, userField, rememberButton;
+
- (NSString *)windowNibName { return @"AuthenticationPanel"; }
- (void)adjustSizeOfTextField:(NSTextField *)textField {
Modified: trunk/bibdesk/BDSKStringEncodingManager.h
===================================================================
--- trunk/bibdesk/BDSKStringEncodingManager.h 2019-07-17 06:30:15 UTC (rev
24037)
+++ trunk/bibdesk/BDSKStringEncodingManager.h 2019-07-17 09:58:25 UTC (rev
24038)
@@ -53,10 +53,12 @@
@interface BDSKStringEncodingManager : NSWindowController {
- IBOutlet NSMatrix *encodingMatrix;
+ NSMatrix *encodingMatrix;
NSArray *encodings;
}
+@property (nonatomic, assign) IBOutlet NSMatrix *encodingMatrix;
+
/*!
@method sharedEncodingManager
@abstract Returns the shared instance of the encoding manager.
Modified: trunk/bibdesk/BDSKStringEncodingManager.m
===================================================================
--- trunk/bibdesk/BDSKStringEncodingManager.m 2019-07-17 06:30:15 UTC (rev
24037)
+++ trunk/bibdesk/BDSKStringEncodingManager.m 2019-07-17 09:58:25 UTC (rev
24038)
@@ -161,6 +161,8 @@
@implementation BDSKStringEncodingManager
+@synthesize encodingMatrix;
+
static BDSKStringEncodingManager *sharedEncodingManager = nil;
+ (BDSKStringEncodingManager *)sharedEncodingManager{
Modified: trunk/bibdesk/BDSKTemplateDocument.h
===================================================================
--- trunk/bibdesk/BDSKTemplateDocument.h 2019-07-17 06:30:15 UTC (rev
24037)
+++ trunk/bibdesk/BDSKTemplateDocument.h 2019-07-17 09:58:25 UTC (rev
24038)
@@ -52,37 +52,37 @@
@interface BDSKTemplateDocument : NSDocument <NSTableViewDelegate,
NSTableViewDataSource, BDSKTokenFieldDelegate>
{
- IBOutlet NSObjectController *ownerController;
+ NSObjectController *ownerController;
- IBOutlet NSTextView *previewTextView;
+ NSTextView *previewTextView;
- IBOutlet NSSplitView *textViewSplitView;
- IBOutlet NSSplitView *tableViewSplitView;
+ NSSplitView *textViewSplitView;
+ NSSplitView *tableViewSplitView;
- IBOutlet NSTextView *prefixTemplateTextView;
- IBOutlet NSTextView *separatorTemplateTextView;
- IBOutlet NSTextView *suffixTemplateTextView;
+ NSTextView *prefixTemplateTextView;
+ NSTextView *separatorTemplateTextView;
+ NSTextView *suffixTemplateTextView;
- IBOutlet BDSKTableView *tableView;
- IBOutlet NSArrayController *templateArrayController;
- IBOutlet NSObjectController *tokenObjectController;
- IBOutlet NSTokenField *specialTokenField;
- IBOutlet NSTokenField *requiredTokenField;
- IBOutlet NSTokenField *optionalTokenField;
- IBOutlet NSTokenField *defaultTokenField;
- IBOutlet NSTokenField *itemTemplateTokenField;
- IBOutlet NSBox *tokenOptionsBox;
+ BDSKTableView *tableView;
+ NSArrayController *templateArrayController;
+ NSObjectController *tokenObjectController;
+ NSTokenField *specialTokenField;
+ NSTokenField *requiredTokenField;
+ NSTokenField *optionalTokenField;
+ NSTokenField *defaultTokenField;
+ NSTokenField *itemTemplateTokenField;
+ NSBox *tokenOptionsBox;
- IBOutlet NSView *fieldOptionsView;
- IBOutlet NSView *appendingOptionsView;
- IBOutlet NSView *fontOptionsView;
- IBOutlet NSView *urlOptionsView;
- IBOutlet NSView *personOptionsView;
- IBOutlet NSView *linkedFileOptionsView;
- IBOutlet NSView *dateOptionsView;
- IBOutlet NSView *numberOptionsView;
- IBOutlet NSView *textOptionsView;
- IBOutlet NSTextField *fieldField;
+ NSView *fieldOptionsView;
+ NSView *appendingOptionsView;
+ NSView *fontOptionsView;
+ NSView *urlOptionsView;
+ NSView *personOptionsView;
+ NSView *linkedFileOptionsView;
+ NSView *dateOptionsView;
+ NSView *numberOptionsView;
+ NSView *textOptionsView;
+ NSTextField *fieldField;
NSMenu *fieldOptionsMenu;
NSMenu *urlOptionsMenu;
@@ -114,6 +114,33 @@
NSAttributedString *attributedString;
}
+@property (nonatomic, assign) IBOutlet NSObjectController *ownerController;
+@property (nonatomic, assign) IBOutlet NSTextView *previewTextView;
+@property (nonatomic, assign) IBOutlet NSSplitView *textViewSplitView;
+@property (nonatomic, assign) IBOutlet NSSplitView *tableViewSplitView;
+@property (nonatomic, assign) IBOutlet NSTextView *prefixTemplateTextView;
+@property (nonatomic, assign) IBOutlet NSTextView *separatorTemplateTextView;
+@property (nonatomic, assign) IBOutlet NSTextView *suffixTemplateTextView;
+@property (nonatomic, assign) IBOutlet BDSKTableView *tableView;
+@property (nonatomic, assign) IBOutlet NSArrayController
*templateArrayController;
+@property (nonatomic, assign) IBOutlet NSObjectController
*tokenObjectController;
+@property (nonatomic, assign) IBOutlet NSTokenField *specialTokenField;
+@property (nonatomic, assign) IBOutlet NSTokenField *requiredTokenField;
+@property (nonatomic, assign) IBOutlet NSTokenField *optionalTokenField;
+@property (nonatomic, assign) IBOutlet NSTokenField *defaultTokenField;
+@property (nonatomic, assign) IBOutlet NSTokenField *itemTemplateTokenField;
+@property (nonatomic, assign) IBOutlet NSBox *tokenOptionsBox;
+@property (nonatomic, assign) IBOutlet NSView *fieldOptionsView;
+@property (nonatomic, assign) IBOutlet NSView *appendingOptionsView;
+@property (nonatomic, assign) IBOutlet NSView *fontOptionsView;
+@property (nonatomic, assign) IBOutlet NSView *urlOptionsView;
+@property (nonatomic, assign) IBOutlet NSView *personOptionsView;
+@property (nonatomic, assign) IBOutlet NSView *linkedFileOptionsView;
+@property (nonatomic, assign) IBOutlet NSView *dateOptionsView;
+@property (nonatomic, assign) IBOutlet NSView *numberOptionsView;
+@property (nonatomic, assign) IBOutlet NSView *textOptionsView;
+@property (nonatomic, assign) IBOutlet NSTextField *fieldField;
+
@property (nonatomic, readonly) NSArray *typeTemplates;
@property (nonatomic, copy) NSArray *specialTokens;
Modified: trunk/bibdesk/BDSKTemplateDocument.m
===================================================================
--- trunk/bibdesk/BDSKTemplateDocument.m 2019-07-17 06:30:15 UTC (rev
24037)
+++ trunk/bibdesk/BDSKTemplateDocument.m 2019-07-17 09:58:25 UTC (rev
24038)
@@ -95,7 +95,7 @@
@implementation BDSKTemplateDocument
-@synthesize typeTemplates, specialTokens, defaultTokens, prefixTemplate,
suffixTemplate, separatorTemplate, richText, fontName, fontSize, bold, italic,
selectedToken, defaultTypeIndex;
+@synthesize ownerController, previewTextView, textViewSplitView,
tableViewSplitView, prefixTemplateTextView, separatorTemplateTextView,
suffixTemplateTextView, tableView, templateArrayController,
tokenObjectController, specialTokenField, requiredTokenField,
optionalTokenField, defaultTokenField, itemTemplateTokenField, tokenOptionsBox,
fieldOptionsView, appendingOptionsView, fontOptionsView, urlOptionsView,
personOptionsView, linkedFileOptionsView, dateOptionsView, numberOptionsView,
textOptionsView, fieldField, typeTemplates, specialTokens, defaultTokens,
prefixTemplate, suffixTemplate, separatorTemplate, richText, fontName,
fontSize, bold, italic, selectedToken, defaultTypeIndex;
@dynamic attributedString, string, previewAttributedString;
+ (NSSet *)keyPathsForValuesAffectingValueForKey:(NSString *)key {
Modified: trunk/bibdesk/BDSKTextImportController.h
===================================================================
--- trunk/bibdesk/BDSKTextImportController.h 2019-07-17 06:30:15 UTC (rev
24037)
+++ trunk/bibdesk/BDSKTextImportController.h 2019-07-17 09:58:25 UTC (rev
24038)
@@ -49,25 +49,25 @@
@class BDSKCiteKeyFormatter, BDSKTextImportItemTableView;
@interface BDSKTextImportController : NSWindowController <BDSKOwner,
BDSKTextImportItemTableViewDelegate, NSTableViewDataSource, NSTextViewDelegate,
NSSplitViewDelegate, BDSKComplexStringFormatterDelegate,
BDSKCitationFormatterDelegate, BDSKWebViewDelegate, BDSKDownloaderDelegate,
NSTouchBarDelegate> {
- IBOutlet NSTextView* sourceTextView;
- IBOutlet BDSKTextImportItemTableView* itemTableView;
- IBOutlet NSTextField* citeKeyField;
- IBOutlet NSTextField* statusLine;
- IBOutlet NSButton *addButton;
- IBOutlet NSButton *addAndCloseButton;
- IBOutlet NSButton *closeButton;
- IBOutlet NSButton *clearButton;
- IBOutlet NSPopUpButton* itemTypeButton;
- IBOutlet NSPopUpButton *actionMenuButton;
- IBOutlet NSSplitView* splitView;
- IBOutlet NSBox* sourceBox;
- IBOutlet BDSKEdgeView *webViewBox;
- IBOutlet NSView* webViewView;
- IBOutlet NSProgressIndicator *progressIndicator;
- IBOutlet NSButton *backButton;
- IBOutlet NSButton *forwardButton;
- IBOutlet NSButton *stopOrReloadButton;
- IBOutlet NSButton *citeKeyWarningButton;
+ NSTextView *sourceTextView;
+ BDSKTextImportItemTableView *itemTableView;
+ NSTextField *citeKeyField;
+ NSTextField *statusLine;
+ NSButton *addButton;
+ NSButton *addAndCloseButton;
+ NSButton *closeButton;
+ NSButton *clearButton;
+ NSPopUpButton *itemTypeButton;
+ NSPopUpButton *actionMenuButton;
+ NSSplitView *splitView;
+ NSBox *sourceBox;
+ BDSKEdgeView *webViewBox;
+ NSView *webViewView;
+ NSProgressIndicator *progressIndicator;
+ NSButton *backButton;
+ NSButton *forwardButton;
+ NSButton *stopOrReloadButton;
+ NSButton *citeKeyWarningButton;
id <BDSKOwner> owner;
BDSKPublicationsArray *publications;
@@ -102,6 +102,26 @@
- (id)initForOwner:(id <BDSKOwner>)anOwner;
+@property (nonatomic, assign) IBOutlet NSTextView* sourceTextView;
+@property (nonatomic, assign) IBOutlet BDSKTextImportItemTableView*
itemTableView;
+@property (nonatomic, assign) IBOutlet NSTextField *citeKeyField;
+@property (nonatomic, assign) IBOutlet NSTextField *statusLine;
+@property (nonatomic, assign) IBOutlet NSButton *addButton;
+@property (nonatomic, assign) IBOutlet NSButton *addAndCloseButton;
+@property (nonatomic, assign) IBOutlet NSButton *closeButton;
+@property (nonatomic, assign) IBOutlet NSButton *clearButton;
+@property (nonatomic, assign) IBOutlet NSPopUpButton *itemTypeButton;
+@property (nonatomic, assign) IBOutlet NSPopUpButton *actionMenuButton;
+@property (nonatomic, assign) IBOutlet NSSplitView *splitView;
+@property (nonatomic, assign) IBOutlet NSBox *sourceBox;
+@property (nonatomic, assign) IBOutlet BDSKEdgeView *webViewBox;
+@property (nonatomic, assign) IBOutlet NSView *webViewView;
+@property (nonatomic, assign) IBOutlet NSProgressIndicator *progressIndicator;
+@property (nonatomic, assign) IBOutlet NSButton *backButton;
+@property (nonatomic, assign) IBOutlet NSButton *forwardButton;
+@property (nonatomic, assign) IBOutlet NSButton *stopOrReloadButton;
+@property (nonatomic, assign) IBOutlet NSButton *citeKeyWarningButton;
+
@property (nonatomic, readonly) BibItem *publication;
@property (nonatomic, readonly) NSArray *addedPublications;
Modified: trunk/bibdesk/BDSKTextImportController.m
===================================================================
--- trunk/bibdesk/BDSKTextImportController.m 2019-07-17 06:30:15 UTC (rev
24037)
+++ trunk/bibdesk/BDSKTextImportController.m 2019-07-17 09:58:25 UTC (rev
24038)
@@ -110,7 +110,7 @@
@implementation BDSKTextImportController
-@synthesize addedPublications=itemsAdded;
+@synthesize sourceTextView, itemTableView, citeKeyField, statusLine,
addButton, addAndCloseButton, closeButton, clearButton, itemTypeButton,
actionMenuButton, splitView, sourceBox, webViewBox, webViewView,
progressIndicator, backButton, forwardButton, stopOrReloadButton,
citeKeyWarningButton, addedPublications=itemsAdded;
@dynamic publication;
- (id)initForOwner:(id <BDSKOwner>)anOwner {
Modified: trunk/bibdesk/BDSKTypeInfoEditor.h
===================================================================
--- trunk/bibdesk/BDSKTypeInfoEditor.h 2019-07-17 06:30:15 UTC (rev 24037)
+++ trunk/bibdesk/BDSKTypeInfoEditor.h 2019-07-17 09:58:25 UTC (rev 24038)
@@ -40,17 +40,17 @@
#import "NSTouchBar_BDSKForwardDeclarations.h"
@interface BDSKTypeInfoEditor : NSWindowController <NSTableViewDelegate,
NSTableViewDataSource, NSSplitViewDelegate, NSTouchBarDelegate> {
- IBOutlet NSTableView *typeTableView;
- IBOutlet NSTableView *requiredTableView;
- IBOutlet NSTableView *optionalTableView;
- IBOutlet NSSegmentedControl *addRemoveTypeButton;
- IBOutlet NSSegmentedControl *addRemoveRequiredButton;
- IBOutlet NSSegmentedControl *addRemoveOptionalButton;
- IBOutlet NSButton *revertCurrentToDefaultButton;
- IBOutlet NSButton *revertAllToDefaultButton;
- IBOutlet NSButton *canEditDefaultTypesButton;
- IBOutlet NSButton *okButton;
- IBOutlet NSButton *cancelButton;
+ NSTableView *typeTableView;
+ NSTableView *requiredTableView;
+ NSTableView *optionalTableView;
+ NSSegmentedControl *addRemoveTypeButton;
+ NSSegmentedControl *addRemoveRequiredButton;
+ NSSegmentedControl *addRemoveOptionalButton;
+ NSButton *revertCurrentToDefaultButton;
+ NSButton *revertAllToDefaultButton;
+ NSButton *canEditDefaultTypesButton;
+ NSButton *okButton;
+ NSButton *cancelButton;
NSMutableDictionary *fieldsForTypesDict;
NSMutableArray *types;
NSMutableArray *currentRequiredFields;
@@ -63,6 +63,18 @@
+ (BDSKTypeInfoEditor *)sharedTypeInfoEditor;
+@property (nonatomic, assign) IBOutlet NSTableView *typeTableView;
+@property (nonatomic, assign) IBOutlet NSTableView *requiredTableView;
+@property (nonatomic, assign) IBOutlet NSTableView *optionalTableView;
+@property (nonatomic, assign) IBOutlet NSSegmentedControl *addRemoveTypeButton;
+@property (nonatomic, assign) IBOutlet NSSegmentedControl
*addRemoveRequiredButton;
+@property (nonatomic, assign) IBOutlet NSSegmentedControl
*addRemoveOptionalButton;
+@property (nonatomic, assign) IBOutlet NSButton *revertCurrentToDefaultButton;
+@property (nonatomic, assign) IBOutlet NSButton *revertAllToDefaultButton;
+@property (nonatomic, assign) IBOutlet NSButton *canEditDefaultTypesButton;
+@property (nonatomic, assign) IBOutlet NSButton *okButton;
+@property (nonatomic, assign) IBOutlet NSButton *cancelButton;
+
- (void)revertTypes;
- (void)addType:(NSString *)newType withFields:(NSDictionary *)fieldsDict;
Modified: trunk/bibdesk/BDSKTypeInfoEditor.m
===================================================================
--- trunk/bibdesk/BDSKTypeInfoEditor.m 2019-07-17 06:30:15 UTC (rev 24037)
+++ trunk/bibdesk/BDSKTypeInfoEditor.m 2019-07-17 09:58:25 UTC (rev 24038)
@@ -55,7 +55,7 @@
@implementation BDSKTypeInfoEditor
-@synthesize currentType;
+@synthesize typeTableView, requiredTableView, optionalTableView,
addRemoveTypeButton, addRemoveRequiredButton, addRemoveOptionalButton,
revertCurrentToDefaultButton, revertAllToDefaultButton,
canEditDefaultTypesButton, okButton, cancelButton, currentType;
+ (BDSKTypeInfoEditor *)sharedTypeInfoEditor{
if (sharedTypeInfoEditor == nil)
Modified: trunk/bibdesk/BDSKURLGroupSheetController.h
===================================================================
--- trunk/bibdesk/BDSKURLGroupSheetController.h 2019-07-17 06:30:15 UTC (rev
24037)
+++ trunk/bibdesk/BDSKURLGroupSheetController.h 2019-07-17 09:58:25 UTC (rev
24038)
@@ -43,10 +43,10 @@
@interface BDSKURLGroupSheetController : NSWindowController
<NSTouchBarDelegate>
{
- IBOutlet BDSKDragTextField *urlField;
- IBOutlet NSObjectController *objectController;
- IBOutlet NSButton *okButton;
- IBOutlet NSButton *cancelButton;
+ BDSKDragTextField *urlField;
+ NSObjectController *objectController;
+ NSButton *okButton;
+ NSButton *cancelButton;
NSString *urlString;
NSUndoManager *undoManager;
BDSKFieldEditor *dragFieldEditor;
@@ -55,6 +55,11 @@
- (id)initWithURL:(NSURL *)aURL;
+@property (nonatomic, assign) IBOutlet BDSKDragTextField *urlField;
+@property (nonatomic, assign) IBOutlet NSObjectController *objectController;
+@property (nonatomic, assign) IBOutlet NSButton *okButton;
+@property (nonatomic, assign) IBOutlet NSButton *cancelButton;
+
- (IBAction)chooseURL:(id)sender;
@property (nonatomic, retain) NSString *urlString;
Modified: trunk/bibdesk/BDSKURLGroupSheetController.m
===================================================================
--- trunk/bibdesk/BDSKURLGroupSheetController.m 2019-07-17 06:30:15 UTC (rev
24037)
+++ trunk/bibdesk/BDSKURLGroupSheetController.m 2019-07-17 09:58:25 UTC (rev
24038)
@@ -51,7 +51,7 @@
@implementation BDSKURLGroupSheetController
-@synthesize urlString;
+@synthesize urlField, objectController, okButton, cancelButton, urlString;
@dynamic URL, undoManager;
- (id)init {
Modified: trunk/bibdesk/BDSKURLSheetController.h
===================================================================
--- trunk/bibdesk/BDSKURLSheetController.h 2019-07-17 06:30:15 UTC (rev
24037)
+++ trunk/bibdesk/BDSKURLSheetController.h 2019-07-17 09:58:25 UTC (rev
24038)
@@ -40,11 +40,15 @@
#import "NSTouchBar_BDSKForwardDeclarations.h"
@interface BDSKURLSheetController : NSWindowController <NSTouchBarDelegate> {
- IBOutlet NSTextField *urlField;
- IBOutlet NSButton *okButton;
- IBOutlet NSButton *cancelButton;
+ NSTextField *urlField;
+ NSButton *okButton;
+ NSButton *cancelButton;
}
+@property (nonatomic, assign) IBOutlet NSTextField *urlField;
+@property (nonatomic, assign) IBOutlet NSButton *okButton;
+@property (nonatomic, assign) IBOutlet NSButton *cancelButton;
+
@property (nonatomic, retain) NSString *urlString;
@property (nonatomic, readonly) NSURL *URL;
Modified: trunk/bibdesk/BDSKURLSheetController.m
===================================================================
--- trunk/bibdesk/BDSKURLSheetController.m 2019-07-17 06:30:15 UTC (rev
24037)
+++ trunk/bibdesk/BDSKURLSheetController.m 2019-07-17 09:58:25 UTC (rev
24038)
@@ -46,6 +46,7 @@
@implementation BDSKURLSheetController
+@synthesize urlField, okButton, cancelButton;
@dynamic urlString, URL;
- (NSString *)windowNibName {
Modified: trunk/bibdesk/BDSKWebGroupViewController.h
===================================================================
--- trunk/bibdesk/BDSKWebGroupViewController.h 2019-07-17 06:30:15 UTC (rev
24037)
+++ trunk/bibdesk/BDSKWebGroupViewController.h 2019-07-17 09:58:25 UTC (rev
24038)
@@ -43,12 +43,16 @@
@class BDSKCollapsibleView, BDSKEdgeView, BDSKAddressTextField,
BDSKFieldEditor;
@interface BDSKWebGroupViewController : NSViewController <NSMenuDelegate,
BDSKWebViewNavigationDelegate> {
- IBOutlet BDSKCollapsibleView *collapsibleView;
- IBOutlet BDSKAddressTextField *urlField;
- IBOutlet NSSegmentedControl *backForwardButton;
+ BDSKCollapsibleView *collapsibleView;
+ BDSKAddressTextField *urlField;
+ NSSegmentedControl *backForwardButton;
BDSKFieldEditor *fieldEditor;
}
+@property (nonatomic, assign) IBOutlet BDSKCollapsibleView *collapsibleView;
+@property (nonatomic, assign) IBOutlet BDSKAddressTextField *urlField;
+@property (nonatomic, assign) IBOutlet NSSegmentedControl *backForwardButton;
+
@property (nonatomic, retain) BDSKWebView *webView;
- (IBAction)changeURL:(id)sender;
Modified: trunk/bibdesk/BDSKWebGroupViewController.m
===================================================================
--- trunk/bibdesk/BDSKWebGroupViewController.m 2019-07-17 06:30:15 UTC (rev
24037)
+++ trunk/bibdesk/BDSKWebGroupViewController.m 2019-07-17 09:58:25 UTC (rev
24038)
@@ -59,6 +59,7 @@
@implementation BDSKWebGroupViewController
+@synthesize collapsibleView, urlField, backForwardButton;
@dynamic webView;
- (id)init {
Modified: trunk/bibdesk/BibDocument.h
===================================================================
--- trunk/bibdesk/BibDocument.h 2019-07-17 06:30:15 UTC (rev 24037)
+++ trunk/bibdesk/BibDocument.h 2019-07-17 09:58:25 UTC (rev 24038)
@@ -106,12 +106,12 @@
{
#pragma mark Main tableview pane variables
- IBOutlet NSWindow *documentWindow;
- IBOutlet BDSKMainTableView *tableView;
- IBOutlet NSSplitView *splitView;
- IBOutlet BDSKColoredView *mainBox;
- IBOutlet NSView *mainView;
- IBOutlet BDSKStatusBar *statusBar;
+ NSWindow *documentWindow;
+ BDSKMainTableView *tableView;
+ NSSplitView *splitView;
+ BDSKColoredView *mainBox;
+ NSView *mainView;
+ BDSKStatusBar *statusBar;
BDSKFileContentSearchController *fileSearchController;
@@ -125,21 +125,21 @@
#pragma mark Group pane variables
- IBOutlet BDSKGroupOutlineView *groupOutlineView;
- IBOutlet NSSplitView *groupSplitView;
- IBOutlet NSPopUpButton *groupActionButton;
- IBOutlet NSPopUpButton *groupAddButton;
- IBOutlet BDSKCollapsibleView *groupButtonView;
- IBOutlet NSMenu *groupFieldMenu;
+ BDSKGroupOutlineView *groupOutlineView;
+ NSSplitView *groupSplitView;
+ NSPopUpButton *groupActionButton;
+ NSPopUpButton *groupAddButton;
+ BDSKCollapsibleView *groupButtonView;
+ NSMenu *groupFieldMenu;
NSMapTable *groupSpinners;
#pragma mark Side preview variables
- IBOutlet NSTabView *sidePreviewTabView;
- IBOutlet NSTextView *sidePreviewTextView;
- IBOutlet FVFileView *sideFileView;
+ NSTabView *sidePreviewTabView;
+ NSTextView *sidePreviewTextView;
+ FVFileView *sideFileView;
- IBOutlet NSSegmentedControl *sidePreviewButton;
+ NSSegmentedControl *sidePreviewButton;
NSMenu *sideTemplatePreviewMenu;
BDSKPreviewDisplay sidePreviewDisplay;
@@ -147,12 +147,12 @@
#pragma mark Bottom preview variables
- IBOutlet NSTabView *bottomPreviewTabView;
- IBOutlet NSTextView *bottomPreviewTextView;
- IBOutlet FVFileView *bottomFileView;
+ NSTabView *bottomPreviewTabView;
+ NSTextView *bottomPreviewTextView;
+ FVFileView *bottomFileView;
BDSKPreviewer *previewer;
- IBOutlet NSSegmentedControl *bottomPreviewButton;
+ NSSegmentedControl *bottomPreviewButton;
NSMenu *bottomTemplatePreviewMenu;
BDSKPreviewDisplay bottomPreviewDisplay;
@@ -162,10 +162,10 @@
NSMutableDictionary *toolbarItems;
- IBOutlet BDSKImagePopUpButton * actionMenuButton;
- IBOutlet BDSKImagePopUpButton * groupActionMenuButton;
+ BDSKImagePopUpButton *actionMenuButton;
+ BDSKImagePopUpButton *groupActionMenuButton;
- IBOutlet NSSearchField *searchField;
+ NSSearchField *searchField;
#pragma mark Custom Cite-String drawer variables
@@ -181,9 +181,9 @@
#pragma mark Menu variables
- IBOutlet NSMenu * groupMenu;
- IBOutlet NSMenu * actionMenu;
- IBOutlet NSMenu * copyAsMenu;
+ NSMenu *groupMenu;
+ NSMenu *actionMenu;
+ NSMenu *alternateCopyMenu;
#pragma mark Accessory view variables
@@ -269,6 +269,33 @@
NSString *uniqueID;
}
+@property (nonatomic, assign) IBOutlet NSWindow *documentWindow;
+@property (nonatomic, assign) IBOutlet BDSKMainTableView *tableView;
+@property (nonatomic, assign) IBOutlet NSSplitView *splitView;
+@property (nonatomic, assign) IBOutlet BDSKColoredView *mainBox;
+@property (nonatomic, assign) IBOutlet NSView *mainView;
+@property (nonatomic, assign) IBOutlet BDSKStatusBar *statusBar;
+@property (nonatomic, assign) IBOutlet BDSKGroupOutlineView *groupOutlineView;
+@property (nonatomic, assign) IBOutlet NSSplitView *groupSplitView;
+@property (nonatomic, assign) IBOutlet NSPopUpButton *groupActionButton;
+@property (nonatomic, assign) IBOutlet NSPopUpButton *groupAddButton;
+@property (nonatomic, assign) IBOutlet BDSKCollapsibleView *groupButtonView;
+@property (nonatomic, assign) IBOutlet NSMenu *groupFieldMenu;
+@property (nonatomic, assign) IBOutlet NSTabView *sidePreviewTabView;
+@property (nonatomic, assign) IBOutlet NSTextView *sidePreviewTextView;
+@property (nonatomic, assign) IBOutlet FVFileView *sideFileView;
+@property (nonatomic, assign) IBOutlet NSSegmentedControl *sidePreviewButton;
+@property (nonatomic, assign) IBOutlet NSTabView *bottomPreviewTabView;
+@property (nonatomic, assign) IBOutlet NSTextView *bottomPreviewTextView;
+@property (nonatomic, assign) IBOutlet FVFileView *bottomFileView;
+@property (nonatomic, assign) IBOutlet NSSegmentedControl *bottomPreviewButton;
+@property (nonatomic, assign) IBOutlet BDSKImagePopUpButton *actionMenuButton;
+@property (nonatomic, assign) IBOutlet BDSKImagePopUpButton
*groupActionMenuButton;
+@property (nonatomic, assign) IBOutlet NSSearchField *searchField;
+@property (nonatomic, assign) IBOutlet NSMenu *groupMenu;
+@property (nonatomic, assign) IBOutlet NSMenu *actionMenu;
+@property (nonatomic, assign) IBOutlet NSMenu *alternateCopyMenu;
+
@property (nonatomic, readonly) BOOL isMainDocument;
- (BOOL)commitPendingEdits;
Modified: trunk/bibdesk/BibDocument.m
===================================================================
--- trunk/bibdesk/BibDocument.m 2019-07-17 06:30:15 UTC (rev 24037)
+++ trunk/bibdesk/BibDocument.m 2019-07-17 09:58:25 UTC (rev 24038)
@@ -186,7 +186,7 @@
@implementation BibDocument
-@synthesize publications, shownPublications, groups, documentInfo,
searchIndexes, macroResolver, documentStringEncoding;
+@synthesize documentWindow, tableView, splitView, mainBox, mainView,
statusBar, groupOutlineView, groupSplitView, groupActionButton, groupAddButton,
groupButtonView, groupFieldMenu, sidePreviewTabView, sidePreviewTextView,
sideFileView, sidePreviewButton, bottomPreviewTabView, bottomPreviewTextView,
bottomFileView, bottomPreviewButton, actionMenuButton, groupActionMenuButton,
searchField, groupMenu, actionMenu, alternateCopyMenu, publications,
shownPublications, groups, documentInfo, searchIndexes, macroResolver,
documentStringEncoding;
@dynamic mainWindowSetupDictionaryFromExtendedAttributes, isMainDocument,
atomData, MODSData, endNoteData, wordXMLData, numberOfSelectedPubs,
numberOfClickedOrSelectedPubs, selectedPublications,
clickedOrSelectedPublications, singleSelectedPublication, selectedFileURLs,
clickedOrSelectedFileURLs, selectedRemoteURLs, clickedOrSelectedRemoteURLs;
+ (void)initialize {
Modified: trunk/bibdesk/BibDocument_UI.m
===================================================================
--- trunk/bibdesk/BibDocument_UI.m 2019-07-17 06:30:15 UTC (rev 24037)
+++ trunk/bibdesk/BibDocument_UI.m 2019-07-17 09:58:25 UTC (rev 24038)
@@ -673,7 +673,7 @@
[menu addItem:[[item copyWithZone:[menu zone]] autorelease]];
}
}else{
- [self menuNeedsUpdate:copyAsMenu];
+ [self menuNeedsUpdate:alternateCopyMenu];
[menu addItemsFromMenu:actionMenu];
[menu removeItemAtIndex:0];
if ([tcId isRatingField] && [tableView
numberOfClickedOrSelectedRows] == 1 && [self
hasGroupTypeSelected:BDSKExternalGroupType] == NO){
@@ -734,7 +734,7 @@
- (void)menuNeedsUpdate:(NSMenu *)menu {
if (menu == bottomTemplatePreviewMenu || menu == sideTemplatePreviewMenu)
[self updateTemplatePreviewMenu:menu];
- else if (menu == copyAsMenu)
+ else if (menu == alternateCopyMenu)
[self updateCopyAsMenu:menu];
else if (menu == [tableView menu])
[self updateMainTableMenu:menu];
Modified: trunk/bibdesk/BibPref_AutoFile.h
===================================================================
--- trunk/bibdesk/BibPref_AutoFile.h 2019-07-17 06:30:15 UTC (rev 24037)
+++ trunk/bibdesk/BibPref_AutoFile.h 2019-07-17 09:58:25 UTC (rev 24038)
@@ -42,26 +42,43 @@
@interface BibPref_AutoFile : BDSKPreferencePane
<NSControlTextEditingDelegate> {
- IBOutlet NSPanel *formatSheet;
- IBOutlet NSTextField* papersFolderLocationTextField;
- IBOutlet NSButton* choosePapersFolderLocationButton;
- IBOutlet NSMatrix *papersFolderLocationRadio;
- IBOutlet NSButton* filePapersAutomaticallyCheckButton;
- IBOutlet NSButton* warnOnMoveFolderCheckButton;
- IBOutlet NSTextField *formatField;
- IBOutlet NSTextField *formatSheetField;
- IBOutlet NSPopUpButton *formatPresetPopUp;
- IBOutlet NSPopUpButton *formatPresetSheetPopUp;
- IBOutlet NSPopUpButton *formatRepositoryPopUp;
- IBOutlet NSButton *formatWarningButton;
- IBOutlet NSButton *formatLowercaseCheckButton;
- IBOutlet NSTextField *previewTextField;
- IBOutlet NSMatrix *formatCleanRadio;
- IBOutlet NSTextField *previewDisplay;
+ NSPanel *formatSheet;
+ NSTextField *papersFolderLocationTextField;
+ NSButton *choosePapersFolderLocationButton;
+ NSMatrix *papersFolderLocationRadio;
+ NSButton *filePapersAutomaticallyCheckButton;
+ NSButton *warnOnMoveFolderCheckButton;
+ NSTextField *formatField;
+ NSTextField *formatSheetField;
+ NSPopUpButton *formatPresetPopUp;
+ NSPopUpButton *formatPresetSheetPopUp;
+ NSPopUpButton *formatRepositoryPopUp;
+ NSButton *formatWarningButton;
+ NSButton *formatLowercaseCheckButton;
+ NSTextField *previewTextField;
+ NSMatrix *formatCleanRadio;
+ NSTextField *previewDisplay;
NSString *lastPapersFolderPath;
}
+@property (nonatomic, assign) IBOutlet NSPanel *formatSheet;
+@property (nonatomic, assign) IBOutlet NSTextField
*papersFolderLocationTextField;
+@property (nonatomic, assign) IBOutlet NSButton
*choosePapersFolderLocationButton;
+@property (nonatomic, assign) IBOutlet NSMatrix *papersFolderLocationRadio;
+@property (nonatomic, assign) IBOutlet NSButton
*filePapersAutomaticallyCheckButton;
+@property (nonatomic, assign) IBOutlet NSButton *warnOnMoveFolderCheckButton;
+@property (nonatomic, assign) IBOutlet NSTextField *formatField;
+@property (nonatomic, assign) IBOutlet NSTextField *formatSheetField;
+@property (nonatomic, assign) IBOutlet NSPopUpButton *formatPresetPopUp;
+@property (nonatomic, assign) IBOutlet NSPopUpButton *formatPresetSheetPopUp;
+@property (nonatomic, assign) IBOutlet NSPopUpButton *formatRepositoryPopUp;
+@property (nonatomic, assign) IBOutlet NSButton *formatWarningButton;
+@property (nonatomic, assign) IBOutlet NSButton *formatLowercaseCheckButton;
+@property (nonatomic, assign) IBOutlet NSTextField *previewTextField;
+@property (nonatomic, assign) IBOutlet NSMatrix *formatCleanRadio;
+@property (nonatomic, assign) IBOutlet NSTextField *previewDisplay;
+
- (IBAction)showFormatSheet:(id)sender;
- (IBAction)closeFormatSheet:(id)sender;
- (IBAction)setPapersFolderPathFromTextField:(id)sender;
Modified: trunk/bibdesk/BibPref_AutoFile.m
===================================================================
--- trunk/bibdesk/BibPref_AutoFile.m 2019-07-17 06:30:15 UTC (rev 24037)
+++ trunk/bibdesk/BibPref_AutoFile.m 2019-07-17 09:58:25 UTC (rev 24038)
@@ -65,6 +65,8 @@
@implementation BibPref_AutoFile
+@synthesize formatSheet, papersFolderLocationTextField,
choosePapersFolderLocationButton, papersFolderLocationRadio,
filePapersAutomaticallyCheckButton, warnOnMoveFolderCheckButton, formatField,
formatSheetField, formatPresetPopUp, formatPresetSheetPopUp,
formatRepositoryPopUp, formatWarningButton, formatLowercaseCheckButton,
previewTextField, formatCleanRadio, previewDisplay;
+
// these should correspond to the items in the popups set in IB
static NSString *presetFormatStrings[] = {@"%l%n0%e", @"%a1/%Y%u0%e",
@"%a1/%T5%n0%e"};
static NSString *repositorySpecifierStrings[] = {@"", @"%a00", @"%A0",
@"%p00", @"%P0", @"%t0", @"%T0", @"%Y", @"%y", @"%m", @"%k0", @"%L", @"%l",
@"%e", @"%E", @"%b", @"%f{}0", @"%w{}[ ]0", @"%s{}[][][]0", @"%c{}", @"%f{Cite
Key}", @"%f{BibTeX Type}", @"%i{}0", @"%u0", @"%U0", @"%n0", @"%0", @"%%"};
Modified: trunk/bibdesk/BibPref_Cite.h
===================================================================
--- trunk/bibdesk/BibPref_Cite.h 2019-07-17 06:30:15 UTC (rev 24037)
+++ trunk/bibdesk/BibPref_Cite.h 2019-07-17 09:58:25 UTC (rev 24038)
@@ -38,18 +38,28 @@
@interface BibPref_Cite : BDSKPreferencePane <NSTextFieldDelegate>
{
- IBOutlet NSPopUpButton* defaultDragCopyPopup;
- IBOutlet NSPopUpButton* defaultDragCopyTemplatePopup;
- IBOutlet NSPopUpButton* alternateDragCopyPopup;
- IBOutlet NSPopUpButton* alternateDragCopyTemplatePopup;
+ NSPopUpButton *defaultDragCopyPopup;
+ NSPopUpButton *defaultDragCopyTemplatePopup;
+ NSPopUpButton *alternateDragCopyPopup;
+ NSPopUpButton *alternateDragCopyTemplatePopup;
- IBOutlet NSTextField* citeBehaviorLine; /*! for feedback */
- IBOutlet NSTextField* citeStringField; /*! for user input */
- IBOutlet NSMatrix* separateCiteRadio;
- IBOutlet NSButton* prependTildeCheckButton;
- IBOutlet NSMatrix* citeBracketRadio;
+ NSTextField *citeBehaviorLine;
+ NSTextField *citeStringField;
+ NSMatrix *separateCiteRadio;
+ NSButton *prependTildeCheckButton;
+ NSMatrix *citeBracketRadio;
}
+@property (nonatomic, assign) IBOutlet NSPopUpButton *defaultDragCopyPopup;
+@property (nonatomic, assign) IBOutlet NSPopUpButton
*defaultDragCopyTemplatePopup;
+@property (nonatomic, assign) IBOutlet NSPopUpButton *alternateDragCopyPopup;
+@property (nonatomic, assign) IBOutlet NSPopUpButton
*alternateDragCopyTemplatePopup;
+@property (nonatomic, assign) IBOutlet NSTextField *citeBehaviorLine;
+@property (nonatomic, assign) IBOutlet NSTextField *citeStringField;
+@property (nonatomic, assign) IBOutlet NSMatrix *separateCiteRadio;
+@property (nonatomic, assign) IBOutlet NSButton *prependTildeCheckButton;
+@property (nonatomic, assign) IBOutlet NSMatrix *citeBracketRadio;
+
- (IBAction)changeDefaultDragCopyFormat:(id)sender;
- (IBAction)changeDefaultDragCopyTemplate:(id)sender;
- (IBAction)changeAlternateDragCopyFormat:(id)sender;
Modified: trunk/bibdesk/BibPref_Cite.m
===================================================================
--- trunk/bibdesk/BibPref_Cite.m 2019-07-17 06:30:15 UTC (rev 24037)
+++ trunk/bibdesk/BibPref_Cite.m 2019-07-17 09:58:25 UTC (rev 24038)
@@ -52,6 +52,8 @@
@implementation BibPref_Cite
+@synthesize defaultDragCopyPopup, defaultDragCopyTemplatePopup,
alternateDragCopyPopup, alternateDragCopyTemplatePopup, citeBehaviorLine,
citeStringField, separateCiteRadio, prependTildeCheckButton, citeBracketRadio;
+
- (void)loadView {
[super loadView];
Modified: trunk/bibdesk/BibPref_CiteKey.h
===================================================================
--- trunk/bibdesk/BibPref_CiteKey.h 2019-07-17 06:30:15 UTC (rev 24037)
+++ trunk/bibdesk/BibPref_CiteKey.h 2019-07-17 09:58:25 UTC (rev 24038)
@@ -42,20 +42,33 @@
@interface BibPref_CiteKey : BDSKPreferencePane
{
- IBOutlet NSPanel *formatSheet;
- IBOutlet NSTextField *citeKeyLine;
- IBOutlet NSTextField *formatField;
- IBOutlet NSTextField *formatSheetField;
- IBOutlet NSPopUpButton *formatPresetPopUp;
- IBOutlet NSPopUpButton *formatPresetSheetPopUp;
- IBOutlet NSPopUpButton *formatRepositoryPopUp;
- IBOutlet NSButton *formatWarningButton;
- IBOutlet NSButton* citeKeyAutogenerateCheckButton;
- IBOutlet NSButton* citeKeyLowercaseCheckButton;
- IBOutlet NSMatrix *formatCleanRadio;
- IBOutlet NSTextField *previewDisplay;
+ NSPanel *formatSheet;
+ NSTextField *citeKeyLine;
+ NSTextField *formatField;
+ NSTextField *formatSheetField;
+ NSPopUpButton *formatPresetPopUp;
+ NSPopUpButton *formatPresetSheetPopUp;
+ NSPopUpButton *formatRepositoryPopUp;
+ NSButton *formatWarningButton;
+ NSButton *citeKeyAutogenerateCheckButton;
+ NSButton *citeKeyLowercaseCheckButton;
+ NSMatrix *formatCleanRadio;
+ NSTextField *previewDisplay;
}
+@property (nonatomic, assign) IBOutlet NSPanel *formatSheet;
+@property (nonatomic, assign) IBOutlet NSTextField *citeKeyLine;
+@property (nonatomic, assign) IBOutlet NSTextField *formatField;
+@property (nonatomic, assign) IBOutlet NSTextField *formatSheetField;
+@property (nonatomic, assign) IBOutlet NSPopUpButton *formatPresetPopUp;
+@property (nonatomic, assign) IBOutlet NSPopUpButton *formatPresetSheetPopUp;
+@property (nonatomic, assign) IBOutlet NSPopUpButton *formatRepositoryPopUp;
+@property (nonatomic, assign) IBOutlet NSButton *formatWarningButton;
+@property (nonatomic, assign) IBOutlet NSButton
*citeKeyAutogenerateCheckButton;
+@property (nonatomic, assign) IBOutlet NSButton *citeKeyLowercaseCheckButton;
+@property (nonatomic, assign) IBOutlet NSMatrix *formatCleanRadio;
+@property (nonatomic, assign) IBOutlet NSTextField *previewDisplay;
+
- (IBAction)showFormatSheet:(id)sender;
- (IBAction)closeFormatSheet:(id)sender;
- (IBAction)citeKeyFormatChanged:(id)sender;
Modified: trunk/bibdesk/BibPref_CiteKey.m
===================================================================
--- trunk/bibdesk/BibPref_CiteKey.m 2019-07-17 06:30:15 UTC (rev 24037)
+++ trunk/bibdesk/BibPref_CiteKey.m 2019-07-17 09:58:25 UTC (rev 24038)
@@ -61,6 +61,8 @@
@implementation BibPref_CiteKey
+@synthesize formatSheet, citeKeyLine, formatField, formatSheetField,
formatPresetPopUp, formatPresetSheetPopUp, formatRepositoryPopUp,
formatWarningButton, citeKeyAutogenerateCheckButton,
citeKeyLowercaseCheckButton, formatCleanRadio, previewDisplay;
+
// these should correspond to the items in the popups set in IB
static NSString *presetFormatStrings[] = {@"%a1:%Y%u2", @"%a1:%Y%u0",
@"%a33%y%m", @"%a1%Y%t15"};
static NSString *repositorySpecifierStrings[] = {@"", @"%a00", @"%A0",
@"%p00", @"%P0", @"%t0", @"%T0", @"%Y", @"%y", @"%m", @"%k0", @"%f{}0", @"%w{}[
]0", @"%s{}[][][]0", @"%c{}", @"%f{BibTeX Type}", @"%i{}0", @"%u0", @"%U0",
@"%n0", @"%0", @"%%"};
Modified: trunk/bibdesk/BibPref_Crossref.h
===================================================================
--- trunk/bibdesk/BibPref_Crossref.h 2019-07-17 06:30:15 UTC (rev 24037)
+++ trunk/bibdesk/BibPref_Crossref.h 2019-07-17 09:58:25 UTC (rev 24038)
@@ -41,15 +41,22 @@
@interface BibPref_Crossref : BDSKPreferencePane <NSTableViewDelegate,
NSTableViewDataSource>
{
- IBOutlet NSButton* autoSortCheckButton;
- IBOutlet NSButton* warnOnEditInheritedCheckButton;
- IBOutlet NSButton* duplicateBooktitleCheckButton;
- IBOutlet NSButton* forceDuplicateBooktitleCheckButton;
- IBOutlet NSSegmentedControl* addRemoveTypeButton;
- IBOutlet NSTableView *tableView;
+ NSButton *autoSortCheckButton;
+ NSButton *warnOnEditInheritedCheckButton;
+ NSButton *duplicateBooktitleCheckButton;
+ NSButton *forceDuplicateBooktitleCheckButton;
+ NSSegmentedControl *addRemoveTypeButton;
+ NSTableView *tableView;
NSMutableArray *typesArray;
}
+@property (nonatomic, assign) IBOutlet NSButton *autoSortCheckButton;
+@property (nonatomic, assign) IBOutlet NSButton
*warnOnEditInheritedCheckButton;
+@property (nonatomic, assign) IBOutlet NSButton *duplicateBooktitleCheckButton;
+@property (nonatomic, assign) IBOutlet NSButton
*forceDuplicateBooktitleCheckButton;
+@property (nonatomic, assign) IBOutlet NSSegmentedControl *addRemoveTypeButton;
+@property (nonatomic, assign) IBOutlet NSTableView *tableView;
+
- (IBAction)changeAutoSort:(id)sender;
- (IBAction)changeWarnOnEditInherited:(id)sender;
- (IBAction)changeDuplicateBooktitle:(id)sender;
Modified: trunk/bibdesk/BibPref_Crossref.m
===================================================================
--- trunk/bibdesk/BibPref_Crossref.m 2019-07-17 06:30:15 UTC (rev 24037)
+++ trunk/bibdesk/BibPref_Crossref.m 2019-07-17 09:58:25 UTC (rev 24038)
@@ -51,6 +51,8 @@
@implementation BibPref_Crossref
+@synthesize autoSortCheckButton, warnOnEditInheritedCheckButton,
duplicateBooktitleCheckButton, forceDuplicateBooktitleCheckButton,
addRemoveTypeButton, tableView;
+
- (void)loadView {
[super loadView];
Modified: trunk/bibdesk/BibPref_Defaults.h
===================================================================
--- trunk/bibdesk/BibPref_Defaults.h 2019-07-17 06:30:15 UTC (rev 24037)
+++ trunk/bibdesk/BibPref_Defaults.h 2019-07-17 09:58:25 UTC (rev 24038)
@@ -40,18 +40,18 @@
@interface BibPref_Defaults : BDSKPreferencePane <NSTableViewDelegate,
NSTableViewDataSource>
{
- IBOutlet NSButton* useLocalUrlButton;
- IBOutlet NSButton* convertURLFieldsButton;
- IBOutlet NSButton* removeLocalFileFieldsButton;
- IBOutlet NSButton* removeRemoteURLFieldsButton;
- IBOutlet NSSegmentedControl* addRemoveDefaultFieldButton;
- IBOutlet NSWindow* globalMacroFileSheet;
- IBOutlet BDSKTableView* globalMacroFilesTableView;
- IBOutlet NSTableView* defaultFieldsTableView;
- IBOutlet NSButton *editGlobalMacroDefsButton;
- IBOutlet NSMenu *fieldTypeMenu;
- IBOutlet NSPopUpButton *localFileOptionPopup;
- IBOutlet NSPopUpButton *pdfViewerPopup;
+ NSButton *useLocalUrlButton;
+ NSButton *convertURLFieldsButton;
+ NSButton *removeLocalFileFieldsButton;
+ NSButton *removeRemoteURLFieldsButton;
+ NSSegmentedControl *addRemoveDefaultFieldButton;
+ NSWindow *globalMacroFileSheet;
+ BDSKTableView *globalMacroFilesTableView;
+ NSTableView *defaultFieldsTableView;
+ NSButton *editGlobalMacroDefsButton;
+ NSMenu *fieldTypeMenu;
+ NSPopUpButton *localFileOptionPopup;
+ NSPopUpButton *pdfViewerPopup;
NSMutableArray *customFieldsArray;
NSMutableSet *customFieldsSet;
NSMutableArray *globalMacroFiles;
@@ -58,6 +58,19 @@
BDSKMacroWindowController *macroWC;
}
+@property (nonatomic, assign) IBOutlet NSButton *useLocalUrlButton;
+@property (nonatomic, assign) IBOutlet NSButton *convertURLFieldsButton;
+@property (nonatomic, assign) IBOutlet NSButton *removeLocalFileFieldsButton;
+@property (nonatomic, assign) IBOutlet NSButton *removeRemoteURLFieldsButton;
+@property (nonatomic, assign) IBOutlet NSSegmentedControl
*addRemoveDefaultFieldButton;
+@property (nonatomic, assign) IBOutlet NSWindow *globalMacroFileSheet;
+@property (nonatomic, assign) IBOutlet BDSKTableView
*globalMacroFilesTableView;
+@property (nonatomic, assign) IBOutlet NSTableView *defaultFieldsTableView;
+@property (nonatomic, assign) IBOutlet NSButton *editGlobalMacroDefsButton;
+@property (nonatomic, assign) IBOutlet NSMenu *fieldTypeMenu;
+@property (nonatomic, assign) IBOutlet NSPopUpButton *localFileOptionPopup;
+@property (nonatomic, assign) IBOutlet NSPopUpButton *pdfViewerPopup;
+
- (IBAction)changeUseLocalUrl:(id)sender;
- (IBAction)changeConvertURLFields:(id)sender;
- (IBAction)changeRemoveLocalFileFields:(id)sender;
Modified: trunk/bibdesk/BibPref_Defaults.m
===================================================================
--- trunk/bibdesk/BibPref_Defaults.m 2019-07-17 06:30:15 UTC (rev 24037)
+++ trunk/bibdesk/BibPref_Defaults.m 2019-07-17 09:58:25 UTC (rev 24038)
@@ -70,6 +70,8 @@
@implementation BibPref_Defaults
+@synthesize useLocalUrlButton, convertURLFieldsButton,
removeLocalFileFieldsButton, removeRemoteURLFieldsButton,
addRemoveDefaultFieldButton, globalMacroFileSheet, globalMacroFilesTableView,
defaultFieldsTableView, editGlobalMacroDefsButton, fieldTypeMenu,
localFileOptionPopup, pdfViewerPopup;
+
+ (void)initialize {
BDSKINITIALIZE;
alwaysDisabledFields = [[NSSet alloc] initWithObjects:BDSKAuthorString,
BDSKEditorString, nil];
Modified: trunk/bibdesk/BibPref_Display.h
===================================================================
--- trunk/bibdesk/BibPref_Display.h 2019-07-17 06:30:15 UTC (rev 24037)
+++ trunk/bibdesk/BibPref_Display.h 2019-07-17 09:58:25 UTC (rev 24038)
@@ -43,26 +43,39 @@
@class BDSKFontWell;
@interface BibPref_Display : BDSKPreferencePane {
- IBOutlet NSComboBox *previewMaxNumberComboBox;
+ NSComboBox *previewMaxNumberComboBox;
- IBOutlet NSPopUpButton *fontElementPopup;
- IBOutlet NSButton *fontButton;
- IBOutlet BDSKFontWell *publicationsFontWell;
- IBOutlet BDSKFontWell *groupsFontWell;
- IBOutlet BDSKFontWell *personsFontWell;
- IBOutlet BDSKFontWell *abstractFontWell;
+ NSPopUpButton *fontElementPopup;
+ NSButton *fontButton;
+ BDSKFontWell *publicationsFontWell;
+ BDSKFontWell *groupsFontWell;
+ BDSKFontWell *personsFontWell;
+ BDSKFontWell *abstractFontWell;
- IBOutlet NSTextField *ignoredSortTermsField;
+ NSTextField *ignoredSortTermsField;
- IBOutlet NSButton *displayGroupCountButton;
+ NSButton *displayGroupCountButton;
- IBOutlet NSButton *authorFirstNameButton;
- IBOutlet NSButton *authorAbbreviateButton;
- IBOutlet NSButton *authorLastNameFirstButton;
+ NSButton *authorFirstNameButton;
+ NSButton *authorAbbreviateButton;
+ NSButton *authorLastNameFirstButton;
BOOL updatingFont;
}
+@property (nonatomic, assign) IBOutlet NSComboBox *previewMaxNumberComboBox;
+@property (nonatomic, assign) IBOutlet NSPopUpButton *fontElementPopup;
+@property (nonatomic, assign) IBOutlet NSButton *fontButton;
+@property (nonatomic, assign) IBOutlet BDSKFontWell *publicationsFontWell;
+@property (nonatomic, assign) IBOutlet BDSKFontWell *groupsFontWell;
+@property (nonatomic, assign) IBOutlet BDSKFontWell *personsFontWell;
+@property (nonatomic, assign) IBOutlet BDSKFontWell *abstractFontWell;
+@property (nonatomic, assign) IBOutlet NSTextField *ignoredSortTermsField;
+@property (nonatomic, assign) IBOutlet NSButton *displayGroupCountButton;
+@property (nonatomic, assign) IBOutlet NSButton *authorFirstNameButton;
+@property (nonatomic, assign) IBOutlet NSButton *authorAbbreviateButton;
+@property (nonatomic, assign) IBOutlet NSButton *authorLastNameFirstButton;
+
- (IBAction)changePreviewMaxNumber:(id)sender;
- (IBAction)changeAuthorDisplay:(id)sender;
Modified: trunk/bibdesk/BibPref_Display.m
===================================================================
--- trunk/bibdesk/BibPref_Display.m 2019-07-17 06:30:15 UTC (rev 24037)
+++ trunk/bibdesk/BibPref_Display.m 2019-07-17 09:58:25 UTC (rev 24038)
@@ -58,6 +58,8 @@
@implementation BibPref_Display
+@synthesize previewMaxNumberComboBox, fontElementPopup, fontButton,
publicationsFontWell, groupsFontWell, personsFontWell, abstractFontWell,
ignoredSortTermsField, displayGroupCountButton, authorFirstNameButton,
authorAbbreviateButton, authorLastNameFirstButton;
+
- (void)loadView {
[super loadView];
Modified: trunk/bibdesk/BibPref_Export.h
===================================================================
--- trunk/bibdesk/BibPref_Export.h 2019-07-17 06:30:15 UTC (rev 24037)
+++ trunk/bibdesk/BibPref_Export.h 2019-07-17 09:58:25 UTC (rev 24038)
@@ -60,18 +60,24 @@
@interface BibPref_Export : BDSKPreferencePane <NSOutlineViewDelegate,
NSOutlineViewDataSource> {
- IBOutlet NSOutlineView *outlineView;
+ NSOutlineView *outlineView;
NSMutableArray *itemNodes;
NSMutableArray *roles;
NSArray *fileTypes;
BDSKTemplateListType templatePrefList;
BDSKTemplate *draggedTemplate;
- IBOutlet NSSegmentedControl *addRemoveButton;
- IBOutlet NSMatrix *prefListRadio;
- IBOutlet NSWindow *chooseMainPageSheet;
- IBOutlet NSPopUpButton *chooseMainPagePopup;
+ NSSegmentedControl *addRemoveButton;
+ NSMatrix *prefListRadio;
+ NSWindow *chooseMainPageSheet;
+ NSPopUpButton *chooseMainPagePopup;
}
+@property (nonatomic, assign) IBOutlet NSOutlineView *outlineView;
+@property (nonatomic, assign) IBOutlet NSSegmentedControl *addRemoveButton;
+@property (nonatomic, assign) IBOutlet NSMatrix *prefListRadio;
+@property (nonatomic, assign) IBOutlet NSWindow *chooseMainPageSheet;
+@property (nonatomic, assign) IBOutlet NSPopUpButton *chooseMainPagePopup;
+
- (IBAction)changePrefList:(id)sender;
- (IBAction)resetDefaultFiles:(id)sender;
Modified: trunk/bibdesk/BibPref_Export.m
===================================================================
--- trunk/bibdesk/BibPref_Export.m 2019-07-17 06:30:15 UTC (rev 24037)
+++ trunk/bibdesk/BibPref_Export.m 2019-07-17 09:58:25 UTC (rev 24038)
@@ -59,6 +59,8 @@
@implementation BibPref_Export
+@synthesize outlineView, addRemoveButton, prefListRadio, chooseMainPageSheet,
chooseMainPagePopup;
+
- (id)initWithRecord:(BDSKPreferenceRecord *)aRecord
forPreferenceController:(BDSKPreferenceController *)aController {
if(self = [super initWithRecord:aRecord
forPreferenceController:aController]){
Modified: trunk/bibdesk/BibPref_Files.h
===================================================================
--- trunk/bibdesk/BibPref_Files.h 2019-07-17 06:30:15 UTC (rev 24037)
+++ trunk/bibdesk/BibPref_Files.h 2019-07-17 09:58:25 UTC (rev 24038)
@@ -42,19 +42,30 @@
@class BDSKEncodingPopUpButton;
@interface BibPref_Files : BDSKPreferencePane {
- IBOutlet NSButton *showErrorsCheckButton;
- IBOutlet BDSKEncodingPopUpButton *encodingPopUp;
- IBOutlet NSButton *shouldTeXifyCheckButton;
- IBOutlet NSButton *saveAnnoteAndAbstractAtEndButton;
- IBOutlet NSButton *useNormalizedNamesButton;
- IBOutlet NSButton *useTemplateFileButton;
- IBOutlet NSButton *outputTemplateFileButton;
+ NSButton *showErrorsCheckButton;
+ BDSKEncodingPopUpButton *encodingPopUp;
+ NSButton *shouldTeXifyCheckButton;
+ NSButton *saveAnnoteAndAbstractAtEndButton;
+ NSButton *useNormalizedNamesButton;
+ NSButton *useTemplateFileButton;
+ NSButton *outputTemplateFileButton;
- IBOutlet NSMatrix *autosaveOptionRadio;
- IBOutlet NSStepper *autosaveTimeStepper;
- IBOutlet NSTextField *autosaveTimeField;
+ NSMatrix *autosaveOptionRadio;
+ NSStepper *autosaveTimeStepper;
+ NSTextField *autosaveTimeField;
}
+@property (nonatomic, assign) IBOutlet NSButton *showErrorsCheckButton;
+@property (nonatomic, assign) IBOutlet BDSKEncodingPopUpButton *encodingPopUp;
+@property (nonatomic, assign) IBOutlet NSButton *shouldTeXifyCheckButton;
+@property (nonatomic, assign) IBOutlet NSButton
*saveAnnoteAndAbstractAtEndButton;
+@property (nonatomic, assign) IBOutlet NSButton *useNormalizedNamesButton;
+@property (nonatomic, assign) IBOutlet NSButton *useTemplateFileButton;
+@property (nonatomic, assign) IBOutlet NSButton *outputTemplateFileButton;
+@property (nonatomic, assign) IBOutlet NSMatrix *autosaveOptionRadio;
+@property (nonatomic, assign) IBOutlet NSStepper *autosaveTimeStepper;
+@property (nonatomic, assign) IBOutlet NSTextField *autosaveTimeField;
+
- (IBAction)setDefaultStringEncoding:(id)sender;
- (IBAction)toggleShowWarnings:(id)sender;
- (IBAction)toggleShouldTeXify:(id)sender;
Modified: trunk/bibdesk/BibPref_Files.m
===================================================================
--- trunk/bibdesk/BibPref_Files.m 2019-07-17 06:30:15 UTC (rev 24037)
+++ trunk/bibdesk/BibPref_Files.m 2019-07-17 09:58:25 UTC (rev 24038)
@@ -55,6 +55,8 @@
@implementation BibPref_Files
+@synthesize showErrorsCheckButton, encodingPopUp, shouldTeXifyCheckButton,
saveAnnoteAndAbstractAtEndButton, useNormalizedNamesButton,
useTemplateFileButton, outputTemplateFileButton, autosaveOptionRadio,
autosaveTimeStepper, autosaveTimeField;
+
- (void)loadView {
[super loadView];
Modified: trunk/bibdesk/BibPref_General.h
===================================================================
--- trunk/bibdesk/BibPref_General.h 2019-07-17 06:30:15 UTC (rev 24037)
+++ trunk/bibdesk/BibPref_General.h 2019-07-17 09:58:25 UTC (rev 24038)
@@ -38,23 +38,37 @@
#import "BDSKPreferencePane.h"
@interface BibPref_General : BDSKPreferencePane {
- IBOutlet NSMatrix *startupBehaviorRadio;
- IBOutlet NSPopUpButton *emailTemplatePopup;
- IBOutlet NSButton *editOnPasteButton;
- IBOutlet NSButton *downloadImportedURLsButton;
- IBOutlet NSTextField *downloadedTypesTextField;
- IBOutlet NSButton *replaceDownloadedURLsButton;
- IBOutlet NSPopUpButton *checkForUpdatesButton;
- IBOutlet NSButton *warnOnDeleteButton;
- IBOutlet NSButton *warnOnRemovalFromGroupButton;
- IBOutlet NSButton *warnOnRenameGroupButton;
- IBOutlet NSButton *warnOnGenerateCiteKeysButton;
- IBOutlet NSButton *askToTrashFilesButton;
- IBOutlet NSTextField *defaultBibFileTextField;
- IBOutlet NSButton *defaultBibFileButton;
-
+ NSMatrix *startupBehaviorRadio;
+ NSPopUpButton *emailTemplatePopup;
+ NSButton *editOnPasteButton;
+ NSButton *downloadImportedURLsButton;
+ NSTextField *downloadedTypesTextField;
+ NSButton *replaceDownloadedURLsButton;
+ NSPopUpButton *checkForUpdatesButton;
+ NSButton *warnOnDeleteButton;
+ NSButton *warnOnRemovalFromGroupButton;
+ NSButton *warnOnRenameGroupButton;
+ NSButton *warnOnGenerateCiteKeysButton;
+ NSButton *askToTrashFilesButton;
+ NSTextField *defaultBibFileTextField;
+ NSButton *defaultBibFileButton;
}
+@property (nonatomic, assign) IBOutlet NSMatrix *startupBehaviorRadio;
+@property (nonatomic, assign) IBOutlet NSPopUpButton *emailTemplatePopup;
+@property (nonatomic, assign) IBOutlet NSButton *editOnPasteButton;
+@property (nonatomic, assign) IBOutlet NSButton *downloadImportedURLsButton;
+@property (nonatomic, assign) IBOutlet NSTextField *downloadedTypesTextField;
+@property (nonatomic, assign) IBOutlet NSButton *replaceDownloadedURLsButton;
+@property (nonatomic, assign) IBOutlet NSPopUpButton *checkForUpdatesButton;
+@property (nonatomic, assign) IBOutlet NSButton *warnOnDeleteButton;
+@property (nonatomic, assign) IBOutlet NSButton *warnOnRemovalFromGroupButton;
+@property (nonatomic, assign) IBOutlet NSButton *warnOnRenameGroupButton;
+@property (nonatomic, assign) IBOutlet NSButton *warnOnGenerateCiteKeysButton;
+@property (nonatomic, assign) IBOutlet NSButton *askToTrashFilesButton;
+@property (nonatomic, assign) IBOutlet NSTextField *defaultBibFileTextField;
+@property (nonatomic, assign) IBOutlet NSButton *defaultBibFileButton;
+
- (IBAction)setAutoOpenFilePath:(id)sender;
- (IBAction)changeStartupBehavior:(id)sender;
- (IBAction)changeEmailTemplate:(id)sender;
Modified: trunk/bibdesk/BibPref_General.m
===================================================================
--- trunk/bibdesk/BibPref_General.m 2019-07-17 06:30:15 UTC (rev 24037)
+++ trunk/bibdesk/BibPref_General.m 2019-07-17 09:58:25 UTC (rev 24038)
@@ -58,6 +58,8 @@
@implementation BibPref_General
+@synthesize startupBehaviorRadio, emailTemplatePopup, editOnPasteButton,
downloadImportedURLsButton, downloadedTypesTextField,
replaceDownloadedURLsButton, checkForUpdatesButton, warnOnDeleteButton,
warnOnRemovalFromGroupButton, warnOnRenameGroupButton,
warnOnGenerateCiteKeysButton, askToTrashFilesButton, defaultBibFileTextField,
defaultBibFileButton;
+
- (void)loadView {
[super loadView];
Modified: trunk/bibdesk/BibPref_ScriptHooks.h
===================================================================
--- trunk/bibdesk/BibPref_ScriptHooks.h 2019-07-17 06:30:15 UTC (rev 24037)
+++ trunk/bibdesk/BibPref_ScriptHooks.h 2019-07-17 09:58:25 UTC (rev 24038)
@@ -40,10 +40,13 @@
#import "BDSKPreferencePane.h"
@interface BibPref_ScriptHooks : BDSKPreferencePane <NSTableViewDelegate,
NSTableViewDataSource> {
- IBOutlet NSTableView *tableView;
- IBOutlet NSSegmentedControl *addRemoveButton;
+ NSTableView *tableView;
+ NSSegmentedControl *addRemoveButton;
}
+@property (nonatomic, assign) IBOutlet NSTableView *tableView;
+@property (nonatomic, assign) IBOutlet NSSegmentedControl *addRemoveButton;
+
- (IBAction)addRemoveScriptHook:(id)sender;
- (void)showOrChooseScriptFile:(id)sender;
Modified: trunk/bibdesk/BibPref_ScriptHooks.m
===================================================================
--- trunk/bibdesk/BibPref_ScriptHooks.m 2019-07-17 06:30:15 UTC (rev 24037)
+++ trunk/bibdesk/BibPref_ScriptHooks.m 2019-07-17 09:58:25 UTC (rev 24038)
@@ -46,6 +46,8 @@
@implementation BibPref_ScriptHooks
+@synthesize tableView, addRemoveButton;
+
- (void)loadView {
[super loadView];
Modified: trunk/bibdesk/BibPref_Sharing.h
===================================================================
--- trunk/bibdesk/BibPref_Sharing.h 2019-07-17 06:30:15 UTC (rev 24037)
+++ trunk/bibdesk/BibPref_Sharing.h 2019-07-17 09:58:25 UTC (rev 24038)
@@ -42,17 +42,26 @@
@interface BibPref_Sharing : BDSKPreferencePane
{
- IBOutlet NSButton *enableBrowsingButton;
- IBOutlet NSButton *enableSharingButton;
- IBOutlet NSButton *usePasswordButton;
- IBOutlet NSSecureTextField *passwordField;
- IBOutlet NSTextField *sharedNameField;
- IBOutlet NSTextField *statusField;
- IBOutlet NSTextField *usedNameField;
- IBOutlet NSImageView *statusImageView;
+ NSButton *enableBrowsingButton;
+ NSButton *enableSharingButton;
+ NSButton *usePasswordButton;
+ NSSecureTextField *passwordField;
+ NSTextField *sharedNameField;
+ NSTextField *statusField;
+ NSTextField *usedNameField;
+ NSImageView *statusImageView;
BOOL didReadPassword;
}
+@property (nonatomic, assign) IBOutlet NSButton *enableBrowsingButton;
+@property (nonatomic, assign) IBOutlet NSButton *enableSharingButton;
+@property (nonatomic, assign) IBOutlet NSButton *usePasswordButton;
+@property (nonatomic, assign) IBOutlet NSSecureTextField *passwordField;
+@property (nonatomic, assign) IBOutlet NSTextField *sharedNameField;
+@property (nonatomic, assign) IBOutlet NSTextField *statusField;
+@property (nonatomic, assign) IBOutlet NSTextField *usedNameField;
+@property (nonatomic, assign) IBOutlet NSImageView *statusImageView;
+
- (IBAction)changePassword:(id)sender;
- (IBAction)changeSharedName:(id)sender;
- (IBAction)toggleBrowsing:(id)sender;
Modified: trunk/bibdesk/BibPref_Sharing.m
===================================================================
--- trunk/bibdesk/BibPref_Sharing.m 2019-07-17 06:30:15 UTC (rev 24037)
+++ trunk/bibdesk/BibPref_Sharing.m 2019-07-17 09:58:25 UTC (rev 24038)
@@ -56,6 +56,8 @@
@implementation BibPref_Sharing
+@synthesize enableBrowsingButton, enableSharingButton, usePasswordButton,
passwordField, sharedNameField, statusField, usedNameField, statusImageView;
+
- (void)updateUI {
[enableSharingButton setState:[sud boolForKey:BDSKShouldShareFilesKey] ?
NSOnState : NSOffState];
[enableBrowsingButton setState:[sud
boolForKey:BDSKShouldLookForSharedFilesKey] ? NSOnState : NSOffState];
Modified: trunk/bibdesk/BibPref_TeX.h
===================================================================
--- trunk/bibdesk/BibPref_TeX.h 2019-07-17 06:30:15 UTC (rev 24037)
+++ trunk/bibdesk/BibPref_TeX.h 2019-07-17 09:58:25 UTC (rev 24038)
@@ -41,13 +41,19 @@
@interface BibPref_TeX : BDSKPreferencePane <NSTextFieldDelegate,
NSAlertDelegate>
{
- IBOutlet NSButton *usesTeXButton;
- IBOutlet NSTextField *texBinaryPathField;
- IBOutlet NSTextField *bibtexBinaryPathField;
- IBOutlet NSComboBox *bibTeXStyleField;
- IBOutlet BDSKEncodingPopUpButton *encodingPopUpButton;
+ NSButton *usesTeXButton;
+ NSTextField *texBinaryPathField;
+ NSTextField *bibtexBinaryPathField;
+ NSComboBox *bibTeXStyleField;
+ BDSKEncodingPopUpButton *encodingPopUpButton;
}
+@property (nonatomic, assign) IBOutlet NSButton *usesTeXButton;
+@property (nonatomic, assign) IBOutlet NSTextField *texBinaryPathField;
+@property (nonatomic, assign) IBOutlet NSTextField *bibtexBinaryPathField;
+@property (nonatomic, assign) IBOutlet NSComboBox *bibTeXStyleField;
+@property (nonatomic, assign) IBOutlet BDSKEncodingPopUpButton
*encodingPopUpButton;
+
- (IBAction)changeUsesTeX:(id)sender;
- (IBAction)changeTexBinPath:(id)sender;
- (IBAction)changeBibTexBinPath:(id)sender;
Modified: trunk/bibdesk/BibPref_TeX.m
===================================================================
--- trunk/bibdesk/BibPref_TeX.m 2019-07-17 06:30:15 UTC (rev 24037)
+++ trunk/bibdesk/BibPref_TeX.m 2019-07-17 09:58:25 UTC (rev 24038)
@@ -60,6 +60,8 @@
@implementation BibPref_TeX
+@synthesize usesTeXButton, texBinaryPathField, bibtexBinaryPathField,
bibTeXStyleField, encodingPopUpButton;
+
+ (void)initialize{
BDSKINITIALIZE;
// contents of /usr/local/gwTeX/texmf.texlive/bibtex/bst/base
Modified: trunk/bibdesk/English.lproj/BibDocument.xib
===================================================================
--- trunk/bibdesk/English.lproj/BibDocument.xib 2019-07-17 06:30:15 UTC (rev
24037)
+++ trunk/bibdesk/English.lproj/BibDocument.xib 2019-07-17 09:58:25 UTC (rev
24038)
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0"
toolsVersion="14490.70" targetRuntime="MacOSX.Cocoa"
propertyAccessControl="none">
<dependencies>
- <deployment identifier="macosx"/>
- <development version="8000" identifier="xcode"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin"
version="14490.70"/>
<capability name="documents saved in the Xcode 8 format"
minToolsVersion="8.0"/>
</dependencies>
@@ -11,11 +9,11 @@
<connections>
<outlet property="actionMenu" destination="433" id="532"/>
<outlet property="actionMenuButton" destination="834"
id="841"/>
+ <outlet property="alternateCopyMenu" destination="101143"
id="101453"/>
<outlet property="bottomFileView" destination="101218"
id="101221"/>
<outlet property="bottomPreviewButton" destination="101662"
id="101678"/>
<outlet property="bottomPreviewTabView" destination="101207"
id="101258"/>
<outlet property="bottomPreviewTextView" destination="101215"
id="101239"/>
- <outlet property="copyAsMenu" destination="101143"
id="101453"/>
<outlet property="documentWindow" destination="5" id="206"/>
<outlet property="groupActionButton" destination="101665"
id="101677"/>
<outlet property="groupActionMenuButton" destination="872"
id="877"/>
@@ -60,7 +58,7 @@
<autoresizingMask key="autoresizingMask"
widthSizable="YES" heightSizable="YES"/>
<clipView key="contentView"
drawsBackground="NO" id="dhN-dj-WmG">
<rect key="frame" x="0.0" y="0.0"
width="120" height="456"/>
- <autoresizingMask key="autoresizingMask"
widthSizable="YES" heightSizable="YES"/>
+ <autoresizingMask key="autoresizingMask"/>
<subviews>
<outlineView focusRingType="none"
verticalHuggingPriority="750" allowsExpansionToolTips="YES"
columnAutoresizingStyle="firstColumnOnly" selectionHighlightStyle="sourceList"
columnReordering="NO" columnResizing="NO" emptySelection="NO"
autosaveColumns="NO" typeSelect="NO" rowHeight="20" indentationPerLevel="14"
outlineTableColumn="101529" id="101527" customClass="BDSKGroupOutlineView">
<rect key="frame" x="0.0" y="0.0"
width="120" height="456"/>
@@ -118,7 +116,7 @@
<autoresizingMask
key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<clipView
key="contentView" id="Cwk-iE-Ppe">
<rect key="frame"
x="0.0" y="0.0" width="518" height="273"/>
- <autoresizingMask
key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <autoresizingMask
key="autoresizingMask"/>
<subviews>
<tableView
focusRingType="none" verticalHuggingPriority="750"
allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly"
alternatingRowBackgroundColors="YES" autosaveColumns="NO" typeSelect="NO"
rowHeight="14" headerView="101624" id="101585" customClass="BDSKMainTableView">
<rect
key="frame" x="0.0" y="0.0" width="518" height="248"/>
@@ -164,7 +162,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES"
heightSizable="YES"/>
<clipView
key="contentView" id="zYz-5T-Zh9">
<rect
key="frame" x="0.0" y="0.0" width="518" height="174"/>
-
<autoresizingMask key="autoresizingMask" widthSizable="YES"
heightSizable="YES"/>
+
<autoresizingMask key="autoresizingMask"/>
<subviews>
<textView focusRingType="none" editable="NO" importsGraphics="NO"
verticallyResizable="YES" usesFontPanel="YES" findStyle="panel" usesRuler="YES"
spellingCorrection="YES" smartInsertDelete="YES" id="101215"
customClass="BDSKZoomableTextView">
<rect key="frame" x="0.0" y="0.0" width="518" height="174"/>
@@ -260,7 +258,7 @@
<autoresizingMask
key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<clipView
key="contentView" id="Xwh-zv-1eo">
<rect key="frame"
x="0.0" y="0.0" width="120" height="456"/>
- <autoresizingMask
key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <autoresizingMask
key="autoresizingMask"/>
<subviews>
<textView
focusRingType="none" editable="NO" importsGraphics="NO"
verticallyResizable="YES" usesFontPanel="YES" findStyle="panel" usesRuler="YES"
spellingCorrection="YES" smartInsertDelete="YES" id="101230"
customClass="BDSKZoomableTextView">
<rect
key="frame" x="0.0" y="0.0" width="200" height="456"/>
Modified: trunk/bibdesk/French.lproj/BibDocument.xib
===================================================================
--- trunk/bibdesk/French.lproj/BibDocument.xib 2019-07-17 06:30:15 UTC (rev
24037)
+++ trunk/bibdesk/French.lproj/BibDocument.xib 2019-07-17 09:58:25 UTC (rev
24038)
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0"
toolsVersion="14490.70" targetRuntime="MacOSX.Cocoa"
propertyAccessControl="none">
<dependencies>
- <deployment identifier="macosx"/>
- <development version="8000" identifier="xcode"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin"
version="14490.70"/>
<capability name="documents saved in the Xcode 8 format"
minToolsVersion="8.0"/>
</dependencies>
@@ -11,11 +9,11 @@
<connections>
<outlet property="actionMenu" destination="433" id="532"/>
<outlet property="actionMenuButton" destination="834"
id="841"/>
+ <outlet property="alternateCopyMenu" destination="101143"
id="101453"/>
<outlet property="bottomFileView" destination="101218"
id="101221"/>
<outlet property="bottomPreviewButton" destination="101662"
id="101678"/>
<outlet property="bottomPreviewTabView" destination="101207"
id="101258"/>
<outlet property="bottomPreviewTextView" destination="101215"
id="101239"/>
- <outlet property="copyAsMenu" destination="101143"
id="101453"/>
<outlet property="documentWindow" destination="5" id="206"/>
<outlet property="groupActionButton" destination="101665"
id="101677"/>
<outlet property="groupActionMenuButton" destination="872"
id="877"/>
@@ -60,7 +58,7 @@
<autoresizingMask key="autoresizingMask"
widthSizable="YES" heightSizable="YES"/>
<clipView key="contentView"
drawsBackground="NO" id="BEg-xW-AfZ">
<rect key="frame" x="0.0" y="0.0"
width="120" height="456"/>
- <autoresizingMask key="autoresizingMask"
widthSizable="YES" heightSizable="YES"/>
+ <autoresizingMask key="autoresizingMask"/>
<subviews>
<outlineView focusRingType="none"
verticalHuggingPriority="750" allowsExpansionToolTips="YES"
columnAutoresizingStyle="firstColumnOnly" selectionHighlightStyle="sourceList"
columnReordering="NO" columnResizing="NO" emptySelection="NO"
autosaveColumns="NO" typeSelect="NO" rowHeight="20" indentationPerLevel="14"
outlineTableColumn="101529" id="101527" customClass="BDSKGroupOutlineView">
<rect key="frame" x="0.0" y="0.0"
width="120" height="456"/>
@@ -118,7 +116,7 @@
<autoresizingMask
key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<clipView
key="contentView" id="2RQ-DP-aIh">
<rect key="frame"
x="0.0" y="0.0" width="518" height="273"/>
- <autoresizingMask
key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <autoresizingMask
key="autoresizingMask"/>
<subviews>
<tableView
focusRingType="none" verticalHuggingPriority="750"
allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly"
alternatingRowBackgroundColors="YES" autosaveColumns="NO" typeSelect="NO"
rowHeight="14" headerView="101624" id="101585" customClass="BDSKMainTableView">
<rect
key="frame" x="0.0" y="0.0" width="518" height="248"/>
@@ -164,7 +162,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES"
heightSizable="YES"/>
<clipView
key="contentView" id="4Hj-qz-J0L">
<rect
key="frame" x="0.0" y="0.0" width="518" height="174"/>
-
<autoresizingMask key="autoresizingMask" widthSizable="YES"
heightSizable="YES"/>
+
<autoresizingMask key="autoresizingMask"/>
<subviews>
<textView focusRingType="none" editable="NO" importsGraphics="NO"
verticallyResizable="YES" usesFontPanel="YES" findStyle="panel" usesRuler="YES"
spellingCorrection="YES" smartInsertDelete="YES" id="101215"
customClass="BDSKZoomableTextView">
<rect key="frame" x="0.0" y="0.0" width="518" height="174"/>
@@ -260,7 +258,7 @@
<autoresizingMask
key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<clipView
key="contentView" id="aTB-vj-PZw">
<rect key="frame"
x="0.0" y="0.0" width="120" height="456"/>
- <autoresizingMask
key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <autoresizingMask
key="autoresizingMask"/>
<subviews>
<textView
focusRingType="none" editable="NO" importsGraphics="NO"
verticallyResizable="YES" usesFontPanel="YES" findStyle="panel" usesRuler="YES"
spellingCorrection="YES" smartInsertDelete="YES" id="101230"
customClass="BDSKZoomableTextView">
<rect
key="frame" x="0.0" y="0.0" width="200" height="456"/>
Modified: trunk/bibdesk/German.lproj/BibDocument.xib
===================================================================
--- trunk/bibdesk/German.lproj/BibDocument.xib 2019-07-17 06:30:15 UTC (rev
24037)
+++ trunk/bibdesk/German.lproj/BibDocument.xib 2019-07-17 09:58:25 UTC (rev
24038)
@@ -1,9 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0"
toolsVersion="14460.31" targetRuntime="MacOSX.Cocoa"
propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0"
toolsVersion="14490.70" targetRuntime="MacOSX.Cocoa"
propertyAccessControl="none">
<dependencies>
- <deployment identifier="macosx"/>
- <development version="8000" identifier="xcode"/>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin"
version="14460.31"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin"
version="14490.70"/>
<capability name="documents saved in the Xcode 8 format"
minToolsVersion="8.0"/>
</dependencies>
<objects>
@@ -11,11 +9,11 @@
<connections>
<outlet property="actionMenu" destination="433" id="532"/>
<outlet property="actionMenuButton" destination="834"
id="841"/>
+ <outlet property="alternateCopyMenu" destination="101143"
id="101453"/>
<outlet property="bottomFileView" destination="101218"
id="101221"/>
<outlet property="bottomPreviewButton" destination="101662"
id="101678"/>
<outlet property="bottomPreviewTabView" destination="101207"
id="101258"/>
<outlet property="bottomPreviewTextView" destination="101215"
id="101239"/>
- <outlet property="copyAsMenu" destination="101143"
id="101453"/>
<outlet property="documentWindow" destination="5" id="206"/>
<outlet property="groupActionButton" destination="101665"
id="101677"/>
<outlet property="groupActionMenuButton" destination="872"
id="877"/>
@@ -60,7 +58,7 @@
<autoresizingMask key="autoresizingMask"
widthSizable="YES" heightSizable="YES"/>
<clipView key="contentView"
drawsBackground="NO" id="vcy-0M-gCY">
<rect key="frame" x="0.0" y="0.0"
width="120" height="456"/>
- <autoresizingMask key="autoresizingMask"
widthSizable="YES" heightSizable="YES"/>
+ <autoresizingMask key="autoresizingMask"/>
<subviews>
<outlineView focusRingType="none"
verticalHuggingPriority="750" allowsExpansionToolTips="YES"
columnAutoresizingStyle="firstColumnOnly" selectionHighlightStyle="sourceList"
columnReordering="NO" columnResizing="NO" emptySelection="NO"
autosaveColumns="NO" typeSelect="NO" rowHeight="20" indentationPerLevel="14"
outlineTableColumn="101529" id="101527" customClass="BDSKGroupOutlineView">
<rect key="frame" x="0.0" y="0.0"
width="120" height="456"/>
@@ -118,7 +116,7 @@
<autoresizingMask
key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<clipView
key="contentView" id="1pk-Ja-m9s">
<rect key="frame"
x="0.0" y="0.0" width="518" height="273"/>
- <autoresizingMask
key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <autoresizingMask
key="autoresizingMask"/>
<subviews>
<tableView
focusRingType="none" verticalHuggingPriority="750"
allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly"
alternatingRowBackgroundColors="YES" autosaveColumns="NO" typeSelect="NO"
rowHeight="14" headerView="101624" id="101585" customClass="BDSKMainTableView">
<rect
key="frame" x="0.0" y="0.0" width="518" height="248"/>
@@ -164,7 +162,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES"
heightSizable="YES"/>
<clipView
key="contentView" id="TzR-Cu-amw">
<rect
key="frame" x="0.0" y="0.0" width="518" height="174"/>
-
<autoresizingMask key="autoresizingMask" widthSizable="YES"
heightSizable="YES"/>
+
<autoresizingMask key="autoresizingMask"/>
<subviews>
<textView focusRingType="none" editable="NO" importsGraphics="NO"
verticallyResizable="YES" usesFontPanel="YES" findStyle="panel" usesRuler="YES"
spellingCorrection="YES" smartInsertDelete="YES" id="101215"
customClass="BDSKZoomableTextView">
<rect key="frame" x="0.0" y="0.0" width="518" height="174"/>
@@ -260,7 +258,7 @@
<autoresizingMask
key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<clipView
key="contentView" id="hhT-Rh-4Hi">
<rect key="frame"
x="0.0" y="0.0" width="120" height="456"/>
- <autoresizingMask
key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <autoresizingMask
key="autoresizingMask"/>
<subviews>
<textView
focusRingType="none" editable="NO" importsGraphics="NO"
verticallyResizable="YES" usesFontPanel="YES" findStyle="panel" usesRuler="YES"
spellingCorrection="YES" smartInsertDelete="YES" id="101230"
customClass="BDSKZoomableTextView">
<rect
key="frame" x="0.0" y="0.0" width="200" height="456"/>
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
