aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstuconnolly <stuart02@gmail.com>2008-12-10 17:59:35 +0000
committerstuconnolly <stuart02@gmail.com>2008-12-10 17:59:35 +0000
commit153048e2efc361befe9b614ddc4b5a2d884213e3 (patch)
treeda8a67f25088f1c7b8f54e6db262feeeec45bbdc
parentfab9a6506cd04ec8f840c98772a80c44a79c74a7 (diff)
downloadsequelpro-153048e2efc361befe9b614ddc4b5a2d884213e3.tar.gz
sequelpro-153048e2efc361befe9b614ddc4b5a2d884213e3.tar.bz2
sequelpro-153048e2efc361befe9b614ddc4b5a2d884213e3.zip
Fixed MainMenu.xib not being compiled properly.
-rw-r--r--Interfaces/English.lproj/MainMenu.xib100
-rw-r--r--sequel-pro.xcodeproj/project.pbxproj22
2 files changed, 89 insertions, 33 deletions
diff --git a/Interfaces/English.lproj/MainMenu.xib b/Interfaces/English.lproj/MainMenu.xib
index 92e6195d..8d2f9bb7 100644
--- a/Interfaces/English.lproj/MainMenu.xib
+++ b/Interfaces/English.lproj/MainMenu.xib
@@ -8,7 +8,7 @@
<string key="IBDocument.HIToolboxVersion">352.00</string>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="81"/>
+ <integer value="57"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -3759,14 +3759,6 @@
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
- <string key="label">checkForUpdates:</string>
- <reference key="source" ref="138191718"/>
- <reference key="destination" ref="615940863"/>
- </object>
- <int key="connectionID">796</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
<string key="label">checksumTable:</string>
<reference key="source" ref="63651044"/>
<reference key="destination" ref="712078058"/>
@@ -3845,6 +3837,14 @@
</object>
<int key="connectionID">828</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">checkForUpdates:</string>
+ <reference key="source" ref="138191718"/>
+ <reference key="destination" ref="615940863"/>
+ </object>
+ <int key="connectionID">829</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -6633,7 +6633,7 @@ Y2hhbmdlIHRoZSBvcmRlcg</string>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
- <string>{{245, 265}, {511, 20}}</string>
+ <string>{{290, 329}, {511, 20}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<string>{{506, 836}, {511, 20}}</string>
@@ -6818,7 +6818,7 @@ Y2hhbmdlIHRoZSBvcmRlcg</string>
<reference ref="9"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
- <string>{{256, 171}, {218, 253}}</string>
+ <string>{{302, 76}, {218, 253}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<string>{{518, 583}, {218, 253}}</string>
@@ -6994,7 +6994,7 @@ Y2hhbmdlIHRoZSBvcmRlcg</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{351, 112}, {205, 153}}</string>
+ <string>{{333, 85}, {205, 153}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<string>{{180, 535}, {182, 253}}</string>
@@ -7035,7 +7035,7 @@ Y2hhbmdlIHRoZSBvcmRlcg</string>
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">828</int>
+ <int key="maxID">829</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -7049,7 +7049,7 @@ Y2hhbmdlIHRoZSBvcmRlcg</string>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
- <string key="minorKey">CMCopyTable.h</string>
+ <string key="minorKey">Source/CMCopyTable.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
@@ -7126,7 +7126,7 @@ Y2hhbmdlIHRoZSBvcmRlcg</string>
<string key="superclassName">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
- <string key="minorKey">KeyChain.h</string>
+ <string key="minorKey">Source/KeyChain.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
@@ -7236,7 +7236,7 @@ Y2hhbmdlIHRoZSBvcmRlcg</string>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
- <string key="minorKey">MainController.h</string>
+ <string key="minorKey">Source/MainController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
@@ -7416,7 +7416,7 @@ Y2hhbmdlIHRoZSBvcmRlcg</string>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
- <string key="minorKey">TableDocument.h</string>
+ <string key="minorKey">Source/TableDocument.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
@@ -7476,7 +7476,7 @@ Y2hhbmdlIHRoZSBvcmRlcg</string>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
- <string key="minorKey">TablesList.h</string>
+ <string key="minorKey">Source/TablesList.h</string>
</object>
</object>
</object>
@@ -7484,9 +7484,65 @@ Y2hhbmdlIHRoZSBvcmRlcg</string>
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="534766002">
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBDocumentRelativeSource</string>
+ <string key="minorKey">../../../../../Desktop/sequel-pro/branches/stuart02/Frameworks/Sparkle.framework/Versions/A/Headers/RSS.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBDocumentRelativeSource</string>
+ <string key="minorKey">../../../../../Desktop/sequel-pro/branches/stuart02/Frameworks/Sparkle.framework/Versions/A/Headers/SUAppcast.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBDocumentRelativeSource</string>
+ <string key="minorKey">../../../../../Desktop/sequel-pro/branches/stuart02/Frameworks/Sparkle.framework/Versions/A/Headers/SUAutomaticUpdateAlert.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBDocumentRelativeSource</string>
+ <string key="minorKey">../../../../../Desktop/sequel-pro/branches/stuart02/Frameworks/Sparkle.framework/Versions/A/Headers/SUInstaller.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBDocumentRelativeSource</string>
+ <string key="minorKey">../../../../../Desktop/sequel-pro/branches/stuart02/Frameworks/Sparkle.framework/Versions/A/Headers/SUProbingUpdateDriver.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBDocumentRelativeSource</string>
+ <string key="minorKey">../../../../../Desktop/sequel-pro/branches/stuart02/Frameworks/Sparkle.framework/Versions/A/Headers/SUUnarchiver.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBDocumentRelativeSource</string>
+ <string key="minorKey">../../../../../Desktop/sequel-pro/branches/stuart02/Frameworks/Sparkle.framework/Versions/A/Headers/SUUpdateAlert.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBDocumentRelativeSource</string>
+ <string key="minorKey">../../../../../Desktop/sequel-pro/branches/stuart02/Frameworks/Sparkle.framework/Versions/A/Headers/SUUpdatePermissionPrompt.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier" id="306975446">
<string key="majorKey">IBDocumentRelativeSource</string>
- <string key="minorKey">../Sparkle.framework/Versions/A/Headers/SUUpdater.h</string>
+ <string key="minorKey">../../../../../Desktop/sequel-pro/branches/stuart02/Frameworks/Sparkle.framework/Versions/A/Headers/SUUpdater.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
@@ -7500,12 +7556,12 @@ Y2hhbmdlIHRoZSBvcmRlcg</string>
<string key="NS.key.0">delegate</string>
<string key="NS.object.0">id</string>
</object>
- <reference key="sourceIdentifier" ref="534766002"/>
+ <reference key="sourceIdentifier" ref="306975446"/>
</object>
</object>
</object>
<int key="IBDocument.localizationMode">0</int>
- <string key="IBDocument.LastKnownRelativeProjectPath">../sequel-pro.xcodeproj</string>
+ <string key="IBDocument.LastKnownRelativeProjectPath">../../sequel-pro.xcodeproj</string>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
</data>
</archive>
diff --git a/sequel-pro.xcodeproj/project.pbxproj b/sequel-pro.xcodeproj/project.pbxproj
index bb9beca6..f14836d3 100644
--- a/sequel-pro.xcodeproj/project.pbxproj
+++ b/sequel-pro.xcodeproj/project.pbxproj
@@ -7,6 +7,7 @@
objects = {
/* Begin PBXBuildFile section */
+ 1761FD480EF03A6F00331368 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1761FD460EF03A6F00331368 /* MainMenu.xib */; };
17E641460EF01EB5001BC333 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E641440EF01EB5001BC333 /* main.m */; };
17E641560EF01EF6001BC333 /* CustomQuery.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E641490EF01EF6001BC333 /* CustomQuery.m */; };
17E641570EF01EF6001BC333 /* MainController.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E6414B0EF01EF6001BC333 /* MainController.m */; };
@@ -84,7 +85,6 @@
17E641FC0EF02088001BC333 /* sequel-pro.scriptSuite in Resources */ = {isa = PBXBuildFile; fileRef = 17E641F70EF02088001BC333 /* sequel-pro.scriptSuite */; };
17E641FD0EF02088001BC333 /* sequel-pro.scriptTerminology in Resources */ = {isa = PBXBuildFile; fileRef = 17E641F80EF02088001BC333 /* sequel-pro.scriptTerminology */; };
17E6420A0EF020CB001BC333 /* DBView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 17E642060EF020CB001BC333 /* DBView.xib */; };
- 17E6420B0EF020CB001BC333 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 17E642080EF020CB001BC333 /* MainMenu.xib */; };
17E6423B0EF0216C001BC333 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 17E642390EF0216C001BC333 /* Credits.rtf */; };
17E6423E0EF0218B001BC333 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 17E6423C0EF0218B001BC333 /* InfoPlist.strings */; };
17E642700EF02733001BC333 /* English.lproj in Resources */ = {isa = PBXBuildFile; fileRef = 17E642500EF02733001BC333 /* English.lproj */; };
@@ -115,6 +115,7 @@
/* Begin PBXFileReference section */
1058C7A7FEA54F5311CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
+ 1761FD470EF03A6F00331368 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/MainMenu.xib; sourceTree = "<group>"; };
17E641440EF01EB5001BC333 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
17E641450EF01EB5001BC333 /* sequel-pro_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "sequel-pro_Prefix.pch"; sourceTree = "<group>"; };
17E641480EF01EF6001BC333 /* CustomQuery.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CustomQuery.h; sourceTree = "<group>"; };
@@ -215,7 +216,6 @@
17E641F70EF02088001BC333 /* sequel-pro.scriptSuite */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.scriptSuite; path = "sequel-pro.scriptSuite"; sourceTree = "<group>"; };
17E641F80EF02088001BC333 /* sequel-pro.scriptTerminology */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.scriptTerminology; path = "sequel-pro.scriptTerminology"; sourceTree = "<group>"; };
17E642070EF020CB001BC333 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/DBView.xib; sourceTree = "<group>"; };
- 17E642090EF020CB001BC333 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/MainMenu.xib; sourceTree = "<group>"; };
17E6423A0EF0216C001BC333 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = English; path = Interfaces/English.lproj/Credits.rtf; sourceTree = SOURCE_ROOT; };
17E6423D0EF0218B001BC333 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = Interfaces/English.lproj/InfoPlist.strings; sourceTree = SOURCE_ROOT; };
17E642500EF02733001BC333 /* English.lproj */ = {isa = PBXFileReference; lastKnownFileType = folder; name = English.lproj; path = Interfaces/English.lproj; sourceTree = SOURCE_ROOT; };
@@ -457,7 +457,7 @@
isa = PBXGroup;
children = (
17E642060EF020CB001BC333 /* DBView.xib */,
- 17E642080EF020CB001BC333 /* MainMenu.xib */,
+ 1761FD460EF03A6F00331368 /* MainMenu.xib */,
);
path = Interfaces;
sourceTree = "<group>";
@@ -587,15 +587,15 @@
17E641F10EF02036001BC333 /* toolbar-switch-to-sql.png in Resources */,
17E641F20EF02036001BC333 /* toolbar-switch-to-structure.png in Resources */,
17E641F30EF02036001BC333 /* toolbar-switch-to-table-info.png in Resources */,
+ 17E6420A0EF020CB001BC333 /* DBView.xib in Resources */,
17E641F90EF02088001BC333 /* askForPass.sh in Resources */,
17E641FA0EF02088001BC333 /* Growl Registration Ticket.growlRegDict in Resources */,
17E641FC0EF02088001BC333 /* sequel-pro.scriptSuite in Resources */,
17E641FD0EF02088001BC333 /* sequel-pro.scriptTerminology in Resources */,
- 17E6420A0EF020CB001BC333 /* DBView.xib in Resources */,
- 17E6420B0EF020CB001BC333 /* MainMenu.xib in Resources */,
17E6423B0EF0216C001BC333 /* Credits.rtf in Resources */,
17E6423E0EF0218B001BC333 /* InfoPlist.strings in Resources */,
17E642700EF02733001BC333 /* English.lproj in Resources */,
+ 1761FD480EF03A6F00331368 /* MainMenu.xib in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -632,20 +632,20 @@
/* End PBXSourcesBuildPhase section */
/* Begin PBXVariantGroup section */
- 17E642060EF020CB001BC333 /* DBView.xib */ = {
+ 1761FD460EF03A6F00331368 /* MainMenu.xib */ = {
isa = PBXVariantGroup;
children = (
- 17E642070EF020CB001BC333 /* English */,
+ 1761FD470EF03A6F00331368 /* English */,
);
- name = DBView.xib;
+ name = MainMenu.xib;
sourceTree = "<group>";
};
- 17E642080EF020CB001BC333 /* MainMenu.xib */ = {
+ 17E642060EF020CB001BC333 /* DBView.xib */ = {
isa = PBXVariantGroup;
children = (
- 17E642090EF020CB001BC333 /* English */,
+ 17E642070EF020CB001BC333 /* English */,
);
- name = MainMenu.xib;
+ name = DBView.xib;
sourceTree = "<group>";
};
17E642390EF0216C001BC333 /* Credits.rtf */ = {