aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBibiko <bibiko@eva.mpg.de>2010-12-03 10:37:17 +0000
committerBibiko <bibiko@eva.mpg.de>2010-12-03 10:37:17 +0000
commit81007b19f8df9efd7a3fd3999d29ddb2af006125 (patch)
tree9e25794f82e86c7e7c21fcc33d53fe76c18bb79a
parentfbaacf6f4f093faaa20af083190d62877e9b3874 (diff)
downloadsequelpro-81007b19f8df9efd7a3fd3999d29ddb2af006125.tar.gz
sequelpro-81007b19f8df9efd7a3fd3999d29ddb2af006125.tar.bz2
sequelpro-81007b19f8df9efd7a3fd3999d29ddb2af006125.zip
• improved Bundle key equivalent handling and enabled to display all short-cuts in menuItem even there're same short-cuts are assigned
-rw-r--r--Interfaces/English.lproj/DBView.xib8
-rw-r--r--Source/SPAppController.h5
-rw-r--r--Source/SPAppController.m109
-rw-r--r--Source/SPBundleEditorController.m10
4 files changed, 124 insertions, 8 deletions
diff --git a/Interfaces/English.lproj/DBView.xib b/Interfaces/English.lproj/DBView.xib
index 2f2c4d25..73902c1b 100644
--- a/Interfaces/English.lproj/DBView.xib
+++ b/Interfaces/English.lproj/DBView.xib
@@ -23,7 +23,7 @@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="6034"/>
+ <integer value="7691"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -493,7 +493,7 @@
<object class="NSTableView" id="794785393">
<reference key="NSNextResponder" ref="242523705"/>
<int key="NSvFlags">4352</int>
- <string key="NSFrameSize">{214, 145}</string>
+ <string key="NSFrameSize">{216, 145}</string>
<reference key="NSSuperview" ref="242523705"/>
<bool key="NSEnabled">YES</bool>
<object class="_NSCornerView" key="NSCornerView">
@@ -559,7 +559,7 @@
<int key="NSTableViewDraggingDestinationStyle">1</int>
</object>
</object>
- <string key="NSFrameSize">{214, 145}</string>
+ <string key="NSFrameSize">{216, 145}</string>
<reference key="NSSuperview" ref="561874764"/>
<reference key="NSNextKeyView" ref="794785393"/>
<reference key="NSDocView" ref="794785393"/>
@@ -586,7 +586,7 @@
<double key="NSPercent">0.76156586408615112</double>
</object>
</object>
- <string key="NSFrameSize">{214, 145}</string>
+ <string key="NSFrame">{{-1, 0}, {216, 145}}</string>
<reference key="NSSuperview" ref="192579410"/>
<reference key="NSNextKeyView" ref="242523705"/>
<int key="NSsFlags">528</int>
diff --git a/Source/SPAppController.h b/Source/SPAppController.h
index e1f1e60c..8626148d 100644
--- a/Source/SPAppController.h
+++ b/Source/SPAppController.h
@@ -34,6 +34,7 @@
IBOutlet NSWindow* bundleEditorWindow;
BOOL isNewFavorite;
+ BOOL stopKeyDownListener;
SPAboutController *aboutController;
SPPreferenceController *prefsController;
@@ -56,6 +57,8 @@
}
+- (IBAction)bundleCommandDispatcher:(id)sender;
+
// Window management
- (IBAction)newWindow:(id)sender;
- (IBAction)newTab:(id)sender;
@@ -110,4 +113,6 @@
- (void)addHTMLOutputController:(id)controller;
+- (void)keyDownListener;
+
@end
diff --git a/Source/SPAppController.m b/Source/SPAppController.m
index 45e9892a..2ff780ae 100644
--- a/Source/SPAppController.m
+++ b/Source/SPAppController.m
@@ -61,6 +61,8 @@
installedBundleUUIDs = [[NSMutableDictionary alloc] initWithCapacity:1];
runningActivitiesArray = [[NSMutableArray alloc] init];
+ stopKeyDownListener = YES;
+
[NSApp setDelegate:self];
}
@@ -117,6 +119,7 @@
[[FRFeedbackReporter sharedReporter] reportIfCrash];
[self reloadBundles:self];
+
}
/**
@@ -1188,6 +1191,8 @@
}
}
+ stopKeyDownListener = YES;
+
BOOL foundInstalledBundles = NO;
[bundleItems removeAllObjects];
@@ -1318,11 +1323,12 @@
// Add installed Bundles
// For each scope add a submenu but not for the last one (should be General always)
[menu addItem:[NSMenuItem separatorItem]];
-
+ [menu setAutoenablesItems:YES];
NSArray *scopes = [NSArray arrayWithObjects:SPBundleScopeInputField, SPBundleScopeDataTable, SPBundleScopeGeneral, nil];
NSArray *scopeTitles = [NSArray arrayWithObjects:NSLocalizedString(@"Input Fields", @"input fields menu item label"),
NSLocalizedString(@"Data Table", @"data table menu item label"),
NSLocalizedString(@"General", @"general menu item label"),nil];
+
NSArray *scopeSelector = [NSArray arrayWithObjects:@"executeBundleItemForInputField:",
@"executeBundleItemForDataTable:",
@"executeBundleItemForApp:", nil];
@@ -1345,7 +1351,7 @@
// Add last scope (General) not as submenu
if(k < [scopes count]-1) {
bundleMenu = [[[NSMenu alloc] init] autorelease];
-
+ [bundleMenu setAutoenablesItems:YES];
bundleSubMenuItem = [[NSMenuItem alloc] initWithTitle:[scopeTitles objectAtIndex:k] action:nil keyEquivalent:@""];
[bundleSubMenuItem setTag:10000000];
@@ -1379,7 +1385,7 @@
else
keyEq = @"";
- NSMenuItem *mItem = [[[NSMenuItem alloc] initWithTitle:[item objectForKey:SPBundleInternLabelKey] action:NSSelectorFromString([scopeSelector objectAtIndex:k]) keyEquivalent:keyEq] autorelease];
+ NSMenuItem *mItem = [[[NSMenuItem alloc] initWithTitle:[item objectForKey:SPBundleInternLabelKey] action:@selector(bundleCommandDispatcher:) keyEquivalent:keyEq] autorelease];
bundleOtherThanGeneralFound = YES;
if([keyEq length])
[mItem setKeyEquivalentModifierMask:[[[item objectForKey:SPBundleFileKeyEquivalentKey] objectAtIndex:1] intValue]];
@@ -1388,6 +1394,7 @@
[mItem setToolTip:[item objectForKey:SPBundleFileTooltipKey]];
[mItem setTag:1000000 + i++];
+ [mItem setRepresentedObject:scope];
if([item objectForKey:SPBundleFileCategoryKey]) {
[[categoryMenus objectAtIndex:[bundleCategories indexOfObject:[item objectForKey:SPBundleFileCategoryKey]]] addItem:mItem];
@@ -1396,10 +1403,104 @@
}
}
- if(bundleSubMenuItem)[bundleSubMenuItem release];
+ if(bundleSubMenuItem) [bundleSubMenuItem release];
k++;
}
+ // Start General keyDown Listener if there're assigned Bundle commands
+ // due to possible same key equivalent settings for differnet scopes
+ if([bundleKeyEquivalents objectForKey:SPBundleScopeGeneral] || [bundleKeyEquivalents objectForKey:SPBundleScopeDataTable]) {
+ stopKeyDownListener = NO;
+ [self performSelector:@selector(keyDownListener) withObject:nil afterDelay:0.1];
+ }
+
+
+}
+
+/**
+ * Action for any Bundle menu menuItem
+ */
+- (IBAction)bundleCommandDispatcher:(id)sender
+{
+ NSString *scope = [sender representedObject];
+ id firstResponder = [[NSApp mainWindow] firstResponder];
+ if([scope isEqualToString:SPBundleScopeInputField] && [firstResponder respondsToSelector:@selector(executeBundleItemForInputField:)]) {
+ [firstResponder executeBundleItemForInputField:sender];
+ }
+ else if([scope isEqualToString:SPBundleScopeDataTable] && [firstResponder respondsToSelector:@selector(executeBundleItemForDataTable:)]) {
+ [firstResponder executeBundleItemForDataTable:sender];
+ }
+ else if([scope isEqualToString:SPBundleScopeGeneral]) {
+ [self executeBundleItemForApp:sender];
+ } else {
+ NSBeep();
+ }
+}
+
+/**
+ * Listener for Bundle key equivalent due to same assigned equivalents
+ */
+- (void)keyDownListener
+{
+ NSDictionary *keyEqsGeneral = [bundleKeyEquivalents objectForKey:SPBundleScopeGeneral];
+ NSDictionary *keyEqsDataTable = [bundleKeyEquivalents objectForKey:SPBundleScopeDataTable];
+
+ while(!stopKeyDownListener) {
+ NSEvent* event = [NSApp nextEventMatchingMask:NSAnyEventMask
+ untilDate:[NSDate distantFuture]
+ inMode:NSDefaultRunLoopMode
+ dequeue:YES];
+ if(!event) continue;
+ if ([event type] == NSKeyDown
+ && ![[[[[NSApp mainWindow] firstResponder] class] description] isEqualToString:@"SRRecorderControl"]
+ && ![[[NSApp mainWindow] firstResponder] respondsToSelector:@selector(executeBundleItemForDataTable:)]
+ && ![[[NSApp mainWindow] firstResponder] respondsToSelector:@selector(executeBundleItemForInputField:)]
+ ) {
+ // Check Bundle key equivalents due to same equivalents for Data Table scope
+ NSString *charactersIgnMod = [event charactersIgnoringModifiers];
+ long curFlags = ([event modifierFlags] & (NSShiftKeyMask|NSControlKeyMask|NSAlternateKeyMask|NSCommandKeyMask));
+ BOOL found = NO;
+ for(NSString *eqs in [keyEqsGeneral allKeys]) {
+ NSArray *eq = [keyEqsGeneral objectForKey:eqs];
+ if([NSArrayObjectAtIndex(eq,0) isEqualToString:charactersIgnMod] && [NSArrayObjectAtIndex(eq,1) intValue] == curFlags) {
+ NSMenuItem *aMenuItem = [[[NSMenuItem alloc] init] autorelease];
+ [aMenuItem setTag:0];
+ [aMenuItem setToolTip:[eq objectAtIndex:2]];
+ [self executeBundleItemForApp:aMenuItem];
+ found = YES;
+ break;
+ }
+ }
+ if(!found)
+ [NSApp sendEvent:event];
+ }
+ else if ([event type] == NSKeyDown
+ && ![[[[[NSApp mainWindow] firstResponder] class] description] isEqualToString:@"SRRecorderControl"]
+ && [[[NSApp mainWindow] firstResponder] respondsToSelector:@selector(executeBundleItemForDataTable:)]
+ ) {
+ // Check Bundle key equivalents due to same equivalents for Data Table scope
+ NSString *charactersIgnMod = [event charactersIgnoringModifiers];
+ long curFlags = ([event modifierFlags] & (NSShiftKeyMask|NSControlKeyMask|NSAlternateKeyMask|NSCommandKeyMask));
+ BOOL found = NO;
+ for(NSString *eqs in [keyEqsDataTable allKeys]) {
+ NSArray *eq = [keyEqsDataTable objectForKey:eqs];
+ if([NSArrayObjectAtIndex(eq,0) isEqualToString:charactersIgnMod] && [NSArrayObjectAtIndex(eq,1) intValue] == curFlags) {
+ NSMenuItem *aMenuItem = [[[NSMenuItem alloc] init] autorelease];
+ [aMenuItem setTag:0];
+ [aMenuItem setToolTip:[eq objectAtIndex:2]];
+ [[[NSApp mainWindow] firstResponder] executeBundleItemForDataTable:aMenuItem];
+ found = YES;
+ break;
+ }
+ }
+ if(!found)
+ [NSApp sendEvent:event];
+ }
+ else {
+ [NSApp sendEvent:event];
+ }
+ usleep(1000);
+ }
}
#pragma mark -
diff --git a/Source/SPBundleEditorController.m b/Source/SPBundleEditorController.m
index 56258ee3..2eb58edc 100644
--- a/Source/SPBundleEditorController.m
+++ b/Source/SPBundleEditorController.m
@@ -1006,6 +1006,16 @@
#pragma mark -
#pragma mark SRRecorderControl delegate
+- (BOOL) shortcutValidator:(SRValidator *)validator isKeyCode:(NSInteger)keyCode andFlagsTaken:(NSUInteger)flags reason:(NSString **)aReason;
+{
+ return YES;
+}
+
+- (BOOL)shortcutRecorderCell:(SRRecorderCell *)aRecorderCell isKeyCode:(NSInteger)keyCode andFlagsTaken:(NSUInteger)flags reason:(NSString **)aReason
+{
+ return YES;
+}
+
- (void)shortcutRecorder:(SRRecorderControl *)aRecorder keyComboDidChange:(KeyCombo)newKeyCombo
{