Implement a toolbar for the preferences window

* Source/AppDelegate.m:
(showPreferences:): Don't call methods on the [prefs window] anymore, but [showPreferencesWindow]
* Source/PreferencesController.m+h: Add toolbar outlet ivars
(showPreferencesWindow): New method
(showGeneral:): New method
(toolbarSelectableItemIdentifiers:): New method

diff --git a/English.lproj/Preferences.xib b/English.lproj/Preferences.xib
index 91daf55a3fd3a71823b0defbd6e19e1cbfc232d3..37816bf2bb90c6e732c83fc4869e26f4f1b2cc39 100644 (file)
--- a/English.lproj/Preferences.xib
+++ b/English.lproj/Preferences.xib
@@ -2,13 +2,14 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.02">
        <data>
                <int key="IBDocument.SystemTarget">1050</int>
-               <string key="IBDocument.SystemVersion">9E17</string>
-               <string key="IBDocument.InterfaceBuilderVersion">670</string>
-               <string key="IBDocument.AppKitVersion">949.33</string>
-               <string key="IBDocument.HIToolboxVersion">352.00</string>
+               <string key="IBDocument.SystemVersion">9G55</string>
+               <string key="IBDocument.InterfaceBuilderVersion">672</string>
+               <string key="IBDocument.AppKitVersion">949.43</string>
+               <string key="IBDocument.HIToolboxVersion">353.00</string>
                <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
                        <bool key="EncodedWithXMLCoder">YES</bool>
-                       <integer value="2"/>
+                       <integer value="1" id="9"/>
+                       <integer value="29"/>
                </object>
                <object class="NSArray" key="IBDocument.PluginDependencies">
                        <bool key="EncodedWithXMLCoder">YES</bool>
@@ -27,140 +28,138 @@
                                <string key="NSClassName">NSApplication</string>
                        </object>
                        <object class="NSWindowTemplate" id="1005">
-                               <int key="NSWindowStyleMask">7</int>
+                               <int key="NSWindowStyleMask">3</int>
                                <int key="NSWindowBacking">2</int>
-                               <string key="NSWindowRect">{{196, 388}, {421, 122}}</string>
-                               <int key="NSWTFlags">1610612736</int>
+                               <string key="NSWindowRect">{{196, 388}, {420, 120}}</string>
+                               <int key="NSWTFlags">1610613760</int>
                                <string key="NSWindowTitle">Preferences</string>
                                <string key="NSWindowClass">NSWindow</string>
-                               <nil key="NSViewClass"/>
-                               <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
-                               <object class="NSView" key="NSWindowView" id="1006">
-                                       <reference key="NSNextResponder"/>
-                                       <int key="NSvFlags">256</int>
-                                       <object class="NSMutableArray" key="NSSubviews">
+                               <object class="NSToolbar" key="NSViewClass" id="14618684">
+                                       <object class="NSMutableString" key="NSToolbarIdentifier">
+                                               <characters key="NS.bytes">8C3684D1-F400-4CBB-897D-0889A0E1CBC8</characters>
+                                       </object>
+                                       <nil key="NSToolbarDelegate"/>
+                                       <bool key="NSToolbarPrefersToBeShown">YES</bool>
+                                       <bool key="NSToolbarShowsBaselineSeparator">YES</bool>
+                                       <bool key="NSToolbarAllowsUserCustomization">NO</bool>
+                                       <bool key="NSToolbarAutosavesConfiguration">NO</bool>
+                                       <int key="NSToolbarDisplayMode">1</int>
+                                       <int key="NSToolbarSizeMode">1</int>
+                                       <object class="NSMutableDictionary" key="NSToolbarIBIdentifiedItems">
                                                <bool key="EncodedWithXMLCoder">YES</bool>
-                                               <object class="NSTextField" id="46436206">
-                                                       <reference key="NSNextResponder" ref="1006"/>
-                                                       <int key="NSvFlags">268</int>
-                                                       <string key="NSFrame">{{77, 84}, {86, 17}}</string>
-                                                       <reference key="NSSuperview" ref="1006"/>
-                                                       <bool key="NSEnabled">YES</bool>
-                                                       <object class="NSTextFieldCell" key="NSCell" id="510437248">
-                                                               <int key="NSCellFlags">68288064</int>
-                                                               <int key="NSCellFlags2">272630784</int>
-                                                               <string key="NSContents">Xdebug Port:</string>
-                                                               <object class="NSFont" key="NSSupport" id="1004931791">
-                                                                       <string key="NSName">LucidaGrande</string>
-                                                                       <double key="NSSize">1.300000e+01</double>
-                                                                       <int key="NSfFlags">1044</int>
-                                                               </object>
-                                                               <reference key="NSControlView" ref="46436206"/>
-                                                               <object class="NSColor" key="NSBackgroundColor" id="769524507">
-                                                                       <int key="NSColorSpace">6</int>
-                                                                       <string key="NSCatalogName">System</string>
-                                                                       <string key="NSColorName">controlColor</string>
-                                                                       <object class="NSColor" key="NSColor">
-                                                                               <int key="NSColorSpace">3</int>
-                                                                               <bytes key="NSWhite">MC42NjY2NjY2OQA</bytes>
-                                                                       </object>
+                                               <object class="NSMutableArray" key="dict.sortedKeys">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <string>6AEED900-187C-4FE3-B185-35C4C2105744</string>
+                                                       <string>NSToolbarFlexibleSpaceItem</string>
+                                                       <string>NSToolbarSpaceItem</string>
+                                               </object>
+                                               <object class="NSMutableArray" key="dict.values">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <object class="NSToolbarItem" id="38779174">
+                                                               <object class="NSMutableString" key="NSToolbarItemIdentifier">
+                                                                       <characters key="NS.bytes">6AEED900-187C-4FE3-B185-35C4C2105744</characters>
                                                                </object>
-                                                               <object class="NSColor" key="NSTextColor" id="819706911">
-                                                                       <int key="NSColorSpace">6</int>
-                                                                       <string key="NSCatalogName">System</string>
-                                                                       <string key="NSColorName">controlTextColor</string>
-                                                                       <object class="NSColor" key="NSColor" id="631481957">
-                                                                               <int key="NSColorSpace">3</int>
-                                                                               <bytes key="NSWhite">MAA</bytes>
-                                                                       </object>
+                                                               <string key="NSToolbarItemLabel">General</string>
+                                                               <string key="NSToolbarItemPaletteLabel">General</string>
+                                                               <string key="NSToolbarItemToolTip"/>
+                                                               <nil key="NSToolbarItemView"/>
+                                                               <object class="NSCustomResource" key="NSToolbarItemImage">
+                                                                       <string key="NSClassName">NSImage</string>
+                                                                       <string key="NSResourceName">NSPreferencesGeneral</string>
                                                                </object>
+                                                               <nil key="NSToolbarItemTarget"/>
+                                                               <nil key="NSToolbarItemAction"/>
+                                                               <string key="NSToolbarItemMinSize">{0, 0}</string>
+                                                               <string key="NSToolbarItemMaxSize">{0, 0}</string>
+                                                               <bool key="NSToolbarItemEnabled">YES</bool>
+                                                               <bool key="NSToolbarItemAutovalidates">NO</bool>
+                                                               <int key="NSToolbarItemTag">-1</int>
+                                                               <bool key="NSToolbarIsUserRemovable">YES</bool>
+                                                               <int key="NSToolbarItemVisibilityPriority">0</int>
                                                        </object>
-                                               </object>
-                                               <object class="NSTextField" id="592554426">
-                                                       <reference key="NSNextResponder" ref="1006"/>
-                                                       <int key="NSvFlags">268</int>
-                                                       <string key="NSFrame">{{168, 82}, {60, 22}}</string>
-                                                       <reference key="NSSuperview" ref="1006"/>
-                                                       <bool key="NSEnabled">YES</bool>
-                                                       <object class="NSTextFieldCell" key="NSCell" id="67781170">
-                                                               <int key="NSCellFlags">-1804468671</int>
-                                                               <int key="NSCellFlags2">272630784</int>
-                                                               <string key="NSContents"/>
-                                                               <reference key="NSSupport" ref="1004931791"/>
-                                                               <reference key="NSControlView" ref="592554426"/>
-                                                               <bool key="NSDrawsBackground">YES</bool>
-                                                               <object class="NSColor" key="NSBackgroundColor" id="981506679">
-                                                                       <int key="NSColorSpace">6</int>
-                                                                       <string key="NSCatalogName">System</string>
-                                                                       <string key="NSColorName">textBackgroundColor</string>
-                                                                       <object class="NSColor" key="NSColor">
-                                                                               <int key="NSColorSpace">3</int>
-                                                                               <bytes key="NSWhite">MQA</bytes>
+                                                       <object class="NSToolbarFlexibleSpaceItem" id="672755434">
+                                                               <string key="NSToolbarItemIdentifier">NSToolbarFlexibleSpaceItem</string>
+                                                               <string key="NSToolbarItemLabel"/>
+                                                               <string key="NSToolbarItemPaletteLabel">Flexible Space</string>
+                                                               <nil key="NSToolbarItemToolTip"/>
+                                                               <nil key="NSToolbarItemView"/>
+                                                               <nil key="NSToolbarItemImage"/>
+                                                               <nil key="NSToolbarItemTarget"/>
+                                                               <nil key="NSToolbarItemAction"/>
+                                                               <string key="NSToolbarItemMinSize">{1, 5}</string>
+                                                               <string key="NSToolbarItemMaxSize">{20000, 32}</string>
+                                                               <bool key="NSToolbarItemEnabled">YES</bool>
+                                                               <bool key="NSToolbarItemAutovalidates">YES</bool>
+                                                               <int key="NSToolbarItemTag">-1</int>
+                                                               <bool key="NSToolbarIsUserRemovable">YES</bool>
+                                                               <int key="NSToolbarItemVisibilityPriority">0</int>
+                                                               <object class="NSMenuItem" key="NSToolbarItemMenuFormRepresentation">
+                                                                       <bool key="NSIsDisabled">YES</bool>
+                                                                       <bool key="NSIsSeparator">YES</bool>
+                                                                       <string key="NSTitle"/>
+                                                                       <string key="NSKeyEquiv"/>
+                                                                       <int key="NSKeyEquivModMask">1048576</int>
+                                                                       <int key="NSMnemonicLoc">2147483647</int>
+                                                                       <object class="NSCustomResource" key="NSOnImage" id="82014028">
+                                                                               <string key="NSClassName">NSImage</string>
+                                                                               <string key="NSResourceName">NSMenuCheckmark</string>
+                                                                       </object>
+                                                                       <object class="NSCustomResource" key="NSMixedImage" id="151294024">
+                                                                               <string key="NSClassName">NSImage</string>
+                                                                               <string key="NSResourceName">NSMenuMixedState</string>
                                                                        </object>
                                                                </object>
-                                                               <object class="NSColor" key="NSTextColor" id="552153145">
-                                                                       <int key="NSColorSpace">6</int>
-                                                                       <string key="NSCatalogName">System</string>
-                                                                       <string key="NSColorName">textColor</string>
-                                                                       <reference key="NSColor" ref="631481957"/>
-                                                               </object>
-                                                       </object>
-                                               </object>
-                                               <object class="NSTextField" id="608297648">
-                                                       <reference key="NSNextResponder" ref="1006"/>
-                                                       <int key="NSvFlags">268</int>
-                                                       <string key="NSFrame">{{55, 52}, {108, 17}}</string>
-                                                       <reference key="NSSuperview" ref="1006"/>
-                                                       <bool key="NSEnabled">YES</bool>
-                                                       <object class="NSTextFieldCell" key="NSCell" id="151696232">
-                                                               <int key="NSCellFlags">68288064</int>
-                                                               <int key="NSCellFlags2">272630784</int>
-                                                               <string key="NSContents">Xdebug IDE Key:</string>
-                                                               <reference key="NSSupport" ref="1004931791"/>
-                                                               <reference key="NSControlView" ref="608297648"/>
-                                                               <reference key="NSBackgroundColor" ref="769524507"/>
-                                                               <reference key="NSTextColor" ref="819706911"/>
-                                                       </object>
-                                               </object>
-                                               <object class="NSTextField" id="769857156">
-                                                       <reference key="NSNextResponder" ref="1006"/>
-                                                       <int key="NSvFlags">268</int>
-                                                       <string key="NSFrame">{{168, 50}, {210, 22}}</string>
-                                                       <reference key="NSSuperview" ref="1006"/>
-                                                       <bool key="NSEnabled">YES</bool>
-                                                       <object class="NSTextFieldCell" key="NSCell" id="129756275">
-                                                               <int key="NSCellFlags">-1804468671</int>
-                                                               <int key="NSCellFlags2">272630784</int>
-                                                               <string key="NSContents"/>
-                                                               <reference key="NSSupport" ref="1004931791"/>
-                                                               <reference key="NSControlView" ref="769857156"/>
-                                                               <bool key="NSDrawsBackground">YES</bool>
-                                                               <reference key="NSBackgroundColor" ref="981506679"/>
-                                                               <reference key="NSTextColor" ref="552153145"/>
                                                        </object>
-                                               </object>
-                                               <object class="NSTextField" id="56294062">
-                                                       <reference key="NSNextResponder" ref="1006"/>
-                                                       <int key="NSvFlags">268</int>
-                                                       <string key="NSFrame">{{17, 14}, {387, 28}}</string>
-                                                       <reference key="NSSuperview" ref="1006"/>
-                                                       <bool key="NSEnabled">YES</bool>
-                                                       <object class="NSTextFieldCell" key="NSCell" id="702365925">
-                                                               <int key="NSCellFlags">67239424</int>
-                                                               <int key="NSCellFlags2">272629760</int>
-                                                               <string key="NSContents">You must close and reopen MacGDBp before these preference values take effect.</string>
-                                                               <object class="NSFont" key="NSSupport">
-                                                                       <string key="NSName">LucidaGrande</string>
-                                                                       <double key="NSSize">1.100000e+01</double>
-                                                                       <int key="NSfFlags">16</int>
+                                                       <object class="NSToolbarSpaceItem" id="278862681">
+                                                               <string key="NSToolbarItemIdentifier">NSToolbarSpaceItem</string>
+                                                               <string key="NSToolbarItemLabel"/>
+                                                               <string key="NSToolbarItemPaletteLabel">Space</string>
+                                                               <nil key="NSToolbarItemToolTip"/>
+                                                               <nil key="NSToolbarItemView"/>
+                                                               <nil key="NSToolbarItemImage"/>
+                                                               <nil key="NSToolbarItemTarget"/>
+                                                               <nil key="NSToolbarItemAction"/>
+                                                               <string key="NSToolbarItemMinSize">{32, 5}</string>
+                                                               <string key="NSToolbarItemMaxSize">{32, 32}</string>
+                                                               <bool key="NSToolbarItemEnabled">YES</bool>
+                                                               <bool key="NSToolbarItemAutovalidates">YES</bool>
+                                                               <int key="NSToolbarItemTag">-1</int>
+                                                               <bool key="NSToolbarIsUserRemovable">YES</bool>
+                                                               <int key="NSToolbarItemVisibilityPriority">0</int>
+                                                               <object class="NSMenuItem" key="NSToolbarItemMenuFormRepresentation">
+                                                                       <bool key="NSIsDisabled">YES</bool>
+                                                                       <bool key="NSIsSeparator">YES</bool>
+                                                                       <string key="NSTitle"/>
+                                                                       <string key="NSKeyEquiv"/>
+                                                                       <int key="NSKeyEquivModMask">1048576</int>
+                                                                       <int key="NSMnemonicLoc">2147483647</int>
+                                                                       <reference key="NSOnImage" ref="82014028"/>
+                                                                       <reference key="NSMixedImage" ref="151294024"/>
                                                                </object>
-                                                               <reference key="NSControlView" ref="56294062"/>
-                                                               <reference key="NSBackgroundColor" ref="769524507"/>
-                                                               <reference key="NSTextColor" ref="819706911"/>
                                                        </object>
                                                </object>
                                        </object>
-                                       <string key="NSFrameSize">{421, 122}</string>
+                                       <object class="NSArray" key="NSToolbarIBAllowedItems">
+                                               <bool key="EncodedWithXMLCoder">YES</bool>
+                                               <reference ref="278862681"/>
+                                               <reference ref="672755434"/>
+                                               <reference ref="38779174"/>
+                                       </object>
+                                       <object class="NSMutableArray" key="NSToolbarIBDefaultItems">
+                                               <bool key="EncodedWithXMLCoder">YES</bool>
+                                               <reference ref="38779174"/>
+                                               <reference ref="278862681"/>
+                                               <reference ref="672755434"/>
+                                       </object>
+                                       <object class="NSMutableArray" key="NSToolbarIBSelectableItems">
+                                               <bool key="EncodedWithXMLCoder">YES</bool>
+                                       </object>
+                               </object>
+                               <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
+                               <object class="NSView" key="NSWindowView" id="1006">
+                                       <reference key="NSNextResponder"/>
+                                       <int key="NSvFlags">256</int>
+                                       <string key="NSFrameSize">{420, 120}</string>
                                        <reference key="NSSuperview"/>
                                </object>
                                <string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
@@ -175,6 +174,135 @@
                                </object>
                                <bool key="NSSharedInstance">YES</bool>
                        </object>
+                       <object class="NSCustomView" id="164161235">
+                               <reference key="NSNextResponder"/>
+                               <int key="NSvFlags">268</int>
+                               <object class="NSMutableArray" key="NSSubviews">
+                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                       <object class="NSTextField" id="190875294">
+                                               <reference key="NSNextResponder" ref="164161235"/>
+                                               <int key="NSvFlags">268</int>
+                                               <string key="NSFrame">{{77, 80}, {86, 17}}</string>
+                                               <reference key="NSSuperview" ref="164161235"/>
+                                               <bool key="NSEnabled">YES</bool>
+                                               <object class="NSTextFieldCell" key="NSCell" id="622681529">
+                                                       <int key="NSCellFlags">68288064</int>
+                                                       <int key="NSCellFlags2">272630784</int>
+                                                       <string key="NSContents">Xdebug Port:</string>
+                                                       <object class="NSFont" key="NSSupport" id="1004931791">
+                                                               <string key="NSName">LucidaGrande</string>
+                                                               <double key="NSSize">1.300000e+01</double>
+                                                               <int key="NSfFlags">1044</int>
+                                                       </object>
+                                                       <reference key="NSControlView" ref="190875294"/>
+                                                       <object class="NSColor" key="NSBackgroundColor" id="769524507">
+                                                               <int key="NSColorSpace">6</int>
+                                                               <string key="NSCatalogName">System</string>
+                                                               <string key="NSColorName">controlColor</string>
+                                                               <object class="NSColor" key="NSColor">
+                                                                       <int key="NSColorSpace">3</int>
+                                                                       <bytes key="NSWhite">MC42NjY2NjY2OQA</bytes>
+                                                               </object>
+                                                       </object>
+                                                       <object class="NSColor" key="NSTextColor" id="819706911">
+                                                               <int key="NSColorSpace">6</int>
+                                                               <string key="NSCatalogName">System</string>
+                                                               <string key="NSColorName">controlTextColor</string>
+                                                               <object class="NSColor" key="NSColor" id="631481957">
+                                                                       <int key="NSColorSpace">3</int>
+                                                                       <bytes key="NSWhite">MAA</bytes>
+                                                               </object>
+                                                       </object>
+                                               </object>
+                                       </object>
+                                       <object class="NSTextField" id="510392492">
+                                               <reference key="NSNextResponder" ref="164161235"/>
+                                               <int key="NSvFlags">268</int>
+                                               <string key="NSFrame">{{168, 78}, {60, 22}}</string>
+                                               <reference key="NSSuperview" ref="164161235"/>
+                                               <bool key="NSEnabled">YES</bool>
+                                               <object class="NSTextFieldCell" key="NSCell" id="503674969">
+                                                       <int key="NSCellFlags">-1804468671</int>
+                                                       <int key="NSCellFlags2">272630784</int>
+                                                       <string key="NSContents"/>
+                                                       <reference key="NSSupport" ref="1004931791"/>
+                                                       <reference key="NSControlView" ref="510392492"/>
+                                                       <bool key="NSDrawsBackground">YES</bool>
+                                                       <object class="NSColor" key="NSBackgroundColor" id="981506679">
+                                                               <int key="NSColorSpace">6</int>
+                                                               <string key="NSCatalogName">System</string>
+                                                               <string key="NSColorName">textBackgroundColor</string>
+                                                               <object class="NSColor" key="NSColor">
+                                                                       <int key="NSColorSpace">3</int>
+                                                                       <bytes key="NSWhite">MQA</bytes>
+                                                               </object>
+                                                       </object>
+                                                       <object class="NSColor" key="NSTextColor" id="552153145">
+                                                               <int key="NSColorSpace">6</int>
+                                                               <string key="NSCatalogName">System</string>
+                                                               <string key="NSColorName">textColor</string>
+                                                               <reference key="NSColor" ref="631481957"/>
+                                                       </object>
+                                               </object>
+                                       </object>
+                                       <object class="NSTextField" id="249176901">
+                                               <reference key="NSNextResponder" ref="164161235"/>
+                                               <int key="NSvFlags">268</int>
+                                               <string key="NSFrame">{{55, 48}, {108, 17}}</string>
+                                               <reference key="NSSuperview" ref="164161235"/>
+                                               <bool key="NSEnabled">YES</bool>
+                                               <object class="NSTextFieldCell" key="NSCell" id="655138249">
+                                                       <int key="NSCellFlags">68288064</int>
+                                                       <int key="NSCellFlags2">272630784</int>
+                                                       <string key="NSContents">Xdebug IDE Key:</string>
+                                                       <reference key="NSSupport" ref="1004931791"/>
+                                                       <reference key="NSControlView" ref="249176901"/>
+                                                       <reference key="NSBackgroundColor" ref="769524507"/>
+                                                       <reference key="NSTextColor" ref="819706911"/>
+                                               </object>
+                                       </object>
+                                       <object class="NSTextField" id="220975723">
+                                               <reference key="NSNextResponder" ref="164161235"/>
+                                               <int key="NSvFlags">268</int>
+                                               <string key="NSFrame">{{168, 46}, {210, 22}}</string>
+                                               <reference key="NSSuperview" ref="164161235"/>
+                                               <bool key="NSEnabled">YES</bool>
+                                               <object class="NSTextFieldCell" key="NSCell" id="874023099">
+                                                       <int key="NSCellFlags">-1804468671</int>
+                                                       <int key="NSCellFlags2">272630784</int>
+                                                       <string key="NSContents"/>
+                                                       <reference key="NSSupport" ref="1004931791"/>
+                                                       <reference key="NSControlView" ref="220975723"/>
+                                                       <bool key="NSDrawsBackground">YES</bool>
+                                                       <reference key="NSBackgroundColor" ref="981506679"/>
+                                                       <reference key="NSTextColor" ref="552153145"/>
+                                               </object>
+                                       </object>
+                                       <object class="NSTextField" id="153346618">
+                                               <reference key="NSNextResponder" ref="164161235"/>
+                                               <int key="NSvFlags">268</int>
+                                               <string key="NSFrame">{{17, 10}, {387, 28}}</string>
+                                               <reference key="NSSuperview" ref="164161235"/>
+                                               <bool key="NSEnabled">YES</bool>
+                                               <object class="NSTextFieldCell" key="NSCell" id="134905980">
+                                                       <int key="NSCellFlags">67239424</int>
+                                                       <int key="NSCellFlags2">272629760</int>
+                                                       <string key="NSContents">You must close and reopen MacGDBp before these preference values take effect.</string>
+                                                       <object class="NSFont" key="NSSupport">
+                                                               <string key="NSName">LucidaGrande</string>
+                                                               <double key="NSSize">1.100000e+01</double>
+                                                               <int key="NSfFlags">16</int>
+                                                       </object>
+                                                       <reference key="NSControlView" ref="153346618"/>
+                                                       <reference key="NSBackgroundColor" ref="769524507"/>
+                                                       <reference key="NSTextColor" ref="819706911"/>
+                                               </object>
+                                       </object>
+                               </object>
+                               <string key="NSFrameSize">{420, 120}</string>
+                               <reference key="NSSuperview"/>
+                               <string key="NSClassName">NSView</string>
+                       </object>
                </object>
                <object class="IBObjectContainer" key="IBDocument.Objects">
                        <object class="NSMutableArray" key="connectionRecords">
@@ -187,13 +315,29 @@
                                        </object>
                                        <int key="connectionID">3</int>
                                </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">generalPreferencesView</string>
+                                               <reference key="source" ref="1001"/>
+                                               <reference key="destination" ref="164161235"/>
+                                       </object>
+                                       <int key="connectionID">42</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">generalPreferencesItem</string>
+                                               <reference key="source" ref="1001"/>
+                                               <reference key="destination" ref="38779174"/>
+                                       </object>
+                                       <int key="connectionID">44</int>
+                               </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBBindingConnection" key="connection">
                                                <string key="label">value: values.Port</string>
-                                               <reference key="source" ref="592554426"/>
+                                               <reference key="source" ref="510392492"/>
                                                <reference key="destination" ref="811642706"/>
                                                <object class="NSNibBindingConnector" key="connector">
-                                                       <reference key="NSSource" ref="592554426"/>
+                                                       <reference key="NSSource" ref="510392492"/>
                                                        <reference key="NSDestination" ref="811642706"/>
                                                        <string key="NSLabel">value: values.Port</string>
                                                        <string key="NSBinding">value</string>
@@ -201,15 +345,15 @@
                                                        <int key="NSNibBindingConnectorVersion">2</int>
                                                </object>
                                        </object>
-                                       <int key="connectionID">15</int>
+                                       <int key="connectionID">45</int>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBBindingConnection" key="connection">
                                                <string key="label">value: values.IDEKey</string>
-                                               <reference key="source" ref="769857156"/>
+                                               <reference key="source" ref="220975723"/>
                                                <reference key="destination" ref="811642706"/>
                                                <object class="NSNibBindingConnector" key="connector">
-                                                       <reference key="NSSource" ref="769857156"/>
+                                                       <reference key="NSSource" ref="220975723"/>
                                                        <reference key="NSDestination" ref="811642706"/>
                                                        <string key="NSLabel">value: values.IDEKey</string>
                                                        <string key="NSBinding">value</string>
@@ -217,7 +361,31 @@
                                                        <int key="NSNibBindingConnectorVersion">2</int>
                                                </object>
                                        </object>
-                                       <int key="connectionID">17</int>
+                                       <int key="connectionID">46</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">delegate</string>
+                                               <reference key="source" ref="14618684"/>
+                                               <reference key="destination" ref="1001"/>
+                                       </object>
+                                       <int key="connectionID">47</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">toolbar</string>
+                                               <reference key="source" ref="1001"/>
+                                               <reference key="destination" ref="14618684"/>
+                                       </object>
+                                       <int key="connectionID">48</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBActionConnection" key="connection">
+                                               <string key="label">showGeneral:</string>
+                                               <reference key="source" ref="1001"/>
+                                               <reference key="destination" ref="38779174"/>
+                                       </object>
+                                       <int key="connectionID">49</int>
                                </object>
                        </object>
                        <object class="IBMutableOrderedSet" key="objectRecords">
@@ -255,6 +423,7 @@
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
                                                        <reference ref="1006"/>
+                                                       <reference ref="14618684"/>
                                                </object>
                                                <reference key="parent" ref="1002"/>
                                        </object>
@@ -263,88 +432,123 @@
                                                <reference key="object" ref="1006"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="56294062"/>
-                                                       <reference ref="46436206"/>
-                                                       <reference ref="592554426"/>
-                                                       <reference ref="608297648"/>
-                                                       <reference ref="769857156"/>
                                                </object>
                                                <reference key="parent" ref="1005"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">4</int>
-                                               <reference key="object" ref="46436206"/>
+                                               <int key="objectID">13</int>
+                                               <reference key="object" ref="811642706"/>
+                                               <reference key="parent" ref="1002"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">20</int>
+                                               <reference key="object" ref="14618684"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="510437248"/>
+                                                       <reference ref="278862681"/>
+                                                       <reference ref="672755434"/>
+                                                       <reference ref="38779174"/>
                                                </object>
-                                               <reference key="parent" ref="1006"/>
+                                               <reference key="parent" ref="1005"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">5</int>
-                                               <reference key="object" ref="510437248"/>
-                                               <reference key="parent" ref="46436206"/>
+                                               <int key="objectID">25</int>
+                                               <reference key="object" ref="278862681"/>
+                                               <reference key="parent" ref="14618684"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">26</int>
+                                               <reference key="object" ref="672755434"/>
+                                               <reference key="parent" ref="14618684"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">29</int>
+                                               <reference key="object" ref="164161235"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="190875294"/>
+                                                       <reference ref="510392492"/>
+                                                       <reference ref="249176901"/>
+                                                       <reference ref="220975723"/>
+                                                       <reference ref="153346618"/>
+                                               </object>
+                                               <reference key="parent" ref="1002"/>
+                                               <string key="objectName">GeneralPreferences</string>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">6</int>
-                                               <reference key="object" ref="592554426"/>
+                                               <int key="objectID">32</int>
+                                               <reference key="object" ref="190875294"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="67781170"/>
+                                                       <reference ref="622681529"/>
                                                </object>
-                                               <reference key="parent" ref="1006"/>
+                                               <reference key="parent" ref="164161235"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">7</int>
-                                               <reference key="object" ref="67781170"/>
-                                               <reference key="parent" ref="592554426"/>
+                                               <int key="objectID">33</int>
+                                               <reference key="object" ref="510392492"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="503674969"/>
+                                               </object>
+                                               <reference key="parent" ref="164161235"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">8</int>
-                                               <reference key="object" ref="608297648"/>
+                                               <int key="objectID">34</int>
+                                               <reference key="object" ref="249176901"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="151696232"/>
+                                                       <reference ref="655138249"/>
                                                </object>
-                                               <reference key="parent" ref="1006"/>
+                                               <reference key="parent" ref="164161235"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">9</int>
-                                               <reference key="object" ref="151696232"/>
-                                               <reference key="parent" ref="608297648"/>
+                                               <int key="objectID">35</int>
+                                               <reference key="object" ref="220975723"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="874023099"/>
+                                               </object>
+                                               <reference key="parent" ref="164161235"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">10</int>
-                                               <reference key="object" ref="769857156"/>
+                                               <int key="objectID">36</int>
+                                               <reference key="object" ref="153346618"/>
                                                <object class="NSMutableArray" key="children">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="129756275"/>
+                                                       <reference ref="134905980"/>
                                                </object>
-                                               <reference key="parent" ref="1006"/>
+                                               <reference key="parent" ref="164161235"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">11</int>
-                                               <reference key="object" ref="129756275"/>
-                                               <reference key="parent" ref="769857156"/>
+                                               <int key="objectID">37</int>
+                                               <reference key="object" ref="134905980"/>
+                                               <reference key="parent" ref="153346618"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">13</int>
-                                               <reference key="object" ref="811642706"/>
-                                               <reference key="parent" ref="1002"/>
+                                               <int key="objectID">38</int>
+                                               <reference key="object" ref="874023099"/>
+                                               <reference key="parent" ref="220975723"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">18</int>
-                                               <reference key="object" ref="56294062"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="702365925"/>
-                                               </object>
-                                               <reference key="parent" ref="1006"/>
+                                               <int key="objectID">39</int>
+                                               <reference key="object" ref="655138249"/>
+                                               <reference key="parent" ref="249176901"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">40</int>
+                                               <reference key="object" ref="503674969"/>
+                                               <reference key="parent" ref="510392492"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">19</int>
-                                               <reference key="object" ref="702365925"/>
-                                               <reference key="parent" ref="56294062"/>
+                                               <int key="objectID">41</int>
+                                               <reference key="object" ref="622681529"/>
+                                               <reference key="parent" ref="190875294"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">43</int>
+                                               <reference key="object" ref="38779174"/>
+                                               <reference key="parent" ref="14618684"/>
                                        </object>
                                </object>
                        </object>
@@ -363,32 +567,46 @@
                                        <string>1.NSWindowTemplate.visibleAtLaunch</string>
                                        <string>1.WindowOrigin</string>
                                        <string>1.editorWindowContentRectSynchronizationRect</string>
-                                       <string>10.IBPluginDependency</string>
-                                       <string>11.IBPluginDependency</string>
-                                       <string>18.IBPluginDependency</string>
-                                       <string>19.IBPluginDependency</string>
                                        <string>2.IBPluginDependency</string>
-                                       <string>4.IBPluginDependency</string>
-                                       <string>5.IBPluginDependency</string>
-                                       <string>6.IBPluginDependency</string>
-                                       <string>7.IBPluginDependency</string>
-                                       <string>8.IBPluginDependency</string>
-                                       <string>9.IBPluginDependency</string>
+                                       <string>20.IBEditorWindowLastContentRect</string>
+                                       <string>20.IBPluginDependency</string>
+                                       <string>25.IBPluginDependency</string>
+                                       <string>26.IBPluginDependency</string>
+                                       <string>29.IBEditorWindowLastContentRect</string>
+                                       <string>29.IBPluginDependency</string>
+                                       <string>32.IBPluginDependency</string>
+                                       <string>33.IBPluginDependency</string>
+                                       <string>34.IBPluginDependency</string>
+                                       <string>35.IBPluginDependency</string>
+                                       <string>36.IBPluginDependency</string>
+                                       <string>37.IBPluginDependency</string>
+                                       <string>38.IBPluginDependency</string>
+                                       <string>39.IBPluginDependency</string>
+                                       <string>40.IBPluginDependency</string>
+                                       <string>41.IBPluginDependency</string>
+                                       <string>43.IBPluginDependency</string>
                                </object>
                                <object class="NSMutableArray" key="dict.values">
                                        <bool key="EncodedWithXMLCoder">YES</bool>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilderKit</string>
                                        <string>com.apple.InterfaceBuilderKit</string>
-                                       <string>{{462, 546}, {421, 122}}</string>
+                                       <string>{{647, 290}, {420, 120}}</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <integer value="0" id="6"/>
-                                       <reference ref="6"/>
-                                       <string>{{462, 546}, {421, 122}}</string>
-                                       <integer value="1"/>
+                                       <integer value="0" id="8"/>
+                                       <reference ref="8"/>
+                                       <string>{{647, 290}, {420, 120}}</string>
+                                       <reference ref="9"/>
                                        <string>{196, 240}</string>
                                        <string>{{202, 428}, {480, 270}}</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>{{549, 410}, {616, 0}}</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>{{369, 249}, {420, 120}}</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -421,7 +639,7 @@
                                </object>
                        </object>
                        <nil key="sourceID"/>
-                       <int key="maxID">19</int>
+                       <int key="maxID">49</int>
                </object>
                <object class="IBClassDescriber" key="IBDocument.Classes">
                        <object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -443,6 +661,25 @@
                                <object class="IBPartialClassDescription">
                                        <string key="className">PreferencesController</string>
                                        <string key="superclassName">NSWindowController</string>
+                                       <object class="NSMutableDictionary" key="actions">
+                                               <string key="NS.key.0">showGeneral:</string>
+                                               <string key="NS.object.0">id</string>
+                                       </object>
+                                       <object class="NSMutableDictionary" key="outlets">
+                                               <bool key="EncodedWithXMLCoder">YES</bool>
+                                               <object class="NSMutableArray" key="dict.sortedKeys">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <string>generalPreferencesItem</string>
+                                                       <string>generalPreferencesView</string>
+                                                       <string>toolbar</string>
+                                               </object>
+                                               <object class="NSMutableArray" key="dict.values">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <string>NSToolbarItem</string>
+                                                       <string>NSView</string>
+                                                       <string>NSToolbar</string>
+                                               </object>
+                                       </object>
                                        <object class="IBClassDescriptionSource" key="sourceIdentifier">
                                                <string key="majorKey">IBProjectSource</string>
                                                <string key="minorKey">Source/PreferencesController.h</string>

diff --git a/Source/AppDelegate.m b/Source/AppDelegate.m
index db3a2d56969d8a9dc733695e228f651c2e114692..adc6596f6de4ec49f48f8a2e6d0caa4f4db7052d 100644 (file)
--- a/Source/AppDelegate.m
+++ b/Source/AppDelegate.m
@@ -72,7 +72,7 @@
        if (!prefs)
                prefs = [[PreferencesController alloc] init];
        
-       [[prefs window] makeKeyAndOrderFront:self];
+       [prefs showPreferencesWindow];
 }
 
 /**

diff --git a/Source/PreferencesController.h b/Source/PreferencesController.h
index 0aca5f9ade2df892a0087431f21db2807912c9c9..3f680ccc393b9df768119edc77830d651d54c8cb 100644 (file)
--- a/Source/PreferencesController.h
+++ b/Source/PreferencesController.h
@@ -19,7 +19,15 @@
 
 @interface PreferencesController : NSWindowController
 {
-
+       IBOutlet NSToolbar *toolbar;
+       
+       IBOutlet NSView *generalPreferencesView;
+       IBOutlet NSToolbarItem *generalPreferencesItem;
 }
 
+- (void)showPreferencesWindow;
+
+// panel switching
+- (IBAction)showGeneral:(id)sender;
+
 @end

diff --git a/Source/PreferencesController.m b/Source/PreferencesController.m
index 87332aa405b3a1c5b18171043f08993216ad8afd..620048aa35783f249830ea1877456442cbdabaf3 100644 (file)
--- a/Source/PreferencesController.m
+++ b/Source/PreferencesController.m
@@ -30,4 +30,37 @@
        return self;
 }
 
+/**
+ * Shows the preferences controller window
+ */
+- (void)showPreferencesWindow
+{
+       [self showGeneral:self];
+       [[self window] makeKeyAndOrderFront:self];
+}
+
+#pragma mark Panel Switching
+
+/**
+ * Shows the general panel
+ */
+- (IBAction)showGeneral:(id)sender
+{
+       if ([[self window] contentView] == generalPreferencesView)
+               return;
+       
+       [[self window] setContentView:generalPreferencesView];
+       [toolbar setSelectedItemIdentifier:[generalPreferencesItem itemIdentifier]];
+}
+
+#pragma mark NSToolbar Delegate
+
+/**
+ * Returns the selection names
+ */
+- (NSArray *)toolbarSelectableItemIdentifiers:(NSToolbar *)toolbar
+{
+       return [NSArray arrayWithObjects:[generalPreferencesItem itemIdentifier], nil];
+}
+
 @end