aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Interfaces/English.lproj/FieldEditorSheet.xib58
-rw-r--r--Source/SPImageView.h (renamed from Source/CMImageView.h)6
-rw-r--r--Source/SPImageView.m (renamed from Source/CMImageView.m)6
-rw-r--r--Source/SPTextView.h2
-rw-r--r--Source/TableContent.m2
-rw-r--r--sequel-pro.xcodeproj/project.pbxproj12
6 files changed, 42 insertions, 44 deletions
diff --git a/Interfaces/English.lproj/FieldEditorSheet.xib b/Interfaces/English.lproj/FieldEditorSheet.xib
index 56099439..218dcdd3 100644
--- a/Interfaces/English.lproj/FieldEditorSheet.xib
+++ b/Interfaces/English.lproj/FieldEditorSheet.xib
@@ -2,17 +2,16 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1050</int>
- <string key="IBDocument.SystemVersion">10B504</string>
- <string key="IBDocument.InterfaceBuilderVersion">732</string>
- <string key="IBDocument.AppKitVersion">1038.2</string>
- <string key="IBDocument.HIToolboxVersion">437.00</string>
+ <string key="IBDocument.SystemVersion">10D573</string>
+ <string key="IBDocument.InterfaceBuilderVersion">762</string>
+ <string key="IBDocument.AppKitVersion">1038.29</string>
+ <string key="IBDocument.HIToolboxVersion">460.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">732</string>
+ <string key="NS.object.0">762</string>
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="2"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -50,7 +49,7 @@
</object>
<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
<object class="NSView" key="NSWindowView" id="559857537">
- <reference key="NSNextResponder"/>
+ <nil key="NSNextResponder"/>
<int key="NSvFlags">4370</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -660,7 +659,6 @@
</object>
</object>
<string key="NSFrameSize">{667, 428}</string>
- <reference key="NSSuperview"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1280, 778}}</string>
<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
@@ -1261,7 +1259,7 @@
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
- <string>CMImageView</string>
+ <string>SPImageView</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1305,26 +1303,6 @@
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBPartialClassDescription">
- <string key="className">CMImageView</string>
- <string key="superclassName">NSImageView</string>
- <object class="NSMutableDictionary" key="outlets">
- <string key="NS.key.0">delegate</string>
- <string key="NS.object.0">id</string>
- </object>
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="595945576">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">Source/CMImageView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">CMImageView</string>
- <string key="superclassName">NSImageView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBUserSource</string>
- <string key="minorKey"/>
- </object>
- </object>
- <object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
@@ -1340,7 +1318,10 @@
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
- <reference key="sourceIdentifier" ref="595945576"/>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Source/CMImageView.h</string>
+ </object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
@@ -1491,6 +1472,18 @@
<string key="minorKey">Source/SPFieldEditorController.h</string>
</object>
</object>
+ <object class="IBPartialClassDescription">
+ <string key="className">SPImageView</string>
+ <string key="superclassName">NSImageView</string>
+ <object class="NSMutableDictionary" key="outlets">
+ <string key="NS.key.0">delegate</string>
+ <string key="NS.object.0">id</string>
+ </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBUserSource</string>
+ <string key="minorKey"/>
+ </object>
+ </object>
</object>
<object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.1+">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1565,6 +1558,7 @@
</object>
</object>
<int key="IBDocument.localizationMode">0</int>
+ <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
<integer value="1050" key="NS.object.0"/>
@@ -1576,5 +1570,9 @@
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<string key="IBDocument.LastKnownRelativeProjectPath">../../sequel-pro.xcodeproj</string>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
+ <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+ <string key="NS.key.0">NSQuickLookTemplate</string>
+ <string key="NS.object.0">{19, 11}</string>
+ </object>
</data>
</archive>
diff --git a/Source/CMImageView.h b/Source/SPImageView.h
index 84ffe041..3576cf37 100644
--- a/Source/CMImageView.h
+++ b/Source/SPImageView.h
@@ -1,7 +1,7 @@
//
// $Id$
//
-// CMImageView.h
+// SPImageView.h
// sequel-pro
//
// Created by lorenz textor (lorenz@textor.ch) on Sat Sep 06 2003.
@@ -25,14 +25,14 @@
#import <Cocoa/Cocoa.h>
-@interface NSObject (CMImageViewDelegate)
+@interface NSObject (SPImageViewDelegate)
- (void)processUpdatedImageData:(NSData *)data;
- (void)processPasteImageData;
@end
-@interface CMImageView : NSImageView
+@interface SPImageView : NSImageView
{
IBOutlet id delegate;
}
diff --git a/Source/CMImageView.m b/Source/SPImageView.m
index 32d60d13..08f39980 100644
--- a/Source/CMImageView.m
+++ b/Source/SPImageView.m
@@ -1,7 +1,7 @@
//
// $Id$
//
-// CMImageView.m
+// SPImageView.m
// sequel-pro
//
// Created by lorenz textor (lorenz@textor.ch) on Sat Sep 06 2003.
@@ -23,9 +23,9 @@
//
// More info at <http://code.google.com/p/sequel-pro/>
-#import "CMImageView.h"
+#import "SPImageView.h"
-@implementation CMImageView
+@implementation SPImageView
/*
* On a drag and drop, read in dragged files and convert dragged images before passing
diff --git a/Source/SPTextView.h b/Source/SPTextView.h
index 2964845a..f89bbc06 100644
--- a/Source/SPTextView.h
+++ b/Source/SPTextView.h
@@ -1,5 +1,5 @@
//
-// $Id: CMTextView.h 2240 2010-05-23 21:44:59Z rowanb $
+// $Id$
//
// SPTextView.h
// sequel-pro
diff --git a/Source/TableContent.m b/Source/TableContent.m
index 723d107a..dee9e430 100644
--- a/Source/TableContent.m
+++ b/Source/TableContent.m
@@ -30,7 +30,7 @@
#import "TableSource.h"
#import "SPTableInfo.h"
#import "TablesList.h"
-#import "CMImageView.h"
+#import "SPImageView.h"
#import "CMCopyTable.h"
#import "SPDataCellFormatter.h"
#import "SPTableData.h"
diff --git a/sequel-pro.xcodeproj/project.pbxproj b/sequel-pro.xcodeproj/project.pbxproj
index 43f14515..24a2a732 100644
--- a/sequel-pro.xcodeproj/project.pbxproj
+++ b/sequel-pro.xcodeproj/project.pbxproj
@@ -104,7 +104,7 @@
17E6416C0EF01F37001BC333 /* ImageAndTextCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E641690EF01F37001BC333 /* ImageAndTextCell.m */; };
17E641750EF01F80001BC333 /* SPKeychain.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E641740EF01F80001BC333 /* SPKeychain.m */; };
17E641820EF01FA8001BC333 /* CMCopyTable.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E6417D0EF01FA8001BC333 /* CMCopyTable.m */; };
- 17E641830EF01FA8001BC333 /* CMImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E6417F0EF01FA8001BC333 /* CMImageView.m */; };
+ 17E641830EF01FA8001BC333 /* SPImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E6417F0EF01FA8001BC333 /* SPImageView.m */; };
17E641840EF01FA8001BC333 /* SPTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E641810EF01FA8001BC333 /* SPTextView.m */; };
17E641C00EF02036001BC333 /* appicon.icns in Resources */ = {isa = PBXBuildFile; fileRef = 17E6418C0EF02036001BC333 /* appicon.icns */; };
17E641C10EF02036001BC333 /* clearconsole.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 17E6418D0EF02036001BC333 /* clearconsole.tiff */; };
@@ -537,8 +537,8 @@
17E641740EF01F80001BC333 /* SPKeychain.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPKeychain.m; sourceTree = "<group>"; };
17E6417C0EF01FA8001BC333 /* CMCopyTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CMCopyTable.h; sourceTree = "<group>"; };
17E6417D0EF01FA8001BC333 /* CMCopyTable.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CMCopyTable.m; sourceTree = "<group>"; };
- 17E6417E0EF01FA8001BC333 /* CMImageView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CMImageView.h; sourceTree = "<group>"; };
- 17E6417F0EF01FA8001BC333 /* CMImageView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CMImageView.m; sourceTree = "<group>"; };
+ 17E6417E0EF01FA8001BC333 /* SPImageView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPImageView.h; sourceTree = "<group>"; };
+ 17E6417F0EF01FA8001BC333 /* SPImageView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPImageView.m; sourceTree = "<group>"; };
17E641800EF01FA8001BC333 /* SPTextView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPTextView.h; sourceTree = "<group>"; };
17E641810EF01FA8001BC333 /* SPTextView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPTextView.m; sourceTree = "<group>"; };
17E6418C0EF02036001BC333 /* appicon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = appicon.icns; sourceTree = "<group>"; };
@@ -1400,8 +1400,8 @@
children = (
17E6417C0EF01FA8001BC333 /* CMCopyTable.h */,
17E6417D0EF01FA8001BC333 /* CMCopyTable.m */,
- 17E6417E0EF01FA8001BC333 /* CMImageView.h */,
- 17E6417F0EF01FA8001BC333 /* CMImageView.m */,
+ 17E6417E0EF01FA8001BC333 /* SPImageView.h */,
+ 17E6417F0EF01FA8001BC333 /* SPImageView.m */,
17E641800EF01FA8001BC333 /* SPTextView.h */,
17E641810EF01FA8001BC333 /* SPTextView.m */,
58C56EF30F438E120035701E /* SPDataCellFormatter.h */,
@@ -2040,7 +2040,7 @@
17E6416C0EF01F37001BC333 /* ImageAndTextCell.m in Sources */,
17E641750EF01F80001BC333 /* SPKeychain.m in Sources */,
17E641820EF01FA8001BC333 /* CMCopyTable.m in Sources */,
- 17E641830EF01FA8001BC333 /* CMImageView.m in Sources */,
+ 17E641830EF01FA8001BC333 /* SPImageView.m in Sources */,
17E641840EF01FA8001BC333 /* SPTextView.m in Sources */,
58FEF16D0F23D66600518E8E /* SPSQLParser.m in Sources */,
1789343C0F30C1DD0097539A /* SPStringAdditions.m in Sources */,
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 02:27:15 +0000