diff options
-rw-r--r-- | cocoa/BrowserView.m | 15 | ||||
-rw-r--r-- | cocoa/NetSurf.xcodeproj/project.pbxproj | 6 | ||||
-rw-r--r-- | cocoa/NetSurfAppDelegate.h | 28 | ||||
-rw-r--r-- | cocoa/NetSurfAppDelegate.m | 78 | ||||
-rw-r--r-- | cocoa/NetsurfApp.m | 1 | ||||
-rw-r--r-- | cocoa/gui.m | 2 | ||||
-rw-r--r-- | cocoa/res/MainMenu.xib | 238 | ||||
-rw-r--r-- | cocoa/res/NetSurf-Info.plist | 12 |
8 files changed, 312 insertions, 68 deletions
diff --git a/cocoa/BrowserView.m b/cocoa/BrowserView.m index 0aed72142..d26fc8bdd 100644 --- a/cocoa/BrowserView.m +++ b/cocoa/BrowserView.m @@ -22,6 +22,7 @@ #import "desktop/history_core.h" #import "desktop/plotters.h" #import "desktop/textinput.h" +#import "desktop/options.h" @implementation BrowserView @@ -244,6 +245,20 @@ static inline NSRect cocoa_get_caret_rect( BrowserView *view ) browser_window_reformat( browser, [self bounds].size.width, [self bounds].size.height ); } +- (void) zoomIn: (id) sender; +{ + browser_window_set_scale( browser, browser->scale * 1.1, true ); +} + +- (void) zoomOut: (id) sender; +{ + browser_window_set_scale( browser, browser->scale * 0.9, true ); +} + +- (void) zoomImageToActualSize: (id) sender; +{ + browser_window_set_scale( browser, (float)option_scale / 100.0, true ); +} - (IBAction) goBack: (id) sender; { diff --git a/cocoa/NetSurf.xcodeproj/project.pbxproj b/cocoa/NetSurf.xcodeproj/project.pbxproj index af16babf1..97ca2d496 100644 --- a/cocoa/NetSurf.xcodeproj/project.pbxproj +++ b/cocoa/NetSurf.xcodeproj/project.pbxproj @@ -112,6 +112,7 @@ 265F321F12D66D510048B600 /* font.m in Sources */ = {isa = PBXBuildFile; fileRef = 265F321E12D66D510048B600 /* font.m */; }; 26AFE63F12DDEB0A005AD082 /* NetSurf.icns in Resources */ = {isa = PBXBuildFile; fileRef = 26AFE63E12DDEB0A005AD082 /* NetSurf.icns */; }; 26AFE8E412DF4200005AD082 /* ScrollableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 26AFE8E312DF4200005AD082 /* ScrollableView.m */; }; + 26AFE97C12DF514C005AD082 /* NetSurfAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 26AFE97B12DF514C005AD082 /* NetSurfAppDelegate.m */; }; 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; /* End PBXBuildFile section */ @@ -328,6 +329,8 @@ 26AFE63E12DDEB0A005AD082 /* NetSurf.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = NetSurf.icns; sourceTree = "<group>"; }; 26AFE8E212DF4200005AD082 /* ScrollableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScrollableView.h; sourceTree = "<group>"; }; 26AFE8E312DF4200005AD082 /* ScrollableView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ScrollableView.m; sourceTree = "<group>"; }; + 26AFE97A12DF514C005AD082 /* NetSurfAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetSurfAppDelegate.h; sourceTree = "<group>"; }; + 26AFE97B12DF514C005AD082 /* NetSurfAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NetSurfAppDelegate.m; sourceTree = "<group>"; }; 8D1107320486CEB800E47090 /* NetSurf.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = NetSurf.app; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ @@ -605,6 +608,8 @@ 2622F1D612DCD84600CD5A62 /* TreeView.m */, 26AFE8E212DF4200005AD082 /* ScrollableView.h */, 26AFE8E312DF4200005AD082 /* ScrollableView.m */, + 26AFE97A12DF514C005AD082 /* NetSurfAppDelegate.h */, + 26AFE97B12DF514C005AD082 /* NetSurfAppDelegate.m */, ); name = cocoa; sourceTree = "<group>"; @@ -851,6 +856,7 @@ 26121EFD12D7132100E10F91 /* BrowserView.m in Sources */, 2622F1D712DCD84600CD5A62 /* TreeView.m in Sources */, 26AFE8E412DF4200005AD082 /* ScrollableView.m in Sources */, + 26AFE97C12DF514C005AD082 /* NetSurfAppDelegate.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/cocoa/NetSurfAppDelegate.h b/cocoa/NetSurfAppDelegate.h new file mode 100644 index 000000000..e070b3fa9 --- /dev/null +++ b/cocoa/NetSurfAppDelegate.h @@ -0,0 +1,28 @@ +/* + * 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> + + +@interface NetSurfAppDelegate : NSObject { + NSWindow *historyWindow; +} + +@property (readwrite, retain, nonatomic) IBOutlet NSWindow *historyWindow; + +@end diff --git a/cocoa/NetSurfAppDelegate.m b/cocoa/NetSurfAppDelegate.m new file mode 100644 index 000000000..8bac3f2ab --- /dev/null +++ b/cocoa/NetSurfAppDelegate.m @@ -0,0 +1,78 @@ +/* + * 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 "NetSurfAppDelegate.h" + +#import "desktop/browser.h" + +@interface NetSurfAppDelegate () + +- (void)handleGetURLEvent:(NSAppleEventDescriptor *)event withReplyEvent:(NSAppleEventDescriptor *)replyEvent; + +@end + + +@implementation NetSurfAppDelegate + +@synthesize historyWindow; + +- (void) newDocument: (id) sender; +{ + browser_window_create( "http://netsurf-browser.org/", NULL, NULL, true, false ); +} + +- (void) openDocument: (id) sender; +{ + NSOpenPanel *openPanel = [NSOpenPanel openPanel]; + [openPanel setAllowsMultipleSelection: YES]; + if ([openPanel runModalForTypes: nil] == NSOKButton) { + for (NSURL *url in [openPanel URLs]) { + browser_window_create( [[url absoluteString] UTF8String], NULL, NULL, true, false ); + } + } +} + +- (void)handleGetURLEvent:(NSAppleEventDescriptor *)event withReplyEvent:(NSAppleEventDescriptor *)replyEvent +{ + NSString *urlAsString = [[event paramDescriptorForKeyword:keyDirectObject] stringValue]; + browser_window_create( [urlAsString UTF8String], NULL, NULL, true, false ); +} + +- (void) awakeFromNib; +{ + [historyWindow setExcludedFromWindowsMenu: YES]; +} + +// Application delegate methods + +- (BOOL) applicationOpenUntitledFile: (NSApplication *)sender; +{ + [self newDocument: self]; + return YES; +} + +-(void)applicationWillFinishLaunching:(NSNotification *)aNotification +{ + NSAppleEventManager *appleEventManager = [NSAppleEventManager sharedAppleEventManager]; + [appleEventManager setEventHandler:self + andSelector:@selector(handleGetURLEvent:withReplyEvent:) + forEventClass:kInternetEventClass andEventID:kAEGetURL]; +} + + +@end diff --git a/cocoa/NetsurfApp.m b/cocoa/NetsurfApp.m index 3ca150e14..9e061a4c1 100644 --- a/cocoa/NetsurfApp.m +++ b/cocoa/NetsurfApp.m @@ -43,7 +43,6 @@ - (void) run; { [self finishLaunching]; - browser_window_create( "http://netsurf-browser.org/", NULL, NULL, true, false ); netsurf_main_loop(); } diff --git a/cocoa/gui.m b/cocoa/gui.m index 4864d8897..15b7ea46b 100644 --- a/cocoa/gui.m +++ b/cocoa/gui.m @@ -249,7 +249,7 @@ void gui_window_save_link(struct gui_window *g, const char *url, void gui_window_set_scale(struct gui_window *g, float scale) { - UNIMPL(); + gui_window_redraw_window( g ); } diff --git a/cocoa/res/MainMenu.xib b/cocoa/res/MainMenu.xib index fae4184cc..ff0082fff 100644 --- a/cocoa/res/MainMenu.xib +++ b/cocoa/res/MainMenu.xib @@ -12,8 +12,7 @@ </object> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="24"/> - <integer value="811"/> + <integer value="296"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -182,7 +181,7 @@ <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSMenuItem" id="705341025"> <reference key="NSMenu" ref="720053764"/> - <string key="NSTitle">New</string> + <string key="NSTitle">New Window</string> <string key="NSKeyEquiv">n</string> <int key="NSKeyEquivModMask">1048576</int> <int key="NSMnemonicLoc">2147483647</int> @@ -191,7 +190,7 @@ </object> <object class="NSMenuItem" id="722745758"> <reference key="NSMenu" ref="720053764"/> - <string key="NSTitle">Open…</string> + <string key="NSTitle">Open File…</string> <string key="NSKeyEquiv">o</string> <int key="NSKeyEquivModMask">1048576</int> <int key="NSMnemonicLoc">2147483647</int> @@ -217,28 +216,11 @@ <reference key="NSOnImage" ref="756751024"/> <reference key="NSMixedImage" ref="908425081"/> </object> - <object class="NSMenuItem" id="1023925487"> - <reference key="NSMenu" ref="720053764"/> - <string key="NSTitle">Save</string> - <string key="NSKeyEquiv">s</string> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="756751024"/> - <reference key="NSMixedImage" ref="908425081"/> - </object> <object class="NSMenuItem" id="117038363"> <reference key="NSMenu" ref="720053764"/> <string key="NSTitle">Save As…</string> - <string key="NSKeyEquiv">S</string> - <int key="NSKeyEquivModMask">1179648</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="756751024"/> - <reference key="NSMixedImage" ref="908425081"/> - </object> - <object class="NSMenuItem" id="579971712"> - <reference key="NSMenu" ref="720053764"/> - <string key="NSTitle">Revert to Saved</string> - <string key="NSKeyEquiv"/> + <string key="NSKeyEquiv">s</string> + <int key="NSKeyEquivModMask">1048576</int> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="756751024"/> <reference key="NSMixedImage" ref="908425081"/> @@ -496,6 +478,43 @@ <reference key="NSOnImage" ref="756751024"/> <reference key="NSMixedImage" ref="908425081"/> </object> + <object class="NSMenuItem" id="588542073"> + <reference key="NSMenu" ref="466310130"/> + <bool key="NSIsDisabled">YES</bool> + <bool key="NSIsSeparator">YES</bool> + <string key="NSTitle"/> + <string key="NSKeyEquiv"/> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="756751024"/> + <reference key="NSMixedImage" ref="908425081"/> + </object> + <object class="NSMenuItem" id="924072330"> + <reference key="NSMenu" ref="466310130"/> + <string key="NSTitle">Original Size</string> + <string key="NSKeyEquiv">0</string> + <int key="NSKeyEquivModMask">1048576</int> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="756751024"/> + <reference key="NSMixedImage" ref="908425081"/> + </object> + <object class="NSMenuItem" id="157577355"> + <reference key="NSMenu" ref="466310130"/> + <string key="NSTitle">Zoom In</string> + <string key="NSKeyEquiv">+</string> + <int key="NSKeyEquivModMask">1048576</int> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="756751024"/> + <reference key="NSMixedImage" ref="908425081"/> + </object> + <object class="NSMenuItem" id="148271458"> + <reference key="NSMenu" ref="466310130"/> + <string key="NSTitle">Zoom Out</string> + <string key="NSKeyEquiv">-</string> + <int key="NSKeyEquivModMask">1048576</int> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="756751024"/> + <reference key="NSMixedImage" ref="908425081"/> + </object> </object> </object> </object> @@ -625,11 +644,13 @@ <int key="NSvFlags">268</int> <string key="NSFrameSize">{300, 387}</string> <reference key="NSSuperview" ref="862897293"/> + <reference key="NSWindow"/> <string key="NSClassName">TreeView</string> </object> </object> <string key="NSFrame">{{1, 1}, {300, 387}}</string> <reference key="NSSuperview" ref="429678852"/> + <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="363409241"/> <reference key="NSDocView" ref="363409241"/> <object class="NSColor" key="NSBGColor"> @@ -648,6 +669,7 @@ <int key="NSvFlags">-2147483392</int> <string key="NSFrame">{{319, 1}, {15, 371}}</string> <reference key="NSSuperview" ref="429678852"/> + <reference key="NSWindow"/> <reference key="NSTarget" ref="429678852"/> <string key="NSAction">_doScroller:</string> <double key="NSPercent">0.99741602067183466</double> @@ -657,6 +679,7 @@ <int key="NSvFlags">-2147483392</int> <string key="NSFrame">{{1, 373}, {500, 15}}</string> <reference key="NSSuperview" ref="429678852"/> + <reference key="NSWindow"/> <int key="NSsFlags">1</int> <reference key="NSTarget" ref="429678852"/> <string key="NSAction">_doScroller:</string> @@ -665,6 +688,7 @@ </object> <string key="NSFrame">{{-1, -1}, {302, 389}}</string> <reference key="NSSuperview" ref="75583718"/> + <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="862897293"/> <int key="NSsFlags">562</int> <reference key="NSVScroller" ref="1030123989"/> @@ -674,10 +698,14 @@ </object> <string key="NSFrameSize">{300, 387}</string> <reference key="NSSuperview"/> + <reference key="NSWindow"/> </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> </object> <object class="IBObjectContainer" key="IBDocument.Objects"> <object class="NSMutableArray" key="connectionRecords"> @@ -748,14 +776,6 @@ </object> <object class="IBConnectionRecord"> <object class="IBActionConnection" key="connection"> - <string key="label">saveDocument:</string> - <reference key="source" ref="1014"/> - <reference key="destination" ref="1023925487"/> - </object> - <int key="connectionID">362</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> <string key="label">saveDocumentAs:</string> <reference key="source" ref="1014"/> <reference key="destination" ref="117038363"/> @@ -764,14 +784,6 @@ </object> <object class="IBConnectionRecord"> <object class="IBActionConnection" key="connection"> - <string key="label">revertDocumentToSaved:</string> - <reference key="source" ref="1014"/> - <reference key="destination" ref="579971712"/> - </object> - <int key="connectionID">364</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> <string key="label">runToolbarCustomizationPalette:</string> <reference key="source" ref="1014"/> <reference key="destination" ref="237841660"/> @@ -938,6 +950,62 @@ </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"/> + <reference key="destination" ref="1026802243"/> + </object> + <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"/> + <reference key="destination" ref="705341025"/> + </object> + <int key="connectionID">823</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">openDocument:</string> + <reference key="source" ref="1014"/> + <reference key="destination" ref="722745758"/> + </object> + <int key="connectionID">824</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">zoomIn:</string> + <reference key="source" ref="1014"/> + <reference key="destination" ref="157577355"/> + </object> + <int key="connectionID">829</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">zoomOut:</string> + <reference key="source" ref="1014"/> + <reference key="destination" ref="148271458"/> + </object> + <int key="connectionID">830</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">zoomImageToActualSize:</string> + <reference key="source" ref="1014"/> + <reference key="destination" ref="924072330"/> + </object> + <int key="connectionID">831</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -1023,25 +1091,18 @@ <reference key="object" ref="720053764"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="1023925487"/> <reference ref="117038363"/> <reference ref="49223823"/> <reference ref="722745758"/> <reference ref="705341025"/> <reference ref="294629803"/> <reference ref="776162233"/> - <reference ref="579971712"/> <reference ref="1010469920"/> <reference ref="425164168"/> </object> <reference key="parent" ref="379814623"/> </object> <object class="IBObjectRecord"> - <int key="objectID">75</int> - <reference key="object" ref="1023925487"/> - <reference key="parent" ref="720053764"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">80</int> <reference key="object" ref="117038363"/> <reference key="parent" ref="720053764"/> @@ -1072,11 +1133,6 @@ <reference key="parent" ref="720053764"/> </object> <object class="IBObjectRecord"> - <int key="objectID">112</int> - <reference key="object" ref="579971712"/> - <reference key="parent" ref="720053764"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">74</int> <reference key="object" ref="1010469920"/> <reference key="parent" ref="720053764"/> @@ -1228,6 +1284,10 @@ <bool key="EncodedWithXMLCoder">YES</bool> <reference ref="102151532"/> <reference ref="237841660"/> + <reference ref="588542073"/> + <reference ref="148271458"/> + <reference ref="924072330"/> + <reference ref="157577355"/> </object> <reference key="parent" ref="586577488"/> </object> @@ -1449,6 +1509,31 @@ <reference key="object" ref="532573582"/> <reference key="parent" ref="835318025"/> </object> + <object class="IBObjectRecord"> + <int key="objectID">820</int> + <reference key="object" ref="1026802243"/> + <reference key="parent" ref="0"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">825</int> + <reference key="object" ref="588542073"/> + <reference key="parent" ref="466310130"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">826</int> + <reference key="object" ref="148271458"/> + <reference key="parent" ref="466310130"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">827</int> + <reference key="object" ref="924072330"/> + <reference key="parent" ref="466310130"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">828</int> + <reference key="object" ref="157577355"/> + <reference key="parent" ref="466310130"/> + </object> </object> </object> <object class="NSMutableDictionary" key="flattenedProperties"> @@ -1464,8 +1549,6 @@ <string>106.editorWindowContentRectSynchronizationRect</string> <string>111.IBPluginDependency</string> <string>111.ImportedFromIB2</string> - <string>112.IBPluginDependency</string> - <string>112.ImportedFromIB2</string> <string>129.IBPluginDependency</string> <string>129.ImportedFromIB2</string> <string>130.IBEditorWindowLastContentRect</string> @@ -1552,8 +1635,6 @@ <string>739.IBPluginDependency</string> <string>74.IBPluginDependency</string> <string>74.ImportedFromIB2</string> - <string>75.IBPluginDependency</string> - <string>75.ImportedFromIB2</string> <string>77.IBPluginDependency</string> <string>77.ImportedFromIB2</string> <string>78.IBPluginDependency</string> @@ -1579,6 +1660,11 @@ <string>818.IBPluginDependency</string> <string>82.IBPluginDependency</string> <string>82.ImportedFromIB2</string> + <string>820.IBPluginDependency</string> + <string>825.IBPluginDependency</string> + <string>826.IBPluginDependency</string> + <string>827.IBPluginDependency</string> + <string>828.IBPluginDependency</string> <string>83.IBPluginDependency</string> <string>83.ImportedFromIB2</string> <string>92.IBPluginDependency</string> @@ -1597,8 +1683,6 @@ <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>{{509, 573}, {64, 6}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> @@ -1631,13 +1715,13 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>{{525, 802}, {197, 73}}</string> - <string>{{590, 797}, {352, 20}}</string> + <string>{{653, 628}, {352, 20}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>{74, 862}</string> <string>{{11, 977}, {478, 20}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{412, 613}, {231, 43}}</string> + <string>{{823, 515}, {234, 113}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>{{475, 832}, {234, 43}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -1653,7 +1737,7 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{368, 453}, {151, 203}}</string> + <string>{{716, 594}, {151, 203}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -1666,7 +1750,7 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{519, 433}, {150, 43}}</string> + <string>{{867, 574}, {150, 43}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -1674,15 +1758,13 @@ <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>{{608, 393}, {238, 103}}</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>{{867, 534}, {238, 103}}</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> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -1693,7 +1775,7 @@ <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>{{326, 473}, {196, 183}}</string> + <string>{{737, 485}, {179, 143}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>{{323, 672}, {199, 203}}</string> @@ -1711,6 +1793,11 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <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> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> @@ -1732,12 +1819,31 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">819</int> + <int key="maxID">831</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="IBPartialClassDescription"> + <string key="className">NetSurfAppDelegate</string> + <string key="superclassName">NSObject</string> + <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> + </object> + </object> + <object class="IBPartialClassDescription"> <string key="className">ScrollableView</string> <string key="superclassName">NSView</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> diff --git a/cocoa/res/NetSurf-Info.plist b/cocoa/res/NetSurf-Info.plist index 1d756f321..a5c540f55 100644 --- a/cocoa/res/NetSurf-Info.plist +++ b/cocoa/res/NetSurf-Info.plist @@ -28,5 +28,17 @@ <string>MainMenu</string> <key>NSPrincipalClass</key> <string>NetSurfApp</string> + <key>CFBundleURLTypes</key> + <array> + <dict> + <key>CFBundleURLName</key> + <string>org.netsurf-browser.NetSurf.URI</string> + <key>CFBundleURLSchemes</key> + <array> + <string>http</string> + <string>https</string> + </array> + </dict> + </array> </dict> </plist> |