diff options
-rw-r--r-- | cocoa/BookmarksController.h | 6 | ||||
-rw-r--r-- | cocoa/BookmarksController.m | 17 | ||||
-rw-r--r-- | cocoa/Makefile.target | 2 | ||||
-rw-r--r-- | cocoa/NetSurf.xcodeproj/project.pbxproj | 2 | ||||
-rw-r--r-- | cocoa/Tree.m | 2 | ||||
-rw-r--r-- | cocoa/TreeView.m | 3 | ||||
-rw-r--r-- | cocoa/res/BookmarksWindow.xib | 395 | ||||
-rw-r--r-- | cocoa/res/MainMenu.xib | 20 |
8 files changed, 424 insertions, 23 deletions
diff --git a/cocoa/BookmarksController.h b/cocoa/BookmarksController.h index 0e43d207a..39449b647 100644 --- a/cocoa/BookmarksController.h +++ b/cocoa/BookmarksController.h @@ -19,17 +19,19 @@ #import <Cocoa/Cocoa.h> @class Tree; +@class TreeView; -@interface BookmarksController : NSObject { +@interface BookmarksController : NSWindowController { Tree *tree; + TreeView *view; NSMapTable *nodeForMenu; NSMenu *defaultMenu; } @property (readwrite, retain, nonatomic) IBOutlet NSMenu *defaultMenu; +@property (readwrite, retain, nonatomic) IBOutlet TreeView *view; - (IBAction) openBookmarkURL: (id) sender; -- (IBAction) showBookmarksWindow: (id) sender; - (IBAction) addBookmark: (id) sender; @end diff --git a/cocoa/BookmarksController.m b/cocoa/BookmarksController.m index e78d76529..9ec6818d7 100644 --- a/cocoa/BookmarksController.m +++ b/cocoa/BookmarksController.m @@ -18,6 +18,7 @@ #import "cocoa/BookmarksController.h" #import "cocoa/Tree.h" +#import "cocoa/TreeView.h" #import "cocoa/NetsurfApp.h" #import "cocoa/BrowserViewController.h" #import "cocoa/gui.h" @@ -29,6 +30,7 @@ @implementation BookmarksController @synthesize defaultMenu; +@synthesize view; static const char *cocoa_hotlist_path( void ) { @@ -38,7 +40,7 @@ static const char *cocoa_hotlist_path( void ) - init; { - if ((self = [super init]) == nil) return nil; + if ((self = [super initWithWindowNibName: @"BookmarksWindow"]) == nil) return nil; tree = [[Tree alloc] initWithFlags: hotlist_get_tree_flags()]; hotlist_initialise( [tree tree], cocoa_hotlist_path(), "" ); @@ -49,9 +51,11 @@ static const char *cocoa_hotlist_path( void ) - (void) dealloc; { + [self setView: nil]; NSFreeMapTable( nodeForMenu ); hotlist_cleanup( cocoa_hotlist_path() ); [tree release]; + [super dealloc]; } @@ -112,11 +116,6 @@ static const char *cocoa_hotlist_path( void ) } } -- (IBAction) showBookmarksWindow: (id) sender; -{ - NSLog( @"TODO: show bookmarks window" ); -} - - (IBAction) addBookmark: (id) sender; { NSLog( @"TODO: add bookmark" ); @@ -133,6 +132,12 @@ static const char *cocoa_hotlist_path( void ) return YES; } +- (void) windowDidLoad; +{ + hotlist_expand_all( ); + [view setTree: tree]; +} + + (void) initialize; { diff --git a/cocoa/Makefile.target b/cocoa/Makefile.target index 2fcbdf1e3..8cab31eae 100644 --- a/cocoa/Makefile.target +++ b/cocoa/Makefile.target @@ -119,7 +119,7 @@ SOURCES := $(addprefix $(shell pwd)/,$(SOURCES)) EXETARGET := NetSurf S_XIBS := MainMenu.xib Browser.xib BrowserWindow.xib DownloadWindow.xib SearchWindow.xib PreferencesWindow.xib \ - HistoryWindow.xib + HistoryWindow.xib BookmarksWindow.xib R_RESOURCES := default.css adblock.css quirks.css NetSurf.icns R_RESOURCES := $(addprefix cocoa/res/,$(R_RESOURCES)) diff --git a/cocoa/NetSurf.xcodeproj/project.pbxproj b/cocoa/NetSurf.xcodeproj/project.pbxproj index f8238f25f..2b096827b 100644 --- a/cocoa/NetSurf.xcodeproj/project.pbxproj +++ b/cocoa/NetSurf.xcodeproj/project.pbxproj @@ -191,6 +191,7 @@ 26376A4412F7FA86000F45FE /* HistoryWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HistoryWindowController.m; sourceTree = "<group>"; }; 26376A8A12F7FF57000F45FE /* BookmarksController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BookmarksController.h; sourceTree = "<group>"; }; 26376A8B12F7FF57000F45FE /* BookmarksController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BookmarksController.m; sourceTree = "<group>"; }; + 26376BAC12F820D7000F45FE /* BookmarksWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BookmarksWindow.xib; sourceTree = "<group>"; }; 2639E20512F2ADEE00699678 /* coordinates.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = coordinates.h; sourceTree = "<group>"; }; 264C344112F0987E00D11246 /* gui.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gui.h; sourceTree = "<group>"; }; 265F30A712D6637E0048B600 /* NetSurf-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "NetSurf-Info.plist"; sourceTree = "<group>"; }; @@ -583,6 +584,7 @@ 2666DC5B12F6D1770045E8B6 /* SearchWindow.xib */, 2625095012F72A8F0090D236 /* PreferencesWindow.xib */, 26376A4112F7FA67000F45FE /* HistoryWindow.xib */, + 26376BAC12F820D7000F45FE /* BookmarksWindow.xib */, ); name = Resources; path = res; diff --git a/cocoa/Tree.m b/cocoa/Tree.m index b5cbf2068..ce7f89100 100644 --- a/cocoa/Tree.m +++ b/cocoa/Tree.m @@ -18,6 +18,7 @@ #import "cocoa/Tree.h" #import "cocoa/coordinates.h" +#import "cocoa/font.h" #import "desktop/tree.h" @@ -115,6 +116,7 @@ static void tree_get_window_dimensions( int *width, int *height, void *data ) - (void) drawRect: (NSRect) rect inView: (NSView *) view; { + cocoa_set_font_scale_factor( 1.0 ); tree_draw( tree, 0, 0, cocoa_pt_to_px( NSMinX( rect ) ), cocoa_pt_to_px( NSMinY( rect )), cocoa_pt_to_px( NSWidth( rect ) ), cocoa_pt_to_px( NSHeight( rect ) ) ); } diff --git a/cocoa/TreeView.m b/cocoa/TreeView.m index 434ceecd4..1a6f83323 100644 --- a/cocoa/TreeView.m +++ b/cocoa/TreeView.m @@ -54,6 +54,8 @@ tree = [newTree retain]; [tree setDelegate: self]; [tree setRedrawing: YES]; + + [self setNeedsDisplay: YES]; } } @@ -96,7 +98,6 @@ } } - //MARK: - //MARK: Tree delegate methods diff --git a/cocoa/res/BookmarksWindow.xib b/cocoa/res/BookmarksWindow.xib new file mode 100644 index 000000000..9800b3e1d --- /dev/null +++ b/cocoa/res/BookmarksWindow.xib @@ -0,0 +1,395 @@ +<?xml version="1.0" encoding="UTF-8"?> +<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10"> + <data> + <int key="IBDocument.SystemTarget">1060</int> + <string key="IBDocument.SystemVersion">10J567</string> + <string key="IBDocument.InterfaceBuilderVersion">804</string> + <string key="IBDocument.AppKitVersion">1038.35</string> + <string key="IBDocument.HIToolboxVersion">462.00</string> + <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> + <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="NS.object.0">804</string> + </object> + <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> + <bool key="EncodedWithXMLCoder">YES</bool> + <integer value="2"/> + </object> + <object class="NSArray" key="IBDocument.PluginDependencies"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + </object> + <object class="NSMutableDictionary" key="IBDocument.Metadata"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys" id="0"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> + </object> + <object class="NSMutableArray" key="IBDocument.RootObjects" id="1000"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSCustomObject" id="1001"> + <string key="NSClassName">BookmarksController</string> + </object> + <object class="NSCustomObject" id="1003"> + <string key="NSClassName">FirstResponder</string> + </object> + <object class="NSCustomObject" id="1004"> + <string key="NSClassName">NSApplication</string> + </object> + <object class="NSWindowTemplate" id="1005"> + <int key="NSWindowStyleMask">15</int> + <int key="NSWindowBacking">2</int> + <string key="NSWindowRect">{{196, 142}, {367, 368}}</string> + <int key="NSWTFlags">1618477056</int> + <string key="NSWindowTitle">Bookmarks</string> + <string key="NSWindowClass">NSWindow</string> + <nil key="NSViewClass"/> + <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string> + <object class="NSView" key="NSWindowView" id="1006"> + <reference key="NSNextResponder"/> + <int key="NSvFlags">256</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSScrollView" id="53827100"> + <reference key="NSNextResponder" ref="1006"/> + <int key="NSvFlags">274</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSClipView" id="501480005"> + <reference key="NSNextResponder" ref="53827100"/> + <int key="NSvFlags">2304</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSCustomView" id="895061337"> + <reference key="NSNextResponder" ref="501480005"/> + <int key="NSvFlags">274</int> + <string key="NSFrameSize">{367, 328}</string> + <reference key="NSSuperview" ref="501480005"/> + <string key="NSClassName">TreeView</string> + </object> + </object> + <string key="NSFrame">{{1, 1}, {367, 328}}</string> + <reference key="NSSuperview" ref="53827100"/> + <reference key="NSNextKeyView" ref="895061337"/> + <reference key="NSDocView" ref="895061337"/> + <object class="NSColor" key="NSBGColor"> + <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">MC42NjY2NjY2NjY3AA</bytes> + </object> + </object> + <int key="NScvFlags">4</int> + </object> + <object class="NSScroller" id="766812660"> + <reference key="NSNextResponder" ref="53827100"/> + <int key="NSvFlags">-2147483392</int> + <string key="NSFrame">{{353, 1}, {15, 313}}</string> + <reference key="NSSuperview" ref="53827100"/> + <reference key="NSTarget" ref="53827100"/> + <string key="NSAction">_doScroller:</string> + <double key="NSCurValue">1</double> + <double key="NSPercent">0.96363627910614014</double> + </object> + <object class="NSScroller" id="86289003"> + <reference key="NSNextResponder" ref="53827100"/> + <int key="NSvFlags">-2147483392</int> + <string key="NSFrame">{{1, 314}, {352, 15}}</string> + <reference key="NSSuperview" ref="53827100"/> + <int key="NSsFlags">1</int> + <reference key="NSTarget" ref="53827100"/> + <string key="NSAction">_doScroller:</string> + <double key="NSPercent">0.50602412223815918</double> + </object> + </object> + <string key="NSFrame">{{-1, 39}, {369, 330}}</string> + <reference key="NSSuperview" ref="1006"/> + <reference key="NSNextKeyView" ref="501480005"/> + <int key="NSsFlags">562</int> + <reference key="NSVScroller" ref="766812660"/> + <reference key="NSHScroller" ref="86289003"/> + <reference key="NSContentView" ref="501480005"/> + </object> + </object> + <string key="NSFrameSize">{367, 368}</string> + <reference key="NSSuperview"/> + </object> + <string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string> + <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string> + </object> + </object> + <object class="IBObjectContainer" key="IBDocument.Objects"> + <object class="NSMutableArray" key="connectionRecords"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">window</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="1005"/> + </object> + <int key="connectionID">3</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">view</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="895061337"/> + </object> + <int key="connectionID">8</int> + </object> + </object> + <object class="IBMutableOrderedSet" key="objectRecords"> + <object class="NSArray" key="orderedObjects"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="IBObjectRecord"> + <int key="objectID">0</int> + <reference key="object" ref="0"/> + <reference key="children" ref="1000"/> + <nil key="parent"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">-2</int> + <reference key="object" ref="1001"/> + <reference key="parent" ref="0"/> + <string key="objectName">File's Owner</string> + </object> + <object class="IBObjectRecord"> + <int key="objectID">-1</int> + <reference key="object" ref="1003"/> + <reference key="parent" ref="0"/> + <string key="objectName">First Responder</string> + </object> + <object class="IBObjectRecord"> + <int key="objectID">-3</int> + <reference key="object" ref="1004"/> + <reference key="parent" ref="0"/> + <string key="objectName">Application</string> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1</int> + <reference key="object" ref="1005"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="1006"/> + </object> + <reference key="parent" ref="0"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">2</int> + <reference key="object" ref="1006"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="53827100"/> + </object> + <reference key="parent" ref="1005"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">4</int> + <reference key="object" ref="53827100"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="766812660"/> + <reference ref="86289003"/> + <reference ref="895061337"/> + </object> + <reference key="parent" ref="1006"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5</int> + <reference key="object" ref="766812660"/> + <reference key="parent" ref="53827100"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">6</int> + <reference key="object" ref="86289003"/> + <reference key="parent" ref="53827100"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7</int> + <reference key="object" ref="895061337"/> + <reference key="parent" ref="53827100"/> + </object> + </object> + </object> + <object class="NSMutableDictionary" key="flattenedProperties"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>1.IBEditorWindowLastContentRect</string> + <string>1.IBPluginDependency</string> + <string>1.IBWindowTemplateEditedContentRect</string> + <string>1.NSWindowTemplate.visibleAtLaunch</string> + <string>1.WindowOrigin</string> + <string>1.editorWindowContentRectSynchronizationRect</string> + <string>2.IBPluginDependency</string> + <string>4.IBPluginDependency</string> + <string>4.IBViewBoundsToFrameTransform</string> + <string>5.IBPluginDependency</string> + <string>6.IBPluginDependency</string> + <string>7.IBPluginDependency</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>{{344, 236}, {367, 368}}</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>{{344, 236}, {367, 368}}</string> + <integer value="1"/> + <string>{196, 240}</string> + <string>{{202, 428}, {480, 270}}</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAAC/gAAAw7eAAA</bytes> + </object> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + </object> + </object> + <object class="NSMutableDictionary" key="unlocalizedProperties"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference key="dict.sortedKeys" ref="0"/> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> + </object> + <nil key="activeLocalization"/> + <object class="NSMutableDictionary" key="localizations"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference key="dict.sortedKeys" ref="0"/> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> + </object> + <nil key="sourceID"/> + <int key="maxID">8</int> + </object> + <object class="IBClassDescriber" key="IBDocument.Classes"> + <object class="NSMutableArray" key="referencedPartialClassDescriptions"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="IBPartialClassDescription"> + <string key="className">BookmarksController</string> + <string key="superclassName">NSWindowController</string> + <object class="NSMutableDictionary" key="actions"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>addBookmark:</string> + <string>openBookmarkURL:</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>id</string> + <string>id</string> + </object> + </object> + <object class="NSMutableDictionary" key="actionInfosByName"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>addBookmark:</string> + <string>openBookmarkURL:</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="IBActionInfo"> + <string key="name">addBookmark:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">openBookmarkURL:</string> + <string key="candidateClassName">id</string> + </object> + </object> + </object> + <object class="NSMutableDictionary" key="outlets"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>defaultMenu</string> + <string>view</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>NSMenu</string> + <string>TreeView</string> + </object> + </object> + <object class="NSMutableDictionary" key="toOneOutletInfosByName"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>defaultMenu</string> + <string>view</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="IBToOneOutletInfo"> + <string key="name">defaultMenu</string> + <string key="candidateClassName">NSMenu</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">view</string> + <string key="candidateClassName">TreeView</string> + </object> + </object> + </object> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">BookmarksController.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSApplication</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">PSMTabBarControl/PSMTabDragAssistant.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">PSMTabBarControl/PSMTabBarCell.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">PSMTabBarControl/PSMTabBarControl.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">ScrollableView</string> + <string key="superclassName">NSView</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">ScrollableView.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">TreeView</string> + <string key="superclassName">ScrollableView</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">TreeView.h</string> + </object> + </object> + </object> + </object> + <int key="IBDocument.localizationMode">0</int> + <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string> + <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies"> + <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string> + <integer value="3000" key="NS.object.0"/> + </object> + <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool> + <string key="IBDocument.LastKnownRelativeProjectPath">../NetSurf.xcodeproj</string> + <int key="IBDocument.defaultPropertyAccessControl">3</int> + </data> +</archive> diff --git a/cocoa/res/MainMenu.xib b/cocoa/res/MainMenu.xib index 596c9ec83..d38240bfd 100644 --- a/cocoa/res/MainMenu.xib +++ b/cocoa/res/MainMenu.xib @@ -12,6 +12,7 @@ </object> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> + <integer value="29"/> <integer value="853"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> @@ -1021,11 +1022,11 @@ </object> <object class="IBConnectionRecord"> <object class="IBActionConnection" key="connection"> - <string key="label">showBookmarksWindow:</string> + <string key="label">showWindow:</string> <reference key="source" ref="867741866"/> <reference key="destination" ref="832858329"/> </object> - <int key="connectionID">858</int> + <int key="connectionID">859</int> </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> @@ -1755,7 +1756,7 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>{{525, 802}, {197, 73}}</string> - <string>{{656, 815}, {446, 20}}</string> + <string>{{604, 815}, {446, 20}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>{74, 862}</string> @@ -1835,7 +1836,7 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{876, 809}, {64, 6}}</string> + <string>{{824, 809}, {64, 6}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>{{616, 718}, {206, 43}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -1861,27 +1862,25 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">858</int> + <int key="maxID">859</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="IBPartialClassDescription"> <string key="className">BookmarksController</string> - <string key="superclassName">NSObject</string> + <string key="superclassName">NSWindowController</string> <object class="NSMutableDictionary" key="actions"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>addBookmark:</string> <string>openBookmarkURL:</string> - <string>showBookmarksWindow:</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <string>id</string> <string>id</string> - <string>id</string> </object> </object> <object class="NSMutableDictionary" key="actionInfosByName"> @@ -1890,7 +1889,6 @@ <bool key="EncodedWithXMLCoder">YES</bool> <string>addBookmark:</string> <string>openBookmarkURL:</string> - <string>showBookmarksWindow:</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -1902,10 +1900,6 @@ <string key="name">openBookmarkURL:</string> <string key="candidateClassName">id</string> </object> - <object class="IBActionInfo"> - <string key="name">showBookmarksWindow:</string> - <string key="candidateClassName">id</string> - </object> </object> </object> <object class="NSMutableDictionary" key="outlets"> |