diff options
author | Sven Weidauer <sven.weidauer@gmail.com> | 2011-02-01 08:39:35 +0000 |
---|---|---|
committer | Sven Weidauer <sven.weidauer@gmail.com> | 2011-02-01 08:39:35 +0000 |
commit | 84b4a01f4f2032a17e5dc93e4b4f1f37a71ab04c (patch) | |
tree | af84f414442ae613d1a95325ef3490bff4c078be /cocoa | |
parent | 28ff0cfb0af7d58244dfd06546b2c8ec37f01c75 (diff) | |
download | netsurf-84b4a01f4f2032a17e5dc93e4b4f1f37a71ab04c.tar.gz netsurf-84b4a01f4f2032a17e5dc93e4b4f1f37a71ab04c.tar.bz2 |
Implemented global history window using new Tree class.
svn path=/trunk/netsurf/; revision=11578
Diffstat (limited to 'cocoa')
-rw-r--r-- | cocoa/HistoryWindowController.h | 31 | ||||
-rw-r--r-- | cocoa/HistoryWindowController.m | 54 | ||||
-rw-r--r-- | cocoa/Makefile.target | 4 | ||||
-rw-r--r-- | cocoa/NetSurf.xcodeproj/project.pbxproj | 6 | ||||
-rw-r--r-- | cocoa/NetSurfAppDelegate.h | 6 | ||||
-rw-r--r-- | cocoa/NetSurfAppDelegate.m | 16 | ||||
-rw-r--r-- | cocoa/res/HistoryWindow.xib | 338 | ||||
-rw-r--r-- | cocoa/res/MainMenu.xib | 206 |
8 files changed, 471 insertions, 190 deletions
diff --git a/cocoa/HistoryWindowController.h b/cocoa/HistoryWindowController.h new file mode 100644 index 000000000..b590dfe1d --- /dev/null +++ b/cocoa/HistoryWindowController.h @@ -0,0 +1,31 @@ +/* + * Copyright 2011 Sven Weidauer <sven.weidauer@gmail.com> + * + * This file is part of NetSurf, http://www.netsurf-browser.org/ + * + * NetSurf is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * NetSurf is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#import <Cocoa/Cocoa.h> + +@class Tree; +@class TreeView; + +@interface HistoryWindowController : NSWindowController { + Tree *tree; + TreeView *view; +} + +@property (readwrite, retain, nonatomic) IBOutlet TreeView *view; + +@end diff --git a/cocoa/HistoryWindowController.m b/cocoa/HistoryWindowController.m new file mode 100644 index 000000000..438551bca --- /dev/null +++ b/cocoa/HistoryWindowController.m @@ -0,0 +1,54 @@ +/* + * Copyright 2011 Sven Weidauer <sven.weidauer@gmail.com> + * + * This file is part of NetSurf, http://www.netsurf-browser.org/ + * + * NetSurf is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * NetSurf is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#import "cocoa/HistoryWindowController.h" +#import "cocoa/Tree.h" +#import "cocoa/TreeView.h" + +#import "desktop/history_global_core.h" + +@implementation HistoryWindowController + +@synthesize view; + +- init; +{ + if ((self = [super initWithWindowNibName: @"HistoryWindow"]) == nil) return nil; + + tree = [[Tree alloc] initWithFlags: history_global_get_tree_flags()]; + history_global_initialise( [tree tree], "" ); + + return self; +} + +- (void) dealloc; +{ + history_global_cleanup(); + [tree release]; + [self setView: nil]; + + [super dealloc]; +} + +- (void)awakeFromNib; +{ + [view setTree: tree]; + [[self window] setExcludedFromWindowsMenu: YES]; +} + +@end diff --git a/cocoa/Makefile.target b/cocoa/Makefile.target index 2c429f3f6..b281cc44c 100644 --- a/cocoa/Makefile.target +++ b/cocoa/Makefile.target @@ -77,6 +77,7 @@ S_COCOA := \ Tree.m \ TreeView.m \ HistoryView.m \ + HistoryWindowController.m \ FormSelectMenu.m \ bitmap.m \ fetch.m \ @@ -116,7 +117,8 @@ SOURCES := $(addprefix $(shell pwd)/,$(SOURCES)) EXETARGET := NetSurf -S_XIBS := MainMenu.xib Browser.xib BrowserWindow.xib DownloadWindow.xib SearchWindow.xib PreferencesWindow.xib +S_XIBS := MainMenu.xib Browser.xib BrowserWindow.xib DownloadWindow.xib SearchWindow.xib PreferencesWindow.xib \ + HistoryWindow.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 b15887b9f..7b799fd77 100644 --- a/cocoa/NetSurf.xcodeproj/project.pbxproj +++ b/cocoa/NetSurf.xcodeproj/project.pbxproj @@ -186,6 +186,9 @@ 263629CA12F69B120048542C /* system_colour.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = system_colour.m; sourceTree = "<group>"; }; 263769A912F7EBE2000F45FE /* Tree.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Tree.h; sourceTree = "<group>"; }; 263769AA12F7EBE2000F45FE /* Tree.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Tree.m; sourceTree = "<group>"; }; + 26376A4112F7FA67000F45FE /* HistoryWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HistoryWindow.xib; sourceTree = "<group>"; }; + 26376A4312F7FA86000F45FE /* HistoryWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HistoryWindowController.h; sourceTree = "<group>"; }; + 26376A4412F7FA86000F45FE /* HistoryWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HistoryWindowController.m; 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>"; }; @@ -546,6 +549,8 @@ 265F30AB12D6637E0048B600 /* Prefix.pch */, 2625095112F72AA70090D236 /* PreferencesWindowController.h */, 2625095212F72AA70090D236 /* PreferencesWindowController.m */, + 26376A4312F7FA86000F45FE /* HistoryWindowController.h */, + 26376A4412F7FA86000F45FE /* HistoryWindowController.m */, ); name = "Cocoa Frontend"; sourceTree = "<group>"; @@ -565,6 +570,7 @@ 26CDCFF212E70AD1004FC66B /* BrowserWindow.xib */, 2666DC5B12F6D1770045E8B6 /* SearchWindow.xib */, 2625095012F72A8F0090D236 /* PreferencesWindow.xib */, + 26376A4112F7FA67000F45FE /* HistoryWindow.xib */, ); name = Resources; path = res; diff --git a/cocoa/NetSurfAppDelegate.h b/cocoa/NetSurfAppDelegate.h index b4ea15e8f..a22c4ceee 100644 --- a/cocoa/NetSurfAppDelegate.h +++ b/cocoa/NetSurfAppDelegate.h @@ -20,21 +20,23 @@ @class SearchWindowController; @class PreferencesWindowController; +@class HistoryWindowController; @interface NetSurfAppDelegate : NSObject { - NSWindow *historyWindow; SearchWindowController *search; PreferencesWindowController *preferences; + HistoryWindowController *history; } -@property (readwrite, retain, nonatomic) IBOutlet NSWindow *historyWindow; @property (readwrite, retain, nonatomic) SearchWindowController *search; @property (readwrite, retain, nonatomic) PreferencesWindowController *preferences; +@property (readwrite, retain, nonatomic) HistoryWindowController *history; - (IBAction) showSearchWindow: (id) sender; - (IBAction) searchForward: (id) sender; - (IBAction) searchBackward: (id) sender; - (IBAction) showPreferences: (id) sender; +- (IBAction) showGlobalHistory: (id) sender; @end diff --git a/cocoa/NetSurfAppDelegate.m b/cocoa/NetSurfAppDelegate.m index b37ff9a9b..2d15d05a3 100644 --- a/cocoa/NetSurfAppDelegate.m +++ b/cocoa/NetSurfAppDelegate.m @@ -19,6 +19,7 @@ #import "cocoa/NetSurfAppDelegate.h" #import "cocoa/SearchWindowController.h" #import "cocoa/PreferencesWindowController.h" +#import "cocoa/HistoryWindowController.h" #import "desktop/browser.h" #import "desktop/options.h" @@ -32,7 +33,7 @@ @implementation NetSurfAppDelegate -@synthesize historyWindow; +@synthesize history; @synthesize search; @synthesize preferences; @@ -58,11 +59,6 @@ browser_window_create( [urlAsString UTF8String], NULL, NULL, true, false ); } -- (void) awakeFromNib; -{ - [historyWindow setExcludedFromWindowsMenu: YES]; -} - - (IBAction) showSearchWindow: (id) sender; { if (search == nil) { @@ -102,6 +98,14 @@ [preferences showWindow: sender]; } +- (IBAction) showGlobalHistory: (id) sender; +{ + if (history == nil) { + [self setHistory: [[[HistoryWindowController alloc] init] autorelease]]; + } + [history showWindow: sender]; +} + // Application delegate methods - (BOOL) applicationOpenUntitledFile: (NSApplication *)sender; diff --git a/cocoa/res/HistoryWindow.xib b/cocoa/res/HistoryWindow.xib new file mode 100644 index 000000000..a5ec90e1a --- /dev/null +++ b/cocoa/res/HistoryWindow.xib @@ -0,0 +1,338 @@ +<?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="1"/> + </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">HistoryWindowController</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, 112}, {327, 398}}</string> + <int key="NSWTFlags">1618477056</int> + <string key="NSWindowTitle">History</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="329245506"> + <reference key="NSNextResponder" ref="1006"/> + <int key="NSvFlags">274</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSClipView" id="429990844"> + <reference key="NSNextResponder" ref="329245506"/> + <int key="NSvFlags">2304</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSCustomView" id="920629225"> + <reference key="NSNextResponder" ref="429990844"/> + <int key="NSvFlags">274</int> + <string key="NSFrameSize">{312, 383}</string> + <reference key="NSSuperview" ref="429990844"/> + <string key="NSClassName">TreeView</string> + </object> + </object> + <string key="NSFrame">{{1, 1}, {312, 383}}</string> + <reference key="NSSuperview" ref="329245506"/> + <reference key="NSNextKeyView" ref="920629225"/> + <reference key="NSDocView" ref="920629225"/> + <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="909448709"> + <reference key="NSNextResponder" ref="329245506"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{313, 1}, {15, 383}}</string> + <reference key="NSSuperview" ref="329245506"/> + <reference key="NSTarget" ref="329245506"/> + <string key="NSAction">_doScroller:</string> + <double key="NSCurValue">1</double> + <double key="NSPercent">0.96363627910614014</double> + </object> + <object class="NSScroller" id="886582390"> + <reference key="NSNextResponder" ref="329245506"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{1, 384}, {312, 15}}</string> + <reference key="NSSuperview" ref="329245506"/> + <int key="NSsFlags">1</int> + <reference key="NSTarget" ref="329245506"/> + <string key="NSAction">_doScroller:</string> + <double key="NSPercent">0.50602412223815918</double> + </object> + </object> + <string key="NSFrame">{{-1, -1}, {329, 400}}</string> + <reference key="NSSuperview" ref="1006"/> + <reference key="NSNextKeyView" ref="429990844"/> + <int key="NSsFlags">50</int> + <reference key="NSVScroller" ref="909448709"/> + <reference key="NSHScroller" ref="886582390"/> + <reference key="NSContentView" ref="429990844"/> + </object> + </object> + <string key="NSFrameSize">{327, 398}</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="920629225"/> + </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="329245506"/> + </object> + <reference key="parent" ref="1005"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">4</int> + <reference key="object" ref="329245506"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="909448709"/> + <reference ref="886582390"/> + <reference ref="920629225"/> + </object> + <reference key="parent" ref="1006"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5</int> + <reference key="object" ref="909448709"/> + <reference key="parent" ref="329245506"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">6</int> + <reference key="object" ref="886582390"/> + <reference key="parent" ref="329245506"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">7</int> + <reference key="object" ref="920629225"/> + <reference key="parent" ref="329245506"/> + </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>5.IBPluginDependency</string> + <string>6.IBPluginDependency</string> + <string>7.IBPluginDependency</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>{{361, 416}, {327, 398}}</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>{{361, 416}, {327, 398}}</string> + <boolean value="NO"/> + <string>{196, 240}</string> + <string>{{202, 428}, {480, 270}}</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> + </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">HistoryWindowController</string> + <string key="superclassName">NSWindowController</string> + <object class="NSMutableDictionary" key="outlets"> + <string key="NS.key.0">view</string> + <string key="NS.object.0">TreeView</string> + </object> + <object class="NSMutableDictionary" key="toOneOutletInfosByName"> + <string key="NS.key.0">view</string> + <object class="IBToOneOutletInfo" key="NS.object.0"> + <string key="name">view</string> + <string key="candidateClassName">TreeView</string> + </object> + </object> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">HistoryWindowController.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 7ca05ec2b..028a970a5 100644 --- a/cocoa/res/MainMenu.xib +++ b/cocoa/res/MainMenu.xib @@ -12,7 +12,7 @@ </object> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="57"/> + <integer value="24"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -643,87 +643,6 @@ </object> <string key="NSName">_NSMainMenu</string> </object> - <object class="NSWindowTemplate" id="346681284"> - <int key="NSWindowStyleMask">15</int> - <int key="NSWindowBacking">2</int> - <string key="NSWindowRect">{{196, 123}, {300, 387}}</string> - <int key="NSWTFlags">1685585920</int> - <string key="NSWindowTitle">History</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="75583718"> - <nil key="NSNextResponder"/> - <int key="NSvFlags">256</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSScrollView" id="429678852"> - <reference key="NSNextResponder" ref="75583718"/> - <int key="NSvFlags">274</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSClipView" id="862897293"> - <reference key="NSNextResponder" ref="429678852"/> - <int key="NSvFlags">2304</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSCustomView" id="363409241"> - <reference key="NSNextResponder" ref="862897293"/> - <int key="NSvFlags">268</int> - <string key="NSFrameSize">{300, 387}</string> - <reference key="NSSuperview" ref="862897293"/> - <string key="NSClassName">TreeView</string> - </object> - </object> - <string key="NSFrame">{{1, 1}, {300, 387}}</string> - <reference key="NSSuperview" ref="429678852"/> - <reference key="NSNextKeyView" ref="363409241"/> - <reference key="NSDocView" ref="363409241"/> - <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="1030123989"> - <reference key="NSNextResponder" ref="429678852"/> - <int key="NSvFlags">-2147483392</int> - <string key="NSFrame">{{319, 1}, {15, 371}}</string> - <reference key="NSSuperview" ref="429678852"/> - <reference key="NSTarget" ref="429678852"/> - <string key="NSAction">_doScroller:</string> - <double key="NSPercent">0.99741602067183466</double> - </object> - <object class="NSScroller" id="523968414"> - <reference key="NSNextResponder" ref="429678852"/> - <int key="NSvFlags">-2147483392</int> - <string key="NSFrame">{{1, 373}, {500, 15}}</string> - <reference key="NSSuperview" ref="429678852"/> - <int key="NSsFlags">1</int> - <reference key="NSTarget" ref="429678852"/> - <string key="NSAction">_doScroller:</string> - <double key="NSPercent">1</double> - </object> - </object> - <string key="NSFrame">{{-1, -1}, {302, 389}}</string> - <reference key="NSSuperview" ref="75583718"/> - <reference key="NSNextKeyView" ref="862897293"/> - <int key="NSsFlags">562</int> - <reference key="NSVScroller" ref="1030123989"/> - <reference key="NSHScroller" ref="523968414"/> - <reference key="NSContentView" ref="862897293"/> - </object> - </object> - <string key="NSFrameSize">{300, 387}</string> - </object> - <string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string> - <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string> - </object> <object class="NSCustomObject" id="1026802243"> <string key="NSClassName">NetSurfAppDelegate</string> </object> @@ -916,14 +835,6 @@ <int key="connectionID">759</int> </object> <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">makeKeyAndOrderFront:</string> - <reference key="source" ref="346681284"/> - <reference key="destination" ref="532573582"/> - </object> - <int key="connectionID">819</int> - </object> - <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> <string key="label">delegate</string> <reference key="source" ref="1050"/> @@ -932,14 +843,6 @@ <int key="connectionID">821</int> </object> <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">historyWindow</string> - <reference key="source" ref="1026802243"/> - <reference key="destination" ref="346681284"/> - </object> - <int key="connectionID">822</int> - </object> - <object class="IBConnectionRecord"> <object class="IBActionConnection" key="connection"> <string key="label">newDocument:</string> <reference key="source" ref="1014"/> @@ -1043,6 +946,14 @@ </object> <int key="connectionID">845</int> </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">showGlobalHistory:</string> + <reference key="source" ref="1014"/> + <reference key="destination" ref="532573582"/> + </object> + <int key="connectionID">846</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -1491,50 +1402,6 @@ <reference key="parent" ref="930654435"/> </object> <object class="IBObjectRecord"> - <int key="objectID">811</int> - <reference key="object" ref="346681284"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="75583718"/> - </object> - <reference key="parent" ref="0"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">812</int> - <reference key="object" ref="75583718"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="429678852"/> - </object> - <reference key="parent" ref="346681284"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">813</int> - <reference key="object" ref="429678852"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="1030123989"/> - <reference ref="523968414"/> - <reference ref="363409241"/> - </object> - <reference key="parent" ref="75583718"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">814</int> - <reference key="object" ref="1030123989"/> - <reference key="parent" ref="429678852"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">815</int> - <reference key="object" ref="523968414"/> - <reference key="parent" ref="429678852"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">816</int> - <reference key="object" ref="363409241"/> - <reference key="parent" ref="429678852"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">817</int> <reference key="object" ref="971013910"/> <reference key="parent" ref="835318025"/> @@ -1701,15 +1568,6 @@ <string>81.IBPluginDependency</string> <string>81.ImportedFromIB2</string> <string>81.editorWindowContentRectSynchronizationRect</string> - <string>811.IBEditorWindowLastContentRect</string> - <string>811.IBPluginDependency</string> - <string>811.IBWindowTemplateEditedContentRect</string> - <string>811.NSWindowTemplate.visibleAtLaunch</string> - <string>812.IBPluginDependency</string> - <string>813.IBPluginDependency</string> - <string>814.IBPluginDependency</string> - <string>815.IBPluginDependency</string> - <string>816.IBPluginDependency</string> <string>817.IBPluginDependency</string> <string>818.IBPluginDependency</string> <string>82.IBPluginDependency</string> @@ -1769,7 +1627,7 @@ <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>{{810, 694}, {194, 103}}</string> + <string>{{876, 712}, {194, 103}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>{{525, 802}, {197, 73}}</string> @@ -1836,15 +1694,6 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>{{323, 672}, {199, 203}}</string> - <string>{{331, 320}, {300, 387}}</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{331, 320}, {300, 387}}</string> - <boolean value="NO"/> - <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> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -1880,7 +1729,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">845</int> + <int key="maxID">846</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -1903,6 +1752,7 @@ <string>backForwardSelected:</string> <string>goBack:</string> <string>goForward:</string> + <string>goHome:</string> <string>navigate:</string> <string>reloadPage:</string> <string>stopLoading:</string> @@ -1921,6 +1771,7 @@ <string>id</string> <string>id</string> <string>id</string> + <string>id</string> </object> </object> <object class="NSMutableDictionary" key="actionInfosByName"> @@ -1930,6 +1781,7 @@ <string>backForwardSelected:</string> <string>goBack:</string> <string>goForward:</string> + <string>goHome:</string> <string>navigate:</string> <string>reloadPage:</string> <string>stopLoading:</string> @@ -1952,6 +1804,10 @@ <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> @@ -2116,6 +1972,7 @@ <bool key="EncodedWithXMLCoder">YES</bool> <string>searchBackward:</string> <string>searchForward:</string> + <string>showGlobalHistory:</string> <string>showPreferences:</string> <string>showSearchWindow:</string> </object> @@ -2125,6 +1982,7 @@ <string>id</string> <string>id</string> <string>id</string> + <string>id</string> </object> </object> <object class="NSMutableDictionary" key="actionInfosByName"> @@ -2133,6 +1991,7 @@ <bool key="EncodedWithXMLCoder">YES</bool> <string>searchBackward:</string> <string>searchForward:</string> + <string>showGlobalHistory:</string> <string>showPreferences:</string> <string>showSearchWindow:</string> </object> @@ -2147,6 +2006,10 @@ <string key="candidateClassName">id</string> </object> <object class="IBActionInfo"> + <string key="name">showGlobalHistory:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> <string key="name">showPreferences:</string> <string key="candidateClassName">id</string> </object> @@ -2156,17 +2019,6 @@ </object> </object> </object> - <object class="NSMutableDictionary" key="outlets"> - <string key="NS.key.0">historyWindow</string> - <string key="NS.object.0">NSWindow</string> - </object> - <object class="NSMutableDictionary" key="toOneOutletInfosByName"> - <string key="NS.key.0">historyWindow</string> - <object class="IBToOneOutletInfo" key="NS.object.0"> - <string key="name">historyWindow</string> - <string key="candidateClassName">NSWindow</string> - </object> - </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> <string key="minorKey">NetSurfAppDelegate.h</string> @@ -2294,14 +2146,6 @@ </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 class="IBPartialClassDescription"> <string key="className">URLFieldCell</string> <string key="superclassName">NSTextFieldCell</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> |