Revision: 12205
http://sourceforge.net/p/skim-app/code/12205
Author: hofman
Date: 2021-03-15 19:09:16 +0000 (Mon, 15 Mar 2021)
Log Message:
-----------
No need for container view for pacer toolbar item
Modified Paths:
--------------
trunk/MainToolbar.xib
trunk/SKMainToolbarController.h
trunk/SKMainToolbarController.m
Modified: trunk/MainToolbar.xib
===================================================================
--- trunk/MainToolbar.xib 2021-03-15 18:46:07 UTC (rev 12204)
+++ trunk/MainToolbar.xib 2021-03-15 19:09:16 UTC (rev 12205)
@@ -33,7 +33,6 @@
<outlet property="pacerButton" destination="Veq-Br-EFG"
id="J9Q-bD-AEQ"/>
<outlet property="pacerSpeedField" destination="jHc-Bm-dWJ"
id="bX9-eZ-X4K"/>
<outlet property="pacerSpeedStepper" destination="jYx-ER-Exi"
id="sy8-pN-C86"/>
- <outlet property="pacerView" destination="eAi-bX-BYI"
id="EqU-cS-YqO"/>
<outlet property="pageBreaksButton" destination="200"
id="204"/>
<outlet property="pageNumberField" destination="38" id="88"/>
<outlet property="presentationButton" destination="23"
id="109"/>
@@ -603,57 +602,6 @@
<action selector="goBackOrForward:" target="-2"
id="162"/>
</connections>
</segmentedControl>
- <customView translatesAutoresizingMaskIntoConstraints="NO"
id="eAi-bX-BYI">
- <rect key="frame" x="146" y="16" width="88" height="24"/>
- <subviews>
- <textField verticalHuggingPriority="750"
preferredMaxLayoutWidth="36" translatesAutoresizingMaskIntoConstraints="NO"
id="jHc-Bm-dWJ">
- <rect key="frame" x="37" y="2" width="30"
height="21"/>
- <constraints>
- <constraint firstAttribute="width"
constant="30" id="vHA-D8-mGk"/>
- </constraints>
- <textFieldCell key="cell" scrollable="YES"
lineBreakMode="clipping" selectable="YES" editable="YES"
sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="center"
drawsBackground="YES" id="9cD-jS-bcm">
- <numberFormatter key="formatter"
formatterBehavior="default10_4" numberStyle="decimal" formatWidth="-1"
minimumIntegerDigits="1" maximumIntegerDigits="2000000000"
maximumFractionDigits="3" id="cUi-co-kf3">
- <real key="minimum" value="1"/>
- </numberFormatter>
- <font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor"
catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor"
name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- <connections>
- <binding destination="190" name="value"
keyPath="selection.pdfView.pacerSpeed" id="Qeo-Kl-wAp"/>
- </connections>
- </textField>
- <stepper horizontalHuggingPriority="750"
verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO"
id="jYx-ER-Exi">
- <rect key="frame" x="69" y="-2" width="19"
height="28"/>
- <stepperCell key="cell" continuous="YES"
alignment="left" minValue="1" maxValue="100" doubleValue="1" id="mIF-lD-uRK"/>
- <connections>
- <binding destination="190" name="value"
keyPath="selection.pdfView.pacerSpeed" id="G0d-wg-67j"/>
- </connections>
- </stepper>
- <segmentedControl verticalHuggingPriority="750"
translatesAutoresizingMaskIntoConstraints="NO" id="Veq-Br-EFG">
- <rect key="frame" x="0.0" y="0.0" width="33"
height="23"/>
- <segmentedCell key="cell" borderStyle="border"
alignment="left" segmentDistribution="fill" style="texturedSquare"
trackingMode="momentary" id="BxE-Xo-uNS">
- <font key="font" metaFont="system"/>
- <segments>
- <segment image="ToolbarPlay"
imageScaling="none" width="27"/>
- </segments>
- </segmentedCell>
- <connections>
- <action selector="togglePacer:" target="-2"
id="tWH-SL-o8t"/>
- </connections>
- </segmentedControl>
- </subviews>
- <constraints>
- <constraint firstAttribute="bottom"
secondItem="Veq-Br-EFG" secondAttribute="bottom" constant="2" id="Aba-cd-Bpz"/>
- <constraint firstAttribute="trailing"
secondItem="jYx-ER-Exi" secondAttribute="trailing" constant="3"
id="IXI-A4-r33"/>
- <constraint firstItem="jHc-Bm-dWJ"
firstAttribute="centerY" secondItem="Veq-Br-EFG" secondAttribute="centerY"
id="KLi-r5-tDF"/>
- <constraint firstItem="Veq-Br-EFG"
firstAttribute="top" secondItem="eAi-bX-BYI" secondAttribute="top" constant="2"
id="OtM-xr-5G2"/>
- <constraint firstItem="Veq-Br-EFG"
firstAttribute="leading" secondItem="eAi-bX-BYI" secondAttribute="leading"
constant="1" id="YhV-sE-h07"/>
- <constraint firstItem="jHc-Bm-dWJ"
firstAttribute="leading" secondItem="Veq-Br-EFG" secondAttribute="trailing"
constant="5" id="tHn-hi-b0S"/>
- <constraint firstItem="Veq-Br-EFG"
firstAttribute="centerY" secondItem="jYx-ER-Exi" secondAttribute="centerY"
id="u5Z-na-kEg"/>
- <constraint firstItem="jYx-ER-Exi"
firstAttribute="leading" secondItem="jHc-Bm-dWJ" secondAttribute="trailing"
constant="5" id="yek-mo-9UQ"/>
- </constraints>
- </customView>
<segmentedControl verticalHuggingPriority="750"
fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="M3M-Fg-kEy">
<rect key="frame" x="170.5" y="47" width="33" height="23"/>
<autoresizingMask key="autoresizingMask"/>
@@ -691,11 +639,49 @@
<action selector="changePageBreaks:" target="-2"
id="MXV-gO-9af"/>
</connections>
</segmentedControl>
+ <segmentedControl verticalHuggingPriority="750"
fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Veq-Br-EFG">
+ <rect key="frame" x="150" y="18" width="33" height="23"/>
+ <autoresizingMask key="autoresizingMask"
flexibleMaxX="YES" flexibleMinY="YES"/>
+ <segmentedCell key="cell" borderStyle="border"
alignment="left" segmentDistribution="fill" style="texturedSquare"
trackingMode="momentary" id="BxE-Xo-uNS">
+ <font key="font" metaFont="system"/>
+ <segments>
+ <segment image="ToolbarPlay" imageScaling="none"
width="27"/>
+ </segments>
+ </segmentedCell>
+ <connections>
+ <action selector="togglePacer:" target="-2"
id="tWH-SL-o8t"/>
+ </connections>
+ </segmentedControl>
+ <textField verticalHuggingPriority="750"
preferredMaxLayoutWidth="36" translatesAutoresizingMaskIntoConstraints="NO"
id="jHc-Bm-dWJ">
+ <rect key="frame" x="190" y="19" width="30" height="21"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="30"
id="vHA-D8-mGk"/>
+ </constraints>
+ <textFieldCell key="cell" scrollable="YES"
lineBreakMode="clipping" selectable="YES" editable="YES"
sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="center"
drawsBackground="YES" id="9cD-jS-bcm">
+ <numberFormatter key="formatter"
formatterBehavior="default10_4" numberStyle="decimal" formatWidth="-1"
minimumIntegerDigits="1" maximumIntegerDigits="2000000000"
maximumFractionDigits="3" id="cUi-co-kf3">
+ <real key="minimum" value="1"/>
+ </numberFormatter>
+ <font key="font" metaFont="system"/>
+ <color key="textColor" name="controlTextColor"
catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor"
name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <binding destination="190" name="value"
keyPath="selection.pdfView.pacerSpeed" id="Qeo-Kl-wAp"/>
+ </connections>
+ </textField>
+ <stepper horizontalHuggingPriority="750"
verticalHuggingPriority="750" fixedFrame="YES"
translatesAutoresizingMaskIntoConstraints="NO" id="jYx-ER-Exi">
+ <rect key="frame" x="225" y="15" width="19" height="28"/>
+ <autoresizingMask key="autoresizingMask"
flexibleMaxX="YES" flexibleMinY="YES"/>
+ <stepperCell key="cell" continuous="YES" alignment="left"
minValue="1" maxValue="100" doubleValue="1" id="mIF-lD-uRK"/>
+ <connections>
+ <binding destination="190" name="value"
keyPath="selection.pdfView.pacerSpeed" id="G0d-wg-67j"/>
+ </connections>
+ </stepper>
</subviews>
<constraints>
- <constraint firstItem="eAi-bX-BYI" firstAttribute="leading"
secondItem="2" secondAttribute="leading" constant="146" id="40V-ef-ZtH"/>
<constraint firstAttribute="bottom" secondItem="38"
secondAttribute="bottom" constant="275" id="6OB-P3-1wa"/>
- <constraint firstAttribute="bottom" secondItem="eAi-bX-BYI"
secondAttribute="bottom" constant="16" id="JrC-Bv-iYG"/>
+ <constraint firstAttribute="bottom" secondItem="jHc-Bm-dWJ"
secondAttribute="bottom" constant="19" id="S4R-0B-0ad"/>
+ <constraint firstItem="jHc-Bm-dWJ" firstAttribute="leading"
secondItem="2" secondAttribute="leading" constant="190" id="S7p-id-FJM"/>
<constraint firstItem="36" firstAttribute="leading"
secondItem="2" secondAttribute="leading" constant="143" id="hKt-B2-zuA"/>
<constraint firstItem="38" firstAttribute="leading"
secondItem="2" secondAttribute="leading" constant="85" id="jzZ-3O-KI1"/>
<constraint firstAttribute="bottom" secondItem="36"
secondAttribute="bottom" constant="275" id="p3o-X8-Ske"/>
Modified: trunk/SKMainToolbarController.h
===================================================================
--- trunk/SKMainToolbarController.h 2021-03-15 18:46:07 UTC (rev 12204)
+++ trunk/SKMainToolbarController.h 2021-03-15 19:09:16 UTC (rev 12205)
@@ -83,7 +83,6 @@
NSTextField *scaleField;
NSSegmentedControl *noteButton;
SKColorSwatch *colorSwatch;
- NSView *pacerView;
NSSegmentedControl *pacerButton;
NSTextField *pacerSpeedField;
NSStepper *pacerSpeedStepper;
@@ -97,7 +96,6 @@
@property (nonatomic, retain) IBOutlet NSTextField *pageNumberField,
*scaleField, *pacerSpeedField;
@property (nonatomic, retain) IBOutlet SKColorSwatch *colorSwatch;
@property (nonatomic, retain) IBOutlet NSStepper *pacerSpeedStepper;
-@property (nonatomic, retain) IBOutlet NSView *pacerView;
- (void)setupToolbar;
Modified: trunk/SKMainToolbarController.m
===================================================================
--- trunk/SKMainToolbarController.m 2021-03-15 18:46:07 UTC (rev 12204)
+++ trunk/SKMainToolbarController.m 2021-03-15 19:09:16 UTC (rev 12205)
@@ -131,7 +131,7 @@
@implementation SKMainToolbarController
-@synthesize mainController, backForwardButton, pageNumberField,
previousNextPageButton, previousPageButton, nextPageButton,
previousNextFirstLastPageButton, zoomInOutButton, zoomInActualOutButton,
zoomActualButton, zoomFitButton, zoomSelectionButton, rotateLeftButton,
rotateRightButton, rotateLeftRightButton, cropButton, fullScreenButton,
presentationButton, leftPaneButton, rightPaneButton, toolModeButton,
textNoteButton, circleNoteButton, markupNoteButton, lineNoteButton,
singleTwoUpButton, continuousButton, displayModeButton, displayDirectionButton,
displaysRTLButton, bookModeButton, pageBreaksButton, displayBoxButton,
infoButton, colorsButton, fontsButton, linesButton, printButton,
customizeButton, scaleField, noteButton, colorSwatch, pacerView, pacerButton,
pacerSpeedField, pacerSpeedStepper, shareButton;
+@synthesize mainController, backForwardButton, pageNumberField,
previousNextPageButton, previousPageButton, nextPageButton,
previousNextFirstLastPageButton, zoomInOutButton, zoomInActualOutButton,
zoomActualButton, zoomFitButton, zoomSelectionButton, rotateLeftButton,
rotateRightButton, rotateLeftRightButton, cropButton, fullScreenButton,
presentationButton, leftPaneButton, rightPaneButton, toolModeButton,
textNoteButton, circleNoteButton, markupNoteButton, lineNoteButton,
singleTwoUpButton, continuousButton, displayModeButton, displayDirectionButton,
displaysRTLButton, bookModeButton, pageBreaksButton, displayBoxButton,
infoButton, colorsButton, fontsButton, linesButton, printButton,
customizeButton, scaleField, noteButton, colorSwatch, pacerButton,
pacerSpeedField, pacerSpeedStepper, shareButton;
- (void)dealloc {
mainController = nil;
@@ -177,7 +177,6 @@
SKDESTROY(pageNumberField);
SKDESTROY(scaleField);
SKDESTROY(colorSwatch);
- SKDESTROY(pacerView);
SKDESTROY(pacerButton);
SKDESTROY(pacerSpeedField);
SKDESTROY(pacerSpeedStepper);
@@ -756,10 +755,7 @@
frame = [pacerSpeedStepper frame];
frame.origin.y = ceil(NSMidY([pacerButton frame]) - 0.5 *
NSHeight([pacerSpeedStepper frame]));
[pacerSpeedStepper setFrame:frame];
- frame = [pacerView frame];
- frame.size.height = NSHeight([pacerButton frame]) + 1.0;
- [pacerView setFrame:frame];
-
+
menuItem = [NSMenuItem
menuItemWithSubmenuAndTitle:NSLocalizedString(@"Pacer", @"Toolbar item label")];
menu = [menuItem submenu];
[menu addItemWithTitle:NSLocalizedString(@"Start Pacer", @"Menu
item title") action:@selector(togglePacer:) target:mainController tag:0];
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
