Revision: 12853
http://sourceforge.net/p/skim-app/code/12853
Author: hofman
Date: 2022-04-23 17:28:57 +0000 (Sat, 23 Apr 2022)
Log Message:
-----------
Add check button for hidden pref to use the intiial view settings from the PDF
to Normal view settings window
Modified Paths:
--------------
trunk/Base.lproj/ViewSettings.xib
trunk/InitialUserDefaults.plist
trunk/SKMainWindowController.m
trunk/SKPDFView.m
trunk/SKStringConstants.h
trunk/SKStringConstants.m
trunk/SKViewSettingsController.h
trunk/SKViewSettingsController.m
trunk/de.lproj/ViewSettings.strings
trunk/en.lproj/ViewSettings.strings
trunk/es.lproj/ViewSettings.strings
trunk/fr.lproj/ViewSettings.strings
trunk/it.lproj/ViewSettings.strings
trunk/ja.lproj/ViewSettings.strings
trunk/nl.lproj/ViewSettings.strings
trunk/pl.lproj/ViewSettings.strings
trunk/ru.lproj/ViewSettings.strings
trunk/zh_CN.lproj/ViewSettings.strings
trunk/zh_TW.lproj/ViewSettings.strings
Modified: trunk/Base.lproj/ViewSettings.xib
===================================================================
--- trunk/Base.lproj/ViewSettings.xib 2022-04-21 09:26:11 UTC (rev 12852)
+++ trunk/Base.lproj/ViewSettings.xib 2022-04-23 17:28:57 UTC (rev 12853)
@@ -1,15 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0"
toolsVersion="17701" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none"
useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0"
toolsVersion="19529" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none"
useAutolayout="YES" customObjectInstantitationMethod="direct">
<dependencies>
<deployment identifier="macosx"/>
- <development version="8000" identifier="xcode"/>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin"
version="17701"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin"
version="19529"/>
<capability name="documents saved in the Xcode 8 format"
minToolsVersion="8.0"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner"
customClass="SKViewSettingsController">
<connections>
- <outlet property="customButton" destination="4tx-Im-k2d"
id="9mi-dv-VJM"/>
<outlet property="window" destination="QvC-M9-y7g"
id="3GF-pN-sxX"/>
</connections>
</customObject>
@@ -43,8 +41,28 @@
</buttonCell>
<connections>
<binding destination="-2" name="value"
keyPath="custom" id="fvj-eE-nHm"/>
+ <binding destination="-2" name="hidden"
keyPath="defaultSettings" id="xZg-vO-Mzs">
+ <dictionary key="options">
+ <string
key="NSValueTransformerName">NSIsNil</string>
+ </dictionary>
+ </binding>
</connections>
</button>
+ <button horizontalHuggingPriority="750"
verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO"
id="V7T-S1-Td4">
+ <rect key="frame" x="18" y="252" width="219"
height="18"/>
+ <buttonCell key="cell" type="check" title="Use
available settings from PDF" bezelStyle="regularSquare" imagePosition="left"
inset="2" id="g8A-hm-CIh">
+ <behavior key="behavior" changeContents="YES"
doesNotDimImage="YES" lightByContents="YES"/>
+ <font key="font" metaFont="system"/>
+ </buttonCell>
+ <connections>
+ <binding destination="-2" name="hidden"
keyPath="defaultSettings" id="vKg-ob-NKQ">
+ <dictionary key="options">
+ <string
key="NSValueTransformerName">NSIsNotNil</string>
+ </dictionary>
+ </binding>
+ <binding destination="-2" name="value"
keyPath="useSettingsFromPDF" id="G4j-4v-oer"/>
+ </connections>
+ </button>
<button horizontalHuggingPriority="750"
verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO"
id="Jh7-f6-LtY">
<rect key="frame" x="18" y="123" width="95"
height="18"/>
<buttonCell key="cell" type="check" title="Book mode"
bezelStyle="regularSquare" imagePosition="left" state="on" inset="2"
id="gaZ-KF-diE">
@@ -218,6 +236,7 @@
<constraint firstItem="7lV-o8-w8w"
firstAttribute="leading" secondItem="jK7-jB-zxl" secondAttribute="trailing"
constant="8" symbolic="YES" id="4vt-lb-H2v"/>
<constraint firstItem="7lV-o8-w8w" firstAttribute="top"
secondItem="8cW-DD-wHC" secondAttribute="bottom" constant="8" symbolic="YES"
id="5lZ-xa-SBH"/>
<constraint firstItem="WFv-vV-yVb"
firstAttribute="leading" secondItem="D1r-q4-3vf" secondAttribute="trailing"
constant="8" symbolic="YES" id="8TS-Gr-Qgp"/>
+ <constraint firstAttribute="trailing"
relation="greaterThanOrEqual" secondItem="V7T-S1-Td4"
secondAttribute="trailing" constant="20" symbolic="YES" id="8pN-6Y-A1v"/>
<constraint firstItem="RaB-j3-S3B"
firstAttribute="leading" secondItem="Jh7-f6-LtY" secondAttribute="trailing"
constant="20" id="Ck8-Pw-3iE"/>
<constraint firstAttribute="bottom"
secondItem="oIO-AP-hzR" secondAttribute="bottom" constant="20" symbolic="YES"
id="FJe-cO-40W"/>
<constraint firstItem="8cW-DD-wHC"
firstAttribute="leading" secondItem="EiT-Mj-1SZ" secondAttribute="leading"
constant="20" symbolic="YES" id="IKL-gC-Yno"/>
@@ -233,6 +252,7 @@
<constraint firstItem="WFv-vV-yVb" firstAttribute="top"
secondItem="Uer-IA-rxW" secondAttribute="bottom" constant="8" id="Zjf-Ff-dGs"/>
<constraint firstItem="8cW-DD-wHC" firstAttribute="top"
secondItem="4tx-Im-k2d" secondAttribute="bottom" constant="20" id="az3-qD-edc"/>
<constraint firstItem="oIO-AP-hzR"
firstAttribute="firstBaseline" secondItem="dpy-5S-Zp3"
secondAttribute="firstBaseline" id="bci-k4-rEO"/>
+ <constraint firstItem="V7T-S1-Td4"
firstAttribute="leading" secondItem="4tx-Im-k2d" secondAttribute="leading"
id="fPb-n3-DL4"/>
<constraint firstItem="Uer-IA-rxW"
firstAttribute="leading" secondItem="8cW-DD-wHC" secondAttribute="leading"
id="fhI-KT-U7c"/>
<constraint firstItem="Jh7-f6-LtY" firstAttribute="top"
secondItem="ZR7-HY-PNO" secondAttribute="bottom" constant="8" symbolic="YES"
id="fwn-WL-FWK"/>
<constraint firstAttribute="trailing"
relation="greaterThanOrEqual" secondItem="Uer-IA-rxW"
secondAttribute="trailing" constant="20" symbolic="YES" id="g1Y-UP-zFl"/>
@@ -241,8 +261,8 @@
<constraint firstItem="Jh7-f6-LtY"
firstAttribute="leading" secondItem="8cW-DD-wHC" secondAttribute="leading"
id="haD-WQ-YQv"/>
<constraint firstAttribute="trailing"
secondItem="oIO-AP-hzR" secondAttribute="trailing" constant="20" symbolic="YES"
id="jCS-t4-4kW"/>
<constraint firstItem="VYe-Nl-QHJ"
firstAttribute="leading" secondItem="8cW-DD-wHC" secondAttribute="leading"
id="jS7-tr-bI9"/>
+ <constraint firstItem="V7T-S1-Td4"
firstAttribute="firstBaseline" secondItem="4tx-Im-k2d"
secondAttribute="firstBaseline" id="ohk-Ys-QqW"/>
<constraint firstItem="oIO-AP-hzR" firstAttribute="width"
secondItem="dpy-5S-Zp3" secondAttribute="width" id="pUV-GC-yn2"/>
- <constraint firstItem="8cW-DD-wHC" firstAttribute="top"
secondItem="EiT-Mj-1SZ" secondAttribute="top" priority="749" constant="20"
symbolic="YES" id="snI-zm-OBz"/>
<constraint firstItem="oIO-AP-hzR" firstAttribute="top"
secondItem="WFv-vV-yVb" secondAttribute="bottom" constant="20" id="uqe-7V-4sf"/>
<constraint firstItem="4tx-Im-k2d" firstAttribute="top"
secondItem="EiT-Mj-1SZ" secondAttribute="top" constant="20" symbolic="YES"
id="vAg-87-diM"/>
<constraint firstAttribute="trailing"
relation="greaterThanOrEqual" secondItem="4tx-Im-k2d"
secondAttribute="trailing" constant="20" symbolic="YES" id="vVR-K5-slg"/>
Modified: trunk/InitialUserDefaults.plist
===================================================================
--- trunk/InitialUserDefaults.plist 2022-04-21 09:26:11 UTC (rev 12852)
+++ trunk/InitialUserDefaults.plist 2022-04-23 17:28:57 UTC (rev 12853)
@@ -45,6 +45,8 @@
</dict>
<key>SKDefaultFullScreenPDFDisplaySettings</key>
<dict/>
+ <key>SKUseSettingsFromPDF</key>
+ <false/>
<key>SKWriteLegacySkimNotes</key>
<false/>
<key>SKAutoSaveSkimNotes</key>
@@ -238,6 +240,7 @@
<string>SKRememberSnapshots</string>
<string>SKDefaultPDFDisplaySettings</string>
<string>SKDefaultFullScreenPDFDisplaySettings</string>
+ <string>SKUseSettingsFromPDF</string>
<string>SKWriteLegacySkimNotes</string>
<string>SKAutoSaveSkimNotes</string>
<string>SKSnapshotsOnTop</string>
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2022-04-21 09:26:11 UTC (rev 12852)
+++ trunk/SKMainWindowController.m 2022-04-23 17:28:57 UTC (rev 12853)
@@ -178,8 +178,6 @@
#define SKLeftSidePaneWidthKey @"SKLeftSidePaneWidth"
#define SKRightSidePaneWidthKey @"SKRightSidePaneWidth"
-#define SKUseSettingsFromPDFKey @"SKUseSettingsFromPDF"
-
#define SKCollapseTOCSublevelsKey @"SKCollapseTOCSublevels"
#if SDK_BEFORE(10_11)
Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m 2022-04-21 09:26:11 UTC (rev 12852)
+++ trunk/SKPDFView.m 2022-04-23 17:28:57 UTC (rev 12853)
@@ -1716,7 +1716,7 @@
if ([activeAnnotation isLink])
[self setActiveAnnotation:nil];
- // 10.6 does not automatically make us firstResponder, that's annoying
+ // 10.6 does not automatichally make us firstResponder, that's annoying
// but we don't want an edited text note to stop editing when we're
resizing it
if ([[[self window] firstResponder] isDescendantOf:self] == NO)
[[self window] makeFirstResponder:self];
Modified: trunk/SKStringConstants.h
===================================================================
--- trunk/SKStringConstants.h 2022-04-21 09:26:11 UTC (rev 12852)
+++ trunk/SKStringConstants.h 2022-04-23 17:28:57 UTC (rev 12853)
@@ -107,6 +107,7 @@
extern NSString *SKSwatchColorsKey;
extern NSString *SKDefaultPDFDisplaySettingsKey;
extern NSString *SKDefaultFullScreenPDFDisplaySettingsKey;
+extern NSString *SKUseSettingsFromPDFKey;
extern NSString *SKShowStatusBarKey;
extern NSString *SKShowBookmarkStatusBarKey;
extern NSString *SKShowNotesStatusBarKey;
Modified: trunk/SKStringConstants.m
===================================================================
--- trunk/SKStringConstants.m 2022-04-21 09:26:11 UTC (rev 12852)
+++ trunk/SKStringConstants.m 2022-04-23 17:28:57 UTC (rev 12853)
@@ -108,6 +108,7 @@
NSString *SKSwatchColorsKey = @"SKSwatchColors";
NSString *SKDefaultPDFDisplaySettingsKey = @"SKDefaultPDFDisplaySettings";
NSString *SKDefaultFullScreenPDFDisplaySettingsKey =
@"SKDefaultFullScreenPDFDisplaySettings";
+NSString *SKUseSettingsFromPDFKey = @"SKUseSettingsFromPDF";
NSString *SKShowStatusBarKey = @"SKShowStatusBar";
NSString *SKShowBookmarkStatusBarKey = @"SKShowBookmarkStatusBar";
NSString *SKShowNotesStatusBarKey = @"SKShowNotesStatusBar";
Modified: trunk/SKViewSettingsController.h
===================================================================
--- trunk/SKViewSettingsController.h 2022-04-21 09:26:11 UTC (rev 12852)
+++ trunk/SKViewSettingsController.h 2022-04-23 17:28:57 UTC (rev 12853)
@@ -41,6 +41,7 @@
@interface SKViewSettingsController : NSWindowController {
BOOL custom;
+ BOOL useSettingsFromPDF;
BOOL autoScales;
CGFloat scaleFactor;
NSInteger displayMode;
@@ -50,15 +51,14 @@
BOOL displaysPageBreaks;
NSInteger displayBox;
NSDictionary *defaultSettings;
- NSButton *customButton;
}
- (id)initWithSettings:(NSDictionary *)settings defaultSettings:(NSDictionary
*)aDefaultSettings;
-@property (nonatomic, retain) IBOutlet NSButton *customButton;
-
@property (nonatomic, getter=isCustom) BOOL custom;
+@property (nonatomic) BOOL useSettingsFromPDF;
+
@property (nonatomic) BOOL autoScales;
@property (nonatomic) CGFloat scaleFactor;
@property (nonatomic) NSInteger displayMode, displayDirection,
extendedDisplayMode;
Modified: trunk/SKViewSettingsController.m
===================================================================
--- trunk/SKViewSettingsController.m 2022-04-21 09:26:11 UTC (rev 12852)
+++ trunk/SKViewSettingsController.m 2022-04-23 17:28:57 UTC (rev 12853)
@@ -37,6 +37,7 @@
*/
#import "SKViewSettingsController.h"
+#import "SKStringConstants.h"
#define kPDFDisplaySinglePageContinuous 1
#define kPDFDisplayHorizontalContinuous 4
@@ -43,7 +44,7 @@
@implementation SKViewSettingsController
-@synthesize customButton, custom, autoScales, scaleFactor, displayMode,
displayDirection, displaysAsBook, displaysRTL, displaysPageBreaks, displayBox;
+@synthesize custom, useSettingsFromPDF, autoScales, scaleFactor, displayMode,
displayDirection, displaysAsBook, displaysRTL, displaysPageBreaks, displayBox;
@dynamic extendedDisplayMode, allowsHorizontalSettings, settings;
+ (NSSet *)keyPathsForValuesAffectingValueForKey:(NSString *)key {
@@ -68,6 +69,7 @@
settings = defaultSettings;
}
[self setSettings:settings];
+ useSettingsFromPDF = [[NSUserDefaults standardUserDefaults]
boolForKey:SKUseSettingsFromPDFKey];
}
return self;
}
@@ -74,7 +76,6 @@
- (void)dealloc {
SKDESTROY(defaultSettings);
- SKDESTROY(customButton);
[super dealloc];
}
@@ -82,15 +83,6 @@
return @"ViewSettings";
}
-- (void)windowDidLoad {
- [super windowDidLoad];
- if (defaultSettings == nil) {
- [customButton removeFromSuperview];
- [customButton unbind:NSValueBinding];
- SKDESTROY(customButton);
- }
-}
-
- (NSInteger)extendedDisplayMode {
NSInteger mode = [self displayMode];
if (mode == kPDFDisplaySinglePageContinuous && [self displayDirection] ==
1)
Modified: trunk/de.lproj/ViewSettings.strings
===================================================================
(Binary files differ)
Modified: trunk/en.lproj/ViewSettings.strings
===================================================================
(Binary files differ)
Modified: trunk/es.lproj/ViewSettings.strings
===================================================================
(Binary files differ)
Modified: trunk/fr.lproj/ViewSettings.strings
===================================================================
(Binary files differ)
Modified: trunk/it.lproj/ViewSettings.strings
===================================================================
(Binary files differ)
Modified: trunk/ja.lproj/ViewSettings.strings
===================================================================
(Binary files differ)
Modified: trunk/nl.lproj/ViewSettings.strings
===================================================================
(Binary files differ)
Modified: trunk/pl.lproj/ViewSettings.strings
===================================================================
(Binary files differ)
Modified: trunk/ru.lproj/ViewSettings.strings
===================================================================
(Binary files differ)
Modified: trunk/zh_CN.lproj/ViewSettings.strings
===================================================================
(Binary files differ)
Modified: trunk/zh_TW.lproj/ViewSettings.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
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
