summaryrefslogtreecommitdiff
path: root/cocoa/NetSurfAppDelegate.m
diff options
context:
space:
mode:
authorSven Weidauer <sven.weidauer@gmail.com>2011-02-01 08:39:35 +0000
committerSven Weidauer <sven.weidauer@gmail.com>2011-02-01 08:39:35 +0000
commit84b4a01f4f2032a17e5dc93e4b4f1f37a71ab04c (patch)
treeaf84f414442ae613d1a95325ef3490bff4c078be /cocoa/NetSurfAppDelegate.m
parent28ff0cfb0af7d58244dfd06546b2c8ec37f01c75 (diff)
downloadnetsurf-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/NetSurfAppDelegate.m')
-rw-r--r--cocoa/NetSurfAppDelegate.m16
1 files changed, 10 insertions, 6 deletions
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;