From 9b5ac7d5073e71e4fc78ee21ba46ad3b593a3ccc Mon Sep 17 00:00:00 2001 From: abhibeckert Date: Sat, 5 Apr 2008 01:38:54 +0000 Subject: rename project; disable software update system (ticket #1) --- CMCopyTable.h | 2 +- CMCopyTable.m | 2 +- CMImageView.h | 4 +- CMImageView.m | 4 +- CMMCPConnection.h | 4 +- CMMCPConnection.m | 6 +- CMMCPResult.h | 4 +- CMMCPResult.m | 6 +- CMTextView.h | 4 +- CMTextView.m | 4 +- CustomQuery.h | 4 +- CustomQuery.m | 16 +-- English.lproj/DBView.nib/info.nib | 2 +- English.lproj/InfoPlist.strings | Bin 522 -> 590 bytes English.lproj/Localizable.strings | Bin 32914 -> 32914 bytes English.lproj/MainMenu.nib/info.nib | 2 +- English.lproj/english_help/cocoamysql_logo.jpg | Bin 1678 -> 0 bytes English.lproj/english_help/index.html | 14 +-- English.lproj/english_help/sequel-pro_logo.jpg | Bin 0 -> 1678 bytes .../english_help/topics/cocoamysql_logo.jpg | Bin 1678 -> 0 bytes English.lproj/english_help/topics/connect.html | 6 +- English.lproj/english_help/topics/console.html | 8 +- English.lproj/english_help/topics/data.html | 4 +- English.lproj/english_help/topics/dump.html | 14 +-- English.lproj/english_help/topics/encoding.html | 6 +- English.lproj/english_help/topics/preferences.html | 10 +- English.lproj/english_help/topics/query.html | 8 +- English.lproj/english_help/topics/reference.html | 4 +- .../english_help/topics/sample_query.html | 4 +- .../english_help/topics/sample_tables.html | 4 +- .../english_help/topics/sequel-pro_logo.jpg | Bin 0 -> 1678 bytes English.lproj/english_help/topics/syntax.html | 8 +- English.lproj/english_help/topics/tables.html | 6 +- Info.plist | 14 +-- KeyChain.h | 4 +- KeyChain.m | 4 +- MainController.h | 4 +- MainController.m | 131 ++++++++++----------- SSHTunnel_old.h | 2 +- SSHTunnel_old.m | 8 +- TableContent.h | 4 +- TableContent.m | 6 +- TableDocument.h | 4 +- TableDocument.m | 18 +-- TableDump.h | 4 +- TableDump.m | 18 +-- TableSource.h | 4 +- TableSource.m | 16 +-- TableStatus.h | 6 +- TablesList.h | 4 +- TablesList.m | 4 +- askForPass.sh | 2 +- sequel-pro.scriptSuite | 2 +- sequel-pro.scriptTerminology | 4 +- 54 files changed, 209 insertions(+), 214 deletions(-) delete mode 100644 English.lproj/english_help/cocoamysql_logo.jpg create mode 100644 English.lproj/english_help/sequel-pro_logo.jpg delete mode 100644 English.lproj/english_help/topics/cocoamysql_logo.jpg create mode 100644 English.lproj/english_help/topics/sequel-pro_logo.jpg diff --git a/CMCopyTable.h b/CMCopyTable.h index 9e767069..18fabde5 100644 --- a/CMCopyTable.h +++ b/CMCopyTable.h @@ -1,6 +1,6 @@ /*! @header CMCopyTable.h - @abstract CocoaMySQL + @abstract sequel-pro @discussion
  $Id:$
  Created by Stuart Glenn on Wed Apr 21 2004.
diff --git a/CMCopyTable.m b/CMCopyTable.m
index 759f0f92..8b46b583 100644
--- a/CMCopyTable.m
+++ b/CMCopyTable.m
@@ -1,6 +1,6 @@
 //
 //  CMCopyTable.m
-//  CocoaMySQL
+//  sequel-pro
 //
 //  Created by Stuart Glenn on Wed Apr 21 2004.
 //  Changed by Lorenz Textor on Sat Nov 13 2004
diff --git a/CMImageView.h b/CMImageView.h
index fb3e9098..c0444240 100644
--- a/CMImageView.h
+++ b/CMImageView.h
@@ -1,6 +1,6 @@
 //
 //  CMImageView.h
-//  CocoaMySQL
+//  sequel-pro
 //
 //  Created by lorenz textor (lorenz@textor.ch) on Sat Sep 06 2003.
 //  Copyright (c) 2002-2003 Lorenz Textor. All rights reserved.
@@ -19,7 +19,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 //
-//  More info at 
+//  More info at 
 //  Or mail to 
 
 #import 
diff --git a/CMImageView.m b/CMImageView.m
index ade12d41..f3757879 100644
--- a/CMImageView.m
+++ b/CMImageView.m
@@ -1,6 +1,6 @@
 //
 //  CMImageView.m
-//  CocoaMySQL
+//  sequel-pro
 //
 //  Created by lorenz textor (lorenz@textor.ch) on Sat Sep 06 2003.
 //  Copyright (c) 2002-2003 Lorenz Textor. All rights reserved.
@@ -19,7 +19,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 //
-//  More info at 
+//  More info at 
 //  Or mail to 
 
 #import "CMImageView.h"
diff --git a/CMMCPConnection.h b/CMMCPConnection.h
index 0957cfb0..1433d885 100644
--- a/CMMCPConnection.h
+++ b/CMMCPConnection.h
@@ -1,6 +1,6 @@
 //
 //  CMMCPConnection.h
-//  CocoaMySQL
+//  sequel-pro
 //
 //  Created by lorenz textor (lorenz@textor.ch) on Wed Sept 21 2005.
 //  Copyright (c) 2002-2003 Lorenz Textor. All rights reserved.
@@ -19,7 +19,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 //
-//  More info at 
+//  More info at 
 //  Or mail to 
 
 #import 
diff --git a/CMMCPConnection.m b/CMMCPConnection.m
index a630b1f7..1e022e40 100644
--- a/CMMCPConnection.m
+++ b/CMMCPConnection.m
@@ -1,6 +1,6 @@
 //
 //  CMMCPConnection.m
-//  CocoaMySQL
+//  sequel-pro
 //
 //  Created by lorenz textor (lorenz@textor.ch) on Wed Sept 21 2005.
 //  Copyright (c) 2002-2003 Lorenz Textor. All rights reserved.
@@ -19,7 +19,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 //
-//  More info at 
+//  More info at 
 //  Or mail to 
 
 #import "CMMCPConnection.h"
@@ -100,7 +100,7 @@
 
 - (CMMCPResult *) queryString:(NSString *) query
 /*
-modified version of queryString to be used in CocoaMySQL
+modified version of queryString to be used in sequel-pro
 */
 {
     CMMCPResult     *theResult;
diff --git a/CMMCPResult.h b/CMMCPResult.h
index b4421caf..c5ab06cf 100644
--- a/CMMCPResult.h
+++ b/CMMCPResult.h
@@ -1,6 +1,6 @@
 //
 //  CMMCPResult.h
-//  CocoaMySQL
+//  sequel-pro
 //
 //  Created by lorenz textor (lorenz@textor.ch) on Wed Sept 21 2005.
 //  Copyright (c) 2002-2003 Lorenz Textor. All rights reserved.
@@ -19,7 +19,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 //
-//  More info at 
+//  More info at 
 //  Or mail to 
 
 #import 
diff --git a/CMMCPResult.m b/CMMCPResult.m
index 7f02da25..77e679ba 100644
--- a/CMMCPResult.m
+++ b/CMMCPResult.m
@@ -1,6 +1,6 @@
 //
 //  CMMCPResult.m
-//  CocoaMySQL
+//  sequel-pro
 //
 //  Created by lorenz textor (lorenz@textor.ch) on Wed Sept 21 2005.
 //  Copyright (c) 2002-2003 Lorenz Textor. All rights reserved.
@@ -19,7 +19,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 //
-//  More info at 
+//  More info at 
 //  Or mail to 
 
 #import "CMMCPResult.h"
@@ -29,7 +29,7 @@
 
 - (id) fetchRowAsType:(MCPReturnType) aType
 /*"
-modified version for use with CocoaMySQL
+modified version for use with sequel-pro
 "*/
 {
     MYSQL_ROW			theRow;
diff --git a/CMTextView.h b/CMTextView.h
index 2067d943..e70c6ea4 100644
--- a/CMTextView.h
+++ b/CMTextView.h
@@ -1,6 +1,6 @@
 //
 //  CMTextView.h
-//  CocoaMySQL
+//  sequel-pro
 //
 //  Created by Carsten BlŸm.
 //
@@ -18,7 +18,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 //
-//  More info at 
+//  More info at 
 //  Or mail to 
 
 #import 
diff --git a/CMTextView.m b/CMTextView.m
index 587bf071..0542ffa8 100644
--- a/CMTextView.m
+++ b/CMTextView.m
@@ -1,6 +1,6 @@
 //
 //  CMTextView.m
-//  CocoaMySQL
+//  sequel-pro
 //
 //  Created by Carsten BlŸm.
 //
@@ -18,7 +18,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 //
-//  More info at 
+//  More info at 
 //  Or mail to 
 
 #import "CMTextView.h"
diff --git a/CustomQuery.h b/CustomQuery.h
index c58ca973..0a3aca94 100644
--- a/CustomQuery.h
+++ b/CustomQuery.h
@@ -1,6 +1,6 @@
 //
 //  CustomQuery.h
-//  CocoaMySQL
+//  sequel-pro
 //
 //  Created by lorenz textor (lorenz@textor.ch) on Wed May 01 2002.
 //  Copyright (c) 2002-2003 Lorenz Textor. All rights reserved.
@@ -19,7 +19,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 //
-//  More info at 
+//  More info at 
 //  Or mail to 
 
 #import 
diff --git a/CustomQuery.m b/CustomQuery.m
index c8a3efd9..7be3dd29 100644
--- a/CustomQuery.m
+++ b/CustomQuery.m
@@ -1,6 +1,6 @@
 //
 //  CustomQuery.m
-//  CocoaMySQL
+//  sequel-pro
 //
 //  Created by lorenz textor (lorenz@textor.ch) on Wed May 01 2002.
 //  Copyright (c) 2002-2003 Lorenz Textor. All rights reserved.
@@ -19,7 +19,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 //
-//  More info at 
+//  More info at 
 //  Or mail to 
 
 #import "CustomQuery.h"
@@ -418,7 +418,7 @@ sets the connection (received from TableDocument) and makes things that have to
         [textView setFont:[NSFont systemFontOfSize:[NSFont smallSystemFontSize]]];
     }
     [textView setContinuousSpellCheckingEnabled:NO];
-    [queryFavoritesView registerForDraggedTypes:[NSArray arrayWithObjects:@"CocoaMySQLPasteboard", nil]];
+    [queryFavoritesView registerForDraggedTypes:[NSArray arrayWithObjects:@"SequelProPasteboard", nil]];
     while ( (column = [enumerator nextObject]) )
     {
         if ( [prefs boolForKey:@"useMonospacedFonts"] ) {
@@ -549,11 +549,11 @@ inserts the query in the textView and performs query
     {
         if ( [rows count] == 1 ) 
         {
-            pboardTypes = [NSArray arrayWithObjects:@"CocoaMySQLPasteboard", nil];
+            pboardTypes = [NSArray arrayWithObjects:@"SequelProPasteboard", nil];
             originalRow = [[rows objectAtIndex:0] intValue];
     
             [pboard declareTypes:pboardTypes owner:nil];
-            [pboard setString:[[NSNumber numberWithInt:originalRow] stringValue] forType:@"CocoaMySQLPasteboard"];
+            [pboard setString:[[NSNumber numberWithInt:originalRow] stringValue] forType:@"SequelProPasteboard"];
             
             return YES;
         } 
@@ -587,9 +587,9 @@ inserts the query in the textView and performs query
     if ( aTableView == queryFavoritesView ) {
         if ([pboardTypes count] == 1 && row != -1)
         {
-            if ([[pboardTypes objectAtIndex:0] isEqualToString:@"CocoaMySQLPasteboard"]==YES && operation==NSTableViewDropAbove)
+            if ([[pboardTypes objectAtIndex:0] isEqualToString:@"SequelProPasteboard"]==YES && operation==NSTableViewDropAbove)
             {
-                originalRow = [[[info draggingPasteboard] stringForType:@"CocoaMySQLPasteboard"] intValue];
+                originalRow = [[[info draggingPasteboard] stringForType:@"SequelProPasteboard"] intValue];
     
                 if (row != originalRow && row != (originalRow+1))
                 {
@@ -610,7 +610,7 @@ inserts the query in the textView and performs query
     NSMutableDictionary *draggedRow;
 
     if ( aTableView == queryFavoritesView ) {
-        originalRow = [[[info draggingPasteboard] stringForType:@"CocoaMySQLPasteboard"] intValue];
+        originalRow = [[[info draggingPasteboard] stringForType:@"SequelProPasteboard"] intValue];
         destinationRow = row;
     
         if ( destinationRow > originalRow )
diff --git a/English.lproj/DBView.nib/info.nib b/English.lproj/DBView.nib/info.nib
index 1768354f..8f6ec530 100644
--- a/English.lproj/DBView.nib/info.nib
+++ b/English.lproj/DBView.nib/info.nib
@@ -5,7 +5,7 @@
 	IBFramework Version
 	629
 	IBLastKnownRelativeProjectPath
-	../../CocoaMySQL.xcodeproj
+	../../sequel-pro.xcodeproj
 	IBOldestOS
 	5
 	IBOpenObjects
diff --git a/English.lproj/InfoPlist.strings b/English.lproj/InfoPlist.strings
index 75a6435f..d23d35e4 100644
Binary files a/English.lproj/InfoPlist.strings and b/English.lproj/InfoPlist.strings differ
diff --git a/English.lproj/Localizable.strings b/English.lproj/Localizable.strings
index 850c72e8..1646888a 100644
Binary files a/English.lproj/Localizable.strings and b/English.lproj/Localizable.strings differ
diff --git a/English.lproj/MainMenu.nib/info.nib b/English.lproj/MainMenu.nib/info.nib
index 7517302b..33181e88 100644
--- a/English.lproj/MainMenu.nib/info.nib
+++ b/English.lproj/MainMenu.nib/info.nib
@@ -5,7 +5,7 @@
 	IBFramework Version
 	629
 	IBLastKnownRelativeProjectPath
-	../../CocoaMySQL.xcodeproj
+	../../sequel-pro.xcodeproj
 	IBOldestOS
 	5
 	IBOpenObjects
diff --git a/English.lproj/english_help/cocoamysql_logo.jpg b/English.lproj/english_help/cocoamysql_logo.jpg
deleted file mode 100644
index 3308dc6c..00000000
Binary files a/English.lproj/english_help/cocoamysql_logo.jpg and /dev/null differ
diff --git a/English.lproj/english_help/index.html b/English.lproj/english_help/index.html
index 11d70d7f..acb42cdf 100755
--- a/English.lproj/english_help/index.html
+++ b/English.lproj/english_help/index.html
@@ -1,7 +1,7 @@
 
 
-CocoaMySQL Help
-
+Sequel Pro Help
+
 
 
 
@@ -15,10 +15,10 @@
 
@@ -66,12 +66,10 @@
 		
- + -

CocoaMySQL Help

+

Sequel Pro Help

- CocoaMySQL Websites + Sequel Pro Websites
- http://cocoamysql.sourceforge.net/ -
- http://sourceforge.net/projects/cocoamysql/ + http://code.google.com/p/sequel-pro/


diff --git a/English.lproj/english_help/sequel-pro_logo.jpg b/English.lproj/english_help/sequel-pro_logo.jpg new file mode 100644 index 00000000..3308dc6c Binary files /dev/null and b/English.lproj/english_help/sequel-pro_logo.jpg differ diff --git a/English.lproj/english_help/topics/cocoamysql_logo.jpg b/English.lproj/english_help/topics/cocoamysql_logo.jpg deleted file mode 100644 index 3308dc6c..00000000 Binary files a/English.lproj/english_help/topics/cocoamysql_logo.jpg and /dev/null differ diff --git a/English.lproj/english_help/topics/connect.html b/English.lproj/english_help/topics/connect.html index b32c0dc8..2fbe0864 100755 --- a/English.lproj/english_help/topics/connect.html +++ b/English.lproj/english_help/topics/connect.html @@ -1,6 +1,6 @@ -CocoaMySQL Help - Connecting to a Database +Sequel Pro Help - Connecting to a Database @@ -14,7 +14,7 @@ @@ -42,7 +42,7 @@
  • Enter at least the host (IP or domain name). To connect to a local database, enter localhost or 127.0.0.1 as host.
  • If you enter a database, it will be selected when the connection to the server is established. Otherwise you can select one of the databases on the server afterwards.
  • -
  • If you enter no port, CocoaMySQL uses the default port.
  • +
  • If you enter no port, Sequel Pro uses the default port.
  • Choose "Save to favorites..." in the favorites popup-button to save a connection. Passwords are stored in the Keychain. To edit favorites open the Preferences.
  • You can connect to multiple databases by opening a new window (Menu File > New)
diff --git a/English.lproj/english_help/topics/console.html b/English.lproj/english_help/topics/console.html index 6bd2a8f3..1269dc38 100755 --- a/English.lproj/english_help/topics/console.html +++ b/English.lproj/english_help/topics/console.html @@ -1,6 +1,6 @@ -CocoaMySQL Help - Actions Console +Sequel Pro Help - Actions Console @@ -14,7 +14,7 @@
- +

Connecting to a Database

@@ -32,11 +32,11 @@

- The Console at the bottom of CocoaMySQL lists all of the actions you made in the current session accompanied by a timestamp. + The Console at the bottom of Sequel Pro lists all of the actions you made in the current session accompanied by a timestamp. It can be shown or hidden using the toolbar icon at the top that says "Show/Hide Console". You can also clear the console by using the "Clear Console" button. If those two icons are not located in your toolbar then right-click in the toolbar area and select "Customize Toolbar..." from the menu. You should then see a window -of icons which you can add to your CocoaMySQL toolbar including the two mentioned above. +of icons which you can add to your Sequel Pro toolbar including the two mentioned above.

diff --git a/English.lproj/english_help/topics/data.html b/English.lproj/english_help/topics/data.html index 109e7b0c..14aaeb9f 100755 --- a/English.lproj/english_help/topics/data.html +++ b/English.lproj/english_help/topics/data.html @@ -1,6 +1,6 @@ -CocoaMySQL Help - Data Management +Sequel Pro Help - Data Management @@ -14,7 +14,7 @@
- +

Console

diff --git a/English.lproj/english_help/topics/dump.html b/English.lproj/english_help/topics/dump.html index f50804f1..99123b69 100755 --- a/English.lproj/english_help/topics/dump.html +++ b/English.lproj/english_help/topics/dump.html @@ -1,6 +1,6 @@ -CocoaMySQL Help - Data Dumps +Sequel Pro Help - Data Dumps @@ -14,7 +14,7 @@
- +

Data Management

@@ -32,10 +32,10 @@

- In order to perform actions with data dumps, you must use the "File->Import; File->Export" menu options of CocoaMySQL. A variety -of exports/dumps can be performed: CocoaMySQL dump, Export of Table Content Results (csv or xml format), Export of Custom + In order to perform actions with data dumps, you must use the "File->Import; File->Export" menu options of Sequel Pro. A variety +of exports/dumps can be performed: Sequel Pro dump, Export of Table Content Results (csv or xml format), Export of Custom Query Results (csv or xml format), or Export of Multiple Table data (csv or xml format). On the other hand, you can only import a -CocoaMySQL dump or a CSV file. +Sequel Pro dump or a CSV file.

CSV File Format Information @@ -61,8 +61,8 @@ CocoaMySQL dump or a CSV file. diff --git a/English.lproj/english_help/topics/encoding.html b/English.lproj/english_help/topics/encoding.html index c824d70c..adaed683 100755 --- a/English.lproj/english_help/topics/encoding.html +++ b/English.lproj/english_help/topics/encoding.html @@ -1,6 +1,6 @@ -CocoaMySQL Help - Text Encoding +Sequel Pro Help - Text Encoding @@ -14,7 +14,7 @@
- +

Data Dumps

    -
  • Choose "File->Import" from the CocoaMySQL Menu
  • -
  • You must choose to import a CSV file (table data) or a CocoaMySQL dump (varied information)
  • +
  • Choose "File->Import" from the Sequel Pro Menu
  • +
  • You must choose to import a CSV file (table data) or a Sequel Pro dump (varied information)
@@ -43,7 +43,7 @@ are over 20 encodings for you to choose from.
- +

Text Encoding

    -
  • Open up the "Preferences Pane" of CocoaMySQL
  • +
  • Open up the "Preferences Pane" of Sequel Pro
  • From the pull-down at the bottom left of the preferences window, labelled "Default Encoding", choose an option.
  • The encoding you choose will be the default encoding for all future databases
diff --git a/English.lproj/english_help/topics/preferences.html b/English.lproj/english_help/topics/preferences.html index 66ae21a8..0350d76b 100755 --- a/English.lproj/english_help/topics/preferences.html +++ b/English.lproj/english_help/topics/preferences.html @@ -1,6 +1,6 @@ -CocoaMySQL Help - Setting Preferences +Sequel Pro Help - Setting Preferences @@ -14,7 +14,7 @@ @@ -38,9 +38,9 @@
- +

Setting Preferences

    -
  • Choose if you want to reload the table after adding, editing or removing a row. If you reload it, you will be sure that the entries showed by CocoaMySQL correspond to the entries in the MySQL database, but editing tables will become slow with big tables.
  • -
  • Choose if you want CocoaMySQL to show an error message if no rows have been affected after adding or editing a row.
  • -
  • Choose if you want to display the values of blob and text fields (especially with big tables this can speed up the interface significantly because CocoaMySQL will load only the blob and text fields of the rows you will be editing).
  • +
  • Choose if you want to reload the table after adding, editing or removing a row. If you reload it, you will be sure that the entries showed by Sequel Pro correspond to the entries in the MySQL database, but editing tables will become slow with big tables.
  • +
  • Choose if you want Sequel Pro to show an error message if no rows have been affected after adding or editing a row.
  • +
  • Choose if you want to display the values of blob and text fields (especially with big tables this can speed up the interface significantly because Sequel Pro will load only the blob and text fields of the rows you will be editing).
  • Choose if you want to limit the rows returned by the MySQL server. You can limit the result to a given number of rows to speed up the interface.
  • Select a value that is displayed and used to enter NULL-values.
  • Add favorites used to quickly connect to a MySQL database. Drag&drop them to change their order. Double-click to edit a favorite. Passwords are stored in the Keychain.
  • diff --git a/English.lproj/english_help/topics/query.html b/English.lproj/english_help/topics/query.html index 2be8ebe9..bb628047 100755 --- a/English.lproj/english_help/topics/query.html +++ b/English.lproj/english_help/topics/query.html @@ -1,6 +1,6 @@ -CocoaMySQL Help - Performing Custom Queries +Sequel Pro Help - Performing Custom Queries @@ -14,7 +14,7 @@ @@ -45,8 +45,8 @@
  • Under "Last Error Message" you can see the last error message returned by MySQL, if there is one.
  • Add your query to the favorites or select a favorite query with the favorites pop-up-button.
  • Select one of the last 20 queries with the history pop-up-button.
  • -
  • You can perform custom queries out of your favorite text editor by using the services menu (Services > CocoaMySQL > Perform selection as MySQL query). CocoaMySQL uses the last opened window to perform the query.
  • -
  • If you perferm a query out of a different text editor, be sure that CocoaMySQL is already loaded and has at least one window open.
  • +
  • You can perform custom queries out of your favorite text editor by using the services menu (Services > Sequel Pro > Perform selection as MySQL query). Sequel Pro uses the last opened window to perform the query.
  • +
  • If you perferm a query out of a different text editor, be sure that Sequel Pro is already loaded and has at least one window open.
  • diff --git a/English.lproj/english_help/topics/reference.html b/English.lproj/english_help/topics/reference.html index 532d29b4..b746bed9 100755 --- a/English.lproj/english_help/topics/reference.html +++ b/English.lproj/english_help/topics/reference.html @@ -1,6 +1,6 @@ -CocoaMySQL Help - MySQL SQL Referernce +Sequel Pro Help - MySQL SQL Referernce @@ -14,7 +14,7 @@
    - +

    Performing Custom Queries

    diff --git a/English.lproj/english_help/topics/sample_query.html b/English.lproj/english_help/topics/sample_query.html index c77723df..66b249fd 100755 --- a/English.lproj/english_help/topics/sample_query.html +++ b/English.lproj/english_help/topics/sample_query.html @@ -1,6 +1,6 @@ -CocoaMySQL Help - SQL Query Examples +Sequel Pro Help - SQL Query Examples @@ -14,7 +14,7 @@
    - +

    MySQL SQL Reference

    diff --git a/English.lproj/english_help/topics/sample_tables.html b/English.lproj/english_help/topics/sample_tables.html index 908f55aa..ba61c094 100755 --- a/English.lproj/english_help/topics/sample_tables.html +++ b/English.lproj/english_help/topics/sample_tables.html @@ -1,6 +1,6 @@ -CocoaMySQL Help - SQL Table Examples +Sequel Pro Help - SQL Table Examples @@ -14,7 +14,7 @@
    - +

    SQL Query Examples

    diff --git a/English.lproj/english_help/topics/sequel-pro_logo.jpg b/English.lproj/english_help/topics/sequel-pro_logo.jpg new file mode 100644 index 00000000..3308dc6c Binary files /dev/null and b/English.lproj/english_help/topics/sequel-pro_logo.jpg differ diff --git a/English.lproj/english_help/topics/syntax.html b/English.lproj/english_help/topics/syntax.html index 0aeb52ac..39c4da72 100755 --- a/English.lproj/english_help/topics/syntax.html +++ b/English.lproj/english_help/topics/syntax.html @@ -1,6 +1,6 @@ -CocoaMySQL Help - Table Syntax Generation +Sequel Pro Help - Table Syntax Generation @@ -14,7 +14,7 @@
    - +

    SQL Table Examples

    @@ -33,11 +33,11 @@
     If you would like to generate a SQL output of your table's syntax (column types, sizes, keys, table name, etc..) use -the "Create Table Syntax" icon at the top of the application in the CocoaMySQL Toolbar area. You can then use that text to +the "Create Table Syntax" icon at the top of the application in the Sequel Pro Toolbar area. You can then use that text to create a copy of the table in another database or it may also serve as a backup of the table's schema. If the "Create Table Syntax" icon is not located in your toolbar then right-click in the toolbar area and select "Customize Toolbar..." from the menu. You should then see a window -of icons which you can add to your CocoaMySQL toolbar including the one mentioned above. +of icons which you can add to your Sequel Pro toolbar including the one mentioned above.

    diff --git a/English.lproj/english_help/topics/tables.html b/English.lproj/english_help/topics/tables.html index 7b56fc10..3840bb26 100755 --- a/English.lproj/english_help/topics/tables.html +++ b/English.lproj/english_help/topics/tables.html @@ -1,6 +1,6 @@ -CocoaMySQL Help - Managing Tables +Sequel Pro Help - Managing Tables @@ -14,7 +14,7 @@
    - +

    Table Syntax Generation

    @@ -59,7 +59,7 @@
    • Add or remove tables with the plus- and minus-buttons.
    • -
    • If you add a table, CocoaMySQL creates a field called "id" because a table must have at least one column. You can change or delete this field afterwards.
    • +
    • If you add a table, Sequel Pro creates a field called "id" because a table must have at least one column. You can change or delete this field afterwards.
    • Change the name of a table by double-clicking on it. Hit the esc-key to cancel editing.
    • Select a table and hit the copy button under the list of tables to copy it. If you mark "Copy table content", the new table will also contain all entries of the old table.
    diff --git a/Info.plist b/Info.plist index 54ca1909..2e93a38f 100644 --- a/Info.plist +++ b/Info.plist @@ -26,21 +26,21 @@ CFBundleExecutable - CocoaMySQL + Sequel Pro CFBundleGetInfoString - CocoaMySQL + Sequel Pro CFBundleHelpBookFolder english_help CFBundleHelpBookName - CocoaMySQL Help + Sequel Pro Help CFBundleIconFile appicon.icns CFBundleIdentifier - com.textor.CocoaMySQL + com.google.code.sequel-pro CFBundleInfoDictionaryVersion 6.0 CFBundleName - CocoaMySQL + Sequel Pro CFBundlePackageType APPL CFBundleShortVersionString @@ -66,12 +66,12 @@ NSMenuItem default - CocoaMySQL/Perform selection as MySQL query + Sequel Pro/Perform selection as MySQL query NSMessage doPerformQueryService NSPortName - CocoaMySQL + Sequel Pro NSSendTypes NSStringPboardType diff --git a/KeyChain.h b/KeyChain.h index 938424de..f0caf0da 100644 --- a/KeyChain.h +++ b/KeyChain.h @@ -1,6 +1,6 @@ // // KeyChain.h -// CocoaMySQL +// sequel-pro // // Created by lorenz textor (lorenz@textor.ch) on Wed Dec 25 2002. // Copyright (c) 2002-2003 Lorenz Textor. All rights reserved. @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// More info at +// More info at // Or mail to #import diff --git a/KeyChain.m b/KeyChain.m index 20264411..7e71c489 100644 --- a/KeyChain.m +++ b/KeyChain.m @@ -1,6 +1,6 @@ // // KeyChain.m -// CocoaMySQL +// sequel-pro // // Created by lorenz textor (lorenz@textor.ch) on Wed Dec 25 2002. // Copyright (c) 2002-2003 Lorenz Textor. All rights reserved. @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// More info at +// More info at // Or mail to #import "KeyChain.h" diff --git a/MainController.h b/MainController.h index ac4349ce..39ebc77e 100644 --- a/MainController.h +++ b/MainController.h @@ -1,6 +1,6 @@ // // MainController.h -// CocoaMySQL +// sequel-pro // // Created by lorenz textor (lorenz@textor.ch) on Wed May 01 2002. // Copyright (c) 2002-2003 Lorenz Textor. All rights reserved. @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// More info at +// More info at // Or mail to #import diff --git a/MainController.m b/MainController.m index 67afec9c..8256a1a2 100644 --- a/MainController.m +++ b/MainController.m @@ -1,6 +1,6 @@ // // MainController.m -// CocoaMySQL +// sequel-pro // // Created by lorenz textor (lorenz@textor.ch) on Wed May 01 2002. // Copyright (c) 2002-2003 Lorenz Textor. All rights reserved. @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// More info at +// More info at // Or mail to #import "MainController.h" @@ -168,12 +168,12 @@ adds a favorite [favorites addObject:favorite]; if ( ![[passwordField stringValue] isEqualToString:@""] ) [keyChainInstance addPassword:[passwordField stringValue] - forName:[NSString stringWithFormat:@"CocoaMySQL : %@", [nameField stringValue]] + forName:[NSString stringWithFormat:@"Sequel Pro : %@", [nameField stringValue]] account:[NSString stringWithFormat:@"%@@%@/%@", [userField stringValue], [hostField stringValue], [databaseField stringValue]]]; if ( ![sshPassword isEqualToString:@""] ) [keyChainInstance addPassword:sshPassword - forName:[NSString stringWithFormat:@"CocoaMySQL SSHTunnel : %@", [nameField stringValue]] + forName:[NSString stringWithFormat:@"Sequel Pro SSHTunnel : %@", [nameField stringValue]] account:[NSString stringWithFormat:@"%@@%@/%@", [userField stringValue], [hostField stringValue], [databaseField stringValue]]]; [tableView reloadData]; @@ -195,9 +195,9 @@ removes a favorite NSString *user = [[favorites objectAtIndex:[tableView selectedRow]] objectForKey:@"user"]; NSString *host = [[favorites objectAtIndex:[tableView selectedRow]] objectForKey:@"host"]; NSString *database = [[favorites objectAtIndex:[tableView selectedRow]] objectForKey:@"database"]; - [keyChainInstance deletePasswordForName:[NSString stringWithFormat:@"CocoaMySQL : %@", name] + [keyChainInstance deletePasswordForName:[NSString stringWithFormat:@"Sequel Pro : %@", name] account:[NSString stringWithFormat:@"%@@%@/%@", user, host, database]]; - [keyChainInstance deletePasswordForName:[NSString stringWithFormat:@"CocoaMySQL SSHTunnel : %@", name] + [keyChainInstance deletePasswordForName:[NSString stringWithFormat:@"Sequel Pro SSHTunnel : %@", name] account:[NSString stringWithFormat:@"%@@%@/%@", user, host, database]]; [favorites removeObjectAtIndex:[tableView selectedRow]]; [tableView reloadData]; @@ -333,7 +333,7 @@ passes the query to the last created document opens donate link in default browser */ { - [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"https://www.paypal.com/xclick/business=lorenz%40textor.ch&item_name=CocoaMySQL+donation&no_shipping=1&return=http%3A//cocoamysql.sourceforge.net/thanks.html&cancel_return=http%3A//cocoamysql.sourceforge.net/thanks.html&cn=Note&tax=0¤cy_code=USD"]]; + [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"http://code.google.com/p/sequel-pro/wiki/Donations"]]; } //menu methods @@ -342,7 +342,7 @@ opens donate link in default browser opens donate link in default browser */ { - [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"http://cocoamysql.sourceforge.net"]]; + [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"http://code.google.com/p/sequel-pro"]]; } - (IBAction)visitHelpWebsite:(id)sender @@ -350,7 +350,7 @@ opens donate link in default browser opens donate link in default browser */ { - [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"http://cocoamysql.sourceforge.net/faq.php"]]; + [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"http://code.google.com/p/sequel-pro/faq.php"]]; } - (IBAction)checkForUpdates:(id)sender @@ -358,46 +358,47 @@ opens donate link in default browser checks for updates and opens download page in default browser */ { - CMMCPConnection *tempConnection = [[CMMCPConnection alloc] initToHost:@"cocoamysql.textor.ch" - withLogin:@"cocoamysql" - password:@"" - usingPort:nil]; - CMMCPResult *tempResult; - NSString *version; - int code; - -//connect to db - if ( ![tempConnection isConnected] ) { - //no connection - NSRunAlertPanel(NSLocalizedString(@"Error", @"error"), NSLocalizedString(@"Error while trying to get the current version number!\nBe sure that you are connected to the internet and try again later.", @"message of panel when check for current version number failed"), NSLocalizedString(@"OK", @"OK button"), nil, nil); - return; - } - if ( ![tempConnection selectDB:@"usr_web8_1"] ) { - //db not found - NSRunAlertPanel(NSLocalizedString(@"Error", @"error"), NSLocalizedString(@"Error while trying to get the current version number!\nBe sure that you are connected to the internet and try again later.", @"message of panel when check for current version number failed"), NSLocalizedString(@"OK", @"OK button"), nil, nil); - return; - } -//get current version - tempResult = [tempConnection queryString:@"SELECT * FROM cocoamysql"]; - if ( ![tempResult numOfRows] ) { - //error in query - NSRunAlertPanel(NSLocalizedString(@"Error", @"error"), NSLocalizedString(@"Error while trying to get the current version number!\nBe sure that you are connected to the internet and try again later.", @"message of panel when check for current version number failed"), NSLocalizedString(@"OK", @"OK button"), nil, nil); - return; - } - version = [[tempResult fetchRowAsArray] objectAtIndex:0]; -//check versions - if ( [version isEqualToString:[[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleVersion"]] ) { - //no new version - NSRunInformationalAlertPanel(NSLocalizedString(@"No update available", @"title of panel when no update is available"), NSLocalizedString(@"There is no newer version available!", @"message of panel when no update is available"), NSLocalizedString(@"OK", @"OK button"), nil, nil); - } else { - //new version available - code = NSRunInformationalAlertPanel(NSLocalizedString(@"Update available", @"title of panel when update is available"), [NSString stringWithFormat:NSLocalizedString(@"There is a newer version available (version %@)!\nClick OK to open the download site.", @"message of panel when update is available"), version], NSLocalizedString(@"OK", @"OK button"), NSLocalizedString(@"Cancel", @"cancel button"), nil); - if ( code == NSAlertDefaultReturn ) { - [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"http://cocoamysql.sourceforge.net/download.php"]]; - } - } - [tempConnection disconnect]; - [tempConnection release]; + NSLog(@"[MainController checkForUpdates:] is not currently functional."); +// CMMCPConnection *tempConnection = [[CMMCPConnection alloc] initToHost:@"com.google.code.sequel-pro" +// withLogin:@"sequel-pro" +// password:@"" +// usingPort:nil]; +// CMMCPResult *tempResult; +// NSString *version; +// int code; +// +// //connect to db +// if ( ![tempConnection isConnected] ) { +// //no connection +// NSRunAlertPanel(NSLocalizedString(@"Error", @"error"), NSLocalizedString(@"Error while trying to get the current version number!\nBe sure that you are connected to the internet and try again later.", @"message of panel when check for current version number failed"), NSLocalizedString(@"OK", @"OK button"), nil, nil); +// return; +// } +// if ( ![tempConnection selectDB:@"usr_web8_1"] ) { +// //db not found +// NSRunAlertPanel(NSLocalizedString(@"Error", @"error"), NSLocalizedString(@"Error while trying to get the current version number!\nBe sure that you are connected to the internet and try again later.", @"message of panel when check for current version number failed"), NSLocalizedString(@"OK", @"OK button"), nil, nil); +// return; +// } +// //get current version +// tempResult = [tempConnection queryString:@"SELECT * FROM sequel-pro"]; +// if ( ![tempResult numOfRows] ) { +// //error in query +// NSRunAlertPanel(NSLocalizedString(@"Error", @"error"), NSLocalizedString(@"Error while trying to get the current version number!\nBe sure that you are connected to the internet and try again later.", @"message of panel when check for current version number failed"), NSLocalizedString(@"OK", @"OK button"), nil, nil); +// return; +// } +// version = [[tempResult fetchRowAsArray] objectAtIndex:0]; +// //check versions +// if ( [version isEqualToString:[[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleVersion"]] ) { +// //no new version +// NSRunInformationalAlertPanel(NSLocalizedString(@"No update available", @"title of panel when no update is available"), NSLocalizedString(@"There is no newer version available!", @"message of panel when no update is available"), NSLocalizedString(@"OK", @"OK button"), nil, nil); +// } else { +// //new version available +// code = NSRunInformationalAlertPanel(NSLocalizedString(@"Update available", @"title of panel when update is available"), [NSString stringWithFormat:NSLocalizedString(@"There is a newer version available (version %@)!\nClick OK to open the download site.", @"message of panel when update is available"), version], NSLocalizedString(@"OK", @"OK button"), NSLocalizedString(@"Cancel", @"cancel button"), nil); +// if ( code == NSAlertDefaultReturn ) { +// [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"http://code.google.com/p/sequel-pro/download.php"]]; +// } +// } +// [tempConnection disconnect]; +// [tempConnection release]; } @@ -422,11 +423,11 @@ checks for updates and opens download page in default browser NSArray *pboardTypes; if ( [rows count] == 1 ) { - pboardTypes=[NSArray arrayWithObjects:@"CocoaMySQLPreferencesPasteboard", nil]; + pboardTypes=[NSArray arrayWithObjects:@"SequelProPreferencesPasteboard", nil]; originalRow = [[rows objectAtIndex:0] intValue]; [pboard declareTypes:pboardTypes owner:nil]; - [pboard setString:[[NSNumber numberWithInt:originalRow] stringValue] forType:@"CocoaMySQLPreferencesPasteboard"]; + [pboard setString:[[NSNumber numberWithInt:originalRow] stringValue] forType:@"SequelProPreferencesPasteboard"]; return YES; } else { @@ -442,9 +443,9 @@ checks for updates and opens download page in default browser if ([pboardTypes count] == 1 && row != -1) { - if ([[pboardTypes objectAtIndex:0] isEqualToString:@"CocoaMySQLPreferencesPasteboard"]==YES && operation==NSTableViewDropAbove) + if ([[pboardTypes objectAtIndex:0] isEqualToString:@"SequelProPreferencesPasteboard"]==YES && operation==NSTableViewDropAbove) { - originalRow = [[[info draggingPasteboard] stringForType:@"CocoaMySQLPreferencesPasteboard"] intValue]; + originalRow = [[[info draggingPasteboard] stringForType:@"SequelProPreferencesPasteboard"] intValue]; if (row != originalRow && row != (originalRow+1)) { @@ -462,7 +463,7 @@ checks for updates and opens download page in default browser int destinationRow; NSMutableDictionary *draggedRow; - originalRow = [[[info draggingPasteboard] stringForType:@"CocoaMySQLPreferencesPasteboard"] intValue]; + originalRow = [[[info draggingPasteboard] stringForType:@"SequelProPreferencesPasteboard"] intValue]; destinationRow = row; if ( destinationRow > originalRow ) @@ -494,7 +495,7 @@ opens sheet to edit favorite and saves favorite if user hit OK [portField setStringValue:[favorite objectForKey:@"port"]]; [databaseField setStringValue:[favorite objectForKey:@"database"]]; [passwordField setStringValue:[keyChainInstance - getPasswordForName:[NSString stringWithFormat:@"CocoaMySQL : %@", [nameField stringValue]] + getPasswordForName:[NSString stringWithFormat:@"Sequel Pro : %@", [nameField stringValue]] account:[NSString stringWithFormat:@"%@@%@/%@", [userField stringValue], [hostField stringValue], [databaseField stringValue]]]]; // set up ssh fields @@ -508,7 +509,7 @@ opens sheet to edit favorite and saves favorite if user hit OK [sshUserField setStringValue:[favorite objectForKey:@"sshUser"]]; [sshPortField setStringValue:[favorite objectForKey:@"sshPort"]]; [sshPasswordField setStringValue:[keyChainInstance - getPasswordForName:[NSString stringWithFormat:@"CocoaMySQL SSHTunnel : %@", [nameField stringValue]] + getPasswordForName:[NSString stringWithFormat:@"Sequel Pro SSHTunnel : %@", [nameField stringValue]] account:[NSString stringWithFormat:@"%@@%@/%@", [userField stringValue], [hostField stringValue], [databaseField stringValue]]]]; } else { @@ -571,21 +572,21 @@ opens sheet to edit favorite and saves favorite if user hit OK ssh = [NSNumber numberWithInt:0]; } //replace password - [keyChainInstance deletePasswordForName:[NSString stringWithFormat:@"CocoaMySQL : %@", [favorite objectForKey:@"name"]] + [keyChainInstance deletePasswordForName:[NSString stringWithFormat:@"Sequel Pro : %@", [favorite objectForKey:@"name"]] account:[NSString stringWithFormat:@"%@@%@/%@", [favorite objectForKey:@"user"], [favorite objectForKey:@"host"], [favorite objectForKey:@"database"]]]; if ( ![[passwordField stringValue] isEqualToString:@""] ) [keyChainInstance addPassword:[passwordField stringValue] - forName:[NSString stringWithFormat:@"CocoaMySQL : %@", [nameField stringValue]] + forName:[NSString stringWithFormat:@"Sequel Pro : %@", [nameField stringValue]] account:[NSString stringWithFormat:@"%@@%@/%@", [userField stringValue], [hostField stringValue], [databaseField stringValue]]]; //replace ssh password - [keyChainInstance deletePasswordForName:[NSString stringWithFormat:@"CocoaMySQL SSHTunnel : %@", [favorite objectForKey:@"name"]] + [keyChainInstance deletePasswordForName:[NSString stringWithFormat:@"Sequel Pro SSHTunnel : %@", [favorite objectForKey:@"name"]] account:[NSString stringWithFormat:@"%@@%@/%@", [favorite objectForKey:@"user"], [favorite objectForKey:@"host"], [favorite objectForKey:@"database"]]]; if ( ([sshCheckbox state] == NSOnState) && ![sshPassword isEqualToString:@""] ) { [keyChainInstance addPassword:sshPassword - forName:[NSString stringWithFormat:@"CocoaMySQL SSHTunnel : %@", [nameField stringValue]] + forName:[NSString stringWithFormat:@"Sequel Pro SSHTunnel : %@", [nameField stringValue]] account:[NSString stringWithFormat:@"%@@%@/%@", [userField stringValue], [hostField stringValue], [databaseField stringValue]]]; } @@ -713,7 +714,7 @@ code that need to be executed when the nib file is loaded [prefs removeObjectForKey:@"allowDragAndDropReordering"]; //rewrite passwords to keychain (with new format) if ( [prefs objectForKey:@"favorites"] ) { - NSRunAlertPanel(NSLocalizedString(@"Warning", @"warning"), NSLocalizedString(@"With version 0.4 CocoaMySQL has introduced a new format to save passwords in the Keychain.\nPlease allow CocoaMySQL to decrypt all passwords of your favorites. Otherwise you have to reenter all passwords of your saved favorites in the Preferences.", @"message of panel when passwords have to be updated for v0.4"), NSLocalizedString(@"OK", @"OK button"), nil, nil); + NSRunAlertPanel(NSLocalizedString(@"Warning", @"warning"), NSLocalizedString(@"With version 0.4 Sequel Pro has introduced a new format to save passwords in the Keychain.\nPlease allow Sequel Pro to decrypt all passwords of your favorites. Otherwise you have to reenter all passwords of your saved favorites in the Preferences.", @"message of panel when passwords have to be updated for v0.4"), NSLocalizedString(@"OK", @"OK button"), nil, nil); enumerator = [[prefs objectForKey:@"favorites"] objectEnumerator]; while ( (favorite = [enumerator nextObject]) ) { //replace password @@ -726,7 +727,7 @@ code that need to be executed when the nib file is loaded [keyChainInstance deletePasswordForName:[NSString stringWithFormat:@"%@/%@", host, database] account:user]; if ( ![password isEqualToString:@""] ) [keyChainInstance addPassword:password - forName:[NSString stringWithFormat:@"CocoaMySQL : %@", name] + forName:[NSString stringWithFormat:@"Sequel Pro : %@", name] account:[NSString stringWithFormat:@"%@@%@/%@", user, host, database]]; } } @@ -759,10 +760,6 @@ code that need to be executed when the nib file is loaded [prefs setObject:@"0.7b3" forKey:@"version"]; [prefs setObject:@"Autodetect" forKey:@"encoding"]; [prefs setBool:YES forKey:@"fetchRowCount"]; - code = NSRunInformationalAlertPanel(NSLocalizedString(@"Donation", @"title of donation panel"), NSLocalizedString(@"CocoaMySQL lives from donations. Thank you for donating!","message of donation panel"), NSLocalizedString(@"Donate", @"donate button"), NSLocalizedString(@"Later", @"later button"), nil); - if ( code == NSAlertDefaultReturn ) { - [self donate:self]; - } } //set up interface @@ -773,7 +770,7 @@ code that need to be executed when the nib file is loaded [[column dataCell] setFont:[NSFont systemFontOfSize:[NSFont smallSystemFontSize]]]; } */ - [tableView registerForDraggedTypes:[NSArray arrayWithObjects:@"CocoaMySQLPreferencesPasteboard", nil]]; + [tableView registerForDraggedTypes:[NSArray arrayWithObjects:@"SequelProPreferencesPasteboard", nil]]; [tableView reloadData]; } diff --git a/SSHTunnel_old.h b/SSHTunnel_old.h index f6d0e03c..f70d3a52 100755 --- a/SSHTunnel_old.h +++ b/SSHTunnel_old.h @@ -3,7 +3,7 @@ SSHTunnel.h Original code by tynsoe.org, Copyright 2002 -Modified by Lorenz Textor for use with CocoaMySQL +Modified by Lorenz Textor for use with Sequel Pro */ diff --git a/SSHTunnel_old.m b/SSHTunnel_old.m index 57a458eb..7657ba22 100755 --- a/SSHTunnel_old.m +++ b/SSHTunnel_old.m @@ -3,7 +3,7 @@ SSHTunnel.m Original code by tynsoe.org, Copyright 2002 -Modified by Lorenz Textor for use with CocoaMySQL +Modified by Lorenz Textor for use with Sequel Pro */ @@ -132,7 +132,7 @@ Modified by Lorenz Textor for use with CocoaMySQL [ environment setObject: pathToAuthentifier forKey: @"SSH_ASKPASS" ]; [ environment setObject:@":0" forKey:@"DISPLAY" ]; - [ environment setObject: @"CocoaMySQL Tunnel" forKey: @"TUNNEL_NAME" ]; + [ environment setObject: @"Sequel Pro Tunnel" forKey: @"TUNNEL_NAME" ]; [ task setEnvironment: environment ]; stdErrPipe = [[ NSPipe alloc ] init ]; @@ -145,14 +145,14 @@ Modified by Lorenz Textor for use with CocoaMySQL [[ stdErrPipe fileHandleForReading] waitForDataInBackgroundAndNotify ]; - NSLog(T_START,@"CocoaMySQL Tunnel"); + NSLog(T_START,@"Sequel Pro Tunnel"); [ self setValue: S_CONNECTING forKey: @"status" ]; [ task launch ]; [[ NSNotificationCenter defaultCenter] postNotificationName:@"STMStatusChanged" object:self ]; [ task waitUntilExit ]; sleep(1); [ self setValue: S_IDLE forKey: @"status" ]; - NSLog(T_STOP,@"CocoaMySQL Tunnel"); + NSLog(T_STOP,@"Sequel Pro Tunnel"); [[ NSNotificationCenter defaultCenter] removeObserver:self name: @"NSFileHandleDataAvailableNotification" object:[ stdErrPipe fileHandleForReading]]; diff --git a/TableContent.h b/TableContent.h index d4020536..00f55feb 100644 --- a/TableContent.h +++ b/TableContent.h @@ -1,6 +1,6 @@ // // TableContent.h -// CocoaMySQL +// sequel-pro // // Created by lorenz textor (lorenz@textor.ch) on Wed May 01 2002. // Copyright (c) 2002-2003 Lorenz Textor. All rights reserved. @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// More info at +// More info at // Or mail to #import diff --git a/TableContent.m b/TableContent.m index bcbc7208..9b2e3b27 100644 --- a/TableContent.m +++ b/TableContent.m @@ -1,6 +1,6 @@ // // TableContent.m -// CocoaMySQL +// sequel-pro // // Created by lorenz textor (lorenz@textor.ch) on Wed May 01 2002. // Copyright (c) 2002-2003 Lorenz Textor. All rights reserved. @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// More info at +// More info at // Or mail to #import "TableContent.h" @@ -1030,7 +1030,7 @@ returns YES if no row is beeing edited and nothing has to be written to db if ( [[rowObject description] isEqualToString:[prefs stringForKey:@"nullValue"]] || ([rowObject isMemberOfClass:[NSConstantString class]] && [[rowObject description] isEqualToString:@""]) ) { //NULL when user entered the nullValue string defined in the prefs or when a number field isn't set - // problem: when a number isn't set, cocoamysql enters 0 + // problem: when a number isn't set, sequel-pro enters 0 // -> second if argument isn't necessary! [rowValue setString:@"NULL"]; } else { diff --git a/TableDocument.h b/TableDocument.h index 76e058a9..0a870d47 100644 --- a/TableDocument.h +++ b/TableDocument.h @@ -1,6 +1,6 @@ // // TableDocument.h -// CocoaMySQL +// sequel-pro // // Created by lorenz textor (lorenz@textor.ch) on Wed May 01 2002. // Copyright (c) 2002-2003 Lorenz Textor. All rights reserved. @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// More info at +// More info at // Or mail to #import diff --git a/TableDocument.m b/TableDocument.m index 5274c688..32c53fcf 100644 --- a/TableDocument.m +++ b/TableDocument.m @@ -1,6 +1,6 @@ // // TableDocument.m -// CocoaMySQL +// sequel-pro // // Created by lorenz textor (lorenz@textor.ch) on Wed May 01 2002. // Copyright (c) 2002-2003 Lorenz Textor. All rights reserved. @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// More info at +// More info at // Or mail to #import "TableDocument.h" @@ -276,7 +276,7 @@ reused when user hits the close button of the variablseSheet or of the createTab [portField setStringValue:port]; [databaseField setStringValue:database]; [passwordField setStringValue:[keyChainInstance - getPasswordForName:[NSString stringWithFormat:@"CocoaMySQL : %@", name] + getPasswordForName:[NSString stringWithFormat:@"Sequel Pro : %@", name] account:[NSString stringWithFormat:@"%@@%@/%@", user, host, database]]]; if ( useSSH ) { [sshCheckbox setState:NSOnState]; @@ -284,7 +284,7 @@ reused when user hits the close button of the variablseSheet or of the createTab [sshUserField setStringValue:sshUser]; [sshPortField setStringValue:sshPort]; [sshPasswordField setStringValue:[keyChainInstance - getPasswordForName:[NSString stringWithFormat:@"CocoaMySQL SSHTunnel : %@", name] + getPasswordForName:[NSString stringWithFormat:@"Sequel Pro SSHTunnel : %@", name] account:[NSString stringWithFormat:@"%@@%@/%@", user, host, database]]]; [sshUserField setEnabled:YES]; [sshPasswordField setEnabled:YES]; @@ -403,10 +403,10 @@ add actual connection to favorites forKeys:[NSArray arrayWithObjects:@"name", @"host", @"socket", @"user", @"port", @"database", @"useSSH", @"sshHost", @"sshUser", @"sshPort", nil]]; favorites = [[favorites arrayByAddingObject:newFavorite] retain]; if ( ![password isEqualToString:@""] ) - [keyChainInstance addPassword:password forName:[NSString stringWithFormat:@"CocoaMySQL : %@", favoriteName] + [keyChainInstance addPassword:password forName:[NSString stringWithFormat:@"Sequel Pro : %@", favoriteName] account:[NSString stringWithFormat:@"%@@%@/%@", user, host, database]]; if ( ![sshPassword isEqualToString:@""] ) - [keyChainInstance addPassword:sshPassword forName:[NSString stringWithFormat:@"CocoaMySQL SSHTunnel : %@", favoriteName] + [keyChainInstance addPassword:sshPassword forName:[NSString stringWithFormat:@"Sequel Pro SSHTunnel : %@", favoriteName] account:[NSString stringWithFormat:@"%@@%@/%@", user, host, database]]; [prefs setObject:favorites forKey:@"favorites"]; @@ -1316,7 +1316,7 @@ toolbar delegate method //set the text label to be displayed in the toolbar and customization palette [toolbarItem setPaletteLabel:NSLocalizedString(@"Show/Hide Console", @"toolbar item for show/hide console")]; //set up tooltip and image - [toolbarItem setToolTip:NSLocalizedString(@"Show or hide the console which shows all MySQL commands performed by CocoaMySQL", @"tooltip for toolbar item for show/hide console")]; + [toolbarItem setToolTip:NSLocalizedString(@"Show or hide the console which shows all MySQL commands performed by Sequel Pro", @"tooltip for toolbar item for show/hide console")]; if ( [self consoleIsOpened] ) { [toolbarItem setLabel:NSLocalizedString(@"Hide Console", @"toolbar item for hide console")]; [toolbarItem setImage:[NSImage imageNamed:@"hideconsole"]]; @@ -1332,7 +1332,7 @@ toolbar delegate method [toolbarItem setLabel:NSLocalizedString(@"Clear Console", @"toolbar item for clear console")]; [toolbarItem setPaletteLabel:NSLocalizedString(@"Clear Console", @"toolbar item for clear console")]; //set up tooltip and image - [toolbarItem setToolTip:NSLocalizedString(@"Clear the console which shows all MySQL commands performed by CocoaMySQL", @"tooltip for toolbar item for clear console")]; + [toolbarItem setToolTip:NSLocalizedString(@"Clear the console which shows all MySQL commands performed by Sequel Pro", @"tooltip for toolbar item for clear console")]; [toolbarItem setImage:[NSImage imageNamed:@"clearconsole"]]; //set up the target action [toolbarItem setTarget:self]; @@ -1490,7 +1490,7 @@ sets upt the interface (small fonts) //tunnel test /* -NSDictionary *args = [NSDictionary dictionaryWithObjectsAndKeys:@"CocoaMySQL Tunnel",@"connName", +NSDictionary *args = [NSDictionary dictionaryWithObjectsAndKeys:@"Sequel Pro Tunnel",@"connName", @"xy",@"connUser", @"textor.ch",@"connHost", [NSNumber numberWithBool:YES],@"connAuth", diff --git a/TableDump.h b/TableDump.h index fa7785c0..80492492 100644 --- a/TableDump.h +++ b/TableDump.h @@ -1,6 +1,6 @@ // // TableDump.h -// CocoaMySQL +// sequel-pro // // Created by lorenz textor (lorenz@textor.ch) on Wed May 01 2002. // Copyright (c) 2002-2003 Lorenz Textor. All rights reserved. @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// More info at +// More info at // Or mail to #import diff --git a/TableDump.m b/TableDump.m index 648a91c1..d363f192 100644 --- a/TableDump.m +++ b/TableDump.m @@ -1,6 +1,6 @@ // // TableDump.m -// CocoaMySQL +// sequel-pro // // Created by lorenz textor (lorenz@textor.ch) on Wed May 01 2002. // Copyright (c) 2002-2003 Lorenz Textor. All rights reserved. @@ -19,7 +19,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// More info at +// More info at // Or mail to #import "TableDump.h" @@ -605,11 +605,11 @@ returns a dump string for the selected tables k = 0; //add header of dump-file -// [dump appendString:[NSString stringWithFormat:@"# Tables dumped %@\n# Created by CocoaMySQL (Copyright (c) 2002-2003 Lorenz Textor)\n#\n# Host: %@ Database: %@\n# ******************************\n\n", [NSDate date], [tableDocumentInstance host], [tableDocumentInstance database]]]; - [dump appendString:@"# CocoaMySQL dump\n"]; +// [dump appendString:[NSString stringWithFormat:@"# Tables dumped %@\n# Created by Sequel Pro (Copyright (c) 2002-2003 Lorenz Textor)\n#\n# Host: %@ Database: %@\n# ******************************\n\n", [NSDate date], [tableDocumentInstance host], [tableDocumentInstance database]]]; + [dump appendString:@"# Sequel Pro dump\n"]; [dump appendString:[NSString stringWithFormat:@"# Version %@\n", [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleVersion"]]]; - [dump appendString:@"# http://cocoamysql.sourceforge.net\n#\n"]; + [dump appendString:@"# http://code.google.com/p/sequel-pro\n#\n"]; [dump appendString:[NSString stringWithFormat:@"# Host: %@ (MySQL %@)\n", [tableDocumentInstance host], [tableDocumentInstance mySQLVersion]]]; [dump appendString:[NSString stringWithFormat:@"# Database: %@\n", [tableDocumentInstance database]]]; @@ -972,10 +972,10 @@ takes an array and returns it as a xml string //add header [string appendString:@"\n\n"]; [string appendString:@"
    - +

    Managing Tables