Revision: 15108
http://sourceforge.net/p/skim-app/code/15108
Author: hofman
Date: 2025-04-10 08:57:35 +0000 (Thu, 10 Apr 2025)
Log Message:
-----------
Remove Customize toolbar item
Modified Paths:
--------------
trunk/MainToolbar.xib
trunk/NSImage_SKExtensions.h
trunk/NSImage_SKExtensions.m
trunk/SKMainToolbarController.h
trunk/SKMainToolbarController.m
trunk/de.lproj/Localizable.strings
trunk/en.lproj/Localizable.strings
trunk/es.lproj/Localizable.strings
trunk/fr.lproj/Localizable.strings
trunk/it.lproj/Localizable.strings
trunk/ja.lproj/Localizable.strings
trunk/nl.lproj/Localizable.strings
trunk/pl.lproj/Localizable.strings
trunk/ru.lproj/Localizable.strings
trunk/zh_CN.lproj/Localizable.strings
trunk/zh_TW.lproj/Localizable.strings
Modified: trunk/MainToolbar.xib
===================================================================
--- trunk/MainToolbar.xib 2025-04-09 15:39:20 UTC (rev 15107)
+++ trunk/MainToolbar.xib 2025-04-10 08:57:35 UTC (rev 15108)
@@ -16,7 +16,6 @@
<outlet property="colorsButton" destination="14" id="92"/>
<outlet property="continuousButton" destination="3" id="115"/>
<outlet property="cropButton" destination="22" id="108"/>
- <outlet property="customizeButton" destination="16" id="96"/>
<outlet property="displayBoxButton" destination="11" id="113"/>
<outlet property="displayDirectionButton"
destination="1gC-QY-jJv" id="mJs-fl-IFE"/>
<outlet property="displayModeButton" destination="4" id="116"/>
@@ -244,19 +243,6 @@
<action selector="printDocument:" target="-1"
id="124"/>
</connections>
</segmentedControl>
- <segmentedControl verticalHuggingPriority="750"
fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="16">
- <rect key="frame" x="206" y="129" width="29" height="25"/>
- <autoresizingMask key="autoresizingMask"/>
- <segmentedCell key="cell" borderStyle="border"
alignment="left" segmentDistribution="fill" style="texturedSquare"
trackingMode="momentary" id="63">
- <font key="font" metaFont="system"/>
- <segments>
- <segment image="ToolbarCustomize"
imageScaling="none" width="27"/>
- </segments>
- </segmentedCell>
- <connections>
- <action selector="runToolbarCustomizationPalette:"
target="-1" id="125"/>
- </connections>
- </segmentedControl>
<segmentedControl verticalHuggingPriority="750"
fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="17">
<rect key="frame" x="20" y="129" width="29" height="25"/>
<autoresizingMask key="autoresizingMask"/>
@@ -761,7 +747,6 @@
<image name="ToolbarColors" width="27" height="20"/>
<image name="ToolbarCrop" width="128" height="128"/>
<image name="ToolbarCropBox" width="128" height="128"/>
- <image name="ToolbarCustomize" width="27" height="19"/>
<image name="ToolbarFirstPage" width="128" height="128"/>
<image name="ToolbarFonts" width="27" height="20"/>
<image name="ToolbarForward" width="128" height="128"/>
Modified: trunk/NSImage_SKExtensions.h
===================================================================
--- trunk/NSImage_SKExtensions.h 2025-04-09 15:39:20 UTC (rev 15107)
+++ trunk/NSImage_SKExtensions.h 2025-04-10 08:57:35 UTC (rev 15108)
@@ -122,7 +122,6 @@
extern NSString *SKImageNameToolbarFonts;
extern NSString *SKImageNameToolbarLines;
extern NSString *SKImageNameToolbarPrint;
-extern NSString *SKImageNameToolbarCustomize;
extern NSString *SKImageNameTouchBarPageUp;
extern NSString *SKImageNameTouchBarPageDown;
Modified: trunk/NSImage_SKExtensions.m
===================================================================
--- trunk/NSImage_SKExtensions.m 2025-04-09 15:39:20 UTC (rev 15107)
+++ trunk/NSImage_SKExtensions.m 2025-04-10 08:57:35 UTC (rev 15108)
@@ -126,7 +126,6 @@
NSString *SKImageNameToolbarFonts = @"ToolbarFonts";
NSString *SKImageNameToolbarLines = @"ToolbarLines";
NSString *SKImageNameToolbarPrint = @"ToolbarPrint";
-NSString *SKImageNameToolbarCustomize = @"ToolbarCustomize";
NSString *SKImageNameTouchBarPageUp = @"TouchBarPageUp";
NSString *SKImageNameTouchBarPageDown = @"TouchBarPageDown";
@@ -955,14 +954,7 @@
[path fill];
);
- MAKE_IMAGE(SKImageNameToolbarCustomize, YES, 27.0, 20.0,
- [[NSColor blackColor] setFill];
- [NSBezierPath fillRect:NSMakeRect(4.0, 1.0, 19.0, 19.0)];
- NSImage *customizeImage = [[NSWorkspace sharedWorkspace]
iconForFileType:NSFileTypeForHFSTypeCode(kToolbarCustomizeIcon)];
- [customizeImage drawInRect:NSMakeRect(4.0, 1.0, 19.0, 19.0)
fromRect:NSZeroRect operation:NSCompositingOperationDestinationAtop
fraction:1.0];
- );
-
- MAKE_IMAGE(SKImageNameToolbarPrint, YES, 27.0, 20.0,
+ MAKE_IMAGE(SKImageNameToolbarPrint, YES, 27.0, 20.0,
NSImage *img = nil;
if (@available(macOS 11.0, *))
img = [NSImage imageWithSystemSymbolName:@"printer"
accessibilityDescription:nil];
Modified: trunk/SKMainToolbarController.h
===================================================================
--- trunk/SKMainToolbarController.h 2025-04-09 15:39:20 UTC (rev 15107)
+++ trunk/SKMainToolbarController.h 2025-04-10 08:57:35 UTC (rev 15108)
@@ -83,7 +83,6 @@
NSSegmentedControl *fontsButton;
NSSegmentedControl *linesButton;
NSSegmentedControl *printButton;
- NSSegmentedControl *customizeButton;
NSTextField *scaleField;
NSSegmentedControl *noteButton;
NSSegmentedControl *notesButton;
@@ -97,7 +96,7 @@
}
@property (nonatomic, nullable, weak) IBOutlet SKMainWindowController
*mainController;
-@property (nonatomic, nullable, strong) IBOutlet NSSegmentedControl
*backForwardButton, *previousNextPageButton, *previousPageButton,
*nextPageButton, *previousNextFirstLastPageButton, *zoomInOutButton,
*zoomInActualOutButton, *zoomActualButton, *zoomFitButton,
*zoomSelectionButton, *autoScalesButton, *rotateLeftButton, *rotateRightButton,
*rotateLeftRightButton, *cropButton, *fullScreenButton, *presentationButton,
*leftPaneButton, *rightPaneButton, *splitPDFButton, *toolModeButton,
*textNoteButton, *circleNoteButton, *markupNoteButton, *lineNoteButton,
*singleTwoUpButton, *continuousButton, *displayModeButton,
*displayDirectionButton, *displaysRTLButton, *bookModeButton,
*pageBreaksButton, *displayBoxButton, *infoButton, *colorsButton, *fontsButton,
*linesButton, *printButton, *customizeButton, *noteButton, *notesButton,
*pacerButton, *shareButton;
+@property (nonatomic, nullable, strong) IBOutlet NSSegmentedControl
*backForwardButton, *previousNextPageButton, *previousPageButton,
*nextPageButton, *previousNextFirstLastPageButton, *zoomInOutButton,
*zoomInActualOutButton, *zoomActualButton, *zoomFitButton,
*zoomSelectionButton, *autoScalesButton, *rotateLeftButton, *rotateRightButton,
*rotateLeftRightButton, *cropButton, *fullScreenButton, *presentationButton,
*leftPaneButton, *rightPaneButton, *splitPDFButton, *toolModeButton,
*textNoteButton, *circleNoteButton, *markupNoteButton, *lineNoteButton,
*singleTwoUpButton, *continuousButton, *displayModeButton,
*displayDirectionButton, *displaysRTLButton, *bookModeButton,
*pageBreaksButton, *displayBoxButton, *infoButton, *colorsButton, *fontsButton,
*linesButton, *printButton, *noteButton, *notesButton, *pacerButton,
*shareButton;
@property (nonatomic, nullable, strong) IBOutlet NSTextField *pageNumberField,
*scaleField, *pacerSpeedField;
@property (nonatomic, nullable, strong) IBOutlet SKColorSwatch *colorSwatch;
@property (nonatomic, nullable, strong) IBOutlet NSStepper *pacerSpeedStepper;
Modified: trunk/SKMainToolbarController.m
===================================================================
--- trunk/SKMainToolbarController.m 2025-04-09 15:39:20 UTC (rev 15107)
+++ trunk/SKMainToolbarController.m 2025-04-10 08:57:35 UTC (rev 15108)
@@ -115,7 +115,6 @@
#define SKDocumentToolbarNotesPaneItemIdentifier
@"SKDocumentToolbarNotesPaneItemIdentifier"
#define SKDocumentToolbarSplitPDFItemIdentifier
@"SKDocumentToolbarSplitPDFItemIdentifier"
#define SKDocumentToolbarPrintItemIdentifier
@"SKDocumentToolbarPrintItemIdentifier"
-#define SKDocumentToolbarCustomizeItemIdentifier
@"SKDocumentToolbarCustomizeItemIdentifier"
static NSString *noteToolImageNames[] = {@"ToolbarTextNoteMenu",
@"ToolbarAnchoredNoteMenu", @"ToolbarCircleNoteMenu", @"ToolbarSquareNoteMenu",
@"ToolbarHighlightNoteMenu", @"ToolbarUnderlineNoteMenu",
@"ToolbarStrikeOutNoteMenu", @"ToolbarLineNoteMenu", @"ToolbarInkNoteMenu"};
@@ -135,7 +134,7 @@
@implementation SKMainToolbarController
-@synthesize mainController, backForwardButton, pageNumberField,
previousNextPageButton, previousPageButton, nextPageButton,
previousNextFirstLastPageButton, zoomInOutButton, zoomInActualOutButton,
zoomActualButton, zoomFitButton, zoomSelectionButton, autoScalesButton,
rotateLeftButton, rotateRightButton, rotateLeftRightButton, cropButton,
fullScreenButton, presentationButton, leftPaneButton, rightPaneButton,
splitPDFButton, toolModeButton, textNoteButton, circleNoteButton,
markupNoteButton, lineNoteButton, singleTwoUpButton, continuousButton,
displayModeButton, displayDirectionButton, displaysRTLButton, bookModeButton,
pageBreaksButton, displayBoxButton, infoButton, colorsButton, fontsButton,
linesButton, printButton, customizeButton, scaleField, noteButton, notesButton,
colorSwatch, pacerButton, pacerSpeedField, pacerSpeedStepper, shareButton;
+@synthesize mainController, backForwardButton, pageNumberField,
previousNextPageButton, previousPageButton, nextPageButton,
previousNextFirstLastPageButton, zoomInOutButton, zoomInActualOutButton,
zoomActualButton, zoomFitButton, zoomSelectionButton, autoScalesButton,
rotateLeftButton, rotateRightButton, rotateLeftRightButton, cropButton,
fullScreenButton, presentationButton, leftPaneButton, rightPaneButton,
splitPDFButton, toolModeButton, textNoteButton, circleNoteButton,
markupNoteButton, lineNoteButton, singleTwoUpButton, continuousButton,
displayModeButton, displayDirectionButton, displaysRTLButton, bookModeButton,
pageBreaksButton, displayBoxButton, infoButton, colorsButton, fontsButton,
linesButton, printButton, scaleField, noteButton, notesButton, colorSwatch,
pacerButton, pacerSpeedField, pacerSpeedStepper, shareButton;
- (void)dealloc {
@try { [[NSUserDefaults standardUserDefaults] removeObserver:self
forKeyPath:SKSwatchColorsKey context:&SKDefaultsObservationContext]; }
@@ -863,15 +862,6 @@
[item setView:printButton];
[item setMenuFormRepresentation:menuItem];
- } else if ([identifier
isEqualToString:SKDocumentToolbarCustomizeItemIdentifier]) {
-
- 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")];
- [item setView:customizeButton];
- [item setMenuFormRepresentation:menuItem];
-
}
}
@@ -954,8 +944,7 @@
SKDocumentToolbarPrintItemIdentifier,
NSToolbarFlexibleSpaceItemIdentifier,
NSToolbarSpaceItemIdentifier,
- NSToolbarSeparatorItemIdentifier,
- SKDocumentToolbarCustomizeItemIdentifier];
+ NSToolbarSeparatorItemIdentifier];
}
- (BOOL)validateToolbarItem:(NSToolbarItem *)toolbarItem {
Modified: trunk/de.lproj/Localizable.strings
===================================================================
(Binary files differ)
Modified: trunk/en.lproj/Localizable.strings
===================================================================
(Binary files differ)
Modified: trunk/es.lproj/Localizable.strings
===================================================================
(Binary files differ)
Modified: trunk/fr.lproj/Localizable.strings
===================================================================
(Binary files differ)
Modified: trunk/it.lproj/Localizable.strings
===================================================================
(Binary files differ)
Modified: trunk/ja.lproj/Localizable.strings
===================================================================
(Binary files differ)
Modified: trunk/nl.lproj/Localizable.strings
===================================================================
(Binary files differ)
Modified: trunk/pl.lproj/Localizable.strings
===================================================================
(Binary files differ)
Modified: trunk/ru.lproj/Localizable.strings
===================================================================
(Binary files differ)
Modified: trunk/zh_CN.lproj/Localizable.strings
===================================================================
(Binary files differ)
Modified: trunk/zh_TW.lproj/Localizable.strings
===================================================================
(Binary files differ)
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
