Menu
▾
▴
skim-app-commit — This tracks source code changes in Subversion.
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
(23) |
Apr
(254) |
May
(252) |
Jun
(209) |
Jul
(198) |
Aug
(192) |
Sep
(207) |
Oct
(120) |
Nov
(179) |
Dec
(52) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(48) |
Feb
(69) |
Mar
(129) |
Apr
(250) |
May
(113) |
Jun
(177) |
Jul
(228) |
Aug
(155) |
Sep
(218) |
Oct
(185) |
Nov
(109) |
Dec
(88) |
| 2009 |
Jan
(83) |
Feb
(39) |
Mar
(70) |
Apr
(47) |
May
(48) |
Jun
(67) |
Jul
(61) |
Aug
(97) |
Sep
(221) |
Oct
(141) |
Nov
(70) |
Dec
(61) |
| 2010 |
Jan
(45) |
Feb
(76) |
Mar
(178) |
Apr
(106) |
May
(57) |
Jun
(32) |
Jul
(64) |
Aug
(98) |
Sep
(96) |
Oct
(19) |
Nov
(34) |
Dec
(117) |
| 2011 |
Jan
(55) |
Feb
(48) |
Mar
(64) |
Apr
(21) |
May
(39) |
Jun
(53) |
Jul
(99) |
Aug
(56) |
Sep
(39) |
Oct
(26) |
Nov
(19) |
Dec
(69) |
| 2012 |
Jan
(17) |
Feb
(40) |
Mar
(17) |
Apr
|
May
(2) |
Jun
(8) |
Jul
(2) |
Aug
(10) |
Sep
(10) |
Oct
(38) |
Nov
(48) |
Dec
(70) |
| 2013 |
Jan
(43) |
Feb
(47) |
Mar
(39) |
Apr
(37) |
May
(25) |
Jun
(6) |
Jul
(20) |
Aug
(49) |
Sep
(33) |
Oct
(34) |
Nov
(75) |
Dec
(6) |
| 2014 |
Jan
(32) |
Feb
(10) |
Mar
(17) |
Apr
|
May
|
Jun
(26) |
Jul
(5) |
Aug
|
Sep
(4) |
Oct
(23) |
Nov
(80) |
Dec
(48) |
| 2015 |
Jan
(80) |
Feb
(50) |
Mar
(58) |
Apr
(20) |
May
(11) |
Jun
(16) |
Jul
(24) |
Aug
(27) |
Sep
(56) |
Oct
(30) |
Nov
(16) |
Dec
(6) |
| 2016 |
Jan
(31) |
Feb
(14) |
Mar
(23) |
Apr
(17) |
May
(40) |
Jun
(12) |
Jul
(17) |
Aug
(9) |
Sep
(32) |
Oct
(36) |
Nov
(23) |
Dec
(9) |
| 2017 |
Jan
(37) |
Feb
(23) |
Mar
(65) |
Apr
(22) |
May
(6) |
Jun
(3) |
Jul
|
Aug
|
Sep
(3) |
Oct
(22) |
Nov
(63) |
Dec
(71) |
| 2018 |
Jan
(83) |
Feb
(21) |
Mar
(35) |
Apr
(44) |
May
(14) |
Jun
(12) |
Jul
(8) |
Aug
(18) |
Sep
(10) |
Oct
(145) |
Nov
(144) |
Dec
(76) |
| 2019 |
Jan
(18) |
Feb
(28) |
Mar
(5) |
Apr
(208) |
May
(291) |
Jun
(158) |
Jul
(27) |
Aug
(8) |
Sep
(10) |
Oct
(83) |
Nov
(41) |
Dec
(31) |
| 2020 |
Jan
(16) |
Feb
(46) |
Mar
(100) |
Apr
(78) |
May
(69) |
Jun
(71) |
Jul
(28) |
Aug
(131) |
Sep
(176) |
Oct
(89) |
Nov
(147) |
Dec
(19) |
| 2021 |
Jan
(19) |
Feb
(25) |
Mar
(91) |
Apr
(98) |
May
(14) |
Jun
(44) |
Jul
(8) |
Aug
(3) |
Sep
(38) |
Oct
(57) |
Nov
(97) |
Dec
(74) |
| 2022 |
Jan
(89) |
Feb
(47) |
Mar
(15) |
Apr
(50) |
May
(54) |
Jun
(56) |
Jul
(80) |
Aug
(12) |
Sep
(11) |
Oct
(60) |
Nov
(48) |
Dec
(4) |
| 2023 |
Jan
(75) |
Feb
(49) |
Mar
(84) |
Apr
(24) |
May
(13) |
Jun
(74) |
Jul
(32) |
Aug
(66) |
Sep
(50) |
Oct
(38) |
Nov
(105) |
Dec
(181) |
| 2024 |
Jan
(21) |
Feb
(49) |
Mar
(77) |
Apr
(84) |
May
(20) |
Jun
(71) |
Jul
(53) |
Aug
(33) |
Sep
(54) |
Oct
(124) |
Nov
(151) |
Dec
(73) |
| 2025 |
Jan
(61) |
Feb
(17) |
Mar
(136) |
Apr
(72) |
May
(200) |
Jun
(238) |
Jul
(91) |
Aug
(8) |
Sep
|
Oct
(63) |
Nov
(42) |
Dec
|
|
From: <ho...@us...> - 2025-11-09 23:02:45
|
Revision: 15782
http://sourceforge.net/p/skim-app/code/15782
Author: hofman
Date: 2025-11-09 23:02:42 +0000 (Sun, 09 Nov 2025)
Log Message:
-----------
use extensible enum string typedefs
Modified Paths:
--------------
trunk/NSDocument_SKExtensions.h
trunk/NSDocument_SKExtensions.m
trunk/NSError_SKExtensions.h
trunk/NSError_SKExtensions.m
trunk/NSImage_SKExtensions.h
trunk/NSImage_SKExtensions.m
trunk/NSValueTransformer_SKExtensions.h
trunk/NSValueTransformer_SKExtensions.m
trunk/PDFAnnotation_SKExtensions.h
trunk/PDFAnnotation_SKExtensions.m
trunk/PDFDocument_SKExtensions.h
trunk/PDFDocument_SKExtensions.m
trunk/PDFPage_SKExtensions.h
trunk/PDFPage_SKExtensions.m
trunk/SKDocumentController.h
trunk/SKDocumentController.m
trunk/SKLineInspector.h
trunk/SKLineInspector.m
trunk/SKLineWell.h
trunk/SKLineWell.m
trunk/SKMainDocument.h
trunk/SKMainDocument.m
trunk/SKPDFView.h
trunk/SKPDFView.m
trunk/SKPresentationView.h
trunk/SKPresentationView.m
trunk/SKTransitionInfo.h
trunk/SKTransitionInfo.m
Modified: trunk/NSDocument_SKExtensions.h
===================================================================
--- trunk/NSDocument_SKExtensions.h 2025-11-09 22:47:51 UTC (rev 15781)
+++ trunk/NSDocument_SKExtensions.h 2025-11-09 23:02:42 UTC (rev 15782)
@@ -40,7 +40,7 @@
NS_ASSUME_NONNULL_BEGIN
-extern NSString * const SKDocumentFileURLDidChangeNotification;
+extern NSNotificationName const SKDocumentFileURLDidChangeNotification;
typedef NS_ENUM(NSInteger, SKInteractionMode) {
SKNormalMode,
Modified: trunk/NSDocument_SKExtensions.m
===================================================================
--- trunk/NSDocument_SKExtensions.m 2025-11-09 22:47:51 UTC (rev 15781)
+++ trunk/NSDocument_SKExtensions.m 2025-11-09 23:02:42 UTC (rev 15782)
@@ -59,7 +59,7 @@
#define SKDisableExportAttributesKey @"SKDisableExportAttributes"
-NSString * const SKDocumentFileURLDidChangeNotification = @"SKDocumentFileURLDidChangeNotification";
+NSNotificationName const SKDocumentFileURLDidChangeNotification = @"SKDocumentFileURLDidChangeNotification";
@implementation NSDocument (SKExtensions)
Modified: trunk/NSError_SKExtensions.h
===================================================================
--- trunk/NSError_SKExtensions.h 2025-11-09 22:47:51 UTC (rev 15781)
+++ trunk/NSError_SKExtensions.h 2025-11-09 23:02:42 UTC (rev 15782)
@@ -40,7 +40,7 @@
NS_ASSUME_NONNULL_BEGIN
-extern NSString * const SKDocumentErrorDomain;
+extern NSErrorDomain const SKDocumentErrorDomain;
enum {
SKWriteFileError = 1,
Modified: trunk/NSError_SKExtensions.m
===================================================================
--- trunk/NSError_SKExtensions.m 2025-11-09 22:47:51 UTC (rev 15781)
+++ trunk/NSError_SKExtensions.m 2025-11-09 23:02:42 UTC (rev 15782)
@@ -38,7 +38,7 @@
#import "NSError_SKExtensions.h"
-NSString * const SKDocumentErrorDomain = @"SKDocumentErrorDomain";
+NSErrorDomain const SKDocumentErrorDomain = @"SKDocumentErrorDomain";
#define ELLIPSIS_CHARACTER (unichar)0x2026
Modified: trunk/NSImage_SKExtensions.h
===================================================================
--- trunk/NSImage_SKExtensions.h 2025-11-09 22:47:51 UTC (rev 15781)
+++ trunk/NSImage_SKExtensions.h 2025-11-09 23:02:42 UTC (rev 15782)
@@ -40,157 +40,157 @@
NS_ASSUME_NONNULL_BEGIN
-extern NSString * const SKImageNameTextNote;
-extern NSString * const SKImageNameAnchoredNote;
-extern NSString * const SKImageNameCircleNote;
-extern NSString * const SKImageNameSquareNote;
-extern NSString * const SKImageNameHighlightNote;
-extern NSString * const SKImageNameUnderlineNote;
-extern NSString * const SKImageNameStrikeOutNote;
-extern NSString * const SKImageNameLineNote;
-extern NSString * const SKImageNameInkNote;
-extern NSString * const SKImageNameWidgetNote;
+extern NSImageName const SKImageNameTextNote;
+extern NSImageName const SKImageNameAnchoredNote;
+extern NSImageName const SKImageNameCircleNote;
+extern NSImageName const SKImageNameSquareNote;
+extern NSImageName const SKImageNameHighlightNote;
+extern NSImageName const SKImageNameUnderlineNote;
+extern NSImageName const SKImageNameStrikeOutNote;
+extern NSImageName const SKImageNameLineNote;
+extern NSImageName const SKImageNameInkNote;
+extern NSImageName const SKImageNameWidgetNote;
-extern NSString * const SKImageNameToolbarPageUp;
-extern NSString * const SKImageNameToolbarPageDown;
-extern NSString * const SKImageNameToolbarFirstPage;
-extern NSString * const SKImageNameToolbarLastPage;
-extern NSString * const SKImageNameToolbarBack;
-extern NSString * const SKImageNameToolbarForward;
-extern NSString * const SKImageNameToolbarZoomIn;
-extern NSString * const SKImageNameToolbarZoomOut;
-extern NSString * const SKImageNameToolbarZoomActual;
-extern NSString * const SKImageNameToolbarZoomToFit;
-extern NSString * const SKImageNameToolbarZoomToSelection;
-extern NSString * const SKImageNameToolbarAutoScales;
-extern NSString * const SKImageNameToolbarRotateRight;
-extern NSString * const SKImageNameToolbarRotateLeft;
-extern NSString * const SKImageNameToolbarCrop;
-extern NSString * const SKImageNameToolbarFullScreen;
-extern NSString * const SKImageNameToolbarPresentation;
-extern NSString * const SKImageNameToolbarSinglePage;
-extern NSString * const SKImageNameToolbarTwoUp;
-extern NSString * const SKImageNameToolbarSinglePageContinuous;
-extern NSString * const SKImageNameToolbarTwoUpContinuous;
-extern NSString * const SKImageNameToolbarHorizontal;
-extern NSString * const SKImageNameToolbarRTL;
-extern NSString * const SKImageNameToolbarBookMode;
-extern NSString * const SKImageNameToolbarPageBreaks;
-extern NSString * const SKImageNameToolbarMediaBox;
-extern NSString * const SKImageNameToolbarCropBox;
-extern NSString * const SKImageNameToolbarLeftPane;
-extern NSString * const SKImageNameToolbarRightPane;
-extern NSString * const SKImageNameToolbarSplitPDF;
-extern NSString * const SKImageNameToolbarTextNoteMenu;
-extern NSString * const SKImageNameToolbarAnchoredNoteMenu;
-extern NSString * const SKImageNameToolbarCircleNoteMenu;
-extern NSString * const SKImageNameToolbarSquareNoteMenu;
-extern NSString * const SKImageNameToolbarHighlightNoteMenu;
-extern NSString * const SKImageNameToolbarUnderlineNoteMenu;
-extern NSString * const SKImageNameToolbarStrikeOutNoteMenu;
-extern NSString * const SKImageNameToolbarLineNoteMenu;
-extern NSString * const SKImageNameToolbarInkNoteMenu;
-extern NSString * const SKImageNameToolbarAddTextNote;
-extern NSString * const SKImageNameToolbarAddAnchoredNote;
-extern NSString * const SKImageNameToolbarAddCircleNote;
-extern NSString * const SKImageNameToolbarAddSquareNote;
-extern NSString * const SKImageNameToolbarAddHighlightNote;
-extern NSString * const SKImageNameToolbarAddUnderlineNote;
-extern NSString * const SKImageNameToolbarAddStrikeOutNote;
-extern NSString * const SKImageNameToolbarAddLineNote;
-extern NSString * const SKImageNameToolbarAddInkNote;
-extern NSString * const SKImageNameToolbarAddTextNoteMenu;
-extern NSString * const SKImageNameToolbarAddAnchoredNoteMenu;
-extern NSString * const SKImageNameToolbarAddCircleNoteMenu;
-extern NSString * const SKImageNameToolbarAddSquareNoteMenu;
-extern NSString * const SKImageNameToolbarAddHighlightNoteMenu;
-extern NSString * const SKImageNameToolbarAddUnderlineNoteMenu;
-extern NSString * const SKImageNameToolbarAddStrikeOutNoteMenu;
-extern NSString * const SKImageNameToolbarAddLineNoteMenu;
-extern NSString * const SKImageNameToolbarAddInkNoteMenu;
-extern NSString * const SKImageNameToolbarNotes;
-extern NSString * const SKImageNameToolbarTextTool;
-extern NSString * const SKImageNameToolbarMoveTool;
-extern NSString * const SKImageNameToolbarMagnifyTool;
-extern NSString * const SKImageNameToolbarSelectTool;
-extern NSString * const SKImageNameToolbarSnapshotTool;
-extern NSString * const SKImageNameToolbarShare;
-extern NSString * const SKImageNameToolbarPlay;
-extern NSString * const SKImageNameToolbarPause;
-extern NSString * const SKImageNameToolbarInfo;
-extern NSString * const SKImageNameToolbarColors;
-extern NSString * const SKImageNameToolbarFonts;
-extern NSString * const SKImageNameToolbarLines;
-extern NSString * const SKImageNameToolbarPrint;
+extern NSImageName const SKImageNameToolbarPageUp;
+extern NSImageName const SKImageNameToolbarPageDown;
+extern NSImageName const SKImageNameToolbarFirstPage;
+extern NSImageName const SKImageNameToolbarLastPage;
+extern NSImageName const SKImageNameToolbarBack;
+extern NSImageName const SKImageNameToolbarForward;
+extern NSImageName const SKImageNameToolbarZoomIn;
+extern NSImageName const SKImageNameToolbarZoomOut;
+extern NSImageName const SKImageNameToolbarZoomActual;
+extern NSImageName const SKImageNameToolbarZoomToFit;
+extern NSImageName const SKImageNameToolbarZoomToSelection;
+extern NSImageName const SKImageNameToolbarAutoScales;
+extern NSImageName const SKImageNameToolbarRotateRight;
+extern NSImageName const SKImageNameToolbarRotateLeft;
+extern NSImageName const SKImageNameToolbarCrop;
+extern NSImageName const SKImageNameToolbarFullScreen;
+extern NSImageName const SKImageNameToolbarPresentation;
+extern NSImageName const SKImageNameToolbarSinglePage;
+extern NSImageName const SKImageNameToolbarTwoUp;
+extern NSImageName const SKImageNameToolbarSinglePageContinuous;
+extern NSImageName const SKImageNameToolbarTwoUpContinuous;
+extern NSImageName const SKImageNameToolbarHorizontal;
+extern NSImageName const SKImageNameToolbarRTL;
+extern NSImageName const SKImageNameToolbarBookMode;
+extern NSImageName const SKImageNameToolbarPageBreaks;
+extern NSImageName const SKImageNameToolbarMediaBox;
+extern NSImageName const SKImageNameToolbarCropBox;
+extern NSImageName const SKImageNameToolbarLeftPane;
+extern NSImageName const SKImageNameToolbarRightPane;
+extern NSImageName const SKImageNameToolbarSplitPDF;
+extern NSImageName const SKImageNameToolbarTextNoteMenu;
+extern NSImageName const SKImageNameToolbarAnchoredNoteMenu;
+extern NSImageName const SKImageNameToolbarCircleNoteMenu;
+extern NSImageName const SKImageNameToolbarSquareNoteMenu;
+extern NSImageName const SKImageNameToolbarHighlightNoteMenu;
+extern NSImageName const SKImageNameToolbarUnderlineNoteMenu;
+extern NSImageName const SKImageNameToolbarStrikeOutNoteMenu;
+extern NSImageName const SKImageNameToolbarLineNoteMenu;
+extern NSImageName const SKImageNameToolbarInkNoteMenu;
+extern NSImageName const SKImageNameToolbarAddTextNote;
+extern NSImageName const SKImageNameToolbarAddAnchoredNote;
+extern NSImageName const SKImageNameToolbarAddCircleNote;
+extern NSImageName const SKImageNameToolbarAddSquareNote;
+extern NSImageName const SKImageNameToolbarAddHighlightNote;
+extern NSImageName const SKImageNameToolbarAddUnderlineNote;
+extern NSImageName const SKImageNameToolbarAddStrikeOutNote;
+extern NSImageName const SKImageNameToolbarAddLineNote;
+extern NSImageName const SKImageNameToolbarAddInkNote;
+extern NSImageName const SKImageNameToolbarAddTextNoteMenu;
+extern NSImageName const SKImageNameToolbarAddAnchoredNoteMenu;
+extern NSImageName const SKImageNameToolbarAddCircleNoteMenu;
+extern NSImageName const SKImageNameToolbarAddSquareNoteMenu;
+extern NSImageName const SKImageNameToolbarAddHighlightNoteMenu;
+extern NSImageName const SKImageNameToolbarAddUnderlineNoteMenu;
+extern NSImageName const SKImageNameToolbarAddStrikeOutNoteMenu;
+extern NSImageName const SKImageNameToolbarAddLineNoteMenu;
+extern NSImageName const SKImageNameToolbarAddInkNoteMenu;
+extern NSImageName const SKImageNameToolbarNotes;
+extern NSImageName const SKImageNameToolbarTextTool;
+extern NSImageName const SKImageNameToolbarMoveTool;
+extern NSImageName const SKImageNameToolbarMagnifyTool;
+extern NSImageName const SKImageNameToolbarSelectTool;
+extern NSImageName const SKImageNameToolbarSnapshotTool;
+extern NSImageName const SKImageNameToolbarShare;
+extern NSImageName const SKImageNameToolbarPlay;
+extern NSImageName const SKImageNameToolbarPause;
+extern NSImageName const SKImageNameToolbarInfo;
+extern NSImageName const SKImageNameToolbarColors;
+extern NSImageName const SKImageNameToolbarFonts;
+extern NSImageName const SKImageNameToolbarLines;
+extern NSImageName const SKImageNameToolbarPrint;
-extern NSString * const SKImageNameTouchBarPageUp;
-extern NSString * const SKImageNameTouchBarPageDown;
-extern NSString * const SKImageNameTouchBarFirstPage;
-extern NSString * const SKImageNameTouchBarLastPage;
-extern NSString * const SKImageNameTouchBarZoomIn;
-extern NSString * const SKImageNameTouchBarZoomOut;
-extern NSString * const SKImageNameTouchBarZoomActual;
-extern NSString * const SKImageNameTouchBarZoomToSelection;
-extern NSString * const SKImageNameTouchBarTextTool;
-extern NSString * const SKImageNameTouchBarMoveTool;
-extern NSString * const SKImageNameTouchBarMagnifyTool;
-extern NSString * const SKImageNameTouchBarSelectTool;
-extern NSString * const SKImageNameTouchBarSnapshotTool;
-extern NSString * const SKImageNameTouchBarTextNote;
-extern NSString * const SKImageNameTouchBarAnchoredNote;
-extern NSString * const SKImageNameTouchBarCircleNote;
-extern NSString * const SKImageNameTouchBarSquareNote;
-extern NSString * const SKImageNameTouchBarHighlightNote;
-extern NSString * const SKImageNameTouchBarUnderlineNote;
-extern NSString * const SKImageNameTouchBarStrikeOutNote;
-extern NSString * const SKImageNameTouchBarLineNote;
-extern NSString * const SKImageNameTouchBarInkNote;
-extern NSString * const SKImageNameTouchBarTextNotePopover;
-extern NSString * const SKImageNameTouchBarAnchoredNotePopover;
-extern NSString * const SKImageNameTouchBarCircleNotePopover;
-extern NSString * const SKImageNameTouchBarSquareNotePopover;
-extern NSString * const SKImageNameTouchBarHighlightNotePopover;
-extern NSString * const SKImageNameTouchBarUnderlineNotePopover;
-extern NSString * const SKImageNameTouchBarStrikeOutNotePopover;
-extern NSString * const SKImageNameTouchBarLineNotePopover;
-extern NSString * const SKImageNameTouchBarInkNotePopover;
-extern NSString * const SKImageNameTouchBarAddTextNote;
-extern NSString * const SKImageNameTouchBarAddAnchoredNote;
-extern NSString * const SKImageNameTouchBarAddCircleNote;
-extern NSString * const SKImageNameTouchBarAddSquareNote;
-extern NSString * const SKImageNameTouchBarAddHighlightNote;
-extern NSString * const SKImageNameTouchBarAddUnderlineNote;
-extern NSString * const SKImageNameTouchBarAddStrikeOutNote;
-extern NSString * const SKImageNameTouchBarAddLineNote;
-extern NSString * const SKImageNameTouchBarAddInkNote;
-extern NSString * const SKImageNameTouchBarNewSeparator;
-extern NSString * const SKImageNameTouchBarRefresh;
-extern NSString * const SKImageNameTouchBarStopProgress;
+extern NSImageName const SKImageNameTouchBarPageUp;
+extern NSImageName const SKImageNameTouchBarPageDown;
+extern NSImageName const SKImageNameTouchBarFirstPage;
+extern NSImageName const SKImageNameTouchBarLastPage;
+extern NSImageName const SKImageNameTouchBarZoomIn;
+extern NSImageName const SKImageNameTouchBarZoomOut;
+extern NSImageName const SKImageNameTouchBarZoomActual;
+extern NSImageName const SKImageNameTouchBarZoomToSelection;
+extern NSImageName const SKImageNameTouchBarTextTool;
+extern NSImageName const SKImageNameTouchBarMoveTool;
+extern NSImageName const SKImageNameTouchBarMagnifyTool;
+extern NSImageName const SKImageNameTouchBarSelectTool;
+extern NSImageName const SKImageNameTouchBarSnapshotTool;
+extern NSImageName const SKImageNameTouchBarTextNote;
+extern NSImageName const SKImageNameTouchBarAnchoredNote;
+extern NSImageName const SKImageNameTouchBarCircleNote;
+extern NSImageName const SKImageNameTouchBarSquareNote;
+extern NSImageName const SKImageNameTouchBarHighlightNote;
+extern NSImageName const SKImageNameTouchBarUnderlineNote;
+extern NSImageName const SKImageNameTouchBarStrikeOutNote;
+extern NSImageName const SKImageNameTouchBarLineNote;
+extern NSImageName const SKImageNameTouchBarInkNote;
+extern NSImageName const SKImageNameTouchBarTextNotePopover;
+extern NSImageName const SKImageNameTouchBarAnchoredNotePopover;
+extern NSImageName const SKImageNameTouchBarCircleNotePopover;
+extern NSImageName const SKImageNameTouchBarSquareNotePopover;
+extern NSImageName const SKImageNameTouchBarHighlightNotePopover;
+extern NSImageName const SKImageNameTouchBarUnderlineNotePopover;
+extern NSImageName const SKImageNameTouchBarStrikeOutNotePopover;
+extern NSImageName const SKImageNameTouchBarLineNotePopover;
+extern NSImageName const SKImageNameTouchBarInkNotePopover;
+extern NSImageName const SKImageNameTouchBarAddTextNote;
+extern NSImageName const SKImageNameTouchBarAddAnchoredNote;
+extern NSImageName const SKImageNameTouchBarAddCircleNote;
+extern NSImageName const SKImageNameTouchBarAddSquareNote;
+extern NSImageName const SKImageNameTouchBarAddHighlightNote;
+extern NSImageName const SKImageNameTouchBarAddUnderlineNote;
+extern NSImageName const SKImageNameTouchBarAddStrikeOutNote;
+extern NSImageName const SKImageNameTouchBarAddLineNote;
+extern NSImageName const SKImageNameTouchBarAddInkNote;
+extern NSImageName const SKImageNameTouchBarNewSeparator;
+extern NSImageName const SKImageNameTouchBarRefresh;
+extern NSImageName const SKImageNameTouchBarStopProgress;
-extern NSString * const SKImageNameGeneralPreferences;
-extern NSString * const SKImageNameDisplayPreferences;
-extern NSString * const SKImageNameNotesPreferences;
-extern NSString * const SKImageNameSyncPreferences;
+extern NSImageName const SKImageNameGeneralPreferences;
+extern NSImageName const SKImageNameDisplayPreferences;
+extern NSImageName const SKImageNameNotesPreferences;
+extern NSImageName const SKImageNameSyncPreferences;
-extern NSString * const SKImageNameToolbarNewFolder;
-extern NSString * const SKImageNameToolbarNewSeparator;
-extern NSString * const SKImageNameToolbarDelete;
+extern NSImageName const SKImageNameToolbarNewFolder;
+extern NSImageName const SKImageNameToolbarNewSeparator;
+extern NSImageName const SKImageNameToolbarDelete;
-extern NSString * const SKImageNameOutlineViewAdorn;
-extern NSString * const SKImageNameThumbnailViewAdorn;
-extern NSString * const SKImageNameNoteViewAdorn;
-extern NSString * const SKImageNameSnapshotViewAdorn;
-extern NSString * const SKImageNameFindViewAdorn;
-extern NSString * const SKImageNameGroupedFindViewAdorn;
-extern NSString * const SKImageNameTextToolAdorn;
-extern NSString * const SKImageNameInkToolAdorn;
+extern NSImageName const SKImageNameOutlineViewAdorn;
+extern NSImageName const SKImageNameThumbnailViewAdorn;
+extern NSImageName const SKImageNameNoteViewAdorn;
+extern NSImageName const SKImageNameSnapshotViewAdorn;
+extern NSImageName const SKImageNameFindViewAdorn;
+extern NSImageName const SKImageNameGroupedFindViewAdorn;
+extern NSImageName const SKImageNameTextToolAdorn;
+extern NSImageName const SKImageNameInkToolAdorn;
-extern NSString * const SKImageNameTextAlignLeft;
-extern NSString * const SKImageNameTextAlignCenter;
-extern NSString * const SKImageNameTextAlignRight;
+extern NSImageName const SKImageNameTextAlignLeft;
+extern NSImageName const SKImageNameTextAlignCenter;
+extern NSImageName const SKImageNameTextAlignRight;
-extern NSString * const SKImageNameRemoteStateResize;
-extern NSString * const SKImageNameRemoteStateScroll;
+extern NSImageName const SKImageNameRemoteStateResize;
+extern NSImageName const SKImageNameRemoteStateScroll;
@interface NSImage (SKExtensions)
Modified: trunk/NSImage_SKExtensions.m
===================================================================
--- trunk/NSImage_SKExtensions.m 2025-11-09 22:47:51 UTC (rev 15781)
+++ trunk/NSImage_SKExtensions.m 2025-11-09 23:02:42 UTC (rev 15782)
@@ -44,157 +44,157 @@
#import <SkimNotes/SkimNotes.h>
-NSString * const SKImageNameTextNote = @"TextNote";
-NSString * const SKImageNameAnchoredNote = @"AnchoredNote";
-NSString * const SKImageNameCircleNote = @"CircleNote";
-NSString * const SKImageNameSquareNote = @"SquareNote";
-NSString * const SKImageNameHighlightNote = @"HighlightNote";
-NSString * const SKImageNameUnderlineNote = @"UnderlineNote";
-NSString * const SKImageNameStrikeOutNote = @"StrikeOutNote";
-NSString * const SKImageNameLineNote = @"LineNote";
-NSString * const SKImageNameInkNote = @"InkNote";
-NSString * const SKImageNameWidgetNote = @"Widget";
+NSImageName const SKImageNameTextNote = @"TextNote";
+NSImageName const SKImageNameAnchoredNote = @"AnchoredNote";
+NSImageName const SKImageNameCircleNote = @"CircleNote";
+NSImageName const SKImageNameSquareNote = @"SquareNote";
+NSImageName const SKImageNameHighlightNote = @"HighlightNote";
+NSImageName const SKImageNameUnderlineNote = @"UnderlineNote";
+NSImageName const SKImageNameStrikeOutNote = @"StrikeOutNote";
+NSImageName const SKImageNameLineNote = @"LineNote";
+NSImageName const SKImageNameInkNote = @"InkNote";
+NSImageName const SKImageNameWidgetNote = @"Widget";
-NSString * const SKImageNameToolbarPageUp = @"ToolbarPageUp";
-NSString * const SKImageNameToolbarPageDown = @"ToolbarPageDown";
-NSString * const SKImageNameToolbarFirstPage = @"ToolbarFirstPage";
-NSString * const SKImageNameToolbarLastPage = @"ToolbarLastPage";
-NSString * const SKImageNameToolbarBack = @"ToolbarBack";
-NSString * const SKImageNameToolbarForward = @"ToolbarForward";
-NSString * const SKImageNameToolbarZoomIn = @"ToolbarZoomIn";
-NSString * const SKImageNameToolbarZoomOut = @"ToolbarZoomOut";
-NSString * const SKImageNameToolbarZoomActual = @"ToolbarZoomActual";
-NSString * const SKImageNameToolbarZoomToFit = @"ToolbarZoomToFit";
-NSString * const SKImageNameToolbarZoomToSelection = @"ToolbarZoomToSelection";
-NSString * const SKImageNameToolbarAutoScales = @"ToolbarAutoScales";
-NSString * const SKImageNameToolbarRotateRight = @"ToolbarRotateRight";
-NSString * const SKImageNameToolbarRotateLeft = @"ToolbarRotateLeft";
-NSString * const SKImageNameToolbarCrop = @"ToolbarCrop";
-NSString * const SKImageNameToolbarFullScreen = @"ToolbarFullScreen";
-NSString * const SKImageNameToolbarPresentation = @"ToolbarPresentation";
-NSString * const SKImageNameToolbarSinglePage = @"ToolbarSinglePage";
-NSString * const SKImageNameToolbarTwoUp = @"ToolbarTwoUp";
-NSString * const SKImageNameToolbarSinglePageContinuous = @"ToolbarSinglePageContinuous";
-NSString * const SKImageNameToolbarTwoUpContinuous = @"ToolbarTwoUpContinuous";
-NSString * const SKImageNameToolbarHorizontal = @"ToolbarHorizontal";
-NSString * const SKImageNameToolbarRTL = @"ToolbarRTL";
-NSString * const SKImageNameToolbarBookMode = @"ToolbarBookMode";
-NSString * const SKImageNameToolbarPageBreaks = @"ToolbarPageBreaks";
-NSString * const SKImageNameToolbarMediaBox = @"ToolbarMediaBox";
-NSString * const SKImageNameToolbarCropBox = @"ToolbarCropBox";
-NSString * const SKImageNameToolbarLeftPane = @"ToolbarLeftPane";
-NSString * const SKImageNameToolbarRightPane = @"ToolbarRightPane";
-NSString * const SKImageNameToolbarSplitPDF = @"ToolbarSplitPDF";
-NSString * const SKImageNameToolbarTextNoteMenu = @"ToolbarTextNoteMenu";
-NSString * const SKImageNameToolbarAnchoredNoteMenu = @"ToolbarAnchoredNoteMenu";
-NSString * const SKImageNameToolbarCircleNoteMenu = @"ToolbarCircleNoteMenu";
-NSString * const SKImageNameToolbarSquareNoteMenu = @"ToolbarSquareNoteMenu";
-NSString * const SKImageNameToolbarHighlightNoteMenu = @"ToolbarHighlightNoteMenu";
-NSString * const SKImageNameToolbarUnderlineNoteMenu = @"ToolbarUnderlineNoteMenu";
-NSString * const SKImageNameToolbarStrikeOutNoteMenu = @"ToolbarStrikeOutNoteMenu";
-NSString * const SKImageNameToolbarLineNoteMenu = @"ToolbarLineNoteMenu";
-NSString * const SKImageNameToolbarInkNoteMenu = @"ToolbarInkNoteMenu";
-NSString * const SKImageNameToolbarAddTextNote = @"ToolbarAddTextNote";
-NSString * const SKImageNameToolbarAddAnchoredNote = @"ToolbarAddAnchoredNote";
-NSString * const SKImageNameToolbarAddCircleNote = @"ToolbarAddCircleNote";
-NSString * const SKImageNameToolbarAddSquareNote = @"ToolbarAddSquareNote";
-NSString * const SKImageNameToolbarAddHighlightNote = @"ToolbarAddHighlightNote";
-NSString * const SKImageNameToolbarAddUnderlineNote = @"ToolbarAddUnderlineNote";
-NSString * const SKImageNameToolbarAddStrikeOutNote = @"ToolbarAddStrikeOutNote";
-NSString * const SKImageNameToolbarAddLineNote = @"ToolbarAddLineNote";
-NSString * const SKImageNameToolbarAddInkNote = @"ToolbarAddInkNote";
-NSString * const SKImageNameToolbarAddTextNoteMenu = @"ToolbarAddTextNoteMenu";
-NSString * const SKImageNameToolbarAddAnchoredNoteMenu = @"ToolbarAddAnchoredNoteMenu";
-NSString * const SKImageNameToolbarAddCircleNoteMenu = @"ToolbarAddCircleNoteMenu";
-NSString * const SKImageNameToolbarAddSquareNoteMenu = @"ToolbarAddSquareNoteMenu";
-NSString * const SKImageNameToolbarAddHighlightNoteMenu = @"ToolbarAddHighlightNoteMenu";
-NSString * const SKImageNameToolbarAddUnderlineNoteMenu = @"ToolbarAddUnderlineNoteMenu";
-NSString * const SKImageNameToolbarAddStrikeOutNoteMenu = @"ToolbarAddStrikeOutNoteMenu";
-NSString * const SKImageNameToolbarAddLineNoteMenu = @"ToolbarAddLineNoteMenu";
-NSString * const SKImageNameToolbarAddInkNoteMenu = @"ToolbarAddInkNoteMenu";
-NSString * const SKImageNameToolbarNotes = @"ToolbarNotes";
-NSString * const SKImageNameToolbarTextTool = @"ToolbarTextTool";
-NSString * const SKImageNameToolbarMoveTool = @"ToolbarMoveTool";
-NSString * const SKImageNameToolbarMagnifyTool = @"ToolbarMagnifyTool";
-NSString * const SKImageNameToolbarSelectTool = @"ToolbarSelectTool";
-NSString * const SKImageNameToolbarSnapshotTool = @"ToolbarSnapshotTool";
-NSString * const SKImageNameToolbarShare = @"ToolbarShare";
-NSString * const SKImageNameToolbarPlay = @"ToolbarPlay";
-NSString * const SKImageNameToolbarPause = @"ToolbarPause";
-NSString * const SKImageNameToolbarInfo = @"ToolbarInfo";
-NSString * const SKImageNameToolbarColors = @"ToolbarColors";
-NSString * const SKImageNameToolbarFonts = @"ToolbarFonts";
-NSString * const SKImageNameToolbarLines = @"ToolbarLines";
-NSString * const SKImageNameToolbarPrint = @"ToolbarPrint";
+NSImageName const SKImageNameToolbarPageUp = @"ToolbarPageUp";
+NSImageName const SKImageNameToolbarPageDown = @"ToolbarPageDown";
+NSImageName const SKImageNameToolbarFirstPage = @"ToolbarFirstPage";
+NSImageName const SKImageNameToolbarLastPage = @"ToolbarLastPage";
+NSImageName const SKImageNameToolbarBack = @"ToolbarBack";
+NSImageName const SKImageNameToolbarForward = @"ToolbarForward";
+NSImageName const SKImageNameToolbarZoomIn = @"ToolbarZoomIn";
+NSImageName const SKImageNameToolbarZoomOut = @"ToolbarZoomOut";
+NSImageName const SKImageNameToolbarZoomActual = @"ToolbarZoomActual";
+NSImageName const SKImageNameToolbarZoomToFit = @"ToolbarZoomToFit";
+NSImageName const SKImageNameToolbarZoomToSelection = @"ToolbarZoomToSelection";
+NSImageName const SKImageNameToolbarAutoScales = @"ToolbarAutoScales";
+NSImageName const SKImageNameToolbarRotateRight = @"ToolbarRotateRight";
+NSImageName const SKImageNameToolbarRotateLeft = @"ToolbarRotateLeft";
+NSImageName const SKImageNameToolbarCrop = @"ToolbarCrop";
+NSImageName const SKImageNameToolbarFullScreen = @"ToolbarFullScreen";
+NSImageName const SKImageNameToolbarPresentation = @"ToolbarPresentation";
+NSImageName const SKImageNameToolbarSinglePage = @"ToolbarSinglePage";
+NSImageName const SKImageNameToolbarTwoUp = @"ToolbarTwoUp";
+NSImageName const SKImageNameToolbarSinglePageContinuous = @"ToolbarSinglePageContinuous";
+NSImageName const SKImageNameToolbarTwoUpContinuous = @"ToolbarTwoUpContinuous";
+NSImageName const SKImageNameToolbarHorizontal = @"ToolbarHorizontal";
+NSImageName const SKImageNameToolbarRTL = @"ToolbarRTL";
+NSImageName const SKImageNameToolbarBookMode = @"ToolbarBookMode";
+NSImageName const SKImageNameToolbarPageBreaks = @"ToolbarPageBreaks";
+NSImageName const SKImageNameToolbarMediaBox = @"ToolbarMediaBox";
+NSImageName const SKImageNameToolbarCropBox = @"ToolbarCropBox";
+NSImageName const SKImageNameToolbarLeftPane = @"ToolbarLeftPane";
+NSImageName const SKImageNameToolbarRightPane = @"ToolbarRightPane";
+NSImageName const SKImageNameToolbarSplitPDF = @"ToolbarSplitPDF";
+NSImageName const SKImageNameToolbarTextNoteMenu = @"ToolbarTextNoteMenu";
+NSImageName const SKImageNameToolbarAnchoredNoteMenu = @"ToolbarAnchoredNoteMenu";
+NSImageName const SKImageNameToolbarCircleNoteMenu = @"ToolbarCircleNoteMenu";
+NSImageName const SKImageNameToolbarSquareNoteMenu = @"ToolbarSquareNoteMenu";
+NSImageName const SKImageNameToolbarHighlightNoteMenu = @"ToolbarHighlightNoteMenu";
+NSImageName const SKImageNameToolbarUnderlineNoteMenu = @"ToolbarUnderlineNoteMenu";
+NSImageName const SKImageNameToolbarStrikeOutNoteMenu = @"ToolbarStrikeOutNoteMenu";
+NSImageName const SKImageNameToolbarLineNoteMenu = @"ToolbarLineNoteMenu";
+NSImageName const SKImageNameToolbarInkNoteMenu = @"ToolbarInkNoteMenu";
+NSImageName const SKImageNameToolbarAddTextNote = @"ToolbarAddTextNote";
+NSImageName const SKImageNameToolbarAddAnchoredNote = @"ToolbarAddAnchoredNote";
+NSImageName const SKImageNameToolbarAddCircleNote = @"ToolbarAddCircleNote";
+NSImageName const SKImageNameToolbarAddSquareNote = @"ToolbarAddSquareNote";
+NSImageName const SKImageNameToolbarAddHighlightNote = @"ToolbarAddHighlightNote";
+NSImageName const SKImageNameToolbarAddUnderlineNote = @"ToolbarAddUnderlineNote";
+NSImageName const SKImageNameToolbarAddStrikeOutNote = @"ToolbarAddStrikeOutNote";
+NSImageName const SKImageNameToolbarAddLineNote = @"ToolbarAddLineNote";
+NSImageName const SKImageNameToolbarAddInkNote = @"ToolbarAddInkNote";
+NSImageName const SKImageNameToolbarAddTextNoteMenu = @"ToolbarAddTextNoteMenu";
+NSImageName const SKImageNameToolbarAddAnchoredNoteMenu = @"ToolbarAddAnchoredNoteMenu";
+NSImageName const SKImageNameToolbarAddCircleNoteMenu = @"ToolbarAddCircleNoteMenu";
+NSImageName const SKImageNameToolbarAddSquareNoteMenu = @"ToolbarAddSquareNoteMenu";
+NSImageName const SKImageNameToolbarAddHighlightNoteMenu = @"ToolbarAddHighlightNoteMenu";
+NSImageName const SKImageNameToolbarAddUnderlineNoteMenu = @"ToolbarAddUnderlineNoteMenu";
+NSImageName const SKImageNameToolbarAddStrikeOutNoteMenu = @"ToolbarAddStrikeOutNoteMenu";
+NSImageName const SKImageNameToolbarAddLineNoteMenu = @"ToolbarAddLineNoteMenu";
+NSImageName const SKImageNameToolbarAddInkNoteMenu = @"ToolbarAddInkNoteMenu";
+NSImageName const SKImageNameToolbarNotes = @"ToolbarNotes";
+NSImageName const SKImageNameToolbarTextTool = @"ToolbarTextTool";
+NSImageName const SKImageNameToolbarMoveTool = @"ToolbarMoveTool";
+NSImageName const SKImageNameToolbarMagnifyTool = @"ToolbarMagnifyTool";
+NSImageName const SKImageNameToolbarSelectTool = @"ToolbarSelectTool";
+NSImageName const SKImageNameToolbarSnapshotTool = @"ToolbarSnapshotTool";
+NSImageName const SKImageNameToolbarShare = @"ToolbarShare";
+NSImageName const SKImageNameToolbarPlay = @"ToolbarPlay";
+NSImageName const SKImageNameToolbarPause = @"ToolbarPause";
+NSImageName const SKImageNameToolbarInfo = @"ToolbarInfo";
+NSImageName const SKImageNameToolbarColors = @"ToolbarColors";
+NSImageName const SKImageNameToolbarFonts = @"ToolbarFonts";
+NSImageName const SKImageNameToolbarLines = @"ToolbarLines";
+NSImageName const SKImageNameToolbarPrint = @"ToolbarPrint";
-NSString * const SKImageNameTouchBarPageUp = @"TouchBarPageUp";
-NSString * const SKImageNameTouchBarPageDown = @"TouchBarPageDown";
-NSString * const SKImageNameTouchBarFirstPage = @"TouchBarFirstPage";
-NSString * const SKImageNameTouchBarLastPage = @"TouchBarLastPage";
-NSString * const SKImageNameTouchBarZoomIn = @"TouchBarZoomIn";
-NSString * const SKImageNameTouchBarZoomOut = @"TouchBarZoomOut";
-NSString * const SKImageNameTouchBarZoomActual = @"TouchBarZoomActual";
-NSString * const SKImageNameTouchBarZoomToSelection = @"TouchBarZoomToSelection";
-NSString * const SKImageNameTouchBarTextTool = @"TouchBarTextTool";
-NSString * const SKImageNameTouchBarMoveTool = @"TouchBarMoveTool";
-NSString * const SKImageNameTouchBarMagnifyTool = @"TouchBarMagnifyTool";
-NSString * const SKImageNameTouchBarSelectTool = @"TouchBarSelectTool";
-NSString * const SKImageNameTouchBarSnapshotTool = @"TouchBarSnapshotTool";
-NSString * const SKImageNameTouchBarTextNote = @"TouchBarTextNote";
-NSString * const SKImageNameTouchBarAnchoredNote = @"TouchBarAnchoredNote";
-NSString * const SKImageNameTouchBarCircleNote = @"TouchBarCircleNote";
-NSString * const SKImageNameTouchBarSquareNote = @"TouchBarSquareNote";
-NSString * const SKImageNameTouchBarHighlightNote = @"TouchBarHighlightNote";
-NSString * const SKImageNameTouchBarUnderlineNote = @"TouchBarUnderlineNote";
-NSString * const SKImageNameTouchBarStrikeOutNote = @"TouchBarStrikeOutNote";
-NSString * const SKImageNameTouchBarLineNote = @"TouchBarLineNote";
-NSString * const SKImageNameTouchBarInkNote = @"TouchBarInkNote";
-NSString * const SKImageNameTouchBarTextNotePopover = @"TouchBarTextNotePopover";
-NSString * const SKImageNameTouchBarAnchoredNotePopover = @"TouchBarAnchoredNotePopover";
-NSString * const SKImageNameTouchBarCircleNotePopover = @"TouchBarCircleNotePopover";
-NSString * const SKImageNameTouchBarSquareNotePopover = @"TouchBarSquareNotePopover";
-NSString * const SKImageNameTouchBarHighlightNotePopover = @"TouchBarHighlightNotePopover";
-NSString * const SKImageNameTouchBarUnderlineNotePopover = @"TouchBarUnderlineNotePopover";
-NSString * const SKImageNameTouchBarStrikeOutNotePopover = @"TouchBarStrikeOutNotePopover";
-NSString * const SKImageNameTouchBarLineNotePopover = @"TouchBarLineNotePopover";
-NSString * const SKImageNameTouchBarInkNotePopover = @"TouchBarInkNotePopover";
-NSString * const SKImageNameTouchBarAddTextNote = @"TouchBarAddTextNote";
-NSString * const SKImageNameTouchBarAddAnchoredNote = @"TouchBarAddAnchoredNote";
-NSString * const SKImageNameTouchBarAddCircleNote = @"TouchBarAddCircleNote";
-NSString * const SKImageNameTouchBarAddSquareNote = @"TouchBarAddSquareNote";
-NSString * const SKImageNameTouchBarAddHighlightNote = @"TouchBarAddHighlightNote";
-NSString * const SKImageNameTouchBarAddUnderlineNote = @"TouchBarAddUnderlineNote";
-NSString * const SKImageNameTouchBarAddStrikeOutNote = @"TouchBarAddStrikeOutNote";
-NSString * const SKImageNameTouchBarAddLineNote = @"TouchBbarAddLineNote";
-NSString * const SKImageNameTouchBarAddInkNote = @"TouchBarAddInkNote";
-NSString * const SKImageNameTouchBarNewSeparator = @"TouchBarNewSeparator";
-NSString * const SKImageNameTouchBarRefresh = @"TouchBarRefresh";
-NSString * const SKImageNameTouchBarStopProgress = @"TouchBarStopProgress";
+NSImageName const SKImageNameTouchBarPageUp = @"TouchBarPageUp";
+NSImageName const SKImageNameTouchBarPageDown = @"TouchBarPageDown";
+NSImageName const SKImageNameTouchBarFirstPage = @"TouchBarFirstPage";
+NSImageName const SKImageNameTouchBarLastPage = @"TouchBarLastPage";
+NSImageName const SKImageNameTouchBarZoomIn = @"TouchBarZoomIn";
+NSImageName const SKImageNameTouchBarZoomOut = @"TouchBarZoomOut";
+NSImageName const SKImageNameTouchBarZoomActual = @"TouchBarZoomActual";
+NSImageName const SKImageNameTouchBarZoomToSelection = @"TouchBarZoomToSelection";
+NSImageName const SKImageNameTouchBarTextTool = @"TouchBarTextTool";
+NSImageName const SKImageNameTouchBarMoveTool = @"TouchBarMoveTool";
+NSImageName const SKImageNameTouchBarMagnifyTool = @"TouchBarMagnifyTool";
+NSImageName const SKImageNameTouchBarSelectTool = @"TouchBarSelectTool";
+NSImageName const SKImageNameTouchBarSnapshotTool = @"TouchBarSnapshotTool";
+NSImageName const SKImageNameTouchBarTextNote = @"TouchBarTextNote";
+NSImageName const SKImageNameTouchBarAnchoredNote = @"TouchBarAnchoredNote";
+NSImageName const SKImageNameTouchBarCircleNote = @"TouchBarCircleNote";
+NSImageName const SKImageNameTouchBarSquareNote = @"TouchBarSquareNote";
+NSImageName const SKImageNameTouchBarHighlightNote = @"TouchBarHighlightNote";
+NSImageName const SKImageNameTouchBarUnderlineNote = @"TouchBarUnderlineNote";
+NSImageName const SKImageNameTouchBarStrikeOutNote = @"TouchBarStrikeOutNote";
+NSImageName const SKImageNameTouchBarLineNote = @"TouchBarLineNote";
+NSImageName const SKImageNameTouchBarInkNote = @"TouchBarInkNote";
+NSImageName const SKImageNameTouchBarTextNotePopover = @"TouchBarTextNotePopover";
+NSImageName const SKImageNameTouchBarAnchoredNotePopover = @"TouchBarAnchoredNotePopover";
+NSImageName const SKImageNameTouchBarCircleNotePopover = @"TouchBarCircleNotePopover";
+NSImageName const SKImageNameTouchBarSquareNotePopover = @"TouchBarSquareNotePopover";
+NSImageName const SKImageNameTouchBarHighlightNotePopover = @"TouchBarHighlightNotePopover";
+NSImageName const SKImageNameTouchBarUnderlineNotePopover = @"TouchBarUnderlineNotePopover";
+NSImageName const SKImageNameTouchBarStrikeOutNotePopover = @"TouchBarStrikeOutNotePopover";
+NSImageName const SKImageNameTouchBarLineNotePopover = @"TouchBarLineNotePopover";
+NSImageName const SKImageNameTouchBarInkNotePopover = @"TouchBarInkNotePopover";
+NSImageName const SKImageNameTouchBarAddTextNote = @"TouchBarAddTextNote";
+NSImageName const SKImageNameTouchBarAddAnchoredNote = @"TouchBarAddAnchoredNote";
+NSImageName const SKImageNameTouchBarAddCircleNote = @"TouchBarAddCircleNote";
+NSImageName const SKImageNameTouchBarAddSquareNote = @"TouchBarAddSquareNote";
+NSImageName const SKImageNameTouchBarAddHighlightNote = @"TouchBarAddHighlightNote";
+NSImageName const SKImageNameTouchBarAddUnderlineNote = @"TouchBarAddUnderlineNote";
+NSImageName const SKImageNameTouchBarAddStrikeOutNote = @"TouchBarAddStrikeOutNote";
+NSImageName const SKImageNameTouchBarAddLineNote = @"TouchBbarAddLineNote";
+NSImageName const SKImageNameTouchBarAddInkNote = @"TouchBarAddInkNote";
+NSImageName const SKImageNameTouchBarNewSeparator = @"TouchBarNewSeparator";
+NSImageName const SKImageNameTouchBarRefresh = @"TouchBarRefresh";
+NSImageName const SKImageNameTouchBarStopProgress = @"TouchBarStopProgress";
-NSString * const SKImageNameGeneralPreferences = @"GeneralPreferences";
-NSString * const SKImageNameDisplayPreferences = @"DisplayPreferences";
-NSString * const SKImageNameNotesPreferences = @"NotesPreferences";
-NSString * const SKImageNameSyncPreferences = @"SyncPreferences";
+NSImageName const SKImageNameGeneralPreferences = @"GeneralPreferences";
+NSImageName const SKImageNameDisplayPreferences = @"DisplayPreferences";
+NSImageName const SKImageNameNotesPreferences = @"NotesPreferences";
+NSImageName const SKImageNameSyncPreferences = @"SyncPreferences";
-NSString * const SKImageNameToolbarNewFolder = @"ToolbarNewFolder";
-NSString * const SKImageNameToolbarNewSeparator = @"ToolbarNewSeparator";
-NSString * const SKImageNameToolbarDelete = @"ToolbarDelete";
+NSImageName const SKImageNameToolbarNewFolder = @"ToolbarNewFolder";
+NSImageName const SKImageNameToolbarNewSeparator = @"ToolbarNewSeparator";
+NSImageName const SKImageNameToolbarDelete = @"ToolbarDelete";
-NSString * const SKImageNameOutlineViewAdorn = @"OutlineViewAdorn";
-NSString * const SKImageNameThumbnailViewAdorn = @"ThumbnailViewAdorn";
-NSString * const SKImageNameNoteViewAdorn = @"NoteViewAdorn";
-NSString * const SKImageNameSnapshotViewAdorn = @"SnapshotViewAdorn";
-NSString * const SKImageNameFindViewAdorn = @"FindViewAdorn";
-NSString * const SKImageNameGroupedFindViewAdorn = @"GroupedFindViewAdorn";
-NSString * const SKImageNameTextToolAdorn = @"TextToolAdorn";
-NSString * const SKImageNameInkToolAdorn = @"InkToolAdorn";
+NSImageName const SKImageNameOutlineViewAdorn = @"OutlineViewAdorn";
+NSImageName const SKImageNameThumbnailViewAdorn = @"ThumbnailViewAdorn";
+NSImageName const SKImageNameNoteViewAdorn = @"NoteViewAdorn";
+NSImageName const SKImageNameSnapshotViewAdorn = @"SnapshotViewAdorn";
+NSImageName const SKImageNameFindViewAdorn = @"FindViewAdorn";
+NSImageName const SKImageNameGroupedFindViewAdorn = @"GroupedFindViewAdorn";
+NSImageName const SKImageNameTextToolAdorn = @"TextToolAdorn";
+NSImageName const SKImageNameInkToolAdorn = @"InkToolAdorn";
-NSString * const SKImageNameTextAlignLeft = @"TextAlignLeft";
-NSString * const SKImageNameTextAlignCenter = @"TextAlignCenter";
-NSString * const SKImageNameTextAlignRight = @"TextAlignRight";
+NSImageName const SKImageNameTextAlignLeft = @"TextAlignLeft";
+NSImageName const SKImageNameTextAlignCenter = @"TextAlignCenter";
+NSImageName const SKImageNameTextAlignRight = @"TextAlignRight";
-NSString * const SKImageNameRemoteStateResize = @"RemoteStateResize";
-NSString * const SKImageNameRemoteStateScroll = @"RemoteStateScroll";
+NSImageName const SKImageNameRemoteStateResize = @"RemoteStateResize";
+NSImageName const SKImageNameRemoteStateScroll = @"RemoteStateScroll";
static void drawMenuBadge();
static void drawAddBadge();
Modified: trunk/NSValueTransformer_SKExtensions.h
===================================================================
--- trunk/NSValueTransformer_SKExtensions.h 2025-11-09 22:47:51 UTC (rev 15781)
+++ trunk/NSValueTransformer_SKExtensions.h 2025-11-09 23:02:42 UTC (rev 15782)
@@ -40,15 +40,15 @@
NS_ASSUME_NONNULL_BEGIN
-extern NSString * const SKUnarchiveColorTransformerName;
-extern NSString * const SKUnarchiveColorArrayTransformerName;
-extern NSString * const SKTypeImageTransformerName;
-extern NSString * const SKHasWindowImageTransformerName;
-extern NSString * const SKDisplayModeImageTransformerName;
-extern NSString * const SKScaleFactorTransformerName;
-extern NSString * const SKIsZeroTransformerName;
-extern NSString * const SKIsOneTransformerName;
-extern NSString * const SKIsTwoTransformerName;
+extern NSValueTransformerName const SKUnarchiveColorTransformerName;
+extern NSValueTransformerName const SKUnarchiveColorArrayTransformerName;
+extern NSValueTransformerName const SKTypeImageTransformerName;
+extern NSValueTransformerName const SKHasWindowImageTransformerName;
+extern NSValueTransformerName const SKDisplayModeImageTransformerName;
+extern NSValueTransformerName const SKScaleFactorTransformerName;
+extern NSValueTransformerName const SKIsZeroTransformerName;
+extern NSValueTransformerName const SKIsOneTransformerName;
+extern NSValueTransformerName const SKIsTwoTransformerName;
@interface NSValueTransformer (SKExtensions)
+ (void)registerCustomTransformers;
Modified: trunk/NSValueTransformer_SKExtensions.m
===================================================================
--- trunk/NSValueTransformer_SKExtensions.m 2025-11-09 22:47:51 UTC (rev 15781)
+++ trunk/NSValueTransformer_SKExtensions.m 2025-11-09 23:02:42 UTC (rev 15782)
@@ -41,15 +41,15 @@
#import <SkimNotes/SkimNotes.h>
#import <Quartz/Quartz.h>
-NSString * const SKUnarchiveColorTransformerName = @"SKUnarchiveColor";
-NSString * const SKUnarchiveColorArrayTransformerName = @"SKUnarchiveColorArray";
-NSString * const SKTypeImageTransformerName = @"SKTypeImage";
-NSString * const SKHasWindowImageTransformerName = @"SKHasWindowImage";
-NSString * const SKDisplayModeImageTransformerName = @"SKDisplayModeImage";
-NSString * const SKScaleFactorTransformerName = @"SKScaleFactor";
-NSString * const SKIsZeroTransformerName = @"SKIsZero";
-NSString * const SKIsOneTransformerName = @"SKIsOne";
-NSString * const SKIsTwoTransformerName = @"SKIsTwo";
+NSValueTransformerName const SKUnarchiveColorTransformerName = @"SKUnarchiveColor";
+NSValueTransformerName const SKUnarchiveColorArrayTransformerName = @"SKUnarchiveColorArray";
+NSValueTransformerName const SKTypeImageTransformerName = @"SKTypeImage";
+NSValueTransformerName const SKHasWindowImageTransformerName = @"SKHasWindowImage";
+NSValueTransformerName const SKDisplayModeImageTransformerName = @"SKDisplayModeImage";
+NSValueTransformerName const SKScaleFactorTransformerName = @"SKScaleFactor";
+NSValueTransformerName const SKIsZeroTransformerName = @"SKIsZero";
+NSValueTransformerName const SKIsOneTransformerName = @"SKIsOne";
+NSValueTransformerName const SKIsTwoTransformerName = @"SKIsTwo";
@interface SKUnarchiveColorTransformer : NSValueTransformer
@end
Modified: trunk/PDFAnnotation_SKExtensions.h
===================================================================
--- trunk/PDFAnnotation_SKExtensions.h 2025-11-09 22:47:51 UTC (rev 15781)
+++ trunk/PDFAnnotation_SKExtensions.h 2025-11-09 23:02:42 UTC (rev 15782)
@@ -51,7 +51,7 @@
extern NSString * const SKPDFAnnotationBoundsOrderKey;
-extern NSString * const SKPasteboardTypeSkimNote;
+extern NSPasteboardType const SKPasteboardTypeSkimNote;
@class SKPDFView, SKNoteText;
Modified: trunk/PDFAnnotation_SKExtensions.m
===================================================================
--- trunk/PDFAnnotation_SKExtensions.m 2025-11-09 22:47:51 UTC (rev 15781)
+++ trunk/PDFAnnotation_SKExtensions.m 2025-11-09 23:02:42 UTC (rev 15782)
@@ -72,7 +72,7 @@
NSString * const SKPDFAnnotationBoundsOrderKey = @"boundsOrder";
-NSString * const SKPasteboardTypeSkimNote = @"net.sourceforge.skim-app.pasteboard.skimnote";
+NSPasteboardType const SKPasteboardTypeSkimNote = @"net.sourceforge.skim-app.pasteboard.skimnote";
@implementation PDFAnnotation (SKExtensions)
Modified: trunk/PDFDocument_SKExtensions.h
===================================================================
--- trunk/PDFDocument_SKExtensions.h 2025-11-09 22:47:51 UTC (rev 15781)
+++ trunk/PDFDocument_SKExtensions.h 2025-11-09 23:02:42 UTC (rev 15782)
@@ -41,11 +41,11 @@
NS_ASSUME_NONNULL_BEGIN
-extern NSString * const SKPDFDocumentDidAddAnnotationNotification;
-extern NSString * const SKPDFDocumentWillRemoveAnnotationNotification;
-extern NSString * const SKPDFDocumentDidRemoveAnnotationNotification;
-extern NSString * const SKPDFDocumentWillMoveAnnotationNotification;
-extern NSString * const SKPDFDocumentDidMoveAnnotationNotification;
+extern NSNotificationName const SKPDFDocumentDidAddAnnotationNotification;
+extern NSNotificationName const SKPDFDocumentWillRemoveAnnotationNotification;
+extern NSNotificationName const SKPDFDocumentDidRemoveAnnotationNotification;
+extern NSNotificationName const SKPDFDocumentWillMoveAnnotationNotification;
+extern NSNotificationName const SKPDFDocumentDidMoveAnnotationNotification;
extern NSString * const SKPDFDocumentAnnotationKey;
extern NSString * const SKPDFDocumentPageKey;
Modified: trunk/PDFDocument_SKExtensions.m
===================================================================
--- trunk/PDFDocument_SKExtensions.m 2025-11-09 22:47:51 UTC (rev 15781)
+++ trunk/PDFDocument_SKExtensions.m 2025-11-09 23:02:42 UTC (rev 15782)
@@ -44,11 +44,11 @@
#import "NSDocument_SKExtensions.h"
#import "PDFAnnotation_SKExtensions.h"
-NSString * const SKPDFDocumentDidAddAnnotationNotification = @"SKPDFDocumentDidAddAnnotationNotification";
-NSString * const SKPDFDocumentWillRemoveAnnotationNotification = @"SKPDFDocumentWillRemoveAnnotationNotification";
-NSString * const SKPDFDocumentDidRemoveAnnotationNotification = @"SKPDFDocumentDidRemoveAnnotationNotification";
-NSString * const SKPDFDocumentWillMoveAnnotationNotification = @"SKPDFDocumentWillMoveAnnotationNotification";
-NSString * const SKPDFDocumentDidMoveAnnotationNotification = @"SKPDFDocumentDidMoveAnnotationNotification";
+NSNotificationName const SKPDFDocumentDidAddAnnotationNotification = @"SKPDFDocumentDidAddAnnotationNotification";
+NSNotificationName const SKPDFDocumentWillRemoveAnnotationNotification = @"SKPDFDocumentWillRemoveAnnotationNotification";
+NSNotificationName const SKPDFDocumentDidRemoveAnnotationNotification = @"SKPDFDocumentDidRemoveAnnotationNotification";
+NSNotificationName const SKPDFDocumentWillMoveAnnotationNotification = @"SKPDFDocumentWillMoveAnnotationNotification";
+NSNotificationName const SKPDFDocumentDidMoveAnnotationNotification = @"SKPDFDocumentDidMoveAnnotationNotification";
NSString * const SKPDFDocumentAnnotationKey = @"annotation";
NSString * const SKPDFDocumentPageKey = @"page";
Modified: trunk/PDFPage_SKExtensions.h
===================================================================
--- trunk/PDFPage_SKExtensions.h 2025-11-09 22:47:51 UTC (rev 15781)
+++ trunk/PDFPage_SKExtensions.h 2025-11-09 23:02:42 UTC (rev 15782)
@@ -42,9 +42,9 @@
NS_ASSUME_NONNULL_BEGIN
-extern NSString * const SKPageLabelsChangedNotification;
+extern NSNotificationName const SKPageLabelsChangedNotification;
-extern NSString * const SKPDFPageBoundsDidChangeNotification;
+extern NSNotificationName const SKPDFPageBoundsDidChangeNotification;
extern NSString * const SKPDFPagePageKey;
extern NSString * const SKPDFPageActionKey;
Modified: trunk/PDFPage_SKExtensions.m
===================================================================
--- trunk/PDFPage_SKExtensions.m 2025-11-09 22:47:51 UTC (rev 15781)
+++ trunk/PDFPage_SKExtensions.m 2025-11-09 23:02:42 UTC (rev 15782)
@@ -60,9 +60,9 @@
#import "NSString_SKExtensions.h"
#import "SKLine.h"
-NSString * const SKPageLabelsChangedNotification = @"SKPageLabelsChangedNotification";
+NSNotificationName const SKPageLabelsChangedNotification = @"SKPageLabelsChangedNotification";
-NSString * const SKPDFPageBoundsDidChangeNotification = @"SKPDFPageBoundsDidChangeNotification";
+NSNotificationName const SKPDFPageBoundsDidChangeNotification = @"SKPDFPageBoundsDidChangeNotification";
NSString * const SKPDFPagePageKey = @"page";
NSString * const SKPDFPageActionKey = @"action";
Modified: trunk/SKDocumentController.h
===================================================================
--- trunk/SKDocumentController.h 2025-11-09 22:47:51 UTC (rev 15781)
+++ trunk/SKDocumentController.h 2025-11-09 23:02:42 UTC (rev 15782)
@@ -59,9 +59,9 @@
extern NSString * const SKDocumentSetupWindowFrameKey;
extern NSString * const SKDocumentSetupTabsKey;
-extern NSString * const SKDocumentControllerWillRemoveDocumentNotification;
-extern NSString * const SKDocumentControllerDidRemoveDocumentNotification;
-extern NSString * const SKDocumentDidShowNotification;
+extern NSNotificationName const SKDocumentControllerWillRemoveDocumentNotification;
+extern NSNotificationName const SKDocumentControllerDidRemoveDocumentNotification;
+extern NSNotificationName const SKDocumentDidShowNotification;
extern NSString * const SKDocumentControllerDocumentKey;
Modified: trunk/SKDocumentController.m
===================================================================
--- trunk/SKDocumentController.m 2025-11-09 22:47:51 UTC (rev 15781)
+++ trunk/SKDocumentController.m 2025-11-09 23:02:42 UTC (rev 15782)
@@ -72,9 +72,9 @@
NSString * const SKDocumentSetupWindowFrameKey = @"windowFrame";
NSString * const SKDocumentSetupTabsKey = @"tabs";
-NSString * const SKDocumentControllerWillRemoveDocumentNotification = @"SKDocumentControllerWillRemoveDocumentNotification";
-NSString * const SKDocumentControllerDidRemoveDocumentNotification = @"SKDocumentControllerDidRemoveDocumentNotification";
-NSString * const SKDocumentDidShowNotification = @"SKDocumentDidShowNotification";
+NSNotificationName const SKDocumentControllerWillRemoveDocumentNotification = @"SKDocumentControllerWillRemoveDocumentNotification";
+NSNotificationName const SKDocumentControllerDidRemoveDocumentNotification = @"SKDocumentControllerDidRemoveDocumentNotification";
+NSNotificationName const SKDocumentDidShowNotification = @"SKDocumentDidShowNotification";
NSString * const SKDocumentControllerDocumentKey = @"document";
Modified: trunk/SKLineInspector.h
===================================================================
--- trunk/SKLineInspector.h 2025-11-09 22:47:51 UTC (rev 15781)
+++ trunk/SKLineInspector.h 2025-11-09 23:02:42 UTC (rev 15782)
@@ -41,7 +41,7 @@
NS_ASSUME_NONNULL_BEGIN
-extern NSString * const SKLineInspectorLineAttributeDidChangeNotification;
+extern NSNotificationName const SKLineInspectorLineAttributeDidChangeNotification;
typedef NS_ENUM(NSUInteger, SKLineChangeAction) {
SKNoLineChangeAction,
Modified: trunk/SKLineInspector.m
===================================================================
--- trunk/SKLineInspector.m 2025-11-09 22:47:51 UTC (rev 15781)
+++ trunk/SKLineInspector.m 2025-11-09 23:02:42 UTC (rev 15782)
@@ -42,7 +42,7 @@
#import "NSSegmentedControl_SKExtensions.h"
#import "NSImage_SKExtensions.h"
-NSString * const SKLineInspectorLineAttributeDidChangeNotification = @"SKLineInspectorLineAttributeDidChangeNotification";
+NSNotificationName const SKLineInspectorLineAttributeDidChangeNotification = @"SKLineInspectorLineAttributeDidChangeNotification";
#define LINEWIDTH_KEY @"lineWidth"
#define STYLE_KEY @"style"
Modified: trunk/SKLineWell.h
===================================================================
--- trunk/SKLineWell.h 2025-11-09 22:47:51 UTC (rev 15781)
+++ trunk/SKLineWell.h 2025-11-09 23:02:42 UTC (rev 15782)
@@ -41,7 +41,7 @@
NS_ASSUME_NONNULL_BEGIN
-extern NSString * const SKPasteboardTypeLineStyle;
+extern NSPasteboardType const SKPasteboardTypeLineStyle;
// these keys are used in the userInfo dictionary of this pboard type
extern NSString * const SKLineWellLineWidthKey;
extern NSString * const SKLineWellStyleKey;
Modified: trunk/SKLineWell.m
===================================================================
--- trunk/SKLineWell.m 2025-11-09 22:47:51 UTC (rev 15781)
+++ trunk/SKLineWell.m 2025-11-09 23:02:42 UTC (rev 15782)
@@ -43,7 +43,7 @@
#import "NSView_SKExtensions.h"
#import "NSObject_SKExtensions.h"
-NSString * const SKPasteboardTypeLineStyle = @"net.sourceforge.skim-app.pasteboard.line-style";
+NSPasteboardType const SKPasteboardTypeLineStyle = @"net.sourceforge.skim-app.pasteboard.line-style";
NSString * const SKLineWellLineWidthKey = @"lineWidth";
NSString * const SKLineWellStyleKey = @"style";
Modified: trunk/SKMainDocument.h
===================================================================
--- trunk/SKMainDocument.h 2025-11-09 22:47:51 UTC (rev 15781)
+++ trunk/SKMainDocument.h 2025-11-09 23:02:42 UTC (rev 15782)
@@ -41,7 +41,7 @@
NS_ASSUME_NONNULL_BEGIN
-extern NSString * const SKSkimFileDidSaveNotification;
+extern NSNotificationName const SKSkimFileDidSaveNotification;
@class PDFDocument, SKMainWindowController, SKPDFView, SKLine, SKTemporaryData, SKFileUpdateChecker, SKExportAccessoryController, PDFAnnotation, SKSnapshotWindowController;
Modified: trunk/SKMainDocument.m
===================================================================
--- trunk/SKMainDocument.m 2025-11-09 22:47:51 UTC (rev 15781)
+++ trunk/SKMainDocument.m 2025-11-09 23:02:42 UTC (rev 15782)
@@ -98,7 +98,7 @@
#define SKIM_NOTES_PREFIX @"net_sourceforge_skim-app"
-NSString * const SKSkimFileDidSaveNotification = @"SKSkimFileDidSaveNotification";
+NSNotificationName const SKSkimFileDidSaveNotification = @"SKSkimFileDidSaveNotification";
#define SKLastExportedTypeKey @"SKLastExportedType"
#define SKLastExportedOptionKey @"SKLastExportedOption"
Modified: trunk/SKPDFView.h
===================================================================
--- trunk/SKPDFView.h 2025-11-09 22:47:51 UTC (rev 15781)
+++ trunk/SKPDFView.h 2025-11-09 23:02:42 UTC (rev 15782)
@@ -44,20 +44,20 @@
NS_ASSUME_NONNULL_BEGIN
-extern NSString * const SKPDFViewDisplaysAsBookChangedNotification;
-extern NSString * const SKPDFViewDisplaysPageBreaksChangedNotification;
-extern NSString * const SKPDFViewDisplaysHorizontallyChangedNotification;
-extern NSString * const SKPDFViewDisplaysRTLChangedNotification;
-extern NSString * const SKPDFViewAutoScalesChangedNotification;
-extern NSString * const SKPDFViewToolModeChangedNotification;
-extern NSString * const SKPDFViewToolModeChangedNotification;
-extern NSString * const SKPDFViewAnnotationModeChangedNotification;
-extern NSString * const SKPDFViewTemporaryToolModeChangedNotification;
-extern NSString * const SKPDFViewCurrentAnnotationChangedNotification;
-extern NSString * const SKPDFViewReadingBarDidChangeNotification;
-extern NSString * const SKPDFViewSelectionChangedNotification;
-extern NSString * const SKPDFViewMagnificationChangedNotification;
-extern NSString * const SKPDFViewPacerStartedOrStoppedNotification;
+extern NSNotificationName const SKPDFViewDisplaysAsBookChangedNotification;
+extern NSNotificationName const SKPDFViewDisplaysPageBreaksChangedNotification;
+extern NSNotificationName const SKPDFViewDisplaysHorizontallyChangedNotification;
+extern NSNotificationName const SKPDFViewDisplaysRTLChangedNotification;
+extern NSNotificationName const SKPDFViewAutoScalesChangedNotification;
+extern NSNotificationName const SKPDFViewToolModeChangedNotification;
+extern NSNotificationName const SKPDFViewToolModeChangedNotification;
+extern NSNotificationName const SKPDFViewAnnotationModeChangedNotification;
+extern NSNotificationName const SKPDFViewTemporaryToolModeChangedNotification;
+extern NSNotificationName const SKPDFViewCurrentAnnotationChangedNotification;
+extern NSNotificationName const SKPDFViewReadingBarDidChangeNotification;
+extern NSNotificationName const SKPDFViewSelectionChangedNotification;
+extern NSNotificationName const SKPDFViewMagnificationChangedNotification;
+extern NSNotificationName const SKPDFViewPacerStartedOrStoppedNotification;
extern NSString * const SKPDFViewAnnotationKey;
extern NSString * const SKPDFViewOldPageKey;
Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m 2025-11-09 22:47:51 UTC (rev 15781)
+++ trunk/SKPDFView.m 2025-11-09 23:02:42 UTC (rev 15782)
@@ -105,19 +105,19 @@
#define DEFAULT_PACER_SPEED 6.0
#define PACER_LINE_HEIGHT 15.0
-NSString * const SKPDFViewDisplaysAsBookChangedNotification = @"SKPDFViewDisplaysAsBookChangedNotification";
-NSString * const SKPDFViewDisplaysPageBreaksChangedNotification = @"SKPDFViewDisplaysPageBreaksChangedNotification";
-NSString * const SKPDFViewDisplaysHorizontallyChangedNotification = @"SKPDFViewDisplaysHorizontallyChangedNotification";
-NSString * const SKPDFViewDisplaysRTLChangedNotification = @"SKPDFViewDisplaysRTLChangedNotification";
-NSString * const SKPDFViewAutoScalesChangedNotification = @"SKPDFViewAutoScalesChangedNotification";
-NSString * const SKPDFViewToolModeChangedNotification = @"SKPDFViewToolModeChangedNotification";
-NSString * const SKPDFViewTemporaryToolModeChangedNotification = @"SKPDFViewTemporaryToolModeChangedNotification";
-NSString * const SKPDFViewAnnotationModeChangedNotification = @"SKPDFViewAnnotationModeChangedNotification";
-NSString * const SKPDFViewCurrentAnnotationChangedNotification = @"SKPDFViewCurrentAnnotationChangedNotification";
-NSString * const SKPDFViewReadingBarDidChangeNotification = @"SKPDFViewReadingBarDidChangeNotification";
-NSString * const SKPDFViewSelectionChangedNotification = @"SKPDFViewSelectionChangedNotification";
-NSString * const SKPDFViewMagnificationChangedNotification = @"SKPDFViewMagnificationChangedNotification";
-NSString * const SKPDFViewPacerStartedOrStoppedNotification = @"SKPDFViewPacerStartedOrStoppedNotification";
+NSNotificationName const SKPDFViewDisplaysAsBookChangedNotification = @"SKPDFViewDisplaysAsBookChangedNotification";
+NSNotificationName const SKPDFViewDisplaysPageBreaksChangedNotification = @"SKPDFViewDisplaysPageBreaksChangedNotification";
+NSNotificationName const SKPDFViewDisplaysHorizontallyChangedNotification = @"SKPDFViewDisplaysHorizontallyChangedNotification";
+NSNotificationName const SKPDFViewDisplaysRTLChangedNotification = @"SKPDFViewDisplaysRTLChangedNotification";
+NSNotificationName const SKPDFViewAutoScalesChangedNotification = @"SKPDFViewAutoScalesChangedNotification";
+NSNotificationName const SKPDFViewToolModeChangedNotification = @"SKPDFViewToolModeChangedNotification";
+NSNotificationName const SKPDFViewTemporaryToolModeChangedNotification = @"SKPDFViewTemporaryToolModeChangedNotification";
+NSNotificationName const SKPDFViewAnnotationModeChangedNotification = @"SKPDFViewAnnotationModeChangedNotification";
+NSNotificationName const SKPDFViewCurrentAnnotationChangedNotification = @"SKPDFViewCurrentAnnotationChangedNotification";
+NSNotificationName const SKPDFViewReadingBarDidChangeNotification = @"SKPDFViewReadingBarDidChangeNotification";
+NSNotificationName const SKPDFViewSelectionChangedNotification = @"SKPDFViewSelectionChangedNotification";
+NSNotificationName const SKPDFViewMagnificationChangedNotification = @"SKPDFViewMagnificationChangedNotification";
+NSNotificationName const SKPDFViewPacerStartedOrStoppedNotifica...
[truncated message content] |
|
From: <ho...@us...> - 2025-11-09 22:47:54
|
Revision: 15781
http://sourceforge.net/p/skim-app/code/15781
Author: hofman
Date: 2025-11-09 22:47:51 +0000 (Sun, 09 Nov 2025)
Log Message:
-----------
Use newer rect edge values
Modified Paths:
--------------
trunk/NSGeometry_SKExtensions.h
trunk/SKColorSwatch.m
trunk/SKLevelIndicator.m
trunk/SKMainWindowController_FullScreen.m
trunk/SKNoteOutlineView.m
trunk/SKNoteTableRowView.m
trunk/SKPreferenceController.m
trunk/SKPresentationView.m
trunk/SKReadingBar.m
trunk/SKSecondaryPDFView.m
trunk/SKSideWindow.m
trunk/SKSnapshotPDFView.m
trunk/SKStatusBar.m
trunk/SKTopBarView.m
Modified: trunk/NSGeometry_SKExtensions.h
===================================================================
--- trunk/NSGeometry_SKExtensions.h 2025-11-09 18:17:24 UTC (rev 15780)
+++ trunk/NSGeometry_SKExtensions.h 2025-11-09 22:47:51 UTC (rev 15781)
@@ -42,10 +42,10 @@
typedef NS_OPTIONS(NSUInteger, SKRectEdges) {
SKRectEdgesNone = 0,
- SKRectEdgesMinX = 1 << NSMinXEdge,
- SKRectEdgesMinY = 1 << NSMinYEdge,
- SKRectEdgesMaxX = 1 << NSMaxXEdge,
- SKRectEdgesMaxY = 1 << NSMaxYEdge,
+ SKRectEdgesMinX = 1 << NSRectEdgeMinX,
+ SKRectEdgesMinY = 1 << NSRectEdgeMinY,
+ SKRectEdgesMaxX = 1 << NSRectEdgeMaxX,
+ SKRectEdgesMaxY = 1 << NSRectEdgeMaxY,
};
static inline NSPoint SKIntegralPoint(NSPoint point) {
Modified: trunk/SKColorSwatch.m
===================================================================
--- trunk/SKColorSwatch.m 2025-11-09 18:17:24 UTC (rev 15780)
+++ trunk/SKColorSwatch.m 2025-11-09 22:47:51 UTC (rev 15781)
@@ -232,7 +232,7 @@
}
- (NSRect)frameForCollapsedItemViewAtIndex:(NSInteger)anIndex {
- return SKShrinkRect([self frameForItemViewAtIndex:anIndex], DISTANCE_BETWEEN_COLORS, NSMaxXEdge);
+ return SKShrinkRect([self frameForItemViewAtIndex:anIndex], DISTANCE_BETWEEN_COLORS, NSRectEdgeMaxX);
}
- (NSInteger)colorIndexAtPoint:(NSPoint)point {
Modified: trunk/SKLevelIndicator.m
===================================================================
--- trunk/SKLevelIndicator.m 2025-11-09 18:17:24 UTC (rev 15780)
+++ trunk/SKLevelIndicator.m 2025-11-09 22:47:51 UTC (rev 15781)
@@ -66,7 +66,7 @@
[NSGraphicsContext restoreGraphicsState];
} else if (NSHeight(cellFrame) <= 2.0 * (cellHeight - EDGE_HEIGHT)) {
NSRect topFrame, bottomFrame, frame = cellFrame;
- NSDivideRect(cellFrame, &topFrame, &bottomFrame, floor(0.5 * NSHeight(cellFrame)), NSMinYEdge);
+ NSDivideRect(cellFrame, &topFrame, &bottomFrame, floor(0.5 * NSHeight(cellFrame)), NSRectEdgeMinY);
frame.size.height = cellHeight;
[NSGraphicsContext saveGraphicsState];
[[NSBezierPath bezierPathWithRect:topFrame] addClip];
@@ -79,8 +79,8 @@
[NSGraphicsContext restoreGraphicsState];
} else {
NSRect topFrame, bottomFrame, restFrame, frame = cellFrame, midFrame;
- NSDivideRect(cellFrame, &topFrame, &bottomFrame, cellHeight - EDGE_HEIGHT, NSMinYEdge);
- NSDivideRect(bottomFrame, &bottomFrame, &restFrame, cellHeight - EDGE_HEIGHT, NSMaxYEdge);
+ NSDivideRect(cellFrame, &topFrame, &bottomFrame, cellHeight - EDGE_HEIGHT, NSRectEdgeMinY);
+ NSDivideRect(bottomFrame, &bottomFrame, &restFrame, cellHeight - EDGE_HEIGHT, NSRectEdgeMaxY);
frame.size.height = cellHeight;
[NSGraphicsContext saveGraphicsState];
[[NSBezierPath bezierPathWithRect:topFrame] addClip];
@@ -87,7 +87,7 @@
[super drawInteriorWithFrame:frame inView:controlView];
[NSGraphicsContext restoreGraphicsState];
do {
- NSDivideRect(restFrame, &midFrame, &restFrame, fmin(cellHeight - 2.0 * EDGE_HEIGHT, NSHeight(restFrame)), NSMinYEdge);
+ NSDivideRect(restFrame, &midFrame, &restFrame, fmin(cellHeight - 2.0 * EDGE_HEIGHT, NSHeight(restFrame)), NSRectEdgeMinY);
[NSGraphicsContext saveGraphicsState];
[[NSBezierPath bezierPathWithRect:midFrame] addClip];
frame.origin.y = NSMinY(midFrame) - EDGE_HEIGHT;
Modified: trunk/SKMainWindowController_FullScreen.m
===================================================================
--- trunk/SKMainWindowController_FullScreen.m 2025-11-09 18:17:24 UTC (rev 15780)
+++ trunk/SKMainWindowController_FullScreen.m 2025-11-09 22:47:51 UTC (rev 15781)
@@ -621,7 +621,7 @@
blackLayer = [CALayer layer];
[blackLayer setBackgroundColor:CGColorGetConstantColor(kCGColorBlack)];
[blackLayer setZPosition:1.0];
- [blackLayer setFrame:SKSliceRect([window convertRectFromScreen:frame], offset, NSMaxYEdge)];
+ [blackLayer setFrame:SKSliceRect([window convertRectFromScreen:frame], offset, NSRectEdgeMaxY)];
[[[[window contentView] superview] layer] addSublayer:blackLayer];
}
for (NSView *view in [[[window standardWindowButton:NSWindowCloseButton] superview] subviews]) {
Modified: trunk/SKNoteOutlineView.m
===================================================================
--- trunk/SKNoteOutlineView.m 2025-11-09 18:17:24 UTC (rev 15780)
+++ trunk/SKNoteOutlineView.m 2025-11-09 22:47:51 UTC (rev 15781)
@@ -125,7 +125,7 @@
id item = row != -1 ? [self itemAtRow:row] : nil;
if (item) {
- NSRect rect = SKSliceRect([self rectOfRow:row], RESIZE_EDGE_HEIGHT, [self isFlipped] ? NSMaxYEdge : NSMinYEdge);
+ NSRect rect = SKSliceRect([self rectOfRow:row], RESIZE_EDGE_HEIGHT, [self isFlipped] ? NSRectEdgeMaxY : NSRectEdgeMinY);
if (NSMouseInRect(mouseLoc, rect, [self isFlipped]) && [NSApp willDragMouse]) {
CGFloat startHeight = [self rowHeightForItem:item] ?: NSHeight([self rectOfRow:row]) - [self intercellSpacing].height;
@@ -189,7 +189,7 @@
}
NSInteger level = [self levelForRow:row];
if (level > 0 && [self outlineColumnIsFirst])
- frame = SKShrinkRect(frame, -[self indentationPerLevel] * level, NSMinXEdge);
+ frame = SKShrinkRect(frame, -[self indentationPerLevel] * level, NSRectEdgeMinX);
return frame;
}
return [super frameOfCellAtColumn:column row:row];
Modified: trunk/SKNoteTableRowView.m
===================================================================
--- trunk/SKNoteTableRowView.m 2025-11-09 18:17:24 UTC (rev 15780)
+++ trunk/SKNoteTableRowView.m 2025-11-09 22:47:51 UTC (rev 15781)
@@ -75,7 +75,7 @@
if ([ov isKindOfClass:[NSTableView class]] && [ov rowHeight] + [ov intercellSpacing].height >= NSHeight([self frame]))
cursor = [NSCursor resizeDownCursor];
- [self addCursorRect:SKSliceRect([self bounds], RESIZE_EDGE_HEIGHT, [self isFlipped] ? NSMaxYEdge : NSMinYEdge) cursor:cursor];
+ [self addCursorRect:SKSliceRect([self bounds], RESIZE_EDGE_HEIGHT, [self isFlipped] ? NSRectEdgeMaxY : NSRectEdgeMinY) cursor:cursor];
}
@end
Modified: trunk/SKPreferenceController.m
===================================================================
--- trunk/SKPreferenceController.m 2025-11-09 18:17:24 UTC (rev 15780)
+++ trunk/SKPreferenceController.m 2025-11-09 22:47:51 UTC (rev 15781)
@@ -111,7 +111,7 @@
NSView *contentView = [window contentView];
NSView *oldView = [currentPane view];
NSView *view = [pane view];
- NSRect frame = SKShrinkRect([window frame], NSHeight([contentView frame]) - NSHeight([view frame]) - BOTTOM_MARGIN, NSMinYEdge);
+ NSRect frame = SKShrinkRect([window frame], NSHeight([contentView frame]) - NSHeight([view frame]) - BOTTOM_MARGIN, NSRectEdgeMinY);
// make sure edits are committed
[currentPane commitEditing];
@@ -189,7 +189,7 @@
view = [currentPane view];
frame = [window frame];
frame.size.width = width;
- frame = SKShrinkRect(frame, NSHeight([[window contentView] frame]) - NSHeight([view frame]) - BOTTOM_MARGIN, NSMinYEdge);
+ frame = SKShrinkRect(frame, NSHeight([[window contentView] frame]) - NSHeight([view frame]) - BOTTOM_MARGIN, NSRectEdgeMinY);
[window setFrame:frame display:NO];
[[window contentView] addSubview:view];
Modified: trunk/SKPresentationView.m
===================================================================
--- trunk/SKPresentationView.m 2025-11-09 18:17:24 UTC (rev 15780)
+++ trunk/SKPresentationView.m 2025-11-09 22:47:51 UTC (rev 15781)
@@ -832,7 +832,7 @@
navWindow = [[SKNavigationWindow alloc] initWithView:self];
[navWindow showForWindow:[self window]];
NSAccessibilityPostNotificationWithUserInfo(NSAccessibilityUnignoredAncestor(self), NSAccessibilityLayoutChangedNotification, [NSDictionary dictionaryWithObjectsAndKeys:NSAccessibilityUnignoredChildrenForOnlyChild(navWindow), NSAccessibilityUIElementsKey, nil]);
- } else if (navigationMode == SKNavigationBottom && NSPointInRect([theEvent locationInWindow], SKSliceRect([[[self window] contentView] frame], NAVIGATION_BOTTOM_EDGE_HEIGHT, NSMinYEdge))) {
+ } else if (navigationMode == SKNavigationBottom && NSPointInRect([theEvent locationInWindow], SKSliceRect([[[self window] contentView] frame], NAVIGATION_BOTTOM_EDGE_HEIGHT, NSRectEdgeMinY))) {
[self performSelectorOnce:@selector(showNavWindow) afterDelay:SHOW_NAV_DELAY];
}
}
@@ -1176,7 +1176,7 @@
}
- (void)showNavWindow {
- if ([navWindow isVisible] == NO && NSPointInRect([[self window] mouseLocationOutsideOfEventStream], SKSliceRect([[[self window] contentView] frame], NAVIGATION_BOTTOM_EDGE_HEIGHT, NSMinYEdge))) {
+ if ([navWindow isVisible] == NO && NSPointInRect([[self window] mouseLocationOutsideOfEventStream], SKSliceRect([[[self window] contentView] frame], NAVIGATION_BOTTOM_EDGE_HEIGHT, NSRectEdgeMinY))) {
if (navWindow == nil)
navWindow = [[SKNavigationWindow alloc] initWithView:self];
[navWindow showForWindow:[self window]];
Modified: trunk/SKReadingBar.m
===================================================================
--- trunk/SKReadingBar.m 2025-11-09 18:17:24 UTC (rev 15780)
+++ trunk/SKReadingBar.m 2025-11-09 22:47:51 UTC (rev 15781)
@@ -367,11 +367,11 @@
if (NSEqualRects(rect, NSZeroRect)) {
CGContextFillRect(context, NSRectToCGRect(bounds));
} else if (([pdfPage lineDirectionAngle] % 180)) {
- CGContextFillRect(context, NSRectToCGRect(SKSliceRect(bounds, NSMaxY(bounds) - NSMaxY(rect), NSMaxYEdge)));
- CGContextFillRect(context, NSRectToCGRect(SKSliceRect(bounds, NSMinY(rect) - NSMinY(bounds), NSMinYEdge)));
+ CGContextFillRect(context, NSRectToCGRect(SKSliceRect(bounds, NSMaxY(bounds) - NSMaxY(rect), NSRectEdgeMaxY)));
+ CGContextFillRect(context, NSRectToCGRect(SKSliceRect(bounds, NSMinY(rect) - NSMinY(bounds), NSRectEdgeMinY)));
} else {
- CGContextFillRect(context, NSRectToCGRect(SKSliceRect(bounds, NSMaxX(bounds) - NSMaxX(rect), NSMaxXEdge)));
- CGContextFillRect(context, NSRectToCGRect(SKSliceRect(bounds, NSMinX(rect) - NSMinX(bounds), NSMinXEdge)));
+ CGContextFillRect(context, NSRectToCGRect(SKSliceRect(bounds, NSMaxX(bounds) - NSMaxX(rect), NSRectEdgeMaxX)));
+ CGContextFillRect(context, NSRectToCGRect(SKSliceRect(bounds, NSMinX(rect) - NSMinX(bounds), NSRectEdgeMinX)));
}
} else {
rect = [[self class] bounds:rect forBox:box onPage:pdfPage];
Modified: trunk/SKSecondaryPDFView.m
===================================================================
--- trunk/SKSecondaryPDFView.m 2025-11-09 18:17:24 UTC (rev 15780)
+++ trunk/SKSecondaryPDFView.m 2025-11-09 22:47:51 UTC (rev 15781)
@@ -281,7 +281,7 @@
[self makeControls];
NSRect rect = [self bounds];
- rect = SKSliceRect(rect, NSHeight([controlView frame]), [self isFlipped] ? NSMinYEdge : NSMaxYEdge);
+ rect = SKSliceRect(rect, NSHeight([controlView frame]), [self isFlipped] ? NSRectEdgeMinY : NSRectEdgeMaxY);
[controlView setFrame:rect];
[controlView setAlphaValue:0.0];
[self addSubview:controlView positioned:NSWindowAbove relativeTo:nil];
@@ -329,7 +329,7 @@
[self removeTrackingArea:trackingArea];
NSRect rect = [self bounds];
if (NSHeight(rect) > CONTROL_HEIGHT) {
- rect = SKSliceRect(rect, CONTROL_HEIGHT, [self isFlipped] ? NSMinYEdge : NSMaxYEdge);
+ rect = SKSliceRect(rect, CONTROL_HEIGHT, [self isFlipped] ? NSRectEdgeMinY : NSRectEdgeMaxY);
trackingArea = [[NSTrackingArea alloc] initWithRect:rect options:NSTrackingActiveInKeyWindow | NSTrackingMouseEnteredAndExited owner:self userInfo:nil];
[self addTrackingArea:trackingArea];
}
Modified: trunk/SKSideWindow.m
===================================================================
--- trunk/SKSideWindow.m 2025-11-09 18:17:24 UTC (rev 15780)
+++ trunk/SKSideWindow.m 2025-11-09 22:47:51 UTC (rev 15781)
@@ -63,7 +63,7 @@
- (void)contentViewFrameChanged:(NSNotification *)notification {
NSVisualEffectView *contentView = (NSVisualEffectView *)[self contentView];
NSImage *mask = [NSImage imageWithSize:[contentView bounds].size drawingHandler:^(NSRect r){
- NSBezierPath *path = [NSBezierPath bezierPathWithRoundedRect:SKShrinkRect(r, -CORNER_RADIUS, NSMinXEdge) xRadius:CORNER_RADIUS yRadius:CORNER_RADIUS];
+ NSBezierPath *path = [NSBezierPath bezierPathWithRoundedRect:SKShrinkRect(r, -CORNER_RADIUS, NSRectEdgeMinX) xRadius:CORNER_RADIUS yRadius:CORNER_RADIUS];
[[NSColor blackColor] set];
[path fill];
return YES;
@@ -103,7 +103,7 @@
[self setContentView:backgroundView];
}
- NSRect contentRect = SKShrinkRect(NSInsetRect([backgroundView bounds], 0.0, CONTENT_INSET), CONTENT_INSET, NSMaxXEdge);
+ NSRect contentRect = SKShrinkRect(NSInsetRect([backgroundView bounds], 0.0, CONTENT_INSET), CONTENT_INSET, NSRectEdgeMaxX);
mainContentView = [[NSView alloc] initWithFrame:contentRect];
[mainContentView setAutoresizingMask:NSViewMinXMargin | NSViewHeightSizable];
[backgroundView addSubview:mainContentView];
@@ -124,7 +124,7 @@
- (void)attachToWindow:(NSWindow *)window {
NSRect frame;
NSRect screenFrame = [[window screen] frame];
- frame = SKSliceRect(screenFrame, WINDOW_OFFSET, NSMinXEdge);
+ frame = SKSliceRect(screenFrame, WINDOW_OFFSET, NSRectEdgeMinX);
[self setFrame:NSInsetRect(frame, 0.0, WINDOW_INSET) display:NO];
[self setLevel:[window level]];
[self orderFront:nil];
@@ -221,13 +221,13 @@
@implementation SKSideWindowContentView
- (NSRect)resizeHandleRect {
- return SKSliceRect([self bounds], CONTENT_INSET, NSMaxXEdge);
+ return SKSliceRect([self bounds], CONTENT_INSET, NSRectEdgeMaxX);
}
- (void)drawRect:(NSRect)aRect {
NSRect rect = [self bounds];
- NSRect topRect = SKSliceRect(rect, CORNER_RADIUS, NSMaxYEdge);
- NSRect bottomRect = SKSliceRect(rect, CORNER_RADIUS, NSMinYEdge);
+ NSRect topRect = SKSliceRect(rect, CORNER_RADIUS, NSRectEdgeMaxY);
+ NSRect bottomRect = SKSliceRect(rect, CORNER_RADIUS, NSRectEdgeMinY);
NSSize offset = NSZeroSize;
NSBezierPath *path = [NSBezierPath bezierPathWithRect:rect];
NSColor *backgroundColor = [NSColor windowBackgroundColor];
@@ -238,7 +238,7 @@
[NSGraphicsContext saveGraphicsState];
[path addClip];
- rect = SKShrinkRect(rect, -CORNER_RADIUS, NSMinXEdge);
+ rect = SKShrinkRect(rect, -CORNER_RADIUS, NSRectEdgeMinX);
[[NSBezierPath bezierPathWithRoundedRect:rect xRadius:CORNER_RADIUS yRadius:CORNER_RADIUS] addClip];
if ([[self window] contentView] == self) {
[backgroundColor set];
Modified: trunk/SKSnapshotPDFView.m
===================================================================
--- trunk/SKSnapshotPDFView.m 2025-11-09 18:17:24 UTC (rev 15780)
+++ trunk/SKSnapshotPDFView.m 2025-11-09 22:47:51 UTC (rev 15781)
@@ -186,7 +186,7 @@
[self makeScalePopUpButton];
NSRect rect = [self bounds];
- rect = SKSliceRect(rect, NSHeight([controlView frame]), [self isFlipped] ? NSMinYEdge : NSMaxYEdge);
+ rect = SKSliceRect(rect, NSHeight([controlView frame]), [self isFlipped] ? NSRectEdgeMinY : NSRectEdgeMaxY);
[controlView setFrame:rect];
[controlView setAlphaValue:0.0];
[self addSubview:controlView positioned:NSWindowAbove relativeTo:nil];
@@ -235,7 +235,7 @@
[self removeTrackingArea:trackingArea];
NSRect rect = [self bounds];
if (NSHeight(rect) > CONTROL_HEIGHT) {
- rect = SKSliceRect(rect, CONTROL_HEIGHT, [self isFlipped] ? NSMinYEdge : NSMaxYEdge);
+ rect = SKSliceRect(rect, CONTROL_HEIGHT, [self isFlipped] ? NSRectEdgeMinY : NSRectEdgeMaxY);
trackingArea = [[NSTrackingArea alloc] initWithRect:rect options:NSTrackingActiveInKeyWindow | NSTrackingMouseEnteredAndExited owner:self userInfo:nil];
[self addTrackingArea:trackingArea];
}
Modified: trunk/SKStatusBar.m
===================================================================
--- trunk/SKStatusBar.m 2025-11-09 18:17:24 UTC (rev 15780)
+++ trunk/SKStatusBar.m 2025-11-09 22:47:51 UTC (rev 15781)
@@ -147,11 +147,11 @@
}
- (CGFloat)windowContentBorderThickness {
- return [[self window] contentBorderThicknessForEdge:NSMinYEdge];
+ return [[self window] contentBorderThicknessForEdge:NSRectEdgeMinY];
}
- (void)setWindowContentBorderThickness:(CGFloat)thickness {
- [[self window] setContentBorderThickness:thickness forEdge:NSMinYEdge];
+ [[self window] setContentBorderThickness:thickness forEdge:NSRectEdgeMinY];
}
- (void)toggleBelowView:(NSView *)view animate:(BOOL)animate {
@@ -201,12 +201,12 @@
animating = NO;
}];
} else if (visible == NO) {
- [[self window] setContentBorderThickness:0.0 forEdge:NSMinYEdge];
+ [[self window] setContentBorderThickness:0.0 forEdge:NSRectEdgeMinY];
[self removeFromSuperview];
[NSLayoutConstraint activateConstraints:constraints];
[contentView layoutSubtreeIfNeeded];
} else {
- [[self window] setContentBorderThickness:statusHeight forEdge:NSMinYEdge];
+ [[self window] setContentBorderThickness:statusHeight forEdge:NSRectEdgeMinY];
}
}
Modified: trunk/SKTopBarView.m
===================================================================
--- trunk/SKTopBarView.m 2025-11-09 18:17:24 UTC (rev 15780)
+++ trunk/SKTopBarView.m 2025-11-09 22:47:51 UTC (rev 15781)
@@ -168,7 +168,7 @@
NSRect rect = [self bounds];
NSRect sepRect = NSZeroRect;
if ([self separatorColor])
- NSDivideRect(rect, &sepRect, &rect, SEPARATOR_WIDTH, NSMinYEdge);
+ NSDivideRect(rect, &sepRect, &rect, SEPARATOR_WIDTH, NSRectEdgeMinY);
[NSGraphicsContext saveGraphicsState];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2025-11-09 18:17:26
|
Revision: 15780
http://sourceforge.net/p/skim-app/code/15780
Author: hofman
Date: 2025-11-09 18:17:24 +0000 (Sun, 09 Nov 2025)
Log Message:
-----------
Declare page labels changed notification in PDFPage category. Remove imports of app controller header.
Modified Paths:
--------------
trunk/NSDocument_SKExtensions.m
trunk/PDFPage_SKExtensions.h
trunk/PDFPage_SKExtensions.m
trunk/SKApplicationController.h
trunk/SKApplicationController.m
trunk/SKMainDocument.m
trunk/SKMainToolbarController.m
trunk/SKMainWindowController.m
trunk/SKMainWindowController_UI.m
trunk/SKNoteToolbarController.m
trunk/SKNoteWindowController.m
trunk/SKNotesDocument.m
Modified: trunk/NSDocument_SKExtensions.m
===================================================================
--- trunk/NSDocument_SKExtensions.m 2025-11-09 17:43:17 UTC (rev 15779)
+++ trunk/NSDocument_SKExtensions.m 2025-11-09 18:17:24 UTC (rev 15780)
@@ -38,7 +38,6 @@
#import "NSDocument_SKExtensions.h"
#import <Quartz/Quartz.h>
-#import "SKApplicationController.h"
#import "SKTemplateParser.h"
#import "NSFileManager_SKExtensions.h"
#import "SKDocumentController.h"
Modified: trunk/PDFPage_SKExtensions.h
===================================================================
--- trunk/PDFPage_SKExtensions.h 2025-11-09 17:43:17 UTC (rev 15779)
+++ trunk/PDFPage_SKExtensions.h 2025-11-09 18:17:24 UTC (rev 15780)
@@ -42,6 +42,8 @@
NS_ASSUME_NONNULL_BEGIN
+extern NSString * const SKPageLabelsChangedNotification;
+
extern NSString * const SKPDFPageBoundsDidChangeNotification;
extern NSString * const SKPDFPagePageKey;
Modified: trunk/PDFPage_SKExtensions.m
===================================================================
--- trunk/PDFPage_SKExtensions.m 2025-11-09 17:43:17 UTC (rev 15779)
+++ trunk/PDFPage_SKExtensions.m 2025-11-09 18:17:24 UTC (rev 15780)
@@ -60,6 +60,8 @@
#import "NSString_SKExtensions.h"
#import "SKLine.h"
+NSString * const SKPageLabelsChangedNotification = @"SKPageLabelsChangedNotification";
+
NSString * const SKPDFPageBoundsDidChangeNotification = @"SKPDFPageBoundsDidChangeNotification";
NSString * const SKPDFPagePageKey = @"page";
Modified: trunk/SKApplicationController.h
===================================================================
--- trunk/SKApplicationController.h 2025-11-09 17:43:17 UTC (rev 15779)
+++ trunk/SKApplicationController.h 2025-11-09 18:17:24 UTC (rev 15780)
@@ -42,8 +42,6 @@
NS_ASSUME_NONNULL_BEGIN
-extern NSString * const SKPageLabelsChangedNotification;
-
@class SKBookmark, SKDownload, SKPreferenceController, SKReleaseNotesController, SKInfoWindowController, SKNotesPanelController, SKDownloadController;
@interface SKApplicationController : NSObject <SKApplicationDelegate, HIDRemoteDelegate, NSMenuDelegate> {
Modified: trunk/SKApplicationController.m
===================================================================
--- trunk/SKApplicationController.m 2025-11-09 17:43:17 UTC (rev 15779)
+++ trunk/SKApplicationController.m 2025-11-09 18:17:24 UTC (rev 15780)
@@ -109,8 +109,6 @@
static char SKApplicationControllerDefaultsObservationContext;
-NSString * const SKPageLabelsChangedNotification = @"SKPageLabelsChangedNotification";
-
enum {
SKReopenNever = 0,
SKReopenOnDefaultLaunch = 1,
Modified: trunk/SKMainDocument.m
===================================================================
--- trunk/SKMainDocument.m 2025-11-09 17:43:17 UTC (rev 15779)
+++ trunk/SKMainDocument.m 2025-11-09 18:17:24 UTC (rev 15780)
@@ -57,9 +57,7 @@
#import "NSString_SKExtensions.h"
#import "SKDocumentController.h"
#import "SKTemplateParser.h"
-#import "SKApplicationController.h"
#import "PDFSelection_SKExtensions.h"
-#import "SKApplicationController.h"
#import "NSFileManager_SKExtensions.h"
#import "SKFDFParser.h"
#import "NSData_SKExtensions.h"
Modified: trunk/SKMainToolbarController.m
===================================================================
--- trunk/SKMainToolbarController.m 2025-11-09 17:43:17 UTC (rev 15779)
+++ trunk/SKMainToolbarController.m 2025-11-09 18:17:24 UTC (rev 15780)
@@ -47,7 +47,6 @@
#import "SKPDFView.h"
#import "SKColorSwatch.h"
#import "NSValueTransformer_SKExtensions.h"
-#import "SKApplicationController.h"
#import "NSImage_SKExtensions.h"
#import "NSMenu_SKExtensions.h"
#import "PDFSelection_SKExtensions.h"
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2025-11-09 17:43:17 UTC (rev 15779)
+++ trunk/SKMainWindowController.m 2025-11-09 18:17:24 UTC (rev 15780)
@@ -77,7 +77,6 @@
#import "SKProgressController.h"
#import "SKSecondaryPDFView.h"
#import "SKColorSwatch.h"
-#import "SKApplicationController.h"
#import "NSSegmentedControl_SKExtensions.h"
#import "NSImage_SKExtensions.h"
#import "NSMenu_SKExtensions.h"
Modified: trunk/SKMainWindowController_UI.m
===================================================================
--- trunk/SKMainWindowController_UI.m 2025-11-09 17:43:17 UTC (rev 15779)
+++ trunk/SKMainWindowController_UI.m 2025-11-09 18:17:24 UTC (rev 15780)
@@ -86,7 +86,6 @@
#import "NSImage_SKExtensions.h"
#import "NSObject_SKExtensions.h"
#import "NSPasteboard_SKExtensions.h"
-#import "SKApplicationController.h"
#import "SKPresentationView.h"
#import "SKBookmarkController.h"
#import "SKNoteToolbarController.h"
Modified: trunk/SKNoteToolbarController.m
===================================================================
--- trunk/SKNoteToolbarController.m 2025-11-09 17:43:17 UTC (rev 15779)
+++ trunk/SKNoteToolbarController.m 2025-11-09 18:17:24 UTC (rev 15780)
@@ -41,7 +41,6 @@
#import "SKPDFView.h"
#import <SkimNotes/SkimNotes.h>
#import "PDFAnnotation_SKExtensions.h"
-#import "SKApplicationController.h"
#import "NSImage_SKExtensions.h"
#import "NSMenu_SKExtensions.h"
#import "NSUserDefaults_SKExtensions.h"
Modified: trunk/SKNoteWindowController.m
===================================================================
--- trunk/SKNoteWindowController.m 2025-11-09 17:43:17 UTC (rev 15779)
+++ trunk/SKNoteWindowController.m 2025-11-09 18:17:24 UTC (rev 15780)
@@ -61,7 +61,6 @@
#import "NSPasteboard_SKExtensions.h"
#import "NSAttributedString_SKExtensions.h"
#import "SKChainedUndoManager.h"
-#import "SKApplicationController.h"
#define SKNoteWindowFrameAutosaveName @"SKNoteWindow"
#define SKAnyNoteWindowFrameAutosaveName @"SKAnyNoteWindow"
Modified: trunk/SKNotesDocument.m
===================================================================
--- trunk/SKNotesDocument.m 2025-11-09 17:43:17 UTC (rev 15779)
+++ trunk/SKNotesDocument.m 2025-11-09 18:17:24 UTC (rev 15780)
@@ -40,7 +40,6 @@
#import "SKNoteOutlineView.h"
#import "SKDocumentController.h"
#import "SKTemplateParser.h"
-#import "SKApplicationController.h"
#import "NSValue_SKExtensions.h"
#import "NSURL_SKExtensions.h"
#import "SKTypeSelectHelper.h"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2025-11-09 17:43:20
|
Revision: 15779
http://sourceforge.net/p/skim-app/code/15779
Author: hofman
Date: 2025-11-09 17:43:17 +0000 (Sun, 09 Nov 2025)
Log Message:
-----------
Add const keyword to string constants
Modified Paths:
--------------
trunk/NSDocument_SKExtensions.h
trunk/NSDocument_SKExtensions.m
trunk/NSError_SKExtensions.h
trunk/NSError_SKExtensions.m
trunk/NSImage_SKExtensions.h
trunk/NSImage_SKExtensions.m
trunk/NSValueTransformer_SKExtensions.h
trunk/NSValueTransformer_SKExtensions.m
trunk/PDFAnnotationFreeText_SKExtensions.h
trunk/PDFAnnotationFreeText_SKExtensions.m
trunk/PDFAnnotationInk_SKExtensions.h
trunk/PDFAnnotationInk_SKExtensions.m
trunk/PDFAnnotationLine_SKExtensions.h
trunk/PDFAnnotationLine_SKExtensions.m
trunk/PDFAnnotationMarkup_SKExtensions.h
trunk/PDFAnnotationMarkup_SKExtensions.m
trunk/PDFAnnotation_SKExtensions.h
trunk/PDFAnnotation_SKExtensions.m
trunk/PDFDocument_SKExtensions.h
trunk/PDFDocument_SKExtensions.m
trunk/PDFPage_SKExtensions.h
trunk/PDFPage_SKExtensions.m
trunk/SKApplicationController.h
trunk/SKApplicationController.m
trunk/SKDocumentController.h
trunk/SKDocumentController.m
trunk/SKDownload.h
trunk/SKDownload.m
trunk/SKFDFParser.h
trunk/SKFDFParser.m
trunk/SKGroupedSearchResult.h
trunk/SKGroupedSearchResult.m
trunk/SKLineInspector.h
trunk/SKLineInspector.m
trunk/SKLineWell.h
trunk/SKLineWell.m
trunk/SKMainDocument.h
trunk/SKMainDocument.m
trunk/SKNPDFAnnotationNote_SKExtensions.h
trunk/SKNPDFAnnotationNote_SKExtensions.m
trunk/SKPDFView.h
trunk/SKPDFView.m
trunk/SKPresentationView.h
trunk/SKPresentationView.m
trunk/SKSnapshotWindowController.h
trunk/SKSnapshotWindowController.m
trunk/SKStringConstants.h
trunk/SKStringConstants.m
trunk/SKSyncPreferences.h
trunk/SKSyncPreferences.m
trunk/SKTransitionInfo.h
trunk/SKTransitionInfo.m
Modified: trunk/NSDocument_SKExtensions.h
===================================================================
--- trunk/NSDocument_SKExtensions.h 2025-11-09 17:10:15 UTC (rev 15778)
+++ trunk/NSDocument_SKExtensions.h 2025-11-09 17:43:17 UTC (rev 15779)
@@ -40,7 +40,7 @@
NS_ASSUME_NONNULL_BEGIN
-extern NSString *SKDocumentFileURLDidChangeNotification;
+extern NSString * const SKDocumentFileURLDidChangeNotification;
typedef NS_ENUM(NSInteger, SKInteractionMode) {
SKNormalMode,
Modified: trunk/NSDocument_SKExtensions.m
===================================================================
--- trunk/NSDocument_SKExtensions.m 2025-11-09 17:10:15 UTC (rev 15778)
+++ trunk/NSDocument_SKExtensions.m 2025-11-09 17:43:17 UTC (rev 15779)
@@ -60,7 +60,7 @@
#define SKDisableExportAttributesKey @"SKDisableExportAttributes"
-NSString *SKDocumentFileURLDidChangeNotification = @"SKDocumentFileURLDidChangeNotification";
+NSString * const SKDocumentFileURLDidChangeNotification = @"SKDocumentFileURLDidChangeNotification";
@implementation NSDocument (SKExtensions)
Modified: trunk/NSError_SKExtensions.h
===================================================================
--- trunk/NSError_SKExtensions.h 2025-11-09 17:10:15 UTC (rev 15778)
+++ trunk/NSError_SKExtensions.h 2025-11-09 17:43:17 UTC (rev 15779)
@@ -40,7 +40,7 @@
NS_ASSUME_NONNULL_BEGIN
-extern NSString *SKDocumentErrorDomain;
+extern NSString * const SKDocumentErrorDomain;
enum {
SKWriteFileError = 1,
Modified: trunk/NSError_SKExtensions.m
===================================================================
--- trunk/NSError_SKExtensions.m 2025-11-09 17:10:15 UTC (rev 15778)
+++ trunk/NSError_SKExtensions.m 2025-11-09 17:43:17 UTC (rev 15779)
@@ -38,7 +38,7 @@
#import "NSError_SKExtensions.h"
-NSString *SKDocumentErrorDomain = @"SKDocumentErrorDomain";
+NSString * const SKDocumentErrorDomain = @"SKDocumentErrorDomain";
#define ELLIPSIS_CHARACTER (unichar)0x2026
Modified: trunk/NSImage_SKExtensions.h
===================================================================
--- trunk/NSImage_SKExtensions.h 2025-11-09 17:10:15 UTC (rev 15778)
+++ trunk/NSImage_SKExtensions.h 2025-11-09 17:43:17 UTC (rev 15779)
@@ -40,157 +40,157 @@
NS_ASSUME_NONNULL_BEGIN
-extern NSString *SKImageNameTextNote;
-extern NSString *SKImageNameAnchoredNote;
-extern NSString *SKImageNameCircleNote;
-extern NSString *SKImageNameSquareNote;
-extern NSString *SKImageNameHighlightNote;
-extern NSString *SKImageNameUnderlineNote;
-extern NSString *SKImageNameStrikeOutNote;
-extern NSString *SKImageNameLineNote;
-extern NSString *SKImageNameInkNote;
-extern NSString *SKImageNameWidgetNote;
+extern NSString * const SKImageNameTextNote;
+extern NSString * const SKImageNameAnchoredNote;
+extern NSString * const SKImageNameCircleNote;
+extern NSString * const SKImageNameSquareNote;
+extern NSString * const SKImageNameHighlightNote;
+extern NSString * const SKImageNameUnderlineNote;
+extern NSString * const SKImageNameStrikeOutNote;
+extern NSString * const SKImageNameLineNote;
+extern NSString * const SKImageNameInkNote;
+extern NSString * const SKImageNameWidgetNote;
-extern NSString *SKImageNameToolbarPageUp;
-extern NSString *SKImageNameToolbarPageDown;
-extern NSString *SKImageNameToolbarFirstPage;
-extern NSString *SKImageNameToolbarLastPage;
-extern NSString *SKImageNameToolbarBack;
-extern NSString *SKImageNameToolbarForward;
-extern NSString *SKImageNameToolbarZoomIn;
-extern NSString *SKImageNameToolbarZoomOut;
-extern NSString *SKImageNameToolbarZoomActual;
-extern NSString *SKImageNameToolbarZoomToFit;
-extern NSString *SKImageNameToolbarZoomToSelection;
-extern NSString *SKImageNameToolbarAutoScales;
-extern NSString *SKImageNameToolbarRotateRight;
-extern NSString *SKImageNameToolbarRotateLeft;
-extern NSString *SKImageNameToolbarCrop;
-extern NSString *SKImageNameToolbarFullScreen;
-extern NSString *SKImageNameToolbarPresentation;
-extern NSString *SKImageNameToolbarSinglePage;
-extern NSString *SKImageNameToolbarTwoUp;
-extern NSString *SKImageNameToolbarSinglePageContinuous;
-extern NSString *SKImageNameToolbarTwoUpContinuous;
-extern NSString *SKImageNameToolbarHorizontal;
-extern NSString *SKImageNameToolbarRTL;
-extern NSString *SKImageNameToolbarBookMode;
-extern NSString *SKImageNameToolbarPageBreaks;
-extern NSString *SKImageNameToolbarMediaBox;
-extern NSString *SKImageNameToolbarCropBox;
-extern NSString *SKImageNameToolbarLeftPane;
-extern NSString *SKImageNameToolbarRightPane;
-extern NSString *SKImageNameToolbarSplitPDF;
-extern NSString *SKImageNameToolbarTextNoteMenu;
-extern NSString *SKImageNameToolbarAnchoredNoteMenu;
-extern NSString *SKImageNameToolbarCircleNoteMenu;
-extern NSString *SKImageNameToolbarSquareNoteMenu;
-extern NSString *SKImageNameToolbarHighlightNoteMenu;
-extern NSString *SKImageNameToolbarUnderlineNoteMenu;
-extern NSString *SKImageNameToolbarStrikeOutNoteMenu;
-extern NSString *SKImageNameToolbarLineNoteMenu;
-extern NSString *SKImageNameToolbarInkNoteMenu;
-extern NSString *SKImageNameToolbarAddTextNote;
-extern NSString *SKImageNameToolbarAddAnchoredNote;
-extern NSString *SKImageNameToolbarAddCircleNote;
-extern NSString *SKImageNameToolbarAddSquareNote;
-extern NSString *SKImageNameToolbarAddHighlightNote;
-extern NSString *SKImageNameToolbarAddUnderlineNote;
-extern NSString *SKImageNameToolbarAddStrikeOutNote;
-extern NSString *SKImageNameToolbarAddLineNote;
-extern NSString *SKImageNameToolbarAddInkNote;
-extern NSString *SKImageNameToolbarAddTextNoteMenu;
-extern NSString *SKImageNameToolbarAddAnchoredNoteMenu;
-extern NSString *SKImageNameToolbarAddCircleNoteMenu;
-extern NSString *SKImageNameToolbarAddSquareNoteMenu;
-extern NSString *SKImageNameToolbarAddHighlightNoteMenu;
-extern NSString *SKImageNameToolbarAddUnderlineNoteMenu;
-extern NSString *SKImageNameToolbarAddStrikeOutNoteMenu;
-extern NSString *SKImageNameToolbarAddLineNoteMenu;
-extern NSString *SKImageNameToolbarAddInkNoteMenu;
-extern NSString *SKImageNameToolbarNotes;
-extern NSString *SKImageNameToolbarTextTool;
-extern NSString *SKImageNameToolbarMoveTool;
-extern NSString *SKImageNameToolbarMagnifyTool;
-extern NSString *SKImageNameToolbarSelectTool;
-extern NSString *SKImageNameToolbarSnapshotTool;
-extern NSString *SKImageNameToolbarShare;
-extern NSString *SKImageNameToolbarPlay;
-extern NSString *SKImageNameToolbarPause;
-extern NSString *SKImageNameToolbarInfo;
-extern NSString *SKImageNameToolbarColors;
-extern NSString *SKImageNameToolbarFonts;
-extern NSString *SKImageNameToolbarLines;
-extern NSString *SKImageNameToolbarPrint;
+extern NSString * const SKImageNameToolbarPageUp;
+extern NSString * const SKImageNameToolbarPageDown;
+extern NSString * const SKImageNameToolbarFirstPage;
+extern NSString * const SKImageNameToolbarLastPage;
+extern NSString * const SKImageNameToolbarBack;
+extern NSString * const SKImageNameToolbarForward;
+extern NSString * const SKImageNameToolbarZoomIn;
+extern NSString * const SKImageNameToolbarZoomOut;
+extern NSString * const SKImageNameToolbarZoomActual;
+extern NSString * const SKImageNameToolbarZoomToFit;
+extern NSString * const SKImageNameToolbarZoomToSelection;
+extern NSString * const SKImageNameToolbarAutoScales;
+extern NSString * const SKImageNameToolbarRotateRight;
+extern NSString * const SKImageNameToolbarRotateLeft;
+extern NSString * const SKImageNameToolbarCrop;
+extern NSString * const SKImageNameToolbarFullScreen;
+extern NSString * const SKImageNameToolbarPresentation;
+extern NSString * const SKImageNameToolbarSinglePage;
+extern NSString * const SKImageNameToolbarTwoUp;
+extern NSString * const SKImageNameToolbarSinglePageContinuous;
+extern NSString * const SKImageNameToolbarTwoUpContinuous;
+extern NSString * const SKImageNameToolbarHorizontal;
+extern NSString * const SKImageNameToolbarRTL;
+extern NSString * const SKImageNameToolbarBookMode;
+extern NSString * const SKImageNameToolbarPageBreaks;
+extern NSString * const SKImageNameToolbarMediaBox;
+extern NSString * const SKImageNameToolbarCropBox;
+extern NSString * const SKImageNameToolbarLeftPane;
+extern NSString * const SKImageNameToolbarRightPane;
+extern NSString * const SKImageNameToolbarSplitPDF;
+extern NSString * const SKImageNameToolbarTextNoteMenu;
+extern NSString * const SKImageNameToolbarAnchoredNoteMenu;
+extern NSString * const SKImageNameToolbarCircleNoteMenu;
+extern NSString * const SKImageNameToolbarSquareNoteMenu;
+extern NSString * const SKImageNameToolbarHighlightNoteMenu;
+extern NSString * const SKImageNameToolbarUnderlineNoteMenu;
+extern NSString * const SKImageNameToolbarStrikeOutNoteMenu;
+extern NSString * const SKImageNameToolbarLineNoteMenu;
+extern NSString * const SKImageNameToolbarInkNoteMenu;
+extern NSString * const SKImageNameToolbarAddTextNote;
+extern NSString * const SKImageNameToolbarAddAnchoredNote;
+extern NSString * const SKImageNameToolbarAddCircleNote;
+extern NSString * const SKImageNameToolbarAddSquareNote;
+extern NSString * const SKImageNameToolbarAddHighlightNote;
+extern NSString * const SKImageNameToolbarAddUnderlineNote;
+extern NSString * const SKImageNameToolbarAddStrikeOutNote;
+extern NSString * const SKImageNameToolbarAddLineNote;
+extern NSString * const SKImageNameToolbarAddInkNote;
+extern NSString * const SKImageNameToolbarAddTextNoteMenu;
+extern NSString * const SKImageNameToolbarAddAnchoredNoteMenu;
+extern NSString * const SKImageNameToolbarAddCircleNoteMenu;
+extern NSString * const SKImageNameToolbarAddSquareNoteMenu;
+extern NSString * const SKImageNameToolbarAddHighlightNoteMenu;
+extern NSString * const SKImageNameToolbarAddUnderlineNoteMenu;
+extern NSString * const SKImageNameToolbarAddStrikeOutNoteMenu;
+extern NSString * const SKImageNameToolbarAddLineNoteMenu;
+extern NSString * const SKImageNameToolbarAddInkNoteMenu;
+extern NSString * const SKImageNameToolbarNotes;
+extern NSString * const SKImageNameToolbarTextTool;
+extern NSString * const SKImageNameToolbarMoveTool;
+extern NSString * const SKImageNameToolbarMagnifyTool;
+extern NSString * const SKImageNameToolbarSelectTool;
+extern NSString * const SKImageNameToolbarSnapshotTool;
+extern NSString * const SKImageNameToolbarShare;
+extern NSString * const SKImageNameToolbarPlay;
+extern NSString * const SKImageNameToolbarPause;
+extern NSString * const SKImageNameToolbarInfo;
+extern NSString * const SKImageNameToolbarColors;
+extern NSString * const SKImageNameToolbarFonts;
+extern NSString * const SKImageNameToolbarLines;
+extern NSString * const SKImageNameToolbarPrint;
-extern NSString *SKImageNameTouchBarPageUp;
-extern NSString *SKImageNameTouchBarPageDown;
-extern NSString *SKImageNameTouchBarFirstPage;
-extern NSString *SKImageNameTouchBarLastPage;
-extern NSString *SKImageNameTouchBarZoomIn;
-extern NSString *SKImageNameTouchBarZoomOut;
-extern NSString *SKImageNameTouchBarZoomActual;
-extern NSString *SKImageNameTouchBarZoomToSelection;
-extern NSString *SKImageNameTouchBarTextTool;
-extern NSString *SKImageNameTouchBarMoveTool;
-extern NSString *SKImageNameTouchBarMagnifyTool;
-extern NSString *SKImageNameTouchBarSelectTool;
-extern NSString *SKImageNameTouchBarSnapshotTool;
-extern NSString *SKImageNameTouchBarTextNote;
-extern NSString *SKImageNameTouchBarAnchoredNote;
-extern NSString *SKImageNameTouchBarCircleNote;
-extern NSString *SKImageNameTouchBarSquareNote;
-extern NSString *SKImageNameTouchBarHighlightNote;
-extern NSString *SKImageNameTouchBarUnderlineNote;
-extern NSString *SKImageNameTouchBarStrikeOutNote;
-extern NSString *SKImageNameTouchBarLineNote;
-extern NSString *SKImageNameTouchBarInkNote;
-extern NSString *SKImageNameTouchBarTextNotePopover;
-extern NSString *SKImageNameTouchBarAnchoredNotePopover;
-extern NSString *SKImageNameTouchBarCircleNotePopover;
-extern NSString *SKImageNameTouchBarSquareNotePopover;
-extern NSString *SKImageNameTouchBarHighlightNotePopover;
-extern NSString *SKImageNameTouchBarUnderlineNotePopover;
-extern NSString *SKImageNameTouchBarStrikeOutNotePopover;
-extern NSString *SKImageNameTouchBarLineNotePopover;
-extern NSString *SKImageNameTouchBarInkNotePopover;
-extern NSString *SKImageNameTouchBarAddTextNote;
-extern NSString *SKImageNameTouchBarAddAnchoredNote;
-extern NSString *SKImageNameTouchBarAddCircleNote;
-extern NSString *SKImageNameTouchBarAddSquareNote;
-extern NSString *SKImageNameTouchBarAddHighlightNote;
-extern NSString *SKImageNameTouchBarAddUnderlineNote;
-extern NSString *SKImageNameTouchBarAddStrikeOutNote;
-extern NSString *SKImageNameTouchBarAddLineNote;
-extern NSString *SKImageNameTouchBarAddInkNote;
-extern NSString *SKImageNameTouchBarNewSeparator;
-extern NSString *SKImageNameTouchBarRefresh;
-extern NSString *SKImageNameTouchBarStopProgress;
+extern NSString * const SKImageNameTouchBarPageUp;
+extern NSString * const SKImageNameTouchBarPageDown;
+extern NSString * const SKImageNameTouchBarFirstPage;
+extern NSString * const SKImageNameTouchBarLastPage;
+extern NSString * const SKImageNameTouchBarZoomIn;
+extern NSString * const SKImageNameTouchBarZoomOut;
+extern NSString * const SKImageNameTouchBarZoomActual;
+extern NSString * const SKImageNameTouchBarZoomToSelection;
+extern NSString * const SKImageNameTouchBarTextTool;
+extern NSString * const SKImageNameTouchBarMoveTool;
+extern NSString * const SKImageNameTouchBarMagnifyTool;
+extern NSString * const SKImageNameTouchBarSelectTool;
+extern NSString * const SKImageNameTouchBarSnapshotTool;
+extern NSString * const SKImageNameTouchBarTextNote;
+extern NSString * const SKImageNameTouchBarAnchoredNote;
+extern NSString * const SKImageNameTouchBarCircleNote;
+extern NSString * const SKImageNameTouchBarSquareNote;
+extern NSString * const SKImageNameTouchBarHighlightNote;
+extern NSString * const SKImageNameTouchBarUnderlineNote;
+extern NSString * const SKImageNameTouchBarStrikeOutNote;
+extern NSString * const SKImageNameTouchBarLineNote;
+extern NSString * const SKImageNameTouchBarInkNote;
+extern NSString * const SKImageNameTouchBarTextNotePopover;
+extern NSString * const SKImageNameTouchBarAnchoredNotePopover;
+extern NSString * const SKImageNameTouchBarCircleNotePopover;
+extern NSString * const SKImageNameTouchBarSquareNotePopover;
+extern NSString * const SKImageNameTouchBarHighlightNotePopover;
+extern NSString * const SKImageNameTouchBarUnderlineNotePopover;
+extern NSString * const SKImageNameTouchBarStrikeOutNotePopover;
+extern NSString * const SKImageNameTouchBarLineNotePopover;
+extern NSString * const SKImageNameTouchBarInkNotePopover;
+extern NSString * const SKImageNameTouchBarAddTextNote;
+extern NSString * const SKImageNameTouchBarAddAnchoredNote;
+extern NSString * const SKImageNameTouchBarAddCircleNote;
+extern NSString * const SKImageNameTouchBarAddSquareNote;
+extern NSString * const SKImageNameTouchBarAddHighlightNote;
+extern NSString * const SKImageNameTouchBarAddUnderlineNote;
+extern NSString * const SKImageNameTouchBarAddStrikeOutNote;
+extern NSString * const SKImageNameTouchBarAddLineNote;
+extern NSString * const SKImageNameTouchBarAddInkNote;
+extern NSString * const SKImageNameTouchBarNewSeparator;
+extern NSString * const SKImageNameTouchBarRefresh;
+extern NSString * const SKImageNameTouchBarStopProgress;
-extern NSString *SKImageNameGeneralPreferences;
-extern NSString *SKImageNameDisplayPreferences;
-extern NSString *SKImageNameNotesPreferences;
-extern NSString *SKImageNameSyncPreferences;
+extern NSString * const SKImageNameGeneralPreferences;
+extern NSString * const SKImageNameDisplayPreferences;
+extern NSString * const SKImageNameNotesPreferences;
+extern NSString * const SKImageNameSyncPreferences;
-extern NSString *SKImageNameToolbarNewFolder;
-extern NSString *SKImageNameToolbarNewSeparator;
-extern NSString *SKImageNameToolbarDelete;
+extern NSString * const SKImageNameToolbarNewFolder;
+extern NSString * const SKImageNameToolbarNewSeparator;
+extern NSString * const SKImageNameToolbarDelete;
-extern NSString *SKImageNameOutlineViewAdorn;
-extern NSString *SKImageNameThumbnailViewAdorn;
-extern NSString *SKImageNameNoteViewAdorn;
-extern NSString *SKImageNameSnapshotViewAdorn;
-extern NSString *SKImageNameFindViewAdorn;
-extern NSString *SKImageNameGroupedFindViewAdorn;
-extern NSString *SKImageNameTextToolAdorn;
-extern NSString *SKImageNameInkToolAdorn;
+extern NSString * const SKImageNameOutlineViewAdorn;
+extern NSString * const SKImageNameThumbnailViewAdorn;
+extern NSString * const SKImageNameNoteViewAdorn;
+extern NSString * const SKImageNameSnapshotViewAdorn;
+extern NSString * const SKImageNameFindViewAdorn;
+extern NSString * const SKImageNameGroupedFindViewAdorn;
+extern NSString * const SKImageNameTextToolAdorn;
+extern NSString * const SKImageNameInkToolAdorn;
-extern NSString *SKImageNameTextAlignLeft;
-extern NSString *SKImageNameTextAlignCenter;
-extern NSString *SKImageNameTextAlignRight;
+extern NSString * const SKImageNameTextAlignLeft;
+extern NSString * const SKImageNameTextAlignCenter;
+extern NSString * const SKImageNameTextAlignRight;
-extern NSString *SKImageNameRemoteStateResize;
-extern NSString *SKImageNameRemoteStateScroll;
+extern NSString * const SKImageNameRemoteStateResize;
+extern NSString * const SKImageNameRemoteStateScroll;
@interface NSImage (SKExtensions)
Modified: trunk/NSImage_SKExtensions.m
===================================================================
--- trunk/NSImage_SKExtensions.m 2025-11-09 17:10:15 UTC (rev 15778)
+++ trunk/NSImage_SKExtensions.m 2025-11-09 17:43:17 UTC (rev 15779)
@@ -44,157 +44,157 @@
#import <SkimNotes/SkimNotes.h>
-NSString *SKImageNameTextNote = @"TextNote";
-NSString *SKImageNameAnchoredNote = @"AnchoredNote";
-NSString *SKImageNameCircleNote = @"CircleNote";
-NSString *SKImageNameSquareNote = @"SquareNote";
-NSString *SKImageNameHighlightNote = @"HighlightNote";
-NSString *SKImageNameUnderlineNote = @"UnderlineNote";
-NSString *SKImageNameStrikeOutNote = @"StrikeOutNote";
-NSString *SKImageNameLineNote = @"LineNote";
-NSString *SKImageNameInkNote = @"InkNote";
-NSString *SKImageNameWidgetNote = @"Widget";
+NSString * const SKImageNameTextNote = @"TextNote";
+NSString * const SKImageNameAnchoredNote = @"AnchoredNote";
+NSString * const SKImageNameCircleNote = @"CircleNote";
+NSString * const SKImageNameSquareNote = @"SquareNote";
+NSString * const SKImageNameHighlightNote = @"HighlightNote";
+NSString * const SKImageNameUnderlineNote = @"UnderlineNote";
+NSString * const SKImageNameStrikeOutNote = @"StrikeOutNote";
+NSString * const SKImageNameLineNote = @"LineNote";
+NSString * const SKImageNameInkNote = @"InkNote";
+NSString * const SKImageNameWidgetNote = @"Widget";
-NSString *SKImageNameToolbarPageUp = @"ToolbarPageUp";
-NSString *SKImageNameToolbarPageDown = @"ToolbarPageDown";
-NSString *SKImageNameToolbarFirstPage = @"ToolbarFirstPage";
-NSString *SKImageNameToolbarLastPage = @"ToolbarLastPage";
-NSString *SKImageNameToolbarBack = @"ToolbarBack";
-NSString *SKImageNameToolbarForward = @"ToolbarForward";
-NSString *SKImageNameToolbarZoomIn = @"ToolbarZoomIn";
-NSString *SKImageNameToolbarZoomOut = @"ToolbarZoomOut";
-NSString *SKImageNameToolbarZoomActual = @"ToolbarZoomActual";
-NSString *SKImageNameToolbarZoomToFit = @"ToolbarZoomToFit";
-NSString *SKImageNameToolbarZoomToSelection = @"ToolbarZoomToSelection";
-NSString *SKImageNameToolbarAutoScales = @"ToolbarAutoScales";
-NSString *SKImageNameToolbarRotateRight = @"ToolbarRotateRight";
-NSString *SKImageNameToolbarRotateLeft = @"ToolbarRotateLeft";
-NSString *SKImageNameToolbarCrop = @"ToolbarCrop";
-NSString *SKImageNameToolbarFullScreen = @"ToolbarFullScreen";
-NSString *SKImageNameToolbarPresentation = @"ToolbarPresentation";
-NSString *SKImageNameToolbarSinglePage = @"ToolbarSinglePage";
-NSString *SKImageNameToolbarTwoUp = @"ToolbarTwoUp";
-NSString *SKImageNameToolbarSinglePageContinuous = @"ToolbarSinglePageContinuous";
-NSString *SKImageNameToolbarTwoUpContinuous = @"ToolbarTwoUpContinuous";
-NSString *SKImageNameToolbarHorizontal = @"ToolbarHorizontal";
-NSString *SKImageNameToolbarRTL = @"ToolbarRTL";
-NSString *SKImageNameToolbarBookMode = @"ToolbarBookMode";
-NSString *SKImageNameToolbarPageBreaks = @"ToolbarPageBreaks";
-NSString *SKImageNameToolbarMediaBox = @"ToolbarMediaBox";
-NSString *SKImageNameToolbarCropBox = @"ToolbarCropBox";
-NSString *SKImageNameToolbarLeftPane = @"ToolbarLeftPane";
-NSString *SKImageNameToolbarRightPane = @"ToolbarRightPane";
-NSString *SKImageNameToolbarSplitPDF = @"ToolbarSplitPDF";
-NSString *SKImageNameToolbarTextNoteMenu = @"ToolbarTextNoteMenu";
-NSString *SKImageNameToolbarAnchoredNoteMenu = @"ToolbarAnchoredNoteMenu";
-NSString *SKImageNameToolbarCircleNoteMenu = @"ToolbarCircleNoteMenu";
-NSString *SKImageNameToolbarSquareNoteMenu = @"ToolbarSquareNoteMenu";
-NSString *SKImageNameToolbarHighlightNoteMenu = @"ToolbarHighlightNoteMenu";
-NSString *SKImageNameToolbarUnderlineNoteMenu = @"ToolbarUnderlineNoteMenu";
-NSString *SKImageNameToolbarStrikeOutNoteMenu = @"ToolbarStrikeOutNoteMenu";
-NSString *SKImageNameToolbarLineNoteMenu = @"ToolbarLineNoteMenu";
-NSString *SKImageNameToolbarInkNoteMenu = @"ToolbarInkNoteMenu";
-NSString *SKImageNameToolbarAddTextNote = @"ToolbarAddTextNote";
-NSString *SKImageNameToolbarAddAnchoredNote = @"ToolbarAddAnchoredNote";
-NSString *SKImageNameToolbarAddCircleNote = @"ToolbarAddCircleNote";
-NSString *SKImageNameToolbarAddSquareNote = @"ToolbarAddSquareNote";
-NSString *SKImageNameToolbarAddHighlightNote = @"ToolbarAddHighlightNote";
-NSString *SKImageNameToolbarAddUnderlineNote = @"ToolbarAddUnderlineNote";
-NSString *SKImageNameToolbarAddStrikeOutNote = @"ToolbarAddStrikeOutNote";
-NSString *SKImageNameToolbarAddLineNote = @"ToolbarAddLineNote";
-NSString *SKImageNameToolbarAddInkNote = @"ToolbarAddInkNote";
-NSString *SKImageNameToolbarAddTextNoteMenu = @"ToolbarAddTextNoteMenu";
-NSString *SKImageNameToolbarAddAnchoredNoteMenu = @"ToolbarAddAnchoredNoteMenu";
-NSString *SKImageNameToolbarAddCircleNoteMenu = @"ToolbarAddCircleNoteMenu";
-NSString *SKImageNameToolbarAddSquareNoteMenu = @"ToolbarAddSquareNoteMenu";
-NSString *SKImageNameToolbarAddHighlightNoteMenu = @"ToolbarAddHighlightNoteMenu";
-NSString *SKImageNameToolbarAddUnderlineNoteMenu = @"ToolbarAddUnderlineNoteMenu";
-NSString *SKImageNameToolbarAddStrikeOutNoteMenu = @"ToolbarAddStrikeOutNoteMenu";
-NSString *SKImageNameToolbarAddLineNoteMenu = @"ToolbarAddLineNoteMenu";
-NSString *SKImageNameToolbarAddInkNoteMenu = @"ToolbarAddInkNoteMenu";
-NSString *SKImageNameToolbarNotes = @"ToolbarNotes";
-NSString *SKImageNameToolbarTextTool = @"ToolbarTextTool";
-NSString *SKImageNameToolbarMoveTool = @"ToolbarMoveTool";
-NSString *SKImageNameToolbarMagnifyTool = @"ToolbarMagnifyTool";
-NSString *SKImageNameToolbarSelectTool = @"ToolbarSelectTool";
-NSString *SKImageNameToolbarSnapshotTool = @"ToolbarSnapshotTool";
-NSString *SKImageNameToolbarShare = @"ToolbarShare";
-NSString *SKImageNameToolbarPlay = @"ToolbarPlay";
-NSString *SKImageNameToolbarPause = @"ToolbarPause";
-NSString *SKImageNameToolbarInfo = @"ToolbarInfo";
-NSString *SKImageNameToolbarColors = @"ToolbarColors";
-NSString *SKImageNameToolbarFonts = @"ToolbarFonts";
-NSString *SKImageNameToolbarLines = @"ToolbarLines";
-NSString *SKImageNameToolbarPrint = @"ToolbarPrint";
+NSString * const SKImageNameToolbarPageUp = @"ToolbarPageUp";
+NSString * const SKImageNameToolbarPageDown = @"ToolbarPageDown";
+NSString * const SKImageNameToolbarFirstPage = @"ToolbarFirstPage";
+NSString * const SKImageNameToolbarLastPage = @"ToolbarLastPage";
+NSString * const SKImageNameToolbarBack = @"ToolbarBack";
+NSString * const SKImageNameToolbarForward = @"ToolbarForward";
+NSString * const SKImageNameToolbarZoomIn = @"ToolbarZoomIn";
+NSString * const SKImageNameToolbarZoomOut = @"ToolbarZoomOut";
+NSString * const SKImageNameToolbarZoomActual = @"ToolbarZoomActual";
+NSString * const SKImageNameToolbarZoomToFit = @"ToolbarZoomToFit";
+NSString * const SKImageNameToolbarZoomToSelection = @"ToolbarZoomToSelection";
+NSString * const SKImageNameToolbarAutoScales = @"ToolbarAutoScales";
+NSString * const SKImageNameToolbarRotateRight = @"ToolbarRotateRight";
+NSString * const SKImageNameToolbarRotateLeft = @"ToolbarRotateLeft";
+NSString * const SKImageNameToolbarCrop = @"ToolbarCrop";
+NSString * const SKImageNameToolbarFullScreen = @"ToolbarFullScreen";
+NSString * const SKImageNameToolbarPresentation = @"ToolbarPresentation";
+NSString * const SKImageNameToolbarSinglePage = @"ToolbarSinglePage";
+NSString * const SKImageNameToolbarTwoUp = @"ToolbarTwoUp";
+NSString * const SKImageNameToolbarSinglePageContinuous = @"ToolbarSinglePageContinuous";
+NSString * const SKImageNameToolbarTwoUpContinuous = @"ToolbarTwoUpContinuous";
+NSString * const SKImageNameToolbarHorizontal = @"ToolbarHorizontal";
+NSString * const SKImageNameToolbarRTL = @"ToolbarRTL";
+NSString * const SKImageNameToolbarBookMode = @"ToolbarBookMode";
+NSString * const SKImageNameToolbarPageBreaks = @"ToolbarPageBreaks";
+NSString * const SKImageNameToolbarMediaBox = @"ToolbarMediaBox";
+NSString * const SKImageNameToolbarCropBox = @"ToolbarCropBox";
+NSString * const SKImageNameToolbarLeftPane = @"ToolbarLeftPane";
+NSString * const SKImageNameToolbarRightPane = @"ToolbarRightPane";
+NSString * const SKImageNameToolbarSplitPDF = @"ToolbarSplitPDF";
+NSString * const SKImageNameToolbarTextNoteMenu = @"ToolbarTextNoteMenu";
+NSString * const SKImageNameToolbarAnchoredNoteMenu = @"ToolbarAnchoredNoteMenu";
+NSString * const SKImageNameToolbarCircleNoteMenu = @"ToolbarCircleNoteMenu";
+NSString * const SKImageNameToolbarSquareNoteMenu = @"ToolbarSquareNoteMenu";
+NSString * const SKImageNameToolbarHighlightNoteMenu = @"ToolbarHighlightNoteMenu";
+NSString * const SKImageNameToolbarUnderlineNoteMenu = @"ToolbarUnderlineNoteMenu";
+NSString * const SKImageNameToolbarStrikeOutNoteMenu = @"ToolbarStrikeOutNoteMenu";
+NSString * const SKImageNameToolbarLineNoteMenu = @"ToolbarLineNoteMenu";
+NSString * const SKImageNameToolbarInkNoteMenu = @"ToolbarInkNoteMenu";
+NSString * const SKImageNameToolbarAddTextNote = @"ToolbarAddTextNote";
+NSString * const SKImageNameToolbarAddAnchoredNote = @"ToolbarAddAnchoredNote";
+NSString * const SKImageNameToolbarAddCircleNote = @"ToolbarAddCircleNote";
+NSString * const SKImageNameToolbarAddSquareNote = @"ToolbarAddSquareNote";
+NSString * const SKImageNameToolbarAddHighlightNote = @"ToolbarAddHighlightNote";
+NSString * const SKImageNameToolbarAddUnderlineNote = @"ToolbarAddUnderlineNote";
+NSString * const SKImageNameToolbarAddStrikeOutNote = @"ToolbarAddStrikeOutNote";
+NSString * const SKImageNameToolbarAddLineNote = @"ToolbarAddLineNote";
+NSString * const SKImageNameToolbarAddInkNote = @"ToolbarAddInkNote";
+NSString * const SKImageNameToolbarAddTextNoteMenu = @"ToolbarAddTextNoteMenu";
+NSString * const SKImageNameToolbarAddAnchoredNoteMenu = @"ToolbarAddAnchoredNoteMenu";
+NSString * const SKImageNameToolbarAddCircleNoteMenu = @"ToolbarAddCircleNoteMenu";
+NSString * const SKImageNameToolbarAddSquareNoteMenu = @"ToolbarAddSquareNoteMenu";
+NSString * const SKImageNameToolbarAddHighlightNoteMenu = @"ToolbarAddHighlightNoteMenu";
+NSString * const SKImageNameToolbarAddUnderlineNoteMenu = @"ToolbarAddUnderlineNoteMenu";
+NSString * const SKImageNameToolbarAddStrikeOutNoteMenu = @"ToolbarAddStrikeOutNoteMenu";
+NSString * const SKImageNameToolbarAddLineNoteMenu = @"ToolbarAddLineNoteMenu";
+NSString * const SKImageNameToolbarAddInkNoteMenu = @"ToolbarAddInkNoteMenu";
+NSString * const SKImageNameToolbarNotes = @"ToolbarNotes";
+NSString * const SKImageNameToolbarTextTool = @"ToolbarTextTool";
+NSString * const SKImageNameToolbarMoveTool = @"ToolbarMoveTool";
+NSString * const SKImageNameToolbarMagnifyTool = @"ToolbarMagnifyTool";
+NSString * const SKImageNameToolbarSelectTool = @"ToolbarSelectTool";
+NSString * const SKImageNameToolbarSnapshotTool = @"ToolbarSnapshotTool";
+NSString * const SKImageNameToolbarShare = @"ToolbarShare";
+NSString * const SKImageNameToolbarPlay = @"ToolbarPlay";
+NSString * const SKImageNameToolbarPause = @"ToolbarPause";
+NSString * const SKImageNameToolbarInfo = @"ToolbarInfo";
+NSString * const SKImageNameToolbarColors = @"ToolbarColors";
+NSString * const SKImageNameToolbarFonts = @"ToolbarFonts";
+NSString * const SKImageNameToolbarLines = @"ToolbarLines";
+NSString * const SKImageNameToolbarPrint = @"ToolbarPrint";
-NSString *SKImageNameTouchBarPageUp = @"TouchBarPageUp";
-NSString *SKImageNameTouchBarPageDown = @"TouchBarPageDown";
-NSString *SKImageNameTouchBarFirstPage = @"TouchBarFirstPage";
-NSString *SKImageNameTouchBarLastPage = @"TouchBarLastPage";
-NSString *SKImageNameTouchBarZoomIn = @"TouchBarZoomIn";
-NSString *SKImageNameTouchBarZoomOut = @"TouchBarZoomOut";
-NSString *SKImageNameTouchBarZoomActual = @"TouchBarZoomActual";
-NSString *SKImageNameTouchBarZoomToSelection = @"TouchBarZoomToSelection";
-NSString *SKImageNameTouchBarTextTool = @"TouchBarTextTool";
-NSString *SKImageNameTouchBarMoveTool = @"TouchBarMoveTool";
-NSString *SKImageNameTouchBarMagnifyTool = @"TouchBarMagnifyTool";
-NSString *SKImageNameTouchBarSelectTool = @"TouchBarSelectTool";
-NSString *SKImageNameTouchBarSnapshotTool = @"TouchBarSnapshotTool";
-NSString *SKImageNameTouchBarTextNote = @"TouchBarTextNote";
-NSString *SKImageNameTouchBarAnchoredNote = @"TouchBarAnchoredNote";
-NSString *SKImageNameTouchBarCircleNote = @"TouchBarCircleNote";
-NSString *SKImageNameTouchBarSquareNote = @"TouchBarSquareNote";
-NSString *SKImageNameTouchBarHighlightNote = @"TouchBarHighlightNote";
-NSString *SKImageNameTouchBarUnderlineNote = @"TouchBarUnderlineNote";
-NSString *SKImageNameTouchBarStrikeOutNote = @"TouchBarStrikeOutNote";
-NSString *SKImageNameTouchBarLineNote = @"TouchBarLineNote";
-NSString *SKImageNameTouchBarInkNote = @"TouchBarInkNote";
-NSString *SKImageNameTouchBarTextNotePopover = @"TouchBarTextNotePopover";
-NSString *SKImageNameTouchBarAnchoredNotePopover = @"TouchBarAnchoredNotePopover";
-NSString *SKImageNameTouchBarCircleNotePopover = @"TouchBarCircleNotePopover";
-NSString *SKImageNameTouchBarSquareNotePopover = @"TouchBarSquareNotePopover";
-NSString *SKImageNameTouchBarHighlightNotePopover = @"TouchBarHighlightNotePopover";
-NSString *SKImageNameTouchBarUnderlineNotePopover = @"TouchBarUnderlineNotePopover";
-NSString *SKImageNameTouchBarStrikeOutNotePopover = @"TouchBarStrikeOutNotePopover";
-NSString *SKImageNameTouchBarLineNotePopover = @"TouchBarLineNotePopover";
-NSString *SKImageNameTouchBarInkNotePopover = @"TouchBarInkNotePopover";
-NSString *SKImageNameTouchBarAddTextNote = @"TouchBarAddTextNote";
-NSString *SKImageNameTouchBarAddAnchoredNote = @"TouchBarAddAnchoredNote";
-NSString *SKImageNameTouchBarAddCircleNote = @"TouchBarAddCircleNote";
-NSString *SKImageNameTouchBarAddSquareNote = @"TouchBarAddSquareNote";
-NSString *SKImageNameTouchBarAddHighlightNote = @"TouchBarAddHighlightNote";
-NSString *SKImageNameTouchBarAddUnderlineNote = @"TouchBarAddUnderlineNote";
-NSString *SKImageNameTouchBarAddStrikeOutNote = @"TouchBarAddStrikeOutNote";
-NSString *SKImageNameTouchBarAddLineNote = @"TouchBbarAddLineNote";
-NSString *SKImageNameTouchBarAddInkNote = @"TouchBarAddInkNote";
-NSString *SKImageNameTouchBarNewSeparator = @"TouchBarNewSeparator";
-NSString *SKImageNameTouchBarRefresh = @"TouchBarRefresh";
-NSString *SKImageNameTouchBarStopProgress = @"TouchBarStopProgress";
+NSString * const SKImageNameTouchBarPageUp = @"TouchBarPageUp";
+NSString * const SKImageNameTouchBarPageDown = @"TouchBarPageDown";
+NSString * const SKImageNameTouchBarFirstPage = @"TouchBarFirstPage";
+NSString * const SKImageNameTouchBarLastPage = @"TouchBarLastPage";
+NSString * const SKImageNameTouchBarZoomIn = @"TouchBarZoomIn";
+NSString * const SKImageNameTouchBarZoomOut = @"TouchBarZoomOut";
+NSString * const SKImageNameTouchBarZoomActual = @"TouchBarZoomActual";
+NSString * const SKImageNameTouchBarZoomToSelection = @"TouchBarZoomToSelection";
+NSString * const SKImageNameTouchBarTextTool = @"TouchBarTextTool";
+NSString * const SKImageNameTouchBarMoveTool = @"TouchBarMoveTool";
+NSString * const SKImageNameTouchBarMagnifyTool = @"TouchBarMagnifyTool";
+NSString * const SKImageNameTouchBarSelectTool = @"TouchBarSelectTool";
+NSString * const SKImageNameTouchBarSnapshotTool = @"TouchBarSnapshotTool";
+NSString * const SKImageNameTouchBarTextNote = @"TouchBarTextNote";
+NSString * const SKImageNameTouchBarAnchoredNote = @"TouchBarAnchoredNote";
+NSString * const SKImageNameTouchBarCircleNote = @"TouchBarCircleNote";
+NSString * const SKImageNameTouchBarSquareNote = @"TouchBarSquareNote";
+NSString * const SKImageNameTouchBarHighlightNote = @"TouchBarHighlightNote";
+NSString * const SKImageNameTouchBarUnderlineNote = @"TouchBarUnderlineNote";
+NSString * const SKImageNameTouchBarStrikeOutNote = @"TouchBarStrikeOutNote";
+NSString * const SKImageNameTouchBarLineNote = @"TouchBarLineNote";
+NSString * const SKImageNameTouchBarInkNote = @"TouchBarInkNote";
+NSString * const SKImageNameTouchBarTextNotePopover = @"TouchBarTextNotePopover";
+NSString * const SKImageNameTouchBarAnchoredNotePopover = @"TouchBarAnchoredNotePopover";
+NSString * const SKImageNameTouchBarCircleNotePopover = @"TouchBarCircleNotePopover";
+NSString * const SKImageNameTouchBarSquareNotePopover = @"TouchBarSquareNotePopover";
+NSString * const SKImageNameTouchBarHighlightNotePopover = @"TouchBarHighlightNotePopover";
+NSString * const SKImageNameTouchBarUnderlineNotePopover = @"TouchBarUnderlineNotePopover";
+NSString * const SKImageNameTouchBarStrikeOutNotePopover = @"TouchBarStrikeOutNotePopover";
+NSString * const SKImageNameTouchBarLineNotePopover = @"TouchBarLineNotePopover";
+NSString * const SKImageNameTouchBarInkNotePopover = @"TouchBarInkNotePopover";
+NSString * const SKImageNameTouchBarAddTextNote = @"TouchBarAddTextNote";
+NSString * const SKImageNameTouchBarAddAnchoredNote = @"TouchBarAddAnchoredNote";
+NSString * const SKImageNameTouchBarAddCircleNote = @"TouchBarAddCircleNote";
+NSString * const SKImageNameTouchBarAddSquareNote = @"TouchBarAddSquareNote";
+NSString * const SKImageNameTouchBarAddHighlightNote = @"TouchBarAddHighlightNote";
+NSString * const SKImageNameTouchBarAddUnderlineNote = @"TouchBarAddUnderlineNote";
+NSString * const SKImageNameTouchBarAddStrikeOutNote = @"TouchBarAddStrikeOutNote";
+NSString * const SKImageNameTouchBarAddLineNote = @"TouchBbarAddLineNote";
+NSString * const SKImageNameTouchBarAddInkNote = @"TouchBarAddInkNote";
+NSString * const SKImageNameTouchBarNewSeparator = @"TouchBarNewSeparator";
+NSString * const SKImageNameTouchBarRefresh = @"TouchBarRefresh";
+NSString * const SKImageNameTouchBarStopProgress = @"TouchBarStopProgress";
-NSString *SKImageNameGeneralPreferences = @"GeneralPreferences";
-NSString *SKImageNameDisplayPreferences = @"DisplayPreferences";
-NSString *SKImageNameNotesPreferences = @"NotesPreferences";
-NSString *SKImageNameSyncPreferences = @"SyncPreferences";
+NSString * const SKImageNameGeneralPreferences = @"GeneralPreferences";
+NSString * const SKImageNameDisplayPreferences = @"DisplayPreferences";
+NSString * const SKImageNameNotesPreferences = @"NotesPreferences";
+NSString * const SKImageNameSyncPreferences = @"SyncPreferences";
-NSString *SKImageNameToolbarNewFolder = @"ToolbarNewFolder";
-NSString *SKImageNameToolbarNewSeparator = @"ToolbarNewSeparator";
-NSString *SKImageNameToolbarDelete = @"ToolbarDelete";
+NSString * const SKImageNameToolbarNewFolder = @"ToolbarNewFolder";
+NSString * const SKImageNameToolbarNewSeparator = @"ToolbarNewSeparator";
+NSString * const SKImageNameToolbarDelete = @"ToolbarDelete";
-NSString *SKImageNameOutlineViewAdorn = @"OutlineViewAdorn";
-NSString *SKImageNameThumbnailViewAdorn = @"ThumbnailViewAdorn";
-NSString *SKImageNameNoteViewAdorn = @"NoteViewAdorn";
-NSString *SKImageNameSnapshotViewAdorn = @"SnapshotViewAdorn";
-NSString *SKImageNameFindViewAdorn = @"FindViewAdorn";
-NSString *SKImageNameGroupedFindViewAdorn = @"GroupedFindViewAdorn";
-NSString *SKImageNameTextToolAdorn = @"TextToolAdorn";
-NSString *SKImageNameInkToolAdorn = @"InkToolAdorn";
+NSString * const SKImageNameOutlineViewAdorn = @"OutlineViewAdorn";
+NSString * const SKImageNameThumbnailViewAdorn = @"ThumbnailViewAdorn";
+NSString * const SKImageNameNoteViewAdorn = @"NoteViewAdorn";
+NSString * const SKImageNameSnapshotViewAdorn = @"SnapshotViewAdorn";
+NSString * const SKImageNameFindViewAdorn = @"FindViewAdorn";
+NSString * const SKImageNameGroupedFindViewAdorn = @"GroupedFindViewAdorn";
+NSString * const SKImageNameTextToolAdorn = @"TextToolAdorn";
+NSString * const SKImageNameInkToolAdorn = @"InkToolAdorn";
-NSString *SKImageNameTextAlignLeft = @"TextAlignLeft";
-NSString *SKImageNameTextAlignCenter = @"TextAlignCenter";
-NSString *SKImageNameTextAlignRight = @"TextAlignRight";
+NSString * const SKImageNameTextAlignLeft = @"TextAlignLeft";
+NSString * const SKImageNameTextAlignCenter = @"TextAlignCenter";
+NSString * const SKImageNameTextAlignRight = @"TextAlignRight";
-NSString *SKImageNameRemoteStateResize = @"RemoteStateResize";
-NSString *SKImageNameRemoteStateScroll = @"RemoteStateScroll";
+NSString * const SKImageNameRemoteStateResize = @"RemoteStateResize";
+NSString * const SKImageNameRemoteStateScroll = @"RemoteStateScroll";
static void drawMenuBadge();
static void drawAddBadge();
Modified: trunk/NSValueTransformer_SKExtensions.h
===================================================================
--- trunk/NSValueTransformer_SKExtensions.h 2025-11-09 17:10:15 UTC (rev 15778)
+++ trunk/NSValueTransformer_SKExtensions.h 2025-11-09 17:43:17 UTC (rev 15779)
@@ -40,15 +40,15 @@
NS_ASSUME_NONNULL_BEGIN
-extern NSString *SKUnarchiveColorTransformerName;
-extern NSString *SKUnarchiveColorArrayTransformerName;
-extern NSString *SKTypeImageTransformerName;
-extern NSString *SKHasWindowImageTransformerName;
-extern NSString *SKDisplayModeImageTransformerName;
-extern NSString *SKScaleFactorTransformerName;
-extern NSString *SKIsZeroTransformerName;
-extern NSString *SKIsOneTransformerName;
-extern NSString *SKIsTwoTransformerName;
+extern NSString * const SKUnarchiveColorTransformerName;
+extern NSString * const SKUnarchiveColorArrayTransformerName;
+extern NSString * const SKTypeImageTransformerName;
+extern NSString * const SKHasWindowImageTransformerName;
+extern NSString * const SKDisplayModeImageTransformerName;
+extern NSString * const SKScaleFactorTransformerName;
+extern NSString * const SKIsZeroTransformerName;
+extern NSString * const SKIsOneTransformerName;
+extern NSString * const SKIsTwoTransformerName;
@interface NSValueTransformer (SKExtensions)
+ (void)registerCustomTransformers;
Modified: trunk/NSValueTransformer_SKExtensions.m
===================================================================
--- trunk/NSValueTransformer_SKExtensions.m 2025-11-09 17:10:15 UTC (rev 15778)
+++ trunk/NSValueTransformer_SKExtensions.m 2025-11-09 17:43:17 UTC (rev 15779)
@@ -41,15 +41,15 @@
#import <SkimNotes/SkimNotes.h>
#import <Quartz/Quartz.h>
-NSString *SKUnarchiveColorTransformerName = @"SKUnarchiveColor";
-NSString *SKUnarchiveColorArrayTransformerName = @"SKUnarchiveColorArray";
-NSString *SKTypeImageTransformerName = @"SKTypeImage";
-NSString *SKHasWindowImageTransformerName = @"SKHasWindowImage";
-NSString *SKDisplayModeImageTransformerName = @"SKDisplayModeImage";
-NSString *SKScaleFactorTransformerName = @"SKScaleFactor";
-NSString *SKIsZeroTransformerName = @"SKIsZero";
-NSString *SKIsOneTransformerName = @"SKIsOne";
-NSString *SKIsTwoTransformerName = @"SKIsTwo";
+NSString * const SKUnarchiveColorTransformerName = @"SKUnarchiveColor";
+NSString * const SKUnarchiveColorArrayTransformerName = @"SKUnarchiveColorArray";
+NSString * const SKTypeImageTransformerName = @"SKTypeImage";
+NSString * const SKHasWindowImageTransformerName = @"SKHasWindowImage";
+NSString * const SKDisplayModeImageTransformerName = @"SKDisplayModeImage";
+NSString * const SKScaleFactorTransformerName = @"SKScaleFactor";
+NSString * const SKIsZeroTransformerName = @"SKIsZero";
+NSString * const SKIsOneTransformerName = @"SKIsOne";
+NSString * const SKIsTwoTransformerName = @"SKIsTwo";
@interface SKUnarchiveColorTransformer : NSValueTransformer
@end
Modified: trunk/PDFAnnotationFreeText_SKExtensions.h
===================================================================
--- trunk/PDFAnnotationFreeText_SKExtensions.h 2025-11-09 17:10:15 UTC (rev 15778)
+++ trunk/PDFAnnotationFreeText_SKExtensions.h 2025-11-09 17:43:17 UTC (rev 15779)
@@ -41,8 +41,8 @@
NS_ASSUME_NONNULL_BEGIN
-extern NSString *SKPDFAnnotationScriptingFontColorKey;
-extern NSString *SKPDFAnnotationScriptingAlignmentKey;
+extern NSString * const SKPDFAnnotationScriptingFontColorKey;
+extern NSString * const SKPDFAnnotationScriptingAlignmentKey;
@interface PDFAnnotationFreeText (SKExtensions)
Modified: trunk/PDFAnnotationFreeText_SKExtensions.m
===================================================================
--- trunk/PDFAnnotationFreeText_SKExtensions.m 2025-11-09 17:10:15 UTC (rev 15778)
+++ trunk/PDFAnnotationFreeText_SKExtensions.m 2025-11-09 17:43:17 UTC (rev 15779)
@@ -44,8 +44,8 @@
#import "NSUserDefaults_SKExtensions.h"
-NSString *SKPDFAnnotationScriptingFontColorKey = @"scriptingFontColor";
-NSString *SKPDFAnnotationScriptingAlignmentKey = @"scriptingAlignment";
+NSString * const SKPDFAnnotationScriptingFontColorKey = @"scriptingFontColor";
+NSString * const SKPDFAnnotationScriptingAlignmentKey = @"scriptingAlignment";
@implementation PDFAnnotationFreeText (SKExtensions)
Modified: trunk/PDFAnnotationInk_SKExtensions.h
===================================================================
--- trunk/PDFAnnotationInk_SKExtensions.h 2025-11-09 17:10:15 UTC (rev 15778)
+++ trunk/PDFAnnotationInk_SKExtensions.h 2025-11-09 17:43:17 UTC (rev 15779)
@@ -41,8 +41,8 @@
NS_ASSUME_NONNULL_BEGIN
-extern NSString *SKPDFAnnotationBezierPathsKey;
-extern NSString *SKPDFAnnotationScriptingPointListsKey;
+extern NSString * const SKPDFAnnotationBezierPathsKey;
+extern NSString * const SKPDFAnnotationScriptingPointListsKey;
@interface PDFAnnotationInk (SKExtensions)
@end
Modified: trunk/PDFAnnotationInk_SKExtensions.m
===================================================================
--- trunk/PDFAnnotationInk_SKExtensions.m 2025-11-09 17:10:15 UTC (rev 15778)
+++ trunk/PDFAnnotationInk_SKExtensions.m 2025-11-09 17:43:17 UTC (rev 15779)
@@ -51,8 +51,8 @@
#import "PDFPage_SKExtensions.h"
#import "PDFView_SKExtensions.h"
-NSString *SKPDFAnnotationBezierPathsKey = @"bezierPaths";
-NSString *SKPDFAnnotationScriptingPointListsKey = @"scriptingPointLists";
+NSString * const SKPDFAnnotationBezierPathsKey = @"bezierPaths";
+NSString * const SKPDFAnnotationScriptingPointListsKey = @"scriptingPointLists";
@implementation PDFAnnotationInk (SKExtensions)
Modified: trunk/PDFAnnotationLine_SKExtensions.h
===================================================================
--- trunk/PDFAnnotationLine_SKExtensions.h 2025-11-09 17:10:15 UTC (rev 15778)
+++ trunk/PDFAnnotationLine_SKExtensions.h 2025-11-09 17:43:17 UTC (rev 15779)
@@ -41,10 +41,10 @@
NS_ASSUME_NONNULL_BEGIN
-extern NSString *SKPDFAnnotationStartPointAsQDPointKey;
-extern NSString *SKPDFAnnotationEndPointAsQDPointKey;
-extern NSString *SKPDFAnnotationScriptingStartLineStyleKey;
-extern NSString *SKPDFAnnotationScriptingEndLineStyleKey;
+extern NSString * const SKPDFAnnotationStartPointAsQDPointKey;
+extern NSString * const SKPDFAnnotationEndPointAsQDPointKey;
+extern NSString * const SKPDFAnnotationScriptingStartLineStyleKey;
+extern NSString * const SKPDFAnnotationScriptingEndLineStyleKey;
@interface PDFAnnotationLine (SKExtensions)
Modified: trunk/PDFAnnotationLine_SKExtensions.m
===================================================================
--- trunk/PDFAnnotationLine_SKExtensions.m 2025-11-09 17:10:15 UTC (rev 15778)
+++ trunk/PDFAnnotationLine_SKExtensions.m 2025-11-09 17:43:17 UTC (rev 15779)
@@ -51,10 +51,10 @@
#import "NSColor_SKExtensions.h"
#import "PDFView_SKExtensions.h"
-NSString *SKPDFAnnotationStartPointAsQDPointKey = @"startPointAsQDPoint";
-NSString *SKPDFAnnotationEndPointAsQDPointKey = @"endPointAsQDPoint";
-NSString *SKPDFAnnotationScriptingStartLineStyleKey = @"scriptingStartLineStyle";
-NSString *SKPDFAnnotationScriptingEndLineStyleKey = @"scriptingEndLineStyle";
+NSString * const SKPDFAnnotationStartPointAsQDPointKey = @"startPointAsQDPoint";
+NSString * const SKPDFAnnotationEndPointAsQDPointKey = @"endPointAsQDPoint";
+NSString * const SKPDFAnnotationScriptingStartLineStyleKey = @"scriptingStartLineStyle";
+NSString * const SKPDFAnnotationScriptingEndLineStyleKey = @"scriptingEndLineStyle";
@implementation PDFAnnotationLine (SKExtensions)
Modified: trunk/PDFAnnotationMarkup_SKExtensions.h
===================================================================
--- trunk/PDFAnnotationMarkup_SKExtensions.h 2025-11-09 17:10:15 UTC (rev 15778)
+++ trunk/PDFAnnotationMarkup_SKExtensions.h 2025-11-09 17:43:17 UTC (rev 15779)
@@ -41,7 +41,7 @@
NS_ASSUME_NONNULL_BEGIN
-extern NSString *SKPDFAnnotationSelectionSpecifierKey;
+extern NSString * const SKPDFAnnotationSelectionSpecifierKey;
@interface PDFAnnotationMarkup (SKExtensions)
Modified: trunk/PDFAnnotationMarkup_SKExtensions.m
===================================================================
--- trunk/PDFAnnotationMarkup_SKExtensions.m 2025-11-09 17:10:15 UTC (rev 15778)
+++ trunk/PDFAnnotationMarkup_SKExtensions.m 2025-11-09 17:43:17 UTC (rev 15779)
@@ -57,7 +57,7 @@
#import "SKRuntime.h"
#import <objc/objc-runtime.h>
-NSString *SKPDFAnnotationSelectionSpecifierKey = @"selectionSpecifier";
+NSString * const SKPDFAnnotationSelectionSpecifierKey = @"selectionSpecifier";
static char SKLineRectsKey;
static char SKTextStringKey;
Modified: trunk/PDFAnnotation_SKExtensions.h
===================================================================
--- trunk/PDFAnnotation_SKExtensions.h 2025-11-09 17:10:15 UTC (rev 15778)
+++ trunk/PDFAnnotation_SKExtensions.h 2025-11-09 17:43:17 UTC (rev 15779)
@@ -43,15 +43,15 @@
NS_ASSUME_NONNULL_BEGIN
-extern NSString *SKPDFAnnotationScriptingColorKey;
-extern NSString *SKPDFAnnotationScriptingModificationDateKey;
-extern NSString *SKPDFAnnotationScriptingUserNameKey;
-extern NSString *SKPDFAnnotationScriptingTextContentsKey;
-extern NSString *SKPDFAnnotationScriptingInteriorColorKey;
+extern NSString * const SKPDFAnnotationScriptingColorKey;
+extern NSString * const SKPDFAnnotationScriptingModificationDateKey;
+extern NSString * const SKPDFAnnotationScriptingUserNameKey;
+extern NSString * const SKPDFAnnotationScriptingTextContentsKey;
+extern NSString * const SKPDFAnnotationScriptingInteriorColorKey;
-extern NSString *SKPDFAnnotationBoundsOrderKey;
+extern NSString * const SKPDFAnnotationBoundsOrderKey;
-extern NSString *SKPasteboardTypeSkimNote;
+extern NSString * const SKPasteboardTypeSkimNote;
@class SKPDFView, SKNoteText;
Modified: trunk/PDFAnnotation_SKExtensions.m
===================================================================
--- trunk/PDFAnnotation_SKExtensions.m 2025-11-09 17:10:15 UTC (rev 15778)
+++ trunk/PDFAnnotation_SKExtensions.m 2025-11-09 17:43:17 UTC (rev 15779)
@@ -64,15 +64,15 @@
#import "NSDate_SKExtensions.h"
-NSString *SKPDFAnnotationScriptingColorKey = @"scriptingColor";
-NSString *SKPDFAnnotationScriptingModificationDateKey = @"scriptingModificationDate";
-NSString *SKPDFAnnotationScriptingUserNameKey = @"scriptingUserName";
-NSString *SKPDFAnnotationScriptingTextContentsKey = @"textContents";
-NSString *SKPDFAnnotationScriptingInteriorColorKey = @"scriptingInteriorColor";
+NSString * const SKPDFAnnotationScriptingColorKey = @"scriptingColor";
+NSString * const SKPDFAnnotationScriptingModificationDateKey = @"scriptingModificationDate";
+NSString * const SKPDFAnnotationScriptingUserNameKey = @"scriptingUserName";
+NSString * const SKPDFAnnotationScriptingTextContentsKey = @"textContents";
+NSString * const SKPDFAnnotationScriptingInteriorColorKey = @"scriptingInteriorColor";
-NSString *SKPDFAnnotationBoundsOrderKey = @"boundsOrder";
+NSString * const SKPDFAnnotationBoundsOrderKey = @"boundsOrder";
-NSString *SKPasteboardTypeSkimNote = @"net.sourceforge.skim-app.pasteboard.skimnote";
+NSString * const SKPasteboardTypeSkimNote = @"net.sourceforge.skim-app.pasteboard.skimnote";
@implementation PDFAnnotation (SKExtensions)
Modified: trunk/PDFDocument_SKExtensions.h
===================================================================
--- trunk/PDFDocument_SKExtensions.h 2025-11-09 17:10:15 UTC (rev 15778)
+++ trunk/PDFDocument_SKExtensions.h 2025-11-09 17:43:17 UTC (rev 15779)
@@ -41,15 +41,15 @@
NS_ASSUME_NONNULL_BEGIN
-extern NSString *SKPDFDocumentDidAddAnnotationNotification;
-extern NSString *SKPDFDocumentWillRemoveAnnotationNotification;
-extern NSString *SKPDFDocumentDidRemoveAnnotationNotification;
-extern NSString *SKPDFDocumentWillMoveAnnotationNotification;
-extern NSString *SKPDFDocumentDidMoveAnnotationNotification;
+extern NSString * const SKPDFDocumentDidAddAnnotationNotification;
+extern NSString * const SKPDFDocumentWillRemoveAnnotationNotification;
+extern NSString * const SKPDFDocumentDidRemoveAnnotationNotification;
+extern NSString * const SKPDFDocumentWillMoveAnnotationNotification;
+extern NSString * const SKPDFDocumentDidMoveAnnotationNotification;
-extern NSString *SKPDFDocumentAnnotationKey;
-extern NSString *SKPDFDocumentPageKey;
-extern NSString *SKPDFDocumentOldPageKey;
+extern NSString * const SKPDFDocumentAnnotationKey;
+extern NSString * const SKPDFDocumentPageKey;
+extern NSString * const SKPDFDocumentOldPageKey;
typedef struct _SKLanguageDirectionAngles {
NSInteger characterDirection;
Modified: trunk/PDFDocument_SKExtensions.m
===================================================================
--- trunk/PDFDocument_SKExtensions.m 2025-11-09 17:10:15 UTC (rev 15778)
+++ trunk/PDFDocument_SKExtensions.m 2025-11-09 17:43:17 UTC (rev 15779)
@@ -44,15 +44,15 @@
#import "NSDocument_SKExtensions.h"
#import "PDFAnnotation_SKExtensions.h"
-NSString *SKPDFDocumentDidAddAnnotationNotification = @"SKPDFDocumentDidAddAnnotationNotification";
-NSString *SKPDFDocumentWillRemoveAnnotationNotification = @"SKPDFDocumentWillRemoveAnnotationNotification";
-NSString *SKPDFDocumentDidRemoveAnnotationNotification = @"SKPDFDocumentDidRemoveAnnotationNotification";
-NSString *SKPDFDocumentWillMoveAnnotationNotification = @"SKPDFDocumentWillMoveAnnotationNotification";
-NSString *SKPDFDocumentDidMoveAnnotationNotification = @"SKPDFDocumentDidMoveAnnotationNotification";
+NSString * const SKPDFDocumentDidAddAnnotationNotification = @"SKPDFDocumentDidAddAnnotationNotification";
+NSString * const SKPDFDocumentWillRemoveAnnotationNotification = @"SKPDFDocumentWillRemoveAnnotationNotification";
+NSString * const SKPDFDocumentDidRemoveAnnotationNotification = @"SKPDFDocumentDidRemoveAnnotationNotification";
+NSString * const SKPDFDocumentWillMoveAnnotationNotification = @"SKPDFDocumentWillMoveAnnotationNotification";
+NSString * const SKPDFDocumentDidMoveAnnotationNotification = @"SKPDFDocumentDidMoveAnnotationNotification";
-NSString *SKPDFDocumentAnnotationKey = @"annotation";
-NSString *SKPDFDocumentPageKey = @"page";
-NSString *SKPDFDocumentOldPageKey = @"oldPage";
+NSString * const SKPDFDocumentAnnotationKey = @"annotation";
+NSString * const SKPDFDocumentPageKey = @"page";
+NSString * const SKPDFDocumentOldPageKey = @"oldPage";
@implementation PDFDocument (SKExtensions)
Modified: trunk/PDFPage_SKExtensions.h
===================================================================
--- trunk/PDFPage_SKExtensions.h 2025-11-09 17:10:15 UTC (rev 15778)
+++ trunk/PDFPage_SKExtensions.h 2025-11-09 17:43:17 UTC (rev 15779)
@@ -42,13 +42,13 @@
NS_ASSUME_NONNULL_BEGIN
-extern NSString *SKPDFPageBoundsDidChangeNotification;
+extern NSString * const SKPDFPageBoundsDidChangeNotification;
-extern NSString *SKPDFPagePageKey;
-extern NSString *SKPDFPageActionKey;
-extern NSString *SKPDFPageActionCrop;
-extern NSString *SKPDFPageActionResize;
-extern NSString *SKPDFPageActionRotate;
+extern NSString * const SKPDFPagePageKey;
+extern NSString * const SKPDFPageActionKey;
+extern NSString * const SKPDFPageActionCrop;
+extern NSString * const SKPDFPageActionResize;
+extern NSString * const SKPDFPageActionRotate;
@class SKMainDocument, SKLine;
Modified: trunk/PDFPage_SKExtensions.m
===================================================================
--- trunk/PDFPage_SKExtensions.m 2025-11-09 17:10:15 UTC (rev 15778)
+++ trunk/PDFPage_SKExtensions.m 2025-11-09 17:43:17 UTC (rev 15779)
@@ -60,13 +60,13 @@
#import "NSString_SKExtensions.h"
#import "SKLine.h"
-NSString *SKPDFPageBoundsDidChangeNotification = @"SKPDFPageBoundsDidChangeNotification";
+NSString * const SKPDFPageBoundsDidChangeNotification = @"SKPDFPageBoundsDidChangeNotification";
-NSString *SKPDFPagePageKey = @"page";
-NSString *SKPDFPageActionKey = @"action";
-NSString *SKPDFPageActionCrop = @"crop";
-NSString *SKPDFPageActionResize = @"resize";
-NSString *SKPDFPageActionRotate = @"rotate";
+NSString * const SKPDFPagePageKey = @"page";
+NSString * const SKPDFPageActionKey = @"action";
+NSString * const SKPDFPageActionCrop = @"crop";
+NSString * const SKPDFPageActionResize = @"resize";
+NSString * const SKPDFPageActionRotate = @"rotate";
#define SKAutoCropBoxMarginWidthKey @"SKAutoCropBoxMarginWidth"
#define SKAutoCropBoxMarginHeightKey @"SKAutoCropBoxMarginHeight"
Modified: trunk/SKApplicationController.h
===================================================================
--- trunk/SKApplicationController.h 2025-11-09 17:10:15 UTC (rev 15778)
+++ trunk/SKApplicationController.h 2025-11-09 17:43:17 UTC (rev 15779)
@@ -42,7 +42,7 @@
NS_ASSUME_NONNULL_BEGIN
-extern NSString *SKPageLabelsChangedNotification;
+extern NSString * const SKPageLabelsChangedNotification;
@class SKBookmark, SKDownload, SKPreferenceController, SKReleaseNotesController, SKInfoWindowController, SKNotesPanelController, SKDownloadController;
Modified: trunk/SKApplicationController.m
===================================================================
--- trunk/SKApplicationController.m 2025-11-09 17:10:15 UTC (rev 15778)
+++ trunk/SKApplicationController.m 2025-11-09 17:43:17 UTC (rev 15779)
@@ -109,7 +109,7 @@
static char SKApplicationControllerDefaultsObservationContext;
-NSString *SKPageLabelsChangedNotification = @"SKPageLabelsChangedNotification";
+NSString * const SKPageLabelsChangedNotification = @"SKPageLabelsChangedNotification";
enum {
SKReopenNever = 0,
Modified: trunk/SKDocumentController.h
===================================================================
--- trunk/SKDocumentController.h 2025-11-09 17:10:15 UTC (rev 15778)
+++ trunk/SKDocumentController.h 2025-11-09 17:43:17 UTC (rev 15779)
@@ -40,30 +40,30 @@
NS_ASSUME_NONNULL_BEGIN
-extern NSString *SKDocumentTypePDF;
-extern NSString *SKDocumentTypePDFBundle;
-extern NSString *SKDocumentTypeNotes;
-extern NSString *SKDocumentTypeNotesText;
-extern NSString *SKDocumentTypeNotesRTF;
-extern NSString *SKDocumentTypeNotesRTFD;
-extern NSString *SKDocumentTypeNotesFDF;
-extern NSString *SKDocumentTypePostScript;
-extern NSString *SKDocumentTypeEncapsulatedPostScript;
-extern NSString *SKDocumentTypeDVI;
-extern NSString *SKDocumentTypeXDV;
-extern NSString *SKDocumentTypeArchive;
-extern NSString *SKDocumentTypeFolder;
+extern NSString * const SKDocumentTypePDF;
+extern NSString * const SKDocumentTypePDFBundle;
+extern NSString * const SKDocumentTypeNotes;
+extern NSString * const SKDocumentTypeNotesText;
+extern NSString * const SKDocumentTypeNotesRTF;
+extern NSString * const SKDocumentTypeNotesRTFD;
+extern NSString * const SKDocumentTypeNotesFDF;
+extern NSString * const SKDocumentTypePostScript;
+extern NSString * const SKDocumentTypeEncapsulatedPostScript;
+extern NSString * const SKDocumentTypeDVI;
+extern NSString * const SKDocumentTypeXDV;
+extern NSString * const SKDocumentTypeArchive;
+extern NSString * const SKDocumentTypeFolder;
-extern NSString *SKDocumentSetupAliasKey;
-extern NSString *SKDocumentSetupBookmarkKey;
-extern NSString *SKDocumentSetupWindowFrameKey;
-extern NSString *SKDocumentSetupTabsKey;
+extern NSString * const SKDocumentSetupAliasKey;
+extern NSString * const SKDocumentSetupBookmarkKey;
+extern NSString * const SKDocumentSetupWindowFrameKey;
+extern NSString * const SKDocumentSetupTabsKey;
-extern NSString *SKDocumentControllerWillRemoveDocumentNotification;
-extern NSString *SKDocumentControllerDidRemoveDocumentNotification;
-extern NSString *SKDocumentDidShowNotification;
+extern NSString * const SKDocumentControllerWillRemoveDocumentNotification;
+extern NSString * const SKDocumentControllerDidRemoveDocumentNotification;
+extern NSString * const SKDocumentDidShowNotification;
-extern NSString *SKDocumentControllerDocumentKey;
+extern NSString * const SKDocumentControllerDocumentKey;
@class SKBookmark;
Modified: trunk/SKDocumentController.m
===================================================================
--- trunk/SKDocumentController.m 2025-11-09 17:10:15 UTC (rev 15778)
+++ trunk/SKDocumentController.m 2025-11-09 17:43:17 UTC (rev 15779)
@@ -53,30 +53,30 @@
#define SKIM_NOTES_KEY @"net_sourceforge_skim-app_notes"
-NSString *SKDocumentTypePDF = @"com.adobe.pdf";
-NSString *SKDocumentTypePDFBundle = @"net.sourceforge.skim-app.pdfd";
-NSString *SKDocumentTypeNotes = @"net.sourceforge.skim-app.skimnotes";
-NSString *SKDocumentTypeNotesText = @"public.plain-text";
-NSString *SKDocumentTypeNotesRTF = @"public.rtf";
-NSString *SKDocumentTypeNotesRTFD = @"com.apple.rtfd";
-NSString *SKDocumentTypeNotesFDF = @"com.adobe.fdf";
-NSString *SKDocumentTypePostScript = @"com.adobe.postscript";
-NSString *SKDocumentTypeEncapsulatedPostScript = @"com.adobe.encapsulated-postscript";
-NSString *SKDocumentTypeDVI = @"org.tug.tex.dvi";
-NSString *SKDocumentTypeXDV = @"org.tug.tex.xdv";
-NSString *SKDocumentTypeArchive = @"org.gnu.gnu-zip-tar-archive";
-NSString *SKDocumentTypeFolder = @"public.folder";
+NSString * const SKDocumentTypePDF = @"com.adobe.pdf";
+NSString * const SKDocumentTypePDFBundle = @"net.sourceforge.skim-app.pdfd";
+NSString * const SKDocumentTypeNotes = @"net.sourceforge.skim-app.ski...
[truncated message content] |
|
From: <ho...@us...> - 2025-11-09 17:10:17
|
Revision: 15778
http://sourceforge.net/p/skim-app/code/15778
Author: hofman
Date: 2025-11-09 17:10:15 +0000 (Sun, 09 Nov 2025)
Log Message:
-----------
variabls for intermediatee values
Modified Paths:
--------------
trunk/NSGraphics_SKExtensions.m
Modified: trunk/NSGraphics_SKExtensions.m
===================================================================
--- trunk/NSGraphics_SKExtensions.m 2025-11-09 16:24:31 UTC (rev 15777)
+++ trunk/NSGraphics_SKExtensions.m 2025-11-09 17:10:15 UTC (rev 15778)
@@ -201,14 +201,15 @@
if (SKHasDarkAppearance() && [sud boolForKey:SKInvertColorsInDarkModeKey]) {
// map the white page background to 45/255, or 30/255 with high contrast
CGFloat f = [[NSWorkspace sharedWorkspace] accessibilityDisplayShouldIncreaseContrast] ? 1.9338 : 1.8972;
+ CGFloat lrf = LR * f, lgf = LG * f, lbf = LB * f;
// This is like CIColorInvert + CIHueAdjust, modified to map white to dark gray rather than black
// Inverts a linear luminocity with weights from the CIE standards
// see https://wiki.preterhuman.net/Matrix_Operations_for_Image_Processingand https://beesbuzz.biz/code/16-hsv-color-transforms
- if ((filter = [CIFilter filterWithName:@"CIGammaAdjust" keysAndValues:@"inputPower", [NSNumber numberWithDouble:0.625], nil]))
+ if ((filter = [CIFilter filterWithName:@"CIGammaAdjust" keysAndValues:@"inputPower", @0.625, nil]))
[filters addObject:filter];
- if ((filter = [CIFilter filterWithName:@"CIColorMatrix" keysAndValues:@"inputRVector", [CIVector vectorWithX:1.0-LR*f Y:-LG*f Z:-LB*f W:0.0], @"inputGVector", [CIVector vectorWithX:-LR*f Y:1.0-LG*f Z:-LB*f W:0.0], @"inputBVector", [CIVector vectorWithX:-LR*f Y:-LG*f Z:1.0-LB*f W:0.0], @"inputAVector", [CIVector vectorWithX:0.0 Y:0.0 Z:0.0 W:1.0], @"inputBiasVector", [CIVector vectorWithX:1.0 Y:1.0 Z:1.0 W:0.0], nil]))
+ if ((filter = [CIFilter filterWithName:@"CIColorMatrix" keysAndValues:@"inputRVector", [CIVector vectorWithX:1.0-lrf Y:-lgf Z:-lbf W:0.0], @"inputGVector", [CIVector vectorWithX:-lrf Y:1.0-lgf Z:-lbf W:0.0], @"inputBVector", [CIVector vectorWithX:-lrf Y:-lgf Z:1.0-lbf W:0.0], @"inputAVector", [CIVector vectorWithX:0.0 Y:0.0 Z:0.0 W:1.0], @"inputBiasVector", [CIVector vectorWithX:1.0 Y:1.0 Z:1.0 W:0.0], nil]))
[filters addObject:filter];
- if ((filter = [CIFilter filterWithName:@"CIGammaAdjust" keysAndValues:@"inputPower", [NSNumber numberWithDouble:1.6], nil]))
+ if ((filter = [CIFilter filterWithName:@"CIGammaAdjust" keysAndValues:@"inputPower", @1.6, nil]))
[filters addObject:filter];
}
return filters;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2025-11-09 16:24:33
|
Revision: 15777
http://sourceforge.net/p/skim-app/code/15777
Author: hofman
Date: 2025-11-09 16:24:31 +0000 (Sun, 09 Nov 2025)
Log Message:
-----------
observe universal access defaults only on 12.0+
Modified Paths:
--------------
trunk/NSCursor_SKExtensions.m
Modified: trunk/NSCursor_SKExtensions.m
===================================================================
--- trunk/NSCursor_SKExtensions.m 2025-11-08 23:36:00 UTC (rev 15776)
+++ trunk/NSCursor_SKExtensions.m 2025-11-09 16:24:31 UTC (rev 15777)
@@ -266,9 +266,11 @@
- (NSUserDefaults *)universalaccessDefaults {
if (universalaccessDefaults == nil) {
universalaccessDefaults = [[NSUserDefaults alloc] initWithSuiteName:@"com.apple.universalaccess"];
- [universalaccessDefaults addObserver:self forKeyPath:@"cursorIsCustomized" options:0 context:&SKUniversalAccessDefaultsObservationContext];
- [universalaccessDefaults addObserver:self forKeyPath:@"cursorOutline" options:0 context:&SKUniversalAccessDefaultsObservationContext];
- [universalaccessDefaults addObserver:self forKeyPath:@"cursorFill" options:0 context:&SKUniversalAccessDefaultsObservationContext];
+ if (@available(macOS 12.0, *)) {
+ [universalaccessDefaults addObserver:self forKeyPath:@"cursorIsCustomized" options:0 context:&SKUniversalAccessDefaultsObservationContext];
+ [universalaccessDefaults addObserver:self forKeyPath:@"cursorOutline" options:0 context:&SKUniversalAccessDefaultsObservationContext];
+ [universalaccessDefaults addObserver:self forKeyPath:@"cursorFill" options:0 context:&SKUniversalAccessDefaultsObservationContext];
+ }
}
return universalaccessDefaults;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2025-11-08 23:36:02
|
Revision: 15776
http://sourceforge.net/p/skim-app/code/15776
Author: hofman
Date: 2025-11-08 23:36:00 +0000 (Sat, 08 Nov 2025)
Log Message:
-----------
update side pane toolbar buttons when collapsed state changes, save state in tag of button
Modified Paths:
--------------
trunk/SKMainToolbarController.m
Modified: trunk/SKMainToolbarController.m
===================================================================
--- trunk/SKMainToolbarController.m 2025-11-08 23:19:57 UTC (rev 15775)
+++ trunk/SKMainToolbarController.m 2025-11-08 23:36:00 UTC (rev 15776)
@@ -877,6 +877,8 @@
[item setView:leftPaneButton];
[item setMenuFormRepresentation:menuItem];
+ [leftPaneButton setTag:[mainController leftSidePaneIsOpen] == NO];
+
} else if ([identifier isEqualToString:SKDocumentToolbarNotesPaneItemIdentifier]) {
menuItem = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"Notes Pane", @"Menu item title") action:@selector(toggleRightSidePane:) target:mainController];
@@ -886,6 +888,8 @@
[item setView:rightPaneButton];
[item setMenuFormRepresentation:menuItem];
+ [rightPaneButton setTag:[mainController rightSidePaneIsOpen] == NO];
+
} else if ([identifier isEqualToString:SKDocumentToolbarSplitPDFItemIdentifier]) {
menuItem = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"Notes Pane", @"Menu item title") action:@selector(toggleSplitPDF:) target:mainController];
@@ -1116,10 +1120,13 @@
[item setToolTip:[mainController hasNoteToolbar] ? NSLocalizedString(@"Hide Note Toolbar", @"Tool tip message") : NSLocalizedString(@"Show Note Toolbar", @"Tool tip message")];
}
-- (void)updatePaneItemToolTips {
+- (void)leftSidePaneDidShowOrHide {
NSToolbarItem *item = [toolbarItems objectForKey:SKDocumentToolbarContentsPaneItemIdentifier];
[item setToolTip:[mainController leftSidePaneIsOpen] ? NSLocalizedString(@"Hide Contents Pane", @"Tool tip message") : NSLocalizedString(@"Show Contents Pane", @"Tool tip message")];
- item = [toolbarItems objectForKey:SKDocumentToolbarNotesPaneItemIdentifier];
+}
+
+- (void)rightSidePaneDidShowOrHide {
+ NSToolbarItem *item = [toolbarItems objectForKey:SKDocumentToolbarNotesPaneItemIdentifier];
[item setToolTip:[mainController rightSidePaneIsOpen] ? NSLocalizedString(@"Hide Notes Pane", @"Tool tip message") : NSLocalizedString(@"Show Notes Pane", @"Tool tip message")];
}
@@ -1489,7 +1496,17 @@
}
- (void)handleSplitViewDidResizeSubviewsNotification:(NSNotification *)notification {
- [self performSelectorOnce:@selector(updatePaneItemToolTips) afterDelay:0.1];
+ NSSplitView *splitView = [notification object];
+ NSInteger isLeftSideViewCollapsed = [splitView isSubviewCollapsed:[[splitView subviews] firstObject]];
+ NSInteger isRightSideViewCollapsed = [splitView isSubviewCollapsed:[[splitView subviews] lastObject]];
+ if (isLeftSideViewCollapsed != [leftPaneButton tag]) {
+ [leftPaneButton setTag:isLeftSideViewCollapsed];
+ [self leftSidePaneDidShowOrHide];
+ }
+ if (isRightSideViewCollapsed != [rightPaneButton tag]) {
+ [rightPaneButton setTag:isRightSideViewCollapsed];
+ [self rightSidePaneDidShowOrHide];
+ }
}
- (void)registerForNotifications {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2025-11-08 23:19:59
|
Revision: 15775
http://sourceforge.net/p/skim-app/code/15775
Author: hofman
Date: 2025-11-08 23:19:57 +0000 (Sat, 08 Nov 2025)
Log Message:
-----------
update split pdf toolbar item when toggling split pdf
Modified Paths:
--------------
trunk/SKMainToolbarController.h
trunk/SKMainToolbarController.m
trunk/SKMainWindowController_Actions.m
Modified: trunk/SKMainToolbarController.h
===================================================================
--- trunk/SKMainToolbarController.h 2025-11-08 18:37:42 UTC (rev 15774)
+++ trunk/SKMainToolbarController.h 2025-11-08 23:19:57 UTC (rev 15775)
@@ -109,6 +109,7 @@
- (void)handlePageChangedNotification:(nullable NSNotification *)notification;
- (void)noteToolbarDidShowOrHide;
+- (void)splitPDFDidShowOrHide;
#pragma mark Actions
Modified: trunk/SKMainToolbarController.m
===================================================================
--- trunk/SKMainToolbarController.m 2025-11-08 18:37:42 UTC (rev 15774)
+++ trunk/SKMainToolbarController.m 2025-11-08 23:19:57 UTC (rev 15775)
@@ -1123,7 +1123,7 @@
[item setToolTip:[mainController rightSidePaneIsOpen] ? NSLocalizedString(@"Hide Notes Pane", @"Tool tip message") : NSLocalizedString(@"Show Notes Pane", @"Tool tip message")];
}
-- (void)updateSplitPDFItemToolTips {
+- (void)splitPDFDidShowOrHide {
NSToolbarItem *item = [toolbarItems objectForKey:SKDocumentToolbarSplitPDFItemIdentifier];
[item setToolTip:[(NSView *)mainController.secondaryPdfView window] ? NSLocalizedString(@"Hide Split PDF", @"Tool tip message") : NSLocalizedString(@"Show Split PDF", @"Tool tip message")];
}
@@ -1492,10 +1492,6 @@
[self performSelectorOnce:@selector(updatePaneItemToolTips) afterDelay:0.1];
}
-- (void)handlePDFSplitViewDidResizeSubviewsNotification:(NSNotification *)notification {
- [self performSelectorOnce:@selector(updateSplitPDFItemToolTips) afterDelay:0.1];
-}
-
- (void)registerForNotifications {
NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
@@ -1529,8 +1525,6 @@
name:PDFViewChangedHistoryNotification object:mainController.pdfView];
[nc addObserver:self selector:@selector(handleSplitViewDidResizeSubviewsNotification:)
name:NSSplitViewDidResizeSubviewsNotification object:mainController.splitView];
- [nc addObserver:self selector:@selector(handlePDFSplitViewDidResizeSubviewsNotification:)
- name:NSSplitViewDidResizeSubviewsNotification object:mainController.pdfSplitView];
[self handleChangedHistoryNotification:nil];
[self handlePageChangedNotification:nil];
Modified: trunk/SKMainWindowController_Actions.m
===================================================================
--- trunk/SKMainWindowController_Actions.m 2025-11-08 18:37:42 UTC (rev 15774)
+++ trunk/SKMainWindowController_Actions.m 2025-11-08 23:19:57 UTC (rev 15775)
@@ -1143,6 +1143,8 @@
}
[[self window] recalculateKeyViewLoop];
+
+ [toolbarController splitPDFDidShowOrHide];
}
- (IBAction)toggleNoteToolbar:(id)sender {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2025-11-08 18:37:44
|
Revision: 15774
http://sourceforge.net/p/skim-app/code/15774
Author: hofman
Date: 2025-11-08 18:37:42 +0000 (Sat, 08 Nov 2025)
Log Message:
-----------
no need to predeclar methods
Modified Paths:
--------------
trunk/SKMainToolbarController.m
Modified: trunk/SKMainToolbarController.m
===================================================================
--- trunk/SKMainToolbarController.m 2025-11-08 18:25:50 UTC (rev 15773)
+++ trunk/SKMainToolbarController.m 2025-11-08 18:37:42 UTC (rev 15774)
@@ -143,8 +143,6 @@
@interface SKMainToolbarController ()
- (void)handleColorSwatchFrameChangedNotification:(NSNotification *)notification;
- (void)updateColorsMenu:(NSMenu *)menu;
-- (void)updatePaneItemToolTips;
-- (void)updateSplitPDFItemToolTips;
@end
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2025-11-08 18:25:53
|
Revision: 15773
http://sourceforge.net/p/skim-app/code/15773
Author: hofman
Date: 2025-11-08 18:25:50 +0000 (Sat, 08 Nov 2025)
Log Message:
-----------
we never call splitview delegate method with nil
Modified Paths:
--------------
trunk/NSGeometry_SKExtensions.h
trunk/NSGeometry_SKExtensions.m
trunk/PDFAnnotationLine_SKExtensions.m
trunk/PDFAnnotation_SKExtensions.m
trunk/SKMainWindowController_UI.m
trunk/SKPDFView.m
Modified: trunk/NSGeometry_SKExtensions.h
===================================================================
--- trunk/NSGeometry_SKExtensions.h 2025-11-08 17:07:13 UTC (rev 15772)
+++ trunk/NSGeometry_SKExtensions.h 2025-11-08 18:25:50 UTC (rev 15773)
@@ -41,12 +41,11 @@
NS_ASSUME_NONNULL_BEGIN
typedef NS_OPTIONS(NSUInteger, SKRectEdges) {
- SKNoEdgeMask = 0,
- SKMinXEdgeMask = 1 << NSMinXEdge,
- SKMinYEdgeMask = 1 << NSMinYEdge,
- SKMaxXEdgeMask = 1 << NSMaxXEdge,
- SKMaxYEdgeMask = 1 << NSMaxYEdge,
- SKEveryEdgeMask = SKMinXEdgeMask | SKMinYEdgeMask | SKMaxXEdgeMask | SKMaxYEdgeMask,
+ SKRectEdgesNone = 0,
+ SKRectEdgesMinX = 1 << NSMinXEdge,
+ SKRectEdgesMinY = 1 << NSMinYEdge,
+ SKRectEdgesMaxX = 1 << NSMaxXEdge,
+ SKRectEdgesMaxY = 1 << NSMaxYEdge,
};
static inline NSPoint SKIntegralPoint(NSPoint point) {
Modified: trunk/NSGeometry_SKExtensions.m
===================================================================
--- trunk/NSGeometry_SKExtensions.m 2025-11-08 17:07:13 UTC (rev 15772)
+++ trunk/NSGeometry_SKExtensions.m 2025-11-08 18:25:50 UTC (rev 15773)
@@ -106,23 +106,23 @@
SKRectEdges SKResizeHandleForPointFromRect(NSPoint point, NSRect rect, CGFloat delta) {
if (NSPointInRect(point, NSInsetRect(rect, -delta, -delta)) == NO)
- return SKNoEdgeMask;
+ return SKRectEdgesNone;
else if (SKPointNearCoordinates(point, NSMaxX(rect), NSMinY(rect), delta))
- return SKMaxXEdgeMask | SKMinYEdgeMask;
+ return SKRectEdgesMaxX | SKRectEdgesMinY;
else if (SKPointNearCoordinates(point, NSMaxX(rect), NSMaxY(rect), delta))
- return SKMaxXEdgeMask | SKMaxYEdgeMask;
+ return SKRectEdgesMaxX | SKRectEdgesMaxY;
else if (SKPointNearCoordinates(point, NSMinX(rect), NSMinY(rect), delta))
- return SKMinXEdgeMask | SKMinYEdgeMask;
+ return SKRectEdgesMinX | SKRectEdgesMinY;
else if (SKPointNearCoordinates(point, NSMinX(rect), NSMaxY(rect), delta))
- return SKMinXEdgeMask | SKMaxYEdgeMask;
+ return SKRectEdgesMinX | SKRectEdgesMaxY;
else if (SKPointNearCoordinates(point, NSMaxX(rect), NSMidY(rect), delta))
- return SKMaxXEdgeMask;
+ return SKRectEdgesMaxX;
else if (SKPointNearCoordinates(point, NSMidX(rect), NSMinY(rect), delta))
- return SKMinYEdgeMask;
+ return SKRectEdgesMinY;
else if (SKPointNearCoordinates(point, NSMidX(rect), NSMaxY(rect), delta))
- return SKMaxYEdgeMask;
+ return SKRectEdgesMaxY;
else if (SKPointNearCoordinates(point, NSMinX(rect), NSMidY(rect), delta))
- return SKMinXEdgeMask;
+ return SKRectEdgesMinX;
else
- return SKNoEdgeMask;
+ return SKRectEdgesNone;
}
Modified: trunk/PDFAnnotationLine_SKExtensions.m
===================================================================
--- trunk/PDFAnnotationLine_SKExtensions.m 2025-11-08 17:07:13 UTC (rev 15772)
+++ trunk/PDFAnnotationLine_SKExtensions.m 2025-11-08 18:25:50 UTC (rev 15773)
@@ -151,15 +151,15 @@
- (SKRectEdges)resizeHandleForPoint:(NSPoint)point scaleFactor:(CGFloat)scaleFactor {
if ([self isResizable] == NO)
- return SKNoEdgeMask;
+ return SKRectEdgesNone;
NSSize size = SKMakeSquareSize(8.0 / scaleFactor);
point = SKSubstractPoints(point, [self bounds].origin);
if (NSPointInRect(point, SKRectFromCenterAndSize([self endPoint], size)))
- return SKMaxXEdgeMask;
+ return SKRectEdgesMaxX;
else if (NSPointInRect(point, SKRectFromCenterAndSize([self startPoint], size)))
- return SKMinXEdgeMask;
+ return SKRectEdgesMinX;
else
- return SKNoEdgeMask;
+ return SKRectEdgesNone;
}
- (void)drawSelectionHighlightWithUnitWidth:(CGFloat)unitWidth active:(BOOL)active inContext:(CGContextRef)context {
Modified: trunk/PDFAnnotation_SKExtensions.m
===================================================================
--- trunk/PDFAnnotation_SKExtensions.m 2025-11-08 17:07:13 UTC (rev 15772)
+++ trunk/PDFAnnotation_SKExtensions.m 2025-11-08 18:25:50 UTC (rev 15773)
@@ -467,7 +467,7 @@
}
- (SKRectEdges)resizeHandleForPoint:(NSPoint)point scaleFactor:(CGFloat)scaleFactor {
- return [self isResizable] ? SKResizeHandleForPointFromRect(point, [self bounds], 4.0 / scaleFactor) : SKNoEdgeMask;
+ return [self isResizable] ? SKResizeHandleForPointFromRect(point, [self bounds], 4.0 / scaleFactor) : SKRectEdgesNone;
}
- (void)drawSelectionHighlightWithUnitWidth:(CGFloat)unitWidth active:(BOOL)active inContext:(CGContextRef)context {
Modified: trunk/SKMainWindowController_UI.m
===================================================================
--- trunk/SKMainWindowController_UI.m 2025-11-08 17:07:13 UTC (rev 15772)
+++ trunk/SKMainWindowController_UI.m 2025-11-08 18:25:50 UTC (rev 15773)
@@ -1731,7 +1731,7 @@
- (void)splitViewDidResizeSubviews:(NSNotification *)notification {
id sender = [notification object];
- if (([sender isEqual:splitView] || sender == nil) && [[self window] frameAutosaveName] && mwcFlags.settingUpWindow == 0) {
+ if ([sender isEqual:splitView] && [[self window] frameAutosaveName] && mwcFlags.settingUpWindow == 0) {
CGFloat leftWidth = [splitView isSubviewCollapsed:leftSideContentView] ? 0.0 : NSWidth([leftSideContentView frame]);
CGFloat rightWidth = [splitView isSubviewCollapsed:rightSideContentView] ? 0.0 : NSWidth([rightSideContentView frame]);
[[NSUserDefaults standardUserDefaults] setFloat:leftWidth forKey:SKLeftSidePaneWidthKey];
Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m 2025-11-08 17:07:13 UTC (rev 15772)
+++ trunk/SKPDFView.m 2025-11-08 18:25:50 UTC (rev 15773)
@@ -3892,13 +3892,13 @@
if (ratio <= 0.0) {
- if ((resizeHandle & SKMaxXEdgeMask)) {
+ if ((resizeHandle & SKRectEdgesMaxX)) {
newBounds.size.width += relPoint.x;
if (NSMaxX(newBounds) > NSMaxX(pageBounds))
newBounds.size.width = NSMaxX(pageBounds) - NSMinX(newBounds);
if (NSWidth(newBounds) < minSize)
newBounds.size.width = minSize;
- } else if ((resizeHandle & SKMinXEdgeMask)) {
+ } else if ((resizeHandle & SKRectEdgesMinX)) {
newBounds.origin.x += relPoint.x;
newBounds.size.width -= relPoint.x;
if (NSMinX(newBounds) < NSMinX(pageBounds)) {
@@ -3910,13 +3910,13 @@
newBounds.size.width = minSize;
}
}
- if ((resizeHandle & SKMaxYEdgeMask)) {
+ if ((resizeHandle & SKRectEdgesMaxY)) {
newBounds.size.height += relPoint.y;
if (NSMaxY(newBounds) > NSMaxY(pageBounds))
newBounds.size.height = NSMaxY(pageBounds) - NSMinY(newBounds);
if (NSHeight(newBounds) < minSize)
newBounds.size.height = minSize;
- } else if ((resizeHandle & SKMinYEdgeMask)) {
+ } else if ((resizeHandle & SKRectEdgesMinY)) {
newBounds.origin.y += relPoint.y;
newBounds.size.height -= relPoint.y;
if (NSMinY(newBounds) < NSMinY(pageBounds)) {
@@ -3935,22 +3935,22 @@
CGFloat height = NSHeight(newBounds);
CGFloat ds = 2.0 * margin;
- if ((resizeHandle & SKMaxXEdgeMask))
+ if ((resizeHandle & SKRectEdgesMaxX))
width = fmax(minSize, width + relPoint.x);
- else if ((resizeHandle & SKMinXEdgeMask))
+ else if ((resizeHandle & SKRectEdgesMinX))
width = fmax(minSize, width - relPoint.x);
- if ((resizeHandle & SKMaxYEdgeMask))
+ if ((resizeHandle & SKRectEdgesMaxY))
height = fmax(minSize, height + relPoint.y);
- else if ((resizeHandle & SKMinYEdgeMask))
+ else if ((resizeHandle & SKRectEdgesMinY))
height = fmax(minSize, height - relPoint.y);
- if ((resizeHandle & (SKMinXEdgeMask | SKMaxXEdgeMask)) == 0) {
+ if ((resizeHandle & (SKRectEdgesMinX | SKRectEdgesMaxX)) == 0) {
width = ds + (height - ds) * ratio;
if (width < minSize) {
width = minSize;
height = ds + (width - ds) / ratio;
}
- } else if ((resizeHandle & (SKMinYEdgeMask | SKMaxYEdgeMask)) == 0) {
+ } else if ((resizeHandle & (SKRectEdgesMinY | SKRectEdgesMaxY)) == 0) {
height = ds + (width - ds) / ratio;
if (height < minSize) {
height = minSize;
@@ -3961,7 +3961,7 @@
height = ds + (width - ds) / ratio;
}
- if ((resizeHandle & SKMinXEdgeMask)) {
+ if ((resizeHandle & SKRectEdgesMinX)) {
if (NSMaxX(newBounds) - width < NSMinX(pageBounds)) {
width = fmax(minSize, NSMaxX(newBounds) - NSMinX(pageBounds));
height = ds + (width - ds) / ratio;
@@ -3972,7 +3972,7 @@
height = ds + (width - ds) / ratio;
}
}
- if ((resizeHandle & SKMinYEdgeMask)) {
+ if ((resizeHandle & SKRectEdgesMinY)) {
if (NSMaxY(newBounds) - height < NSMinY(pageBounds)) {
height = fmax(minSize, NSMaxY(newBounds) - NSMinY(pageBounds));
width = ds + (height - ds) * ratio;
@@ -3984,9 +3984,9 @@
}
}
- if ((resizeHandle & SKMinXEdgeMask))
+ if ((resizeHandle & SKRectEdgesMinX))
newBounds.origin.x = NSMaxX(newBounds) - width;
- if ((resizeHandle & SKMinYEdgeMask))
+ if ((resizeHandle & SKRectEdgesMinY))
newBounds.origin.y = NSMaxY(newBounds) - height;
newBounds.size.width = width;
newBounds.size.height = height;
@@ -4046,14 +4046,14 @@
originalBounds = SKRectFromCenterAndSquareSize(SKIntegralPoint(initialPoint), 0.0);
if (noteType == SKNoteTypeAnchored) {
[self addAnnotationWithType:SKNoteTypeAnchored selection:nil page:page bounds:originalBounds];
- resizeHandle = SKNoEdgeMask;
+ resizeHandle = SKRectEdgesNone;
originalBounds = [[self currentAnnotation] bounds];
} else if (noteType == SKNoteTypeLine) {
isLine = YES;
- resizeHandle = SKMaxXEdgeMask;
+ resizeHandle = SKRectEdgesMaxX;
originalStartPoint = originalEndPoint = originalBounds.origin;
} else {
- resizeHandle = SKMaxXEdgeMask | SKMinYEdgeMask;
+ resizeHandle = SKRectEdgesMaxX | SKRectEdgesMinY;
}
} else if (isLine) {
originalStartPoint = SKIntegralPoint(SKAddPoints([currentAnnotation startPoint], originalBounds.origin));
@@ -4069,7 +4069,7 @@
NSUInteger eventMask = NSEventMaskLeftMouseUp | NSEventMaskLeftMouseDragged;
[self setCursorForAreaOfInterest:SKAreaOfInterestForResizeHandle(resizeHandle, page)];
- if (resizeHandle == SKNoEdgeMask) {
+ if (resizeHandle == SKRectEdgesNone) {
[[NSCursor closedHandCursor] push];
[NSEvent startPeriodicEventsAfterDelay:0.1 withPeriod:0.1];
eventMask |= NSEventMaskPeriodic;
@@ -4090,7 +4090,7 @@
draggedAnnotation = YES;
}
mousePoint = [theEvent locationInView:self];
- if (resizeHandle == SKNoEdgeMask) {
+ if (resizeHandle == SKRectEdgesNone) {
lastMouseEvent = theEvent;
[[[self scrollView] contentView] autoscroll:lastMouseEvent];
}
@@ -4099,16 +4099,16 @@
continue;
}
BOOL shiftDown = ([theEvent modifierFlags] & NSEventModifierFlagShift) != 0;
- if (resizeHandle == SKNoEdgeMask)
+ if (resizeHandle == SKRectEdgesNone)
page = [self pageForPoint:mousePoint nearest:YES];
NSPoint draggedPoint = SKSubstractPoints([self convertPoint:mousePoint toPage:page], initialPoint);
- if (resizeHandle == SKNoEdgeMask) {
+ if (resizeHandle == SKRectEdgesNone) {
[self moveAnnotationToPoint:draggedPoint onPage:page];
} else if (isLine) {
- [self dragLineAnnotationStartPoint:(resizeHandle & SKMinXEdgeMask) != 0 by:draggedPoint originalStartPoint:originalStartPoint originalEndPoint:originalEndPoint shiftDown:shiftDown];
+ [self dragLineAnnotationStartPoint:(resizeHandle & SKRectEdgesMinX) != 0 by:draggedPoint originalStartPoint:originalStartPoint originalEndPoint:originalEndPoint shiftDown:shiftDown];
} else {
if (shouldAddAnnotation) {
- SKRectEdges currentResizeHandle = (draggedPoint.x < 0.0 ? SKMinXEdgeMask : SKMaxXEdgeMask) | (draggedPoint.y <= 0.0 ? SKMinYEdgeMask : SKMaxYEdgeMask);
+ SKRectEdges currentResizeHandle = (draggedPoint.x < 0.0 ? SKRectEdgesMinX : SKRectEdgesMaxX) | (draggedPoint.y <= 0.0 ? SKRectEdgesMinY : SKRectEdgesMaxY);
if (currentResizeHandle != resizeHandle) {
resizeHandle = currentResizeHandle;
[self setCursorForAreaOfInterest:SKAreaOfInterestForResizeHandle(resizeHandle, page)];
@@ -4129,7 +4129,7 @@
[[highlightLayerController layer] setNeedsDisplay];
}
- if (resizeHandle == SKNoEdgeMask) {
+ if (resizeHandle == SKRectEdgesNone) {
[NSEvent stopPeriodicEvents];
[NSCursor pop];
}
@@ -4415,14 +4415,14 @@
BOOL didSelect = (NO == NSIsEmptyRect(selectionRect));
- SKRectEdges resizeHandle = didSelect ? SKResizeHandleForPointFromRect(initialPoint, selectionRect, margin) : SKNoEdgeMask;
+ SKRectEdges resizeHandle = didSelect ? SKResizeHandleForPointFromRect(initialPoint, selectionRect, margin) : SKRectEdgesNone;
initialPoint = SKIntegralPoint(initialPoint);
- if (resizeHandle == SKNoEdgeMask && (didSelect == NO || NSPointInRect(initialPoint, selectionRect) == NO)) {
+ if (resizeHandle == SKRectEdgesNone && (didSelect == NO || NSPointInRect(initialPoint, selectionRect) == NO)) {
selectionRect.origin = initialPoint;
selectionRect.size = NSZeroSize;
- resizeHandle = SKMaxXEdgeMask | SKMinYEdgeMask;
+ resizeHandle = SKRectEdgesMaxX | SKRectEdgesMinY;
if (didSelect)
[self setNeedsDisplay:YES];
}
@@ -4448,15 +4448,15 @@
delta = SKSubstractPoints(newPoint, initialPoint);
if (resizeHandle) {
- SKRectEdges newEffectiveResizeHandle = SKNoEdgeMask;
- if ((resizeHandle & SKMaxXEdgeMask))
- newEffectiveResizeHandle |= newPoint.x < NSMinX(initialRect) ? SKMinXEdgeMask : SKMaxXEdgeMask;
- else if ((resizeHandle & SKMinXEdgeMask))
- newEffectiveResizeHandle |= newPoint.x > NSMaxX(initialRect) ? SKMaxXEdgeMask : SKMinXEdgeMask;
- if ((resizeHandle & SKMaxYEdgeMask))
- newEffectiveResizeHandle |= newPoint.y < NSMinY(initialRect) ? SKMinYEdgeMask : SKMaxYEdgeMask;
- else if ((resizeHandle & SKMinYEdgeMask))
- newEffectiveResizeHandle |= newPoint.y > NSMaxY(initialRect) ? SKMaxYEdgeMask : SKMinYEdgeMask;
+ SKRectEdges newEffectiveResizeHandle = SKRectEdgesNone;
+ if ((resizeHandle & SKRectEdgesMaxX))
+ newEffectiveResizeHandle |= newPoint.x < NSMinX(initialRect) ? SKRectEdgesMinX : SKRectEdgesMaxX;
+ else if ((resizeHandle & SKRectEdgesMinX))
+ newEffectiveResizeHandle |= newPoint.x > NSMaxX(initialRect) ? SKRectEdgesMaxX : SKRectEdgesMinX;
+ if ((resizeHandle & SKRectEdgesMaxY))
+ newEffectiveResizeHandle |= newPoint.y < NSMinY(initialRect) ? SKRectEdgesMinY : SKRectEdgesMaxY;
+ else if ((resizeHandle & SKRectEdgesMinY))
+ newEffectiveResizeHandle |= newPoint.y > NSMaxY(initialRect) ? SKRectEdgesMaxY : SKRectEdgesMinY;
if (newEffectiveResizeHandle != effectiveResizeHandle) {
effectiveResizeHandle = newEffectiveResizeHandle;
[self setCursorForAreaOfInterest:SKAreaOfInterestForResizeHandle(effectiveResizeHandle, page)];
@@ -4463,7 +4463,7 @@
}
}
- if (resizeHandle == SKNoEdgeMask) {
+ if (resizeHandle == SKRectEdgesNone) {
newRect.origin = SKAddPoints(newRect.origin, delta);
} else if (([theEvent modifierFlags] & NSEventModifierFlagShift)) {
CGFloat width = NSWidth(newRect);
@@ -4470,23 +4470,23 @@
CGFloat height = NSHeight(newRect);
CGFloat square;
- if ((resizeHandle & SKMaxXEdgeMask))
+ if ((resizeHandle & SKRectEdgesMaxX))
width += delta.x;
- else if ((resizeHandle & SKMinXEdgeMask))
+ else if ((resizeHandle & SKRectEdgesMinX))
width -= delta.x;
- if ((resizeHandle & SKMaxYEdgeMask))
+ if ((resizeHandle & SKRectEdgesMaxY))
height += delta.y;
- else if ((resizeHandle & SKMinYEdgeMask))
+ else if ((resizeHandle & SKRectEdgesMinY))
height -= delta.y;
- if (0 == (resizeHandle & (SKMinXEdgeMask | SKMaxXEdgeMask)))
+ if (0 == (resizeHandle & (SKRectEdgesMinX | SKRectEdgesMaxX)))
square = fabs(height);
- else if (0 == (resizeHandle & (SKMinYEdgeMask | SKMaxYEdgeMask)))
+ else if (0 == (resizeHandle & (SKRectEdgesMinY | SKRectEdgesMaxY)))
square = fabs(width);
else
square = fmax(fabs(width), fabs(height));
- if ((resizeHandle & SKMinXEdgeMask)) {
+ if ((resizeHandle & SKRectEdgesMinX)) {
if (width >= 0.0 && NSMaxX(newRect) - square < NSMinX(pageBounds))
square = NSMaxX(newRect) - NSMinX(pageBounds);
else if (width < 0.0 && NSMaxX(newRect) + square > NSMaxX(pageBounds))
@@ -4497,7 +4497,7 @@
else if (width < 0.0 && NSMinX(newRect) - square < NSMinX(pageBounds))
square = NSMinX(newRect) - NSMinX(pageBounds);
}
- if ((resizeHandle & SKMinYEdgeMask)) {
+ if ((resizeHandle & SKRectEdgesMinY)) {
if (height >= 0.0 && NSMaxY(newRect) - square < NSMinY(pageBounds))
square = NSMaxY(newRect) - NSMinY(pageBounds);
else if (height < 0.0 && NSMaxY(newRect) + square > NSMaxY(pageBounds))
@@ -4509,23 +4509,23 @@
square = NSMinY(newRect) - NSMinY(pageBounds);
}
- if ((resizeHandle & SKMinXEdgeMask))
+ if ((resizeHandle & SKRectEdgesMinX))
newRect.origin.x = width < 0.0 ? NSMaxX(newRect) : NSMaxX(newRect) - square;
- else if (width < 0.0 && (resizeHandle & SKMaxXEdgeMask))
+ else if (width < 0.0 && (resizeHandle & SKRectEdgesMaxX))
newRect.origin.x = NSMinX(newRect) - square;
- if ((resizeHandle & SKMinYEdgeMask))
+ if ((resizeHandle & SKRectEdgesMinY))
newRect.origin.y = height < 0.0 ? NSMaxY(newRect) : NSMaxY(newRect) - square;
- else if (height < 0.0 && (resizeHandle & SKMaxYEdgeMask))
+ else if (height < 0.0 && (resizeHandle & SKRectEdgesMaxY))
newRect.origin.y = NSMinY(newRect) - square;
newRect.size.width = newRect.size.height = square;
} else {
- if ((resizeHandle & SKMaxXEdgeMask)) {
+ if ((resizeHandle & SKRectEdgesMaxX)) {
newRect.size.width += delta.x;
if (NSWidth(newRect) < 0.0) {
newRect.size.width *= -1.0;
newRect.origin.x -= NSWidth(newRect);
}
- } else if ((resizeHandle & SKMinXEdgeMask)) {
+ } else if ((resizeHandle & SKRectEdgesMinX)) {
newRect.origin.x += delta.x;
newRect.size.width -= delta.x;
if (NSWidth(newRect) < 0.0) {
@@ -4534,13 +4534,13 @@
}
}
- if ((resizeHandle & SKMaxYEdgeMask)) {
+ if ((resizeHandle & SKRectEdgesMaxY)) {
newRect.size.height += delta.y;
if (NSHeight(newRect) < 0.0) {
newRect.size.height *= -1.0;
newRect.origin.y -= NSHeight(newRect);
}
- } else if ((resizeHandle & SKMinYEdgeMask)) {
+ } else if ((resizeHandle & SKRectEdgesMinY)) {
newRect.origin.y += delta.y;
newRect.size.height -= delta.y;
if (NSHeight(newRect) < 0.0) {
@@ -5048,7 +5048,7 @@
area = SKDragArea;
} else {
- SKRectEdges resizeHandle = SKNoEdgeMask;
+ SKRectEdges resizeHandle = SKRectEdgesNone;
PDFPage *page = [self pageAndPoint:&p forEvent:theEvent nearest:YES];
if (readingBar && [[readingBar page] isEqual:page]) {
@@ -5209,13 +5209,13 @@
BOOL rotated = ([page rotation] % 180 != 0);
if (mask == 0)
return SKDragArea;
- else if (mask == SKMaxXEdgeMask || mask == SKMinXEdgeMask)
+ else if (mask == SKRectEdgesMaxX || mask == SKRectEdgesMinX)
return rotated ? SKResizeUpDownArea : SKResizeLeftRightArea;
- else if (mask == (SKMaxXEdgeMask | SKMaxYEdgeMask) || mask == (SKMinXEdgeMask | SKMinYEdgeMask))
+ else if (mask == (SKRectEdgesMaxX | SKRectEdgesMaxY) || mask == (SKRectEdgesMinX | SKRectEdgesMinY))
return rotated ? SKResizeDiagonal135Area : SKResizeDiagonal45Area;
- else if (mask == SKMaxYEdgeMask || mask == SKMinYEdgeMask)
+ else if (mask == SKRectEdgesMaxY || mask == SKRectEdgesMinY)
return rotated ? SKResizeLeftRightArea : SKResizeUpDownArea;
- else if (mask == (SKMaxXEdgeMask | SKMinYEdgeMask) || mask == (SKMinXEdgeMask | SKMaxYEdgeMask))
+ else if (mask == (SKRectEdgesMaxX | SKRectEdgesMinY) || mask == (SKRectEdgesMinX | SKRectEdgesMaxY))
return rotated ? SKResizeDiagonal45Area : SKResizeDiagonal135Area;
else
return kPDFNoArea;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2025-11-08 17:07:15
|
Revision: 15772
http://sourceforge.net/p/skim-app/code/15772
Author: hofman
Date: 2025-11-08 17:07:13 +0000 (Sat, 08 Nov 2025)
Log Message:
-----------
use enum value instead of 0
Modified Paths:
--------------
trunk/PDFAnnotationLine_SKExtensions.m
trunk/PDFAnnotation_SKExtensions.m
trunk/SKPDFView.m
Modified: trunk/PDFAnnotationLine_SKExtensions.m
===================================================================
--- trunk/PDFAnnotationLine_SKExtensions.m 2025-11-08 16:30:51 UTC (rev 15771)
+++ trunk/PDFAnnotationLine_SKExtensions.m 2025-11-08 17:07:13 UTC (rev 15772)
@@ -151,7 +151,7 @@
- (SKRectEdges)resizeHandleForPoint:(NSPoint)point scaleFactor:(CGFloat)scaleFactor {
if ([self isResizable] == NO)
- return 0;
+ return SKNoEdgeMask;
NSSize size = SKMakeSquareSize(8.0 / scaleFactor);
point = SKSubstractPoints(point, [self bounds].origin);
if (NSPointInRect(point, SKRectFromCenterAndSize([self endPoint], size)))
@@ -159,7 +159,7 @@
else if (NSPointInRect(point, SKRectFromCenterAndSize([self startPoint], size)))
return SKMinXEdgeMask;
else
- return 0;
+ return SKNoEdgeMask;
}
- (void)drawSelectionHighlightWithUnitWidth:(CGFloat)unitWidth active:(BOOL)active inContext:(CGContextRef)context {
Modified: trunk/PDFAnnotation_SKExtensions.m
===================================================================
--- trunk/PDFAnnotation_SKExtensions.m 2025-11-08 16:30:51 UTC (rev 15771)
+++ trunk/PDFAnnotation_SKExtensions.m 2025-11-08 17:07:13 UTC (rev 15772)
@@ -467,7 +467,7 @@
}
- (SKRectEdges)resizeHandleForPoint:(NSPoint)point scaleFactor:(CGFloat)scaleFactor {
- return [self isResizable] ? SKResizeHandleForPointFromRect(point, [self bounds], 4.0 / scaleFactor) : 0;
+ return [self isResizable] ? SKResizeHandleForPointFromRect(point, [self bounds], 4.0 / scaleFactor) : SKNoEdgeMask;
}
- (void)drawSelectionHighlightWithUnitWidth:(CGFloat)unitWidth active:(BOOL)active inContext:(CGContextRef)context {
Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m 2025-11-08 16:30:51 UTC (rev 15771)
+++ trunk/SKPDFView.m 2025-11-08 17:07:13 UTC (rev 15772)
@@ -4046,7 +4046,7 @@
originalBounds = SKRectFromCenterAndSquareSize(SKIntegralPoint(initialPoint), 0.0);
if (noteType == SKNoteTypeAnchored) {
[self addAnnotationWithType:SKNoteTypeAnchored selection:nil page:page bounds:originalBounds];
- resizeHandle = 0;
+ resizeHandle = SKNoEdgeMask;
originalBounds = [[self currentAnnotation] bounds];
} else if (noteType == SKNoteTypeLine) {
isLine = YES;
@@ -4069,7 +4069,7 @@
NSUInteger eventMask = NSEventMaskLeftMouseUp | NSEventMaskLeftMouseDragged;
[self setCursorForAreaOfInterest:SKAreaOfInterestForResizeHandle(resizeHandle, page)];
- if (resizeHandle == 0) {
+ if (resizeHandle == SKNoEdgeMask) {
[[NSCursor closedHandCursor] push];
[NSEvent startPeriodicEventsAfterDelay:0.1 withPeriod:0.1];
eventMask |= NSEventMaskPeriodic;
@@ -4090,7 +4090,7 @@
draggedAnnotation = YES;
}
mousePoint = [theEvent locationInView:self];
- if (resizeHandle == 0) {
+ if (resizeHandle == SKNoEdgeMask) {
lastMouseEvent = theEvent;
[[[self scrollView] contentView] autoscroll:lastMouseEvent];
}
@@ -4099,10 +4099,10 @@
continue;
}
BOOL shiftDown = ([theEvent modifierFlags] & NSEventModifierFlagShift) != 0;
- if (resizeHandle == 0)
+ if (resizeHandle == SKNoEdgeMask)
page = [self pageForPoint:mousePoint nearest:YES];
NSPoint draggedPoint = SKSubstractPoints([self convertPoint:mousePoint toPage:page], initialPoint);
- if (resizeHandle == 0) {
+ if (resizeHandle == SKNoEdgeMask) {
[self moveAnnotationToPoint:draggedPoint onPage:page];
} else if (isLine) {
[self dragLineAnnotationStartPoint:(resizeHandle & SKMinXEdgeMask) != 0 by:draggedPoint originalStartPoint:originalStartPoint originalEndPoint:originalEndPoint shiftDown:shiftDown];
@@ -4129,7 +4129,7 @@
[[highlightLayerController layer] setNeedsDisplay];
}
- if (resizeHandle == 0) {
+ if (resizeHandle == SKNoEdgeMask) {
[NSEvent stopPeriodicEvents];
[NSCursor pop];
}
@@ -4415,11 +4415,11 @@
BOOL didSelect = (NO == NSIsEmptyRect(selectionRect));
- SKRectEdges resizeHandle = didSelect ? SKResizeHandleForPointFromRect(initialPoint, selectionRect, margin) : 0;
+ SKRectEdges resizeHandle = didSelect ? SKResizeHandleForPointFromRect(initialPoint, selectionRect, margin) : SKNoEdgeMask;
initialPoint = SKIntegralPoint(initialPoint);
- if (resizeHandle == 0 && (didSelect == NO || NSPointInRect(initialPoint, selectionRect) == NO)) {
+ if (resizeHandle == SKNoEdgeMask && (didSelect == NO || NSPointInRect(initialPoint, selectionRect) == NO)) {
selectionRect.origin = initialPoint;
selectionRect.size = NSZeroSize;
resizeHandle = SKMaxXEdgeMask | SKMinYEdgeMask;
@@ -4429,7 +4429,7 @@
NSRect initialRect = selectionRect;
NSRect pageBounds = [page boundsForBox:[self displayBox]];
- SKRectEdges newEffectiveResizeHandle, effectiveResizeHandle = resizeHandle;
+ SKRectEdges effectiveResizeHandle = resizeHandle;
[self setCursorForAreaOfInterest:SKAreaOfInterestForResizeHandle(resizeHandle, page)];
@@ -4448,7 +4448,7 @@
delta = SKSubstractPoints(newPoint, initialPoint);
if (resizeHandle) {
- newEffectiveResizeHandle = 0;
+ SKRectEdges newEffectiveResizeHandle = SKNoEdgeMask;
if ((resizeHandle & SKMaxXEdgeMask))
newEffectiveResizeHandle |= newPoint.x < NSMinX(initialRect) ? SKMinXEdgeMask : SKMaxXEdgeMask;
else if ((resizeHandle & SKMinXEdgeMask))
@@ -4463,7 +4463,7 @@
}
}
- if (resizeHandle == 0) {
+ if (resizeHandle == SKNoEdgeMask) {
newRect.origin = SKAddPoints(newRect.origin, delta);
} else if (([theEvent modifierFlags] & NSEventModifierFlagShift)) {
CGFloat width = NSWidth(newRect);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2025-11-08 16:30:54
|
Revision: 15771
http://sourceforge.net/p/skim-app/code/15771
Author: hofman
Date: 2025-11-08 16:30:51 +0000 (Sat, 08 Nov 2025)
Log Message:
-----------
return enum value instead of 0
Modified Paths:
--------------
trunk/NSGeometry_SKExtensions.m
Modified: trunk/NSGeometry_SKExtensions.m
===================================================================
--- trunk/NSGeometry_SKExtensions.m 2025-11-08 15:50:51 UTC (rev 15770)
+++ trunk/NSGeometry_SKExtensions.m 2025-11-08 16:30:51 UTC (rev 15771)
@@ -106,8 +106,8 @@
SKRectEdges SKResizeHandleForPointFromRect(NSPoint point, NSRect rect, CGFloat delta) {
if (NSPointInRect(point, NSInsetRect(rect, -delta, -delta)) == NO)
- return 0;
- if (SKPointNearCoordinates(point, NSMaxX(rect), NSMinY(rect), delta))
+ return SKNoEdgeMask;
+ else if (SKPointNearCoordinates(point, NSMaxX(rect), NSMinY(rect), delta))
return SKMaxXEdgeMask | SKMinYEdgeMask;
else if (SKPointNearCoordinates(point, NSMaxX(rect), NSMaxY(rect), delta))
return SKMaxXEdgeMask | SKMaxYEdgeMask;
@@ -124,5 +124,5 @@
else if (SKPointNearCoordinates(point, NSMinX(rect), NSMidY(rect), delta))
return SKMinXEdgeMask;
else
- return 0;
+ return SKNoEdgeMask;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2025-11-08 15:50:53
|
Revision: 15770
http://sourceforge.net/p/skim-app/code/15770
Author: hofman
Date: 2025-11-08 15:50:51 +0000 (Sat, 08 Nov 2025)
Log Message:
-----------
rename temporary toolmode
Modified Paths:
--------------
trunk/SKMainToolbarController.m
trunk/SKMainTouchBarController.m
trunk/SKPDFView.h
Modified: trunk/SKMainToolbarController.m
===================================================================
--- trunk/SKMainToolbarController.m 2025-11-07 18:05:38 UTC (rev 15769)
+++ trunk/SKMainToolbarController.m 2025-11-08 15:50:51 UTC (rev 15770)
@@ -1423,7 +1423,7 @@
case SKToolModeZoom : name = SKImageNameToolbarZoomToSelection; break;
case SKToolModeSnapshot : name = SKImageNameToolbarSnapshotTool; break;
case SKToolModeFreeText : name = SKImageNameToolbarAddTextNote; break;
- case SKAnchoredToolMode : name = SKImageNameToolbarAddAnchoredNote; break;
+ case SKToolModeAnchored : name = SKImageNameToolbarAddAnchoredNote; break;
case SKToolModeCircle : name = SKImageNameToolbarAddCircleNote; break;
case SKToolModeSquare : name = SKImageNameToolbarAddSquareNote; break;
case SKToolModeHighlight : name = SKImageNameToolbarAddHighlightNote; break;
Modified: trunk/SKMainTouchBarController.m
===================================================================
--- trunk/SKMainTouchBarController.m 2025-11-07 18:05:38 UTC (rev 15769)
+++ trunk/SKMainTouchBarController.m 2025-11-08 15:50:51 UTC (rev 15770)
@@ -389,7 +389,7 @@
case SKToolModeZoom : name = SKImageNameTouchBarZoomToSelection; break;
case SKToolModeSnapshot : name = SKImageNameTouchBarSnapshotTool; break;
case SKToolModeFreeText : name = SKImageNameTouchBarAddTextNote; break;
- case SKAnchoredToolMode : name = SKImageNameTouchBarAddAnchoredNote; break;
+ case SKToolModeAnchored : name = SKImageNameTouchBarAddAnchoredNote; break;
case SKToolModeCircle : name = SKImageNameTouchBarAddCircleNote; break;
case SKToolModeSquare : name = SKImageNameTouchBarAddSquareNote; break;
case SKToolModeHighlight : name = SKImageNameTouchBarAddHighlightNote; break;
Modified: trunk/SKPDFView.h
===================================================================
--- trunk/SKPDFView.h 2025-11-07 18:05:38 UTC (rev 15769)
+++ trunk/SKPDFView.h 2025-11-08 15:50:51 UTC (rev 15770)
@@ -88,7 +88,7 @@
SKToolModeZoom,
SKToolModeSnapshot,
SKToolModeFreeText,
- SKAnchoredToolMode,
+ SKToolModeAnchored,
SKToolModeCircle,
SKToolModeSquare,
SKToolModeHighlight,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2025-11-07 18:05:39
|
Revision: 15769
http://sourceforge.net/p/skim-app/code/15769
Author: hofman
Date: 2025-11-07 18:05:38 +0000 (Fri, 07 Nov 2025)
Log Message:
-----------
no need to check whether note draws image when resizing
Modified Paths:
--------------
trunk/SKPDFView.m
Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m 2025-11-07 17:51:19 UTC (rev 15768)
+++ trunk/SKPDFView.m 2025-11-07 18:05:38 UTC (rev 15769)
@@ -4117,7 +4117,7 @@
if (shiftDown && ratio <= 0.0) {
if ([currentAnnotation isInk]) {
ratio = fmax(1.0, NSWidth(originalBounds) - 2.0 * margin) / fmax(1.0, NSHeight(originalBounds) - 2.0 * margin);
- } else if ([currentAnnotation isNote] && [(SKNPDFAnnotationNote *)currentAnnotation drawsImage] && [currentAnnotation image]) {
+ } else if ([currentAnnotation isNote] && [currentAnnotation image]) {
NSSize size = [[currentAnnotation image] size];
ratio = size.width / size.height;
} else {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2025-11-07 17:51:21
|
Revision: 15768
http://sourceforge.net/p/skim-app/code/15768
Author: hofman
Date: 2025-11-07 17:51:19 +0000 (Fri, 07 Nov 2025)
Log Message:
-----------
calculate size ratio for dragged note once
Modified Paths:
--------------
trunk/SKPDFView.m
Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m 2025-11-07 16:28:12 UTC (rev 15767)
+++ trunk/SKPDFView.m 2025-11-07 17:51:19 UTC (rev 15768)
@@ -1802,7 +1802,7 @@
if ((area & kPDFLinkArea))
[super mouseDown:theEvent];
else
- [self doDragContentWithEvent:theEvent];
+ [self doDragContentWithEvent:theEvent];
} else if (toolMode == SKToolModeSelect) {
[self setCurrentSelection:nil];
[self doSelectWithEvent:theEvent];
@@ -3883,7 +3883,7 @@
}
}
-- (void)dragAnnotationResizeHandle:(SKRectEdges)resizeHandle by:(NSPoint)relPoint originalBounds:(NSRect)originalBounds originalPaths:(NSArray *)originalPaths margin:(CGFloat)margin shiftDown:(BOOL)shiftDown {
+- (void)dragAnnotationResizeHandle:(SKRectEdges)resizeHandle by:(NSPoint)relPoint originalBounds:(NSRect)originalBounds originalPaths:(NSArray *)originalPaths margin:(CGFloat)margin sizeRatio:(CGFloat)ratio {
PDFPage *page = [currentAnnotation page];
NSRect newBounds = originalBounds;
NSRect pageBounds = [page boundsForBox:[self displayBox]];
@@ -3890,7 +3890,7 @@
CGFloat minSize = fmax(MIN_NOTE_SIZE, 2.0 * margin + 2.0);
BOOL isInk = [currentAnnotation isInk];
- if (shiftDown == NO) {
+ if (ratio <= 0.0) {
if ((resizeHandle & SKMaxXEdgeMask)) {
newBounds.size.width += relPoint.x;
@@ -3934,11 +3934,6 @@
CGFloat width = NSWidth(newBounds);
CGFloat height = NSHeight(newBounds);
CGFloat ds = 2.0 * margin;
- CGFloat ratio = isInk ? fmax(1.0, NSWidth(originalBounds) - ds) / fmax(1.0, NSHeight(originalBounds) - ds) : 1.0;
- if ([currentAnnotation isNote] && [(SKNPDFAnnotationNote *)currentAnnotation drawsImage] && [currentAnnotation image]) {
- NSSize size = [[currentAnnotation image] size];
- ratio = size.width / size.height;
- }
if ((resizeHandle & SKMaxXEdgeMask))
width = fmax(minSize, width + relPoint.x);
@@ -4007,7 +4002,7 @@
CGFloat sy = fmax(1.0, NSHeight(newBounds) - 2.0 * margin) / fmax(1.0, NSHeight(originalBounds) - 2.0 * margin);
[transform translateXBy:margin yBy:margin];
- if (shiftDown)
+ if (ratio > 0.0)
[transform scaleBy:fmin(sx, sy)];
else
[transform scaleXBy:sx yBy:sy];
@@ -4037,6 +4032,7 @@
NSPoint originalEndPoint = NSZeroPoint;
NSArray *originalPaths = nil;
CGFloat margin = 0.0;
+ CGFloat ratio = 0.0;
// Hit-test for resize box.
SKRectEdges resizeHandle = [currentAnnotation resizeHandleForPoint:initialPoint scaleFactor:[self scaleFactor]];
@@ -4118,7 +4114,17 @@
[self setCursorForAreaOfInterest:SKAreaOfInterestForResizeHandle(resizeHandle, page)];
}
}
- [self dragAnnotationResizeHandle:resizeHandle by:draggedPoint originalBounds:originalBounds originalPaths:originalPaths margin:margin shiftDown:shiftDown];
+ if (shiftDown && ratio <= 0.0) {
+ if ([currentAnnotation isInk]) {
+ ratio = fmax(1.0, NSWidth(originalBounds) - 2.0 * margin) / fmax(1.0, NSHeight(originalBounds) - 2.0 * margin);
+ } else if ([currentAnnotation isNote] && [(SKNPDFAnnotationNote *)currentAnnotation drawsImage] && [currentAnnotation image]) {
+ NSSize size = [[currentAnnotation image] size];
+ ratio = size.width / size.height;
+ } else {
+ ratio = 1.0;
+ }
+ }
+ [self dragAnnotationResizeHandle:resizeHandle by:draggedPoint originalBounds:originalBounds originalPaths:originalPaths margin:margin sizeRatio:shiftDown ? ratio : 0.0];
}
[[highlightLayerController layer] setNeedsDisplay];
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2025-11-07 16:28:15
|
Revision: 15767
http://sourceforge.net/p/skim-app/code/15767
Author: hofman
Date: 2025-11-07 16:28:12 +0000 (Fri, 07 Nov 2025)
Log Message:
-----------
rename event handler to reduce risk of overwriting one
Modified Paths:
--------------
trunk/PDFView_SKExtensions.h
trunk/PDFView_SKExtensions.m
trunk/SKPDFView.m
trunk/SKSecondaryPDFView.m
trunk/SKSnapshotPDFView.m
Modified: trunk/PDFView_SKExtensions.h
===================================================================
--- trunk/PDFView_SKExtensions.h 2025-11-06 10:34:21 UTC (rev 15766)
+++ trunk/PDFView_SKExtensions.h 2025-11-07 16:28:12 UTC (rev 15767)
@@ -62,7 +62,7 @@
- (void)removedAnnotation:(PDFAnnotation *)annotation onPage:(PDFPage *)page;
- (void)doPdfsyncWithEvent:(NSEvent *)theEvent;
-- (void)doDragWithEvent:(NSEvent *)theEvent;
+- (void)doDragContentWithEvent:(NSEvent *)theEvent;
- (BOOL)doDragTextWithEvent:(NSEvent *)theEvent;
- (PDFPage *)pageAndPoint:(NSPoint * _Nullable)point forEvent:(NSEvent *)event nearest:(BOOL)nearest;
Modified: trunk/PDFView_SKExtensions.m
===================================================================
--- trunk/PDFView_SKExtensions.m 2025-11-06 10:34:21 UTC (rev 15766)
+++ trunk/PDFView_SKExtensions.m 2025-11-07 16:28:12 UTC (rev 15767)
@@ -136,7 +136,7 @@
}
}
-- (void)doDragWithEvent:(NSEvent *)theEvent {
+- (void)doDragContentWithEvent:(NSEvent *)theEvent {
NSView *contentView = [[self scrollView] contentView];
NSPoint startLocation = [theEvent locationInView:contentView];
Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m 2025-11-06 10:34:21 UTC (rev 15766)
+++ trunk/SKPDFView.m 2025-11-07 16:28:12 UTC (rev 15767)
@@ -1767,7 +1767,7 @@
if (wantsLoupe)
[loupeController update];
} else if ((area & kPDFPageArea) == 0) {
- [self doDragWithEvent:theEvent];
+ [self doDragContentWithEvent:theEvent];
} else if (temporaryToolMode != SKToolModeNone && (modifiers & NSEventModifierFlagCommand) == 0) {
BOOL wantsLoupe = [loupeController hide];
BOOL delayTempToolMode = NO;
@@ -1802,7 +1802,7 @@
if ((area & kPDFLinkArea))
[super mouseDown:theEvent];
else
- [self doDragWithEvent:theEvent];
+ [self doDragContentWithEvent:theEvent];
} else if (toolMode == SKToolModeSelect) {
[self setCurrentSelection:nil];
[self doSelectWithEvent:theEvent];
@@ -1835,7 +1835,7 @@
}
} else if ((area & SKDragArea)) {
[self setCurrentAnnotation:nil];
- [self doDragWithEvent:theEvent];
+ [self doDragContentWithEvent:theEvent];
} else if ([self doDragTextWithEvent:theEvent] == NO) {
[self setCurrentAnnotation:nil];
[super mouseDown:theEvent];
Modified: trunk/SKSecondaryPDFView.m
===================================================================
--- trunk/SKSecondaryPDFView.m 2025-11-06 10:34:21 UTC (rev 15766)
+++ trunk/SKSecondaryPDFView.m 2025-11-07 16:28:12 UTC (rev 15767)
@@ -702,11 +702,11 @@
} else if ([self selectsText] == NO) {
- [self doDragWithEvent:theEvent];
+ [self doDragContentWithEvent:theEvent];
} else if (([self areaOfInterestForMouse:theEvent] & SKDragArea)) {
- [self doDragWithEvent:theEvent];
+ [self doDragContentWithEvent:theEvent];
} else if ([self doDragTextWithEvent:theEvent] == NO) {
Modified: trunk/SKSnapshotPDFView.m
===================================================================
--- trunk/SKSnapshotPDFView.m 2025-11-06 10:34:21 UTC (rev 15766)
+++ trunk/SKSnapshotPDFView.m 2025-11-07 16:28:12 UTC (rev 15767)
@@ -624,7 +624,7 @@
} else {
- [self doDragWithEvent:theEvent];
+ [self doDragContentWithEvent:theEvent];
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2025-11-06 10:34:23
|
Revision: 15766
http://sourceforge.net/p/skim-app/code/15766
Author: hofman
Date: 2025-11-06 10:34:21 +0000 (Thu, 06 Nov 2025)
Log Message:
-----------
default colors for label
Modified Paths:
--------------
trunk/Base.lproj/NoteTypeSheet.xib
Modified: trunk/Base.lproj/NoteTypeSheet.xib
===================================================================
--- trunk/Base.lproj/NoteTypeSheet.xib 2025-11-06 10:33:18 UTC (rev 15765)
+++ trunk/Base.lproj/NoteTypeSheet.xib 2025-11-06 10:34:21 UTC (rev 15766)
@@ -26,8 +26,8 @@
<rect key="frame" x="18" y="162" width="223" height="16"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Select notes and highlights to show:" id="35">
<font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="UVY-Ei-MpZ">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2025-11-06 10:33:19
|
Revision: 15765
http://sourceforge.net/p/skim-app/code/15765
Author: hofman
Date: 2025-11-06 10:33:18 +0000 (Thu, 06 Nov 2025)
Log Message:
-----------
fix auto layout in xib
Modified Paths:
--------------
trunk/Base.lproj/InfoWindow.xib
Modified: trunk/Base.lproj/InfoWindow.xib
===================================================================
--- trunk/Base.lproj/InfoWindow.xib 2025-11-04 17:58:48 UTC (rev 15764)
+++ trunk/Base.lproj/InfoWindow.xib 2025-11-06 10:33:18 UTC (rev 15765)
@@ -21,8 +21,8 @@
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
<rect key="contentRect" x="50" y="489" width="460" height="297"/>
<rect key="screenRect" x="0.0" y="0.0" width="1280" height="775"/>
- <view key="contentView" misplaced="YES" id="6">
- <rect key="frame" x="0.0" y="0.0" width="438" height="301"/>
+ <view key="contentView" id="6">
+ <rect key="frame" x="0.0" y="0.0" width="438" height="297"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<tabView controlSize="small" translatesAutoresizingMaskIntoConstraints="NO" id="91">
@@ -161,7 +161,7 @@
<rect key="frame" x="6" y="6" width="380" height="220"/>
<clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="0HB-s2-5Dm">
<rect key="frame" x="0.0" y="0.0" width="380" height="220"/>
- <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <autoresizingMask key="autoresizingMask"/>
<subviews>
<tableView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnReordering="NO" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" typeSelect="NO" rowHeight="20" viewBased="YES" id="235">
<rect key="frame" x="0.0" y="0.0" width="409" height="220"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2025-11-04 17:58:49
|
Revision: 15764
http://sourceforge.net/p/skim-app/code/15764
Author: hofman
Date: 2025-11-04 17:58:48 +0000 (Tue, 04 Nov 2025)
Log Message:
-----------
use default colors for created labels
Modified Paths:
--------------
trunk/SKStatusBar.m
trunk/SKThumbnailView.m
Modified: trunk/SKStatusBar.m
===================================================================
--- trunk/SKStatusBar.m 2025-11-04 17:54:49 UTC (rev 15763)
+++ trunk/SKStatusBar.m 2025-11-04 17:58:48 UTC (rev 15764)
@@ -85,6 +85,7 @@
[leftField setDrawsBackground:NO];
[leftField setEditable:NO];
[leftField setSelectable:NO];
+ [leftField setTextColor:[NSColor labelColor]];
[leftField setControlSize:NSControlSizeSmall];
[leftField setTranslatesAutoresizingMaskIntoConstraints:NO];
[self addSubview:leftField];
@@ -95,6 +96,7 @@
[rightField setDrawsBackground:NO];
[rightField setEditable:NO];
[rightField setSelectable:NO];
+ [rightField setTextColor:[NSColor labelColor]];
[rightField setControlSize:NSControlSizeSmall];
[rightField setTranslatesAutoresizingMaskIntoConstraints:NO];
[self addSubview:rightField];
Modified: trunk/SKThumbnailView.m
===================================================================
--- trunk/SKThumbnailView.m 2025-11-04 17:54:49 UTC (rev 15763)
+++ trunk/SKThumbnailView.m 2025-11-04 17:58:48 UTC (rev 15764)
@@ -92,6 +92,7 @@
[labelView setDrawsBackground:NO];
[labelView setEditable:NO];
[labelView setSelectable:NO];
+ [labelView setTextColor:[NSColor labelColor]];
[labelView setAlignment:NSTextAlignmentCenter];
[labelView setAutoresizingMask:NSViewWidthSizable | NSViewMaxYMargin];
rect = NSInsetRect(bounds, TEXT_MARGIN, TEXT_SPACE);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2025-11-04 17:54:52
|
Revision: 15763
http://sourceforge.net/p/skim-app/code/15763
Author: hofman
Date: 2025-11-04 17:54:49 +0000 (Tue, 04 Nov 2025)
Log Message:
-----------
use default colors for labels in tables
Modified Paths:
--------------
trunk/Base.lproj/BookmarksWindow.xib
trunk/Base.lproj/DownloadsWindow.xib
trunk/Base.lproj/InfoWindow.xib
trunk/Base.lproj/NoteWindow.xib
trunk/Base.lproj/TransitionSheet.xib
trunk/LeftSideView.xib
trunk/NotesDocument.xib
trunk/RightSideView.xib
Modified: trunk/Base.lproj/BookmarksWindow.xib
===================================================================
--- trunk/Base.lproj/BookmarksWindow.xib 2025-11-04 17:23:07 UTC (rev 15762)
+++ trunk/Base.lproj/BookmarksWindow.xib 2025-11-04 17:54:49 UTC (rev 15763)
@@ -81,7 +81,7 @@
<textFieldCell key="cell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" alignment="left" id="A8A-xh-ahK">
<font key="font" metaFont="cellTitle"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<connections>
<binding destination="m5H-UD-Vea" name="toolTip" keyPath="objectValue.label" id="hsM-ca-NCP"/>
@@ -146,7 +146,7 @@
<textFieldCell key="cell" lineBreakMode="truncatingHead" sendsActionOnEndEditing="YES" alignment="left" id="Q2g-rw-niA">
<font key="font" metaFont="cellTitle"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<connections>
<binding destination="jUR-pb-IBn" name="value" keyPath="objectValue.fileDescription" id="4C5-7g-4Um"/>
@@ -192,7 +192,7 @@
</numberFormatter>
<font key="font" metaFont="cellTitle"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<connections>
<binding destination="yAP-ry-sjs" name="editable" keyPath="objectValue.pageNumber" id="n4v-1N-V6H">
Modified: trunk/Base.lproj/DownloadsWindow.xib
===================================================================
--- trunk/Base.lproj/DownloadsWindow.xib 2025-11-04 17:23:07 UTC (rev 15762)
+++ trunk/Base.lproj/DownloadsWindow.xib 2025-11-04 17:54:49 UTC (rev 15763)
@@ -90,8 +90,8 @@
<rect key="frame" x="6" y="17" width="238" height="15"/>
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" id="XbQ-e9-yZ2">
<font key="font" metaFont="cellTitle"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<connections>
<binding destination="DJL-SM-8pU" name="value" keyPath="objectValue.fileName" id="7fh-3z-YgY"/>
@@ -101,8 +101,8 @@
<rect key="frame" x="6" y="2" width="238" height="13"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" id="ZFf-Fi-56G">
<font key="font" metaFont="system" size="10"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<connections>
<binding destination="DJL-SM-8pU" name="hidden" keyPath="objectValue.downloading" id="wl3-Jm-96W"/>
Modified: trunk/Base.lproj/InfoWindow.xib
===================================================================
--- trunk/Base.lproj/InfoWindow.xib 2025-11-04 17:23:07 UTC (rev 15762)
+++ trunk/Base.lproj/InfoWindow.xib 2025-11-04 17:54:49 UTC (rev 15763)
@@ -21,8 +21,8 @@
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
<rect key="contentRect" x="50" y="489" width="460" height="297"/>
<rect key="screenRect" x="0.0" y="0.0" width="1280" height="775"/>
- <view key="contentView" id="6">
- <rect key="frame" x="0.0" y="0.0" width="438" height="297"/>
+ <view key="contentView" misplaced="YES" id="6">
+ <rect key="frame" x="0.0" y="0.0" width="438" height="301"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<tabView controlSize="small" translatesAutoresizingMaskIntoConstraints="NO" id="91">
@@ -72,7 +72,7 @@
<rect key="frame" x="0.0" y="4" width="106" height="13"/>
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="right" id="dM9-pe-r2Q">
<font key="font" metaFont="system" size="10"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
@@ -107,7 +107,7 @@
<rect key="frame" x="0.0" y="3" width="277" height="14"/>
<textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" id="4XF-A1-aZs">
<font key="font" metaFont="smallSystem"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
@@ -161,7 +161,7 @@
<rect key="frame" x="6" y="6" width="380" height="220"/>
<clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="0HB-s2-5Dm">
<rect key="frame" x="0.0" y="0.0" width="380" height="220"/>
- <autoresizingMask key="autoresizingMask"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<tableView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnReordering="NO" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" typeSelect="NO" rowHeight="20" viewBased="YES" id="235">
<rect key="frame" x="0.0" y="0.0" width="409" height="220"/>
@@ -192,7 +192,7 @@
<rect key="frame" x="0.0" y="3" width="106" height="13"/>
<textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="right" id="pak-4y-Zbc">
<font key="font" metaFont="system" size="10"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
@@ -227,7 +227,7 @@
<rect key="frame" x="0.0" y="3" width="277" height="14"/>
<textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" id="db9-bA-mZN">
<font key="font" metaFont="smallSystem"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
Modified: trunk/Base.lproj/NoteWindow.xib
===================================================================
--- trunk/Base.lproj/NoteWindow.xib 2025-11-04 17:23:07 UTC (rev 15762)
+++ trunk/Base.lproj/NoteWindow.xib 2025-11-04 17:54:49 UTC (rev 15763)
@@ -92,8 +92,8 @@
<rect key="frame" x="8" y="29" width="34" height="16"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Icon:" id="242">
<font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<popUpButton verticalHuggingPriority="750" imageHugsTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="101">
Modified: trunk/Base.lproj/TransitionSheet.xib
===================================================================
--- trunk/Base.lproj/TransitionSheet.xib 2025-11-04 17:23:07 UTC (rev 15762)
+++ trunk/Base.lproj/TransitionSheet.xib 2025-11-04 17:54:49 UTC (rev 15763)
@@ -333,8 +333,8 @@
</tableHeaderCell>
<textFieldCell key="dataCell" controlSize="small" lineBreakMode="truncatingTail" alignment="left" id="282">
<font key="font" metaFont="message" size="11"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES"/>
<prototypeCellViews>
@@ -346,8 +346,8 @@
<rect key="frame" x="0.0" y="9" width="22" height="14"/>
<textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="left" id="KRm-gQ-Tj2">
<font key="font" metaFont="message" size="11"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<connections>
<binding destination="Ak4-gE-KVg" name="value" keyPath="objectValue.label" id="QOb-NM-lZB"/>
Modified: trunk/LeftSideView.xib
===================================================================
--- trunk/LeftSideView.xib 2025-11-04 17:23:07 UTC (rev 15762)
+++ trunk/LeftSideView.xib 2025-11-04 17:54:49 UTC (rev 15763)
@@ -165,7 +165,7 @@
</tableHeaderCell>
<textFieldCell key="dataCell" scrollable="YES" lineBreakMode="clipping" allowsUndo="NO" alignment="right" id="104">
<font key="font" metaFont="cellTitle"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
@@ -178,8 +178,8 @@
<rect key="frame" x="0.0" y="9" width="40" height="15"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" allowsUndo="NO" sendsActionOnEndEditing="YES" alignment="right" id="avZ-Yh-zVv">
<font key="font" metaFont="cellTitle"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<connections>
<binding destination="7fi-B8-Xao" name="value" keyPath="objectValue.label" id="KuG-zV-D6t"/>
@@ -243,8 +243,8 @@
</tableHeaderCell>
<textFieldCell key="dataCell" lineBreakMode="truncatingTail" allowsUndo="NO" alignment="left" id="122">
<font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
<prototypeCellViews>
@@ -256,8 +256,8 @@
<rect key="frame" x="0.0" y="2" width="132" height="16"/>
<textFieldCell key="cell" lineBreakMode="truncatingTail" allowsUndo="NO" sendsActionOnEndEditing="YES" alignment="left" id="dcT-gP-VNy">
<font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<connections>
<binding destination="E5O-BA-vGf" name="value" keyPath="objectValue.cleanedLabel" id="c7l-xI-mQd"/>
@@ -286,7 +286,7 @@
</tableHeaderCell>
<textFieldCell key="dataCell" scrollable="YES" lineBreakMode="clipping" allowsUndo="NO" alignment="right" id="123">
<font key="font" metaFont="cellTitle"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
@@ -299,8 +299,8 @@
<rect key="frame" x="0.0" y="2" width="40" height="16"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" allowsUndo="NO" sendsActionOnEndEditing="YES" alignment="right" id="Z6W-JS-ODs">
<font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<connections>
<binding destination="kqC-1o-aAK" name="value" keyPath="objectValue.pageLabel" id="TAg-77-vgU"/>
@@ -354,10 +354,10 @@
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
</tableHeaderCell>
- <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" id="114">
+ <textFieldCell key="dataCell" lineBreakMode="truncatingTail" alignment="left" id="114">
<font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
<prototypeCellViews>
@@ -369,8 +369,8 @@
<rect key="frame" x="0.0" y="1" width="47" height="16"/>
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="left" id="xYT-z2-Ika">
<font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<connections>
<binding destination="rTN-Wm-aea" name="value" keyPath="objectValue.safeFirstPage.displayLabel" id="okR-mF-avE"/>
@@ -393,10 +393,10 @@
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
</tableHeaderCell>
- <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" id="115">
+ <textFieldCell key="dataCell" lineBreakMode="truncatingTail" alignment="left" id="115">
<font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
<prototypeCellViews>
@@ -408,8 +408,8 @@
<rect key="frame" x="0.0" y="1" width="116" height="16"/>
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="left" id="t89-Nc-Fkj">
<font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<connections>
<binding destination="yHY-cQ-hrW" name="value" keyPath="objectValue.contextString" id="2WE-eS-hFe"/>
@@ -506,10 +506,10 @@
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
</tableHeaderCell>
- <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" id="131">
+ <textFieldCell key="dataCell" lineBreakMode="truncatingTail" alignment="left" id="131">
<font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<sortDescriptor key="sortDescriptorPrototype" selector="compare:" sortKey="pageIndex"/>
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
@@ -522,8 +522,8 @@
<rect key="frame" x="0.0" y="1" width="46" height="16"/>
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="left" id="MLb-Qs-lO5">
<font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<connections>
<binding destination="hdZ-O4-HlW" name="value" keyPath="objectValue.page.displayLabel" id="NEC-LX-DqZ"/>
Modified: trunk/NotesDocument.xib
===================================================================
--- trunk/NotesDocument.xib 2025-11-04 17:23:07 UTC (rev 15762)
+++ trunk/NotesDocument.xib 2025-11-04 17:54:49 UTC (rev 15763)
@@ -51,7 +51,7 @@
</tableHeaderCell>
<textFieldCell key="dataCell" alignment="left" id="80">
<font key="font" metaFont="cellTitle"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
@@ -68,8 +68,8 @@
<rect key="frame" x="-2" y="0.0" width="393" height="17"/>
<textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="left" id="d2Y-IV-bO4">
<font key="font" metaFont="cellTitle"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<connections>
<binding destination="6Wp-hg-AAV" name="value" keyPath="objectValue.objectValue" id="MsE-3O-Bb1"/>
@@ -170,8 +170,8 @@
</tableHeaderCell>
<textFieldCell key="dataCell" lineBreakMode="truncatingTail" alignment="left" id="97">
<font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
<prototypeCellViews>
@@ -183,8 +183,8 @@
<rect key="frame" x="-2" y="1" width="50" height="16"/>
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="left" id="hOk-U1-Iq2">
<font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<connections>
<binding destination="o1B-Qd-sFQ" name="value" keyPath="objectValue.page.displayLabel" id="m31-Yl-Mhh"/>
@@ -210,8 +210,8 @@
</tableHeaderCell>
<textFieldCell key="dataCell" lineBreakMode="truncatingTail" alignment="left" id="117">
<font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
<prototypeCellViews>
@@ -223,8 +223,8 @@
<rect key="frame" x="-2" y="1" width="4" height="16"/>
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="left" id="0q4-P3-T71">
<font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<connections>
<binding destination="14m-ak-Cob" name="value" keyPath="objectValue.userName" id="GYb-s7-RH3"/>
@@ -250,8 +250,8 @@
<textFieldCell key="dataCell" lineBreakMode="truncatingTail" alignment="left" id="119">
<dateFormatter key="formatter" dateStyle="short" id="120"/>
<font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
<prototypeCellViews>
@@ -264,8 +264,8 @@
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="left" id="Cc8-W5-0Sb">
<dateFormatter key="formatter" dateStyle="short" id="PeK-Z9-GQW"/>
<font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<connections>
<binding destination="amI-Vn-SmP" name="value" keyPath="objectValue.modificationDate" id="UOF-fe-eNc"/>
Modified: trunk/RightSideView.xib
===================================================================
--- trunk/RightSideView.xib 2025-11-04 17:23:07 UTC (rev 15762)
+++ trunk/RightSideView.xib 2025-11-04 17:54:49 UTC (rev 15763)
@@ -120,7 +120,7 @@
<textFieldCell key="cell" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" alignment="left" id="UPF-5H-Pgd">
<font key="font" metaFont="cellTitle"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<connections>
<binding destination="ZGN-Pg-55C" name="value" keyPath="objectValue.objectValue" id="Dhp-4I-hEo">
@@ -228,7 +228,7 @@
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
</tableHeaderCell>
- <textFieldCell key="dataCell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" alignment="left" id="37">
+ <textFieldCell key="dataCell" scrollable="YES" lineBreakMode="clipping" alignment="left" id="37">
<font key="font" metaFont="cellTitle"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -243,7 +243,7 @@
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" id="Abp-DN-Ahr">
<font key="font" metaFont="cellTitle"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<connections>
<binding destination="rnK-rN-FoS" name="value" keyPath="objectValue.page.displayLabel" id="dzi-bo-zsV"/>
@@ -269,7 +269,7 @@
<textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" id="66">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
<prototypeCellViews>
@@ -282,7 +282,7 @@
<textFieldCell key="cell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" alignment="left" id="xpD-hJ-5U5">
<font key="font" metaFont="cellTitle"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<connections>
<binding destination="I4N-kX-XRY" name="value" keyPath="objectValue.userName" id="NUe-EE-ODN">
@@ -313,7 +313,7 @@
<dateFormatter key="formatter" dateStyle="short" id="69"/>
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
<prototypeCellViews>
@@ -327,7 +327,7 @@
<dateFormatter key="formatter" dateStyle="short" id="Gub-Cr-3E8"/>
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<connections>
<binding destination="pRJ-Qg-L6f" name="value" keyPath="objectValue.modificationDate" id="iSA-fJ-8ja"/>
@@ -416,9 +416,9 @@
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
</tableHeaderCell>
- <textFieldCell key="dataCell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" alignment="right" id="17">
+ <textFieldCell key="dataCell" scrollable="YES" lineBreakMode="clipping" alignment="right" id="17">
<font key="font" metaFont="cellTitle"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
@@ -431,8 +431,8 @@
<rect key="frame" x="0.0" y="0.0" width="36" height="15"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" id="dwa-9x-zmD">
<font key="font" metaFont="cellTitle"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<connections>
<binding destination="EU8-lX-Lad" name="value" keyPath="objectValue.pageLabel" id="eEq-wq-iac"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2025-11-04 17:23:11
|
Revision: 15762
http://sourceforge.net/p/skim-app/code/15762
Author: hofman
Date: 2025-11-04 17:23:07 +0000 (Tue, 04 Nov 2025)
Log Message:
-----------
use default colors for labels
Modified Paths:
--------------
trunk/Base.lproj/BookmarkSheet.xib
trunk/Base.lproj/DisplayPreferences.xib
trunk/Base.lproj/DownloadPreferenceSheet.xib
trunk/Base.lproj/ExportAccessoryView.xib
trunk/Base.lproj/GeneralPreferences.xib
trunk/Base.lproj/LineInspector.xib
trunk/Base.lproj/NotesPreferences.xib
trunk/Base.lproj/PageSheet.xib
trunk/Base.lproj/PasswordSheet.xib
trunk/Base.lproj/ScaleSheet.xib
trunk/Base.lproj/SpeedSheet.xib
trunk/Base.lproj/SyncPreferences.xib
trunk/Base.lproj/TransitionSheet.xib
trunk/ConversionProgressWindow.xib
trunk/ProgressSheet.xib
Modified: trunk/Base.lproj/BookmarkSheet.xib
===================================================================
--- trunk/Base.lproj/BookmarkSheet.xib 2025-11-04 16:46:16 UTC (rev 15761)
+++ trunk/Base.lproj/BookmarkSheet.xib 2025-11-04 17:23:07 UTC (rev 15762)
@@ -31,8 +31,8 @@
<rect key="frame" x="21" y="79" width="69" height="16"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Bookmark:" id="27">
<font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<button autoresizesSubviews="NO" verticalHuggingPriority="750" tag="1" imageHugsTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="12">
@@ -95,8 +95,8 @@
<rect key="frame" x="42" y="51" width="48" height="16"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Add to:" id="32">
<font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
</subviews>
Modified: trunk/Base.lproj/DisplayPreferences.xib
===================================================================
--- trunk/Base.lproj/DisplayPreferences.xib 2025-11-04 16:46:16 UTC (rev 15761)
+++ trunk/Base.lproj/DisplayPreferences.xib 2025-11-04 17:23:07 UTC (rev 15762)
@@ -24,8 +24,8 @@
<rect key="frame" x="57" y="425" width="45" height="16"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Pages:" id="50">
<font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<slider toolTip="Set the size of the thumbnails" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3" userLabel="Pages Slider">
@@ -46,8 +46,8 @@
<rect key="frame" x="30" y="396" width="72" height="16"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Snapshots:" id="48">
<font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<slider toolTip="Set the size of the thumbnails" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="5" userLabel="Snapshots Slider">
@@ -64,8 +64,8 @@
<rect key="frame" x="18" y="454" width="106" height="16"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Thumbnail sizes:" id="45">
<font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="8">
@@ -90,8 +90,8 @@
<rect key="frame" x="30" y="264" width="113" height="16"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Image smoothing:" id="KLe-Zv-fHm">
<font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="12">
@@ -98,8 +98,8 @@
<rect key="frame" x="18" y="289" width="79" height="16"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="PDF display:" id="40">
<font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="13">
@@ -106,8 +106,8 @@
<rect key="frame" x="18" y="196" width="115" height="16"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Background color:" id="39">
<font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField horizontalHuggingPriority="253" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="14" userLabel="Normal:">
@@ -114,8 +114,8 @@
<rect key="frame" x="30" y="168" width="52" height="16"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Normal:" id="38">
<font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField horizontalHuggingPriority="253" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="15" userLabel="Full Screen:">
@@ -122,8 +122,8 @@
<rect key="frame" x="158" y="168" width="75" height="16"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Full Screen:" id="37">
<font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<colorWell toolTip="Color to use for the background of the PDF view in normal mode" translatesAutoresizingMaskIntoConstraints="NO" id="16" customClass="SKColorWell">
@@ -163,8 +163,8 @@
<rect key="frame" x="18" y="123" width="81" height="16"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Reading bar:" id="35">
<font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<colorWell toolTip="Color to use for the reading bar" translatesAutoresizingMaskIntoConstraints="NO" id="23" customClass="SKColorWell">
@@ -198,8 +198,8 @@
<rect key="frame" x="41" y="95" width="41" height="16"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Color:" id="33">
<font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="adG-Xp-L6g">
@@ -209,8 +209,8 @@
<rect key="frame" x="18" y="50" width="97" height="16"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Favorite colors:" id="ZsF-Ll-YPJ">
<font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="26">
@@ -223,8 +223,8 @@
<rect key="frame" x="18" y="354" width="96" height="16"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Table font size:" id="32">
<font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<comboBox toolTip="Font size to use for text tables" verticalHuggingPriority="750" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="29">
Modified: trunk/Base.lproj/DownloadPreferenceSheet.xib
===================================================================
--- trunk/Base.lproj/DownloadPreferenceSheet.xib 2025-11-04 16:46:16 UTC (rev 15761)
+++ trunk/Base.lproj/DownloadPreferenceSheet.xib 2025-11-04 17:23:07 UTC (rev 15762)
@@ -74,8 +74,8 @@
<rect key="frame" x="18" y="63" width="114" height="16"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Downloads folder:" id="31">
<font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<popUpButton verticalHuggingPriority="750" imageHugsTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="32">
Modified: trunk/Base.lproj/ExportAccessoryView.xib
===================================================================
--- trunk/Base.lproj/ExportAccessoryView.xib 2025-11-04 16:46:16 UTC (rev 15761)
+++ trunk/Base.lproj/ExportAccessoryView.xib 2025-11-04 17:23:07 UTC (rev 15762)
@@ -64,8 +64,8 @@
<rect key="frame" x="18" y="87" width="76" height="16"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="File Format:" id="11">
<font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Ie8-eu-nzt">
Modified: trunk/Base.lproj/GeneralPreferences.xib
===================================================================
--- trunk/Base.lproj/GeneralPreferences.xib 2025-11-04 16:46:16 UTC (rev 15761)
+++ trunk/Base.lproj/GeneralPreferences.xib 2025-11-04 17:23:07 UTC (rev 15762)
@@ -47,8 +47,8 @@
<rect key="frame" x="18" y="109" width="153" height="16"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Check for Skim updates:" id="47">
<font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="8">
@@ -122,8 +122,8 @@
<rect key="frame" x="18" y="249" width="152" height="16"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Initial PDF view settings:" id="35">
<font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField horizontalHuggingPriority="252" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="16" userLabel="Open files:">
@@ -130,8 +130,8 @@
<rect key="frame" x="18" y="345" width="70" height="16"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Open files:" id="34">
<font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<button toolTip="Reopen the last viewed snapshots when opening a file" horizontalHuggingPriority="252" verticalHuggingPriority="750" imageHugsTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="18">
@@ -151,8 +151,8 @@
<rect key="frame" x="18" y="23" width="178" height="16"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Save passwords in Keychain:" id="28">
<font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<button toolTip="Attach Skim notes that can be read by older versions of Skim, but are not preserved by iCloud" horizontalHuggingPriority="252" verticalHuggingPriority="750" imageHugsTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="YMN-MA-BZc">
@@ -205,8 +205,8 @@
<rect key="frame" x="18" y="217" width="152" height="16"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Settings for Full Screen:" id="rQz-G0-Jos">
<font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<popUpButton toolTip="Remember and reopen files from a previous run" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="lVN-xI-ijg">
@@ -230,8 +230,8 @@
<rect key="frame" x="18" y="415" width="204" height="16"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Reopen last open files at startup:" id="bXV-8Q-oZQ">
<font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="krj-lQ-Yls">
Modified: trunk/Base.lproj/LineInspector.xib
===================================================================
--- trunk/Base.lproj/LineInspector.xib 2025-11-04 16:46:16 UTC (rev 15761)
+++ trunk/Base.lproj/LineInspector.xib 2025-11-04 17:23:07 UTC (rev 15762)
@@ -29,8 +29,8 @@
<rect key="frame" x="20" y="121" width="64" height="14"/>
<textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Line Width:" id="78">
<font key="font" metaFont="smallSystem"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField toolTip="Dash pattern as numbers separated by space" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="8" userLabel="Dash Pattern Text Field">
@@ -112,8 +112,8 @@
</constraints>
<textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Dash Pattern:" id="85">
<font key="font" metaFont="smallSystem"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="17" userLabel="Start:">
@@ -120,8 +120,8 @@
<rect key="frame" x="50" y="38" width="34" height="14"/>
<textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Start:" id="86">
<font key="font" metaFont="smallSystem"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="18" userLabel="End:">
@@ -128,8 +128,8 @@
<rect key="frame" x="56" y="12" width="28" height="14"/>
<textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="End:" id="87">
<font key="font" metaFont="smallSystem"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="31">
@@ -136,8 +136,8 @@
<rect key="frame" x="8" y="146" width="124" height="14"/>
<textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Line and Border Style" id="88">
<font key="font" metaFont="smallSystemBold"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="32">
@@ -144,8 +144,8 @@
<rect key="frame" x="8" y="62" width="101" height="14"/>
<textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Line Ending Style" id="89">
<font key="font" metaFont="smallSystemBold"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="34">
Modified: trunk/Base.lproj/NotesPreferences.xib
===================================================================
--- trunk/Base.lproj/NotesPreferences.xib 2025-11-04 16:46:16 UTC (rev 15761)
+++ trunk/Base.lproj/NotesPreferences.xib 2025-11-04 17:23:07 UTC (rev 15762)
@@ -44,8 +44,8 @@
<rect key="frame" x="76" y="454" width="34" height="16"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Text:" id="65">
<font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<colorWell toolTip="Color to use for new anchored notes" translatesAutoresizingMaskIntoConstraints="NO" id="4" userLabel="Anchored Color Well">
@@ -65,8 +65,8 @@
<rect key="frame" x="43" y="422" width="67" height="16"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Anchored:" id="64">
<font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<colorWell toolTip="Color to use for new circle highlights" translatesAutoresizingMaskIntoConstraints="NO" id="6" userLabel="Circle Color Well">
@@ -86,8 +86,8 @@
<rect key="frame" x="233" y="454" width="43" height="16"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Circle:" id="63">
<font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<colorWell toolTip="Color to use for new box highlights" translatesAutoresizingMaskIntoConstraints="NO" id="8" userLabel="Box Color Well">
@@ -107,8 +107,8 @@
<rect key="frame" x="245" y="390" width="31" height="16"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Box:" id="62">
<font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<colorWell toolTip="Color to use for new highlights" translatesAutoresizingMaskIntoConstraints="NO" id="10" userLabel="Highlight Color Well">
@@ -128,8 +128,8 @@
<rect key="frame" x="358" y="454" width="63" height="16"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Highlight:" id="61">
<font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<colorWell toolTip="Color to use for new underlines" translatesAutoresizingMaskIntoConstraints="NO" id="12" userLabel="Underline Color Well">
@@ -149,8 +149,8 @@
<rect key="frame" x="354" y="422" width="67" height="16"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Underline:" id="60">
<font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<colorWell toolTip="Color to use for new strike-outs" translatesAutoresizingMaskIntoConstraints="NO" id="14" userLabel="Strike Out Color Well">
@@ -169,8 +169,8 @@
<rect key="frame" x="352" y="390" width="69" height="16"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Strike Out:" id="59">
<font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<colorWell toolTip="Color to use for new freehand notes" translatesAutoresizingMaskIntoConstraints="NO" id="16" userLabel="Freehand Color Well">
@@ -190,8 +190,8 @@
<rect key="frame" x="356" y="358" width="65" height="16"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Freehand:" id="58">
<font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="18">
@@ -198,8 +198,8 @@
<rect key="frame" x="18" y="482" width="78" height="16"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Note colors:" id="57">
<font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="19">
@@ -206,8 +206,8 @@
<rect key="frame" x="18" y="313" width="72" height="16"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Note fonts:" id="56">
<font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<box verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="20">
@@ -230,8 +230,8 @@
<rect key="frame" x="76" y="390" width="34" height="16"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Line:" id="55">
<font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<customView toolTip="Border styles to use for new text notes" translatesAutoresizingMaskIntoConstraints="NO" id="23" userLabel="Text Line Well" customClass="SKLineWell">
@@ -248,8 +248,8 @@
<rect key="frame" x="76" y="174" width="34" height="16"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Text:" id="54">
<font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<customView toolTip="Line styles to use for new lines" translatesAutoresizingMaskIntoConstraints="NO" id="25" userLabel="Line Line Well" customClass="SKLineWell">
@@ -263,8 +263,8 @@
<rect key="frame" x="76" y="126" width="34" height="16"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Line:" id="53">
<font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<customView toolTip="Line styles to use for new freehand notes" translatesAutoresizingMaskIntoConstraints="NO" id="27" userLabel="Freehand Line Well" customClass="SKLineWell">
@@ -278,8 +278,8 @@
<rect key="frame" x="45" y="78" width="65" height="16"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Freehand:" id="52">
<font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<customView toolTip="Line styles to use for new circle highlights" translatesAutoresizingMaskIntoConstraints="NO" id="29" customClass="SKLineWell">
@@ -293,8 +293,8 @@
<rect key="frame" x="283" y="174" width="43" height="16"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Circle:" id="51">
<font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<customView toolTip="Line styles to use for new box highlights" translatesAutoresizingMaskIntoConstraints="NO" id="31" userLabel="Box Line Well" customClass="SKLineWell">
@@ -307,8 +307,8 @@
<rect key="frame" x="295" y="126" width="31" height="16"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Box:" id="50">
<font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="33">
@@ -318,8 +318,8 @@
<rect key="frame" x="18" y="210" width="145" height="16"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Note lines and borders:" id="49">
<font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<colorWell toolTip="Color to use for the interior of new circle highlights" translatesAutoresizingMaskIntoConstraints="NO" id="35">
@@ -339,8 +339,8 @@
<rect key="frame" x="186" y="422" width="90" height="16"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Circle interior:" id="48">
<font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<colorWell toolTip="Color to use for the interior of new box highlights" translatesAutoresizingMaskIntoConstraints="NO" id="37" userLabel="Box Interior Color Well">
@@ -360,8 +360,8 @@
<rect key="frame" x="199" y="358" width="77" height="16"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Box interior:" id="47">
<font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<colorWell toolTip="Color to use for the interior of new lines" translatesAutoresizingMaskIntoConstraints="NO" id="262" userLabel="Line Interior Color Well">
@@ -381,8 +381,8 @@
<rect key="frame" x="30" y="358" width="80" height="16"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Line interior:" id="264">
<font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField horizontalHuggingPriority="252" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="39" userLabel="Text font label">
@@ -397,8 +397,8 @@
<rect key="frame" x="43" y="254" width="67" height="16"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Anchored:" id="45">
<font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<button toolTip="Font to use for new text notes" horizontalHuggingPriority="249" horizontalCompressionResistancePriority="250" imageHugsTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="41" customClass="SKFontWell">
Modified: trunk/Base.lproj/PageSheet.xib
===================================================================
--- trunk/Base.lproj/PageSheet.xib 2025-11-04 16:46:16 UTC (rev 15761)
+++ trunk/Base.lproj/PageSheet.xib 2025-11-04 17:23:07 UTC (rev 15762)
@@ -29,8 +29,8 @@
<rect key="frame" x="18" y="62" width="39" height="16"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Page:" id="49">
<font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<button verticalHuggingPriority="750" tag="1" imageHugsTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="41">
Modified: trunk/Base.lproj/PasswordSheet.xib
===================================================================
--- trunk/Base.lproj/PasswordSheet.xib 2025-11-04 16:46:16 UTC (rev 15761)
+++ trunk/Base.lproj/PasswordSheet.xib 2025-11-04 17:23:07 UTC (rev 15762)
@@ -31,8 +31,8 @@
<rect key="frame" x="18" y="63" width="66" height="16"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Password:" id="20">
<font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<button autoresizesSubviews="NO" verticalHuggingPriority="750" tag="1" imageHugsTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="11">
Modified: trunk/Base.lproj/ScaleSheet.xib
===================================================================
--- trunk/Base.lproj/ScaleSheet.xib 2025-11-04 16:46:16 UTC (rev 15761)
+++ trunk/Base.lproj/ScaleSheet.xib 2025-11-04 17:23:07 UTC (rev 15762)
@@ -29,8 +29,8 @@
<rect key="frame" x="18" y="63" width="41" height="16"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Scale:" id="20">
<font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<button autoresizesSubviews="NO" verticalHuggingPriority="750" tag="1" imageHugsTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="11">
Modified: trunk/Base.lproj/SpeedSheet.xib
===================================================================
--- trunk/Base.lproj/SpeedSheet.xib 2025-11-04 16:46:16 UTC (rev 15761)
+++ trunk/Base.lproj/SpeedSheet.xib 2025-11-04 17:23:07 UTC (rev 15762)
@@ -29,8 +29,8 @@
<rect key="frame" x="18" y="63" width="47" height="16"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Speed:" id="20">
<font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<button autoresizesSubviews="NO" verticalHuggingPriority="750" tag="1" imageHugsTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="11">
Modified: trunk/Base.lproj/SyncPreferences.xib
===================================================================
--- trunk/Base.lproj/SyncPreferences.xib 2025-11-04 16:46:16 UTC (rev 15761)
+++ trunk/Base.lproj/SyncPreferences.xib 2025-11-04 17:23:07 UTC (rev 15762)
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="16097.3" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="19529" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<deployment identifier="macosx"/>
- <development version="8000" identifier="xcode"/>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="16097.3"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="19529"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
@@ -16,10 +15,10 @@
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
<customView translatesAutoresizingMaskIntoConstraints="NO" id="1">
- <rect key="frame" x="0.0" y="0.0" width="428" height="226"/>
+ <rect key="frame" x="0.0" y="0.0" width="428" height="229"/>
<subviews>
<button toolTip="Select this to check for external file changes. Use at your own risk." horizontalHuggingPriority="252" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2">
- <rect key="frame" x="18" y="168" width="158" height="18"/>
+ <rect key="frame" x="18" y="170" width="162" height="18"/>
<buttonCell key="cell" type="check" title="Check for file changes" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="23">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
@@ -29,22 +28,22 @@
</connections>
</button>
<box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="3">
- <rect key="frame" x="12" y="135" width="404" height="5"/>
+ <rect key="frame" x="12" y="134" width="404" height="5"/>
</box>
<textField horizontalHuggingPriority="252" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="4" userLabel="Command:">
<rect key="frame" x="34" y="54" width="70" height="16"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Command:" id="22...
[truncated message content] |
|
From: <ho...@us...> - 2025-11-04 16:46:18
|
Revision: 15761
http://sourceforge.net/p/skim-app/code/15761
Author: hofman
Date: 2025-11-04 16:46:16 +0000 (Tue, 04 Nov 2025)
Log Message:
-----------
override drawInteriorWithFrame instead of drawWithFrame for level indicator
Modified Paths:
--------------
trunk/SKLevelIndicator.m
Modified: trunk/SKLevelIndicator.m
===================================================================
--- trunk/SKLevelIndicator.m 2025-11-04 15:35:22 UTC (rev 15760)
+++ trunk/SKLevelIndicator.m 2025-11-04 16:46:16 UTC (rev 15761)
@@ -55,14 +55,14 @@
@implementation SKLevelIndicatorCell
-#define EDGE_HEIGHT 4.0
+#define EDGE_HEIGHT 3.0
-- (void)drawWithFrame:(NSRect)cellFrame inView:(NSView *)controlView {
+- (void)drawInteriorWithFrame:(NSRect)cellFrame inView:(NSView *)controlView {
CGFloat cellHeight = [self cellSize].height;
if (fabs(NSHeight(cellFrame) - cellHeight) <= 0.0) {
[NSGraphicsContext saveGraphicsState];
[[NSBezierPath bezierPathWithRect:cellFrame] addClip];
- [super drawWithFrame:cellFrame inView:controlView];
+ [super drawInteriorWithFrame:cellFrame inView:controlView];
[NSGraphicsContext restoreGraphicsState];
} else if (NSHeight(cellFrame) <= 2.0 * (cellHeight - EDGE_HEIGHT)) {
NSRect topFrame, bottomFrame, frame = cellFrame;
@@ -70,12 +70,12 @@
frame.size.height = cellHeight;
[NSGraphicsContext saveGraphicsState];
[[NSBezierPath bezierPathWithRect:topFrame] addClip];
- [super drawWithFrame:frame inView:controlView];
+ [super drawInteriorWithFrame:frame inView:controlView];
[NSGraphicsContext restoreGraphicsState];
[NSGraphicsContext saveGraphicsState];
[[NSBezierPath bezierPathWithRect:bottomFrame] addClip];
frame.origin.y = NSMaxY(bottomFrame) - cellHeight;
- [super drawWithFrame:frame inView:controlView];
+ [super drawInteriorWithFrame:frame inView:controlView];
[NSGraphicsContext restoreGraphicsState];
} else {
NSRect topFrame, bottomFrame, restFrame, frame = cellFrame, midFrame;
@@ -84,7 +84,7 @@
frame.size.height = cellHeight;
[NSGraphicsContext saveGraphicsState];
[[NSBezierPath bezierPathWithRect:topFrame] addClip];
- [super drawWithFrame:frame inView:controlView];
+ [super drawInteriorWithFrame:frame inView:controlView];
[NSGraphicsContext restoreGraphicsState];
do {
NSDivideRect(restFrame, &midFrame, &restFrame, fmin(cellHeight - 2.0 * EDGE_HEIGHT, NSHeight(restFrame)), NSMinYEdge);
@@ -91,13 +91,13 @@
[NSGraphicsContext saveGraphicsState];
[[NSBezierPath bezierPathWithRect:midFrame] addClip];
frame.origin.y = NSMinY(midFrame) - EDGE_HEIGHT;
- [super drawWithFrame:frame inView:controlView];
+ [super drawInteriorWithFrame:frame inView:controlView];
[NSGraphicsContext restoreGraphicsState];
} while (NSHeight(restFrame) > 0.0);
frame.origin.y = NSMaxY(bottomFrame) - cellHeight;
[NSGraphicsContext saveGraphicsState];
[[NSBezierPath bezierPathWithRect:bottomFrame] addClip];
- [super drawWithFrame:frame inView:controlView];
+ [super drawInteriorWithFrame:frame inView:controlView];
[NSGraphicsContext restoreGraphicsState];
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2025-11-04 15:35:25
|
Revision: 15760
http://sourceforge.net/p/skim-app/code/15760
Author: hofman
Date: 2025-11-04 15:35:22 +0000 (Tue, 04 Nov 2025)
Log Message:
-----------
accessibility of control is implemented in the cell
Modified Paths:
--------------
trunk/SKFontWell.m
Modified: trunk/SKFontWell.m
===================================================================
--- trunk/SKFontWell.m 2025-11-04 10:32:46 UTC (rev 15759)
+++ trunk/SKFontWell.m 2025-11-04 15:35:22 UTC (rev 15760)
@@ -298,10 +298,6 @@
}
}
-- (NSString *)accessibilitySubrole {
- return @"AXFontWell";
-}
-
#pragma mark NSDraggingSource protocol
- (NSDragOperation)draggingSession:(NSDraggingSession *)session sourceOperationMaskForDraggingContext:(NSDraggingContext)context {
@@ -458,6 +454,10 @@
}
}
+- (NSString *)accessibilitySubrole {
+ return @"AXFontWell";
+}
+
- (NSString *)accessibilityRoleDescription {
return NSLocalizedString(@"font well", @"Accessibility description");
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2025-11-04 10:32:47
|
Revision: 15759
http://sourceforge.net/p/skim-app/code/15759
Author: hofman
Date: 2025-11-04 10:32:46 +0000 (Tue, 04 Nov 2025)
Log Message:
-----------
don't bother drawing discrete level indicator continuous, as we don't use that style
Modified Paths:
--------------
trunk/SKLevelIndicator.m
Modified: trunk/SKLevelIndicator.m
===================================================================
--- trunk/SKLevelIndicator.m 2025-11-04 10:16:59 UTC (rev 15758)
+++ trunk/SKLevelIndicator.m 2025-11-04 10:32:46 UTC (rev 15759)
@@ -58,9 +58,6 @@
#define EDGE_HEIGHT 4.0
- (void)drawWithFrame:(NSRect)cellFrame inView:(NSView *)controlView {
- BOOL drawDiscreteContinuous = ([self levelIndicatorStyle] == NSDiscreteCapacityLevelIndicatorStyle) && (NSWidth(cellFrame) + 1.0 < 3.0 * [self maxValue]);
- if (drawDiscreteContinuous)
- [self setLevelIndicatorStyle:NSContinuousCapacityLevelIndicatorStyle];
CGFloat cellHeight = [self cellSize].height;
if (fabs(NSHeight(cellFrame) - cellHeight) <= 0.0) {
[NSGraphicsContext saveGraphicsState];
@@ -103,8 +100,6 @@
[super drawWithFrame:frame inView:controlView];
[NSGraphicsContext restoreGraphicsState];
}
- if (drawDiscreteContinuous)
- [self setLevelIndicatorStyle:NSDiscreteCapacityLevelIndicatorStyle];
}
- (void)setBackgroundStyle:(NSBackgroundStyle)backgroundStyle {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ho...@us...> - 2025-11-04 10:17:02
|
Revision: 15758
http://sourceforge.net/p/skim-app/code/15758
Author: hofman
Date: 2025-11-04 10:16:59 +0000 (Tue, 04 Nov 2025)
Log Message:
-----------
use while loop instead of for loop, we don't use the index
Modified Paths:
--------------
trunk/SKColorMenuView.m
Modified: trunk/SKColorMenuView.m
===================================================================
--- trunk/SKColorMenuView.m 2025-11-04 10:01:47 UTC (rev 15757)
+++ trunk/SKColorMenuView.m 2025-11-04 10:16:59 UTC (rev 15758)
@@ -60,9 +60,9 @@
annotation = anAnnotation;
hoveredIndex = NSNotFound;
- NSUInteger i, iMax = [colors count];
+ NSInteger i = [colors count];
NSRect rect = NSMakeRect(MARGIN, 0.0, ITEM_SIZE, ITEM_SIZE);
- for (i = 0; i < iMax; i++) {
+ while (i-- > 0) {
NSTrackingArea *area = [[NSTrackingArea alloc] initWithRect:rect options:NSTrackingMouseEnteredAndExited | NSTrackingActiveInActiveApp owner:self userInfo:nil];
[self addTrackingArea:area];
rect.origin.x += OFFSET;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
2 messages has been excluded from this view by a project administrator.