Revision: 15820
http://sourceforge.net/p/skim-app/code/15820
Author: hofman
Date: 2025-11-23 17:57:00 +0000 (Sun, 23 Nov 2025)
Log Message:
-----------
revert previous commit, the initialization is not always the same
Modified Paths:
--------------
trunk/SKMainWindowController.h
trunk/SKMainWindowController.m
trunk/SKMainWindowController_Actions.m
trunk/SKMainWindowController_UI.m
trunk/SKNoteOutlineView.h
trunk/SKNoteOutlineView.m
trunk/SKNotesDocument.h
trunk/SKNotesDocument.m
trunk/SKRightSideViewController.h
trunk/SKRightSideViewController.m
Modified: trunk/SKMainWindowController.h
===================================================================
--- trunk/SKMainWindowController.h 2025-11-23 17:34:31 UTC (rev 15819)
+++ trunk/SKMainWindowController.h 2025-11-23 17:57:00 UTC (rev 15820)
@@ -69,7 +69,7 @@
@class PDFAnnotation, PDFSelection, SKGroupedSearchResult;
@class SKPDFView, SKSecondaryPDFView, SKPresentationView, SKStatusBar,
SKFindController, SKSplitView, SKFieldEditor, SKOverviewView, SKSideWindow;
-@class SKLeftSideViewController, SKRightSideViewController,
SKMainToolbarController, SKMainTouchBarController, SKNoteToolbarController,
SKProgressController, SKSnapshotWindowController, SKTransitionController;
+@class SKLeftSideViewController, SKRightSideViewController,
SKMainToolbarController, SKMainTouchBarController, SKNoteToolbarController,
SKProgressController, SKNoteTypeSheetController, SKSnapshotWindowController,
SKTransitionController;
@class SKPresentationNotesAuxiliary;
@interface SKMainWindowController : NSWindowController
<SKSnapshotWindowControllerDelegate, SKThumbnailDelegate,
SKFindControllerDelegate, SKPDFViewDelegate, SKPDFDocumentDelegate,
NSTouchBarDelegate> {
@@ -115,6 +115,7 @@
NSMutableArray<SKGroupedSearchResult *> *groupedSearchResults;
+ SKNoteTypeSheetController *noteTypeSheetController;
NSMutableArray<PDFAnnotation *> *notes;
NSMutableArray<PDFAnnotation *> *widgets;
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2025-11-23 17:34:31 UTC (rev 15819)
+++ trunk/SKMainWindowController.m 2025-11-23 17:57:00 UTC (rev 15820)
@@ -298,7 +298,7 @@
[findController setDelegate:nil];
[pdfView setDelegate:nil]; // this cleans up the pdfview
[[pdfView document] setDelegate:nil];
- [[rightSideController.noteOutlineView noteTypeSheetController]
setDelegate:nil];
+ [noteTypeSheetController setDelegate:nil];
[[pdfView document] setContainingDocument:nil];
[self setPresentationNotesDocument:nil];
}
@@ -510,8 +510,13 @@
[self showSnapshotsWithSetups:snapshotSetups];
}
- [[rightSideController.noteOutlineView noteTypeSheetController]
setDelegate:self];
+ noteTypeSheetController = [[SKNoteTypeSheetController alloc] init];
+ [noteTypeSheetController setDelegate:self];
+ menu = [[rightSideController.noteOutlineView headerView] menu];
+ [menu addItem:[NSMenuItem separatorItem]];
+ [[menu addItemWithTitle:NSLocalizedString(@"Note Type", @"Menu item
title") action:NULL keyEquivalent:@""] setSubmenu:[noteTypeSheetController
noteTypeMenu]];
+
[pdfView setTypeSelectHelper:[leftSideController.thumbnailTableView
typeSelectHelper]];
[window recalculateKeyViewLoop];
@@ -3119,6 +3124,11 @@
}
}
+- (void)updateNoteFilterPredicate {
+ [rightSideController.noteArrayController
setFilterPredicate:[noteTypeSheetController
filterPredicateForSearchString:[rightSideController.searchField stringValue]
caseInsensitive:mwcFlags.caseInsensitiveFilter]];
+ [rightSideController.noteOutlineView reloadData];
+}
+
#pragma mark Snapshots
- (void)resetSnapshotSizeIfNeeded {
Modified: trunk/SKMainWindowController_Actions.m
===================================================================
--- trunk/SKMainWindowController_Actions.m 2025-11-23 17:34:31 UTC (rev
15819)
+++ trunk/SKMainWindowController_Actions.m 2025-11-23 17:57:00 UTC (rev
15820)
@@ -93,6 +93,7 @@
@interface SKMainWindowController (SKPrivateUI)
- (void)updateLineInspector;
+- (void)updateNoteFilterPredicate;
- (void)updateSnapshotFilterPredicate;
- (void)resetNoteRowHeights;
@end
@@ -864,7 +865,7 @@
- (IBAction)searchNotes:(id)sender {
if (mwcFlags.rightSidePaneState == SKSidePaneStateNote)
- [rightSideController
updateNoteFilterPredicateCaseInsensitive:mwcFlags.caseInsensitiveFilter];
+ [self updateNoteFilterPredicate];
else
[self updateSnapshotFilterPredicate];
NSString *searchString = [sender stringValue];
Modified: trunk/SKMainWindowController_UI.m
===================================================================
--- trunk/SKMainWindowController_UI.m 2025-11-23 17:34:31 UTC (rev 15819)
+++ trunk/SKMainWindowController_UI.m 2025-11-23 17:57:00 UTC (rev 15820)
@@ -129,6 +129,8 @@
- (void)updatePageLabels;
- (void)updatePageLabel;
+- (void)updateNoteFilterPredicate;
+
- (void)rotatePageAtIndex:(NSUInteger)idx by:(NSInteger)rotation;
@end
@@ -1441,7 +1443,7 @@
#pragma mark SKNoteTypeSheetController delegate protocol
- (void)noteTypeSheetControllerNoteTypesDidChange {
- [rightSideController
updateNoteFilterPredicateCaseInsensitive:mwcFlags.caseInsensitiveFilter];
+ [self updateNoteFilterPredicate];
}
- (NSWindow *)windowForNoteTypeSheetController {
Modified: trunk/SKNoteOutlineView.h
===================================================================
--- trunk/SKNoteOutlineView.h 2025-11-23 17:34:31 UTC (rev 15819)
+++ trunk/SKNoteOutlineView.h 2025-11-23 17:57:00 UTC (rev 15820)
@@ -41,11 +41,8 @@
NS_ASSUME_NONNULL_BEGIN
-@class SKNoteTypeSheetController;
-
@interface SKNoteOutlineView : SKOutlineView {
NSMapTable *rowHeights;
- SKNoteTypeSheetController *noteTypeSheetController;
}
- (void)toggleTableColumn:(nullable id)sender;
@@ -57,8 +54,6 @@
- (void)setRowHeight:(CGFloat)rowHeight forItem:(id)item;
- (void)resetRowHeights;
-@property (nonatomic, readonly) SKNoteTypeSheetController
*noteTypeSheetController;
-
@end
NS_ASSUME_NONNULL_END
Modified: trunk/SKNoteOutlineView.m
===================================================================
--- trunk/SKNoteOutlineView.m 2025-11-23 17:34:31 UTC (rev 15819)
+++ trunk/SKNoteOutlineView.m 2025-11-23 17:57:00 UTC (rev 15820)
@@ -42,7 +42,6 @@
#import "SKApplication.h"
#import "NSGeometry_SKExtensions.h"
#import "NSMenu_SKExtensions.h"
-#import "SKNoteTypeSheetController.h"
#define NUMBER_OF_TYPES 9
@@ -62,7 +61,6 @@
@implementation SKNoteOutlineView
-@synthesize noteTypeSheetController;
@dynamic fullWidthCellWidth, outlineIndentation, delegate;
static inline NSString *titleForTableColumnIdentifier(NSString *identifier) {
@@ -85,15 +83,12 @@
- (instancetype)initWithCoder:(NSCoder *)decoder {
self = [super initWithCoder:decoder];
if (self) {
- noteTypeSheetController = [[SKNoteTypeSheetController alloc] init];
-
NSMenu *menu = [NSMenu menu];
- NSMenuItem *menuItem;
for (NSTableColumn *tc in [self tableColumns]) {
NSString *identifier = [tc identifier];
NSString *title = titleForTableColumnIdentifier(identifier);
- menuItem = [menu addItemWithTitle:title
action:@selector(toggleTableColumn:) target:self];
+ NSMenuItem *menuItem = [menu addItemWithTitle:title
action:@selector(toggleTableColumn:) target:self];
[menuItem setRepresentedObject:identifier];
if ([tc maxWidth] >= SMALL_COLUMN_WIDTH)
[[tc headerCell] setTitle:title];
@@ -100,9 +95,6 @@
else
[tc setHeaderToolTip:title];
}
- [menu addItem:[NSMenuItem separatorItem]];
- menuItem = [menu addItemWithTitle:NSLocalizedString(@"Note Type",
@"Menu item title") action:NULL keyEquivalent:@""];
- [menuItem setSubmenu:[noteTypeSheetController noteTypeMenu]];
[[self headerView] setMenu:menu];
Modified: trunk/SKNotesDocument.h
===================================================================
--- trunk/SKNotesDocument.h 2025-11-23 17:34:31 UTC (rev 15819)
+++ trunk/SKNotesDocument.h 2025-11-23 17:57:00 UTC (rev 15820)
@@ -54,6 +54,7 @@
NSArray<NSDictionary<NSString *, id> *> *unsupportedNotes;
PDFDocument *pdfDocument;
NSURL *sourceFileURL;
+ SKNoteTypeSheetController *noteTypeSheetController;
NSRect windowRect;
struct _ndFlags {
unsigned int exportUsingPanel:1;
Modified: trunk/SKNotesDocument.m
===================================================================
--- trunk/SKNotesDocument.m 2025-11-23 17:34:31 UTC (rev 15819)
+++ trunk/SKNotesDocument.m 2025-11-23 17:57:00 UTC (rev 15820)
@@ -174,8 +174,13 @@
[outlineView setTypeSelectHelper:[SKTypeSelectHelper
typeSelectHelperWithMatchOption:SKSubstringMatch]];
- [[outlineView noteTypeSheetController] setDelegate:self];
+ noteTypeSheetController = [[SKNoteTypeSheetController alloc]
initIncludingWidgets:YES];
+ [noteTypeSheetController setDelegate:self];
+ menu = [[outlineView headerView] menu];
+ [menu addItem:[NSMenuItem separatorItem]];
+ [[menu addItemWithTitle:NSLocalizedString(@"Note Type", @"Menu item
title") action:NULL keyEquivalent:@""] setSubmenu:[noteTypeSheetController
noteTypeMenu]];
+
[self setRecentInfoNeedsUpdate:YES];
ndFlags.settingUpWindow = NO;
@@ -391,7 +396,7 @@
}
- (void)updateNoteFilterPredicate {
- [arrayController setFilterPredicate:[[outlineView noteTypeSheetController]
filterPredicateForSearchString:[searchField stringValue]
caseInsensitive:ndFlags.caseInsensitiveSearch]];
+ [arrayController setFilterPredicate:[noteTypeSheetController
filterPredicateForSearchString:[searchField stringValue]
caseInsensitive:ndFlags.caseInsensitiveSearch]];
[outlineView reloadData];
}
Modified: trunk/SKRightSideViewController.h
===================================================================
--- trunk/SKRightSideViewController.h 2025-11-23 17:34:31 UTC (rev 15819)
+++ trunk/SKRightSideViewController.h 2025-11-23 17:57:00 UTC (rev 15820)
@@ -55,8 +55,6 @@
@property (nonatomic, nullable, strong) IBOutlet SKNoteOutlineView
*noteOutlineView;
@property (nonatomic, nullable, strong) IBOutlet SKTableView
*snapshotTableView;
-- (void)updateNoteFilterPredicateCaseInsensitive:(BOOL)caseInsensitive;
-
@end
NS_ASSUME_NONNULL_END
Modified: trunk/SKRightSideViewController.m
===================================================================
--- trunk/SKRightSideViewController.m 2025-11-23 17:34:31 UTC (rev 15819)
+++ trunk/SKRightSideViewController.m 2025-11-23 17:57:00 UTC (rev 15820)
@@ -131,9 +131,4 @@
return [NSArray arrayWithObjects:noteOutlineView, snapshotTableView, nil];
}
-- (void)updateNoteFilterPredicateCaseInsensitive:(BOOL)caseInsensitive {
- [noteArrayController setFilterPredicate:[[noteOutlineView
noteTypeSheetController] filterPredicateForSearchString:[searchField
stringValue] caseInsensitive:caseInsensitive]];
- [noteOutlineView reloadData];
-}
-
@end
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
