• MySQL Help

- managed contextual menus in webview
-- added for selection menu "Search in MySQL Help" and "Search in MySQL Documentation"
- fixed keyboard short-cuts in webview
- corrected tooltip for "Web" button in GUI

2 files changed, 77 insertions, 16 deletions

diff --git a/Interfaces/English.lproj/DBView.xib b/Interfaces/English.lproj/DBView.xib
index 764c0149..feead6cc 100644
--- a/Interfaces/English.lproj/DBView.xib
+++ b/Interfaces/English.lproj/DBView.xib
@@ -21571,7 +21571,7 @@ aGUgYWN0aXZlIHNlbGVjdGlvbiAo4oyl4oyYUik</string>
 						<object class="IBToolTipAttribute" key="NS.object.0">
 							<string key="name">ToolTip</string>
 							<reference key="object" ref="859272377"/>
-							<string type="base64-UTF8" key="toolTip">U2VhcmNoIGluIHRoZSBvbmxpbmUgZG9jdW1lbnRhdGlvbiBb4oyl4oyYT10</string>
+							<string type="base64-UTF8" key="toolTip">U2VhcmNoIGluIHRoZSBvbmxpbmUgZG9jdW1lbnRhdGlvbiBb4oyl4oyYV10</string>
 						</object>
 					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
diff --git a/Source/CustomQuery.m b/Source/CustomQuery.m
index b209409c..2798139d 100644
--- a/Source/CustomQuery.m
+++ b/Source/CustomQuery.m
@@ -1431,12 +1431,6 @@ traps enter key and
 				searchTerm,
 				[mySQLversion stringByReplacingOccurrencesOfString:@"." withString:@""]]
 			stringByAddingPercentEscapesUsingEncoding:NSASCIIStringEncoding]]];
-		// [[helpWebView mainFrame] loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:
-		// 	[[NSString stringWithFormat:
-		// 		MYSQL_DEV_SEARCH_URL,
-		// 		[[helpSearchField stringValue] stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]],
-		// 		[[mySQLversion substringToIndex:3] stringByReplacingOccurrencesOfString:@"." withString:@""]]
-		// 	stringByAddingPercentEscapesUsingEncoding:NSASCIIStringEncoding]]]];
 		break;
 		case 2: // MySQL
 		[self showHelpFor:searchTerm setHistory:YES];
@@ -1445,6 +1439,28 @@ traps enter key and
 }
 
 /*
+ * Retrieve and show the Help for the selected text in the webview
+ */
+- (IBAction)showHelpForWebViewSelection:(id)sender
+{
+	[self showHelpFor:[[helpWebView selectedDOMRange] text] setHistory:YES];
+}
+
+/*
+ * Retrieve and show MySQL's online documentation for the selected text in the webview
+ */
+- (IBAction)searchInDocForWebViewSelection:(id)sender
+{
+	[[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:
+		[[NSString stringWithFormat:
+			MYSQL_DEV_SEARCH_URL,
+			[[helpWebView selectedDOMRange] text],
+			[mySQLversion stringByReplacingOccurrencesOfString:@"." withString:@""]]
+		stringByAddingPercentEscapesUsingEncoding:NSASCIIStringEncoding]]];
+}
+
+
+/*
  * Retrieve and show the data for "HELP 'currentWord'"
  */
 - (IBAction)getHelpForCurrentWord:(id)sender
@@ -1710,39 +1726,84 @@ traps enter key and
 
 /*
  * Link detector: If user clicked at an http link open it in the default browser,
- * otherwise search for it in the MySQL help.
+ * otherwise search for it in the MySQL help. Additionally handle back/forward events from
+ * keyboard and context menu.
  */
 - (void)webView:(WebView *)webView decidePolicyForNavigationAction:(NSDictionary *)actionInformation request:(NSURLRequest *)request frame:(WebFrame *)frame decisionListener:(id<WebPolicyDecisionListener>)listener
 {
 	int navigationType = [[actionInformation objectForKey:WebActionNavigationTypeKey] intValue];
-	if([[[request URL] scheme] isEqualToString:@"applewebdata"]){
-		[self showHelpFor:[[[request URL] path] substringWithRange:NSMakeRange(1,[[[request URL] path] length]-1)] setHistory:YES];
+	if([[[request URL] scheme] isEqualToString:@"applewebdata"] && navigationType == WebNavigationTypeLinkClicked){
+		// [self showHelpFor:[[[request URL] path] substringWithRange:NSMakeRange(1,[[[request URL] path] length]-1)] setHistory:YES];
+		[self showHelpFor:[[[request URL] path] lastPathComponent] setHistory:YES];
 		[listener ignore];
-		// WebHistoryItem *aWebHistoryItem = [[WebHistoryItem alloc] initWithURLString:[[request URL] absoluteString] title:[[request URL] path] lastVisitedTimeInterval:[[NSDate date] timeIntervalSinceDate:[NSDate distantFuture]]];
-		// [[helpWebView backForwardList] addItem:aWebHistoryItem];
-
 	} else {
 		if (navigationType == WebNavigationTypeOther) {
+			// catch reload event
+			// if([[[actionInformation objectForKey:WebActionOriginalURLKey] absoluteString] isEqualToString:@"about:blank"])
+			// 	[listener use];
+			// else
 			[listener use];
 		} else if (navigationType == WebNavigationTypeLinkClicked) {
+			// show http in browser
 			[[NSWorkspace sharedWorkspace] openURL:[actionInformation objectForKey:WebActionOriginalURLKey]];
 			[listener ignore];
+		} else if (navigationType == WebNavigationTypeBackForward) {
+			// catch back/forward events from contextual menu
+			[self showHelpFor:[[[[actionInformation objectForKey:WebActionOriginalURLKey] absoluteString] lastPathComponent] stringByReplacingPercentEscapesUsingEncoding:NSASCIIStringEncoding] setHistory:NO];
+			[listener ignore];
+		} else if (navigationType == WebNavigationTypeReload) {
+			// just in case
+			[listener ignore];
 		} else {
-			// Ignore WebNavigationTypeFormSubmitted, WebNavigationTypeBackForward, 
-			// WebNavigationTypeReload and WebNavigationTypeFormResubmitted.
+			// Ignore WebNavigationTypeFormSubmitted, WebNavigationTypeFormResubmitted.
 			[listener ignore];
 		}
 	}
 }
 
+
 /*
- * Up to now no contextual menu in helpWebView 
+ * Manage contextual menu in helpWebView 
  */
 - (NSArray *)webView:(WebView *)sender contextMenuItemsForElement:(NSDictionary *)element defaultMenuItems:(NSArray *)defaultMenuItems
 {
+	int menuType = [defaultMenuItems count];
+	NSMutableArray *returnArray = [[NSMutableArray array] autorelease];
+	NSMenuItem *searchInMySQL;
+	NSMenuItem *searchInMySQLonline;
+
+	// dispatcher for different context menus via the number of menu items
+	switch(menuType)
+	{
+		case 1: // only reload
+		return nil;
+		break;
+		case 2: // back and reload
+		return [NSArray arrayWithObjects:[defaultMenuItems objectAtIndex:0], nil];
+		break;
+		case 3: // back, forward, and reload
+		return [NSArray arrayWithObjects:[defaultMenuItems objectAtIndex:0], [defaultMenuItems objectAtIndex:1], nil];
+		break;
+		case 4: // cursor over link (only allow copy link)
+		return [NSArray arrayWithObjects:[defaultMenuItems objectAtIndex:3], nil];
+		break;
+		case 6: // menu for a selection, add Search in MySQL Help
+		searchInMySQL = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"Search in MySQL Help", @"Search in MySQL Help") action:@selector(showHelpForWebViewSelection:) keyEquivalent:@""];
+		[searchInMySQL setEnabled:YES];
+		[searchInMySQL setTarget:self];
+		[returnArray addObject:searchInMySQL];
+		searchInMySQLonline = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"Search in MySQL Documentation", @"Search in MySQL Documentation") action:@selector(searchInDocForWebViewSelection:) keyEquivalent:@""];
+		[searchInMySQLonline setEnabled:YES];
+		[searchInMySQLonline setTarget:self];
+		[returnArray addObject:searchInMySQLonline];
+		[returnArray addObjectsFromArray:defaultMenuItems];
+		return returnArray;
+		break;
+	}
 	return nil;
 }
 
+
 #pragma mark -
 
 // Last but not least