aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Interfaces/English.lproj/Navigator.xib76
-rw-r--r--Source/SPNavigatorController.m1
-rw-r--r--Source/SPNavigatorOutlineView.h33
-rw-r--r--Source/SPNavigatorOutlineView.m44
-rw-r--r--sequel-pro.xcodeproj/project.pbxproj6
5 files changed, 150 insertions, 10 deletions
diff --git a/Interfaces/English.lproj/Navigator.xib b/Interfaces/English.lproj/Navigator.xib
index f22aa2e6..6fda2083 100644
--- a/Interfaces/English.lproj/Navigator.xib
+++ b/Interfaces/English.lproj/Navigator.xib
@@ -21,7 +21,7 @@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="89"/>
+ <integer value="70"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -292,7 +292,7 @@
</object>
</object>
<double key="NSRowHeight">14</double>
- <int key="NSTvFlags">1514143744</int>
+ <int key="NSTvFlags">1245708288</int>
<reference key="NSDelegate"/>
<reference key="NSDataSource"/>
<string key="NSAutosaveName">SPNavigatorSchema1</string>
@@ -481,7 +481,7 @@
</object>
<reference key="NSGridColor" ref="1022465183"/>
<double key="NSRowHeight">14</double>
- <int key="NSTvFlags">1514143744</int>
+ <int key="NSTvFlags">1245708288</int>
<reference key="NSDelegate"/>
<reference key="NSDataSource"/>
<string key="NSAutosaveName">SPNavigatorSchema2</string>
@@ -1263,6 +1263,62 @@
</object>
<int key="connectionID">111</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">initialFirstResponder</string>
+ <reference key="source" ref="856804369"/>
+ <reference key="destination" ref="771350217"/>
+ </object>
+ <int key="connectionID">123</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">nextKeyView</string>
+ <reference key="source" ref="701533802"/>
+ <reference key="destination" ref="357076828"/>
+ </object>
+ <int key="connectionID">124</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">nextKeyView</string>
+ <reference key="source" ref="357076828"/>
+ <reference key="destination" ref="576014685"/>
+ </object>
+ <int key="connectionID">125</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">nextKeyView</string>
+ <reference key="source" ref="576014685"/>
+ <reference key="destination" ref="771350217"/>
+ </object>
+ <int key="connectionID">127</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">nextKeyView</string>
+ <reference key="source" ref="1023753551"/>
+ <reference key="destination" ref="390132860"/>
+ </object>
+ <int key="connectionID">128</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">nextKeyView</string>
+ <reference key="source" ref="667909124"/>
+ <reference key="destination" ref="434865577"/>
+ </object>
+ <int key="connectionID">129</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">nextKeyView</string>
+ <reference key="source" ref="840702619"/>
+ <reference key="destination" ref="701533802"/>
+ </object>
+ <int key="connectionID">130</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -1776,16 +1832,16 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>SPOutlineView</string>
+ <string>SPNavigatorOutlineView</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>ImageAndTextCell</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{91, 357}, {395, 359}}</string>
+ <string>{{104, 323}, {395, 359}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{91, 357}, {395, 359}}</string>
+ <string>{{104, 323}, {395, 359}}</string>
<boolean value="NO"/>
<boolean value="YES"/>
<string>{200, 200}</string>
@@ -1795,7 +1851,7 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>SPOutlineView</string>
+ <string>SPNavigatorOutlineView</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1853,7 +1909,7 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">111</int>
+ <int key="maxID">130</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.1+">
@@ -1917,11 +1973,11 @@
</object>
</object>
<object class="IBPartialClassDescription">
- <string key="className">SPOutlineView</string>
+ <string key="className">SPNavigatorOutlineView</string>
<string key="superclassName">NSOutlineView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBDocumentRelativeSource</string>
- <string key="minorKey">../../Source/SPOutlineView.h</string>
+ <string key="minorKey">../../Source/SPNavigatorOutlineView.h</string>
</object>
</object>
</object>
diff --git a/Source/SPNavigatorController.m b/Source/SPNavigatorController.m
index a9ce93c8..f0d8961a 100644
--- a/Source/SPNavigatorController.m
+++ b/Source/SPNavigatorController.m
@@ -682,6 +682,7 @@ static SPNavigatorController *sharedNavigatorController = nil;
atLocation:pos
ofType:@"text"];
}
+ return YES;
}
}
diff --git a/Source/SPNavigatorOutlineView.h b/Source/SPNavigatorOutlineView.h
new file mode 100644
index 00000000..70c5d28f
--- /dev/null
+++ b/Source/SPNavigatorOutlineView.h
@@ -0,0 +1,33 @@
+//
+// $Id$
+//
+// SPNavigatorOutlineView.h
+// sequel-pro
+//
+// Created by H.-J. Bibiko on 3/23/10.
+// Copyright 2010. All rights reserved.
+//
+// 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 SPNavigatorOutlineView : NSOutlineView {
+
+}
+
+@end
diff --git a/Source/SPNavigatorOutlineView.m b/Source/SPNavigatorOutlineView.m
new file mode 100644
index 00000000..26a37198
--- /dev/null
+++ b/Source/SPNavigatorOutlineView.m
@@ -0,0 +1,44 @@
+//
+// $Id$
+//
+// SPNavigatorOutlineView.m
+// sequel-pro
+//
+// Created by H.-J. Bibiko on 3/23/10.
+// Copyright 2010. All rights reserved.
+//
+// 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 "SPNavigatorOutlineView.h"
+
+
+@implementation SPNavigatorOutlineView
+
+- (BOOL)acceptsFirstResponder
+{
+ return YES;
+}
+
+- (void)keyDown:(NSEvent *)theEvent
+{
+ if ([self numberOfSelectedRows] == 1 && ([theEvent keyCode] == 36 || [theEvent keyCode] == 76)) {
+ ;
+ }
+ [super keyDown:theEvent];
+}
+
+@end
diff --git a/sequel-pro.xcodeproj/project.pbxproj b/sequel-pro.xcodeproj/project.pbxproj
index 1d068c78..5e73f1b2 100644
--- a/sequel-pro.xcodeproj/project.pbxproj
+++ b/sequel-pro.xcodeproj/project.pbxproj
@@ -237,6 +237,7 @@
BC2C16D40FEBEDF10003993B /* SPDataAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = BC2C16D30FEBEDF10003993B /* SPDataAdditions.m */; };
BC2C8E220FA8C2DB008468C7 /* sequel-pro-mysql-help-template.html in Resources */ = {isa = PBXBuildFile; fileRef = BC2C8E210FA8C2DB008468C7 /* sequel-pro-mysql-help-template.html */; };
BC30C011111C98BD002701C9 /* DataMigrationDialog.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC30C00F111C98BD002701C9 /* DataMigrationDialog.xib */; };
+ BC4DF1981158FB280059FABD /* SPNavigatorOutlineView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC4DF1971158FB280059FABD /* SPNavigatorOutlineView.m */; };
BC5AD7FF10FB262F008769E3 /* field-small-square.tiff in Resources */ = {isa = PBXBuildFile; fileRef = BC5AD7FE10FB262F008769E3 /* field-small-square.tiff */; };
BC65C3B2107CE3EE003F7B02 /* ImportAccessory.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC65C3B0107CE3EE003F7B02 /* ImportAccessory.xib */; };
BC675A141072039C00C5ACD4 /* SPContentFilterManager.m in Sources */ = {isa = PBXBuildFile; fileRef = BC675A131072039C00C5ACD4 /* SPContentFilterManager.m */; };
@@ -653,6 +654,8 @@
BC2C16D30FEBEDF10003993B /* SPDataAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPDataAdditions.m; sourceTree = "<group>"; };
BC2C8E210FA8C2DB008468C7 /* sequel-pro-mysql-help-template.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "sequel-pro-mysql-help-template.html"; sourceTree = "<group>"; };
BC30C010111C98BD002701C9 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/DataMigrationDialog.xib; sourceTree = "<group>"; };
+ BC4DF1961158FB280059FABD /* SPNavigatorOutlineView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPNavigatorOutlineView.h; sourceTree = "<group>"; };
+ BC4DF1971158FB280059FABD /* SPNavigatorOutlineView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPNavigatorOutlineView.m; sourceTree = "<group>"; };
BC5AD7FE10FB262F008769E3 /* field-small-square.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = "field-small-square.tiff"; sourceTree = "<group>"; };
BC65C3B1107CE3EE003F7B02 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/ImportAccessory.xib; sourceTree = "<group>"; };
BC675A121072039C00C5ACD4 /* SPContentFilterManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPContentFilterManager.h; sourceTree = "<group>"; };
@@ -1148,6 +1151,8 @@
29A1B7E40FD1293A000B88E8 /* SPPrintAccessory.m */,
BC8C8530100E0A8000D7A129 /* SPTableView.h */,
BC8C8531100E0A8000D7A129 /* SPTableView.m */,
+ BC4DF1961158FB280059FABD /* SPNavigatorOutlineView.h */,
+ BC4DF1971158FB280059FABD /* SPNavigatorOutlineView.m */,
);
name = Views;
sourceTree = "<group>";
@@ -1855,6 +1860,7 @@
17E090E811498FC9007FC1B4 /* SPPrintController.m in Sources */,
BC2777A011514B940034DF6A /* SPNavigatorController.m in Sources */,
589582151154F8F400EDCC28 /* SPMainThreadTrampoline.m in Sources */,
+ BC4DF1981158FB280059FABD /* SPNavigatorOutlineView.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-20 05:01:14 +0000