Bring outline view branch up to date with trunk (r3165:r3177).

1 files changed, 61 insertions, 4 deletions

diff --git a/Source/SPBundleHTMLOutputController.m b/Source/SPBundleHTMLOutputController.m
index 3c47964a..4b1567bb 100644
--- a/Source/SPBundleHTMLOutputController.m
+++ b/Source/SPBundleHTMLOutputController.m
@@ -24,6 +24,7 @@
 
 #import "SPBundleHTMLOutputController.h"
 #import "SPAlertSheets.h"
+#import "SPPrintAccessory.h"
 
 @class WebScriptCallFrame;
 
@@ -178,7 +179,57 @@
 
 - (IBAction)printDocument:(id)sender
 {
-	[[[[webView mainFrame] frameView] documentView] print:sender];
+
+	NSPrintInfo *printInfo = [NSPrintInfo sharedPrintInfo];
+
+	NSSize paperSize = [printInfo paperSize];
+	NSRect printableRect = [printInfo imageablePageBounds];
+
+	// Calculate page margins
+	CGFloat marginL = printableRect.origin.x;
+	CGFloat marginR = paperSize.width - (printableRect.origin.x + printableRect.size.width);
+	CGFloat marginB = printableRect.origin.y;
+	CGFloat marginT = paperSize.height - (printableRect.origin.y + printableRect.size.height);
+
+	// Make sure margins are symetric and positive
+	CGFloat marginLR = MAX(0, MAX(marginL, marginR));
+	CGFloat marginTB = MAX(0, MAX(marginT, marginB));
+
+	// Set the margins
+	[printInfo setLeftMargin:marginLR];
+	[printInfo setRightMargin:marginLR];
+	[printInfo setTopMargin:marginTB];
+	[printInfo setBottomMargin:marginTB];
+
+	[printInfo setHorizontalPagination:NSFitPagination];
+	[printInfo setVerticalPagination:NSFitPagination];
+	[printInfo setVerticallyCentered:NO];
+
+	NSPrintOperation *op = [NSPrintOperation printOperationWithView:[[[webView mainFrame] frameView] documentView] printInfo:printInfo];
+
+	// Perform the print operation on a background thread
+	[op setCanSpawnSeparateThread:YES];
+
+	// Add the ability to select the orientation to print panel
+	NSPrintPanel *printPanel = [op printPanel];
+
+	[printPanel setOptions:[printPanel options] + NSPrintPanelShowsOrientation + NSPrintPanelShowsScaling + NSPrintPanelShowsPaperSize];
+
+	[op setPrintPanel:printPanel];
+
+	SPPrintAccessory *printAccessory = [[SPPrintAccessory alloc] initWithNibName:@"PrintAccessory" bundle:nil];
+
+	[printAccessory setPrintView:webView];
+	[printPanel addAccessoryController:printAccessory];
+
+	[[NSPageLayout pageLayout] addAccessoryController:printAccessory];
+	[printAccessory release];
+
+	[op runOperationModalForWindow:[self window]
+		delegate:self
+		didRunSelector:nil
+		contextInfo:nil];
+
 }
 
 - (void)showSourceCode
@@ -263,6 +314,7 @@
 
 - (void)webView:(WebView *)webView decidePolicyForNavigationAction:(NSDictionary *)actionInformation request:(NSURLRequest *)request frame:(WebFrame *)frame decisionListener:(id<WebPolicyDecisionListener>)listener
 {
+
 	NSInteger navigationType = [[actionInformation objectForKey:WebActionNavigationTypeKey] integerValue];
 
 	// sequelpro:// handler
@@ -270,9 +322,14 @@
 		[[NSApp delegate] handleEventWithURL:[request URL]];
 		[listener ignore];
 	}
-	// file://a_file_path opens the reveal the file in Finder
-	else if([[[request URL] scheme] isEqualToString:@"file"] && navigationType == WebNavigationTypeLinkClicked) {
-		[[NSWorkspace sharedWorkspace] selectFile:[[[request mainDocumentURL] absoluteString] substringFromIndex:6] inFileViewerRootedAtPath:nil];
+	// sp-reveal-file://a_file_path reveals the file in Finder
+	else if([[[request URL] scheme] isEqualToString:@"sp-reveal-file"] && navigationType == WebNavigationTypeLinkClicked) {
+		[[NSWorkspace sharedWorkspace] selectFile:[[[request mainDocumentURL] absoluteString] substringFromIndex:16] inFileViewerRootedAtPath:nil];
+		[listener ignore];
+	}
+	// sp-open-file://a_file_path opens the file with the default
+	else if([[[request URL] scheme] isEqualToString:@"sp-open-file"] && navigationType == WebNavigationTypeLinkClicked) {
+		[[NSWorkspace sharedWorkspace] openFile:[[[request mainDocumentURL] absoluteString] substringFromIndex:14]];
 		[listener ignore];
 	}
 	else {