aboutsummaryrefslogtreecommitdiffstats
path: root/Source/SPAppController.m
diff options
context:
space:
mode:
authorBibiko <bibiko@eva.mpg.de>2010-11-18 23:57:50 +0000
committerBibiko <bibiko@eva.mpg.de>2010-11-18 23:57:50 +0000
commit3f11234f767748cefc04ec42de6008954359b19d (patch)
tree73fb6ae32940285ac024f30f5aa2d8a10776c089 /Source/SPAppController.m
parent7449035e027814b807764d59ecd2428dbb43319d (diff)
downloadsequelpro-3f11234f767748cefc04ec42de6008954359b19d.tar.gz
sequelpro-3f11234f767748cefc04ec42de6008954359b19d.tar.bz2
sequelpro-3f11234f767748cefc04ec42de6008954359b19d.zip
• further work on Bundle Editor
• generalised [NSString runBashCommand...]
Diffstat (limited to 'Source/SPAppController.m')
-rw-r--r--Source/SPAppController.m4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/SPAppController.m b/Source/SPAppController.m
index 430587a0..2003a9e6 100644
--- a/Source/SPAppController.m
+++ b/Source/SPAppController.m
@@ -893,7 +893,7 @@
NSBeep();
if (cmdData) [cmdData release];
} else {
- if([cmdData objectForKey:SPBundleFileNameKey] && [[cmdData objectForKey:SPBundleFileNameKey] length] && [cmdData objectForKey:SPBundleFileScopeKey])
+ if((![cmdData objectForKey:SPBundleFileDisabledKey] || ![[cmdData objectForKey:SPBundleFileDisabledKey] intValue]) && [cmdData objectForKey:SPBundleFileNameKey] && [[cmdData objectForKey:SPBundleFileNameKey] length] && [cmdData objectForKey:SPBundleFileScopeKey])
{
NSArray *scopes = [[cmdData objectForKey:SPBundleFileScopeKey] componentsSeparatedByString:@" "];
@@ -924,7 +924,7 @@
mask = mask | NSCommandKeyMask;
if([theMods rangeOfString:@"~"].length)
mask = mask | NSAlternateKeyMask;
- if(![[theChar lowercaseString] isEqualToString:theChar])
+ if([theMods rangeOfString:@"$"].length)
mask = mask | NSShiftKeyMask;
for(NSString* scope in scopes)
[[bundleKeyEquivalents objectForKey:scope] setObject:[NSArray arrayWithObjects:[theChar lowercaseString],