Revision: 29773
http://sourceforge.net/p/bibdesk/svn/29773
Author: hofman
Date: 2025-11-07 10:27:13 +0000 (Fri, 07 Nov 2025)
Log Message:
-----------
don't use Transformer in value tranformer names
Modified Paths:
--------------
trunk/bibdesk/BDSKFileImageTransformer.m
trunk/bibdesk/BDSKFileMigrationController.m
trunk/bibdesk/BDSKFilePathTransformer.m
trunk/bibdesk/BDSKFilerErrorController.m
trunk/bibdesk/BDSKMergeController.m
trunk/bibdesk/Base.lproj/AutoFile.xib
trunk/bibdesk/Base.lproj/BDSKFileMigration.xib
trunk/bibdesk/Base.lproj/BDSKOrphanedFilesFinder.xib
trunk/bibdesk/Base.lproj/FileMatcherConfigSheet.xib
trunk/bibdesk/Base.lproj/MergeSheet.xib
Modified: trunk/bibdesk/BDSKFileImageTransformer.m
===================================================================
--- trunk/bibdesk/BDSKFileImageTransformer.m 2025-11-06 22:50:26 UTC (rev
29772)
+++ trunk/bibdesk/BDSKFileImageTransformer.m 2025-11-07 10:27:13 UTC (rev
29773)
@@ -39,7 +39,7 @@
#import "BDSKFileImageTransformer.h"
#import "NSImage_BDSKExtensions.h"
-NSString *BDSKFileImageTransformerName = @"BDSKFileImageTransformer";
+NSString *BDSKFileImageTransformerName = @"BDSKFileImage";
@implementation BDSKFileImageTransformer
Modified: trunk/bibdesk/BDSKFileMigrationController.m
===================================================================
--- trunk/bibdesk/BDSKFileMigrationController.m 2025-11-06 22:50:26 UTC (rev
29772)
+++ trunk/bibdesk/BDSKFileMigrationController.m 2025-11-07 10:27:13 UTC (rev
29773)
@@ -48,16 +48,15 @@
#import "BDSKStringConstants.h"
#import "NSString_BDSKExtensions.h"
#import "NSMenu_BDSKExtensions.h"
-#import "BDSKFilePathTransformer.h"
-#define BDSKURLTransformerName @"BDSKURLTransformer"
-#define BDSKURLPathTransformerName @"BDSKURLPathTransformer"
+#define BDSKURLTransformerName @"BDSKURLName"
+#define BDSKURLPathTransformerName @"BDSKURLPath"
#define BDSKFileMigrationFrameAutosaveName @"BDSKFileMigrationWindow"
#define BDSKTouchBarItemIdentifierMigrate
@"edu.ucsd.mmccrack.bibdesk.touchbar-item.migrate"
-@interface BDSKURLTransformer : NSValueTransformer
+@interface BDSKURLNameTransformer : NSValueTransformer
@end
@interface BDSKURLPathTransformer : NSValueTransformer
@@ -73,7 +72,7 @@
+ (void)initialize
{
BDSKINITIALIZE;
- [NSValueTransformer setValueTransformer:[[BDSKURLTransformer alloc] init]
forName:BDSKURLTransformerName];
+ [NSValueTransformer setValueTransformer:[[BDSKURLNameTransformer alloc]
init] forName:BDSKURLTransformerName];
[NSValueTransformer setValueTransformer:[[BDSKURLPathTransformer alloc]
init] forName:BDSKURLPathTransformerName];
}
@@ -278,7 +277,7 @@
@end
-@implementation BDSKURLTransformer
+@implementation BDSKURLNameTransformer
+ (Class)transformedValueClass {
return [NSString class];
Modified: trunk/bibdesk/BDSKFilePathTransformer.m
===================================================================
--- trunk/bibdesk/BDSKFilePathTransformer.m 2025-11-06 22:50:26 UTC (rev
29772)
+++ trunk/bibdesk/BDSKFilePathTransformer.m 2025-11-07 10:27:13 UTC (rev
29773)
@@ -40,7 +40,7 @@
@implementation BDSKFilePathTransformer
-NSString *BDSKFilePathTransformerName = @"BDSKFilePathTransformer";
+NSString *BDSKFilePathTransformerName = @"BDSKFilePath";
+ (void)initialize {
BDSKINITIALIZE;
Modified: trunk/bibdesk/BDSKFilerErrorController.m
===================================================================
--- trunk/bibdesk/BDSKFilerErrorController.m 2025-11-06 22:50:26 UTC (rev
29772)
+++ trunk/bibdesk/BDSKFilerErrorController.m 2025-11-07 10:27:13 UTC (rev
29773)
@@ -49,8 +49,8 @@
#import "BDSKFilePathTransformer.h"
#import "BDSKTouchBarButtonGroup.h"
-#define BDSKOldPathColorTransformerName @"BDSKOldPathColorTransformer"
-#define BDSKNewPathColorTransformerName @"BDSKNewPathColorTransformer"
+#define BDSKOldPathColorTransformerName @"BDSKOldPathColor"
+#define BDSKNewPathColorTransformerName @"BDSKNewPathColor"
#define BDSKFilerSelectKey @"select"
Modified: trunk/bibdesk/BDSKMergeController.m
===================================================================
--- trunk/bibdesk/BDSKMergeController.m 2025-11-06 22:50:26 UTC (rev 29772)
+++ trunk/bibdesk/BDSKMergeController.m 2025-11-07 10:27:13 UTC (rev 29773)
@@ -52,11 +52,11 @@
#define PASTED_COLUMNID @"pasted"
#define CURRENT_COLUMNID @"current"
-#define BDSKLocalizedFieldTransformerName @"BDSKLocalizedFieldTransformer"
+#define BDSKLocalizedFieldTransformerName @"BDSKLocalizedFieldName"
static char BDSKMergeControllerObservationContext;
-@interface BDSKLocalizedFieldTransformer : NSValueTransformer
+@interface BDSKLocalizedFieldNameTransformer : NSValueTransformer
@end
@@ -75,7 +75,7 @@
+ (void)initialize {
BDSKINITIALIZE;
- [NSValueTransformer setValueTransformer:[[BDSKLocalizedFieldTransformer
alloc] init] forName:BDSKLocalizedFieldTransformerName];
+ [NSValueTransformer
setValueTransformer:[[BDSKLocalizedFieldNameTransformer alloc] init]
forName:BDSKLocalizedFieldTransformerName];
}
@@ -408,7 +408,7 @@
@end
-@implementation BDSKLocalizedFieldTransformer
+@implementation BDSKLocalizedFieldNameTransformer
+ (Class)transformedValueClass {
return [NSString class];
Modified: trunk/bibdesk/Base.lproj/AutoFile.xib
===================================================================
--- trunk/bibdesk/Base.lproj/AutoFile.xib 2025-11-06 22:50:26 UTC (rev
29772)
+++ trunk/bibdesk/Base.lproj/AutoFile.xib 2025-11-07 10:27:13 UTC (rev
29773)
@@ -139,9 +139,9 @@
</constraints>
<imageCell
key="cell" refusesFirstResponder="YES" alignment="left"
imageScaling="proportionallyDown" image="NSActionTemplate" id="e42-ta-tm1"/>
<connections>
- <binding
destination="Fu3-OG-IFA" name="value" keyPath="objectValue.path"
id="Py1-v5-GEL">
+ <binding
destination="Fu3-OG-IFA" name="value" keyPath="objectValue.path"
id="UHr-Dc-NfW">
<dictionary key="options">
-
<string key="NSValueTransformerName">BDSKFileImageTransformer</string>
+
<string key="NSValueTransformerName">BDSKFileImage</string>
</dictionary>
</binding>
</connections>
@@ -154,14 +154,14 @@
<color
key="backgroundColor" name="textBackgroundColor" catalog="System"
colorSpace="catalog"/>
</textFieldCell>
<connections>
- <binding
destination="Fu3-OG-IFA" name="value" keyPath="objectValue" id="sZy-Jj-e7Z">
+ <binding
destination="Fu3-OG-IFA" name="textColor" keyPath="objectValue.flag"
id="z3t-p3-8xJ">
<dictionary key="options">
-
<string key="NSValueTransformerName">BDSKFilePathTransformer</string>
+
<string key="NSValueTransformerName">BDSKOldPathColor</string>
</dictionary>
</binding>
- <binding
destination="Fu3-OG-IFA" name="textColor" keyPath="objectValue.flag"
id="yfd-BA-c1l">
+ <binding
destination="Fu3-OG-IFA" name="value" keyPath="objectValue" id="3RS-H9-ovY">
<dictionary key="options">
-
<string key="NSValueTransformerName">BDSKOldPathColorTransformer</string>
+
<string key="NSValueTransformerName">BDSKFilePath</string>
</dictionary>
</binding>
</connections>
@@ -205,9 +205,9 @@
</constraints>
<imageCell
key="cell" refusesFirstResponder="YES" alignment="left"
imageScaling="proportionallyDown" image="NSActionTemplate" id="UAM-R9-5Rl"/>
<connections>
- <binding
destination="Fe0-jY-Vf0" name="value" keyPath="objectValue.newPath"
id="JTH-6f-LBm">
+ <binding
destination="Fe0-jY-Vf0" name="value" keyPath="objectValue.newPath"
id="1vr-Gt-gnx">
<dictionary key="options">
-
<string key="NSValueTransformerName">BDSKFileImageTransformer</string>
+
<string key="NSValueTransformerName">BDSKFileImage</string>
</dictionary>
</binding>
</connections>
@@ -220,14 +220,14 @@
<color
key="backgroundColor" name="textBackgroundColor" catalog="System"
colorSpace="catalog"/>
</textFieldCell>
<connections>
- <binding
destination="Fe0-jY-Vf0" name="value" keyPath="objectValue" id="RsY-U3-o2X">
+ <binding
destination="Fe0-jY-Vf0" name="textColor" keyPath="objectValue.flag"
id="uZM-3J-rOv">
<dictionary key="options">
-
<string key="NSValueTransformerName">BDSKFilePathTransformer</string>
+
<string key="NSValueTransformerName">BDSKNewPathColor</string>
</dictionary>
</binding>
- <binding
destination="Fe0-jY-Vf0" name="textColor" keyPath="objectValue.flag"
id="nuu-mM-pGu">
+ <binding
destination="Fe0-jY-Vf0" name="value" keyPath="objectValue" id="9i9-bW-HKp">
<dictionary key="options">
-
<string key="NSValueTransformerName">BDSKNewPathColorTransformer</string>
+
<string key="NSValueTransformerName">BDSKFilePath</string>
</dictionary>
</binding>
</connections>
Modified: trunk/bibdesk/Base.lproj/BDSKFileMigration.xib
===================================================================
--- trunk/bibdesk/Base.lproj/BDSKFileMigration.xib 2025-11-06 22:50:26 UTC
(rev 29772)
+++ trunk/bibdesk/Base.lproj/BDSKFileMigration.xib 2025-11-07 10:27:13 UTC
(rev 29773)
@@ -67,14 +67,14 @@
<color
key="backgroundColor" name="textBackgroundColor" catalog="System"
colorSpace="catalog"/>
</textFieldCell>
<connections>
- <binding
destination="Nd3-YU-7YY" name="toolTip" keyPath="objectValue.URL"
id="G5l-ii-6ce">
+ <binding
destination="Nd3-YU-7YY" name="toolTip" keyPath="objectValue.URL"
id="Iz7-Yj-boH">
<dictionary key="options">
-
<string key="NSValueTransformerName">BDSKURLPathTransformer</string>
+
<string key="NSValueTransformerName">BDSKURLPath</string>
</dictionary>
</binding>
- <binding
destination="Nd3-YU-7YY" name="value" keyPath="objectValue.URL" id="HSu-uL-TdC">
+ <binding
destination="Nd3-YU-7YY" name="value" keyPath="objectValue.URL" id="hx8-0S-4b9">
<dictionary key="options">
-
<string key="NSValueTransformerName">BDSKURLTransformer</string>
+
<string key="NSValueTransformerName">BDSKURLName</string>
</dictionary>
</binding>
</connections>
Modified: trunk/bibdesk/Base.lproj/BDSKOrphanedFilesFinder.xib
===================================================================
--- trunk/bibdesk/Base.lproj/BDSKOrphanedFilesFinder.xib 2025-11-06
22:50:26 UTC (rev 29772)
+++ trunk/bibdesk/Base.lproj/BDSKOrphanedFilesFinder.xib 2025-11-07
10:27:13 UTC (rev 29773)
@@ -31,13 +31,13 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<scrollView horizontalLineScroll="16"
horizontalPageScroll="10" verticalLineScroll="16" verticalPageScroll="10"
usesPredominantAxisScrolling="NO"
translatesAutoresizingMaskIntoConstraints="NO" id="8">
- <rect key="frame" x="20" y="60" width="440"
height="233"/>
+ <rect key="frame" x="20" y="60" width="440"
height="205"/>
<clipView key="contentView" id="YM6-nq-XFK">
- <rect key="frame" x="1" y="1" width="438"
height="231"/>
+ <rect key="frame" x="1" y="1" width="438"
height="203"/>
<autoresizingMask key="autoresizingMask"
widthSizable="YES" heightSizable="YES"/>
<subviews>
<tableView verticalHuggingPriority="750"
allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly"
columnReordering="NO" columnResizing="NO" autosaveColumns="NO" typeSelect="NO"
rowHeight="14" headerView="103" viewBased="YES" id="9"
customClass="BDSKTableView">
- <rect key="frame" x="0.0" y="25"
width="438" height="206"/>
+ <rect key="frame" x="0.0" y="25"
width="438" height="178"/>
<autoresizingMask key="autoresizingMask"
widthSizable="YES" heightSizable="YES"/>
<constraints>
<constraint firstAttribute="height"
constant="203" placeholder="YES" id="QqD-RT-X8K"/>
@@ -69,9 +69,9 @@
</constraints>
<imageCell
key="cell" refusesFirstResponder="YES" alignment="left"
imageScaling="proportionallyDown" image="NSActionTemplate" id="5i5-tU-h6T"/>
<connections>
- <binding
destination="0IS-Me-NVw" name="value" keyPath="objectValue" id="ivV-Nu-xQr">
+ <binding
destination="0IS-Me-NVw" name="value" keyPath="objectValue" id="NGm-xk-4aB">
<dictionary key="options">
-
<string key="NSValueTransformerName">BDSKFileImageTransformer</string>
+
<string key="NSValueTransformerName">BDSKFileImage</string>
</dictionary>
</binding>
</connections>
@@ -84,12 +84,12 @@
<color
key="backgroundColor" name="textBackgroundColor" catalog="System"
colorSpace="catalog"/>
</textFieldCell>
<connections>
- <binding
destination="0IS-Me-NVw" name="value" keyPath="objectValue" id="JU6-R8-RNp">
+ <binding
destination="0IS-Me-NVw" name="toolTip" keyPath="objectValue.path"
id="fBZ-V0-0vZ"/>
+ <binding
destination="0IS-Me-NVw" name="value" keyPath="objectValue" id="fXy-dw-c9Q">
<dictionary key="options">
-
<string key="NSValueTransformerName">BDSKFilePathTransformer</string>
+
<string key="NSValueTransformerName">BDSKFilePath</string>
</dictionary>
</binding>
- <binding
destination="0IS-Me-NVw" name="toolTip" keyPath="objectValue.path"
id="fBZ-V0-0vZ"/>
</connections>
</textField>
</subviews>
@@ -120,11 +120,11 @@
</subviews>
</clipView>
<scroller key="horizontalScroller" wantsLayer="YES"
verticalHuggingPriority="750" horizontal="YES" id="102">
- <rect key="frame" x="1" y="216" width="438"
height="16"/>
+ <rect key="frame" x="1" y="188" width="438"
height="16"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
<scroller key="verticalScroller" wantsLayer="YES"
verticalHuggingPriority="750" horizontal="NO" id="101">
- <rect key="frame" x="423" y="26" width="16"
height="206"/>
+ <rect key="frame" x="423" y="26" width="16"
height="178"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
<tableHeaderView key="headerView" wantsLayer="YES"
id="103">
Modified: trunk/bibdesk/Base.lproj/FileMatcherConfigSheet.xib
===================================================================
--- trunk/bibdesk/Base.lproj/FileMatcherConfigSheet.xib 2025-11-06 22:50:26 UTC
(rev 29772)
+++ trunk/bibdesk/Base.lproj/FileMatcherConfigSheet.xib 2025-11-07 10:27:13 UTC
(rev 29773)
@@ -240,10 +240,10 @@
</constraints>
<imageCell
key="cell" refusesFirstResponder="YES" alignment="left"
imageScaling="proportionallyDown" image="NSActionTemplate" id="CsO-rx-NoJ"/>
<connections>
-
<binding destination="1Fm-u3-WeL" name="value" keyPath="objectValue"
id="rdr-dV-nso">
+
<binding destination="1Fm-u3-WeL" name="value" keyPath="objectValue"
id="hUE-GR-WTX">
<dictionary key="options">
<bool key="NSConditionallySetsEnabled" value="NO"/>
-
<string key="NSValueTransformerName">BDSKFileImageTransformer</string>
+
<string key="NSValueTransformerName">BDSKFileImage</string>
</dictionary>
</binding>
</connections>
@@ -256,9 +256,9 @@
<color
key="backgroundColor" name="textBackgroundColor" catalog="System"
colorSpace="catalog"/>
</textFieldCell>
<connections>
-
<binding destination="1Fm-u3-WeL" name="value" keyPath="objectValue"
id="wpf-DW-bja">
+
<binding destination="1Fm-u3-WeL" name="value" keyPath="objectValue"
id="ayW-nS-tXd">
<dictionary key="options">
-
<string key="NSValueTransformerName">BDSKFilePathTransformer</string>
+
<string key="NSValueTransformerName">BDSKFilePath</string>
</dictionary>
</binding>
</connections>
Modified: trunk/bibdesk/Base.lproj/MergeSheet.xib
===================================================================
--- trunk/bibdesk/Base.lproj/MergeSheet.xib 2025-11-06 22:50:26 UTC (rev
29772)
+++ trunk/bibdesk/Base.lproj/MergeSheet.xib 2025-11-07 10:27:13 UTC (rev
29773)
@@ -102,9 +102,9 @@
<color
key="backgroundColor" name="textBackgroundColor" catalog="System"
colorSpace="catalog"/>
</textFieldCell>
<connections>
- <binding
destination="ygf-FO-qDO" name="value" keyPath="objectValue.field"
id="cxh-2W-Pxi">
+ <binding
destination="ygf-FO-qDO" name="value" keyPath="objectValue.field"
id="hX1-bh-47s">
<dictionary key="options">
-
<string key="NSValueTransformerName">BDSKLocalizedFieldTransformer</string>
+
<string key="NSValueTransformerName">BDSKLocalizedFieldName</string>
</dictionary>
</binding>
</connections>
@@ -174,7 +174,7 @@
<tableColumnResizingMask
key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
<prototypeCellViews>
<tableCellView id="uka-l2-2fw">
- <rect key="frame"
x="297.5" y="1" width="151" height="17"/>
+ <rect key="frame" x="298"
y="1" width="151" height="17"/>
<autoresizingMask
key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField
horizontalHuggingPriority="251" verticalHuggingPriority="750"
horizontalCompressionResistancePriority="250" allowsExpansionToolTips="YES"
translatesAutoresizingMaskIntoConstraints="NO" id="IXk-MD-Fzw">
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
