diff options
author | Sven Weidauer <sven.weidauer@gmail.com> | 2011-02-28 15:24:38 +0000 |
---|---|---|
committer | Sven Weidauer <sven.weidauer@gmail.com> | 2011-02-28 15:24:38 +0000 |
commit | c03890339ecf69b577927e100b3fa69eb1227a53 (patch) | |
tree | 584ea471b44c9fd51a327aa43b81abe7f27cdbd2 | |
parent | 4b10485de13d5ba23ab496092184c15d4d4bc9a1 (diff) | |
download | netsurf-c03890339ecf69b577927e100b3fa69eb1227a53.tar.gz netsurf-c03890339ecf69b577927e100b3fa69eb1227a53.tar.bz2 |
Implemented menu for back and forward buttons.
svn path=/trunk/netsurf/; revision=11857
-rw-r--r-- | cocoa/BrowserViewController.h | 3 | ||||
-rw-r--r-- | cocoa/BrowserViewController.m | 59 | ||||
-rw-r--r-- | cocoa/BrowserWindowController.h | 4 | ||||
-rw-r--r-- | cocoa/BrowserWindowController.m | 14 | ||||
-rw-r--r-- | cocoa/res/BrowserWindow.xib | 442 |
5 files changed, 280 insertions, 242 deletions
diff --git a/cocoa/BrowserViewController.h b/cocoa/BrowserViewController.h index f9085e44d..81ac74249 100644 --- a/cocoa/BrowserViewController.h +++ b/cocoa/BrowserViewController.h @@ -67,4 +67,7 @@ struct browser_window; - (IBAction) zoomOut: (id) sender; - (IBAction) zoomOriginal: (id) sender; +- (void) buildBackMenu: (NSMenu *)menu; +- (void) buildForwardMenu: (NSMenu *)menu; + @end diff --git a/cocoa/BrowserViewController.m b/cocoa/BrowserViewController.m index 8f903c839..387227de0 100644 --- a/cocoa/BrowserViewController.m +++ b/cocoa/BrowserViewController.m @@ -182,4 +182,63 @@ static inline bool compare_float( float a, float b ) [browserView updateHistory]; } +struct history_add_menu_item_data { + NSInteger index; + NSMenu *menu; + id target; +}; + +static bool history_add_menu_item_cb( const struct history *history, int x0, int y0, int x1, int y1, + const struct history_entry *page, void *user_data ) +{ + struct history_add_menu_item_data *data = user_data; + + NSMenuItem *item = nil; + if (data->index < [data->menu numberOfItems]) { + item = [data->menu itemAtIndex: data->index]; + } else { + item = [[NSMenuItem alloc] initWithTitle: @"" + action: @selector( historyItemSelected: ) + keyEquivalent: @""]; + [data->menu addItem: item]; + [item release]; + } + ++data->index; + + [item setTarget: data->target]; + [item setTitle: [NSString stringWithUTF8String: history_entry_get_title( page )]]; + [item setRepresentedObject: [NSValue valueWithPointer: page]]; + + return true; +} + +- (IBAction) historyItemSelected: (id) sender; +{ + struct history_entry *entry = [[sender representedObject] pointerValue]; + history_go( browser, browser->history, entry, false ); + [self updateBackForward]; +} + +- (void) buildBackMenu: (NSMenu *)menu; +{ + struct history_add_menu_item_data data = { + .index = 0, + .menu = menu, + .target = self + }; + history_enumerate_back( browser->history, history_add_menu_item_cb, &data ); + while (data.index < [menu numberOfItems]) [menu removeItemAtIndex: data.index]; +} + +- (void) buildForwardMenu: (NSMenu *)menu; +{ + struct history_add_menu_item_data data = { + .index = 0, + .menu = menu, + .target = self + }; + history_enumerate_forward( browser->history, history_add_menu_item_cb, &data ); + while (data.index < [menu numberOfItems]) [menu removeItemAtIndex: data.index]; +} + @end diff --git a/cocoa/BrowserWindowController.h b/cocoa/BrowserWindowController.h index 2f29b4ca2..22e199509 100644 --- a/cocoa/BrowserWindowController.h +++ b/cocoa/BrowserWindowController.h @@ -30,6 +30,8 @@ NSSegmentedControl *navigationControl; NSButton *historyButton; BrowserViewController *activeBrowser; + NSMenu *historyBackMenu; + NSMenu *historyForwardMenu; } @property (readwrite, assign, nonatomic) IBOutlet PSMTabBarControl *tabBar; @@ -38,6 +40,8 @@ @property (readwrite, assign, nonatomic) IBOutlet NSObjectController *activeBrowserController; @property (readwrite, assign, nonatomic) IBOutlet NSSegmentedControl *navigationControl; @property (readwrite, assign, nonatomic) IBOutlet NSButton *historyButton; +@property (readwrite, assign, nonatomic) IBOutlet NSMenu *historyBackMenu; +@property (readwrite, assign, nonatomic) IBOutlet NSMenu *historyForwardMenu; @property (readwrite, assign, nonatomic) BrowserViewController *activeBrowser; diff --git a/cocoa/BrowserWindowController.m b/cocoa/BrowserWindowController.m index 9fa502429..343bd42e6 100644 --- a/cocoa/BrowserWindowController.m +++ b/cocoa/BrowserWindowController.m @@ -42,6 +42,8 @@ @synthesize urlField; @synthesize navigationControl; @synthesize historyButton; +@synthesize historyBackMenu; +@synthesize historyForwardMenu; @synthesize activeBrowser; @synthesize activeBrowserController; @@ -83,6 +85,9 @@ [self bind: @"canGoForward" toObject: activeBrowserController withKeyPath: @"selection.canGoForward" options: nil]; + + [navigationControl setMenu: historyBackMenu forSegment: 0]; + [navigationControl setMenu: historyForwardMenu forSegment: 1]; } - (void) addTab: (BrowserViewController *)browser; @@ -184,6 +189,15 @@ [(NetSurfApp *)NSApp setFrontTab: [[tabView selectedTabViewItem] identifier]]; } +- (void)menuNeedsUpdate:(NSMenu *)menu +{ + if (menu == historyBackMenu) { + [activeBrowser buildBackMenu: menu]; + } else if (menu == historyForwardMenu) { + [activeBrowser buildForwardMenu: menu]; + } +} + #pragma mark - #pragma mark Tab bar delegate diff --git a/cocoa/res/BrowserWindow.xib b/cocoa/res/BrowserWindow.xib index 377eadc02..982144cb8 100644 --- a/cocoa/res/BrowserWindow.xib +++ b/cocoa/res/BrowserWindow.xib @@ -1,18 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10"> +<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.03"> <data> <int key="IBDocument.SystemTarget">1050</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> + <string key="IBDocument.SystemVersion">9L31a</string> + <string key="IBDocument.InterfaceBuilderVersion">680</string> + <string key="IBDocument.AppKitVersion">949.54</string> + <string key="IBDocument.HIToolboxVersion">353.00</string> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="1"/> + <integer value="1" id="9"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -20,7 +16,7 @@ </object> <object class="NSMutableDictionary" key="IBDocument.Metadata"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys" id="0"> + <object class="NSArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> </object> <object class="NSMutableArray" key="dict.values"> @@ -58,7 +54,7 @@ <int key="NSToolbarSizeMode">1</int> <object class="NSMutableDictionary" key="NSToolbarIBIdentifiedItems"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> + <object class="NSMutableArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>6D497003-6D4B-4335-ADCE-368C7CD87371</string> <string>9DB83278-4E60-41F8-8A7C-C0B2E00A552B</string> @@ -89,7 +85,7 @@ <string key="NSContents"/> <object class="NSFont" key="NSSupport" id="770988704"> <string key="NSName">LucidaGrande</string> - <double key="NSSize">13</double> + <double key="NSSize">1.300000e+01</double> <int key="NSfFlags">1044</int> </object> <reference key="NSControlView" ref="229385913"/> @@ -174,14 +170,14 @@ <int key="NSCellFlags2">0</int> <object class="NSFont" key="NSSupport"> <string key="NSName">LucidaGrande</string> - <double key="NSSize">13</double> + <double key="NSSize">1.300000e+01</double> <int key="NSfFlags">16</int> </object> <reference key="NSControlView" ref="692457026"/> <object class="NSMutableArray" key="NSSegmentImages"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSSegmentItem"> - <double key="NSSegmentItemWidth">30</double> + <double key="NSSegmentItemWidth">3.000000e+01</double> <object class="NSCustomResource" key="NSSegmentItemImage"> <string key="NSClassName">NSImage</string> <string key="NSResourceName">NSLeftFacingTriangleTemplate</string> @@ -191,7 +187,7 @@ <int key="NSSegmentItemImageScaling">0</int> </object> <object class="NSSegmentItem"> - <double key="NSSegmentItemWidth">30</double> + <double key="NSSegmentItemWidth">3.000000e+01</double> <object class="NSCustomResource" key="NSSegmentItemImage"> <string key="NSClassName">NSImage</string> <string key="NSResourceName">NSRightFacingTriangleTemplate</string> @@ -275,9 +271,96 @@ <string key="NSToolbarItemPaletteLabel">Customize</string> <string key="NSToolbarItemToolTip">Customize Toolbar</string> <nil key="NSToolbarItemView"/> - <object class="NSCustomResource" key="NSToolbarItemImage"> - <string key="NSClassName">NSImage</string> - <string key="NSResourceName">NSToolbarCustomizeToolbarItemImage</string> + <object class="NSImage" key="NSToolbarItemImage"> + <int key="NSImageFlags">683671552</int> + <string key="NSSize">{32, 32}</string> + <object class="NSMutableArray" key="NSReps"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray"> + <bool key="EncodedWithXMLCoder">YES</bool> + <integer value="0" id="8"/> + <object class="NSBitmapImageRep"> + <object class="NSData" key="NSTIFFRepresentation"> + <bytes key="NS.bytes">TU0AKgAAEAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAICAgbAAAABAAAAAAEBAQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAQEBAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAENDQ0dJSUlW11dXbBpaWnDb29vzyAgIGUPDw8xAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAABsbGyUoKChIHh4ePSkpKUonJycsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwMDCEJCQoWvr6/i9fX1/fX19f7h4eH82dnZ+YODg9sYGBg8 +AAAAAAAAAAAAAAAAAAAAAAAAAAJFRUV6ZGRkvf39/f/+/v7//////0NDQ7QAAAAEAAAAAAAAAAAAAAAA +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 +AAAACQAAABAAAAAYAAAAIAAAACoAAAAxAAAANgAAADkAAAA4AQEBOQAAAC8AAAAnAAAAHQAAABUAAAAO +AAAACgAAAAsAAAAPAAAAFwAAACAAAAAqAAAAMQAAADQAAAAzAAAALQAAACQAAAAbAAAAEgAAAAsAAAAA +AAAAAAAAAAQAAAAJAAAAEAAAABgAAAAgAAAAKgAAADEAAAA2AAAAOQAAADgAAAA1AAAALwAAACcAAAAd +AAAAFQAAAA4AAAAKAAAACwAAAA8AAAAXAAAAIAAAACoAAAAxAAAANAAAADMAAAAtAAAAJAAAABsAAAAS +AAAACwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA0BAAADAAAAAQAgAAABAQADAAAAAQAgAAABAgADAAAABAAA +EKoBAwADAAAAAQABAAABBgADAAAAAQACAAABEQAEAAAAAQAAAAgBEgADAAAAAQABAAABFQADAAAAAQAE +AAABFgADAAAAAQD8AAABFwAEAAAAAQAAEAABHAADAAAAAQABAAABUgADAAAAAQABAAABUwADAAAABAAA +ELIAAAAAAAgACAAIAAgAAQABAAEAAQ</bytes> + </object> + </object> + </object> + </object> + <object class="NSColor" key="NSColor"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MCAwAA</bytes> + </object> </object> <nil key="NSToolbarItemTarget"/> <string key="NSToolbarItemAction">runToolbarCustomizationPalette:</string> @@ -400,7 +483,7 @@ <bool key="EncodedWithXMLCoder">YES</bool> </object> </object> - <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string> + <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string> <string key="NSWindowContentMinSize">{273, 43}</string> <object class="NSView" key="NSWindowView" id="1006"> <reference key="NSNextResponder"/> @@ -426,7 +509,7 @@ <string key="NSContents">Status bar</string> <object class="NSFont" key="NSSupport"> <string key="NSName">LucidaGrande</string> - <double key="NSSize">11</double> + <double key="NSSize">1.100000e+01</double> <int key="NSfFlags">3100</int> </object> <reference key="NSControlView" ref="795357547"/> @@ -436,7 +519,7 @@ <string key="NSColorName">controlColor</string> <object class="NSColor" key="NSColor"> <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes> + <bytes key="NSWhite">MC42NjY2NjY2OQA</bytes> </object> </object> <object class="NSColor" key="NSTextColor"> @@ -454,7 +537,7 @@ <string key="NSFrame">{{4, 2}, {16, 16}}</string> <reference key="NSSuperview" ref="1006"/> <int key="NSpiFlags">28938</int> - <double key="NSMaxValue">100</double> + <double key="NSMaxValue">1.000000e+02</double> </object> <object class="NSTabView" id="477345536"> <reference key="NSNextResponder" ref="1006"/> @@ -475,9 +558,7 @@ </object> <string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string> <string key="NSMinSize">{273, 97}</string> - <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string> - <bool key="NSAutorecalculatesContentBorderThicknessMinY">NO</bool> - <double key="NSContentBorderThicknessMinY">20</double> + <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string> </object> <object class="NSObjectController" id="177599630"> <object class="NSMutableArray" key="NSDeclaredKeys"> @@ -494,6 +575,18 @@ <bool key="NSEditable">YES</bool> <object class="_NSManagedProxy" key="_NSManagedProxy"/> </object> + <object class="NSMenu" id="237938373"> + <string key="NSTitle">Forward</string> + <object class="NSMutableArray" key="NSMenuItems"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> + </object> + <object class="NSMenu" id="353660550"> + <string key="NSTitle">Back</string> + <object class="NSMutableArray" key="NSMenuItems"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> + </object> </object> <object class="IBObjectContainer" key="IBDocument.Objects"> <object class="NSMutableArray" key="connectionRecords"> @@ -714,32 +807,66 @@ </object> <int key="connectionID">87</int> </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">historyForwardMenu</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="237938373"/> + </object> + <int key="connectionID">96</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">historyBackMenu</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="353660550"/> + </object> + <int key="connectionID">97</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">delegate</string> + <reference key="source" ref="237938373"/> + <reference key="destination" ref="1001"/> + </object> + <int key="connectionID">98</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">delegate</string> + <reference key="source" ref="353660550"/> + <reference key="destination" ref="1001"/> + </object> + <int key="connectionID">99</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"/> + <object class="NSArray" key="object" id="209349352"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> <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> + <reference key="parent" ref="209349352"/> + <string type="base64-UTF8" key="objectName">RmlsZSdzIE93bmVyA</string> </object> <object class="IBObjectRecord"> <int key="objectID">-1</int> <reference key="object" ref="1003"/> - <reference key="parent" ref="0"/> + <reference key="parent" ref="209349352"/> <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"/> + <reference key="parent" ref="209349352"/> <string key="objectName">Application</string> </object> <object class="IBObjectRecord"> @@ -750,7 +877,7 @@ <reference ref="1006"/> <reference ref="71746575"/> </object> - <reference key="parent" ref="0"/> + <reference key="parent" ref="209349352"/> </object> <object class="IBObjectRecord"> <int key="objectID">2</int> @@ -858,7 +985,7 @@ <object class="IBObjectRecord"> <int key="objectID">61</int> <reference key="object" ref="177599630"/> - <reference key="parent" ref="0"/> + <reference key="parent" ref="209349352"/> <string key="objectName">Active Browser</string> </object> <object class="IBObjectRecord"> @@ -930,11 +1057,27 @@ <reference key="object" ref="413663381"/> <reference key="parent" ref="518219892"/> </object> + <object class="IBObjectRecord"> + <int key="objectID">88</int> + <reference key="object" ref="237938373"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> + <reference key="parent" ref="209349352"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">92</int> + <reference key="object" ref="353660550"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> + <reference key="parent" ref="209349352"/> + </object> </object> </object> <object class="NSMutableDictionary" key="flattenedProperties"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> + <object class="NSMutableArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>1.IBEditorWindowLastContentRect</string> <string>1.IBPluginDependency</string> @@ -973,13 +1116,15 @@ <string>82.IBAttributePlaceholdersKey</string> <string>82.IBPluginDependency</string> <string>83.IBPluginDependency</string> + <string>88.IBPluginDependency</string> + <string>92.IBPluginDependency</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> - <string>{{276, 86}, {774, 554}}</string> + <string>{{103, 62}, {774, 554}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{276, 86}, {774, 554}}</string> - <integer value="1"/> + <string>{{103, 62}, {774, 554}}</string> + <reference ref="9"/> <string>{196, 240}</string> <string>{{202, 428}, {480, 270}}</string> <boolean value="YES"/> @@ -1014,7 +1159,7 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="0"/> + <reference ref="8"/> <object class="NSMutableDictionary"> <string key="NS.key.0">ToolTip</string> <object class="IBToolTipAttribute" key="NS.object.0"> @@ -1035,11 +1180,15 @@ </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <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="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> </object> @@ -1047,13 +1196,15 @@ <nil key="activeLocalization"/> <object class="NSMutableDictionary" key="localizations"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference key="dict.sortedKeys" ref="0"/> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> </object> </object> <nil key="sourceID"/> - <int key="maxID">87</int> + <int key="maxID">99</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -1061,17 +1212,6 @@ <object class="IBPartialClassDescription"> <string key="className">BrowserView</string> <string key="superclassName">ScrollableView</string> - <object class="NSMutableDictionary" key="outlets"> - <string key="NS.key.0">historyButton</string> - <string key="NS.object.0">NSButton</string> - </object> - <object class="NSMutableDictionary" key="toOneOutletInfosByName"> - <string key="NS.key.0">historyButton</string> - <object class="IBToOneOutletInfo" key="NS.object.0"> - <string key="name">historyButton</string> - <string key="candidateClassName">NSButton</string> - </object> - </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> <string key="minorKey">BrowserView.h</string> @@ -1082,7 +1222,7 @@ <string key="superclassName">NSViewController</string> <object class="NSMutableDictionary" key="actions"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> + <object class="NSMutableArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>backForwardSelected:</string> <string>goBack:</string> @@ -1109,76 +1249,10 @@ <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>backForwardSelected:</string> - <string>goBack:</string> - <string>goForward:</string> - <string>goHome:</string> - <string>navigate:</string> - <string>reloadPage:</string> - <string>stopLoading:</string> - <string>zoomIn:</string> - <string>zoomOriginal:</string> - <string>zoomOut:</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="IBActionInfo"> - <string key="name">backForwardSelected:</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBActionInfo"> - <string key="name">goBack:</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBActionInfo"> - <string key="name">goForward:</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBActionInfo"> - <string key="name">goHome:</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBActionInfo"> - <string key="name">navigate:</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBActionInfo"> - <string key="name">reloadPage:</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBActionInfo"> - <string key="name">stopLoading:</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBActionInfo"> - <string key="name">zoomIn:</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBActionInfo"> - <string key="name">zoomOriginal:</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBActionInfo"> - <string key="name">zoomOut:</string> - <string key="candidateClassName">id</string> - </object> - </object> - </object> <object class="NSMutableDictionary" key="outlets"> <string key="NS.key.0">browserView</string> <string key="NS.object.0">BrowserView</string> </object> - <object class="NSMutableDictionary" key="toOneOutletInfosByName"> - <string key="NS.key.0">browserView</string> - <object class="IBToOneOutletInfo" key="NS.object.0"> - <string key="name">browserView</string> - <string key="candidateClassName">BrowserView</string> - </object> - </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> <string key="minorKey">BrowserViewController.h</string> @@ -1197,7 +1271,7 @@ <string key="superclassName">NSWindowController</string> <object class="NSMutableDictionary" key="actions"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> + <object class="NSMutableArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>closeCurrentTab:</string> <string>newTab:</string> @@ -1208,31 +1282,14 @@ <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>closeCurrentTab:</string> - <string>newTab:</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="IBActionInfo"> - <string key="name">closeCurrentTab:</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBActionInfo"> - <string key="name">newTab:</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"> + <object class="NSMutableArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>activeBrowserController</string> + <string>historyBackMenu</string> <string>historyButton</string> + <string>historyForwardMenu</string> <string>navigationControl</string> <string>tabBar</string> <string>tabView</string> @@ -1241,52 +1298,15 @@ <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <string>NSObjectController</string> + <string>NSMenu</string> <string>NSButton</string> + <string>NSMenu</string> <string>NSSegmentedControl</string> <string>PSMTabBarControl</string> <string>NSTabView</string> <string>URLFieldCell</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>activeBrowserController</string> - <string>historyButton</string> - <string>navigationControl</string> - <string>tabBar</string> - <string>tabView</string> - <string>urlField</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="IBToOneOutletInfo"> - <string key="name">activeBrowserController</string> - <string key="candidateClassName">NSObjectController</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">historyButton</string> - <string key="candidateClassName">NSButton</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">navigationControl</string> - <string key="candidateClassName">NSSegmentedControl</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">tabBar</string> - <string key="candidateClassName">PSMTabBarControl</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">tabView</string> - <string key="candidateClassName">NSTabView</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">urlField</string> - <string key="candidateClassName">URLFieldCell</string> - </object> - </object> - </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> <string key="minorKey">BrowserWindowController.h</string> @@ -1322,7 +1342,7 @@ <string key="superclassName">NSControl</string> <object class="NSMutableDictionary" key="outlets"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> + <object class="NSMutableArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>delegate</string> <string>partnerView</string> @@ -1337,35 +1357,6 @@ <string>NSTabView</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>delegate</string> - <string>partnerView</string> - <string>style</string> - <string>tabView</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="IBToOneOutletInfo"> - <string key="name">delegate</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">partnerView</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">style</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">tabView</string> - <string key="candidateClassName">NSTabView</string> - </object> - </object> - </object> <reference key="sourceIdentifier" ref="395663776"/> </object> <object class="IBPartialClassDescription"> @@ -1398,40 +1389,7 @@ </object> </object> <int key="IBDocument.localizationMode">0</int> - <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string> - <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults"> - <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string> - <integer value="1050" key="NS.object.0"/> - </object> - <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> - <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>HomeTemplate</string> - <string>NSIconViewTemplate</string> - <string>NSLeftFacingTriangleTemplate</string> - <string>NSMenuCheckmark</string> - <string>NSMenuMixedState</string> - <string>NSRightFacingTriangleTemplate</string> - <string>NSToolbarCustomizeToolbarItemImage</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>{16, 16}</string> - <string>{11, 10}</string> - <string>{9, 9}</string> - <string>{9, 8}</string> - <string>{7, 2}</string> - <string>{9, 9}</string> - <string>{32, 32}</string> - </object> - </object> </data> </archive> |