Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/bf0a0fb15aa650bd9abaad05d6534dfd31ded6e7
...commit
http://git.netsurf-browser.org/netsurf.git/commit/bf0a0fb15aa650bd9abaad05d6534dfd31ded6e7
...tree
http://git.netsurf-browser.org/netsurf.git/tree/bf0a0fb15aa650bd9abaad05d6534dfd31ded6e7
The branch, svenw/cocoa has been updated
via bf0a0fb15aa650bd9abaad05d6534dfd31ded6e7 (commit)
via d023f97499af34f53b68f3e471b421d38e92090a (commit)
from 7a3976a120e33a9a56590388e5ed077a0c766e14 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=bf0a0fb15aa650bd9abaad05d6534dfd31ded6e7
commit bf0a0fb15aa650bd9abaad05d6534dfd31ded6e7
Author: Sven Weidauer <[email protected]>
Commit: Sven Weidauer <[email protected]>
Use newer API for alert.
diff --git a/frontends/cocoa/BrowserWindowController.m
b/frontends/cocoa/BrowserWindowController.m
index 2abc5d8..8607e4d 100644
--- a/frontends/cocoa/BrowserWindowController.m
+++ b/frontends/cocoa/BrowserWindowController.m
@@ -110,34 +110,30 @@
- (BOOL)windowShouldClose:(NSWindow *)window
{
- if ([tabView numberOfTabViewItems] <= 1)
- return YES;
- if ([[NSUserDefaults standardUserDefaults]
boolForKey:kAlwaysCloseMultipleTabs])
+ if (tabView.numberOfTabViewItems <= 1 || [[NSUserDefaults
standardUserDefaults] boolForKey:kAlwaysCloseMultipleTabs]) {
return YES;
+ }
- NSAlert *ask = [NSAlert alertWithMessageText:NSLocalizedString(@"Do you
really want to close this window?", nil)
- defaultButton:NSLocalizedString(@"Yes",
@"'Yes' button")
- alternateButton:NSLocalizedString(@"No",
@"'No' button")
- otherButton:nil
- informativeTextWithFormat:NSLocalizedString(@"There are
%d tabs open, do you want to close them all?", nil),
- [tabView numberOfTabViewItems]];
- [ask setShowsSuppressionButton:YES];
+ NSAlert *ask = [[NSAlert alloc] init];
+ ask.messageText = NSLocalizedString(@"Do you really want to close this
window?", nil);
+ [ask addButtonWithTitle:NSLocalizedString(@"Yes", @"'Yes' button")];
+ [ask addButtonWithTitle:NSLocalizedString(@"No", @"'No' button")];
+ ask.informativeText = [NSString
localizedStringWithFormat:NSLocalizedString(@"There are %d tabs open, do you
want to close them all?", nil), tabView.numberOfTabViewItems];
+ ask.showsSuppressionButton = YES;
[ask beginSheetModalForWindow:window
- modalDelegate:self
-
didEndSelector:@selector(canCloseAlertDidEnd:returnCode:contextInfo:)
- contextInfo:NULL];
+ completionHandler:^(NSModalResponse returnCode) {
+ if (returnCode != NSAlertFirstButtonReturn) {
+ return;
+ }
- return NO;
-}
+ [[NSUserDefaults standardUserDefaults] setBool:[[ask
suppressionButton] state] == NSOnState
+
forKey:kAlwaysCloseMultipleTabs];
+ [self.window close];
-- (void)canCloseAlertDidEnd:(NSAlert *)alert returnCode:(int)returnCode
contextInfo:(void *)contextInfo
-{
- if (returnCode == NSModalResponseOK) {
- [[NSUserDefaults standardUserDefaults] setBool:[[alert
suppressionButton] state] == NSOnState
-
forKey:kAlwaysCloseMultipleTabs];
- [[self window] close];
- }
+ }];
+
+ return NO;
}
- (void)windowWillClose:(NSNotification *)notification
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=d023f97499af34f53b68f3e471b421d38e92090a
commit d023f97499af34f53b68f3e471b421d38e92090a
Author: Sven Weidauer <[email protected]>
Commit: Sven Weidauer <[email protected]>
Pass actions from the browser window controller to the browser view
controller.
diff --git a/frontends/cocoa/BrowserWindowController.m
b/frontends/cocoa/BrowserWindowController.m
index ac3cf18..2abc5d8 100644
--- a/frontends/cocoa/BrowserWindowController.m
+++ b/frontends/cocoa/BrowserWindowController.m
@@ -147,6 +147,15 @@
}
}
+- (id)supplementalTargetForAction:(SEL)action sender:(id)sender
+{
+ if ([self.activeBrowser respondsToSelector:action]) {
+ return activeBrowser;
+ }
+
+ return [super supplementalTargetForAction:action sender:sender];
+}
+
- (IBAction)newTab:(id)sender
{
nsurl *url;
@@ -175,12 +184,6 @@
[self removeTab:activeBrowser];
}
-- (void)setActiveBrowser:(BrowserViewController *)newBrowser
-{
- activeBrowser = newBrowser;
- //[self setNextResponder: activeBrowser];
-}
-
- (void)setCanGoBack:(BOOL)can
{
[navigationControl setEnabled:can forSegment:0];
-----------------------------------------------------------------------
Summary of changes:
frontends/cocoa/BrowserWindowController.m | 53 ++++++++++++++---------------
1 file changed, 26 insertions(+), 27 deletions(-)
diff --git a/frontends/cocoa/BrowserWindowController.m
b/frontends/cocoa/BrowserWindowController.m
index ac3cf18..8607e4d 100644
--- a/frontends/cocoa/BrowserWindowController.m
+++ b/frontends/cocoa/BrowserWindowController.m
@@ -110,41 +110,46 @@
- (BOOL)windowShouldClose:(NSWindow *)window
{
- if ([tabView numberOfTabViewItems] <= 1)
- return YES;
- if ([[NSUserDefaults standardUserDefaults]
boolForKey:kAlwaysCloseMultipleTabs])
+ if (tabView.numberOfTabViewItems <= 1 || [[NSUserDefaults
standardUserDefaults] boolForKey:kAlwaysCloseMultipleTabs]) {
return YES;
+ }
- NSAlert *ask = [NSAlert alertWithMessageText:NSLocalizedString(@"Do you
really want to close this window?", nil)
- defaultButton:NSLocalizedString(@"Yes",
@"'Yes' button")
- alternateButton:NSLocalizedString(@"No",
@"'No' button")
- otherButton:nil
- informativeTextWithFormat:NSLocalizedString(@"There are
%d tabs open, do you want to close them all?", nil),
- [tabView numberOfTabViewItems]];
- [ask setShowsSuppressionButton:YES];
+ NSAlert *ask = [[NSAlert alloc] init];
+ ask.messageText = NSLocalizedString(@"Do you really want to close this
window?", nil);
+ [ask addButtonWithTitle:NSLocalizedString(@"Yes", @"'Yes' button")];
+ [ask addButtonWithTitle:NSLocalizedString(@"No", @"'No' button")];
+ ask.informativeText = [NSString
localizedStringWithFormat:NSLocalizedString(@"There are %d tabs open, do you
want to close them all?", nil), tabView.numberOfTabViewItems];
+ ask.showsSuppressionButton = YES;
[ask beginSheetModalForWindow:window
- modalDelegate:self
-
didEndSelector:@selector(canCloseAlertDidEnd:returnCode:contextInfo:)
- contextInfo:NULL];
+ completionHandler:^(NSModalResponse returnCode) {
+ if (returnCode != NSAlertFirstButtonReturn) {
+ return;
+ }
+
+ [[NSUserDefaults standardUserDefaults] setBool:[[ask
suppressionButton] state] == NSOnState
+
forKey:kAlwaysCloseMultipleTabs];
+ [self.window close];
+
+ }];
return NO;
}
-- (void)canCloseAlertDidEnd:(NSAlert *)alert returnCode:(int)returnCode
contextInfo:(void *)contextInfo
+- (void)windowWillClose:(NSNotification *)notification
{
- if (returnCode == NSModalResponseOK) {
- [[NSUserDefaults standardUserDefaults] setBool:[[alert
suppressionButton] state] == NSOnState
-
forKey:kAlwaysCloseMultipleTabs];
- [[self window] close];
+ for (NSTabViewItem *tab in [tabView tabViewItems]) {
+ [tabView removeTabViewItem:tab];
}
}
-- (void)windowWillClose:(NSNotification *)notification
+- (id)supplementalTargetForAction:(SEL)action sender:(id)sender
{
- for (NSTabViewItem *tab in [tabView tabViewItems]) {
- [tabView removeTabViewItem:tab];
+ if ([self.activeBrowser respondsToSelector:action]) {
+ return activeBrowser;
}
+
+ return [super supplementalTargetForAction:action sender:sender];
}
- (IBAction)newTab:(id)sender
@@ -175,12 +180,6 @@
[self removeTab:activeBrowser];
}
-- (void)setActiveBrowser:(BrowserViewController *)newBrowser
-{
- activeBrowser = newBrowser;
- //[self setNextResponder: activeBrowser];
-}
-
- (void)setCanGoBack:(BOOL)can
{
[navigationControl setEnabled:can forSegment:0];
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
