aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBibiko <bibiko@eva.mpg.de>2011-01-26 11:27:50 +0000
committerBibiko <bibiko@eva.mpg.de>2011-01-26 11:27:50 +0000
commit7cc062247ff23496dd0390cf07b5d45d6bc49777 (patch)
tree8c9563f96e0015ce5fdc4c73190cbaf736fd1e93
parent03573a327829b79ce13de972b32a4a7fef12e04b (diff)
downloadsequelpro-7cc062247ff23496dd0390cf07b5d45d6bc49777.tar.gz
sequelpro-7cc062247ff23496dd0390cf07b5d45d6bc49777.tar.bz2
sequelpro-7cc062247ff23496dd0390cf07b5d45d6bc49777.zip
• bound short-cut ⌥⎋ to display the context menu of the first responder if responder is embedded in a SPWindow
-rw-r--r--Interfaces/English.lproj/BundleEditor.xib16
-rw-r--r--Interfaces/English.lproj/FieldEditorSheet.xib22
-rw-r--r--Source/SPWindow.m31
3 files changed, 50 insertions, 19 deletions
diff --git a/Interfaces/English.lproj/BundleEditor.xib b/Interfaces/English.lproj/BundleEditor.xib
index d1ad8f4d..bfd90c39 100644
--- a/Interfaces/English.lproj/BundleEditor.xib
+++ b/Interfaces/English.lproj/BundleEditor.xib
@@ -27,9 +27,9 @@
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
+ <string>com.brandonwalkin.BWToolkit</string>
<string>net.wafflesoftware.ShortcutRecorder.IB.Leopard</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.brandonwalkin.BWToolkit</string>
</object>
<object class="NSMutableDictionary" key="IBDocument.Metadata">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -57,9 +57,9 @@
<string key="NSWindowRect">{{235, 76}, {691, 444}}</string>
<int key="NSWTFlags">611844096</int>
<string key="NSWindowTitle">Bundle Editor</string>
- <string key="NSWindowClass">NSWindow</string>
+ <string key="NSWindowClass">SPWindow</string>
<nil key="NSViewClass"/>
- <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
+ <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
<string key="NSWindowContentMinSize">{691, 444}</string>
<object class="NSView" key="NSWindowView" id="391663674">
<reference key="NSNextResponder"/>
@@ -321,7 +321,7 @@
<string key="NSColorName">controlBackgroundColor</string>
<object class="NSColor" key="NSColor" id="752361275">
<int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
+ <bytes key="NSWhite">MC42NjY2NjY2ODY1AA</bytes>
</object>
</object>
<object class="NSColor" key="NSTextColor" id="576381864">
@@ -1380,7 +1380,7 @@
<string key="NSAutosaveName">SPBundleEditorSplitView</string>
<object class="NSColor" key="BWSVColor">
<int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MC42NjY2NjY2NjY3IDAuNjY2NjY2NjY2NyAwLjY2NjY2NjY2NjcAA</bytes>
+ <bytes key="NSRGB">MC42NjY2NjY2ODY1IDAuNjY2NjY2Njg2NSAwLjY2NjY2NjY4NjUAA</bytes>
</object>
<bool key="BWSVColorIsEnabled">YES</bool>
<object class="NSMutableDictionary" key="BWSVMinValues">
@@ -1444,7 +1444,7 @@
</object>
<string key="NSScreenRect">{{0, 0}, {1920, 1058}}</string>
<string key="NSMinSize">{691, 466}</string>
- <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
+ <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
<string key="NSFrameAutosaveName">SPBundleEditor</string>
</object>
<object class="NSMenu" id="655873624">
@@ -1509,7 +1509,7 @@
<string key="NSWindowTitle">Window</string>
<string key="NSWindowClass">NSPanel</string>
<nil key="NSViewClass"/>
- <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
+ <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
<string key="NSWindowContentMinSize">{341, 198}</string>
<object class="NSView" key="NSWindowView" id="856429814">
<nil key="NSNextResponder"/>
@@ -1700,7 +1700,7 @@
</object>
<string key="NSScreenRect">{{0, 0}, {1280, 778}}</string>
<string key="NSMinSize">{341, 214}</string>
- <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
+ <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
</object>
<object class="NSTreeController" id="645644012">
<object class="NSMutableArray" key="NSDeclaredKeys">
diff --git a/Interfaces/English.lproj/FieldEditorSheet.xib b/Interfaces/English.lproj/FieldEditorSheet.xib
index fcee245d..4b2845a9 100644
--- a/Interfaces/English.lproj/FieldEditorSheet.xib
+++ b/Interfaces/English.lproj/FieldEditorSheet.xib
@@ -2,18 +2,18 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1050</int>
- <string key="IBDocument.SystemVersion">10H574</string>
- <string key="IBDocument.InterfaceBuilderVersion">804</string>
+ <string key="IBDocument.SystemVersion">10J567</string>
+ <string key="IBDocument.InterfaceBuilderVersion">788</string>
<string key="IBDocument.AppKitVersion">1038.35</string>
- <string key="IBDocument.HIToolboxVersion">461.00</string>
+ <string key="IBDocument.HIToolboxVersion">462.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">804</string>
+ <string key="NS.object.0">788</string>
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="81"/>
<integer value="2"/>
+ <integer value="81"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -40,11 +40,11 @@
<string key="NSWindowRect">{{364, 183}, {667, 428}}</string>
<int key="NSWTFlags">544735232</int>
<string key="NSWindowTitle">Field Editor</string>
- <string key="NSWindowClass">NSWindow</string>
+ <string key="NSWindowClass">SPWindow</string>
<object class="NSMutableString" key="NSViewClass">
<characters key="NS.bytes">View</characters>
</object>
- <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
+ <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
<object class="NSView" key="NSWindowView" id="559857537">
<reference key="NSNextResponder"/>
<int key="NSvFlags">4370</int>
@@ -359,7 +359,7 @@
<string key="NSColorName">selectedTextBackgroundColor</string>
<object class="NSColor" key="NSColor" id="394290367">
<int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
+ <bytes key="NSWhite">MC42NjY2NjY2ODY1AA</bytes>
</object>
</object>
<object class="NSColor" id="935002176">
@@ -659,7 +659,7 @@
<reference key="NSSuperview"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1280, 778}}</string>
- <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
+ <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
<string key="NSFrameAutosaveName"/>
</object>
<object class="NSWindowTemplate" id="620871617">
@@ -6878,9 +6878,9 @@
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{329, 231}, {667, 428}}</string>
+ <string>{{242, 231}, {667, 428}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{329, 231}, {667, 428}}</string>
+ <string>{{242, 231}, {667, 428}}</string>
<integer value="1"/>
<integer value="0"/>
<boolean value="NO"/>
diff --git a/Source/SPWindow.m b/Source/SPWindow.m
index 69d3e4a5..58f38d0b 100644
--- a/Source/SPWindow.m
+++ b/Source/SPWindow.m
@@ -37,10 +37,41 @@
*/
- (void) sendEvent:(NSEvent *)theEvent
{
+
if ([theEvent type] == NSKeyDown && [[theEvent characters] length]) {
unichar theCharacter = [[theEvent charactersIgnoringModifiers] characterAtIndex:0];
+ // ⌃⎋ sends a right-click to order front the context menu under the first responder's visible Rect
+ if ([theEvent keyCode] == 53 && (([theEvent modifierFlags] & NSDeviceIndependentModifierFlagsMask) == (NSAlternateKeyMask))) {
+
+ id firstResponder = [[NSApp keyWindow] firstResponder];
+
+ if(firstResponder && [firstResponder respondsToSelector:@selector(menuForEvent:)]) {
+
+ NSRect theRect = [firstResponder visibleRect];
+ NSPoint loc = theRect.origin;
+ loc.y += theRect.size.height+5;
+ loc = [firstResponder convertPoint:loc toView:nil];
+ NSEvent *anEvent = [NSEvent
+ mouseEventWithType:NSRightMouseDown
+ location:loc
+ modifierFlags:0
+ timestamp:1
+ windowNumber:[self windowNumber]
+ context:[NSGraphicsContext currentContext]
+ eventNumber:0
+ clickCount:1
+ pressure:0.0];
+
+ [NSMenu popUpContextMenu:[firstResponder menuForEvent:theEvent] withEvent:anEvent forView:firstResponder];
+
+ return;
+
+ }
+
+ }
+
switch (theCharacter) {
// Alternate keys for switching tabs - ⇧⌘[ and ⇧⌘]. These seem to be standards on some apps,