Revision: 26305
http://sourceforge.net/p/bibdesk/svn/26305
Author: hofman
Date: 2021-06-26 09:48:23 +0000 (Sat, 26 Jun 2021)
Log Message:
-----------
String constants for image names
Modified Paths:
--------------
trunk/bibdesk/BDSKBookmarkController.m
trunk/bibdesk/BDSKFindController.m
trunk/bibdesk/BDSKSearchBookmarkController.m
trunk/bibdesk/NSImage_BDSKExtensions.h
trunk/bibdesk/NSImage_BDSKExtensions.m
Modified: trunk/bibdesk/BDSKBookmarkController.m
===================================================================
--- trunk/bibdesk/BDSKBookmarkController.m 2021-06-26 09:38:24 UTC (rev
26304)
+++ trunk/bibdesk/BDSKBookmarkController.m 2021-06-26 09:48:23 UTC (rev
26305)
@@ -782,7 +782,7 @@
if (addBookmarkTouchBarButton == nil)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wpartial-availability"
- addBookmarkTouchBarButton = [[NSButton buttonWithImage:[NSImage
imageNamed:@"BDSKTouchBarAddBookmark"] target:self
action:@selector(insertBookmark:)] retain];
+ addBookmarkTouchBarButton = [[NSButton buttonWithImage:[NSImage
imageNamed:BDSKImageNameTouchBarAddBookmark] target:self
action:@selector(insertBookmark:)] retain];
#pragma clang diagnostic pop
[item setView:addBookmarkTouchBarButton];
[item setCustomizationLabel:NSLocalizedString(@"New Bookmark",
@"Toolbar item label")];
@@ -800,7 +800,7 @@
if (addSeparatorTouchBarButton == nil)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wpartial-availability"
- addSeparatorTouchBarButton = [[NSButton buttonWithImage:[NSImage
imageNamed:@"BDSKTouchBarAddSeparator"] target:self
action:@selector(insertBookmarkSeparator:)] retain];
+ addSeparatorTouchBarButton = [[NSButton buttonWithImage:[NSImage
imageNamed:BDSKImageNameTouchBarAddSeparator] target:self
action:@selector(insertBookmarkSeparator:)] retain];
#pragma clang diagnostic pop
[item setView:addSeparatorTouchBarButton];
[item setCustomizationLabel:NSLocalizedString(@"New Separator",
@"Toolbar item label")];
Modified: trunk/bibdesk/BDSKFindController.m
===================================================================
--- trunk/bibdesk/BDSKFindController.m 2021-06-26 09:38:24 UTC (rev 26304)
+++ trunk/bibdesk/BDSKFindController.m 2021-06-26 09:48:23 UTC (rev 26305)
@@ -1202,7 +1202,7 @@
if ([identifier isEqualToString:BDSKTouchBarItemIdentifierReplaceAll]) {
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wpartial-availability"
- NSButton *button = [NSButton buttonWithImage:[NSImage
imageNamed:@"BDSKTouchBarReplaceAll"] target:self
action:@selector(performFindPanelAction:)];
+ NSButton *button = [NSButton buttonWithImage:[NSImage
imageNamed:BDSKImageNameTouchBarReplaceAll] target:self
action:@selector(performFindPanelAction:)];
#pragma clang diagnostic pop
[button setTag:NSFindPanelActionReplaceAll];
item = [[[NSClassFromString(@"NSCustomTouchBarItem") alloc]
initWithIdentifier:identifier] autorelease];
@@ -1210,7 +1210,7 @@
} else if ([identifier isEqualToString:BDSKTouchBarItemIdentifierReplace])
{
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wpartial-availability"
- NSButton *button = [NSButton buttonWithImage:[NSImage
imageNamed:@"BDSKTouchBarReplace"] target:self
action:@selector(performFindPanelAction:)];
+ NSButton *button = [NSButton buttonWithImage:[NSImage
imageNamed:BDSKImageNameTouchBarReplace] target:self
action:@selector(performFindPanelAction:)];
#pragma clang diagnostic pop
[button setTag:NSFindPanelActionReplace];
item = [[[NSClassFromString(@"NSCustomTouchBarItem") alloc]
initWithIdentifier:identifier] autorelease];
@@ -1218,7 +1218,7 @@
} else if ([identifier
isEqualToString:BDSKTouchBarItemIdentifierReplaceAndFind]) {
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wpartial-availability"
- NSButton *button = [NSButton buttonWithImage:[NSImage
imageNamed:@"BDSKTouchBarReplaceAndFind"] target:self
action:@selector(performFindPanelAction:)];
+ NSButton *button = [NSButton buttonWithImage:[NSImage
imageNamed:BDSKImageNameTouchBarReplaceAndFind] target:self
action:@selector(performFindPanelAction:)];
#pragma clang diagnostic pop
[button setTag:NSFindPanelActionReplaceAndFind];
item = [[[NSClassFromString(@"NSCustomTouchBarItem") alloc]
initWithIdentifier:identifier] autorelease];
Modified: trunk/bibdesk/BDSKSearchBookmarkController.m
===================================================================
--- trunk/bibdesk/BDSKSearchBookmarkController.m 2021-06-26 09:38:24 UTC
(rev 26304)
+++ trunk/bibdesk/BDSKSearchBookmarkController.m 2021-06-26 09:48:23 UTC
(rev 26305)
@@ -753,7 +753,7 @@
if (addSeparatorTouchBarButton == nil)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wpartial-availability"
- addSeparatorTouchBarButton = [[NSButton buttonWithImage:[NSImage
imageNamed:@"BDSKTouchBarAddSeparator"] target:self
action:@selector(insertBookmarkSeparator:)] retain];
+ addSeparatorTouchBarButton = [[NSButton buttonWithImage:[NSImage
imageNamed:BDSKImageNameTouchBarAddSeparator] target:self
action:@selector(insertBookmarkSeparator:)] retain];
#pragma clang diagnostic pop
[item setView:addSeparatorTouchBarButton];
[item setCustomizationLabel:NSLocalizedString(@"New Separator",
@"Toolbar item label")];
Modified: trunk/bibdesk/NSImage_BDSKExtensions.h
===================================================================
--- trunk/bibdesk/NSImage_BDSKExtensions.h 2021-06-26 09:38:24 UTC (rev
26304)
+++ trunk/bibdesk/NSImage_BDSKExtensions.h 2021-06-26 09:48:23 UTC (rev
26305)
@@ -38,7 +38,25 @@
#import <Cocoa/Cocoa.h>
+extern NSString *BDSKImageNameToolbarAddBookmark;
+extern NSString *BDSKImageNameToolbarAddFolder;
+extern NSString *BDSKImageNameToolbarAddSeparator;
+extern NSString *BDSKImageNameToolbarDelete;
+extern NSString *BDSKImageNameToolbarEdit;
+extern NSString *BDSKImageNameTouchBarAddBookmark;
+extern NSString *BDSKImageNameTouchBarAddSeparator;
+extern NSString *BDSKImageNameSeparator;
+
+extern NSString *BDSKImageNameTouchBarReplace;
+extern NSString *BDSKImageNameTouchBarReplaceAll;
+extern NSString *BDSKImageNameTouchBarReplaceAndFind;
+
+extern NSString *BDSKImageNamePreviewDisplayTextTemplate;
+extern NSString *BDSKImageNamePreviewDisplayFilesTemplate;
+extern NSString *BDSKImageNamePreviewDisplayTeXTemplate;
+extern NSString *BDSKImageNameCautionIcon;
+
@interface NSImage (BDSKExtensions)
+ (void)makePreviewDisplayImages;
Modified: trunk/bibdesk/NSImage_BDSKExtensions.m
===================================================================
--- trunk/bibdesk/NSImage_BDSKExtensions.m 2021-06-26 09:38:24 UTC (rev
26304)
+++ trunk/bibdesk/NSImage_BDSKExtensions.m 2021-06-26 09:48:23 UTC (rev
26305)
@@ -42,24 +42,24 @@
#import "NSString_BDSKExtensions.h"
#import "NSColor_BDSKExtensions.h"
-#define BDSKImageNameToolbarAddBookmark @"BDSKToolbarAddBookmark"
-#define BDSKImageNameToolbarAddFolder @"BDSKToolbarAddFolder"
-#define BDSKImageNameToolbarAddSeparator @"BDSKToolbarAddSeparator"
-#define BDSKImageNameToolbarDelete @"BDSKToolbarDelete"
-#define BDSKImageNameToolbarEdit @"BDSKToolbarEdit"
-#define BDSKImageNameTouchBarAddBookmark @"BDSKTouchBarAddBookmark"
-#define BDSKImageNameTouchBarAddSeparator @"BDSKTouchBarAddSeparator"
+NSString *BDSKImageNameToolbarAddBookmark = @"BDSKToolbarAddBookmark";
+NSString *BDSKImageNameToolbarAddFolder = @"BDSKToolbarAddFolder";
+NSString *BDSKImageNameToolbarAddSeparator = @"BDSKToolbarAddSeparator";
+NSString *BDSKImageNameToolbarDelete = @"BDSKToolbarDelete";
+NSString *BDSKImageNameToolbarEdit = @"BDSKToolbarEdit";
+NSString *BDSKImageNameTouchBarAddBookmark = @"BDSKTouchBarAddBookmark";
+NSString *BDSKImageNameTouchBarAddSeparator = @"BDSKTouchBarAddSeparator";
-#define BDSKImageNameSeparator @"BDSKSeparator"
+NSString *BDSKImageNameSeparator = @"BDSKSeparator";
-#define BDSKImageNameTouchBarReplace @"BDSKTouchBarReplace"
-#define BDSKImageNameTouchBarReplaceAll @"BDSKTouchBarReplaceAll"
-#define BDSKImageNameTouchBarReplaceAndFind @"BDSKTouchBarReplaceAndFind"
+NSString *BDSKImageNameTouchBarReplace = @"BDSKTouchBarReplace";
+NSString *BDSKImageNameTouchBarReplaceAll = @"BDSKTouchBarReplaceAll";
+NSString *BDSKImageNameTouchBarReplaceAndFind = @"BDSKTouchBarReplaceAndFind";
-#define BDSKImageNamePreviewDisplayTextTemplate @"BDSKPreviewDisplayText"
-#define BDSKImageNamePreviewDisplayFilesTemplate @"BDSKPreviewDisplayFiles"
-#define BDSKImageNamePreviewDisplayTeXTemplate @"BDSKPreviewDisplayTeX"
-#define BDSKImageNameCautionIcon @"BDSKCautionIcon"
+NSString *BDSKImageNamePreviewDisplayTextTemplate = @"BDSKPreviewDisplayText";
+NSString *BDSKImageNamePreviewDisplayFilesTemplate =
@"BDSKPreviewDisplayFiles";
+NSString *BDSKImageNamePreviewDisplayTeXTemplate = @"BDSKPreviewDisplayTeX";
+NSString *BDSKImageNameCautionIcon = @"BDSKCautionIcon";
@implementation NSImage (BDSKExtensions)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Bibdesk-commit mailing list
Bibdesk-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
