diff options
| author | Max Lohrmann <dmoagx@users.noreply.github.com> | 2016-05-08 01:34:22 +0200 |
|---|---|---|
| committer | Max Lohrmann <dmoagx@users.noreply.github.com> | 2016-05-08 01:34:22 +0200 |
| commit | 4af9763a06e9bcadccb02a85dba49b29176c2361 (patch) | |
| tree | bfacc03297db1f3bb894b6f9b1d50aa8ce5752cb /Source/SPTextView.m | |
| parent | 5e4d094a71c31adfb9278894f39df1dc0ef3d280 (diff) | |
| download | sequelpro-4af9763a06e9bcadccb02a85dba49b29176c2361.tar.gz sequelpro-4af9763a06e9bcadccb02a85dba49b29176c2361.tar.bz2 sequelpro-4af9763a06e9bcadccb02a85dba49b29176c2361.zip | |
Make reassigning "Select active query" (^Y) possible (#1215)
* Added a menu item: Edit > Select > Active Query
* Remove the key binding from the context menu item (which is in line with OS X' context menus not having key bindings in general)
Diffstat (limited to 'Source/SPTextView.m')
| -rw-r--r-- | Source/SPTextView.m | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/Source/SPTextView.m b/Source/SPTextView.m index ce5f8454..36bd005e 100644 --- a/Source/SPTextView.m +++ b/Source/SPTextView.m @@ -1131,7 +1131,7 @@ static inline NSPoint SPPointOnLine(NSPoint a, NSPoint b, CGFloat t) { return NS } } -- (void) selectCurrentQuery +- (IBAction) selectCurrentQuery:(id)sender { if([self isEditable]) [customQueryInstance selectCurrentQuery]; @@ -2244,12 +2244,6 @@ static inline NSPoint SPPointOnLine(NSPoint a, NSPoint b, CGFloat t) { return NS #endif } - if([charactersIgnMod isEqualToString:@"y"]) // ^Y select current query - if(curFlags==(NSControlKeyMask)) - { - [self selectCurrentQuery]; - return; - } if(curFlags & NSCommandKeyMask) { if([charactersIgnMod isEqualToString:@"+"] || [charactersIgnMod isEqualToString:@"="]) // increase text size by 1; ⌘+, ⌘=, and ⌘ numpad + { @@ -3112,9 +3106,8 @@ static inline NSPoint SPPointOnLine(NSPoint a, NSPoint b, CGFloat t) { return NS } if ([[[self class] defaultMenu] itemWithTag:SP_CQ_SELECT_CURRENT_QUERY_MENU_ITEM_TAG] == nil) { - NSMenuItem *selectCurrentQueryMenuItem = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"Select Active Query", @"Select Active Query") action:@selector(selectCurrentQuery) keyEquivalent:@"y"]; + NSMenuItem *selectCurrentQueryMenuItem = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"Select Active Query", @"Select Active Query") action:@selector(selectCurrentQuery:) keyEquivalent:@""]; [selectCurrentQueryMenuItem setTag:SP_CQ_SELECT_CURRENT_QUERY_MENU_ITEM_TAG]; - [selectCurrentQueryMenuItem setKeyEquivalentModifierMask:NSControlKeyMask]; [menu insertItem:selectCurrentQueryMenuItem atIndex:4]; [selectCurrentQueryMenuItem release]; } @@ -3222,7 +3215,7 @@ static inline NSPoint SPPointOnLine(NSPoint a, NSPoint b, CGFloat t) { return NS return ([self selectedRange].length>0); } // Validate Select Active Query - if ([menuItem action] == @selector(selectCurrentQuery)) { + if ([menuItem action] == @selector(selectCurrentQuery:)) { return ([self isEditable] && [[self delegate] isKindOfClass:[SPCustomQuery class]]); } // Disable "Copy with Column Names" and "Copy as SQL INSERT" |