aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBibiko <bibiko@eva.mpg.de>2010-04-12 13:54:56 +0000
committerBibiko <bibiko@eva.mpg.de>2010-04-12 13:54:56 +0000
commit6867d2ec117eaa9537a5e6ccb39fc233d790ba61 (patch)
tree08ad956edaaaeabb091526287b13d70e837e9320
parentba9e5fc5c311e756c6a1e1e7294d2c719d5b4709 (diff)
downloadsequelpro-6867d2ec117eaa9537a5e6ccb39fc233d790ba61.tar.gz
sequelpro-6867d2ec117eaa9537a5e6ccb39fc233d790ba61.tar.bz2
sequelpro-6867d2ec117eaa9537a5e6ccb39fc233d790ba61.zip
• renamed 'Open' button in 'Import from Clipboard' to 'Next'
• fixed 'Import from Clipboard' menu item validation to be disabled if no database is selected (thanks to avenjamin for pointing it out)
-rw-r--r--Interfaces/English.lproj/ImportAccessory.xib4
-rw-r--r--Source/TableDocument.m2
2 files changed, 3 insertions, 3 deletions
diff --git a/Interfaces/English.lproj/ImportAccessory.xib b/Interfaces/English.lproj/ImportAccessory.xib
index ac831371..1b709b7a 100644
--- a/Interfaces/English.lproj/ImportAccessory.xib
+++ b/Interfaces/English.lproj/ImportAccessory.xib
@@ -13,7 +13,7 @@
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
<integer value="1"/>
- <integer value="91"/>
+ <integer value="86"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -811,7 +811,7 @@
<object class="NSButtonCell" key="NSCell" id="437878340">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">134217728</int>
- <string key="NSContents">Open</string>
+ <string key="NSContents">Next</string>
<reference key="NSSupport" ref="857116476"/>
<reference key="NSControlView" ref="660428801"/>
<int key="NSButtonFlags">-2038284033</int>
diff --git a/Source/TableDocument.m b/Source/TableDocument.m
index de23ba80..71c581bf 100644
--- a/Source/TableDocument.m
+++ b/Source/TableDocument.m
@@ -3096,7 +3096,7 @@
if ([menuItem action] == @selector(importFromClipboard:))
{
- return ([[NSPasteboard generalPasteboard] availableTypeFromArray:[NSArray arrayWithObjects:NSStringPboardType, nil]]) ? YES : NO;
+ return ([self database] && [[NSPasteboard generalPasteboard] availableTypeFromArray:[NSArray arrayWithObjects:NSStringPboardType, nil]]) ? YES : NO;
}