From 66b9d5476ed7c47fd31b4e175d2752165894226a Mon Sep 17 00:00:00 2001 From: Sven Weidauer Date: Mon, 31 Jan 2011 15:13:38 +0000 Subject: Implemented search window. svn path=/trunk/netsurf/; revision=11563 --- cocoa/BrowserWindow.h | 26 ++ cocoa/BrowserWindow.m | 29 ++ cocoa/BrowserWindowController.m | 9 + cocoa/Makefile.target | 7 +- cocoa/NetSurf.xcodeproj/project.pbxproj | 10 + cocoa/NetSurfAppDelegate.h | 7 + cocoa/NetSurfAppDelegate.m | 34 +- cocoa/NetsurfApp.h | 5 +- cocoa/NetsurfApp.m | 2 + cocoa/SearchWindowController.h | 52 +++ cocoa/SearchWindowController.m | 124 ++++++ cocoa/res/BrowserWindow.xib | 73 ++-- cocoa/res/MainMenu.xib | 197 ++++++---- cocoa/res/SearchWindow.xib | 646 ++++++++++++++++++++++++++++++++ 14 files changed, 1108 insertions(+), 113 deletions(-) create mode 100644 cocoa/BrowserWindow.h create mode 100644 cocoa/BrowserWindow.m create mode 100644 cocoa/SearchWindowController.h create mode 100644 cocoa/SearchWindowController.m create mode 100644 cocoa/res/SearchWindow.xib (limited to 'cocoa') diff --git a/cocoa/BrowserWindow.h b/cocoa/BrowserWindow.h new file mode 100644 index 000000000..e0b83017f --- /dev/null +++ b/cocoa/BrowserWindow.h @@ -0,0 +1,26 @@ +/* + * Copyright 2011 Sven Weidauer + * + * 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 . + */ + +#import + + +@interface BrowserWindow : NSWindow { + +} + +@end diff --git a/cocoa/BrowserWindow.m b/cocoa/BrowserWindow.m new file mode 100644 index 000000000..ce31787f2 --- /dev/null +++ b/cocoa/BrowserWindow.m @@ -0,0 +1,29 @@ +/* + * Copyright 2011 Sven Weidauer + * + * 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 . + */ + +#import "cocoa/BrowserWindow.h" +#import "cocoa/BrowserWindowController.h" + +@implementation BrowserWindow + +- (void) performClose: (id) sender; +{ + [[self windowController] closeCurrentTab: sender]; +} + +@end diff --git a/cocoa/BrowserWindowController.m b/cocoa/BrowserWindowController.m index f30607a8e..bb91a67d0 100644 --- a/cocoa/BrowserWindowController.m +++ b/cocoa/BrowserWindowController.m @@ -23,6 +23,7 @@ #import "PSMRolloverButton.h" #import "URLFieldCell.h" #import "cocoa/gui.h" +#import "cocoa/NetsurfApp.h" #import "desktop/browser.h" #import "desktop/options.h" @@ -174,12 +175,20 @@ return [navigationControl isEnabledForSegment: 1]; } +- (void)windowDidBecomeMain: (NSNotification *)note; +{ + [(NetSurfApp *)NSApp setFrontTab: [[tabView selectedTabViewItem] identifier]]; +} + #pragma mark - #pragma mark Tab bar delegate - (void) tabView: (NSTabView *)tabView didSelectTabViewItem: (NSTabViewItem *)tabViewItem; { [self setActiveBrowser: [tabViewItem identifier]]; + if ([[self window] isMainWindow]) { + [(NetSurfApp *)NSApp setFrontTab: [tabViewItem identifier]]; + } } - (BOOL)tabView:(NSTabView*)aTabView shouldDragTabViewItem:(NSTabViewItem *)tabViewItem fromTabBar:(PSMTabBarControl *)tabBarControl diff --git a/cocoa/Makefile.target b/cocoa/Makefile.target index b8c323269..f98260510 100644 --- a/cocoa/Makefile.target +++ b/cocoa/Makefile.target @@ -67,10 +67,12 @@ S_COCOA := \ BrowserView.m \ BrowserViewController.m \ BrowserWindowController.m \ + BrowserWindow.m \ DownloadWindowController.m \ NetSurfAppDelegate.m \ NetsurfApp.m \ ScrollableView.m \ + SearchWindowController.m \ URLFieldCell.m \ TreeView.m \ HistoryView.m \ @@ -113,7 +115,7 @@ SOURCES := $(addprefix $(shell pwd)/,$(SOURCES)) EXETARGET := NetSurf -S_XIBS := MainMenu.xib Browser.xib BrowserWindow.xib DownloadWindow.xib +S_XIBS := MainMenu.xib Browser.xib BrowserWindow.xib DownloadWindow.xib SearchWindow.xib S_NIBS := $(S_XIBS:.xib=.nib) S_XIBS := $(addprefix cocoa/res/,$(S_XIBS)) @@ -162,6 +164,9 @@ $(OBJROOT)/BrowserWindow.nib: cocoa/res/BrowserWindow.xib $(OBJROOT)/created $(OBJROOT)/DownloadWindow.nib: cocoa/res/DownloadWindow.xib $(OBJROOT)/created ibtool $< --compile $@ +$(OBJROOT)/SearchWindow.nib: cocoa/res/SearchWindow.xib $(OBJROOT)/created + ibtool $< --compile $@ + NetSurf.app: NetSurf cocoa/Makefile.target $(R_RESOURCES) $(S_NIBS) NetSurf.app/Contents/Info.plist mkdir -p NetSurf.app/Contents/MacOS diff --git a/cocoa/NetSurf.xcodeproj/project.pbxproj b/cocoa/NetSurf.xcodeproj/project.pbxproj index 7ae15c4fa..24449e731 100644 --- a/cocoa/NetSurf.xcodeproj/project.pbxproj +++ b/cocoa/NetSurf.xcodeproj/project.pbxproj @@ -217,6 +217,11 @@ 265F320512D66C200048B600 /* utf8.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = utf8.m; sourceTree = ""; }; 265F321312D66CD90048B600 /* utils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = utils.m; sourceTree = ""; }; 265F321E12D66D510048B600 /* font.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = font.m; sourceTree = ""; }; + 2666DC5B12F6D1770045E8B6 /* SearchWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SearchWindow.xib; sourceTree = ""; }; + 2666DC5D12F6D2E70045E8B6 /* SearchWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SearchWindowController.h; sourceTree = ""; }; + 2666DC5E12F6D2E70045E8B6 /* SearchWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SearchWindowController.m; sourceTree = ""; }; + 2666DD5012F706BC0045E8B6 /* BrowserWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BrowserWindow.h; sourceTree = ""; }; + 2666DD5112F706BC0045E8B6 /* BrowserWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BrowserWindow.m; sourceTree = ""; }; 26ABD61C12F02EB900407161 /* overflowImage.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = overflowImage.png; sourceTree = ""; }; 26ABD61D12F02EB900407161 /* overflowImagePressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = overflowImagePressed.png; sourceTree = ""; }; 26ABD61E12F02EB900407161 /* pi.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = pi.png; sourceTree = ""; }; @@ -539,6 +544,7 @@ 26121EAB12D70E0A00E10F91 /* Browser.xib */, 26AFEAF012E042F9005AD082 /* DownloadWindow.xib */, 26CDCFF212E70AD1004FC66B /* BrowserWindow.xib */, + 2666DC5B12F6D1770045E8B6 /* SearchWindow.xib */, ); name = Resources; path = res; @@ -649,6 +655,10 @@ 26CDD00212E70F56004FC66B /* BrowserWindowController.m */, 26CDD0F412E726E0004FC66B /* BrowserViewController.h */, 26CDD0F512E726E0004FC66B /* BrowserViewController.m */, + 2666DC5D12F6D2E70045E8B6 /* SearchWindowController.h */, + 2666DC5E12F6D2E70045E8B6 /* SearchWindowController.m */, + 2666DD5012F706BC0045E8B6 /* BrowserWindow.h */, + 2666DD5112F706BC0045E8B6 /* BrowserWindow.m */, ); name = Browser; sourceTree = ""; diff --git a/cocoa/NetSurfAppDelegate.h b/cocoa/NetSurfAppDelegate.h index e070b3fa9..4852f6fd5 100644 --- a/cocoa/NetSurfAppDelegate.h +++ b/cocoa/NetSurfAppDelegate.h @@ -18,11 +18,18 @@ #import +@class SearchWindowController; @interface NetSurfAppDelegate : NSObject { NSWindow *historyWindow; + SearchWindowController *search; } @property (readwrite, retain, nonatomic) IBOutlet NSWindow *historyWindow; +@property (readwrite, retain, nonatomic) SearchWindowController *search; + +- (IBAction) showSearchWindow: (id) sender; +- (IBAction) searchForward: (id) sender; +- (IBAction) searchBackward: (id) sender; @end diff --git a/cocoa/NetSurfAppDelegate.m b/cocoa/NetSurfAppDelegate.m index 1d9df1ff2..f6ddc2146 100644 --- a/cocoa/NetSurfAppDelegate.m +++ b/cocoa/NetSurfAppDelegate.m @@ -17,6 +17,7 @@ */ #import "NetSurfAppDelegate.h" +#import "cocoa/SearchWindowController.h" #import "desktop/browser.h" #import "desktop/options.h" @@ -30,8 +31,8 @@ @implementation NetSurfAppDelegate - @synthesize historyWindow; +@synthesize search; - (void) newDocument: (id) sender; { @@ -60,6 +61,37 @@ [historyWindow setExcludedFromWindowsMenu: YES]; } +- (IBAction) showSearchWindow: (id) sender; +{ + if (search == nil) { + [self setSearch: [[[SearchWindowController alloc] init] autorelease]]; + } + [[search window] makeKeyAndOrderFront: self]; +} + +- (IBAction) searchForward: (id) sender; +{ + [search search: SearchForward]; +} + +- (IBAction) searchBackward: (id) sender; +{ + [search search: SearchBackward]; +} + +- (BOOL) validateMenuItem: (id) item; +{ + SEL action = [item action]; + + if (action == @selector( searchForward: )) { + return [search canGoForward]; + } else if (action == @selector( searchBackward: )) { + return [search canGoBack]; + } + + return YES; +} + // Application delegate methods - (BOOL) applicationOpenUntitledFile: (NSApplication *)sender; diff --git a/cocoa/NetsurfApp.h b/cocoa/NetsurfApp.h index cca9c419b..a5f8fff3d 100644 --- a/cocoa/NetsurfApp.h +++ b/cocoa/NetsurfApp.h @@ -18,9 +18,12 @@ #import +@class BrowserViewController; @interface NetSurfApp : NSApplication { - + BrowserViewController *frontTab; } +@property (readwrite, assign, nonatomic) BrowserViewController *frontTab; + @end diff --git a/cocoa/NetsurfApp.m b/cocoa/NetsurfApp.m index dad37a046..609e6beed 100644 --- a/cocoa/NetsurfApp.m +++ b/cocoa/NetsurfApp.m @@ -49,6 +49,8 @@ static NSString *cocoa_get_user_path( NSString *fileName ) ; @implementation NetSurfApp +@synthesize frontTab; + - (void) loadOptions; { NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; diff --git a/cocoa/SearchWindowController.h b/cocoa/SearchWindowController.h new file mode 100644 index 000000000..a1aac2e3f --- /dev/null +++ b/cocoa/SearchWindowController.h @@ -0,0 +1,52 @@ +/* + * Copyright 2011 Sven Weidauer + * + * 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 . + */ + + +#import + +@class BrowserViewController; + +typedef enum { + SearchBackward, + SearchForward +} SearchDirection; + +@interface SearchWindowController : NSWindowController { + BOOL caseSensitive; + BOOL selectAll; + BOOL canGoBack; + BOOL canGoForward; + NSString *searchString; + BrowserViewController *browser; +} + +@property (readwrite, assign, nonatomic) BOOL caseSensitive; +@property (readwrite, assign, nonatomic) BOOL selectAll; +@property (readwrite, assign, nonatomic) BOOL canGoBack; +@property (readwrite, assign, nonatomic) BOOL canGoForward; +@property (readwrite, copy, nonatomic) NSString *searchString; +@property (readwrite, assign, nonatomic) BrowserViewController *browser; + +- (IBAction) searchNext: (id) sender; +- (IBAction) searchPrevious: (id) sender; + +- (IBAction) searchStringDidChange: (id) sender; + +- (void) search: (SearchDirection)direction; + +@end diff --git a/cocoa/SearchWindowController.m b/cocoa/SearchWindowController.m new file mode 100644 index 000000000..2557dedc8 --- /dev/null +++ b/cocoa/SearchWindowController.m @@ -0,0 +1,124 @@ +/* + * Copyright 2011 Sven Weidauer + * + * 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 . + */ + + +#import "cocoa/SearchWindowController.h" +#import "cocoa/BrowserViewController.h" + +#import "desktop/browser.h" +#import "desktop/search.h" + +static void cocoa_search_set_back( bool active, void *p ); +static void cocoa_search_set_forward( bool active, void *p ); + +static struct search_callbacks cocoa_search_callbacks = { + .forward_state = cocoa_search_set_forward, + .back_state = cocoa_search_set_back, + .status = NULL, + .hourglass = NULL, + .add_recent = NULL +}; + +@implementation SearchWindowController + +@synthesize caseSensitive; +@synthesize selectAll; +@synthesize canGoBack; +@synthesize canGoForward; +@synthesize searchString; +@synthesize browser; + +- init; +{ + if ((self = [super initWithWindowNibName: @"SearchWindow"]) == nil) return nil; + + [self bind: @"browser" toObject: NSApp withKeyPath: @"frontTab" options: nil]; + canGoBack = canGoForward = YES; + + return self; +} + +- (void) dealloc; +{ + [self unbind: @"browser"]; + [super dealloc]; +} + +- (IBAction) searchNext: (id) sender; +{ + [self search: SearchForward]; +} + +- (IBAction) searchPrevious: (id) sender; +{ + [self search: SearchBackward]; +} + +- (void) search: (SearchDirection)direction; +{ + search_flags_t flags = (direction == SearchForward) ? SEARCH_FLAG_FORWARDS : 0; + if (caseSensitive) flags |= SEARCH_FLAG_CASE_SENSITIVE; + if (selectAll) flags |= SEARCH_FLAG_SHOWALL; + + struct browser_window *bw = [browser browser]; + if (bw != NULL && search_verify_new( bw, &cocoa_search_callbacks, self )) { + search_step( bw->search_context, flags, [searchString UTF8String] ); + } +} + +- (IBAction) searchStringDidChange: (id) sender; +{ + struct browser_window *bw = [browser browser]; + if (bw != NULL && bw->search_context != NULL) { + search_destroy_context( bw->search_context ); + bw->search_context = NULL; + } + + [self setCanGoBack: YES]; + [self setCanGoForward: YES]; +} + +- (void) setCaseSensitive: (BOOL) newValue; +{ + if (caseSensitive != newValue) { + caseSensitive = newValue; + [self setCanGoBack: YES]; + [self setCanGoForward: YES]; + } +} + +- (void) setSelectAll: (BOOL) newValue; +{ + if (selectAll != newValue) { + selectAll = newValue; + [self setCanGoBack: YES]; + [self setCanGoForward: YES]; + } +} + +static void cocoa_search_set_back( bool active, void *p ) +{ + [(SearchWindowController *)p setCanGoBack: active]; +} + +static void cocoa_search_set_forward( bool active, void *p ) +{ + [(SearchWindowController *)p setCanGoForward: active]; +} + +@end diff --git a/cocoa/res/BrowserWindow.xib b/cocoa/res/BrowserWindow.xib index 4ccce303a..41fad0c80 100644 --- a/cocoa/res/BrowserWindow.xib +++ b/cocoa/res/BrowserWindow.xib @@ -43,7 +43,7 @@ {{139, 364}, {774, 554}} 1618477056 NetSurf - NSWindow + BrowserWindow 8335B5EA-A088-4DE8-BF4F-777E98920BB3 @@ -77,11 +77,9 @@ History - + 268 {{8, 14}, {30, 25}} - - YES 67239424 @@ -124,11 +122,9 @@ Back/Forward - + 268 {{5, 14}, {71, 25}} - - YES 67239424 @@ -187,11 +183,9 @@ URL - + 268 {{0, 14}, {96, 22}} - - YES -1804468671 @@ -364,7 +358,7 @@ {1.79769e+308, 1.79769e+308} {273, 43} - + 256 YES @@ -373,7 +367,6 @@ 266 {{0, 532}, {774, 22}} - PSMTabBarControl @@ -381,7 +374,6 @@ 290 {{25, 3}, {732, 14}} - YES 68288064 @@ -416,7 +408,6 @@ {{4, 2}, {16, 16}} - 28938 100 @@ -425,7 +416,6 @@ 18 {{0, 20}, {774, 512}} - YES @@ -436,8 +426,6 @@ {774, 554} - - {{0, 0}, {1680, 1028}} {273, 97} @@ -1062,18 +1050,47 @@ BrowserViewController.h + + BrowserWindow + NSWindow + + IBProjectSource + BrowserWindow.h + + BrowserWindowController NSWindowController - newTab: - id + YES + + YES + closeCurrentTab: + newTab: + + + YES + id + id + - newTab: - - newTab: - id + YES + + YES + closeCurrentTab: + newTab: + + + YES + + closeCurrentTab: + id + + + newTab: + id + @@ -1238,16 +1255,6 @@ - - YES - - NSObject - - IBFrameworkSource - Print.framework/Headers/PDEPluginInterface.h - - - 0 IBCocoaFramework diff --git a/cocoa/res/MainMenu.xib b/cocoa/res/MainMenu.xib index 6a02ce968..a87221761 100644 --- a/cocoa/res/MainMenu.xib +++ b/cocoa/res/MainMenu.xib @@ -12,7 +12,7 @@ YES - + YES @@ -412,15 +412,6 @@ 7 - - - Jump to Selection - j - 1048576 - 2147483647 - - - @@ -924,46 +915,6 @@ 759 - - - performFindPanelAction: - - - - 771 - - - - performFindPanelAction: - - - - 772 - - - - performFindPanelAction: - - - - 773 - - - - centerSelectionInVisibleArea: - - - - 774 - - - - performFindPanelAction: - - - - 775 - makeKeyAndOrderFront: @@ -1054,11 +1005,35 @@ - closeCurrentTab: + showSearchWindow: + + + + 841 + + + + searchNext: + + + + 842 + + + + searchPrevious: + + + + 843 + + + + performClose: - 840 + 844 @@ -1484,7 +1459,6 @@ - @@ -1508,11 +1482,6 @@ - - 739 - - - 811 @@ -1710,7 +1679,6 @@ 736.IBPluginDependency 737.IBPluginDependency 738.IBPluginDependency - 739.IBPluginDependency 74.IBPluginDependency 74.ImportedFromIB2 77.IBPluginDependency @@ -1797,7 +1765,7 @@ com.apple.InterfaceBuilder.CocoaPlugin {{525, 802}, {197, 73}} - {{653, 628}, {352, 20}} + {{656, 815}, {352, 20}} com.apple.InterfaceBuilder.CocoaPlugin {74, 862} @@ -1812,14 +1780,14 @@ com.apple.InterfaceBuilder.CocoaPlugin - {{254, 473}, {186, 183}} + {{668, 632}, {186, 183}} com.apple.InterfaceBuilder.CocoaPlugin {{23, 794}, {245, 183}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{716, 594}, {151, 203}} + {{782, 612}, {151, 203}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -1832,7 +1800,7 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{867, 574}, {150, 43}} + {{933, 592}, {150, 43}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -1840,8 +1808,7 @@ com.apple.InterfaceBuilder.CocoaPlugin - {{867, 534}, {238, 103}} - com.apple.InterfaceBuilder.CocoaPlugin + {{933, 572}, {238, 83}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -1857,7 +1824,7 @@ com.apple.InterfaceBuilder.CocoaPlugin - {{737, 465}, {179, 163}} + {{740, 652}, {179, 163}} com.apple.InterfaceBuilder.CocoaPlugin {{323, 672}, {199, 203}} @@ -1905,7 +1872,7 @@ - 840 + 844 @@ -2135,6 +2102,45 @@ NetSurfAppDelegate NSObject + + YES + + YES + searchBackward: + searchForward: + showSearchWindow: + + + YES + id + id + id + + + + YES + + YES + searchBackward: + searchForward: + showSearchWindow: + + + YES + + searchBackward: + id + + + searchForward: + id + + + showSearchWindow: + id + + + historyWindow NSWindow @@ -2225,6 +2231,53 @@ ScrollableView.h + + SearchWindowController + NSWindowController + + YES + + YES + searchNext: + searchPrevious: + searchStringDidChange: + + + YES + id + id + id + + + + YES + + YES + searchNext: + searchPrevious: + searchStringDidChange: + + + YES + + searchNext: + id + + + searchPrevious: + id + + + searchStringDidChange: + id + + + + + IBProjectSource + SearchWindowController.h + + TreeView ScrollableView @@ -2242,16 +2295,6 @@ - - YES - - NSObject - - IBFrameworkSource - Print.framework/Headers/PDEPluginInterface.h - - - 0 IBCocoaFramework diff --git a/cocoa/res/SearchWindow.xib b/cocoa/res/SearchWindow.xib new file mode 100644 index 000000000..c093635de --- /dev/null +++ b/cocoa/res/SearchWindow.xib @@ -0,0 +1,646 @@ + + + + 1060 + 10J567 + 804 + 1038.35 + 462.00 + + com.apple.InterfaceBuilder.CocoaPlugin + 804 + + + YES + + + + YES + com.apple.InterfaceBuilder.CocoaPlugin + + + YES + + YES + + + YES + + + + YES + + SearchWindowController + + + FirstResponder + + + NSApplication + + + 7 + 2 + {{196, 376}, {480, 134}} + 1618477056 + Search + NSWindow + + {1.79769e+308, 1.79769e+308} + + + 256 + + YES + + + 268 + {{53, 92}, {407, 22}} + + YES + + -1803944383 + 272630784 + + + LucidaGrande + 13 + 1044 + + + YES + + 6 + System + textBackgroundColor + + 3 + MQA + + + + 6 + System + textColor + + 3 + MAA + + + + + + + 268 + {{17, 94}, {31, 14}} + + YES + + 68288064 + 272761856 + Find: + + LucidaGrande + 11 + 3100 + + + + 6 + System + controlColor + + 3 + MC42NjY2NjY2NjY3AA + + + + 6 + System + controlTextColor + + + + + + + 268 + {{370, 12}, {96, 32}} + + YES + + 67239424 + 134217728 + Next + + + -2038284033 + 129 + + DQ + 200 + 25 + + + + + 268 + {{274, 12}, {96, 32}} + + YES + + -2080244224 + 134217728 + Previous + + + -2038284033 + 129 + + + 200 + 25 + + + + + 268 + {{139, 68}, {111, 18}} + + YES + + -2080244224 + 0 + Case sensitive + + + 1211912703 + 2 + + NSImage + NSSwitch + + + NSSwitch + + + + 200 + 25 + + + + + 268 + {{295, 68}, {78, 18}} + + YES + + -2080244224 + 0 + Select all + + + 1211912703 + 2 + + + + + 200 + 25 + + + + {480, 134} + + + {{0, 0}, {1680, 1028}} + {1.79769e+308, 1.79769e+308} + + + + + YES + + + searchNext: + + + + 15 + + + + searchPrevious: + + + + 16 + + + + enabled: canGoForward + + + + + + enabled: canGoForward + enabled + canGoForward + 2 + + + 17 + + + + enabled: canGoBack + + + + + + enabled: canGoBack + enabled + canGoBack + 2 + + + 18 + + + + searchStringDidChange: + + + + 22 + + + + window + + + + 23 + + + + value: searchString + + + + + + value: searchString + value + searchString + 2 + + + 24 + + + + value: caseSensitive + + + + + + value: caseSensitive + value + caseSensitive + 2 + + + 25 + + + + value: selectAll + + + + + + value: selectAll + value + selectAll + 2 + + + 27 + + + + + YES + + 0 + + + + + + -2 + + + File's Owner + + + -1 + + + First Responder + + + -3 + + + Application + + + 1 + + + YES + + + + + + 2 + + + YES + + + + + + + + + + + 3 + + + YES + + + + + + 4 + + + + + 5 + + + YES + + + + + + 6 + + + + + 7 + + + YES + + + + + + 8 + + + + + 9 + + + YES + + + + + + 10 + + + + + 11 + + + YES + + + + + + 12 + + + + + 13 + + + YES + + + + + + 14 + + + + + + + YES + + YES + 1.IBEditorWindowLastContentRect + 1.IBPluginDependency + 1.IBWindowTemplateEditedContentRect + 1.NSWindowTemplate.visibleAtLaunch + 1.WindowOrigin + 1.editorWindowContentRectSynchronizationRect + 10.IBPluginDependency + 11.IBPluginDependency + 11.IBViewBoundsToFrameTransform + 12.IBPluginDependency + 13.IBPluginDependency + 13.IBViewBoundsToFrameTransform + 14.IBPluginDependency + 2.IBPluginDependency + 3.IBPluginDependency + 4.IBPluginDependency + 5.IBPluginDependency + 5.IBViewBoundsToFrameTransform + 6.IBPluginDependency + 7.IBPluginDependency + 7.IBViewBoundsToFrameTransform + 8.IBPluginDependency + 9.IBPluginDependency + 9.IBViewBoundsToFrameTransform + + + YES + {{185, 245}, {480, 134}} + com.apple.InterfaceBuilder.CocoaPlugin + {{185, 245}, {480, 134}} + + {196, 240} + {{202, 428}, {480, 270}} + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABDCwAAwpQAAA + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABDk4AAwpQAAA + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABBiAAAw3IAAA + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABDuQAAwigAAA + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABDiQAAwigAAA + + + + + YES + + + YES + + + + + YES + + + YES + + + + 27 + + + + YES + + NSApplication + + IBProjectSource + PSMTabBarControl/PSMTabDragAssistant.h + + + + NSObject + + IBProjectSource + PSMTabBarControl/PSMTabBarCell.h + + + + NSObject + + IBProjectSource + PSMTabBarControl/PSMTabBarControl.h + + + + SearchWindowController + NSWindowController + + YES + + YES + searchNext: + searchPrevious: + searchStringDidChange: + + + YES + id + id + id + + + + YES + + YES + searchNext: + searchPrevious: + searchStringDidChange: + + + YES + + searchNext: + id + + + searchPrevious: + id + + + searchStringDidChange: + id + + + + + IBProjectSource + SearchWindowController.h + + + + + 0 + IBCocoaFramework + + com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 + + + YES + ../NetSurf.xcodeproj + 3 + + NSSwitch + {15, 15} + + + -- cgit v1.2.3