merge up to r153

git-svn-id: https://svn.r-project.org/R-packages/trunk/Mac-GUI@5737 694ef91d-65df-0310-b7bb-92e67a308ead

DataManager.h

@@ -55,6 +55,7 @@
 - (IBAction)showHelp:(id)sender;
 - (IBAction)reloadDatasets:(id)sender;
 - (IBAction)filterTable:(id)sender;
+- (IBAction)executeSelection:(id)sender;
 
 - (void)show;
 - (NSWindow*)window;

DataManager.m

@@ -30,6 +30,7 @@
 #import "DataManager.h"
 #import "RController.h"
 #import "REngine/REngine.h"
+#import "RegexKitLite.h"
 
 #import <WebKit/WebKit.h>
 #import <WebKit/WebFrame.h>
@@ -254,6 +255,21 @@ - (IBAction)printDocument:(id)sender
 						    contextInfo:@""];
 }
 
+- (IBAction)executeSelection:(id)sender
+{
+	DOMRange *dr = [dataInfoView selectedDOMRange];
+	if (dr) { /* we don't do line-exec since we don't get the text outside the selection */
+		NSString *stx = [dr markupString];
+		// Ok, some simple processing here - it may not work in all cases
+		stx = [stx stringByReplacingOccurrencesOfRegex:@"(?i)<br[^>]*?>" withString:@"\n"];
+		stx = [stx stringByReplacingOccurrencesOfRegex:@"<[^>]*?>" withString:@""];
+		stx = [stx stringByReplacingOccurrencesOfString:@"&lt;" withString:@"<"];
+		stx = [stx stringByReplacingOccurrencesOfString:@"&gt;" withString:@">"];
+		stx = [stx stringByReplacingOccurrencesOfString:@"&amp;" withString:@"&"];
+		[[RController sharedController] sendInput:stx];
+	}
+}
+
 #pragma mark -
 #pragma mark tableView delegates
 
@@ -367,4 +383,13 @@ - (void)sheetDidEnd:(id)sheet returnCode:(int)returnCode contextInfo:(NSString *
 
 }
 
+- (BOOL)validateMenuItem:(NSMenuItem *)menuItem
+{
+	if ([menuItem action] == @selector(executeSelection:)) {
+		return ([dataInfoView selectedDOMRange] == nil) ? NO : YES;
+	}
+
+	return YES;
+}
+
 @end