diff options
| author | Bibiko <bibiko@eva.mpg.de> | 2010-08-31 19:18:50 +0000 |
|---|---|---|
| committer | Bibiko <bibiko@eva.mpg.de> | 2010-08-31 19:18:50 +0000 |
| commit | 26865c7ea66092de62009cc8f1212863326f4a49 (patch) | |
| tree | d45f73c6bd07492574c2ab6be19fb2428f684363 /Source/SPAppController.m | |
| parent | 441ef7b38085eebcd5d05806f70b56ab9a2b0925 (diff) | |
| download | sequelpro-26865c7ea66092de62009cc8f1212863326f4a49.tar.gz sequelpro-26865c7ea66092de62009cc8f1212863326f4a49.tar.bz2 sequelpro-26865c7ea66092de62009cc8f1212863326f4a49.zip | |
• fixed AppleScript crash after calling 'open' without any parameter
- this should fix the issues 108, 1398, 226 , 1157, 1473
• added AppleScript support for command 'print'
- it prints the active view
• renamed SP classes in sequel-pro.scriptSuite
• AppleScript command 'make new document' opens a new window and connects to default automatically if set
Diffstat (limited to 'Source/SPAppController.m')
| -rw-r--r-- | Source/SPAppController.m | 37 |
1 files changed, 29 insertions, 8 deletions
diff --git a/Source/SPAppController.m b/Source/SPAppController.m index 88890c46..c6d89c02 100644 --- a/Source/SPAppController.m +++ b/Source/SPAppController.m @@ -199,6 +199,7 @@ */ - (void)application:(NSApplication *)app openFiles:(NSArray *)filenames { + for (NSString *filename in filenames) { // Opens a sql file and insert its content into the Custom Query editor @@ -889,7 +890,7 @@ // } // - (void)handleOpenEvent:(NSAppleEventDescriptor *)event withReplyEvent:(NSAppleEventDescriptor *)replyEvent // { -// NSLog(@"OPEN %@", [event description]); +// NSLog(@"OPEN "); // } // // - (void)applicationWillFinishLaunching:(NSNotification *)aNotification @@ -898,7 +899,7 @@ // [aeManager setEventHandler:self andSelector:@selector(handleQuitEvent:withReplyEvent:) forEventClass:kCoreEventClass andEventID:kAEQuitApplication]; // [aeManager setEventHandler:self andSelector:@selector(handleOpenEvent:withReplyEvent:) forEventClass:kCoreEventClass andEventID:kAEOpenApplication]; // } -// + /** * Is needed to interact with AppleScript for set/get internal SP variables @@ -933,12 +934,12 @@ - (void)insertInOrderedDocuments:(SPDatabaseDocument *)doc { [self newWindow:self]; -/* if ([[NSUserDefaults standardUserDefaults] boolForKey:SPAutoConnectToDefault]) - [doc setShouldAutomaticallyConnect:YES]; - - [[NSDocumentController sharedDocumentController] addDocument:doc]; - [doc makeWindowControllers]; - [doc showWindows];*/ + + // Set autoconnection if appropriate + if ([[NSUserDefaults standardUserDefaults] boolForKey:SPAutoConnectToDefault]) { + [[self frontDocument] connect]; + } + } /** @@ -959,6 +960,26 @@ return nil; } +/** + * AppleScript handler + * This handler is needed to catch an 'open' command if no argument was passed which would cause a crash + */ +- (id)handleOpenScriptCommand:(NSScriptCommand *)command +{ + return nil; +} + +/** + * AppleScript handler for print + * This handler prints the active view + */ +- (id)handlePrintScriptCommand:(NSScriptCommand *)command +{ + SPDatabaseDocument *frontDoc = [self frontDocument]; + if (frontDoc && ![frontDoc isWorking] && ![[frontDoc connectionID] isEqualToString:@"_"]) + [frontDoc startPrintDocumentOperation]; +} + #pragma mark - /** |