diff options
author | Sven Weidauer <sven.weidauer@gmail.com> | 2011-01-26 15:04:42 +0000 |
---|---|---|
committer | Sven Weidauer <sven.weidauer@gmail.com> | 2011-01-26 15:04:42 +0000 |
commit | 80cdf73f6b5f4893490b7dafe876b8cd1ae232b7 (patch) | |
tree | e110a637e85fef24b878f4122f90329a9022c040 | |
parent | 241510c0e236dc3479a0987ca2f166ba8a3d15bd (diff) | |
download | netsurf-80cdf73f6b5f4893490b7dafe876b8cd1ae232b7.tar.gz netsurf-80cdf73f6b5f4893490b7dafe876b8cd1ae232b7.tar.bz2 |
Cmd-W closes active tab.
svn path=/trunk/netsurf/; revision=11497
-rw-r--r-- | cocoa/BrowserWindowController.h | 1 | ||||
-rw-r--r-- | cocoa/BrowserWindowController.m | 5 | ||||
-rw-r--r-- | cocoa/res/MainMenu.xib | 125 |
3 files changed, 103 insertions, 28 deletions
diff --git a/cocoa/BrowserWindowController.h b/cocoa/BrowserWindowController.h index 96157e71f..e10cd5a4c 100644 --- a/cocoa/BrowserWindowController.h +++ b/cocoa/BrowserWindowController.h @@ -44,6 +44,7 @@ @property (readwrite, assign, nonatomic) BOOL canGoForward; - (IBAction) newTab: (id) sender; +- (IBAction) closeCurrentTab: (id) sender; - (void) addTab: (BrowserViewController *)browser; - (void) removeTab: (BrowserViewController *)browser; diff --git a/cocoa/BrowserWindowController.m b/cocoa/BrowserWindowController.m index 21e787b03..32cb57e9a 100644 --- a/cocoa/BrowserWindowController.m +++ b/cocoa/BrowserWindowController.m @@ -113,6 +113,11 @@ extern NSString * const kHomepageURL; browser_window_create( [homepageURL UTF8String], clone, NULL, false, true ); } +- (IBAction) closeCurrentTab: (id) sender; +{ + [self removeTab: activeBrowser]; +} + - (void) setActiveBrowser: (BrowserViewController *)newBrowser; { activeBrowser = newBrowser; diff --git a/cocoa/res/MainMenu.xib b/cocoa/res/MainMenu.xib index 7cf458f98..6a02ce968 100644 --- a/cocoa/res/MainMenu.xib +++ b/cocoa/res/MainMenu.xib @@ -782,14 +782,6 @@ </object> <object class="IBConnectionRecord"> <object class="IBActionConnection" key="connection"> - <string key="label">performClose:</string> - <reference key="source" ref="1014"/> - <reference key="destination" ref="776162233"/> - </object> - <int key="connectionID">193</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> <string key="label">performZoom:</string> <reference key="source" ref="1014"/> <reference key="destination" ref="575023229"/> @@ -1060,6 +1052,14 @@ </object> <int key="connectionID">839</int> </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">closeCurrentTab:</string> + <reference key="source" ref="1014"/> + <reference key="destination" ref="776162233"/> + </object> + <int key="connectionID">840</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -1905,22 +1905,31 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">839</int> + <int key="maxID">840</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="IBPartialClassDescription"> <string key="className">BrowserView</string> - <string key="superclassName">NSView</string> + <string key="superclassName">ScrollableView</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">BrowserView.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">BrowserViewController</string> + <string key="superclassName">NSViewController</string> <object class="NSMutableDictionary" key="actions"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> + <string>backForwardSelected:</string> <string>goBack:</string> <string>goForward:</string> + <string>navigate:</string> <string>reloadPage:</string> - <string>showHistory:</string> <string>stopLoading:</string> <string>zoomIn:</string> <string>zoomOriginal:</string> @@ -1936,16 +1945,18 @@ <string>id</string> <string>id</string> <string>id</string> + <string>id</string> </object> </object> <object class="NSMutableDictionary" key="actionInfosByName"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> + <string>backForwardSelected:</string> <string>goBack:</string> <string>goForward:</string> + <string>navigate:</string> <string>reloadPage:</string> - <string>showHistory:</string> <string>stopLoading:</string> <string>zoomIn:</string> <string>zoomOriginal:</string> @@ -1954,6 +1965,10 @@ <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="IBActionInfo"> + <string key="name">backForwardSelected:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> <string key="name">goBack:</string> <string key="candidateClassName">id</string> </object> @@ -1962,11 +1977,11 @@ <string key="candidateClassName">id</string> </object> <object class="IBActionInfo"> - <string key="name">reloadPage:</string> + <string key="name">navigate:</string> <string key="candidateClassName">id</string> </object> <object class="IBActionInfo"> - <string key="name">showHistory:</string> + <string key="name">reloadPage:</string> <string key="candidateClassName">id</string> </object> <object class="IBActionInfo"> @@ -1987,48 +2002,97 @@ </object> </object> </object> + <object class="NSMutableDictionary" key="outlets"> + <string key="NS.key.0">browserView</string> + <string key="NS.object.0">BrowserView</string> + </object> + <object class="NSMutableDictionary" key="toOneOutletInfosByName"> + <string key="NS.key.0">browserView</string> + <object class="IBToOneOutletInfo" key="NS.object.0"> + <string key="name">browserView</string> + <string key="candidateClassName">BrowserView</string> + </object> + </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> - <string key="minorKey">BrowserView.h</string> + <string key="minorKey">BrowserViewController.h</string> </object> </object> <object class="IBPartialClassDescription"> <string key="className">BrowserWindowController</string> <string key="superclassName">NSWindowController</string> <object class="NSMutableDictionary" key="actions"> - <string key="NS.key.0">newTab:</string> - <string key="NS.object.0">id</string> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>closeCurrentTab:</string> + <string>newTab:</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>id</string> + <string>id</string> + </object> </object> <object class="NSMutableDictionary" key="actionInfosByName"> - <string key="NS.key.0">newTab:</string> - <object class="IBActionInfo" key="NS.object.0"> - <string key="name">newTab:</string> - <string key="candidateClassName">id</string> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>closeCurrentTab:</string> + <string>newTab:</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="IBActionInfo"> + <string key="name">closeCurrentTab:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> + <string key="name">newTab:</string> + <string key="candidateClassName">id</string> + </object> </object> </object> <object class="NSMutableDictionary" key="outlets"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> + <string>activeBrowserController</string> + <string>navigationControl</string> <string>tabBar</string> <string>tabView</string> + <string>urlField</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> + <string>NSObjectController</string> + <string>NSSegmentedControl</string> <string>PSMTabBarControl</string> <string>NSTabView</string> + <string>URLFieldCell</string> </object> </object> <object class="NSMutableDictionary" key="toOneOutletInfosByName"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> + <string>activeBrowserController</string> + <string>navigationControl</string> <string>tabBar</string> <string>tabView</string> + <string>urlField</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="IBToOneOutletInfo"> + <string key="name">activeBrowserController</string> + <string key="candidateClassName">NSObjectController</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">navigationControl</string> + <string key="candidateClassName">NSSegmentedControl</string> + </object> + <object class="IBToOneOutletInfo"> <string key="name">tabBar</string> <string key="candidateClassName">PSMTabBarControl</string> </object> @@ -2036,6 +2100,10 @@ <string key="name">tabView</string> <string key="candidateClassName">NSTabView</string> </object> + <object class="IBToOneOutletInfo"> + <string key="name">urlField</string> + <string key="candidateClassName">URLFieldCell</string> + </object> </object> </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> @@ -2085,13 +2153,6 @@ </object> <object class="IBPartialClassDescription"> <string key="className">PSMTabBarControl</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">PSMTabBarControl/PSMProgressIndicator.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">PSMTabBarControl</string> <reference key="sourceIdentifier" ref="831067236"/> </object> <object class="IBPartialClassDescription"> @@ -2172,6 +2233,14 @@ <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"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">URLFieldCell.h</string> + </object> + </object> </object> <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+"> <bool key="EncodedWithXMLCoder">YES</bool> |