aboutsummaryrefslogtreecommitdiffstats
path: root/Source/SPAppController.m
diff options
context:
space:
mode:
authorBibiko <bibiko@eva.mpg.de>2010-11-23 14:20:26 +0000
committerBibiko <bibiko@eva.mpg.de>2010-11-23 14:20:26 +0000
commitcc5aa6c295b6072b5feedc1b912df264c34a9edb (patch)
treecd247e012e95c137dc5c6bf77cbad048e9daf0f3 /Source/SPAppController.m
parent9f5c7db05e8a999df38b200d93031b1475adf5dc (diff)
downloadsequelpro-cc5aa6c295b6072b5feedc1b912df264c34a9edb.tar.gz
sequelpro-cc5aa6c295b6072b5feedc1b912df264c34a9edb.tar.bz2
sequelpro-cc5aa6c295b6072b5feedc1b912df264c34a9edb.zip
• Bundle Editor
- fixed gui arragement - suppress error message if no ouptut key found in command.plist • added sequelpro://ID@/passToDoc/SelectTableRows/1/3/4/.. scheme command which selects given rows in current table if a SPCopyTable is the first responder; not valid given rows are ignored • added SP_SELECTED_ROW_INDICES as passed shell variable for Data Table scope
Diffstat (limited to 'Source/SPAppController.m')
-rw-r--r--Source/SPAppController.m20
1 files changed, 17 insertions, 3 deletions
diff --git a/Source/SPAppController.m b/Source/SPAppController.m
index 9a4e23e6..609593a8 100644
--- a/Source/SPAppController.m
+++ b/Source/SPAppController.m
@@ -573,17 +573,31 @@
}
}
+ BOOL userTerminated = NO;
+
while(1) {
NSEvent* event = [NSApp nextEventMatchingMask:NSAnyEventMask
untilDate:[NSDate distantPast]
inMode:NSDefaultRunLoopMode
dequeue:YES];
- // if(!event) continue;
+
+ if ([event type] == NSKeyDown) {
+ unichar key = [[event characters] length] == 1 ? [[event characters] characterAtIndex:0] : 0;
+ if (([event modifierFlags] & NSCommandKeyMask) && key == '.') {
+ userTerminated = YES;
+ break;
+ }
+ }
[NSApp sendEvent:event];
if(![processDocument isWorking]) break;
usleep(1000);
}
+ if(userTerminated) {
+ NSBeep();
+ return;
+ }
+
if(processDocument && command && [command isEqualToString:@"passToDoc"]) {
NSMutableDictionary *cmdDict = [NSMutableDictionary dictionary];
[cmdDict setObject:parameter forKey:@"parameter"];
@@ -693,8 +707,8 @@
[[NSFileManager defaultManager] removeItemAtPath:bundleInputFilePath error:nil];
- if(err == nil && output && [cmdData objectForKey:SPBundleFileOutputActionKey]) {
- if([[cmdData objectForKey:SPBundleFileOutputActionKey] length]
+ if(err == nil && output) {
+ if([cmdData objectForKey:SPBundleFileOutputActionKey] && [[cmdData objectForKey:SPBundleFileOutputActionKey] length]
&& ![[cmdData objectForKey:SPBundleFileOutputActionKey] isEqualToString:SPBundleOutputActionNone]) {
NSString *action = [[cmdData objectForKey:SPBundleFileOutputActionKey] lowercaseString];
NSPoint pos = [NSEvent mouseLocation];