From d766381344119184158738d2d5a23484a8a1b3a1 Mon Sep 17 00:00:00 2001
From: stuconnolly <stuart02@gmail.com>
Date: Thu, 1 Oct 2009 15:23:33 +0000
Subject: - Add copy create syntax button to the create syntax sheet. - Fix the
 Growl notification prefs message as well as making the dialog a sheet. -
 Re-run genstrings to update localizable.strings and also remove use of
 multiple comments for a single string.

---
 Interfaces/English.lproj/DBView.xib          |  79 +++++++++++++++++++++++++--
 Interfaces/English.lproj/Localizable.strings | Bin 84242 -> 92506 bytes
 Source/SPContentFilterManager.m              |   2 +-
 Source/SPPreferenceController.m              |  10 ++--
 Source/TableDocument.h                       |   1 +
 Source/TableDocument.m                       |  21 +++++++
 Source/TableDump.m                           |   4 +-
 7 files changed, 103 insertions(+), 14 deletions(-)

diff --git a/Interfaces/English.lproj/DBView.xib b/Interfaces/English.lproj/DBView.xib
index 31e8191a..d3b36706 100644
--- a/Interfaces/English.lproj/DBView.xib
+++ b/Interfaces/English.lproj/DBView.xib
@@ -23,7 +23,7 @@
 		</object>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="849"/>
+			<integer value="6558"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -7408,12 +7408,14 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 											<int key="NSvFlags">256</int>
 											<string key="NSFrameSize">{399, 251}</string>
 											<reference key="NSSuperview" ref="841219743"/>
+											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTableHeaderView" key="NSHeaderView" id="74674217">
 												<reference key="NSNextResponder" ref="133857118"/>
 												<int key="NSvFlags">256</int>
 												<string key="NSFrameSize">{399, 17}</string>
 												<reference key="NSSuperview" ref="133857118"/>
+												<reference key="NSWindow"/>
 												<reference key="NSTableView" ref="460727716"/>
 											</object>
 											<object class="_NSCornerView" key="NSCornerView" id="111814662">
@@ -7421,6 +7423,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 												<int key="NSvFlags">256</int>
 												<string key="NSFrame">{{400, 0}, {12, 17}}</string>
 												<reference key="NSSuperview" ref="294857516"/>
+												<reference key="NSWindow"/>
 											</object>
 											<object class="NSMutableArray" key="NSTableColumns">
 												<bool key="EncodedWithXMLCoder">YES</bool>
@@ -7497,6 +7500,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 									</object>
 									<string key="NSFrame">{{1, 17}, {399, 251}}</string>
 									<reference key="NSSuperview" ref="294857516"/>
+									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="460727716"/>
 									<reference key="NSDocView" ref="460727716"/>
 									<reference key="NSBGColor" ref="1024678221"/>
@@ -7507,6 +7511,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 									<int key="NSvFlags">256</int>
 									<string key="NSFrame">{{400, 17}, {11, 251}}</string>
 									<reference key="NSSuperview" ref="294857516"/>
+									<reference key="NSWindow"/>
 									<int key="NSsFlags">256</int>
 									<reference key="NSTarget" ref="294857516"/>
 									<string key="NSAction">_doScroller:</string>
@@ -7517,6 +7522,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 									<int key="NSvFlags">-2147483392</int>
 									<string key="NSFrame">{{-100, -100}, {358, 11}}</string>
 									<reference key="NSSuperview" ref="294857516"/>
+									<reference key="NSWindow"/>
 									<int key="NSsFlags">257</int>
 									<reference key="NSTarget" ref="294857516"/>
 									<string key="NSAction">_doScroller:</string>
@@ -7531,6 +7537,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 									</object>
 									<string key="NSFrame">{{1, 0}, {399, 17}}</string>
 									<reference key="NSSuperview" ref="294857516"/>
+									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="74674217"/>
 									<reference key="NSDocView" ref="74674217"/>
 									<reference key="NSBGColor" ref="1024678221"/>
@@ -7540,6 +7547,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 							</object>
 							<string key="NSFrame">{{-1, 39}, {412, 269}}</string>
 							<reference key="NSSuperview" ref="226131408"/>
+							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="841219743"/>
 							<int key="NSsFlags">18</int>
 							<reference key="NSVScroller" ref="297298990"/>
@@ -7554,6 +7562,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 							<int key="NSvFlags">257</int>
 							<string key="NSFrame">{{320, 5}, {76, 28}}</string>
 							<reference key="NSSuperview" ref="226131408"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="939960403">
 								<int key="NSCellFlags">67239424</int>
@@ -7575,6 +7584,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 							<int key="NSvFlags">260</int>
 							<string key="NSFrame">{{15, 5}, {111, 28}}</string>
 							<reference key="NSSuperview" ref="226131408"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="652323914">
 								<int key="NSCellFlags">-2080244224</int>
@@ -7595,6 +7605,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{9, 316}, {97, 14}}</string>
 							<reference key="NSSuperview" ref="226131408"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="720788317">
 								<int key="NSCellFlags">68288064</int>
@@ -7611,6 +7622,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 							<int key="NSvFlags">265</int>
 							<string key="NSFrame">{{229, 314}, {170, 19}}</string>
 							<reference key="NSSuperview" ref="226131408"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSSearchFieldCell" key="NSCell" id="164220113">
 								<int key="NSCellFlags">343014976</int>
@@ -7674,6 +7686,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 							<int key="NSvFlags">266</int>
 							<string key="NSFrame">{{108, 316}, {116, 14}}</string>
 							<reference key="NSSuperview" ref="226131408"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="882848749">
 								<int key="NSCellFlags">68288064</int>
@@ -7688,6 +7701,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 					</object>
 					<string key="NSFrameSize">{411, 341}</string>
 					<reference key="NSSuperview"/>
+					<reference key="NSWindow"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
 				<string key="NSMinSize">{350, 222}</string>
@@ -7706,7 +7720,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 				<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</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>
@@ -7843,6 +7857,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 									</object>
 									<string key="NSFrame">{{1, 1}, {411, 264}}</string>
 									<reference key="NSSuperview" ref="666283614"/>
+									<reference key="NSNextKeyView" ref="843242867"/>
 									<reference key="NSDocView" ref="843242867"/>
 									<reference key="NSBGColor" ref="449903125"/>
 									<reference key="NSCursor" ref="32917531"/>
@@ -7872,13 +7887,36 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 							</object>
 							<string key="NSFrame">{{-1, 42}, {413, 266}}</string>
 							<reference key="NSSuperview" ref="749598685"/>
+							<reference key="NSNextKeyView" ref="789153540"/>
 							<int key="NSsFlags">514</int>
 							<reference key="NSVScroller" ref="497829974"/>
 							<reference key="NSHScroller" ref="246464134"/>
 							<reference key="NSContentView" ref="789153540"/>
 						</object>
+						<object class="NSButton" id="677148756">
+							<reference key="NSNextResponder" ref="749598685"/>
+							<int key="NSvFlags">260</int>
+							<string key="NSFrame">{{124, 5}, {76, 28}}</string>
+							<reference key="NSSuperview" ref="749598685"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="1153515">
+								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags2">138018816</int>
+								<string key="NSContents">Copy</string>
+								<reference key="NSSupport" ref="26"/>
+								<reference key="NSControlView" ref="677148756"/>
+								<int key="NSButtonFlags">-2038284033</int>
+								<int key="NSButtonFlags2">1</int>
+								<reference key="NSAlternateImage" ref="932958253"/>
+								<string key="NSAlternateContents"/>
+								<string key="NSKeyEquivalent"/>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+						</object>
 					</object>
 					<string key="NSFrameSize">{411, 341}</string>
+					<reference key="NSSuperview"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
 				<string key="NSMinSize">{350, 222}</string>
@@ -15647,6 +15685,14 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 					</object>
 					<int key="connectionID">6601</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">copyCreateTableSyntaxFromSheet:</string>
+						<reference key="source" ref="427689665"/>
+						<reference key="destination" ref="677148756"/>
+					</object>
+					<int key="connectionID">6608</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -21979,6 +22025,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 							<reference ref="1045688777"/>
 							<reference ref="281286750"/>
 							<reference ref="666283614"/>
+							<reference ref="677148756"/>
 						</object>
 						<reference key="parent" ref="828950706"/>
 					</object>
@@ -22050,6 +22097,20 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 						<reference key="object" ref="497829974"/>
 						<reference key="parent" ref="666283614"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">6606</int>
+						<reference key="object" ref="677148756"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="1153515"/>
+						</object>
+						<reference key="parent" ref="749598685"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">6607</int>
+						<reference key="object" ref="1153515"/>
+						<reference key="parent" ref="677148756"/>
+					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@@ -23382,6 +23443,9 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 					<string>6583.IBPluginDependency</string>
 					<string>6584.IBPluginDependency</string>
 					<string>6585.IBPluginDependency</string>
+					<string>6606.IBPluginDependency</string>
+					<string>6606.ImportedFromIB2</string>
+					<string>6607.IBPluginDependency</string>
 					<string>662.IBPluginDependency</string>
 					<string>662.ImportedFromIB2</string>
 					<string>663.IBPluginDependency</string>
@@ -25304,6 +25368,9 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</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>
 					<integer value="1"/>
@@ -25351,9 +25418,9 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
-					<string>{{795, 383}, {411, 341}}</string>
+					<string>{{711, 412}, {411, 341}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{795, 383}, {411, 341}}</string>
+					<string>{{711, 412}, {411, 341}}</string>
 					<integer value="1"/>
 					<string>{{321, 508}, {411, 341}}</string>
 					<integer value="0"/>
@@ -25489,7 +25556,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">6601</int>
+			<int key="maxID">6608</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -26296,6 +26363,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 							<string>closePasswordSheet:</string>
 							<string>closeSheet:</string>
 							<string>copyCreateTableSyntax:</string>
+							<string>copyCreateTableSyntaxFromSheet:</string>
 							<string>export:</string>
 							<string>exportMultipleTables:</string>
 							<string>exportTable:</string>
@@ -26359,6 +26427,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 							<string>id</string>
 							<string>id</string>
 							<string>id</string>
+							<string>id</string>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="outlets">
diff --git a/Interfaces/English.lproj/Localizable.strings b/Interfaces/English.lproj/Localizable.strings
index 79e0428a..f94937b0 100644
Binary files a/Interfaces/English.lproj/Localizable.strings and b/Interfaces/English.lproj/Localizable.strings differ
diff --git a/Source/SPContentFilterManager.m b/Source/SPContentFilterManager.m
index 8ac609b9..4d15823b 100644
--- a/Source/SPContentFilterManager.m
+++ b/Source/SPContentFilterManager.m
@@ -550,7 +550,7 @@
 		[contentFilterConjunctionLabel setHidden:(numOfArgs < 2)];
 
 		if(numOfArgs > 2) {
-			[resultingClauseLabel setStringValue:NSLocalizedString(@"Error", @"Error")];
+			[resultingClauseLabel setStringValue:NSLocalizedString(@"Error", @"error")];
 			[resultingClauseContentLabel setStringValue:NSLocalizedString(@"Maximum number of arguments is 2!", @"Maximum number of arguments is 2!")];
 		} else {
 			[resultingClauseLabel setStringValue:@"SELECT * FROM <table> WHERE"];
diff --git a/Source/SPPreferenceController.m b/Source/SPPreferenceController.m
index c1a430f9..a0fac783 100644
--- a/Source/SPPreferenceController.m
+++ b/Source/SPPreferenceController.m
@@ -946,12 +946,10 @@
 - (void)setGrowlEnabled:(BOOL)value
 {
 	if (value) {
-		NSRunInformationalAlertPanel(
-			NSLocalizedString(@"growl_prefs_title", "Title for Growl Notifications Alert Dialog"),
-			NSLocalizedString(@"growl_prefs_msg", @"Message for Growl Notifications Alert Dialog"),
-			nil,
-			nil,
-			nil
+		NSBeginInformationalAlertSheet(
+			NSLocalizedString(@"Growl notification preferences", "Growl notification preferences alert title"),
+			nil, nil, nil, [self window], self, nil, nil, nil,
+			NSLocalizedString(@"All Growl notifications are enabled by default. To change which notifications are displayed, go to the Growl Preference Pane in the System Preferences and choose what notifications Growl should display from Sequel Pro.", @"Growl notification preferences alert message")
 		);
 	}
 	
diff --git a/Source/TableDocument.h b/Source/TableDocument.h
index 89603085..2741ca7d 100644
--- a/Source/TableDocument.h
+++ b/Source/TableDocument.h
@@ -188,6 +188,7 @@ enum sp_current_query_mode
 - (IBAction)flushTable:(id)sender;
 - (IBAction)checksumTable:(id)sender;
 - (IBAction)saveCreateSyntax:(id)sender;
+- (IBAction)copyCreateTableSyntaxFromSheet:(id)sender;
 
 // Other methods
 - (void) setQueryMode:(int)theQueryMode;
diff --git a/Source/TableDocument.m b/Source/TableDocument.m
index c685c89b..be05b720 100644
--- a/Source/TableDocument.m
+++ b/Source/TableDocument.m
@@ -1743,6 +1743,27 @@
 	[panel beginSheetForDirectory:nil file:@"CreateSyntax" modalForWindow:createTableSyntaxWindow modalDelegate:self didEndSelector:@selector(savePanelDidEnd:returnCode:contextInfo:) contextInfo:@"CreateSyntax"];
 }
 
+/**
+ * Copy the create syntax in the create syntax text view to the pasteboard.
+ */
+- (IBAction)copyCreateTableSyntaxFromSheet:(id)sender
+{
+	NSString *createSyntax = [createTableSyntaxTextView string];
+	
+	if ([createSyntax length] > 0) {
+		// Copy to the clipboard
+		NSPasteboard *pb = [NSPasteboard generalPasteboard];
+		
+		[pb declareTypes:[NSArray arrayWithObject:NSStringPboardType] owner:self];
+		[pb setString:createSyntax forType:NSStringPboardType];
+		
+		// Table syntax copied Growl notification
+		[[SPGrowlController sharedGrowlController] notifyWithTitle:@"Syntax Copied"
+													   description:[NSString stringWithFormat:NSLocalizedString(@"Syntax for %@ table copied", @"description for table syntax copied growl notification"), [self table]] 
+												  notificationName:@"Syntax Copied"];
+	}
+}
+
 #pragma mark -
 #pragma mark Other Methods
 
diff --git a/Source/TableDump.m b/Source/TableDump.m
index 3f518214..346ae099 100644
--- a/Source/TableDump.m
+++ b/Source/TableDump.m
@@ -735,7 +735,7 @@
 	// Reset progress interface
 	[errorsView setString:@""];
 	[singleProgressTitle setStringValue:NSLocalizedString(@"Importing CSV", @"text showing that the application is importing CSV")];
-	[singleProgressText setStringValue:NSLocalizedString(@"Reading...", @"text showing that app is reading CSV file")];
+	[singleProgressText setStringValue:NSLocalizedString(@"Reading...", @"text showing that app is reading dump")];
 	[singleProgressBar setIndeterminate:YES];
 	[singleProgressBar setUsesThreadedAnimation:YES];
 	[singleProgressBar startAnimation:self];
@@ -1006,7 +1006,7 @@
 
 	// Ensure data was provided, or alert than an import error occurred and return false.
 	if (![importData count]) {
-		NSBeginAlertSheet(NSLocalizedString(@"Error", @"Error"),
+		NSBeginAlertSheet(NSLocalizedString(@"Error", @"error"),
 						  NSLocalizedString(@"OK", @"OK button"),
 						  nil, nil,
 						  tableWindow, self,
-- 
cgit v1.2.3