diff options
Diffstat (limited to 'frontends/cocoa/BookmarksController.m')
| -rw-r--r-- | frontends/cocoa/BookmarksController.m | 178 |
1 files changed, 88 insertions, 90 deletions
diff --git a/frontends/cocoa/BookmarksController.m b/frontends/cocoa/BookmarksController.m index c8a23cb8d..f2358cd53 100644 --- a/frontends/cocoa/BookmarksController.m +++ b/frontends/cocoa/BookmarksController.m @@ -33,10 +33,9 @@ #import "cocoa/BrowserViewController.h" #import "cocoa/gui.h" - @interface BookmarksController () -- (void) noteAppWillTerminate: (NSNotification *) note; -- (void) save; +- (void)noteAppWillTerminate:(NSNotification *)note; +- (void)save; @end @implementation BookmarksController @@ -44,52 +43,52 @@ @synthesize defaultMenu; @synthesize view; -static const char *cocoa_hotlist_path( void ) +static const char *cocoa_hotlist_path(void) { - NSString *path = [[NSUserDefaults standardUserDefaults] - stringForKey: kHotlistFileOption]; - return [path UTF8String]; + NSString *path = [[NSUserDefaults standardUserDefaults] + stringForKey:kHotlistFileOption]; + return [path UTF8String]; } - (id)init { - if ((self = [super initWithWindowNibName: @"BookmarksWindow"]) == nil) { - return nil; - } - tree_hotlist_path = cocoa_hotlist_path(); - tree = [[Tree alloc] initWithFlags: TREE_HOTLIST]; - nodeForMenu = NSCreateMapTable(NSNonOwnedPointerMapKeyCallBacks, - NSNonOwnedPointerMapValueCallBacks, - 0); - - [[NSNotificationCenter defaultCenter] - addObserver:self - selector:@selector(noteAppWillTerminate:) - name:NSApplicationWillTerminateNotification - object:NSApp]; - - return self; + if ((self = [super initWithWindowNibName:@"BookmarksWindow"]) == nil) { + return nil; + } + tree_hotlist_path = cocoa_hotlist_path(); + tree = [[Tree alloc] initWithFlags:TREE_HOTLIST]; + nodeForMenu = NSCreateMapTable(NSNonOwnedPointerMapKeyCallBacks, + NSNonOwnedPointerMapValueCallBacks, + 0); + + [[NSNotificationCenter defaultCenter] + addObserver:self + selector:@selector(noteAppWillTerminate:) + name:NSApplicationWillTerminateNotification + object:NSApp]; + + return self; } -- (void) noteAppWillTerminate: (NSNotification *)note +- (void)noteAppWillTerminate:(NSNotification *)note { - [self save]; + [self save]; } -- (void) save +- (void)save { - hotlist_export( cocoa_hotlist_path(), NULL ); + hotlist_export(cocoa_hotlist_path(), NULL); } -- (void) dealloc +- (void)dealloc { - [self setView: nil]; - NSFreeMapTable( nodeForMenu ); + [self setView:nil]; + NSFreeMapTable(nodeForMenu); - [[NSNotificationCenter defaultCenter] removeObserver: self]; + [[NSNotificationCenter defaultCenter] removeObserver:self]; } -- (void) menuNeedsUpdate: (NSMenu *)menu +- (void)menuNeedsUpdate:(NSMenu *)menu { #if 0 for (NSMenuItem *item in [menu itemArray]) { @@ -134,90 +133,89 @@ static const char *cocoa_hotlist_path( void ) #endif } -- (IBAction) openBookmarkURL: (id)sender +- (IBAction)openBookmarkURL:(id)sender { - const char *urltxt = [[sender representedObject] UTF8String]; - NSParameterAssert( urltxt != NULL ); - - nsurl *url; - nserror error; - - error = nsurl_create(urltxt, &url); - if (error == NSERROR_OK) { - BrowserViewController *tab = [(NetSurfApp *)NSApp frontTab]; - if (tab != nil) { - error = browser_window_navigate([tab browser], - url, - NULL, - BW_NAVIGATE_HISTORY, - NULL, - NULL, - NULL); - } else { - error = browser_window_create(BW_CREATE_HISTORY, - url, - NULL, - NULL, - NULL); - } - nsurl_unref(url); - } - if (error != NSERROR_OK) { - cocoa_warning(messages_get_errorcode(error), 0); + const char *urltxt = [[sender representedObject] UTF8String]; + NSParameterAssert(urltxt != NULL); + + nsurl *url; + nserror error; + + error = nsurl_create(urltxt, &url); + if (error == NSERROR_OK) { + BrowserViewController *tab = [(NetSurfApp *)NSApp frontTab]; + if (tab != nil) { + error = browser_window_navigate([tab browser], + url, + NULL, + BW_NAVIGATE_HISTORY, + NULL, + NULL, + NULL); + } else { + error = browser_window_create(BW_CREATE_HISTORY, + url, + NULL, + NULL, + NULL); } + nsurl_unref(url); + } + if (error != NSERROR_OK) { + cocoa_warning(messages_get_errorcode(error), 0); + } } -- (IBAction) addBookmark: (id)sender +- (IBAction)addBookmark:(id)sender { - struct browser_window *bw = [[(NetSurfApp *)NSApp frontTab] browser]; - if (bw != NULL) { - hotlist_add_url(browser_window_get_url(bw)); - } + struct browser_window *bw = [[(NetSurfApp *)NSApp frontTab] browser]; + if (bw != NULL) { + hotlist_add_url(browser_window_get_url(bw)); + } } -- (BOOL) validateUserInterfaceItem: (id)item +- (BOOL)validateUserInterfaceItem:(id)item { - SEL action = [item action]; + SEL action = [item action]; - if (action == @selector( addBookmark: )) { - return [(NetSurfApp *)NSApp frontTab] != nil; - } + if (action == @selector(addBookmark:)) { + return [(NetSurfApp *)NSApp frontTab] != nil; + } - return YES; + return YES; } -- (void) windowDidLoad +- (void)windowDidLoad { - hotlist_expand(false); - hotlist_contract(true); + hotlist_expand(false); + hotlist_contract(true); - [view setTree: tree]; + [view setTree:tree]; } - -+ (void) initialize ++ (void)initialize { - [[NSUserDefaults standardUserDefaults] - registerDefaults: - [NSDictionary - dictionaryWithObjectsAndKeys:cocoa_get_user_path( @"Bookmarks.html" ), - kHotlistFileOption, - nil]]; + [[NSUserDefaults standardUserDefaults] + registerDefaults: + [NSDictionary + dictionaryWithObjectsAndKeys:cocoa_get_user_path(@"Bookmarks.html"), + kHotlistFileOption, + nil]]; } -- (IBAction) editSelected: (id)sender +- (IBAction)editSelected:(id)sender { - hotlist_edit_selection(); + hotlist_edit_selection(); } -- (IBAction) deleteSelected: (id)sender +- (IBAction)deleteSelected:(id)sender { - hotlist_keypress(NS_KEY_DELETE_LEFT); + hotlist_keypress(NS_KEY_DELETE_LEFT); } -- (IBAction) addFolder: (id)sender +- (IBAction)addFolder:(id)sender { - hotlist_add_folder(NULL, false, 0); + hotlist_add_folder(NULL, false, 0); } @end |