From eb5fa28ec49e2aaecb5fd38c86f42a530498267b Mon Sep 17 00:00:00 2001
From: Bibiko <bibiko@eva.mpg.de>
Date: Wed, 8 Dec 2010 19:35:24 +0000
Subject: =?UTF-8?q?=E2=80=A2=20Bundle=20Editor:=20removed=20unnecessary=20?=
 =?UTF-8?q?tooltip;=20replace=20menu=20item=20title=20'Save'=20by=20'Expor?=
 =?UTF-8?q?t'=20=E2=80=A2=20improved=20check=20whether=20a=20doc=20window?=
 =?UTF-8?q?=20has=20a=20connection=20or=20not=20for=20running=20a=20Bundle?=
 =?UTF-8?q?=20command?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Interfaces/English.lproj/BundleEditor.xib | 25 +++++++++++++++++--------
 Source/SPStringAdditions.m                |  4 ++--
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/Interfaces/English.lproj/BundleEditor.xib b/Interfaces/English.lproj/BundleEditor.xib
index 8bcfbdd1..8f224ad4 100644
--- a/Interfaces/English.lproj/BundleEditor.xib
+++ b/Interfaces/English.lproj/BundleEditor.xib
@@ -23,7 +23,7 @@
 		</object>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="686"/>
+			<integer value="683"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -351,7 +351,7 @@
 																</object>
 																<object class="NSMenuItem" id="18029675">
 																	<reference key="NSMenu" ref="973574710"/>
-																	<string key="NSTitle">Save Bundle…</string>
+																	<string key="NSTitle">Export Bundle…</string>
 																	<string key="NSKeyEquiv"/>
 																	<int key="NSMnemonicLoc">2147483647</int>
 																	<reference key="NSOnImage" ref="545549031"/>
@@ -383,6 +383,7 @@
 																</object>
 															</object>
 														</object>
+														<int key="NSSelectedIndex">3</int>
 														<bool key="NSPullDown">YES</bool>
 														<int key="NSPreferredEdge">1</int>
 														<bool key="NSUsesItemFromMenu">YES</bool>
@@ -3261,6 +3262,7 @@
 					<string>904.IBPluginDependency</string>
 					<string>908.IBPluginDependency</string>
 					<string>909.IBPluginDependency</string>
+					<string>920.IBAttributePlaceholdersKey</string>
 					<string>920.IBPluginDependency</string>
 					<string>932.IBAttributePlaceholdersKey</string>
 					<string>932.IBPluginDependency</string>
@@ -3432,7 +3434,7 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.brandonwalkin.BWToolkit</string>
-					<string>{{230, 222}, {243, 98}}</string>
+					<string>{{222, 223}, {243, 98}}</string>
 					<string>com.brandonwalkin.BWToolkit</string>
 					<string>com.brandonwalkin.BWToolkit</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -3473,11 +3475,10 @@
 					<string>{{430, 598}, {167, 4}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<object class="NSMutableDictionary">
-						<string key="NS.key.0">ToolTip</string>
-						<object class="IBToolTipAttribute" key="NS.object.0">
-							<string key="name">ToolTip</string>
-							<reference key="object" ref="994416682"/>
-							<string key="toolTip">Alphanumeric character string which inserts the favorite query string after expansion by pressing the ⇥ key.</string>
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<reference key="dict.sortedKeys" ref="0"/>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
 						</object>
 					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -3546,6 +3547,14 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSMutableDictionary">
+						<string key="NS.key.0">ToolTip</string>
+						<object class="IBToolTipAttribute" key="NS.object.0">
+							<string key="name">ToolTip</string>
+							<reference key="object" ref="18029675"/>
+							<string key="toolTip">Save the selected Bundle to disk</string>
+						</object>
+					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<object class="NSMutableDictionary">
 						<string key="NS.key.0">ToolTip</string>
diff --git a/Source/SPStringAdditions.m b/Source/SPStringAdditions.m
index 97339201..012f365c 100644
--- a/Source/SPStringAdditions.m
+++ b/Source/SPStringAdditions.m
@@ -537,14 +537,14 @@
 	if([[[NSApp mainWindow] delegate] respondsToSelector:@selector(selectedTableDocument)])
 		doc = [[[NSApp mainWindow] delegate] selectedTableDocument];
 		// Check if connected
-		if([[doc connectionID] isEqualToString:@"_"])
+		if([doc getConnection] == nil)
 			doc = nil;
 	else {
 		for (NSWindow *aWindow in [NSApp orderedWindows]) {
 			if([[[[aWindow windowController] class] description] isEqualToString:@"SPWindowController"]) {
 				if([[[aWindow windowController] documents] count] && [[[[[[aWindow windowController] documents] objectAtIndex:0] class] description] isEqualToString:@"SPDatabaseDocument"]) {
 					// Check if connected
-					if(![[[[[aWindow windowController] documents] objectAtIndex:0] connectionID] isEqualToString:@"_"])
+					if([[[[aWindow windowController] documents] objectAtIndex:0] getConnection])
 						doc = [[[aWindow windowController] documents] objectAtIndex:0];
 					else
 						doc = nil;
-- 
cgit v1.2.3