Revision: 14144
http://sourceforge.net/p/skim-app/code/14144
Author: hofman
Date: 2024-03-25 17:16:25 +0000 (Mon, 25 Mar 2024)
Log Message:
-----------
remove cclass factory methods, use init methods instead
Modified Paths:
--------------
trunk/NSMenu_SKExtensions.h
trunk/NSMenu_SKExtensions.m
trunk/SKMainToolbarController.m
trunk/SKScriptMenu.m
Modified: trunk/NSMenu_SKExtensions.h
===================================================================
--- trunk/NSMenu_SKExtensions.h 2024-03-25 09:48:45 UTC (rev 14143)
+++ trunk/NSMenu_SKExtensions.h 2024-03-25 17:16:25 UTC (rev 14144)
@@ -61,10 +61,6 @@
@interface NSMenuItem (SKExtensions)
-+ (NSMenuItem *)menuItemWithTitle:(NSString *)aString action:(SEL
_Nullable)aSelector target:(nullable id)aTarget;
-+ (NSMenuItem *)menuItemWithTitle:(NSString *)aString action:(SEL
_Nullable)aSelector target:(nullable id)aTarget tag:(NSInteger)aTag;
-+ (NSMenuItem *)menuItemWithSubmenuAndTitle:(NSString *)aString;
-
- (instancetype)initWithTitle:(NSString *)aString action:(SEL
_Nullable)aSelector target:(nullable id)aTarget;
- (instancetype)initWithTitle:(NSString *)aString action:(SEL
_Nullable)aSelector target:(nullable id)aTarget tag:(NSInteger)aTag;
- (instancetype)initWithTitle:(NSString *)aString imageNamed:(nullable
NSString *)anImageName action:(SEL _Nullable)aSelector target:(nullable
id)aTarget tag:(NSInteger)aTag;
Modified: trunk/NSMenu_SKExtensions.m
===================================================================
--- trunk/NSMenu_SKExtensions.m 2024-03-25 09:48:45 UTC (rev 14143)
+++ trunk/NSMenu_SKExtensions.m 2024-03-25 17:16:25 UTC (rev 14144)
@@ -91,18 +91,6 @@
@implementation NSMenuItem (SKExtensions)
-+ (NSMenuItem *)menuItemWithTitle:(NSString *)aString action:(SEL)aSelector
target:(id)aTarget {
- return [[NSMenuItem alloc] initWithTitle:aString action:aSelector
target:aTarget];
-}
-
-+ (NSMenuItem *)menuItemWithTitle:(NSString *)aString action:(SEL)aSelector
target:(id)aTarget tag:(NSInteger)aTag {
- return [[NSMenuItem alloc] initWithTitle:aString action:aSelector
target:aTarget tag:aTag];
-}
-
-+ (NSMenuItem *)menuItemWithSubmenuAndTitle:(NSString *)aString {
- return [[NSMenuItem alloc] initWithSubmenuAndTitle:aString];
-}
-
- (instancetype)initWithTitle:(NSString *)aString action:(SEL)aSelector
target:(id)aTarget {
return [self initWithTitle:aString imageNamed:nil action:aSelector
target:aTarget tag:0];
}
Modified: trunk/SKMainToolbarController.m
===================================================================
--- trunk/SKMainToolbarController.m 2024-03-25 09:48:45 UTC (rev 14143)
+++ trunk/SKMainToolbarController.m 2024-03-25 17:16:25 UTC (rev 14144)
@@ -185,7 +185,7 @@
if ([identifier
isEqualToString:SKDocumentToolbarPreviousNextItemIdentifier]) {
- menuItem = [NSMenuItem
menuItemWithSubmenuAndTitle:NSLocalizedString(@"Previous/Next", @"Toolbar item
label")];
+ menuItem = [[NSMenuItem alloc]
initWithSubmenuAndTitle:NSLocalizedString(@"Previous/Next", @"Toolbar item
label")];
menu = [menuItem submenu];
[menu addItemWithTitle:NSLocalizedString(@"Previous", @"Menu item
title") action:@selector(doGoToPreviousPage:) target:mainController];
[menu addItemWithTitle:NSLocalizedString(@"Next", @"Menu item
title") action:@selector(doGoToNextPage:) target:mainController];
@@ -200,7 +200,7 @@
} else if ([identifier
isEqualToString:SKDocumentToolbarPreviousItemIdentifier]) {
- menuItem = [NSMenuItem
menuItemWithSubmenuAndTitle:NSLocalizedString(@"Previous", @"Toolbar item
label")];
+ menuItem = [[NSMenuItem alloc]
initWithSubmenuAndTitle:NSLocalizedString(@"Previous", @"Toolbar item label")];
menu = [menuItem submenu];
[menu addItemWithTitle:NSLocalizedString(@"Previous", @"Menu item
title") action:@selector(doGoToPreviousPage:) target:mainController];
[menu addItemWithTitle:NSLocalizedString(@"First", @"Menu item
title") action:@selector(doGoToFirstPage:) target:mainController];
@@ -215,7 +215,7 @@
} else if ([identifier
isEqualToString:SKDocumentToolbarNextItemIdentifier]) {
- menuItem = [NSMenuItem
menuItemWithSubmenuAndTitle:NSLocalizedString(@"Next", @"Toolbar item label")];
+ menuItem = [[NSMenuItem alloc]
initWithSubmenuAndTitle:NSLocalizedString(@"Next", @"Toolbar item label")];
menu = [menuItem submenu];
[menu addItemWithTitle:NSLocalizedString(@"Next", @"Menu item
title") action:@selector(doGoToNextPage:) target:mainController];
[menu addItemWithTitle:NSLocalizedString(@"Last", @"Menu item
title") action:@selector(doGoToLastPage:) target:mainController];
@@ -230,7 +230,7 @@
} else if ([identifier
isEqualToString:SKDocumentToolbarPreviousNextFirstLastItemIdentifier]) {
- menuItem = [NSMenuItem
menuItemWithSubmenuAndTitle:NSLocalizedString(@"Previous/Next", @"Toolbar item
label")];
+ menuItem = [[NSMenuItem alloc]
initWithSubmenuAndTitle:NSLocalizedString(@"Previous/Next", @"Toolbar item
label")];
menu = [menuItem submenu];
[menu addItemWithTitle:NSLocalizedString(@"Previous", @"Menu item
title") action:@selector(doGoToPreviousPage:) target:mainController];
[menu addItemWithTitle:NSLocalizedString(@"Next", @"Menu item
title") action:@selector(doGoToNextPage:) target:mainController];
@@ -249,7 +249,7 @@
} else if ([identifier
isEqualToString:SKDocumentToolbarBackForwardItemIdentifier]) {
- menuItem = [NSMenuItem
menuItemWithSubmenuAndTitle:NSLocalizedString(@"Back/Forward", @"Toolbar item
label")];
+ menuItem = [[NSMenuItem alloc]
initWithSubmenuAndTitle:NSLocalizedString(@"Back/Forward", @"Toolbar item
label")];
menu = [menuItem submenu];
[menu addItemWithTitle:NSLocalizedString(@"Back", @"Menu item
title") action:@selector(doGoBack:) target:mainController];
[menu addItemWithTitle:NSLocalizedString(@"Forward", @"Menu item
title") action:@selector(doGoForward:) target:mainController];
@@ -264,7 +264,7 @@
} else if ([identifier
isEqualToString:SKDocumentToolbarPageNumberItemIdentifier]) {
- menuItem = [NSMenuItem
menuItemWithTitle:NSLocalizedString(@"Page", @"Menu item title")
action:@selector(doGoToPage:) target:mainController];
+ menuItem = [[NSMenuItem alloc]
initWithTitle:NSLocalizedString(@"Page", @"Menu item title")
action:@selector(doGoToPage:) target:mainController];
[item setLabels:NSLocalizedString(@"Page", @"Toolbar item label")];
[item setToolTip:NSLocalizedString(@"Go To Page", @"Tool tip
message")];
@@ -273,7 +273,7 @@
} else if ([identifier
isEqualToString:SKDocumentToolbarScaleItemIdentifier]) {
- menuItem = [NSMenuItem
menuItemWithTitle:NSLocalizedString(@"Scale", @"Menu item title")
action:@selector(chooseScale:) target:self];
+ menuItem = [[NSMenuItem alloc]
initWithTitle:NSLocalizedString(@"Scale", @"Menu item title")
action:@selector(chooseScale:) target:self];
[item setLabels:NSLocalizedString(@"Scale", @"Toolbar item
label")];
[item setToolTip:NSLocalizedString(@"Scale", @"Tool tip message")];
@@ -285,7 +285,7 @@
} else if ([identifier
isEqualToString:SKDocumentToolbarZoomActualItemIdentifier]) {
- menuItem = [NSMenuItem
menuItemWithTitle:NSLocalizedString(@"Actual Size", @"Menu item title")
action:@selector(zoomActualPhysical:) target:self];
+ menuItem = [[NSMenuItem alloc]
initWithTitle:NSLocalizedString(@"Actual Size", @"Menu item title")
action:@selector(zoomActualPhysical:) target:self];
[item setLabels:NSLocalizedString(@"Actual Size", @"Toolbar item
label")];
[item setToolTip:NSLocalizedString(@"Zoom To Actual Size", @"Tool
tip message")];
@@ -294,7 +294,7 @@
} else if ([identifier
isEqualToString:SKDocumentToolbarZoomToFitItemIdentifier]) {
- menuItem = [NSMenuItem menuItemWithTitle:NSLocalizedString(@"Zoom
To Fit", @"Menu item title") action:@selector(doZoomToFit:)
target:mainController];
+ menuItem = [[NSMenuItem alloc]
initWithTitle:NSLocalizedString(@"Zoom To Fit", @"Menu item title")
action:@selector(doZoomToFit:) target:mainController];
[item setLabels:NSLocalizedString(@"Zoom To Fit", @"Toolbar item
label")];
[item setToolTip:NSLocalizedString(@"Zoom To Fit", @"Tool tip
message")];
@@ -303,7 +303,7 @@
} else if ([identifier
isEqualToString:SKDocumentToolbarZoomToSelectionItemIdentifier]) {
- menuItem = [NSMenuItem menuItemWithTitle:NSLocalizedString(@"Zoom
To Selection", @"Menu item title") action:@selector(doZoomToSelection:)
target:mainController];
+ menuItem = [[NSMenuItem alloc]
initWithTitle:NSLocalizedString(@"Zoom To Selection", @"Menu item title")
action:@selector(doZoomToSelection:) target:mainController];
[item setLabels:NSLocalizedString(@"Zoom To Selection", @"Toolbar
item label")];
[item setToolTip:NSLocalizedString(@"Zoom To Selection", @"Tool
tip message")];
@@ -312,7 +312,7 @@
} else if ([identifier
isEqualToString:SKDocumentToolbarZoomInOutItemIdentifier]) {
- menuItem = [NSMenuItem
menuItemWithSubmenuAndTitle:NSLocalizedString(@"Zoom", @"Toolbar item label")];
+ menuItem = [[NSMenuItem alloc]
initWithSubmenuAndTitle:NSLocalizedString(@"Zoom", @"Toolbar item label")];
menu = [menuItem submenu];
[menu addItemWithTitle:NSLocalizedString(@"Zoom In", @"Menu item
title") action:@selector(doZoomIn:) target:mainController];
[menu addItemWithTitle:NSLocalizedString(@"Zoom Out", @"Menu item
title") action:@selector(doZoomOut:) target:mainController];
@@ -327,7 +327,7 @@
} else if ([identifier
isEqualToString:SKDocumentToolbarZoomInActualOutItemIdentifier]) {
- menuItem = [NSMenuItem
menuItemWithSubmenuAndTitle:NSLocalizedString(@"Zoom", @"Toolbar item label")];
+ menuItem = [[NSMenuItem alloc]
initWithSubmenuAndTitle:NSLocalizedString(@"Zoom", @"Toolbar item label")];
menu = [menuItem submenu];
[menu addItemWithTitle:NSLocalizedString(@"Zoom In", @"Menu item
title") action:@selector(doZoomIn:) target:mainController];
[menu addItemWithTitle:NSLocalizedString(@"Zoom Out", @"Menu item
title") action:@selector(doZoomOut:) target:mainController];
@@ -344,7 +344,7 @@
} else if ([identifier
isEqualToString:SKDocumentToolbarAutoScalesItemIdentifier]) {
- menuItem = [NSMenuItem
menuItemWithTitle:NSLocalizedString(@"Automatically Resize", @"Menu item
title") action:@selector(toggleAutoScale:) target:mainController];
+ menuItem = [[NSMenuItem alloc]
initWithTitle:NSLocalizedString(@"Automatically Resize", @"Menu item title")
action:@selector(toggleAutoScale:) target:mainController];
[item setLabels:NSLocalizedString(@"Automatically Resize",
@"Toolbar item label")];
[item setToolTip:NSLocalizedString(@"Automatically Resize", @"Tool
tip message")];
@@ -354,7 +354,7 @@
} else if ([identifier
isEqualToString:SKDocumentToolbarRotateRightItemIdentifier]) {
- menuItem = [NSMenuItem
menuItemWithTitle:NSLocalizedString(@"Rotate Right", @"Menu item title")
action:@selector(rotateAllRight:) target:mainController];
+ menuItem = [[NSMenuItem alloc]
initWithTitle:NSLocalizedString(@"Rotate Right", @"Menu item title")
action:@selector(rotateAllRight:) target:mainController];
[item setLabels:NSLocalizedString(@"Rotate Right", @"Toolbar item
label")];
[item setToolTip:NSLocalizedString(@"Rotate Right", @"Tool tip
message")];
@@ -363,7 +363,7 @@
} else if ([identifier
isEqualToString:SKDocumentToolbarRotateLeftItemIdentifier]) {
- menuItem = [NSMenuItem
menuItemWithTitle:NSLocalizedString(@"Rotate Left", @"Menu item title")
action:@selector(rotateAllLeft:) target:mainController];
+ menuItem = [[NSMenuItem alloc]
initWithTitle:NSLocalizedString(@"Rotate Left", @"Menu item title")
action:@selector(rotateAllLeft:) target:mainController];
[item setLabels:NSLocalizedString(@"Rotate Left", @"Toolbar item
label")];
[item setToolTip:NSLocalizedString(@"Rotate Left", @"Tool tip
message")];
@@ -372,7 +372,7 @@
} else if ([identifier
isEqualToString:SKDocumentToolbarRotateLeftRightItemIdentifier]) {
- menuItem = [NSMenuItem
menuItemWithSubmenuAndTitle:NSLocalizedString(@"Rotate", @"Toolbar item
label")];
+ menuItem = [[NSMenuItem alloc]
initWithSubmenuAndTitle:NSLocalizedString(@"Rotate", @"Toolbar item label")];
menu = [menuItem submenu];
[menu addItemWithTitle:NSLocalizedString(@"Rotate Right", @"Menu
item title") action:@selector(rotateAllRight:) target:mainController];
[menu addItemWithTitle:NSLocalizedString(@"Rotate Left", @"Menu
item title") action:@selector(rotateAllLeft:) target:mainController];
@@ -387,7 +387,7 @@
} else if ([identifier
isEqualToString:SKDocumentToolbarCropItemIdentifier]) {
- menuItem = [NSMenuItem
menuItemWithTitle:NSLocalizedString(@"Crop", @"Menu item title")
action:@selector(cropAll:) target:mainController];
+ menuItem = [[NSMenuItem alloc]
initWithTitle:NSLocalizedString(@"Crop", @"Menu item title")
action:@selector(cropAll:) target:mainController];
[item setLabels:NSLocalizedString(@"Crop", @"Toolbar item label")];
[item setToolTip:NSLocalizedString(@"Crop", @"Tool tip message")];
@@ -396,7 +396,7 @@
} else if ([identifier
isEqualToString:SKDocumentToolbarFullScreenItemIdentifier]) {
- menuItem = [NSMenuItem menuItemWithTitle:NSLocalizedString(@"Full
Screen", @"Menu item title") action:@selector(toggleFullscreen:) target:self];
+ menuItem = [[NSMenuItem alloc]
initWithTitle:NSLocalizedString(@"Full Screen", @"Menu item title")
action:@selector(toggleFullscreen:) target:self];
[item setLabels:NSLocalizedString(@"Full Screen", @"Toolbar item
label")];
[item setToolTip:NSLocalizedString(@"Full Screen", @"Tool tip
message")];
@@ -405,7 +405,7 @@
} else if ([identifier
isEqualToString:SKDocumentToolbarPresentationItemIdentifier]) {
- menuItem = [NSMenuItem
menuItemWithTitle:NSLocalizedString(@"Presentation", @"Menu item title")
action:@selector(togglePresentation:) target:self];
+ menuItem = [[NSMenuItem alloc]
initWithTitle:NSLocalizedString(@"Presentation", @"Menu item title")
action:@selector(togglePresentation:) target:self];
[item setLabels:NSLocalizedString(@"Presentation", @"Toolbar item
label")];
[item setToolTip:NSLocalizedString(@"Presentation", @"Tool tip
message")];
@@ -419,7 +419,7 @@
[menu addItemWithTitle:NSLocalizedString(@"Anchored Note", @"Menu
item title") imageNamed:SKImageNameToolbarAddAnchoredNote
action:@selector(createNewTextNote:) target:self tag:SKAnchoredNote];
[textNoteButton setMenu:menu forSegment:0];
- menuItem = [NSMenuItem
menuItemWithSubmenuAndTitle:NSLocalizedString(@"Add Note", @"Toolbar item
label")];
+ menuItem = [[NSMenuItem alloc]
initWithSubmenuAndTitle:NSLocalizedString(@"Add Note", @"Toolbar item label")];
menu = [menuItem submenu];
[menu addItemWithTitle:NSLocalizedString(@"Text Note", @"Menu item
title") imageNamed:SKImageNameToolbarAddTextNote
action:@selector(createNewNote:) target:mainController tag:SKFreeTextNote];
[menu addItemWithTitle:NSLocalizedString(@"Anchored Note", @"Menu
item title") imageNamed:SKImageNameToolbarAddAnchoredNote
action:@selector(createNewNote:) target:mainController tag:SKAnchoredNote];
@@ -436,7 +436,7 @@
[menu addItemWithTitle:NSLocalizedString(@"Box", @"Menu item
title") imageNamed:SKImageNameToolbarAddSquareNote
action:@selector(createNewCircleNote:) target:self tag:SKSquareNote];
[circleNoteButton setMenu:menu forSegment:0];
- menuItem = [NSMenuItem
menuItemWithSubmenuAndTitle:NSLocalizedString(@"Add Shape", @"Toolbar item
label")];
+ menuItem = [[NSMenuItem alloc]
initWithSubmenuAndTitle:NSLocalizedString(@"Add Shape", @"Toolbar item label")];
menu = [menuItem submenu];
[menu addItemWithTitle:NSLocalizedString(@"Circle", @"Menu item
title") imageNamed:SKImageNameToolbarAddCircleNote
action:@selector(createNewNote:) target:mainController tag:SKCircleNote];
[menu addItemWithTitle:NSLocalizedString(@"Box", @"Menu item
title") imageNamed:SKImageNameToolbarAddSquareNote
action:@selector(createNewNote:) target:mainController tag:SKSquareNote];
@@ -454,7 +454,7 @@
[menu addItemWithTitle:NSLocalizedString(@"Strike Out", @"Menu
item title") imageNamed:SKImageNameToolbarAddStrikeOutNote
action:@selector(createNewMarkupNote:) target:self tag:SKStrikeOutNote];
[markupNoteButton setMenu:menu forSegment:0];
- menuItem = [NSMenuItem
menuItemWithSubmenuAndTitle:NSLocalizedString(@"Add Markup", @"Toolbar item
label")];
+ menuItem = [[NSMenuItem alloc]
initWithSubmenuAndTitle:NSLocalizedString(@"Add Markup", @"Toolbar item
label")];
menu = [menuItem submenu];
[menu addItemWithTitle:NSLocalizedString(@"Highlight", @"Menu item
title") imageNamed:SKImageNameToolbarAddHighlightNote
action:@selector(createNewNote:) target:mainController tag:SKHighlightNote];
[menu addItemWithTitle:NSLocalizedString(@"Underline", @"Menu item
title") imageNamed:SKImageNameToolbarAddUnderlineNote
action:@selector(createNewNote:) target:mainController tag:SKUnderlineNote];
@@ -472,7 +472,7 @@
[menu addItemWithTitle:NSLocalizedString(@"Freehand", @"Menu item
title") imageNamed:SKImageNameToolbarAddInkNote
action:@selector(createNewLineNote:) target:self tag:SKInkNote];
[lineNoteButton setMenu:menu forSegment:0];
- menuItem = [NSMenuItem
menuItemWithSubmenuAndTitle:NSLocalizedString(@"Add Line", @"Toolbar item
label")];
+ menuItem = [[NSMenuItem alloc]
initWithSubmenuAndTitle:NSLocalizedString(@"Add Line", @"Toolbar item label")];
menu = [menuItem submenu];
[menu addItemWithTitle:NSLocalizedString(@"Line", @"Menu item
title") imageNamed:SKImageNameToolbarAddLineNote
action:@selector(createNewNote:) target:mainController tag:SKLineNote];
[menu addItemWithTitle:NSLocalizedString(@"Freehand", @"Menu item
title") imageNamed:SKImageNameToolbarAddInkNote
action:@selector(createNewNote:) target:mainController tag:SKInkNote];
@@ -484,7 +484,7 @@
} else if ([identifier
isEqualToString:SKDocumentToolbarNewNoteItemIdentifier]) {
- menuItem = [NSMenuItem
menuItemWithSubmenuAndTitle:NSLocalizedString(@"Add Note", @"Toolbar item
label")];
+ menuItem = [[NSMenuItem alloc]
initWithSubmenuAndTitle:NSLocalizedString(@"Add Note", @"Toolbar item label")];
menu = [menuItem submenu];
[menu addItemWithTitle:NSLocalizedString(@"Text Note", @"Menu item
title") imageNamed:SKImageNameToolbarAddTextNote
action:@selector(createNewNote:) target:mainController tag:SKFreeTextNote];
[menu addItemWithTitle:NSLocalizedString(@"Anchored Note", @"Menu
item title") imageNamed:SKImageNameToolbarAddAnchoredNote
action:@selector(createNewNote:) target:mainController tag:SKAnchoredNote];
@@ -525,7 +525,7 @@
[menu addItemWithTitle:NSLocalizedString(@"Freehand", @"Menu item
title") imageNamed:SKImageNameInkNote action:@selector(changeAnnotationMode:)
target:mainController tag:SKInkNote];
[toolModeButton setMenu:menu forSegment:SKNoteToolMode];
- menuItem = [NSMenuItem
menuItemWithSubmenuAndTitle:NSLocalizedString(@"Tool Mode", @"Toolbar item
label")];
+ menuItem = [[NSMenuItem alloc]
initWithSubmenuAndTitle:NSLocalizedString(@"Tool Mode", @"Toolbar item label")];
menu = [menuItem submenu];
[menu addItemWithTitle:NSLocalizedString(@"Text Tool", @"Menu item
title") action:@selector(changeToolMode:) target:mainController
tag:SKTextToolMode];
[menu addItemWithTitle:NSLocalizedString(@"Scroll Tool", @"Menu
item title") action:@selector(changeToolMode:) target:mainController
tag:SKMoveToolMode];
@@ -554,7 +554,7 @@
} else if ([identifier
isEqualToString:SKDocumentToolbarSingleTwoUpItemIdentifier]) {
- menuItem = [NSMenuItem
menuItemWithSubmenuAndTitle:NSLocalizedString(@"Single/Two Pages", @"Toolbar
item label")];
+ menuItem = [[NSMenuItem alloc]
initWithSubmenuAndTitle:NSLocalizedString(@"Single/Two Pages", @"Toolbar item
label")];
menu = [menuItem submenu];
[menu addItemWithTitle:NSLocalizedString(@"Single Page", @"Menu
item title") action:@selector(changeDisplaySinglePages:) target:mainController
tag:kPDFDisplaySinglePage];
[menu addItemWithTitle:NSLocalizedString(@"Two Pages", @"Menu item
title") action:@selector(changeDisplaySinglePages:) target:mainController
tag:kPDFDisplayTwoUp];
@@ -568,7 +568,7 @@
} else if ([identifier
isEqualToString:SKDocumentToolbarContinuousItemIdentifier]) {
- menuItem = [NSMenuItem
menuItemWithSubmenuAndTitle:NSLocalizedString(@"Continuous", @"Toolbar item
label")];
+ menuItem = [[NSMenuItem alloc]
initWithSubmenuAndTitle:NSLocalizedString(@"Continuous", @"Toolbar item
label")];
menu = [menuItem submenu];
[menu addItemWithTitle:NSLocalizedString(@"Non Continuous", @"Menu
item title") action:@selector(changeDisplayContinuous:) target:mainController
tag:kPDFDisplaySinglePage];
[menu addItemWithTitle:NSLocalizedString(@"Continuous", @"Menu
item title") action:@selector(changeDisplayContinuous:) target:mainController
tag:kPDFDisplaySinglePageContinuous];
@@ -582,7 +582,7 @@
} else if ([identifier
isEqualToString:SKDocumentToolbarDisplayModeItemIdentifier]) {
- menuItem = [NSMenuItem
menuItemWithSubmenuAndTitle:NSLocalizedString(@"Display Mode", @"Toolbar item
label")];
+ menuItem = [[NSMenuItem alloc]
initWithSubmenuAndTitle:NSLocalizedString(@"Display Mode", @"Toolbar item
label")];
menu = [menuItem submenu];
[menu addItemWithTitle:NSLocalizedString(@"Single Page", @"Menu
item title") action:@selector(changeDisplayMode:) target:mainController
tag:kPDFDisplaySinglePage];
[menu addItemWithTitle:NSLocalizedString(@"Single Page
Continuous", @"Menu item title") action:@selector(changeDisplayMode:)
target:mainController tag:kPDFDisplaySinglePageContinuous];
@@ -603,7 +603,7 @@
} else if ([identifier
isEqualToString:SKDocumentToolbarDisplayDirectionItemIdentifier]) {
- menuItem = [NSMenuItem
menuItemWithSubmenuAndTitle:NSLocalizedString(@"Direction", @"Toolbar item
label")];
+ menuItem = [[NSMenuItem alloc]
initWithSubmenuAndTitle:NSLocalizedString(@"Direction", @"Toolbar item label")];
menu = [menuItem submenu];
[menu addItemWithTitle:NSLocalizedString(@"Vertical", @"Menu item
title") action:@selector(changeDisplayDirection:) target:mainController tag:0];
[menu addItemWithTitle:NSLocalizedString(@"Horizontal", @"Menu
item title") action:@selector(changeDisplayDirection:) target:mainController
tag:1];
@@ -617,7 +617,7 @@
} else if ([identifier
isEqualToString:SKDocumentToolbarDisplayDirectionItemIdentifier]) {
- menuItem = [NSMenuItem
menuItemWithSubmenuAndTitle:NSLocalizedString(@"Direction", @"Toolbar item
label")];
+ menuItem = [[NSMenuItem alloc]
initWithSubmenuAndTitle:NSLocalizedString(@"Direction", @"Toolbar item label")];
menu = [menuItem submenu];
[menu addItemWithTitle:NSLocalizedString(@"Vertical", @"Menu
item title") action:@selector(changeDisplayDirection:) target:mainController
tag:0];
[menu addItemWithTitle:NSLocalizedString(@"Horizontal", @"Menu
item title") action:@selector(changeDisplayDirection:) target:mainController
tag:1];
@@ -631,7 +631,7 @@
} else if ([identifier
isEqualToString:SKDocumentToolbarDisplaysRTLItemIdentifier]) {
- menuItem = [NSMenuItem menuItemWithTitle:NSLocalizedString(@"Right
to Left", @"Menu item title") action:@selector(toggleDisplaysRTL:)
target:mainController];
+ menuItem = [[NSMenuItem alloc]
initWithTitle:NSLocalizedString(@"Right to Left", @"Menu item title")
action:@selector(toggleDisplaysRTL:) target:mainController];
[item setLabels:NSLocalizedString(@"Right to Left", @"Toolbar item
label")];
[item setToolTip:NSLocalizedString(@"Right to Left", @"Tool tip
message")];
@@ -640,7 +640,7 @@
} else if ([identifier
isEqualToString:SKDocumentToolbarBookModeItemIdentifier]) {
- menuItem = [NSMenuItem menuItemWithTitle:NSLocalizedString(@"Book
Mode", @"Menu item title") action:@selector(toggleDisplaysAsBook:)
target:mainController];
+ menuItem = [[NSMenuItem alloc]
initWithTitle:NSLocalizedString(@"Book Mode", @"Menu item title")
action:@selector(toggleDisplaysAsBook:) target:mainController];
[item setLabels:NSLocalizedString(@"Book Mode", @"Toolbar item
label")];
[item setToolTip:NSLocalizedString(@"Book Mode", @"Tool tip
message")];
@@ -649,7 +649,7 @@
} else if ([identifier
isEqualToString:SKDocumentToolbarPageBreaksItemIdentifier]) {
- menuItem = [NSMenuItem menuItemWithTitle:NSLocalizedString(@"Page
Breaks", @"Menu item title") action:@selector(toggleDisplayPageBreaks:)
target:mainController];
+ menuItem = [[NSMenuItem alloc]
initWithTitle:NSLocalizedString(@"Page Breaks", @"Menu item title")
action:@selector(toggleDisplayPageBreaks:) target:mainController];
[item setLabels:NSLocalizedString(@"Page Breaks", @"Toolbar item
label")];
[item setToolTip:NSLocalizedString(@"Page Breaks", @"Tool tip
message")];
@@ -658,7 +658,7 @@
} else if ([identifier
isEqualToString:SKDocumentToolbarDisplayBoxItemIdentifier]) {
- menuItem = [NSMenuItem
menuItemWithSubmenuAndTitle:NSLocalizedString(@"Display Box", @"Toolbar item
label")];
+ menuItem = [[NSMenuItem alloc]
initWithSubmenuAndTitle:NSLocalizedString(@"Display Box", @"Toolbar item
label")];
menu = [menuItem submenu];
[menu addItemWithTitle:NSLocalizedString(@"Media Box", @"Menu item
title") action:@selector(changeDisplayBox:) target:mainController
tag:kPDFDisplayBoxMediaBox];
[menu addItemWithTitle:NSLocalizedString(@"Crop Box", @"Menu item
title") action:@selector(changeDisplayBox:) target:mainController
tag:kPDFDisplayBoxCropBox];
@@ -679,7 +679,7 @@
[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(handleColorSwatchFrameChangedNotification:)
name:NSViewFrameDidChangeNotification object:colorSwatch];
- menuItem = [NSMenuItem
menuItemWithSubmenuAndTitle:NSLocalizedString(@"Favorite Colors", @"Toolbar
item label")];
+ menuItem = [[NSMenuItem alloc]
initWithSubmenuAndTitle:NSLocalizedString(@"Favorite Colors", @"Toolbar item
label")];
[item setLabels:NSLocalizedString(@"Favorite Colors", @"Toolbar
item label")];
[item setToolTip:NSLocalizedString(@"Favorite Colors", @"Tool tip
message")];
@@ -691,7 +691,7 @@
} else if ([identifier
isEqualToString:SKDocumentToolbarShareItemIdentifier]) {
shareMenuController = [[SKShareMenuController alloc]
initForDocument:[[self mainController] document]];
- menuItem = [NSMenuItem
menuItemWithSubmenuAndTitle:NSLocalizedString(@"Share", @"Toolbar item label")];
+ menuItem = [[NSMenuItem alloc]
initWithSubmenuAndTitle:NSLocalizedString(@"Share", @"Toolbar item label")];
menu = [menuItem submenu];
[menu setDelegate:shareMenuController];
@@ -724,7 +724,7 @@
frame.origin.y = ceil(NSMidY([pacerButton frame]) - 0.5 *
NSHeight([pacerSpeedStepper frame]));
[pacerSpeedStepper setFrame:frame];
- menuItem = [NSMenuItem
menuItemWithSubmenuAndTitle:NSLocalizedString(@"Pacer", @"Toolbar item label")];
+ menuItem = [[NSMenuItem alloc]
initWithSubmenuAndTitle:NSLocalizedString(@"Pacer", @"Toolbar item label")];
menu = [menuItem submenu];
[menu addItemWithTitle:NSLocalizedString(@"Start Pacer", @"Menu
item title") action:@selector(togglePacer:) target:mainController tag:0];
[menu addItemWithTitle:NSLocalizedString(@"Pacer Speed", @"Menu
item title") action:@selector(choosePacerSpeed:) target:self tag:0];
@@ -749,7 +749,7 @@
} else if ([identifier
isEqualToString:SKDocumentToolbarColorsItemIdentifier]) {
- menuItem = [NSMenuItem
menuItemWithTitle:NSLocalizedString(@"Colors", @"Menu item title")
action:@selector(orderFrontColorPanel:) target:nil];
+ menuItem = [[NSMenuItem alloc]
initWithTitle:NSLocalizedString(@"Colors", @"Menu item title")
action:@selector(orderFrontColorPanel:) target:nil];
[item setLabels:NSLocalizedString(@"Colors", @"Toolbar item
label")];
[item setToolTip:NSLocalizedString(@"Colors", @"Tool tip
message")];
@@ -758,7 +758,7 @@
} else if ([identifier
isEqualToString:SKDocumentToolbarFontsItemIdentifier]) {
- menuItem = [NSMenuItem
menuItemWithTitle:NSLocalizedString(@"Fonts", @"Menu item title")
action:@selector(orderFrontFontPanel:) target:nil];
+ menuItem = [[NSMenuItem alloc]
initWithTitle:NSLocalizedString(@"Fonts", @"Menu item title")
action:@selector(orderFrontFontPanel:) target:nil];
[item setLabels:NSLocalizedString(@"Fonts", @"Toolbar item
label")];
[item setToolTip:NSLocalizedString(@"Fonts", @"Tool tip message")];
@@ -767,7 +767,7 @@
} else if ([identifier
isEqualToString:SKDocumentToolbarLinesItemIdentifier]) {
- menuItem = [NSMenuItem
menuItemWithTitle:NSLocalizedString(@"Lines", @"Menu item title")
action:@selector(orderFrontLineInspector:) target:nil];
+ menuItem = [[NSMenuItem alloc]
initWithTitle:NSLocalizedString(@"Lines", @"Menu item title")
action:@selector(orderFrontLineInspector:) target:nil];
[item setLabels:NSLocalizedString(@"Lines", @"Toolbar item
label")];
[item setToolTip:NSLocalizedString(@"Lines", @"Tool tip message")];
@@ -776,7 +776,7 @@
} else if ([identifier
isEqualToString:SKDocumentToolbarInfoItemIdentifier]) {
- menuItem = [NSMenuItem
menuItemWithTitle:NSLocalizedString(@"Info", @"Menu item title")
action:@selector(getInfo:) target:mainController];
+ menuItem = [[NSMenuItem alloc]
initWithTitle:NSLocalizedString(@"Info", @"Menu item title")
action:@selector(getInfo:) target:mainController];
[item setLabels:NSLocalizedString(@"Info", @"Toolbar item label")];
[item setToolTip:NSLocalizedString(@"Get Document Info", @"Tool
tip message")];
@@ -785,7 +785,7 @@
} else if ([identifier
isEqualToString:SKDocumentToolbarContentsPaneItemIdentifier]) {
- menuItem = [NSMenuItem
menuItemWithTitle:NSLocalizedString(@"Contents Pane", @"Menu item title")
action:@selector(toggleLeftSidePane:) target:mainController];
+ menuItem = [[NSMenuItem alloc]
initWithTitle:NSLocalizedString(@"Contents Pane", @"Menu item title")
action:@selector(toggleLeftSidePane:) target:mainController];
[item setLabels:NSLocalizedString(@"Contents Pane", @"Toolbar item
label")];
[item setToolTip:NSLocalizedString(@"Toggle Contents Pane", @"Tool
tip message")];
@@ -794,7 +794,7 @@
} else if ([identifier
isEqualToString:SKDocumentToolbarNotesPaneItemIdentifier]) {
- menuItem = [NSMenuItem menuItemWithTitle:NSLocalizedString(@"Notes
Pane", @"Menu item title") action:@selector(toggleRightSidePane:)
target:mainController];
+ menuItem = [[NSMenuItem alloc]
initWithTitle:NSLocalizedString(@"Notes Pane", @"Menu item title")
action:@selector(toggleRightSidePane:) target:mainController];
[item setLabels:NSLocalizedString(@"Notes Pane", @"Toolbar item
label")];
[item setToolTip:NSLocalizedString(@"Toggle Notes Pane", @"Tool
tip message")];
@@ -803,7 +803,7 @@
} else if ([identifier
isEqualToString:SKDocumentToolbarSplitPDFItemIdentifier]) {
- menuItem = [NSMenuItem menuItemWithTitle:NSLocalizedString(@"Notes
Pane", @"Menu item title") action:@selector(toggleSplitPDF:)
target:mainController];
+ menuItem = [[NSMenuItem alloc]
initWithTitle:NSLocalizedString(@"Notes Pane", @"Menu item title")
action:@selector(toggleSplitPDF:) target:mainController];
[item setLabels:NSLocalizedString(@"Split PDF", @"Toolbar item
label")];
[item setToolTip:NSLocalizedString(@"Toggle Split PDF", @"Tool tip
message")];
@@ -812,7 +812,7 @@
} else if ([identifier
isEqualToString:SKDocumentToolbarPrintItemIdentifier]) {
- menuItem = [NSMenuItem
menuItemWithTitle:NSLocalizedString(@"Print", @"Menu item title")
action:@selector(printDocument:) target:nil];
+ menuItem = [[NSMenuItem alloc]
initWithTitle:NSLocalizedString(@"Print", @"Menu item title")
action:@selector(printDocument:) target:nil];
[item setLabels:NSLocalizedString(@"Print", @"Toolbar item
label")];
[item setToolTip:NSLocalizedString(@"Print Document", @"Tool tip
message")];
@@ -821,7 +821,7 @@
} else if ([identifier
isEqualToString:SKDocumentToolbarCustomizeItemIdentifier]) {
- menuItem = [NSMenuItem
menuItemWithTitle:NSLocalizedString(@"Customize", @"Menu item title")
action:@selector(runToolbarCustomizationPalette:) target:nil];
+ menuItem = [[NSMenuItem alloc]
initWithTitle:NSLocalizedString(@"Customize", @"Menu item title")
action:@selector(runToolbarCustomizationPalette:) target:nil];
[item setLabels:NSLocalizedString(@"Customize", @"Toolbar item
label")];
[item setToolTip:NSLocalizedString(@"Customize Toolbar", @"Tool
tip message")];
Modified: trunk/SKScriptMenu.m
===================================================================
--- trunk/SKScriptMenu.m 2024-03-25 09:48:45 UTC (rev 14143)
+++ trunk/SKScriptMenu.m 2024-03-25 17:16:25 UTC (rev 14144)
@@ -99,7 +99,7 @@
if (itemIndex > 0 && [folders count]) {
- NSMenuItem *menuItem = [NSMenuItem
menuItemWithSubmenuAndTitle:SCRIPTS_MENU_TITLE];
+ NSMenuItem *menuItem = [[NSMenuItem alloc]
initWithSubmenuAndTitle:SCRIPTS_MENU_TITLE];
[[NSImage imageNamed:@"ScriptMenu"] setTemplate:YES];
[menuItem setImage:[NSImage imageNamed:@"ScriptMenu"]];
[[NSApp mainMenu] insertItem:menuItem atIndex:itemIndex];
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
