Menu
▾
▴
[Skim-app-commit] SF.net SVN: skim-app:[15782] trunk
|
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] |