Revision: 7330 http://skim-app.svn.sourceforge.net/skim-app/?rev=7330&view=rev Author: hofman Date: 2011-07-07 11:32:14 +0000 (Thu, 07 Jul 2011)
Log Message: ----------- Center pref panes instead of resizing the width of the window. This way the titlebar stays fixed. Consistent with Apple's pref panes. Modified Paths: -------------- trunk/DisplayPreferences.xib trunk/GeneralPreferences.xib trunk/NotesPreferences.xib trunk/SKPreferenceController.m trunk/SyncPreferences.xib Modified: trunk/DisplayPreferences.xib =================================================================== --- trunk/DisplayPreferences.xib 2011-07-06 11:55:34 UTC (rev 7329) +++ trunk/DisplayPreferences.xib 2011-07-07 11:32:14 UTC (rev 7330) @@ -2,9 +2,9 @@ <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10"> <data> <int key="IBDocument.SystemTarget">1060</int> - <string key="IBDocument.SystemVersion">10J869</string> + <string key="IBDocument.SystemVersion">10K540</string> <string key="IBDocument.InterfaceBuilderVersion">851</string> - <string key="IBDocument.AppKitVersion">1038.35</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> @@ -33,8 +33,8 @@ <string key="NSClassName">NSApplication</string> </object> <object class="NSCustomView" id="1005"> - <reference key="NSNextResponder"/> - <int key="NSvFlags">268</int> + <nil key="NSNextResponder"/> + <int key="NSvFlags">292</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSComboBox" id="992421370"> @@ -42,7 +42,6 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{124, 257}, {57, 26}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSComboBoxCell" key="NSCell" id="858253465"> <int key="NSCellFlags">343014976</int> @@ -225,7 +224,6 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{17, 261}, {102, 17}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="501819390"> <int key="NSCellFlags">68288064</int> @@ -247,7 +245,6 @@ <int key="NSvFlags">258</int> <string key="NSFrame">{{12, 245}, {315, 5}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <string key="NSOffsets">{0, 0}</string> <object class="NSTextFieldCell" key="NSTitleCell"> <int key="NSCellFlags">67239424</int> @@ -270,7 +267,6 @@ <int key="NSvFlags">258</int> <string key="NSFrame">{{12, 153}, {315, 5}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <string key="NSOffsets">{0, 0}</string> <object class="NSTextFieldCell" key="NSTitleCell"> <int key="NSCellFlags">67239424</int> @@ -293,7 +289,6 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{41, 24}, {43, 17}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="907367062"> <int key="NSCellFlags">68288064</int> @@ -310,7 +305,6 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{159, 23}, {83, 18}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="179185784"> <int key="NSCellFlags">67239424</int> @@ -347,7 +341,6 @@ </object> <string key="NSFrame">{{89, 20}, {52, 24}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <bool key="NSIsBordered">YES</bool> <object class="NSColor" key="NSColor"> @@ -360,7 +353,6 @@ <int key="NSvFlags">258</int> <string key="NSFrame">{{17, 52}, {305, 17}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="770809825"> <int key="NSCellFlags">68288064</int> @@ -377,7 +369,6 @@ <int key="NSvFlags">258</int> <string key="NSFrame">{{12, 79}, {315, 5}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <string key="NSOffsets">{0, 0}</string> <object class="NSTextFieldCell" key="NSTitleCell"> <int key="NSCellFlags">67239424</int> @@ -409,7 +400,6 @@ </object> <string key="NSFrame">{{240, 94}, {52, 24}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <bool key="NSIsBordered">YES</bool> <object class="NSColor" key="NSColor"> @@ -431,7 +421,6 @@ </object> <string key="NSFrame">{{89, 94}, {52, 24}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <bool key="NSIsBordered">YES</bool> <object class="NSColor" key="NSColor"> @@ -444,7 +433,6 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{158, 98}, {77, 17}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="314998176"> <int key="NSCellFlags">68288064</int> @@ -461,7 +449,6 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{29, 98}, {55, 17}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="950299575"> <int key="NSCellFlags">68288064</int> @@ -478,7 +465,6 @@ <int key="NSvFlags">258</int> <string key="NSFrame">{{17, 126}, {305, 17}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="227183864"> <int key="NSCellFlags">68288064</int> @@ -495,7 +481,6 @@ <int key="NSvFlags">258</int> <string key="NSFrame">{{17, 218}, {305, 17}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="971644572"> <int key="NSCellFlags">68288064</int> @@ -512,7 +497,6 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{29, 190}, {130, 17}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="1048466871"> <int key="NSCellFlags">68288064</int> @@ -529,7 +513,6 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{164, 188}, {53, 22}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="275331186"> <int key="NSCellFlags">-1804468671</int> @@ -603,7 +586,6 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{30, 166}, {189, 18}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="978934309"> <int key="NSCellFlags">-2080244224</int> @@ -626,7 +608,6 @@ <int key="NSvFlags">258</int> <string key="NSFrame">{{12, 291}, {315, 5}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <string key="NSOffsets">{0, 0}</string> <object class="NSTextFieldCell" key="NSTitleCell"> <int key="NSCellFlags">67239424</int> @@ -649,7 +630,6 @@ <int key="NSvFlags">258</int> <string key="NSFrame">{{17, 397}, {459, 17}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="862300099"> <int key="NSCellFlags">68288064</int> @@ -666,7 +646,6 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{105, 304}, {110, 18}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="704726313"> <int key="NSCellFlags">67239424</int> @@ -689,7 +668,6 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{105, 336}, {149, 21}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSSliderCell" key="NSCell" id="167349722"> <int key="NSCellFlags">67239424</int> @@ -718,7 +696,6 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{29, 340}, {73, 17}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="750825339"> <int key="NSCellFlags">68288064</int> @@ -735,7 +712,6 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{105, 368}, {149, 21}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSSliderCell" key="NSCell" id="961800403"> <int key="NSCellFlags">67239424</int> @@ -760,7 +736,6 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{57, 372}, {45, 17}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="87733577"> <int key="NSCellFlags">68288064</int> @@ -774,8 +749,6 @@ </object> </object> <string key="NSFrameSize">{339, 434}</string> - <reference key="NSSuperview"/> - <reference key="NSWindow"/> <string key="NSClassName">NSView</string> </object> <object class="NSUserDefaultsController" id="888202062"> @@ -1986,13 +1959,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> @@ -2110,6 +2076,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">SKDisplayPreferences</string> <string key="superclassName">SKPreferencePane</string> <object class="NSMutableDictionary" key="actions"> Modified: trunk/GeneralPreferences.xib =================================================================== --- trunk/GeneralPreferences.xib 2011-07-06 11:55:34 UTC (rev 7329) +++ trunk/GeneralPreferences.xib 2011-07-07 11:32:14 UTC (rev 7330) @@ -34,7 +34,7 @@ </object> <object class="NSCustomView" id="1005"> <nil key="NSNextResponder"/> - <int key="NSvFlags">268</int> + <int key="NSvFlags">292</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSTextField" id="1008857157"> Modified: trunk/NotesPreferences.xib =================================================================== --- trunk/NotesPreferences.xib 2011-07-06 11:55:34 UTC (rev 7329) +++ trunk/NotesPreferences.xib 2011-07-07 11:32:14 UTC (rev 7330) @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10"> <data> - <int key="IBDocument.SystemTarget">1050</int> - <string key="IBDocument.SystemVersion">10H574</string> - <string key="IBDocument.InterfaceBuilderVersion">823</string> - <string key="IBDocument.AppKitVersion">1038.35</string> + <int key="IBDocument.SystemTarget">1060</int> + <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">823</string> + <string key="NS.object.0">851</string> </object> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -33,8 +33,8 @@ <string key="NSClassName">NSApplication</string> </object> <object class="NSCustomView" id="1005"> - <reference key="NSNextResponder"/> - <int key="NSvFlags">268</int> + <nil key="NSNextResponder"/> + <int key="NSvFlags">292</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSButton" id="17412635"> @@ -42,7 +42,6 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{122, 230}, {367, 22}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="942827002"> <int key="NSCellFlags">67239424</int> @@ -70,7 +69,6 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{122, 262}, {367, 22}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="58431203"> <int key="NSCellFlags">67239424</int> @@ -94,7 +92,6 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{48, 233}, {69, 17}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="541887597"> <int key="NSCellFlags">68288064</int> @@ -127,7 +124,6 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{80, 265}, {37, 17}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="284131075"> <int key="NSCellFlags">68288064</int> @@ -144,7 +140,6 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{32, 337}, {85, 17}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="352462776"> <int key="NSCellFlags">68288064</int> @@ -170,7 +165,6 @@ </object> <string key="NSFrame">{{122, 333}, {52, 24}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <bool key="NSIsBordered">YES</bool> <object class="NSColor" key="NSColor" id="699519570"> @@ -183,7 +177,6 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{204, 337}, {82, 17}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="302420903"> <int key="NSCellFlags">68288064</int> @@ -209,7 +202,6 @@ </object> <string key="NSFrame">{{291, 333}, {52, 24}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <bool key="NSIsBordered">YES</bool> <reference key="NSColor" ref="699519570"/> @@ -219,7 +211,6 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{191, 401}, {95, 17}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="564574178"> <int key="NSCellFlags">68288064</int> @@ -245,7 +236,6 @@ </object> <string key="NSFrame">{{291, 397}, {52, 24}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <bool key="NSIsBordered">YES</bool> <reference key="NSColor" ref="699519570"/> @@ -255,7 +245,6 @@ <int key="NSvFlags">258</int> <string key="NSFrame">{{17, 188}, {475, 17}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="307262770"> <int key="NSCellFlags">68288064</int> @@ -272,7 +261,6 @@ <int key="NSvFlags">258</int> <string key="NSFrame">{{12, 215}, {485, 5}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <string key="NSOffsets">{0, 0}</string> <object class="NSTextFieldCell" key="NSTitleCell"> <int key="NSCellFlags">67239424</int> @@ -303,7 +291,6 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{332, 92}, {32, 17}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="322087153"> <int key="NSCellFlags">68288064</int> @@ -320,7 +307,6 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{369, 76}, {120, 48}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <string key="NSClassName">SKLineWell</string> <string key="NSExtension">NSControl</string> </object> @@ -329,7 +315,6 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{320, 148}, {44, 17}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="821514814"> <int key="NSCellFlags">68288064</int> @@ -346,7 +331,6 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{369, 132}, {120, 48}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <string key="NSClassName">SKLineWell</string> <string key="NSExtension">NSControl</string> </object> @@ -355,7 +339,6 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{50, 36}, {67, 17}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="1029913034"> <int key="NSCellFlags">68288064</int> @@ -372,7 +355,6 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{122, 20}, {120, 48}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <string key="NSClassName">SKLineWell</string> <string key="NSExtension">NSControl</string> </object> @@ -381,7 +363,6 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{82, 92}, {35, 17}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="1067494187"> <int key="NSCellFlags">68288064</int> @@ -398,7 +379,6 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{122, 76}, {120, 48}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <string key="NSClassName">SKLineWell</string> <string key="NSExtension">NSControl</string> </object> @@ -407,7 +387,6 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{80, 148}, {37, 17}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="503612567"> <int key="NSCellFlags">68288064</int> @@ -424,7 +403,6 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{122, 132}, {120, 48}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <string key="NSClassName">SKLineWell</string> <string key="NSExtension">NSControl</string> </object> @@ -433,7 +411,6 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{82, 369}, {35, 17}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="1006832893"> <int key="NSCellFlags">68288064</int> @@ -459,7 +436,6 @@ </object> <string key="NSFrame">{{122, 365}, {52, 24}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <bool key="NSIsBordered">YES</bool> <object class="NSColor" key="NSColor"> @@ -472,7 +448,6 @@ <int key="NSvFlags">258</int> <string key="NSFrame">{{12, 318}, {485, 5}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <string key="NSOffsets">{0, 0}</string> <object class="NSTextFieldCell" key="NSTitleCell"> <int key="NSCellFlags">67239424</int> @@ -495,7 +470,6 @@ <int key="NSvFlags">258</int> <string key="NSFrame">{{17, 291}, {475, 17}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="86143246"> <int key="NSCellFlags">68288064</int> @@ -512,7 +486,6 @@ <int key="NSvFlags">258</int> <string key="NSFrame">{{17, 461}, {475, 17}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="156594319"> <int key="NSCellFlags">68288064</int> @@ -529,7 +502,6 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{366, 337}, {67, 17}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="639024076"> <int key="NSCellFlags">68288064</int> @@ -555,7 +527,6 @@ </object> <string key="NSFrame">{{437, 333}, {52, 24}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <bool key="NSIsBordered">YES</bool> <object class="NSColor" key="NSColor" id="958251680"> @@ -568,7 +539,6 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{360, 369}, {72, 17}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="628123043"> <int key="NSCellFlags">68288064</int> @@ -594,7 +564,6 @@ </object> <string key="NSFrame">{{437, 365}, {52, 24}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <bool key="NSIsBordered">YES</bool> <reference key="NSColor" ref="958251680"/> @@ -604,7 +573,6 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{363, 401}, {69, 17}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="751148081"> <int key="NSCellFlags">68288064</int> @@ -630,7 +598,6 @@ </object> <string key="NSFrame">{{437, 397}, {52, 24}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <bool key="NSIsBordered">YES</bool> <object class="NSColor" key="NSColor"> @@ -643,7 +610,6 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{365, 433}, {67, 17}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="288624897"> <int key="NSCellFlags">68288064</int> @@ -669,7 +635,6 @@ </object> <string key="NSFrame">{{437, 429}, {52, 24}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <bool key="NSIsBordered">YES</bool> <object class="NSColor" key="NSColor"> @@ -682,7 +647,6 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{254, 369}, {32, 17}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="994688985"> <int key="NSCellFlags">68288064</int> @@ -708,7 +672,6 @@ </object> <string key="NSFrame">{{291, 365}, {52, 24}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <bool key="NSIsBordered">YES</bool> <object class="NSColor" key="NSColor"> @@ -721,7 +684,6 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{242, 433}, {44, 17}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="150818374"> <int key="NSCellFlags">68288064</int> @@ -747,7 +709,6 @@ </object> <string key="NSFrame">{{291, 429}, {52, 24}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <bool key="NSIsBordered">YES</bool> <reference key="NSColor" ref="958251680"/> @@ -757,7 +718,6 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{48, 401}, {69, 17}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="740954090"> <int key="NSCellFlags">68288064</int> @@ -783,7 +743,6 @@ </object> <string key="NSFrame">{{122, 397}, {52, 24}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <bool key="NSIsBordered">YES</bool> <object class="NSColor" key="NSColor" id="479188063"> @@ -796,7 +755,6 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{80, 433}, {37, 17}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="362190971"> <int key="NSCellFlags">68288064</int> @@ -822,15 +780,12 @@ </object> <string key="NSFrame">{{122, 429}, {52, 24}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <bool key="NSIsBordered">YES</bool> <reference key="NSColor" ref="479188063"/> </object> </object> <string key="NSFrameSize">{509, 498}</string> - <reference key="NSSuperview"/> - <reference key="NSWindow"/> <string key="NSClassName">NSView</string> </object> <object class="NSUserDefaultsController" id="251596978"> @@ -2907,13 +2862,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> @@ -3031,6 +2979,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">SKFontWell</string> <string key="superclassName">NSButton</string> <object class="NSMutableDictionary" key="actions"> @@ -4037,7 +3992,7 @@ <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string> <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.m =================================================================== --- trunk/SKPreferenceController.m 2011-07-06 11:55:34 UTC (rev 7329) +++ trunk/SKPreferenceController.m 2011-07-07 11:32:14 UTC (rev 7330) @@ -120,9 +120,7 @@ NSView *view = [pane view]; NSRect frame = [view frame]; CGFloat dh = NSHeight([contentView frame]) - NSHeight(frame); - CGFloat dw = NSWidth([contentView frame]) - NSWidth(frame); - [view setFrameOrigin:NSMakePoint(0.0, dh)]; [contentView replaceSubview:[currentPane view] with:view]; currentPane = pane; @@ -130,7 +128,6 @@ frame = [[self window] frame]; frame.origin.y += dh; frame.size.height -= dh; - frame.size.width -= dw; [[self window] setFrame:frame display:YES animate:YES]; [[NSUserDefaults standardUserDefaults] setObject:[currentPane nibName] forKey:SKLastSelectedPreferencePaneKey]; @@ -152,17 +149,33 @@ SKAutoSizeButtons(resetButtons, NO); + CGFloat width = 0.0; + NSRect frame; + SKPreferencePane *pane; + NSView *view; + for (pane in preferencePanes) + width = fmax(width, NSWidth([[pane view] frame])); + for (pane in preferencePanes) { + view = [pane view]; + frame = [view frame]; + if (([view autoresizingMask] & NSViewWidthSizable)) + frame.size.width = width; + else + frame.origin.x = floor(0.5 * (width - NSWidth(frame))); + [view setFrame:frame]; + } + currentPane = [self preferencePaneForItemIdentifier:[[NSUserDefaults standardUserDefaults] stringForKey:SKLastSelectedPreferencePaneKey]] ?: [preferencePanes objectAtIndex:0]; [toolbar setSelectedItemIdentifier:[currentPane nibName]]; [window setTitle:[currentPane title]]; - - NSView *view = [currentPane view]; - NSRect frame = [[self window] frame]; - frame.size.width = NSWidth([view frame]); + + view = [currentPane view]; + frame = [[self window] frame]; + frame.size.width = width; frame.size.height -= NSHeight([contentView frame]) - NSHeight([view frame]); [window setFrame:frame display:NO]; - [view setFrameOrigin:NSZeroPoint]; + [view setFrameOrigin:NSMakePoint(floor(0.5 * (width - NSWidth([view frame]))), 0.0)]; [contentView addSubview:view]; } Modified: trunk/SyncPreferences.xib =================================================================== --- trunk/SyncPreferences.xib 2011-07-06 11:55:34 UTC (rev 7329) +++ trunk/SyncPreferences.xib 2011-07-07 11:32:14 UTC (rev 7330) @@ -33,8 +33,8 @@ <string key="NSClassName">NSApplication</string> </object> <object class="NSCustomView" id="1005"> - <reference key="NSNextResponder"/> - <int key="NSvFlags">268</int> + <nil key="NSNextResponder"/> + <int key="NSvFlags">290</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSTextField" id="937325737"> @@ -42,7 +42,6 @@ <int key="NSvFlags">266</int> <string key="NSFrame">{{17, 143}, {394, 28}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="407446917"> <int key="NSCellFlags">67239424</int> @@ -79,7 +78,6 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{60, 81}, {47, 17}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="63051104"> <int key="NSCellFlags">68288064</int> @@ -100,7 +98,6 @@ <int key="NSvFlags">258</int> <string key="NSFrame">{{112, 49}, {296, 22}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="522288509"> <int key="NSCellFlags">-1805517247</int> @@ -131,7 +128,6 @@ <int key="NSvFlags">258</int> <string key="NSFrame">{{109, 75}, {302, 26}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSPopUpButtonCell" key="NSCell" id="922138690"> <int key="NSCellFlags">-2076049856</int> @@ -198,7 +194,6 @@ <int key="NSvFlags">258</int> <string key="NSFrame">{{112, 20}, {296, 22}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="739968313"> <int key="NSCellFlags">-1804468671</int> @@ -216,7 +211,6 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{29, 22}, {78, 17}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="156775353"> <int key="NSCellFlags">68288064</int> @@ -233,7 +227,6 @@ <int key="NSvFlags">258</int> <string key="NSFrame">{{17, 107}, {394, 17}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="201594954"> <int key="NSCellFlags">68288064</int> @@ -250,7 +243,6 @@ <int key="NSvFlags">256</int> <string key="NSFrame">{{34, 51}, {73, 17}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="1047989511"> <int key="NSCellFlags">68288064</int> @@ -267,7 +259,6 @@ <int key="NSvFlags">258</int> <string key="NSFrame">{{12, 132}, {404, 5}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <string key="NSOffsets">{0, 0}</string> <object class="NSTextFieldCell" key="NSTitleCell"> <int key="NSCellFlags">67239424</int> @@ -290,7 +281,6 @@ <int key="NSvFlags">258</int> <string key="NSFrame">{{18, 177}, {392, 18}}</string> <reference key="NSSuperview" ref="1005"/> - <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="267822828"> <int key="NSCellFlags">67239424</int> @@ -315,8 +305,6 @@ </object> </object> <string key="NSFrameSize">{428, 213}</string> - <reference key="NSSuperview"/> - <reference key="NSWindow"/> <string key="NSClassName">NSView</string> </object> <object class="NSUserDefaultsController" id="105163509"> 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