Revision: 29712
http://sourceforge.net/p/bibdesk/svn/29712
Author: hofman
Date: 2025-10-12 15:47:40 +0000 (Sun, 12 Oct 2025)
Log Message:
-----------
revert back to using separate textfield for group name, so it won't be grayed
when inactivating the table
Modified Paths:
--------------
trunk/bibdesk/BDSKGroupCellView.h
trunk/bibdesk/BDSKGroupCellView.m
trunk/bibdesk/Base.lproj/BibDocument.xib
trunk/bibdesk/BibDocument_DataSource.m
trunk/bibdesk/BibDocument_Groups.m
trunk/bibdesk/BibDocument_UI.m
Modified: trunk/bibdesk/BDSKGroupCellView.h
===================================================================
--- trunk/bibdesk/BDSKGroupCellView.h 2025-10-12 15:35:23 UTC (rev 29711)
+++ trunk/bibdesk/BDSKGroupCellView.h 2025-10-12 15:47:40 UTC (rev 29712)
@@ -41,11 +41,13 @@
NS_ASSUME_NONNULL_BEGIN
@interface BDSKGroupCellView : NSTableCellView {
+ __weak NSTextField *nameField;
__weak NSTextField *labelField;
__weak NSImageView *bubbleView;
__weak NSProgressIndicator *progressIndicator;
}
+@property (nonatomic, nullable, weak) IBOutlet NSTextField *nameField;
@property (nonatomic, nullable, weak) IBOutlet NSTextField *labelField;
@property (nonatomic, nullable, weak) IBOutlet NSImageView *bubbleView;
@property (nonatomic, nullable, weak) IBOutlet NSProgressIndicator
*progressIndicator;
Modified: trunk/bibdesk/BDSKGroupCellView.m
===================================================================
--- trunk/bibdesk/BDSKGroupCellView.m 2025-10-12 15:35:23 UTC (rev 29711)
+++ trunk/bibdesk/BDSKGroupCellView.m 2025-10-12 15:47:40 UTC (rev 29712)
@@ -42,11 +42,13 @@
@implementation BDSKGroupCellView
-@synthesize labelField, bubbleView, progressIndicator;
+@synthesize nameField, labelField, bubbleView, progressIndicator;
@dynamic font;
- (void)setBackgroundStyle:(NSBackgroundStyle)backgroundStyle {
[super setBackgroundStyle:backgroundStyle];
+ [[[self nameField] cell] setBackgroundStyle:backgroundStyle];
+ [[self nameField] setNeedsDisplay:YES];
[[[self labelField] cell] setBackgroundStyle:backgroundStyle];
[[self labelField] setNeedsDisplay:YES];
[[[self bubbleView] cell] setBackgroundStyle:backgroundStyle];
@@ -54,11 +56,11 @@
}
- (NSFont *)font {
- return [[self textField] font];
+ return [[self nameField] font];
}
- (void)setFont:(NSFont *)font {
- [[self textField] setFont:font];
+ [[self nameField] setFont:font];
[[self labelField] setFont:[font smallerFont]];
}
Modified: trunk/bibdesk/Base.lproj/BibDocument.xib
===================================================================
--- trunk/bibdesk/Base.lproj/BibDocument.xib 2025-10-12 15:35:23 UTC (rev
29711)
+++ trunk/bibdesk/Base.lproj/BibDocument.xib 2025-10-12 15:47:40 UTC (rev
29712)
@@ -436,7 +436,7 @@
<outlet
property="bubbleView" destination="0tL-Oa-e04" id="0x6-uv-17g"/>
<outlet
property="imageView" destination="Mm1-Fi-uzg" id="nrF-QC-MGX"/>
<outlet
property="labelField" destination="oFI-uU-pLf" id="dxm-sT-GfK"/>
- <outlet
property="textField" destination="h4r-Dh-CgO" id="k6Q-w4-pOK"/>
+ <outlet
property="nameField" destination="h4r-Dh-CgO" id="wyn-Wp-lor"/>
</connections>
</tableCellView>
<tableCellView
identifier="parent" id="quh-gS-kgm">
Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m 2025-10-12 15:35:23 UTC (rev
29711)
+++ trunk/bibdesk/BibDocument_DataSource.m 2025-10-12 15:47:40 UTC (rev
29712)
@@ -1030,7 +1030,7 @@
} else {
BDSKGroupCellView *view = [outlineView
makeViewWithIdentifier:[tableColumn identifier] owner:self];
- NSTextField *textField = [view textField];
+ NSTextField *textField = [view nameField];
if ([item groupType] == BDSKCategoryGroupType)
[textField setFormatter:[[BDSKCategoryFormatter alloc]
initWithKey:[item key]]];
else
Modified: trunk/bibdesk/BibDocument_Groups.m
===================================================================
--- trunk/bibdesk/BibDocument_Groups.m 2025-10-12 15:35:23 UTC (rev 29711)
+++ trunk/bibdesk/BibDocument_Groups.m 2025-10-12 15:47:40 UTC (rev 29712)
@@ -321,7 +321,7 @@
if ([group document] == self &&
[groupOutlineView isItemExpanded:[group parent]] &&
NO == [self resortParentGroup:[group parent]])
- [[[self viewForGroup:group] textField] setObjectValue:[group name]];
+ [[[self viewForGroup:group] nameField] setObjectValue:[group name]];
}
- (void)handleStaticGroupChangedNotification:(NSNotification *)notification{
@@ -674,7 +674,7 @@
[view addSubview:spinner];
[view setProgressIndicator:spinner];
[NSLayoutConstraint activateConstraints:@[
- [[spinner leadingAnchor] constraintEqualToAnchor:[[view textField]
trailingAnchor] constant:2.0],
+ [[spinner leadingAnchor] constraintEqualToAnchor:[[view nameField]
trailingAnchor] constant:2.0],
[[view trailingAnchor] constraintEqualToAnchor:[spinner
trailingAnchor] constant:2.0],
[[spinner centerYAnchor] constraintEqualToAnchor:[view
centerYAnchor]]]];
[spinner startAnimation:nil];
Modified: trunk/bibdesk/BibDocument_UI.m
===================================================================
--- trunk/bibdesk/BibDocument_UI.m 2025-10-12 15:35:23 UTC (rev 29711)
+++ trunk/bibdesk/BibDocument_UI.m 2025-10-12 15:47:40 UTC (rev 29712)
@@ -1811,7 +1811,7 @@
for (BDSKCategoryParentGroup *group in [groups categoryParents]) {
if ([[group key] isPersonField] && [groupOutlineView
isItemExpanded:group]) {
for (BDSKGroup *catGroup in [group categoryGroups])
- [[[self viewForGroup:catGroup] textField]
setNeedsDisplay:YES];
+ [[[self viewForGroup:catGroup] nameField]
setNeedsDisplay:YES];
}
}
} else if ([keyPath isEqualToString:BDSKBibTeXStyleKey]) {
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
