Revision: 9433
http://sourceforge.net/p/skim-app/code/9433
Author: hofman
Date: 2017-10-21 14:36:24 +0000 (Sat, 21 Oct 2017)
Log Message:
-----------
Avoid warnings when using 10.13 SDK. Also change some method names to avoid
clashes with new methods, and provide some methods only when not implemented.
Explicitly silence partial availability warnings.
Modified Paths:
--------------
trunk/Configurations/Skim-Common.xcconfig
trunk/NSSegmentedControl_SKExtensions.h
trunk/NSSegmentedControl_SKExtensions.m
trunk/SKCompatibility.h
trunk/SKLeftSideViewController.m
trunk/SKLineInspector.m
trunk/SKMainToolbarController.m
trunk/SKMainWindowController.h
trunk/SKMainWindowController.m
trunk/SKPDFDocument.h
trunk/SKPDFDocument.m
trunk/SKPDFView.m
trunk/SKRightSideViewController.m
trunk/SKStatusBar.m
trunk/SkimImporter/GetMetadataForFile.m
Modified: trunk/Configurations/Skim-Common.xcconfig
===================================================================
--- trunk/Configurations/Skim-Common.xcconfig 2017-10-21 13:43:12 UTC (rev
9432)
+++ trunk/Configurations/Skim-Common.xcconfig 2017-10-21 14:36:24 UTC (rev
9433)
@@ -27,5 +27,6 @@
GCC_WARN_SIGN_COMPARE = YES
GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES
GCC_WARN_UNUSED_VARIABLE = YES
+CLANG_WARN_UNGUARDED_AVAILABILITY = NO
WARNING_CFLAGS = -Wfloat-equal
Modified: trunk/NSSegmentedControl_SKExtensions.h
===================================================================
--- trunk/NSSegmentedControl_SKExtensions.h 2017-10-21 13:43:12 UTC (rev
9432)
+++ trunk/NSSegmentedControl_SKExtensions.h 2017-10-21 14:36:24 UTC (rev
9433)
@@ -39,12 +39,19 @@
#import <Cocoa/Cocoa.h>
+#if !defined(MAC_OS_X_VERSION_10_13) || MAC_OS_X_VERSION_MAX_ALLOWED <
MAC_OS_X_VERSION_10_13
+
+@interface NSSegmentedControl (SKHighSierraDeclarations)
+- (NSInteger)tagForSegment:(NSInteger)segment;
+- (void)setTag:(NSInteger)tag forSegment:(NSInteger)segment;
+@end
+
+#endif
+
@interface NSSegmentedControl (SKExtensions)
- (NSInteger)selectedTag;
- (void)setEnabledForAllSegments:(BOOL)enabled;
-- (void)setToolTip:(NSString *)toolTip forSegment:(NSInteger)segment;
-- (NSInteger)tagForSegment:(NSInteger)segment;
-- (void)setTag:(NSInteger)tag forSegment:(NSInteger)segment;
+- (void)setHelp:(NSString *)toolTip forSegment:(NSInteger)segment;
@end
Modified: trunk/NSSegmentedControl_SKExtensions.m
===================================================================
--- trunk/NSSegmentedControl_SKExtensions.m 2017-10-21 13:43:12 UTC (rev
9432)
+++ trunk/NSSegmentedControl_SKExtensions.m 2017-10-21 14:36:24 UTC (rev
9433)
@@ -37,10 +37,24 @@
*/
#import "NSSegmentedControl_SKExtensions.h"
+#import "SKRuntime.h"
@implementation NSSegmentedControl (SKExtensions)
+- (NSInteger)Sierra_tagForSegment:(NSInteger)segment {
+ return [[self cell] tagForSegment:segment];
+}
+
+- (void)Sierra_setTag:(NSInteger)tag forSegment:(NSInteger)segment {
+ [[self cell] setTag:tag forSegment:segment];
+}
+
++ (void)load {
+ SKAddInstanceMethodImplementationFromSelector(self,
@selector(tagForSegment:), @selector(Sierra_tagForSegment:));
+ SKAddInstanceMethodImplementationFromSelector(self,
@selector(setTag:forSegment:), @selector(Sierra_setTag:forSegment:));
+}
+
- (NSInteger)selectedTag {
return [[self cell] tagForSegment:[self selectedSegment]];
}
@@ -51,18 +65,10 @@
[self setEnabled:enabled forSegment:i];
}
-- (void)setToolTip:(NSString *)toolTip forSegment:(NSInteger)segment {
+- (void)setHelp:(NSString *)toolTip forSegment:(NSInteger)segment {
[[self cell] setToolTip:toolTip forSegment:segment];
NSArray *accessibilitySegments = [NSAccessibilityUnignoredDescendant(self)
accessibilityAttributeValue:NSAccessibilityChildrenAttribute];
[[accessibilitySegments objectAtIndex:segment]
accessibilitySetOverrideValue:toolTip
forAttribute:NSAccessibilityDescriptionAttribute];
}
-- (NSInteger)tagForSegment:(NSInteger)segment {
- return [[self cell] tagForSegment:segment];
-}
-
-- (void)setTag:(NSInteger)tag forSegment:(NSInteger)segment {
- [[self cell] setTag:tag forSegment:segment];
-}
-
@end
Modified: trunk/SKCompatibility.h
===================================================================
--- trunk/SKCompatibility.h 2017-10-21 13:43:12 UTC (rev 9432)
+++ trunk/SKCompatibility.h 2017-10-21 14:36:24 UTC (rev 9433)
@@ -150,5 +150,6 @@
@end
@protocol PDFViewDelegate <NSObject> @end
+@protocol PDFDocumentDelegate <NSObject> @end
#endif
Modified: trunk/SKLeftSideViewController.m
===================================================================
--- trunk/SKLeftSideViewController.m 2017-10-21 13:43:12 UTC (rev 9432)
+++ trunk/SKLeftSideViewController.m 2017-10-21 14:36:24 UTC (rev 9433)
@@ -84,10 +84,10 @@
- (void)loadView {
[super loadView];
- [button setToolTip:NSLocalizedString(@"View Thumbnails", @"Tool tip
message") forSegment:SKThumbnailSidePaneState];
- [button setToolTip:NSLocalizedString(@"View Table of Contents", @"Tool tip
message") forSegment:SKOutlineSidePaneState];
- [alternateButton setToolTip:NSLocalizedString(@"Separate search results",
@"Tool tip message") forSegment:SKSingularFindPaneState];
- [alternateButton setToolTip:NSLocalizedString(@"Group search results by
page", @"Tool tip message") forSegment:SKGroupedFindPaneState];
+ [button setHelp:NSLocalizedString(@"View Thumbnails", @"Tool tip message")
forSegment:SKThumbnailSidePaneState];
+ [button setHelp:NSLocalizedString(@"View Table of Contents", @"Tool tip
message") forSegment:SKOutlineSidePaneState];
+ [alternateButton setHelp:NSLocalizedString(@"Separate search results",
@"Tool tip message") forSegment:SKSingularFindPaneState];
+ [alternateButton setHelp:NSLocalizedString(@"Group search results by
page", @"Tool tip message") forSegment:SKGroupedFindPaneState];
NSMenu *menu = [NSMenu menu];
[menu addItemWithTitle:NSLocalizedString(@"Whole Words Only", @"Menu item
title") action:@selector(toggleWholeWordSearch:) target:mainController];
Modified: trunk/SKLineInspector.m
===================================================================
--- trunk/SKLineInspector.m 2017-10-21 13:43:12 UTC (rev 9432)
+++ trunk/SKLineInspector.m 2017-10-21 14:36:24 UTC (rev 9433)
@@ -110,25 +110,25 @@
[lineWell bind:SKLineWellStartLineStyleKey toObject:self
withKeyPath:STARTLINESTYLE_KEY options:nil];
[lineWell bind:SKLineWellEndLineStyleKey toObject:self
withKeyPath:ENDLINESTYLE_KEY options:nil];
- [styleButton setToolTip:NSLocalizedString(@"Solid line style", @"Tool tip
message") forSegment:kPDFBorderStyleSolid];
- [styleButton setToolTip:NSLocalizedString(@"Dashed line style", @"Tool tip
message") forSegment:kPDFBorderStyleDashed];
- [styleButton setToolTip:NSLocalizedString(@"Beveled line style", @"Tool
tip message") forSegment:kPDFBorderStyleBeveled];
- [styleButton setToolTip:NSLocalizedString(@"Inset line style", @"Tool tip
message") forSegment:kPDFBorderStyleInset];
- [styleButton setToolTip:NSLocalizedString(@"Underline line style", @"Tool
tip message") forSegment:kPDFBorderStyleUnderline];
+ [styleButton setHelp:NSLocalizedString(@"Solid line style", @"Tool tip
message") forSegment:kPDFBorderStyleSolid];
+ [styleButton setHelp:NSLocalizedString(@"Dashed line style", @"Tool tip
message") forSegment:kPDFBorderStyleDashed];
+ [styleButton setHelp:NSLocalizedString(@"Beveled line style", @"Tool tip
message") forSegment:kPDFBorderStyleBeveled];
+ [styleButton setHelp:NSLocalizedString(@"Inset line style", @"Tool tip
message") forSegment:kPDFBorderStyleInset];
+ [styleButton setHelp:NSLocalizedString(@"Underline line style", @"Tool tip
message") forSegment:kPDFBorderStyleUnderline];
- [startLineStyleButton setToolTip:NSLocalizedString(@"No start line style",
@"Tool tip message") forSegment:kPDFLineStyleNone];
- [startLineStyleButton setToolTip:NSLocalizedString(@"Square start line
style", @"Tool tip message") forSegment:kPDFLineStyleSquare];
- [startLineStyleButton setToolTip:NSLocalizedString(@"Circle start line
style", @"Tool tip message") forSegment:kPDFLineStyleCircle];
- [startLineStyleButton setToolTip:NSLocalizedString(@"Diamond start line
style", @"Tool tip message") forSegment:kPDFLineStyleDiamond];
- [startLineStyleButton setToolTip:NSLocalizedString(@"Open arrow start line
style", @"Tool tip message") forSegment:kPDFLineStyleOpenArrow];
- [startLineStyleButton setToolTip:NSLocalizedString(@"Closed arrow start
line style", @"Tool tip message") forSegment:kPDFLineStyleClosedArrow];
+ [startLineStyleButton setHelp:NSLocalizedString(@"No start line style",
@"Tool tip message") forSegment:kPDFLineStyleNone];
+ [startLineStyleButton setHelp:NSLocalizedString(@"Square start line
style", @"Tool tip message") forSegment:kPDFLineStyleSquare];
+ [startLineStyleButton setHelp:NSLocalizedString(@"Circle start line
style", @"Tool tip message") forSegment:kPDFLineStyleCircle];
+ [startLineStyleButton setHelp:NSLocalizedString(@"Diamond start line
style", @"Tool tip message") forSegment:kPDFLineStyleDiamond];
+ [startLineStyleButton setHelp:NSLocalizedString(@"Open arrow start line
style", @"Tool tip message") forSegment:kPDFLineStyleOpenArrow];
+ [startLineStyleButton setHelp:NSLocalizedString(@"Closed arrow start line
style", @"Tool tip message") forSegment:kPDFLineStyleClosedArrow];
- [endLineStyleButton setToolTip:NSLocalizedString(@"No end line style",
@"Tool tip message") forSegment:kPDFLineStyleNone];
- [endLineStyleButton setToolTip:NSLocalizedString(@"Square end line style",
@"Tool tip message") forSegment:kPDFLineStyleSquare];
- [endLineStyleButton setToolTip:NSLocalizedString(@"Circle end line style",
@"Tool tip message") forSegment:kPDFLineStyleCircle];
- [endLineStyleButton setToolTip:NSLocalizedString(@"Diamond end line
style", @"Tool tip message") forSegment:kPDFLineStyleDiamond];
- [endLineStyleButton setToolTip:NSLocalizedString(@"Open arrow end line
style", @"Tool tip message") forSegment:kPDFLineStyleOpenArrow];
- [endLineStyleButton setToolTip:NSLocalizedString(@"Closed arrow end line
style", @"Tool tip message") forSegment:kPDFLineStyleClosedArrow];
+ [endLineStyleButton setHelp:NSLocalizedString(@"No end line style", @"Tool
tip message") forSegment:kPDFLineStyleNone];
+ [endLineStyleButton setHelp:NSLocalizedString(@"Square end line style",
@"Tool tip message") forSegment:kPDFLineStyleSquare];
+ [endLineStyleButton setHelp:NSLocalizedString(@"Circle end line style",
@"Tool tip message") forSegment:kPDFLineStyleCircle];
+ [endLineStyleButton setHelp:NSLocalizedString(@"Diamond end line style",
@"Tool tip message") forSegment:kPDFLineStyleDiamond];
+ [endLineStyleButton setHelp:NSLocalizedString(@"Open arrow end line
style", @"Tool tip message") forSegment:kPDFLineStyleOpenArrow];
+ [endLineStyleButton setHelp:NSLocalizedString(@"Closed arrow end line
style", @"Tool tip message") forSegment:kPDFLineStyleClosedArrow];
CGFloat dw = SKAutoSizeLabelFields(labelFields, [NSArray
arrayWithObjects:lineWidthSlider, lineWidthField, styleButton,
dashPatternField, startLineStyleButton, endLineStyleButton, nil], NO);
if (fabs(dw) > 0.0)
Modified: trunk/SKMainToolbarController.m
===================================================================
--- trunk/SKMainToolbarController.m 2017-10-21 13:43:12 UTC (rev 9432)
+++ trunk/SKMainToolbarController.m 2017-10-21 14:36:24 UTC (rev 9433)
@@ -228,8 +228,8 @@
[item setLabels:NSLocalizedString(@"Previous/Next", @"Toolbar item
label")];
[item setToolTip:NSLocalizedString(@"Previous/Next", @"Tool tip
message")];
- [previousNextPageButton setToolTip:NSLocalizedString(@"Go To
Previous Page", @"Tool tip message") forSegment:0];
- [previousNextPageButton setToolTip:NSLocalizedString(@"Go To Next
Page", @"Tool tip message") forSegment:1];
+ [previousNextPageButton setHelp:NSLocalizedString(@"Go To Previous
Page", @"Tool tip message") forSegment:0];
+ [previousNextPageButton setHelp:NSLocalizedString(@"Go To Next
Page", @"Tool tip message") forSegment:1];
[item setViewWithSizes:previousNextPageButton];
[item setMenuFormRepresentation:menuItem];
@@ -242,8 +242,8 @@
[item setLabels:NSLocalizedString(@"Previous", @"Toolbar item
label")];
[item setToolTip:NSLocalizedString(@"Go To Previous Page", @"Tool
tip message")];
- [previousPageButton setToolTip:NSLocalizedString(@"Go To First
page", @"Tool tip message") forSegment:0];
- [previousPageButton setToolTip:NSLocalizedString(@"Go To Previous
Page", @"Tool tip message") forSegment:1];
+ [previousPageButton setHelp:NSLocalizedString(@"Go To First page",
@"Tool tip message") forSegment:0];
+ [previousPageButton setHelp:NSLocalizedString(@"Go To Previous
Page", @"Tool tip message") forSegment:1];
[item setViewWithSizes:previousPageButton];
[item setMenuFormRepresentation:menuItem];
@@ -256,8 +256,8 @@
[item setLabels:NSLocalizedString(@"Next", @"Toolbar item label")];
[item setToolTip:NSLocalizedString(@"Go To Next Page", @"Tool tip
message")];
- [nextPageButton setToolTip:NSLocalizedString(@"Go To Next Page",
@"Tool tip message") forSegment:0];
- [nextPageButton setToolTip:NSLocalizedString(@"Go To Last page",
@"Tool tip message") forSegment:1];
+ [nextPageButton setHelp:NSLocalizedString(@"Go To Next Page",
@"Tool tip message") forSegment:0];
+ [nextPageButton setHelp:NSLocalizedString(@"Go To Last page",
@"Tool tip message") forSegment:1];
[item setViewWithSizes:nextPageButton];
[item setMenuFormRepresentation:menuItem];
@@ -272,10 +272,10 @@
[item setLabels:NSLocalizedString(@"Previous/Next", @"Toolbar item
label")];
[item setToolTip:NSLocalizedString(@"Go To First, Previous, Next
or Last Page", @"Tool tip message")];
- [previousNextFirstLastPageButton setToolTip:NSLocalizedString(@"Go
To First page", @"Tool tip message") forSegment:0];
- [previousNextFirstLastPageButton setToolTip:NSLocalizedString(@"Go
To Previous Page", @"Tool tip message") forSegment:1];
- [previousNextFirstLastPageButton setToolTip:NSLocalizedString(@"Go
To Next Page", @"Tool tip message") forSegment:2];
- [previousNextFirstLastPageButton setToolTip:NSLocalizedString(@"Go
To Last page", @"Tool tip message") forSegment:3];
+ [previousNextFirstLastPageButton setHelp:NSLocalizedString(@"Go To
First page", @"Tool tip message") forSegment:0];
+ [previousNextFirstLastPageButton setHelp:NSLocalizedString(@"Go To
Previous Page", @"Tool tip message") forSegment:1];
+ [previousNextFirstLastPageButton setHelp:NSLocalizedString(@"Go To
Next Page", @"Tool tip message") forSegment:2];
+ [previousNextFirstLastPageButton setHelp:NSLocalizedString(@"Go To
Last page", @"Tool tip message") forSegment:3];
[item setViewWithSizes:previousNextFirstLastPageButton];
[item setMenuFormRepresentation:menuItem];
@@ -288,8 +288,8 @@
[item setLabels:NSLocalizedString(@"Back/Forward", @"Toolbar item
label")];
[item setToolTip:NSLocalizedString(@"Back/Forward", @"Tool tip
message")];
- [backForwardButton setToolTip:NSLocalizedString(@"Go Back", @"Tool
tip message") forSegment:0];
- [backForwardButton setToolTip:NSLocalizedString(@"Go Forward",
@"Tool tip message") forSegment:1];
+ [backForwardButton setHelp:NSLocalizedString(@"Go Back", @"Tool
tip message") forSegment:0];
+ [backForwardButton setHelp:NSLocalizedString(@"Go Forward", @"Tool
tip message") forSegment:1];
[item setViewWithSizes:backForwardButton];
[item setMenuFormRepresentation:menuItem];
@@ -352,8 +352,8 @@
[item setLabels:NSLocalizedString(@"Zoom", @"Toolbar item label")];
[item setToolTip:NSLocalizedString(@"Zoom", @"Tool tip message")];
- [zoomInOutButton setToolTip:NSLocalizedString(@"Zoom Out", @"Tool
tip message") forSegment:0];
- [zoomInOutButton setToolTip:NSLocalizedString(@"Zoom In", @"Tool
tip message") forSegment:1];
+ [zoomInOutButton setHelp:NSLocalizedString(@"Zoom Out", @"Tool tip
message") forSegment:0];
+ [zoomInOutButton setHelp:NSLocalizedString(@"Zoom In", @"Tool tip
message") forSegment:1];
[item setViewWithSizes:zoomInOutButton];
[item setMenuFormRepresentation:menuItem];
@@ -367,9 +367,9 @@
[item setLabels:NSLocalizedString(@"Zoom", @"Toolbar item label")];
[item setToolTip:NSLocalizedString(@"Zoom", @"Tool tip message")];
- [zoomInActualOutButton setToolTip:NSLocalizedString(@"Zoom Out",
@"Tool tip message") forSegment:0];
- [zoomInActualOutButton setToolTip:NSLocalizedString(@"Zoom To
Actual Size", @"Tool tip message") forSegment:1];
- [zoomInActualOutButton setToolTip:NSLocalizedString(@"Zoom In",
@"Tool tip message") forSegment:2];
+ [zoomInActualOutButton setHelp:NSLocalizedString(@"Zoom Out",
@"Tool tip message") forSegment:0];
+ [zoomInActualOutButton setHelp:NSLocalizedString(@"Zoom To Actual
Size", @"Tool tip message") forSegment:1];
+ [zoomInActualOutButton setHelp:NSLocalizedString(@"Zoom In",
@"Tool tip message") forSegment:2];
[item setViewWithSizes:zoomInActualOutButton];
[item setMenuFormRepresentation:menuItem];
@@ -508,14 +508,14 @@
[item setLabels:NSLocalizedString(@"Add Note", @"Toolbar item
label")];
[item setToolTip:NSLocalizedString(@"Add New Note", @"Tool tip
message")];
- [noteButton setToolTip:NSLocalizedString(@"Add New Text Note",
@"Tool tip message") forSegment:SKFreeTextNote];
- [noteButton setToolTip:NSLocalizedString(@"Add New Anchored Note",
@"Tool tip message") forSegment:SKAnchoredNote];
- [noteButton setToolTip:NSLocalizedString(@"Add New Circle", @"Tool
tip message") forSegment:SKCircleNote];
- [noteButton setToolTip:NSLocalizedString(@"Add New Box", @"Tool
tip message") forSegment:SKSquareNote];
- [noteButton setToolTip:NSLocalizedString(@"Add New Highlight",
@"Tool tip message") forSegment:SKHighlightNote];
- [noteButton setToolTip:NSLocalizedString(@"Add New Underline",
@"Tool tip message") forSegment:SKUnderlineNote];
- [noteButton setToolTip:NSLocalizedString(@"Add New Strike Out",
@"Tool tip message") forSegment:SKStrikeOutNote];
- [noteButton setToolTip:NSLocalizedString(@"Add New Line", @"Tool
tip message") forSegment:SKLineNote];
+ [noteButton setHelp:NSLocalizedString(@"Add New Text Note", @"Tool
tip message") forSegment:SKFreeTextNote];
+ [noteButton setHelp:NSLocalizedString(@"Add New Anchored Note",
@"Tool tip message") forSegment:SKAnchoredNote];
+ [noteButton setHelp:NSLocalizedString(@"Add New Circle", @"Tool
tip message") forSegment:SKCircleNote];
+ [noteButton setHelp:NSLocalizedString(@"Add New Box", @"Tool tip
message") forSegment:SKSquareNote];
+ [noteButton setHelp:NSLocalizedString(@"Add New Highlight", @"Tool
tip message") forSegment:SKHighlightNote];
+ [noteButton setHelp:NSLocalizedString(@"Add New Underline", @"Tool
tip message") forSegment:SKUnderlineNote];
+ [noteButton setHelp:NSLocalizedString(@"Add New Strike Out",
@"Tool tip message") forSegment:SKStrikeOutNote];
+ [noteButton setHelp:NSLocalizedString(@"Add New Line", @"Tool tip
message") forSegment:SKLineNote];
[item setViewWithSizes:noteButton];
[item setMenuFormRepresentation:menuItem];
@@ -552,11 +552,11 @@
[item setLabels:NSLocalizedString(@"Tool Mode", @"Toolbar item
label")];
[item setToolTip:NSLocalizedString(@"Tool Mode", @"Tool tip
message")];
- [toolModeButton setToolTip:NSLocalizedString(@"Text Tool", @"Tool
tip message") forSegment:SKTextToolMode];
- [toolModeButton setToolTip:NSLocalizedString(@"Scroll Tool",
@"Tool tip message") forSegment:SKMoveToolMode];
- [toolModeButton setToolTip:NSLocalizedString(@"Magnify Tool",
@"Tool tip message") forSegment:SKMagnifyToolMode];
- [toolModeButton setToolTip:NSLocalizedString(@"Select Tool",
@"Tool tip message") forSegment:SKSelectToolMode];
- [toolModeButton setToolTip:NSLocalizedString(@"Note Tool", @"Tool
tip message") forSegment:SKNoteToolMode];
+ [toolModeButton setHelp:NSLocalizedString(@"Text Tool", @"Tool tip
message") forSegment:SKTextToolMode];
+ [toolModeButton setHelp:NSLocalizedString(@"Scroll Tool", @"Tool
tip message") forSegment:SKMoveToolMode];
+ [toolModeButton setHelp:NSLocalizedString(@"Magnify Tool", @"Tool
tip message") forSegment:SKMagnifyToolMode];
+ [toolModeButton setHelp:NSLocalizedString(@"Select Tool", @"Tool
tip message") forSegment:SKSelectToolMode];
+ [toolModeButton setHelp:NSLocalizedString(@"Note Tool", @"Tool tip
message") forSegment:SKNoteToolMode];
[item setViewWithSizes:toolModeButton];
[item setMenuFormRepresentation:menuItem];
@@ -569,8 +569,8 @@
[item setLabels:NSLocalizedString(@"Single/Two Pages", @"Toolbar
item label")];
[item setToolTip:NSLocalizedString(@"Single/Two Pages", @"Tool tip
message")];
- [singleTwoUpButton setToolTip:NSLocalizedString(@"Single Page",
@"Tool tip message") forSegment:0];
- [singleTwoUpButton setToolTip:NSLocalizedString(@"Two Pages",
@"Tool tip message") forSegment:1];
+ [singleTwoUpButton setHelp:NSLocalizedString(@"Single Page",
@"Tool tip message") forSegment:0];
+ [singleTwoUpButton setHelp:NSLocalizedString(@"Two Pages", @"Tool
tip message") forSegment:1];
[item setViewWithSizes:singleTwoUpButton];
[item setMenuFormRepresentation:menuItem];
@@ -583,8 +583,8 @@
[item setLabels:NSLocalizedString(@"Continuous", @"Toolbar item
label")];
[item setToolTip:NSLocalizedString(@"Continuous", @"Tool tip
message")];
- [continuousButton setToolTip:NSLocalizedString(@"Non Continuous",
@"Tool tip message") forSegment:0];
- [continuousButton setToolTip:NSLocalizedString(@"Continuous",
@"Tool tip message") forSegment:1];
+ [continuousButton setHelp:NSLocalizedString(@"Non Continuous",
@"Tool tip message") forSegment:0];
+ [continuousButton setHelp:NSLocalizedString(@"Continuous", @"Tool
tip message") forSegment:1];
[item setViewWithSizes:continuousButton];
[item setMenuFormRepresentation:menuItem];
@@ -599,10 +599,10 @@
[item setLabels:NSLocalizedString(@"Display Mode", @"Toolbar item
label")];
[item setToolTip:NSLocalizedString(@"Display Mode", @"Tool tip
message")];
- [displayModeButton setToolTip:NSLocalizedString(@"Single Page",
@"Tool tip message") forSegment:kPDFDisplaySinglePage];
- [displayModeButton setToolTip:NSLocalizedString(@"Single Page
Continuous", @"Tool tip message") forSegment:kPDFDisplaySinglePageContinuous];
- [displayModeButton setToolTip:NSLocalizedString(@"Two Pages",
@"Tool tip message") forSegment:kPDFDisplayTwoUp];
- [displayModeButton setToolTip:NSLocalizedString(@"Two Pages
Continuous", @"Tool tip message") forSegment:kPDFDisplayTwoUpContinuous];
+ [displayModeButton setHelp:NSLocalizedString(@"Single Page",
@"Tool tip message") forSegment:kPDFDisplaySinglePage];
+ [displayModeButton setHelp:NSLocalizedString(@"Single Page
Continuous", @"Tool tip message") forSegment:kPDFDisplaySinglePageContinuous];
+ [displayModeButton setHelp:NSLocalizedString(@"Two Pages", @"Tool
tip message") forSegment:kPDFDisplayTwoUp];
+ [displayModeButton setHelp:NSLocalizedString(@"Two Pages
Continuous", @"Tool tip message") forSegment:kPDFDisplayTwoUpContinuous];
[item setViewWithSizes:displayModeButton];
[item setMenuFormRepresentation:menuItem];
Modified: trunk/SKMainWindowController.h
===================================================================
--- trunk/SKMainWindowController.h 2017-10-21 13:43:12 UTC (rev 9432)
+++ trunk/SKMainWindowController.h 2017-10-21 14:36:24 UTC (rev 9433)
@@ -42,6 +42,7 @@
#import "SKFindController.h"
#import "NSDocument_SKExtensions.h"
#import "SKPDFView.h"
+#import "SKPDFDocument.h"
#import <IOKit/pwr_mgt/IOPMLib.h>
typedef NS_ENUM(NSInteger, SKLeftSidePaneState) {
@@ -69,7 +70,7 @@
@class SKPDFView, SKSecondaryPDFView, SKStatusBar, SKFindController,
SKSplitView, SKFieldEditor, SKSideWindow;
@class SKLeftSideViewController, SKRightSideViewController,
SKMainToolbarController, SKProgressController,
SKPresentationOptionsSheetController, SKNoteTypeSheetController;
-@interface SKMainWindowController : NSWindowController
<SKSnapshotWindowControllerDelegate, SKThumbnailDelegate,
SKFindControllerDelegate, SKPDFViewDelegate> {
+@interface SKMainWindowController : NSWindowController
<SKSnapshotWindowControllerDelegate, SKThumbnailDelegate,
SKFindControllerDelegate, SKPDFViewDelegate, SKPDFDocumentDelegate> {
SKSplitView *splitView;
NSView *centerContentView;
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2017-10-21 13:43:12 UTC (rev 9432)
+++ trunk/SKMainWindowController.m 2017-10-21 14:36:24 UTC (rev 9433)
@@ -435,7 +435,7 @@
pageIndex = [[savedNormalSetup objectForKey:PAGEINDEX_KEY]
unsignedIntegerValue];
pointString = [savedNormalSetup objectForKey:SCROLLPOINT_KEY];
} else if ([sud boolForKey:SKRememberLastPageViewedKey]) {
- pageIndex = [[SKBookmarkController sharedBookmarkController]
pageIndexForRecentDocumentAtURL:[[self document] fileURL]];
+ pageIndex = [[SKBookmarkController sharedBookmarkController]
pageIndexForRecentDocumentAtURL:[(NSDocument *)[self document] fileURL]];
}
if (pageIndex != NSNotFound && [[pdfView document] pageCount] > pageIndex)
{
if ([[pdfView document] isLocked]) {
@@ -460,7 +460,7 @@
if (hasWindowSetup)
snapshotSetups = [savedNormalSetup objectForKey:SNAPSHOTS_KEY];
else if ([sud boolForKey:SKRememberSnapshotsKey])
- snapshotSetups = [[SKBookmarkController sharedBookmarkController]
snapshotsForRecentDocumentAtURL:[[self document] fileURL]];
+ snapshotSetups = [[SKBookmarkController sharedBookmarkController]
snapshotsForRecentDocumentAtURL:[(NSDocument *)[self document] fileURL]];
if ([snapshotSetups count]) {
if ([[pdfView document] isLocked])
[savedNormalSetup setObject:snapshotSetups forKey:SNAPSHOTS_KEY];
Modified: trunk/SKPDFDocument.h
===================================================================
--- trunk/SKPDFDocument.h 2017-10-21 13:43:12 UTC (rev 9432)
+++ trunk/SKPDFDocument.h 2017-10-21 14:36:24 UTC (rev 9433)
@@ -39,12 +39,18 @@
#import <Cocoa/Cocoa.h>
#import <Quartz/Quartz.h>
+@protocol SKPDFDocumentDelegate;
@interface SKPDFDocument : PDFDocument {
CFLocaleLanguageDirection languageDirection;
}
+- (id <SKPDFDocumentDelegate>)delegate;
+- (void)setDelegate:(id <SKPDFDocumentDelegate>)newDelegate;
@end
-@interface NSObject (SKPDFDocumentDelegate)
+#pragma mark -
+
+@protocol SKPDFDocumentDelegate <PDFDocumentDelegate>
+@optional
- (void)document:(PDFDocument *)document didUnlockWithPassword:(NSString
*)password;
@end
Modified: trunk/SKPDFDocument.m
===================================================================
--- trunk/SKPDFDocument.m 2017-10-21 13:43:12 UTC (rev 9432)
+++ trunk/SKPDFDocument.m 2017-10-21 14:36:24 UTC (rev 9433)
@@ -68,7 +68,11 @@
}
// don't send out delegate methods during a synchronous find
+// don't warn when using 10.3 SDK for different type
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wmismatched-parameter-types"
+
- (NSArray *)findString:(NSString *)string withOptions:(NSUInteger)options {
id delegate = [self delegate];
[self setDelegate:nil];
@@ -85,4 +89,14 @@
return selection;
}
+#pragma clang diagnostic pop
+
+- (id <SKPDFDocumentDelegate>)delegate {
+ return (id <SKPDFDocumentDelegate>)[super delegate];
+}
+
+- (void)setDelegate:(id <SKPDFDocumentDelegate>)newDelegate {
+ [super setDelegate:newDelegate];
+}
+
@end
Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m 2017-10-21 13:43:12 UTC (rev 9432)
+++ trunk/SKPDFView.m 2017-10-21 14:36:24 UTC (rev 9433)
@@ -2225,7 +2225,6 @@
NSRect lineRect = [sel hasCharacters] ? [sel boundsForPage:page] :
SKRectFromCenterAndSquareSize(point, 10.0);
NSRect rect = lineRect;
NSRect visibleRect;
- NSPoint p;
BOOL wasPageDisplayed = NSLocationInRange(pageIndex, [self
displayedPageIndexRange]);
if (wasPageDisplayed == NO)
Modified: trunk/SKRightSideViewController.m
===================================================================
--- trunk/SKRightSideViewController.m 2017-10-21 13:43:12 UTC (rev 9432)
+++ trunk/SKRightSideViewController.m 2017-10-21 14:36:24 UTC (rev 9433)
@@ -73,8 +73,8 @@
- (void)loadView {
[super loadView];
- [button setToolTip:NSLocalizedString(@"View Notes", @"Tool tip message")
forSegment:SKNoteSidePaneState];
- [button setToolTip:NSLocalizedString(@"View Snapshots", @"Tool tip
message") forSegment:SKSnapshotSidePaneState];
+ [button setHelp:NSLocalizedString(@"View Notes", @"Tool tip message")
forSegment:SKNoteSidePaneState];
+ [button setHelp:NSLocalizedString(@"View Snapshots", @"Tool tip message")
forSegment:SKSnapshotSidePaneState];
NSMenu *menu = [NSMenu menu];
[menu addItemWithTitle:NSLocalizedString(@"Ignore Case", @"Menu item
title") action:@selector(toggleCaseInsensitiveNoteSearch:)
target:mainController];
Modified: trunk/SKStatusBar.m
===================================================================
--- trunk/SKStatusBar.m 2017-10-21 13:43:12 UTC (rev 9432)
+++ trunk/SKStatusBar.m 2017-10-21 14:36:24 UTC (rev 9433)
@@ -394,8 +394,8 @@
[progressIndicator setAutoresizingMask:NSViewMinXMargin |
NSViewMinYMargin | NSViewMaxYMargin];
[progressIndicator setStyle:style];
[progressIndicator setControlSize:NSSmallControlSize];
- [progressIndicator setIndeterminate:style ==
NSProgressIndicatorSpinningStyle];
- [progressIndicator setDisplayedWhenStopped:style ==
NSProgressIndicatorBarStyle];
+ [progressIndicator setIndeterminate:style ==
(SKProgressIndicatorStyle)NSProgressIndicatorSpinningStyle];
+ [progressIndicator setDisplayedWhenStopped:style ==
(SKProgressIndicatorStyle)NSProgressIndicatorBarStyle];
[progressIndicator setUsesThreadedAnimation:YES];
[progressIndicator sizeToFit];
Modified: trunk/SkimImporter/GetMetadataForFile.m
===================================================================
--- trunk/SkimImporter/GetMetadataForFile.m 2017-10-21 13:43:12 UTC (rev
9432)
+++ trunk/SkimImporter/GetMetadataForFile.m 2017-10-21 14:36:24 UTC (rev
9433)
@@ -52,7 +52,7 @@
NSUInteger pageCount = [pdfDoc pageCount];
NSSize size = pageCount ? [[pdfDoc pageAtIndex:0]
boundsForBox:kPDFDisplayBoxCropBox].size : NSZeroSize;
NSMutableDictionary *mutableInfo = [[[pdfDoc documentAttributes]
mutableCopy] autorelease];
- [mutableInfo setValue:[NSString stringWithFormat: @"%d.%d",
[pdfDoc majorVersion], [pdfDoc minorVersion]] forKey:@"Version"];
+ [mutableInfo setValue:[NSString stringWithFormat: @"%ld.%ld",
(long)[pdfDoc majorVersion], (long)[pdfDoc minorVersion]] forKey:@"Version"];
[mutableInfo setValue:[NSNumber numberWithBool:[pdfDoc
isEncrypted]] forKey:@"Encrypted"];
[mutableInfo setValue:[NSNumber
numberWithUnsignedInteger:pageCount] forKey:@"PageCount"];
[mutableInfo setValue:[NSNumber numberWithDouble:size.width]
forKey:@"PageWidth"];
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
