diff options
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/SPAppController.m | 53 | ||||
| -rw-r--r-- | Source/SPChooseMenuItemDialog.h | 34 | ||||
| -rw-r--r-- | Source/SPChooseMenuItemDialog.m | 30 |
3 files changed, 110 insertions, 7 deletions
diff --git a/Source/SPAppController.m b/Source/SPAppController.m index 2ff780ae..89a6359c 100644 --- a/Source/SPAppController.m +++ b/Source/SPAppController.m @@ -36,6 +36,7 @@ #import "SPTooltip.h" #import "SPBundleHTMLOutputController.h" #import "SPAlertSheets.h" +#import "SPChooseMenuItemDialog.h" #import <PSMTabBar/PSMTabBarControl.h> #import <Sparkle/Sparkle.h> @@ -1275,9 +1276,12 @@ mask = mask | NSAlternateKeyMask; if([theMods rangeOfString:@"$"].length) mask = mask | NSShiftKeyMask; - for(NSString* scope in scopes) - [[bundleKeyEquivalents objectForKey:scope] setObject:[NSArray arrayWithObjects:[theChar lowercaseString], - [NSNumber numberWithInteger:mask], infoPath, nil] forKey:[cmdData objectForKey:SPBundleFileKeyEquivalentKey]]; + for(NSString* scope in scopes) { + if(![[bundleKeyEquivalents objectForKey:scope] objectForKey:[cmdData objectForKey:SPBundleFileKeyEquivalentKey]]) + [[bundleKeyEquivalents objectForKey:scope] setObject:[NSMutableArray array] forKey:[cmdData objectForKey:SPBundleFileKeyEquivalentKey]]; + [[[bundleKeyEquivalents objectForKey:scope] objectForKey:[cmdData objectForKey:SPBundleFileKeyEquivalentKey]] addObject: + [NSArray arrayWithObjects:[theChar lowercaseString], [NSNumber numberWithInteger:mask], infoPath, [cmdData objectForKey:SPBundleFileNameKey], nil]]; + } [aDict setObject:[NSArray arrayWithObjects:theChar, [NSNumber numberWithInteger:mask], nil] forKey:SPBundleInternKeyEquivalentKey]; } @@ -1444,6 +1448,7 @@ { NSDictionary *keyEqsGeneral = [bundleKeyEquivalents objectForKey:SPBundleScopeGeneral]; NSDictionary *keyEqsDataTable = [bundleKeyEquivalents objectForKey:SPBundleScopeDataTable]; + NSDictionary *keyEqsInputFields = [bundleKeyEquivalents objectForKey:SPBundleScopeInputField]; while(!stopKeyDownListener) { NSEvent* event = [NSApp nextEventMatchingMask:NSAnyEventMask @@ -1461,8 +1466,12 @@ 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) { + NSInteger idx = 0; + if([[keyEqsInputFields objectForKey:eqs] count] > 1) { + // TODO + } + NSArray *eq = [[keyEqsDataTable objectForKey:eqs] objectAtIndex:idx]; + if(eq && [eq count] && [NSArrayObjectAtIndex(eq,0) isEqualToString:charactersIgnMod] && [NSArrayObjectAtIndex(eq,1) intValue] == curFlags) { NSMenuItem *aMenuItem = [[[NSMenuItem alloc] init] autorelease]; [aMenuItem setTag:0]; [aMenuItem setToolTip:[eq objectAtIndex:2]]; @@ -1483,8 +1492,12 @@ 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) { + NSInteger idx = 0; + if([[keyEqsInputFields objectForKey:eqs] count] > 1) { + // TODO + } + NSArray *eq = [[keyEqsDataTable objectForKey:eqs] objectAtIndex:idx]; + if(eq && [eq count] && [NSArrayObjectAtIndex(eq,0) isEqualToString:charactersIgnMod] && [NSArrayObjectAtIndex(eq,1) intValue] == curFlags) { NSMenuItem *aMenuItem = [[[NSMenuItem alloc] init] autorelease]; [aMenuItem setTag:0]; [aMenuItem setToolTip:[eq objectAtIndex:2]]; @@ -1496,6 +1509,32 @@ if(!found) [NSApp sendEvent:event]; } + else if ([event type] == NSKeyDown + && ![[[[[NSApp mainWindow] firstResponder] class] description] isEqualToString:@"SRRecorderControl"] + && [[[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 [keyEqsInputFields allKeys]) { + NSInteger idx = 0; + if([[keyEqsInputFields objectForKey:eqs] count] > 1) { + // TODO + } + NSArray *eq = [[keyEqsInputFields objectForKey:eqs] objectAtIndex:idx]; + if(eq && [eq count] && [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] executeBundleItemForInputField:aMenuItem]; + found = YES; + break; + } + } + if(!found) + [NSApp sendEvent:event]; + } else { [NSApp sendEvent:event]; } diff --git a/Source/SPChooseMenuItemDialog.h b/Source/SPChooseMenuItemDialog.h new file mode 100644 index 00000000..4b6f4a67 --- /dev/null +++ b/Source/SPChooseMenuItemDialog.h @@ -0,0 +1,34 @@ +// +// $Id: SPChooseMenuItemDialog.h 744 2009-05-22 20:00:00Z bibiko $ +// +// SPChooseMenuItemDialog.h +// sequel-pro +// +// Created by Hans-J. Bibiko on Dec 03, 2010. +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// More info at <http://code.google.com/p/sequel-pro/> + +#import <Cocoa/Cocoa.h> + + +@interface SPChooseMenuItemDialog : NSWindow + +{ + +} + +@end diff --git a/Source/SPChooseMenuItemDialog.m b/Source/SPChooseMenuItemDialog.m new file mode 100644 index 00000000..2dc73077 --- /dev/null +++ b/Source/SPChooseMenuItemDialog.m @@ -0,0 +1,30 @@ +// +// $Id: SPChooseMenuItemDialog.m 744 2009-05-22 20:00:00Z bibiko $ +// +// SPChooseMenuItemDialog.m +// sequel-pro +// +// Created by Hans-J. Bibiko on Dec 03, 2010. +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// More info at <http://code.google.com/p/sequel-pro/> + +#import "SPChooseMenuItemDialog.h" + + +@implementation SPChooseMenuItemDialog + +@end |