Revision: 7333
http://skim-app.svn.sourceforge.net/skim-app/?rev=7333&view=rev
Author: hofman
Date: 2011-07-08 10:04:32 +0000 (Fri, 08 Jul 2011)
Log Message:
-----------
no need to use extra containing view for pref panes
Modified Paths:
--------------
trunk/PreferenceWindow.xib
trunk/SKPreferenceController.h
trunk/SKPreferenceController.m
Modified: trunk/PreferenceWindow.xib
===================================================================
--- trunk/PreferenceWindow.xib 2011-07-08 09:46:23 UTC (rev 7332)
+++ trunk/PreferenceWindow.xib 2011-07-08 10:04:32 UTC (rev 7333)
@@ -2,13 +2,13 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1040</int>
- <string key="IBDocument.SystemVersion">10C540</string>
- <string key="IBDocument.InterfaceBuilderVersion">740</string>
- <string key="IBDocument.AppKitVersion">1038.25</string>
- <string key="IBDocument.HIToolboxVersion">458.00</string>
+ <string key="IBDocument.SystemVersion">10K540</string>
+ <string key="IBDocument.InterfaceBuilderVersion">851</string>
+ <string key="IBDocument.AppKitVersion">1038.36</string>
+ <string key="IBDocument.HIToolboxVersion">461.00</string>
<object class="NSMutableDictionary"
key="IBDocument.PluginVersions">
<string
key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">740</string>
+ <string key="NS.object.0">851</string>
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -18,13 +18,8 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
</object>
<object class="NSMutableDictionary" key="IBDocument.Metadata">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys" id="0">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
+ <string
key="NS.key.0">PluginDependencyRecalculationVersion</string>
+ <integer value="1" key="NS.object.0"/>
</object>
<object class="NSMutableArray" key="IBDocument.RootObjects"
id="1046687300">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -40,7 +35,7 @@
<object class="NSWindowTemplate" id="981162220">
<int key="NSWindowStyleMask">3</int>
<int key="NSWindowBacking">2</int>
- <string key="NSWindowRect">{{327, 204}, {533,
566}}</string>
+ <string key="NSWindowRect">{{327, 514}, {438,
256}}</string>
<int key="NSWTFlags">1886914560</int>
<string key="NSWindowTitle"/>
<string
key="NSWindowClass">SKPreferenceWindow</string>
@@ -50,7 +45,7 @@
<string
key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
<string key="NSWindowContentMinSize">{213,
107}</string>
<object class="NSView" key="NSWindowView"
id="927475153">
- <nil key="NSNextResponder"/>
+ <reference key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray"
key="NSSubviews">
<bool
key="EncodedWithXMLCoder">YES</bool>
@@ -59,6 +54,7 @@
<int
key="NSvFlags">256</int>
<string
key="NSFrame">{{76, 3}, {73, 28}}</string>
<reference
key="NSSuperview" ref="927475153"/>
+ <reference
key="NSWindow"/>
<bool
key="NSEnabled">YES</bool>
<object
class="NSButtonCell" key="NSCell" id="882051690">
<int
key="NSCellFlags">67239424</int>
@@ -86,6 +82,7 @@
<int
key="NSvFlags">256</int>
<string
key="NSFrame">{{5, 3}, {73, 28}}</string>
<reference
key="NSSuperview" ref="927475153"/>
+ <reference
key="NSWindow"/>
<bool
key="NSEnabled">YES</bool>
<object
class="NSButtonCell" key="NSCell" id="516927679">
<int
key="NSCellFlags">67239424</int>
@@ -104,15 +101,10 @@
<int
key="NSPeriodicInterval">25</int>
</object>
</object>
- <object class="NSCustomView"
id="548768964">
- <reference
key="NSNextResponder" ref="927475153"/>
- <int
key="NSvFlags">274</int>
- <string
key="NSFrame">{{0, 31}, {533, 535}}</string>
- <reference
key="NSSuperview" ref="927475153"/>
- <string
key="NSClassName">NSView</string>
- </object>
</object>
- <string key="NSFrameSize">{533,
566}</string>
+ <string key="NSFrameSize">{438,
256}</string>
+ <reference key="NSSuperview"/>
+ <reference key="NSWindow"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1440,
878}}</string>
<string key="NSMinSize">{213, 129}</string>
@@ -158,14 +150,6 @@
<int key="connectionID">495</int>
</object>
<object class="IBConnectionRecord">
- <object class="IBOutletConnection"
key="connection">
- <string
key="label">contentView</string>
- <reference key="source"
ref="298295156"/>
- <reference key="destination"
ref="548768964"/>
- </object>
- <int key="connectionID">1653</int>
- </object>
- <object class="IBConnectionRecord">
<object
class="IBAccessibilityConnection" key="connection">
<string
key="label">link</string>
<reference key="source"
ref="46260068"/>
@@ -203,7 +187,9 @@
<bool
key="EncodedWithXMLCoder">YES</bool>
<object class="IBObjectRecord">
<int key="objectID">0</int>
- <reference key="object"
ref="0"/>
+ <object class="NSArray"
key="object" id="0">
+ <bool
key="EncodedWithXMLCoder">YES</bool>
+ </object>
<reference key="children"
ref="1046687300"/>
<nil key="parent"/>
</object>
@@ -242,7 +228,6 @@
<bool
key="EncodedWithXMLCoder">YES</bool>
<reference
ref="776334843"/>
<reference
ref="46260068"/>
- <reference
ref="548768964"/>
</object>
<reference key="parent"
ref="981162220"/>
</object>
@@ -275,11 +260,6 @@
<reference key="parent"
ref="46260068"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">1652</int>
- <reference key="object"
ref="548768964"/>
- <reference key="parent"
ref="927475153"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">1657</int>
<reference key="object"
ref="921399283"/>
<reference key="parent"
ref="0"/>
@@ -295,12 +275,13 @@
<string>-3.ImportedFromIB2</string>
<string>1648.IBPluginDependency</string>
<string>1649.IBPluginDependency</string>
- <string>1652.IBPluginDependency</string>
<string>491.IBAttributePlaceholdersKey</string>
<string>491.IBPluginDependency</string>
+
<string>491.IBViewBoundsToFrameTransform</string>
<string>491.ImportedFromIB2</string>
<string>492.IBAttributePlaceholdersKey</string>
<string>492.IBPluginDependency</string>
+
<string>492.IBViewBoundsToFrameTransform</string>
<string>492.ImportedFromIB2</string>
<string>5.IBEditorWindowLastContentRect</string>
<string>5.IBPluginDependency</string>
@@ -317,7 +298,6 @@
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSMutableDictionary">
<string
key="NS.key.0">ToolTip</string>
<object
class="IBToolTipAttribute" key="NS.object.0">
@@ -327,6 +307,9 @@
</object>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes
key="NSTransformStruct">P4AAAL+AAABCmAAAweAAAA</bytes>
+ </object>
<boolean value="YES"/>
<object class="NSMutableDictionary">
<string
key="NS.key.0">ToolTip</string>
@@ -337,10 +320,13 @@
</object>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes
key="NSTransformStruct">P4AAAL+AAABAoAAAweAAAA</bytes>
+ </object>
<boolean value="YES"/>
- <string>{{142, 159}, {533,
566}}</string>
+ <string>{{142, 469}, {438,
256}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{142, 159}, {533,
566}}</string>
+ <string>{{142, 469}, {438,
256}}</string>
<boolean value="YES"/>
<boolean value="YES"/>
<string>{213, 107}</string>
@@ -376,6 +362,13 @@
<string
key="NS.key.0">:</string>
<string
key="NS.object.0">id</string>
</object>
+ <object class="NSMutableDictionary"
key="actionInfosByName">
+ <string
key="NS.key.0">:</string>
+ <object class="IBActionInfo"
key="NS.object.0">
+ <string
key="name">:</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ </object>
<object
class="IBClassDescriptionSource" key="sourceIdentifier">
<string
key="majorKey">IBUserSource</string>
<string key="minorKey"/>
@@ -390,6 +383,13 @@
</object>
<object class="IBPartialClassDescription">
<string
key="className">NSApplication</string>
+ <object
class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string
key="majorKey">IBProjectSource</string>
+ <string
key="minorKey">SKScriptMenu.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string
key="className">NSApplication</string>
<string
key="superclassName">NSResponder</string>
<object
class="IBClassDescriptionSource" key="sourceIdentifier">
<string
key="majorKey">IBUserSource</string>
@@ -437,13 +437,6 @@
<string
key="className">NSObject</string>
<object
class="IBClassDescriptionSource" key="sourceIdentifier">
<string
key="majorKey">IBProjectSource</string>
- <string
key="minorKey">SKFindController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string
key="className">NSObject</string>
- <object
class="IBClassDescriptionSource" key="sourceIdentifier">
- <string
key="majorKey">IBProjectSource</string>
<string
key="minorKey">SKLine.h</string>
</object>
</object>
@@ -453,6 +446,13 @@
<string
key="NS.key.0">changeLineAttribute:</string>
<string
key="NS.object.0">id</string>
</object>
+ <object class="NSMutableDictionary"
key="actionInfosByName">
+ <string
key="NS.key.0">changeLineAttribute:</string>
+ <object class="IBActionInfo"
key="NS.object.0">
+ <string
key="name">changeLineAttribute:</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ </object>
<object
class="IBClassDescriptionSource" key="sourceIdentifier">
<string
key="majorKey">IBProjectSource</string>
<string
key="minorKey">SKLineInspector.h</string>
@@ -487,6 +487,25 @@
<string>PDFView</string>
</object>
</object>
+ <object class="NSMutableDictionary"
key="actionInfosByName">
+ <bool
key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray"
key="dict.sortedKeys">
+ <bool
key="EncodedWithXMLCoder">YES</bool>
+
<string>PDFViewDidBeginEditing:</string>
+
<string>PDFViewDidEndEditing:</string>
+ </object>
+ <object class="NSMutableArray"
key="dict.values">
+ <bool
key="EncodedWithXMLCoder">YES</bool>
+ <object
class="IBActionInfo">
+ <string
key="name">PDFViewDidBeginEditing:</string>
+ <string
key="candidateClassName">PDFView</string>
+ </object>
+ <object
class="IBActionInfo">
+ <string
key="name">PDFViewDidEndEditing:</string>
+ <string
key="candidateClassName">PDFView</string>
+ </object>
+ </object>
+ </object>
<object
class="IBClassDescriptionSource" key="sourceIdentifier">
<string
key="majorKey">IBProjectSource</string>
<string
key="minorKey">SKPDFView.h</string>
@@ -503,20 +522,6 @@
<string
key="className">NSObject</string>
<object
class="IBClassDescriptionSource" key="sourceIdentifier">
<string
key="majorKey">IBProjectSource</string>
- <string
key="minorKey">vendorsrc/martinkahr/RemoteControlWrapper/MultiClickRemoteBehavior.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string
key="className">NSObject</string>
- <object
class="IBClassDescriptionSource" key="sourceIdentifier">
- <string
key="majorKey">IBProjectSource</string>
- <string
key="minorKey">vendorsrc/martinkahr/RemoteControlWrapper/RemoteControl.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string
key="className">NSObject</string>
- <object
class="IBClassDescriptionSource" key="sourceIdentifier">
- <string
key="majorKey">IBProjectSource</string>
<string
key="minorKey">vendorsrc/ulikusterer/UKFileWatcher.h</string>
</object>
</object>
@@ -548,6 +553,40 @@
<string>id</string>
</object>
</object>
+ <object class="NSMutableDictionary"
key="actionInfosByName">
+ <bool
key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray"
key="dict.sortedKeys">
+ <bool
key="EncodedWithXMLCoder">YES</bool>
+
<string>changeDashPattern:</string>
+
<string>changeEndLineStyle:</string>
+
<string>changeLineStyle:</string>
+
<string>changeLineWidth:</string>
+
<string>changeStartLineStyle:</string>
+ </object>
+ <object class="NSMutableArray"
key="dict.values">
+ <bool
key="EncodedWithXMLCoder">YES</bool>
+ <object
class="IBActionInfo">
+ <string
key="name">changeDashPattern:</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ <object
class="IBActionInfo">
+ <string
key="name">changeEndLineStyle:</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ <object
class="IBActionInfo">
+ <string
key="name">changeLineStyle:</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ <object
class="IBActionInfo">
+ <string
key="name">changeLineWidth:</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ <object
class="IBActionInfo">
+ <string
key="name">changeStartLineStyle:</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ </object>
+ </object>
<object
class="IBClassDescriptionSource" key="sourceIdentifier">
<string
key="majorKey">IBUserSource</string>
<string key="minorKey"/>
@@ -601,9 +640,16 @@
<object class="IBPartialClassDescription">
<string
key="className">NSWindowController</string>
<object class="NSMutableDictionary"
key="actions">
- <string
key="NS.key.0">dismiss:</string>
+ <string
key="NS.key.0">dismissSheet:</string>
<string
key="NS.object.0">id</string>
</object>
+ <object class="NSMutableDictionary"
key="actionInfosByName">
+ <string
key="NS.key.0">dismissSheet:</string>
+ <object class="IBActionInfo"
key="NS.object.0">
+ <string
key="name">dismissSheet:</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ </object>
<object
class="IBClassDescriptionSource" key="sourceIdentifier">
<string
key="majorKey">IBProjectSource</string>
<string
key="minorKey">NSWindowController_SKExtensions.h</string>
@@ -618,6 +664,13 @@
</object>
</object>
<object class="IBPartialClassDescription">
+ <string key="className">PDFView</string>
+ <object
class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string
key="majorKey">IBProjectSource</string>
+ <string
key="minorKey">PDFView_SKExtensions.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
<string
key="className">SKIBArray</string>
<string
key="superclassName">NSArray</string>
<object class="NSMutableDictionary"
key="outlets">
@@ -629,6 +682,10 @@
<string>object3</string>
<string>object4</string>
<string>object5</string>
+ <string>object6</string>
+ <string>object7</string>
+ <string>object8</string>
+ <string>object9</string>
</object>
<object class="NSMutableArray"
key="dict.values">
<bool
key="EncodedWithXMLCoder">YES</bool>
@@ -637,8 +694,66 @@
<string>id</string>
<string>id</string>
<string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
</object>
</object>
+ <object class="NSMutableDictionary"
key="toOneOutletInfosByName">
+ <bool
key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray"
key="dict.sortedKeys">
+ <bool
key="EncodedWithXMLCoder">YES</bool>
+ <string>object1</string>
+ <string>object2</string>
+ <string>object3</string>
+ <string>object4</string>
+ <string>object5</string>
+ <string>object6</string>
+ <string>object7</string>
+ <string>object8</string>
+ <string>object9</string>
+ </object>
+ <object class="NSMutableArray"
key="dict.values">
+ <bool
key="EncodedWithXMLCoder">YES</bool>
+ <object
class="IBToOneOutletInfo">
+ <string
key="name">object1</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ <object
class="IBToOneOutletInfo">
+ <string
key="name">object2</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ <object
class="IBToOneOutletInfo">
+ <string
key="name">object3</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ <object
class="IBToOneOutletInfo">
+ <string
key="name">object4</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ <object
class="IBToOneOutletInfo">
+ <string
key="name">object5</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ <object
class="IBToOneOutletInfo">
+ <string
key="name">object6</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ <object
class="IBToOneOutletInfo">
+ <string
key="name">object7</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ <object
class="IBToOneOutletInfo">
+ <string
key="name">object8</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ <object
class="IBToOneOutletInfo">
+ <string
key="name">object9</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ </object>
+ </object>
<object
class="IBClassDescriptionSource" key="sourceIdentifier">
<string
key="majorKey">IBProjectSource</string>
<string
key="minorKey">SKIBArray.h</string>
@@ -653,6 +768,8 @@
<bool
key="EncodedWithXMLCoder">YES</bool>
<string>changeAttributes:</string>
<string>changeFont:</string>
+
<string>doGoToNextPage:</string>
+
<string>doGoToPreviousPage:</string>
<string>resetAll:</string>
<string>resetCurrent:</string>
</object>
@@ -662,21 +779,60 @@
<string>id</string>
<string>id</string>
<string>id</string>
+ <string>id</string>
+ <string>id</string>
</object>
</object>
- <object class="NSMutableDictionary"
key="outlets">
+ <object class="NSMutableDictionary"
key="actionInfosByName">
<bool
key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray"
key="dict.sortedKeys">
<bool
key="EncodedWithXMLCoder">YES</bool>
-
<string>contentView</string>
-
<string>resetButtons</string>
+
<string>changeAttributes:</string>
+
<string>changeFont:</string>
+
<string>doGoToNextPage:</string>
+
<string>doGoToPreviousPage:</string>
+
<string>resetAll:</string>
+
<string>resetCurrent:</string>
</object>
<object class="NSMutableArray"
key="dict.values">
<bool
key="EncodedWithXMLCoder">YES</bool>
- <string>NSView</string>
- <string>NSArray</string>
+ <object
class="IBActionInfo">
+ <string
key="name">changeAttributes:</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ <object
class="IBActionInfo">
+ <string
key="name">changeFont:</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ <object
class="IBActionInfo">
+ <string
key="name">doGoToNextPage:</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ <object
class="IBActionInfo">
+ <string
key="name">doGoToPreviousPage:</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ <object
class="IBActionInfo">
+ <string
key="name">resetAll:</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ <object
class="IBActionInfo">
+ <string
key="name">resetCurrent:</string>
+ <string
key="candidateClassName">id</string>
+ </object>
</object>
</object>
+ <object class="NSMutableDictionary"
key="outlets">
+ <string
key="NS.key.0">resetButtons</string>
+ <string
key="NS.object.0">NSArray</string>
+ </object>
+ <object class="NSMutableDictionary"
key="toOneOutletInfosByName">
+ <string
key="NS.key.0">resetButtons</string>
+ <object
class="IBToOneOutletInfo" key="NS.object.0">
+ <string
key="name">resetButtons</string>
+ <string
key="candidateClassName">NSArray</string>
+ </object>
+ </object>
<object
class="IBClassDescriptionSource" key="sourceIdentifier">
<string
key="majorKey">IBProjectSource</string>
<string
key="minorKey">SKPreferenceController.h</string>
@@ -689,6 +845,13 @@
<string
key="NS.key.0">changeUpdateInterval:</string>
<string
key="NS.object.0">id</string>
</object>
+ <object class="NSMutableDictionary"
key="actionInfosByName">
+ <string
key="NS.key.0">changeUpdateInterval:</string>
+ <object class="IBActionInfo"
key="NS.object.0">
+ <string
key="name">changeUpdateInterval:</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ </object>
<object
class="IBClassDescriptionSource" key="sourceIdentifier">
<string
key="majorKey">IBUserSource</string>
<string key="minorKey"/>
@@ -1240,6 +1403,13 @@
<string
key="NS.key.0">showWindow:</string>
<string
key="NS.object.0">id</string>
</object>
+ <object class="NSMutableDictionary"
key="actionInfosByName">
+ <string
key="NS.key.0">showWindow:</string>
+ <object class="IBActionInfo"
key="NS.object.0">
+ <string
key="name">showWindow:</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ </object>
<object
class="IBClassDescriptionSource" key="sourceIdentifier">
<string
key="majorKey">IBFrameworkSource</string>
<string
key="minorKey">AppKit.framework/Headers/NSWindowController.h</string>
@@ -1277,18 +1447,78 @@
<string>id</string>
</object>
</object>
+ <object class="NSMutableDictionary"
key="actionInfosByName">
+ <bool
key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray"
key="dict.sortedKeys">
+ <bool
key="EncodedWithXMLCoder">YES</bool>
+ <string>goBack:</string>
+
<string>goForward:</string>
+
<string>goToFirstPage:</string>
+
<string>goToLastPage:</string>
+
<string>goToNextPage:</string>
+
<string>goToPreviousPage:</string>
+
<string>selectAll:</string>
+
<string>takeBackgroundColorFrom:</string>
+ <string>zoomIn:</string>
+
<string>zoomOut:</string>
+ </object>
+ <object class="NSMutableArray"
key="dict.values">
+ <bool
key="EncodedWithXMLCoder">YES</bool>
+ <object
class="IBActionInfo">
+ <string
key="name">goBack:</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ <object
class="IBActionInfo">
+ <string
key="name">goForward:</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ <object
class="IBActionInfo">
+ <string
key="name">goToFirstPage:</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ <object
class="IBActionInfo">
+ <string
key="name">goToLastPage:</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ <object
class="IBActionInfo">
+ <string
key="name">goToNextPage:</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ <object
class="IBActionInfo">
+ <string
key="name">goToPreviousPage:</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ <object
class="IBActionInfo">
+ <string
key="name">selectAll:</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ <object
class="IBActionInfo">
+ <string
key="name">takeBackgroundColorFrom:</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ <object
class="IBActionInfo">
+ <string
key="name">zoomIn:</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ <object
class="IBActionInfo">
+ <string
key="name">zoomOut:</string>
+ <string
key="candidateClassName">id</string>
+ </object>
+ </object>
+ </object>
<reference key="sourceIdentifier"
ref="93965670"/>
</object>
</object>
</object>
<int key="IBDocument.localizationMode">0</int>
+ <string
key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
<object class="NSMutableDictionary"
key="IBDocument.PluginDeclaredDependencies">
<string
key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
<integer value="1040" key="NS.object.0"/>
</object>
<object class="NSMutableDictionary"
key="IBDocument.PluginDeclaredDependencyDefaults">
<string
key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
- <integer value="1050" key="NS.object.0"/>
+ <integer value="1060" key="NS.object.0"/>
</object>
<object class="NSMutableDictionary"
key="IBDocument.PluginDeclaredDevelopmentDependencies">
<string
key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
Modified: trunk/SKPreferenceController.h
===================================================================
--- trunk/SKPreferenceController.h 2011-07-08 09:46:23 UTC (rev 7332)
+++ trunk/SKPreferenceController.h 2011-07-08 10:04:32 UTC (rev 7333)
@@ -42,13 +42,11 @@
@class SKPreferencePane, SKIBArray;
@interface SKPreferenceController : SKWindowController <NSWindowDelegate,
NSTabViewDelegate, NSToolbarDelegate> {
- NSView *contentView;
NSArray *resetButtons;
NSArray *preferencePanes;
SKPreferencePane *currentPane;
}
-@property (nonatomic, retain) IBOutlet NSView *contentView;
@property (nonatomic, retain) IBOutlet NSArray *resetButtons;
+ (id)sharedPrefenceController;
Modified: trunk/SKPreferenceController.m
===================================================================
--- trunk/SKPreferenceController.m 2011-07-08 09:46:23 UTC (rev 7332)
+++ trunk/SKPreferenceController.m 2011-07-08 10:04:32 UTC (rev 7333)
@@ -59,9 +59,11 @@
#define NIBNAME_KEY @"nibName"
+#define BOTTOM_MARGIN 27.0
+
@implementation SKPreferenceController
-@synthesize contentView, resetButtons;
+@synthesize resetButtons;
static SKPreferenceController *sharedPrefenceController = nil;
@@ -97,7 +99,6 @@
- (void)dealloc {
currentPane = nil;
SKDESTROY(preferencePanes);
- SKDESTROY(contentView);
SKDESTROY(resetButtons);
[super dealloc];
}
@@ -110,7 +111,7 @@
}
- (void)endAnimation {
- [contentView setWantsLayer:NO];
+ [[[self window] contentView] setWantsLayer:NO];
}
- (void)selectPane:(SKPreferencePane *)pane {
@@ -120,9 +121,10 @@
[[NSUserDefaultsController sharedUserDefaultsController]
commitEditing];
NSView *oldView = [currentPane view];
+ NSView *contentView = [[self window] contentView];
NSView *view = [pane view];
NSRect frame = [view frame];
- CGFloat dh = NSHeight([contentView frame]) - NSHeight(frame);
+ CGFloat dh = NSHeight([contentView frame]) - NSMaxY(frame);
frame = [[self window] frame];
frame.origin.y += dh;
@@ -181,6 +183,7 @@
frame.size.width = width;
else
frame.origin.x = floor(0.5 * (width - NSWidth(frame)));
+ frame.origin.y = BOTTOM_MARGIN;
[view setFrame:frame];
}
@@ -191,11 +194,10 @@
view = [currentPane view];
frame = [[self window] frame];
frame.size.width = width;
- frame.size.height -= NSHeight([contentView frame]) - NSHeight([view
frame]);
+ frame.size.height -= NSHeight([[[self window] contentView] frame]) -
NSMaxY([view frame]);
[window setFrame:frame display:NO];
- [view setFrameOrigin:NSMakePoint(floor(0.5 * (width - NSWidth([view
frame]))), 0.0)];
- [contentView addSubview:view];
+ [[[self window] contentView] addSubview:view];
}
- (void)windowDidResignMain:(NSNotification *)notification {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
All of the data generated in your IT infrastructure is seriously valuable.
Why? It contains a definitive record of application performance, security
threats, fraudulent activity, and more. Splunk takes this data and makes
sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-d2d-c2
_______________________________________________
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
