Skip to content
Permalink
Browse files

Fix a drawing issue on 10.6 and move some code

  • Loading branch information...
dmoagx committed May 15, 2018
1 parent 4145d3d commit 67531d3eef6cf819c54b3b55aa9e96261db4cbba
@@ -6,39 +6,17 @@
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6751"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="SPTableContent">
<customObject id="-2" userLabel="File's Owner" customClass="ContentPaginationViewController">
<connections>
<outlet property="paginationBox" destination="2" id="plQ-Ch-kaG"/>
<outlet property="paginationGoButton" destination="cXy-Rp-Edv" id="tIC-S1-mTE"/>
<outlet property="paginationPageField" destination="Vtc-V2-j0v" id="cwZ-g9-Qbj"/>
<outlet property="paginationView" destination="1" id="46"/>
<outlet property="paginationViewController" destination="hrG-95-pXC" id="yiZ-Ax-bVs"/>
<outlet property="paginationPageStepper" destination="S7c-s1-KCT" id="c4Q-RA-Dny"/>
<outlet property="view" destination="ZlV-bd-j4D" id="zKu-MD-Rhn"/>
</connections>
</customObject>
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
<customObject id="-3" userLabel="Application"/>
<customView id="1">
<rect key="frame" x="0.0" y="0.0" width="330" height="89"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
<subviews>
<box autoresizesSubviews="NO" wantsLayer="YES" boxType="custom" borderType="line" titlePosition="noTitle" id="2">
<rect key="frame" x="0.0" y="-47" width="330" height="136"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
<view key="contentView">
<rect key="frame" x="1" y="1" width="328" height="134"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
</view>
<color key="borderColor" white="0.0" alpha="0.20000000300000001" colorSpace="calibratedWhite"/>
<color key="fillColor" white="0.94758063550000005" alpha="1" colorSpace="calibratedWhite"/>
</box>
</subviews>
</customView>
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
<userDefaultsController representsSharedInstance="YES" id="24"/>
<viewController id="hrG-95-pXC" userLabel="Popover View Controller">
<connections>
<outlet property="view" destination="ZlV-bd-j4D" id="zor-2S-MNt"/>
</connections>
</viewController>
<customView id="ZlV-bd-j4D" userLabel="Popover Content View">
<rect key="frame" x="0.0" y="0.0" width="330" height="89"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
@@ -51,7 +29,7 @@
<font key="font" metaFont="smallSystem"/>
</buttonCell>
<connections>
<action selector="navigatePaginationFromButton:" target="-2" id="28B-A6-zUZ"/>
<action selector="paginationGoAction:" target="-2" id="86K-61-7Jl"/>
<binding destination="24" name="enabled" keyPath="values.LimitResults" id="AkR-JA-LEs"/>
</connections>
</button>
@@ -69,6 +47,8 @@
</textFieldCell>
<connections>
<action selector="performClick:" target="cXy-Rp-Edv" id="4Uu-gW-Xhz"/>
<binding destination="-2" name="maxValue" keyPath="maxPage" id="JKa-ju-VyP"/>
<binding destination="-2" name="value" keyPath="page" previousBinding="JKa-ju-VyP" id="21h-9k-7Xk"/>
<binding destination="24" name="enabled" keyPath="values.LimitResults" id="rJH-8j-rCm"/>
</connections>
</textField>
@@ -108,7 +88,8 @@
<font key="font" metaFont="smallSystem"/>
</stepperCell>
<connections>
<action selector="takeIntValueFrom:" target="Vtc-V2-j0v" id="JYr-Pw-YZ2"/>
<binding destination="-2" name="maxValue" keyPath="maxPage" id="h3F-DA-oCz"/>
<binding destination="-2" name="value" keyPath="page" previousBinding="h3F-DA-oCz" id="W48-Lg-Q7t"/>
<binding destination="24" name="enabled" keyPath="values.LimitResults" id="Nl1-31-oLD"/>
</connections>
</stepper>
@@ -4596,15 +4596,17 @@ Gw
<outlet property="contentViewPane" destination="27" id="6661"/>
<outlet property="countText" destination="261" id="262"/>
<outlet property="duplicateButton" destination="5178" id="7837"/>
<outlet property="ruleFilterController" destination="ki9-Po-bdr" id="5od-0U-9xj"/>
<outlet property="filterRuleEditorContainer" destination="9oo-u0-ndW" id="OZb-jI-CMy"/>
<outlet property="filterTableController" destination="UBS-cN-3Af" id="FV7-by-Gy1"/>
<outlet property="multipleLineEditingButton" destination="5201" id="5203"/>
<outlet property="paginationBox" destination="Cen-HW-aJR" id="cE5-7g-Pzn"/>
<outlet property="paginationButton" destination="6653" id="6657"/>
<outlet property="paginationNextButton" destination="6647" id="6664"/>
<outlet property="paginationPreviousButton" destination="6650" id="6663"/>
<outlet property="paginationView" destination="EmC-GF-Hfu" id="l4X-ze-hG5"/>
<outlet property="reloadButton" destination="5176" id="6625"/>
<outlet property="removeButton" destination="5177" id="5190"/>
<outlet property="ruleFilterController" destination="ki9-Po-bdr" id="5od-0U-9xj"/>
<outlet property="spHistoryControllerInstance" destination="6297" id="6316"/>
<outlet property="tableContentContainer" destination="vcX-Xr-0cm" id="Xak-w0-y6x"/>
<outlet property="tableContentView" destination="36" id="142"/>
</view>
<point key="canvasLocation" x="98" y="659.5"/>
</window>
<customView id="EmC-GF-Hfu">
<rect key="frame" x="0.0" y="0.0" width="330" height="89"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
<subviews>
<box autoresizesSubviews="NO" wantsLayer="YES" boxType="custom" borderType="line" titlePosition="noTitle" id="Cen-HW-aJR">
<rect key="frame" x="0.0" y="-47" width="330" height="136"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
<view key="contentView" id="yNs-cH-TWp">
<rect key="frame" x="1" y="1" width="328" height="134"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
</view>
<color key="borderColor" white="0.0" alpha="0.20000000300000001" colorSpace="calibratedWhite"/>
<color key="fillColor" white="0.94758063550000005" alpha="1" colorSpace="calibratedWhite"/>
</box>
</subviews>
<point key="canvasLocation" x="19" y="-25"/>
</customView>
</objects>
<resources>
<image name="NSAdvanced" width="32" height="32"/>
@@ -46,6 +46,8 @@
@class SPRuleFilterController;
@class SPFilterTableController;

@class ContentPaginationViewController; //private

typedef NS_ENUM(NSInteger, SPTableContentFilterSource) {
SPTableContentFilterSourceNone = -1,
SPTableContentFilterSourceRuleFilter = 0,
@@ -82,19 +84,14 @@ typedef NS_ENUM(NSInteger, SPTableContentFilterSource) {
IBOutlet NSButton *paginationPreviousButton;
#ifndef SP_CODA
IBOutlet NSButton *paginationButton;
IBOutlet NSButton *paginationGoButton;
#endif
IBOutlet NSButton *paginationNextButton;
#ifndef SP_CODA
IBOutlet NSView *contentViewPane;
IBOutlet NSViewController *paginationViewController;
ContentPaginationViewController *paginationViewController;
NSPopover *paginationPopover;
IBOutlet NSView *paginationView;
IBOutlet NSBox *paginationBox;
NSPopover *paginationPopover;
#endif
IBOutlet NSTextField *paginationPageField;
#ifndef SP_CODA
IBOutlet NSStepper *paginationPageStepper;

IBOutlet SPRuleFilterController *ruleFilterController;
IBOutlet SPFilterTableController *filterTableController;
@@ -188,7 +185,6 @@ typedef NS_ENUM(NSInteger, SPTableContentFilterSource) {
@property (assign) NSButton* reloadButton;
@property (assign) NSButton* paginationNextButton;
@property (assign) NSButton* paginationPreviousButton;
@property (assign) NSTextField* paginationPageField;
@property (assign) SPDatabaseDocument* tableDocumentInstance;
@property (assign) SPTablesList* tablesListInstance;
@property (assign) SPCopyTable* tableContentView;
Oops, something went wrong.

0 comments on commit 67531d3

Please sign in to comment.
You can’t perform that action at this time.