Changed appearance of copy/rename DB to match that of copyTable.

Added the to be copied/renamed database name to the name input sheet. Added necessary outlets. Added the current db name as preset value in the rename input field.
Renamed databaseNewSheet to databaseCopySheet and copyOnlyStructureButton to copyDatabaseDataButton and inverted behaviour of the button.

3 files changed, 131 insertions, 142 deletions

diff --git a/Interfaces/English.lproj/DBView.xib b/Interfaces/English.lproj/DBView.xib
index 144048cb..0f676d67 100644
--- a/Interfaces/English.lproj/DBView.xib
+++ b/Interfaces/English.lproj/DBView.xib
@@ -23,9 +23,6 @@
 		</object>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="6991"/>
-			<integer value="557"/>
-			<integer value="6938"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -284,7 +281,6 @@
 																					</object>
 																					<string key="NSFrame">{{1, 1}, {218, 38}}</string>
 																					<reference key="NSSuperview" ref="607475905"/>
-																					<reference key="NSNextKeyView" ref="970881282"/>
 																					<reference key="NSDocView" ref="970881282"/>
 																					<object class="NSColor" key="NSBGColor" id="1024678221">
 																						<int key="NSColorSpace">6</int>
@@ -316,7 +312,6 @@
 																			</object>
 																			<string key="NSFrame">{{-1, -13}, {220.212, 40}}</string>
 																			<reference key="NSSuperview" ref="801427893"/>
-																			<reference key="NSNextKeyView" ref="494991824"/>
 																			<int key="NSsFlags">2</int>
 																			<reference key="NSVScroller" ref="196112633"/>
 																			<reference key="NSHScroller" ref="142487484"/>
@@ -414,7 +409,6 @@
 																					</object>
 																					<string key="NSFrameSize">{214, 354}</string>
 																					<reference key="NSSuperview" ref="233472824"/>
-																					<reference key="NSNextKeyView" ref="251040077"/>
 																					<reference key="NSDocView" ref="251040077"/>
 																					<reference key="NSBGColor" ref="1024678221"/>
 																					<int key="NScvFlags">4</int>
@@ -442,7 +436,6 @@
 																			</object>
 																			<string key="NSFrameSize">{214, 354}</string>
 																			<reference key="NSSuperview" ref="1017775084"/>
-																			<reference key="NSNextKeyView" ref="73685676"/>
 																			<int key="NSsFlags">528</int>
 																			<reference key="NSVScroller" ref="693168867"/>
 																			<reference key="NSHScroller" ref="656188692"/>
@@ -578,7 +571,6 @@
 																	</object>
 																	<string key="NSFrameSize">{214, 145}</string>
 																	<reference key="NSSuperview" ref="298226231"/>
-																	<reference key="NSNextKeyView" ref="347093764"/>
 																	<reference key="NSDocView" ref="347093764"/>
 																	<reference key="NSBGColor" ref="1024678221"/>
 																	<int key="NScvFlags">6</int>
@@ -606,7 +598,6 @@
 															</object>
 															<string key="NSFrameSize">{214, 145}</string>
 															<reference key="NSSuperview" ref="192579410"/>
-															<reference key="NSNextKeyView" ref="685057119"/>
 															<int key="NSsFlags">512</int>
 															<reference key="NSVScroller" ref="245346414"/>
 															<reference key="NSHScroller" ref="353686052"/>
@@ -811,6 +802,7 @@
 																</object>
 															</object>
 														</object>
+														<int key="NSSelectedIndex">1</int>
 														<bool key="NSPullDown">YES</bool>
 														<int key="NSPreferredEdge">1</int>
 														<bool key="NSUsesItemFromMenu">YES</bool>
@@ -3918,29 +3910,6 @@
 																							<object class="NSTextView" id="69074373">
 																								<reference key="NSNextResponder" ref="78677381"/>
 																								<int key="NSvFlags">2322</int>
-																								<object class="NSMutableSet" key="NSDragTypes">
-																									<bool key="EncodedWithXMLCoder">YES</bool>
-																									<object class="NSArray" key="set.sortedObjects">
-																										<bool key="EncodedWithXMLCoder">YES</bool>
-																										<string>Apple HTML pasteboard type</string>
-																										<string>Apple PDF pasteboard type</string>
-																										<string>Apple PICT pasteboard type</string>
-																										<string>Apple PNG pasteboard type</string>
-																										<string>Apple URL pasteboard type</string>
-																										<string>CorePasteboardFlavorType 0x6D6F6F76</string>
-																										<string>NSColor pasteboard type</string>
-																										<string>NSFilenamesPboardType</string>
-																										<string>NSStringPboardType</string>
-																										<string>NeXT Encapsulated PostScript v1.2 pasteboard type</string>
-																										<string>NeXT RTFD pasteboard type</string>
-																										<string>NeXT Rich Text Format v1.0 pasteboard type</string>
-																										<string>NeXT TIFF v4.0 pasteboard type</string>
-																										<string>NeXT font pasteboard type</string>
-																										<string>NeXT ruler pasteboard type</string>
-																										<string>WebURLsWithTitlesPboardType</string>
-																										<string>public.url</string>
-																									</object>
-																								</object>
 																								<string key="NSFrameSize">{542, 14}</string>
 																								<reference key="NSSuperview" ref="78677381"/>
 																								<object class="NSTextContainer" key="NSTextContainer" id="708157837">
@@ -4007,7 +3976,6 @@
 																						</object>
 																						<string key="NSFrame">{{1, 1}, {542, 69}}</string>
 																						<reference key="NSSuperview" ref="709531668"/>
-																						<reference key="NSNextKeyView" ref="69074373"/>
 																						<reference key="NSDocView" ref="69074373"/>
 																						<reference key="NSBGColor" ref="449903125"/>
 																						<reference key="NSCursor" ref="32917531"/>
@@ -4037,7 +4005,6 @@
 																				</object>
 																				<string key="NSFrame">{{96, 0}, {555, 71}}</string>
 																				<reference key="NSSuperview" ref="259390764"/>
-																				<reference key="NSNextKeyView" ref="78677381"/>
 																				<int key="NSsFlags">18</int>
 																				<reference key="NSVScroller" ref="892376800"/>
 																				<reference key="NSHScroller" ref="490174802"/>
@@ -4145,7 +4112,6 @@
 																						</object>
 																						<string key="NSFrame">{{1, 1}, {542, 196}}</string>
 																						<reference key="NSSuperview" ref="449863508"/>
-																						<reference key="NSNextKeyView" ref="421486962"/>
 																						<reference key="NSDocView" ref="421486962"/>
 																						<reference key="NSBGColor" ref="449903125"/>
 																						<reference key="NSCursor" ref="32917531"/>
@@ -4175,7 +4141,6 @@
 																				</object>
 																				<string key="NSFrame">{{96, 0}, {555, 198}}</string>
 																				<reference key="NSSuperview" ref="983998494"/>
-																				<reference key="NSNextKeyView" ref="637054939"/>
 																				<int key="NSsFlags">18</int>
 																				<reference key="NSVScroller" ref="633929130"/>
 																				<reference key="NSHScroller" ref="883667132"/>
@@ -5604,6 +5569,7 @@
 							<int key="NSvFlags">256</int>
 							<string key="NSFrame">{{36, 75}, {91, 14}}</string>
 							<reference key="NSSuperview" ref="70075497"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="45988560">
 								<int key="NSCellFlags">68288064</int>
@@ -5620,6 +5586,7 @@
 							<int key="NSvFlags">256</int>
 							<string key="NSFrame">{{17, 50}, {110, 14}}</string>
 							<reference key="NSSuperview" ref="70075497"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="410467805">
 								<int key="NSCellFlags">68288064</int>
@@ -5636,6 +5603,7 @@
 							<int key="NSvFlags">258</int>
 							<string key="NSFrame">{{135, 74}, {137, 18}}</string>
 							<reference key="NSSuperview" ref="70075497"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="212969926">
 								<int key="NSCellFlags">-1804468671</int>
@@ -5658,6 +5626,7 @@
 							<int key="NSvFlags">259</int>
 							<string key="NSFrame">{{207, 13}, {70, 28}}</string>
 							<reference key="NSSuperview" ref="70075497"/>
+							<reference key="NSWindow"/>
 							<int key="NSTag">1</int>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="169260261">
@@ -5685,6 +5654,7 @@
 							<int key="NSvFlags">259</int>
 							<string key="NSFrame">{{139, 13}, {70, 28}}</string>
 							<reference key="NSSuperview" ref="70075497"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="994559297">
 								<int key="NSCellFlags">67239424</int>
@@ -5706,6 +5676,7 @@
 							<int key="NSvFlags">258</int>
 							<string key="NSFrame">{{132, 45}, {143, 22}}</string>
 							<reference key="NSSuperview" ref="70075497"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSPopUpButtonCell" key="NSCell" id="1000126742">
 								<int key="NSCellFlags">-2076049856</int>
@@ -6027,6 +5998,7 @@
 					</object>
 					<string key="NSFrameSize">{292, 112}</string>
 					<reference key="NSSuperview"/>
+					<reference key="NSWindow"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
 				<string key="NSMinSize">{292, 134}</string>
@@ -6035,9 +6007,9 @@
 			<object class="NSWindowTemplate" id="1003190366">
 				<int key="NSWindowStyleMask">1</int>
 				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{343, 483}, {292, 112}}</string>
+				<string key="NSWindowRect">{{343, 483}, {292, 132}}</string>
 				<int key="NSWTFlags">1886912512</int>
-				<string key="NSWindowTitle">Copy Database</string>
+				<string key="NSWindowTitle">Duplicate Database</string>
 				<string key="NSWindowClass">NSWindow</string>
 				<object class="NSMutableString" key="NSViewClass">
 					<characters key="NS.bytes">View</characters>
@@ -6045,46 +6017,30 @@
 				<string key="NSWindowContentMaxSize">{292, 112}</string>
 				<string key="NSWindowContentMinSize">{292, 112}</string>
 				<object class="NSView" key="NSWindowView" id="351046403">
-					<reference key="NSNextResponder"/>
+					<nil key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
 					<object class="NSMutableArray" key="NSSubviews">
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<object class="NSTextField" id="941161511">
 							<reference key="NSNextResponder" ref="351046403"/>
 							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{36, 75}, {91, 14}}</string>
+							<string key="NSFrame">{{17, 98}, {258, 14}}</string>
 							<reference key="NSSuperview" ref="351046403"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="292220806">
 								<int key="NSCellFlags">68288064</int>
-								<int key="NSCellFlags2">71304192</int>
-								<string key="NSContents">Database Name:</string>
+								<int key="NSCellFlags2">4195328</int>
+								<string key="NSContents">Duplicate database to</string>
 								<reference key="NSSupport" ref="26"/>
 								<reference key="NSControlView" ref="941161511"/>
 								<reference key="NSBackgroundColor" ref="62854682"/>
 								<reference key="NSTextColor" ref="454249633"/>
 							</object>
 						</object>
-						<object class="NSTextField" id="791604690">
-							<reference key="NSNextResponder" ref="351046403"/>
-							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{17, 50}, {110, 14}}</string>
-							<reference key="NSSuperview" ref="351046403"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="970440435">
-								<int key="NSCellFlags">68288064</int>
-								<int key="NSCellFlags2">71304192</int>
-								<string key="NSContents">Only Structure:</string>
-								<reference key="NSSupport" ref="26"/>
-								<reference key="NSControlView" ref="791604690"/>
-								<reference key="NSBackgroundColor" ref="62854682"/>
-								<reference key="NSTextColor" ref="454249633"/>
-							</object>
-						</object>
 						<object class="NSTextField" id="362774263">
 							<reference key="NSNextResponder" ref="351046403"/>
 							<int key="NSvFlags">258</int>
-							<string key="NSFrame">{{135, 74}, {137, 18}}</string>
+							<string key="NSFrame">{{20, 72}, {252, 18}}</string>
 							<reference key="NSSuperview" ref="351046403"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="322980098">
@@ -6101,14 +6057,14 @@
 						<object class="NSButton" id="61396236">
 							<reference key="NSNextResponder" ref="351046403"/>
 							<int key="NSvFlags">259</int>
-							<string key="NSFrame">{{207, 13}, {70, 28}}</string>
+							<string key="NSFrame">{{204, 13}, {77, 28}}</string>
 							<reference key="NSSuperview" ref="351046403"/>
 							<int key="NSTag">1</int>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="261586860">
 								<int key="NSCellFlags">604110336</int>
 								<int key="NSCellFlags2">138018816</int>
-								<string key="NSContents">Copy</string>
+								<string key="NSContents">Duplicate</string>
 								<reference key="NSSupport" ref="26"/>
 								<reference key="NSControlView" ref="61396236"/>
 								<int key="NSTag">1</int>
@@ -6124,7 +6080,7 @@
 						<object class="NSButton" id="41421287">
 							<reference key="NSNextResponder" ref="351046403"/>
 							<int key="NSvFlags">259</int>
-							<string key="NSFrame">{{139, 13}, {70, 28}}</string>
+							<string key="NSFrame">{{136, 13}, {70, 28}}</string>
 							<reference key="NSSuperview" ref="351046403"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="1011860722">
@@ -6145,16 +6101,16 @@
 						<object class="NSButton" id="560080814">
 							<reference key="NSNextResponder" ref="351046403"/>
 							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{256, 48}, {18, 18}}</string>
+							<string key="NSFrame">{{18, 48}, {256, 18}}</string>
 							<reference key="NSSuperview" ref="351046403"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="852298622">
 								<int key="NSCellFlags">67239424</int>
-								<int key="NSCellFlags2">0</int>
-								<string key="NSContents">Check</string>
-								<reference key="NSSupport" ref="244931163"/>
+								<int key="NSCellFlags2">131072</int>
+								<string key="NSContents">Duplicate database content</string>
+								<reference key="NSSupport" ref="26"/>
 								<reference key="NSControlView" ref="560080814"/>
-								<int key="NSButtonFlags">1215582719</int>
+								<int key="NSButtonFlags">1211912703</int>
 								<int key="NSButtonFlags2">2</int>
 								<reference key="NSNormalImage" ref="653588312"/>
 								<reference key="NSAlternateImage" ref="386686735"/>
@@ -6165,8 +6121,7 @@
 							</object>
 						</object>
 					</object>
-					<string key="NSFrameSize">{292, 112}</string>
-					<reference key="NSSuperview"/>
+					<string key="NSFrameSize">{292, 132}</string>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1280, 778}}</string>
 				<string key="NSMinSize">{292, 134}</string>
@@ -6175,7 +6130,7 @@
 			<object class="NSWindowTemplate" id="223499819">
 				<int key="NSWindowStyleMask">1</int>
 				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{343, 483}, {292, 83}}</string>
+				<string key="NSWindowRect">{{343, 483}, {292, 110}}</string>
 				<int key="NSWTFlags">1886912512</int>
 				<string key="NSWindowTitle">Rename Database</string>
 				<string key="NSWindowClass">NSWindow</string>
@@ -6185,20 +6140,20 @@
 				<string key="NSWindowContentMaxSize">{292, 112}</string>
 				<string key="NSWindowContentMinSize">{292, 108}</string>
 				<object class="NSView" key="NSWindowView" id="1034135752">
-					<reference key="NSNextResponder"/>
+					<nil key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
 					<object class="NSMutableArray" key="NSSubviews">
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<object class="NSTextField" id="92013996">
 							<reference key="NSNextResponder" ref="1034135752"/>
 							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{12, 47}, {118, 14}}</string>
+							<string key="NSFrame">{{17, 76}, {258, 14}}</string>
 							<reference key="NSSuperview" ref="1034135752"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="315512815">
 								<int key="NSCellFlags">68288064</int>
-								<int key="NSCellFlags2">71304192</int>
-								<string key="NSContents">New Database Name:</string>
+								<int key="NSCellFlags2">4195328</int>
+								<string key="NSContents">Rename database to</string>
 								<reference key="NSSupport" ref="26"/>
 								<reference key="NSControlView" ref="92013996"/>
 								<reference key="NSBackgroundColor" ref="62854682"/>
@@ -6208,7 +6163,7 @@
 						<object class="NSTextField" id="888396188">
 							<reference key="NSNextResponder" ref="1034135752"/>
 							<int key="NSvFlags">258</int>
-							<string key="NSFrame">{{135, 45}, {137, 18}}</string>
+							<string key="NSFrame">{{20, 50}, {252, 18}}</string>
 							<reference key="NSSuperview" ref="1034135752"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="1071800920">
@@ -6267,8 +6222,7 @@
 							</object>
 						</object>
 					</object>
-					<string key="NSFrameSize">{292, 83}</string>
-					<reference key="NSSuperview"/>
+					<string key="NSFrameSize">{292, 110}</string>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
 				<string key="NSMinSize">{292, 130}</string>
@@ -6287,7 +6241,7 @@
 				<string key="NSWindowContentMaxSize">{600, 142}</string>
 				<string key="NSWindowContentMinSize">{269, 142}</string>
 				<object class="NSView" key="NSWindowView" id="846512394">
-					<nil key="NSNextResponder"/>
+					<reference key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
 					<object class="NSMutableArray" key="NSSubviews">
 						<bool key="EncodedWithXMLCoder">YES</bool>
@@ -6296,6 +6250,7 @@
 							<int key="NSvFlags">256</int>
 							<string key="NSFrame">{{36, 105}, {71, 14}}</string>
 							<reference key="NSSuperview" ref="846512394"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="967312779">
 								<int key="NSCellFlags">68288064</int>
@@ -6312,6 +6267,7 @@
 							<int key="NSvFlags">256</int>
 							<string key="NSFrame">{{17, 80}, {90, 14}}</string>
 							<reference key="NSSuperview" ref="846512394"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="308586219">
 								<int key="NSCellFlags">68288064</int>
@@ -6328,6 +6284,7 @@
 							<int key="NSvFlags">258</int>
 							<string key="NSFrame">{{112, 104}, {137, 18}}</string>
 							<reference key="NSSuperview" ref="846512394"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="39963071">
 								<int key="NSCellFlags">-1804468671</int>
@@ -6345,6 +6302,7 @@
 							<int key="NSvFlags">257</int>
 							<string key="NSFrame">{{184, 13}, {70, 28}}</string>
 							<reference key="NSSuperview" ref="846512394"/>
+							<reference key="NSWindow"/>
 							<int key="NSTag">1</int>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="805893132">
@@ -6368,6 +6326,7 @@
 							<int key="NSvFlags">256</int>
 							<string key="NSFrame">{{109, 75}, {143, 22}}</string>
 							<reference key="NSSuperview" ref="846512394"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSPopUpButtonCell" key="NSCell" id="285868883">
 								<int key="NSCellFlags">-2076049856</int>
@@ -6691,6 +6650,7 @@
 							<int key="NSvFlags">256</int>
 							<string key="NSFrame">{{41, 54}, {66, 14}}</string>
 							<reference key="NSSuperview" ref="846512394"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="193977111">
 								<int key="NSCellFlags">68288064</int>
@@ -6707,6 +6667,7 @@
 							<int key="NSvFlags">256</int>
 							<string key="NSFrame">{{109, 50}, {143, 22}}</string>
 							<reference key="NSSuperview" ref="846512394"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSPopUpButtonCell" key="NSCell" id="285541065">
 								<int key="NSCellFlags">-2076049856</int>
@@ -6742,6 +6703,7 @@
 							<int key="NSvFlags">257</int>
 							<string key="NSFrame">{{116, 13}, {70, 28}}</string>
 							<reference key="NSSuperview" ref="846512394"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="783843620">
 								<int key="NSCellFlags">67239424</int>
@@ -6760,6 +6722,8 @@
 						</object>
 					</object>
 					<string key="NSFrameSize">{269, 142}</string>
+					<reference key="NSSuperview"/>
+					<reference key="NSWindow"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
 				<string key="NSMinSize">{269, 164}</string>
@@ -6778,7 +6742,7 @@
 				<string key="NSWindowContentMaxSize">{600, 127}</string>
 				<string key="NSWindowContentMinSize">{260, 127}</string>
 				<object class="NSView" key="NSWindowView" id="653204527">
-					<nil key="NSNextResponder"/>
+					<reference key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
 					<object class="NSMutableArray" key="NSSubviews">
 						<bool key="EncodedWithXMLCoder">YES</bool>
@@ -6787,6 +6751,7 @@
 							<int key="NSvFlags">266</int>
 							<string key="NSFrame">{{17, 93}, {226, 14}}</string>
 							<reference key="NSSuperview" ref="653204527"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="604072019">
 								<int key="NSCellFlags">67239488</int>
@@ -6803,6 +6768,7 @@
 							<int key="NSvFlags">258</int>
 							<string key="NSFrame">{{20, 67}, {220, 18}}</string>
 							<reference key="NSSuperview" ref="653204527"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="870160310">
 								<int key="NSCellFlags">-1804468671</int>
@@ -6820,6 +6786,7 @@
 							<int key="NSvFlags">292</int>
 							<string key="NSFrame">{{19, 43}, {189, 18}}</string>
 							<reference key="NSSuperview" ref="653204527"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="575635343">
 								<int key="NSCellFlags">67239424</int>
@@ -6841,6 +6808,7 @@
 							<int key="NSvFlags">289</int>
 							<string key="NSFrame">{{158, 13}, {87, 28}}</string>
 							<reference key="NSSuperview" ref="653204527"/>
+							<reference key="NSWindow"/>
 							<int key="NSTag">1</int>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="834960254">
@@ -6864,6 +6832,7 @@
 							<int key="NSvFlags">289</int>
 							<string key="NSFrame">{{80, 13}, {80, 28}}</string>
 							<reference key="NSSuperview" ref="653204527"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="1048025876">
 								<int key="NSCellFlags">67239424</int>
@@ -6882,6 +6851,8 @@
 						</object>
 					</object>
 					<string key="NSFrameSize">{260, 127}</string>
+					<reference key="NSSuperview"/>
+					<reference key="NSWindow"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
 				<string key="NSMinSize">{260, 149}</string>
@@ -8840,7 +8811,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 				<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
 				<string key="NSWindowContentMinSize">{350, 200}</string>
 				<object class="NSView" key="NSWindowView" id="749598685">
-					<nil key="NSNextResponder"/>
+					<reference key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
 					<object class="NSMutableArray" key="NSSubviews">
 						<bool key="EncodedWithXMLCoder">YES</bool>
@@ -8849,6 +8820,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 							<int key="NSvFlags">257</int>
 							<string key="NSFrame">{{320, 5}, {76, 28}}</string>
 							<reference key="NSSuperview" ref="749598685"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="849738207">
 								<int key="NSCellFlags">67239424</int>
@@ -8870,6 +8842,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 							<int key="NSvFlags">257</int>
 							<string key="NSFrame">{{246, -215.5}, {76, 28}}</string>
 							<reference key="NSSuperview" ref="749598685"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="323973752">
 								<int key="NSCellFlags">67239424</int>
@@ -8891,6 +8864,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 							<int key="NSvFlags">260</int>
 							<string key="NSFrame">{{15, 5}, {111, 28}}</string>
 							<reference key="NSSuperview" ref="749598685"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="116117289">
 								<int key="NSCellFlags">-2080244224</int>
@@ -8911,6 +8885,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 							<int key="NSvFlags">266</int>
 							<string key="NSFrame">{{9, 316}, {385, 14}}</string>
 							<reference key="NSSuperview" ref="749598685"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="187876153">
 								<int key="NSCellFlags">68288064</int>
@@ -8937,6 +8912,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 											<int key="NSvFlags">2322</int>
 											<string key="NSFrameSize">{411, 14}</string>
 											<reference key="NSSuperview" ref="789153540"/>
+											<reference key="NSWindow"/>
 											<object class="NSTextContainer" key="NSTextContainer" id="297140751">
 												<object class="NSLayoutManager" key="NSLayoutManager">
 													<object class="NSTextStorage" key="NSTextStorage">
@@ -8998,6 +8974,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 									</object>
 									<string key="NSFrame">{{1, 1}, {411, 264}}</string>
 									<reference key="NSSuperview" ref="666283614"/>
+									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="843242867"/>
 									<reference key="NSDocView" ref="843242867"/>
 									<reference key="NSBGColor" ref="449903125"/>
@@ -9009,6 +8986,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 									<int key="NSvFlags">-2147483392</int>
 									<string key="NSFrame">{{-100, -100}, {11, 133}}</string>
 									<reference key="NSSuperview" ref="666283614"/>
+									<reference key="NSWindow"/>
 									<int key="NSsFlags">256</int>
 									<reference key="NSTarget" ref="666283614"/>
 									<string key="NSAction">_doScroller:</string>
@@ -9019,6 +8997,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 									<int key="NSvFlags">-2147483392</int>
 									<string key="NSFrame">{{-100, -100}, {87, 18}}</string>
 									<reference key="NSSuperview" ref="666283614"/>
+									<reference key="NSWindow"/>
 									<int key="NSsFlags">1</int>
 									<reference key="NSTarget" ref="666283614"/>
 									<string key="NSAction">_doScroller:</string>
@@ -9028,6 +9007,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 							</object>
 							<string key="NSFrame">{{-1, 42}, {413, 266}}</string>
 							<reference key="NSSuperview" ref="749598685"/>
+							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="789153540"/>
 							<int key="NSsFlags">514</int>
 							<reference key="NSVScroller" ref="497829974"/>
@@ -9039,6 +9019,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 							<int key="NSvFlags">260</int>
 							<string key="NSFrame">{{124, 5}, {76, 28}}</string>
 							<reference key="NSSuperview" ref="749598685"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="1153515">
 								<int key="NSCellFlags">67239424</int>
@@ -9057,6 +9038,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 						</object>
 					</object>
 					<string key="NSFrameSize">{411, 341}</string>
+					<reference key="NSSuperview"/>
+					<reference key="NSWindow"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
 				<string key="NSMinSize">{350, 222}</string>
@@ -16693,22 +16676,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">databaseNewSheet</string>
-						<reference key="source" ref="427689665"/>
-						<reference key="destination" ref="1003190366"/>
-					</object>
-					<int key="connectionID">6984</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">copyOnlyStructureButton</string>
-						<reference key="source" ref="427689665"/>
-						<reference key="destination" ref="560080814"/>
-					</object>
-					<int key="connectionID">6985</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
 						<string key="label">nextKeyView</string>
 						<reference key="source" ref="560080814"/>
 						<reference key="destination" ref="41421287"/>
@@ -16859,6 +16826,38 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 					</object>
 					<int key="connectionID">7031</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">databaseCopySheet</string>
+						<reference key="source" ref="427689665"/>
+						<reference key="destination" ref="1003190366"/>
+					</object>
+					<int key="connectionID">7032</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">copyDatabaseDataButton</string>
+						<reference key="source" ref="427689665"/>
+						<reference key="destination" ref="560080814"/>
+					</object>
+					<int key="connectionID">7039</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">copyDatabaseMessageField</string>
+						<reference key="source" ref="427689665"/>
+						<reference key="destination" ref="941161511"/>
+					</object>
+					<int key="connectionID">7040</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">renameDatabaseMessageField</string>
+						<reference key="source" ref="427689665"/>
+						<reference key="destination" ref="92013996"/>
+					</object>
+					<int key="connectionID">7041</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -23535,19 +23534,18 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 							<reference ref="351046403"/>
 						</object>
 						<reference key="parent" ref="0"/>
-						<string key="objectName">Copy Database Sheet</string>
+						<string key="objectName">Duplicate Database Sheet</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">6938</int>
 						<reference key="object" ref="351046403"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="61396236"/>
-							<reference ref="791604690"/>
 							<reference ref="941161511"/>
 							<reference ref="362774263"/>
-							<reference ref="41421287"/>
 							<reference ref="560080814"/>
+							<reference ref="61396236"/>
+							<reference ref="41421287"/>
 						</object>
 						<reference key="parent" ref="1003190366"/>
 					</object>
@@ -23561,15 +23559,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 						<reference key="parent" ref="351046403"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">6941</int>
-						<reference key="object" ref="791604690"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="970440435"/>
-						</object>
-						<reference key="parent" ref="351046403"/>
-					</object>
-					<object class="IBObjectRecord">
 						<int key="objectID">6942</int>
 						<reference key="object" ref="941161511"/>
 						<object class="NSMutableArray" key="children">
@@ -23612,11 +23601,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 						<reference key="parent" ref="941161511"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">6948</int>
-						<reference key="object" ref="970440435"/>
-						<reference key="parent" ref="791604690"/>
-					</object>
-					<object class="IBObjectRecord">
 						<int key="objectID">6976</int>
 						<reference key="object" ref="261586860"/>
 						<reference key="parent" ref="61396236"/>
@@ -23651,9 +23635,9 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<reference ref="39894315"/>
-							<reference ref="681566428"/>
 							<reference ref="92013996"/>
 							<reference ref="888396188"/>
+							<reference ref="681566428"/>
 						</object>
 						<reference key="parent" ref="223499819"/>
 					</object>
@@ -25118,8 +25102,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 					<string>6938.ImportedFromIB2</string>
 					<string>6939.IBPluginDependency</string>
 					<string>6939.ImportedFromIB2</string>
-					<string>6941.IBPluginDependency</string>
-					<string>6941.ImportedFromIB2</string>
 					<string>6942.IBPluginDependency</string>
 					<string>6942.ImportedFromIB2</string>
 					<string>6943.IBPluginDependency</string>
@@ -25129,7 +25111,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 					<string>6945.IBPluginDependency</string>
 					<string>6946.IBPluginDependency</string>
 					<string>6947.IBPluginDependency</string>
-					<string>6948.IBPluginDependency</string>
 					<string>6976.IBPluginDependency</string>
 					<string>6980.IBPluginDependency</string>
 					<string>6981.IBPluginDependency</string>
@@ -25977,9 +25958,9 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 					<string>{780, 480}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
-					<string>{{628, 485}, {260, 127}}</string>
+					<string>{{940, 346}, {260, 127}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{628, 485}, {260, 127}}</string>
+					<string>{{940, 346}, {260, 127}}</string>
 					<integer value="1"/>
 					<boolean value="YES"/>
 					<integer value="1"/>
@@ -26167,9 +26148,9 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{630, 405}, {269, 142}}</string>
+					<string>{{919, 382}, {269, 142}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{630, 405}, {269, 142}}</string>
+					<string>{{919, 382}, {269, 142}}</string>
 					<integer value="1"/>
 					<boolean value="YES"/>
 					<boolean value="YES"/>
@@ -26409,9 +26390,9 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{850, 373}, {292, 112}}</string>
+					<string>{{859, 372}, {292, 112}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{850, 373}, {292, 112}}</string>
+					<string>{{859, 372}, {292, 112}}</string>
 					<integer value="1"/>
 					<integer value="1"/>
 					<integer value="1"/>
@@ -26560,7 +26541,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 					<string>com.brandonwalkin.BWToolkit</string>
 					<string>com.brandonwalkin.BWToolkit</string>
 					<string>com.brandonwalkin.BWToolkit</string>
-					<string>{{508, 204}, {208, 125}}</string>
+					<string>{{73, 104}, {208, 125}}</string>
 					<string>com.brandonwalkin.BWToolkit</string>
 					<string>com.brandonwalkin.BWToolkit</string>
 					<object class="NSMutableDictionary">
@@ -27171,9 +27152,9 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{558, 399}, {292, 112}}</string>
+					<string>{{925, 531}, {292, 132}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{558, 399}, {292, 112}}</string>
+					<string>{{925, 531}, {292, 132}}</string>
 					<integer value="1"/>
 					<integer value="1"/>
 					<integer value="1"/>
@@ -27190,17 +27171,14 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<integer value="1"/>
-					<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>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>{{919, 473}, {292, 110}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{854, 253}, {292, 83}}</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{854, 253}, {292, 83}}</string>
+					<string>{{919, 473}, {292, 110}}</string>
 					<integer value="1"/>
 					<integer value="1"/>
 					<integer value="1"/>
@@ -27363,7 +27341,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">7031</int>
+			<int key="maxID">7041</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -28506,17 +28484,18 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 							<string>connectionErrorDialog</string>
 							<string>contentViewSplitter</string>
 							<string>copyDatabaseButton</string>
-							<string>copyOnlyStructureButton</string>
+							<string>copyDatabaseDataButton</string>
+							<string>copyDatabaseMessageField</string>
 							<string>createTableSyntaxTextField</string>
 							<string>createTableSyntaxTextView</string>
 							<string>createTableSyntaxWindow</string>
 							<string>customQueryInstance</string>
 							<string>customQueryTextView</string>
 							<string>databaseCopyNameField</string>
+							<string>databaseCopySheet</string>
 							<string>databaseDataInstance</string>
 							<string>databaseEncodingButton</string>
 							<string>databaseNameField</string>
-							<string>databaseNewSheet</string>
 							<string>databaseRenameNameField</string>
 							<string>databaseRenameSheet</string>
 							<string>databaseSheet</string>
@@ -28533,6 +28512,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 							<string>listFilterField</string>
 							<string>queryProgressBar</string>
 							<string>renameDatabaseButton</string>
+							<string>renameDatabaseMessageField</string>
 							<string>saveConnectionAccessory</string>
 							<string>saveConnectionAutoConnect</string>
 							<string>saveConnectionEncrypt</string>
@@ -28577,6 +28557,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 							<string>NSSplitView</string>
 							<string>id</string>
 							<string>id</string>
+							<string>id</string>
 							<string>NSTextField</string>
 							<string>NSTextView</string>
 							<string>NSWindow</string>
@@ -28606,6 +28587,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 							<string>id</string>
 							<string>id</string>
 							<string>id</string>
+							<string>id</string>
 							<string>NSSecureTextField</string>
 							<string>id</string>
 							<string>id</string>
diff --git a/Source/TableDocument.h b/Source/TableDocument.h
index 8eb6cb4b..b3cbb6e7 100644
--- a/Source/TableDocument.h
+++ b/Source/TableDocument.h
@@ -65,7 +65,7 @@
 	IBOutlet id titleStringView;
 	
 	IBOutlet id databaseSheet;
-	IBOutlet id databaseNewSheet;
+	IBOutlet id databaseCopySheet;
 	IBOutlet id databaseRenameSheet;
 
 	IBOutlet id queryProgressBar;
@@ -77,13 +77,18 @@
 	IBOutlet id favoritesButton;
 
 	IBOutlet id databaseNameField;
-	IBOutlet id databaseCopyNameField;
-	IBOutlet id databaseRenameNameField;
 	IBOutlet id databaseEncodingButton;
-	IBOutlet id copyOnlyStructureButton;
 	IBOutlet id addDatabaseButton;
+
+	IBOutlet id databaseCopyNameField;
+	IBOutlet id copyDatabaseDataButton;
+	IBOutlet id copyDatabaseMessageField;
 	IBOutlet id copyDatabaseButton;
+
+	IBOutlet id databaseRenameNameField;
+	IBOutlet id renameDatabaseMessageField;
 	IBOutlet id renameDatabaseButton;
+
 	IBOutlet id chooseDatabaseButton;
 	IBOutlet id historyControl;
 	IBOutlet NSTabView *tableTabView;
diff --git a/Source/TableDocument.m b/Source/TableDocument.m
index 49f30030..a5dc87b4 100644
--- a/Source/TableDocument.m
+++ b/Source/TableDocument.m
@@ -940,8 +940,9 @@
 	if (![tablesListInstance selectionShouldChangeInTableView:nil]) return;
 	
 	[databaseCopyNameField setStringValue:@""];
+	[copyDatabaseMessageField setStringValue:[NSString stringWithFormat:NSLocalizedString(@"Duplicate database '%@' to:", @"duplicate database message"), selectedDatabase]];
 	
-	[NSApp beginSheet:databaseNewSheet
+	[NSApp beginSheet:databaseCopySheet
 	   modalForWindow:tableWindow
 		modalDelegate:self
 	   didEndSelector:@selector(sheetDidEnd:returnCode:contextInfo:)
@@ -955,7 +956,8 @@
 {	
 	if (![tablesListInstance selectionShouldChangeInTableView:nil]) return;
 	
-	[databaseRenameNameField setStringValue:@""];
+	[databaseRenameNameField setStringValue:selectedDatabase];
+	[renameDatabaseMessageField setStringValue:[NSString stringWithFormat:NSLocalizedString(@"Rename database '%@' to:", @"rename database message"), selectedDatabase]];
 	
 	[NSApp beginSheet:databaseRenameSheet
 	   modalForWindow:tableWindow
@@ -4158,7 +4160,7 @@
 	[dbActionCopy setConnection: [self getConnection]];
 	[dbActionCopy setMessageWindow: tableWindow];
 	
-	BOOL copyWithContent = [copyOnlyStructureButton state] == NSOffState;
+	BOOL copyWithContent = [copyDatabaseDataButton state] == NSOnState;
 	
 	if ([dbActionCopy copyDatabaseFrom: [self database] 
 									to: [databaseCopyNameField stringValue]