diff options
Diffstat (limited to 'Resources')
| -rw-r--r-- | Resources/English.lproj/Credits.rtf | 2 | ||||
| -rw-r--r-- | Resources/English.lproj/GotoDatabaseDialog.strings | bin | 1294 -> 1528 bytes | |||
| -rw-r--r-- | Resources/English.lproj/InfoPlist.strings | 4 | ||||
| -rw-r--r-- | Resources/English.lproj/Localizable.strings | bin | 250498 -> 251230 bytes | |||
| -rw-r--r-- | Resources/English.lproj/MainMenu.strings | bin | 49854 -> 53670 bytes | |||
| -rw-r--r-- | Resources/English.lproj/SPQLPluginExportSettingsTemplate.html | 77 | ||||
| -rw-r--r-- | Resources/License.rtf | 4 | ||||
| -rw-r--r-- | Resources/Plists/CompletionTokens.plist | 64 | ||||
| -rw-r--r-- | Resources/Plists/Info.plist | 12 | ||||
| -rw-r--r-- | Resources/Plists/PreferenceDefaults.plist | 4 |
10 files changed, 156 insertions, 11 deletions
diff --git a/Resources/English.lproj/Credits.rtf b/Resources/English.lproj/Credits.rtf index da243416..41c17245 100644 --- a/Resources/English.lproj/Credits.rtf +++ b/Resources/English.lproj/Credits.rtf @@ -228,6 +228,6 @@ All rights reserved.\ \b0\fs22 \cf0 \ \pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\qc\pardirnatural -\cf0 Icon by {\field{\*\fldinst{HYPERLINK "http://kenichiyoshida.jp/"}}{\fldrslt Kenichi Yoshida}}, with thanks to {\field{\*\fldinst{HYPERLINK "http://panic.com/"}}{\fldrslt Panic}}\ +\cf0 Icon by {\field{\*\fldinst{HYPERLINK "http://www.kenichi27.com/"}}{\fldrslt Kenichi Yoshida}}, with thanks to {\field{\*\fldinst{HYPERLINK "http://panic.com/"}}{\fldrslt Panic}}\ GUI design by {\field{\*\fldinst{HYPERLINK "http://www.sequelpro.com/"}}{\fldrslt Sequel Pro}} team.\ } diff --git a/Resources/English.lproj/GotoDatabaseDialog.strings b/Resources/English.lproj/GotoDatabaseDialog.strings Binary files differindex bf48b104..6512a3de 100644 --- a/Resources/English.lproj/GotoDatabaseDialog.strings +++ b/Resources/English.lproj/GotoDatabaseDialog.strings diff --git a/Resources/English.lproj/InfoPlist.strings b/Resources/English.lproj/InfoPlist.strings index af866cf8..64644f83 100644 --- a/Resources/English.lproj/InfoPlist.strings +++ b/Resources/English.lproj/InfoPlist.strings @@ -1,4 +1,4 @@ /* Localized versions of Info.plist keys */ -CFBundleGetInfoString = "Sequel Pro version 1.0.2, Copyright 2002-2013 Sequel Pro and CocoaMySQL team."; -NSHumanReadableCopyright = "Copyright 2002-2013 Sequel Pro and CocoaMySQL team.";
\ No newline at end of file +CFBundleGetInfoString = "Sequel Pro version 1.1, Copyright 2002-2016 Sequel Pro and CocoaMySQL team."; +NSHumanReadableCopyright = "Copyright 2002-2016 Sequel Pro and CocoaMySQL team.";
\ No newline at end of file diff --git a/Resources/English.lproj/Localizable.strings b/Resources/English.lproj/Localizable.strings Binary files differindex a571d298..bdeee714 100644 --- a/Resources/English.lproj/Localizable.strings +++ b/Resources/English.lproj/Localizable.strings diff --git a/Resources/English.lproj/MainMenu.strings b/Resources/English.lproj/MainMenu.strings Binary files differindex b5593a7d..b6407843 100644 --- a/Resources/English.lproj/MainMenu.strings +++ b/Resources/English.lproj/MainMenu.strings diff --git a/Resources/English.lproj/SPQLPluginExportSettingsTemplate.html b/Resources/English.lproj/SPQLPluginExportSettingsTemplate.html new file mode 100644 index 00000000..29a2e9d7 --- /dev/null +++ b/Resources/English.lproj/SPQLPluginExportSettingsTemplate.html @@ -0,0 +1,77 @@ +<!DOCTYPE html> +<html xmlns="http://www.w3.org/1999/xhtml" lang="en"> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> + <style> + body { + font-family:'Lucida Grande'; + font-size:10pt; + } + .token { + background: linear-gradient(to top, rgb(199,216,244) 0%,rgb(217,229,247) 100%); + border: 1px solid rgb(168,184,249); + padding: 0 5px; + margin: 2px; + border-radius: 10px; + } + </style> + </head> + <body> + <center> + <table> + <tr> + <td colspan="2"> + <center> + <b style="font-size:12pt">Sequel Pro Saved Export Settings</b><br /> + {{ filename }} + </center><br /><br /> + </td> + </tr> + <tr> + <td valign="right"> + <img width="128" heigth="128" src="cid:icon.tiff"> + </td> + <td> + <table> + <tr> + <td align="right">Path: </td><td>{{ exportPath }}</td> + </tr> + {% if customFilename %} + <tr> + <td align="right">Filename: </td> + <td><!-- Those comments are only used to eliminate visible whitespace + {% /if %} + {% for part in customFilename %} + {% if part.isToken %} + --><span class="token">{{ part.name }}</span><!-- + {% else %} + -->{{ part.name }}<!-- + {% /if %} + {% /for %} + {% comment This is most likely a bug in our version of MGTemplateEngine, but putting the for loop inside the if will create broken output %} + {% if customFilename %} + --></td> + </tr> + {% /if %} + <tr> + <td align="right">Format: </td><td><b>{{ exportType }}</b></td> + </tr> + <tr> + <td align="right">Compression: </td><td>{{ compressionFormat }}</td> + </tr> + <tr> + <td align="right">Input data: </td><td>{{ exportSource }}</td> + </tr> + <tr> + <td align="right">Low Memory: </td><td><input type="checkbox" {% if lowMemoryStreaming %}checked{% /if %} disabled></td> + </tr> + <tr> + <td colspan="2" style="color: grey;"><br />(format specific settings not shown)</td> + </tr> + </table> + </td> + </tr> + </table> + </center> + </body> +</html> diff --git a/Resources/License.rtf b/Resources/License.rtf index a9ce83c0..5f5e1c22 100644 --- a/Resources/License.rtf +++ b/Resources/License.rtf @@ -5,7 +5,7 @@ \deftab560 \pard\tx560\pardeftab560\pardirnatural -\f0\b\fs22 \cf2 \CocoaLigature0 Copyright (c) 2002-2015 Sequel Pro & CocoaMySQL Teams. \ +\f0\b\fs22 \cf2 \CocoaLigature0 Copyright (c) 2002-2016 Sequel Pro & CocoaMySQL Teams. \ \ All rights reserved. \b0 \ @@ -34,4 +34,4 @@ CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN \ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER \ DEALINGS IN THE SOFTWARE. \b0 \cf0 \CocoaLigature1 \ -}
\ No newline at end of file +} diff --git a/Resources/Plists/CompletionTokens.plist b/Resources/Plists/CompletionTokens.plist index f089401d..fc10db70 100644 --- a/Resources/Plists/CompletionTokens.plist +++ b/Resources/Plists/CompletionTokens.plist @@ -289,6 +289,7 @@ <string>ISSUER</string> <string>ITERATE</string> <string>JOIN</string> + <string>JSON</string> <string>KEY</string> <string>KEYS</string> <string>KEY_BLOCK_SIZE</string> @@ -834,6 +835,27 @@ <string>ISSIMPLE</string> <string>IS_FREE_LOCK</string> <string>IS_USED_LOCK</string> + <string>JSON_APPEND</string> + <string>JSON_ARRAY_APPEND</string> + <string>JSON_ARRAY_INSERT</string> + <string>JSON_ARRAY</string> + <string>JSON_CONTAINS_PATH</string> + <string>JSON_CONTAINS</string> + <string>JSON_DEPTH</string> + <string>JSON_EXTRACT</string> + <string>JSON_INSERT</string> + <string>JSON_KEYS</string> + <string>JSON_LENGTH</string> + <string>JSON_MERGE</string> + <string>JSON_OBJECT</string> + <string>JSON_QUOTE</string> + <string>JSON_REMOVE</string> + <string>JSON_REPLACE</string> + <string>JSON_SEARCH</string> + <string>JSON_SET</string> + <string>JSON_TYPE</string> + <string>JSON_UNQUOTE</string> + <string>JSON_VALID</string> <string>LAST_DAY</string> <string>LAST_INSERT_ID</string> <string>LCASE</string> @@ -1162,6 +1184,48 @@ <string>${1:bits}, ${2:str1}</string> <key>FIND_IN_SET</key> <string>${1:str}, ${2:strlist}</string> + <key>JSON_APPEND</key> + <string>${1:json_doc}, ${2:path}, ${3:val}${4:, ${5:path}, ${6:val}${7:, ${8:...}}}</string> + <key>JSON_ARRAY_APPEND</key> + <string>${1:json_doc}, ${2:path}, ${3:val}${4:, ${5:path}, ${6:val}${7:, ${8:...}}}</string> + <key>JSON_ARRAY_INSERT</key> + <string>${1:json_doc}, ${2:path}, ${3:val}${4:, ${5:path}, ${6:val}${7:, ${8:...}}}</string> + <key>JSON_ARRAY</key> + <string>${1:${2:val} ${3:, ${4:val}${5:, ${6:...}}}}</string> + <key>JSON_CONTAINS_PATH</key> + <string>${1:json_doc}, ${2:¦'one'¦'all'¦}, ${3:path}${4:, ${5:path}${6:, ${7:...}}}</string> + <key>JSON_CONTAINS</key> + <string>${1:json_doc}, ${2:val}${3:, ${4:path}}</string> + <key>JSON_DEPTH</key> + <string>${1:json_doc}</string> + <key>JSON_EXTRACT</key> + <string>${1:json_doc}, ${2:path}${3:, ${4:path}${5:, ${6:...}}}</string> + <key>JSON_INSERT</key> + <string>${1:json_doc}, ${2:path}, ${3:val}${4:, ${5:path}, ${6:val}${7:, ${8:...}}}</string> + <key>JSON_KEYS</key> + <string>${1:json_doc}${2:, ${3:path}}</string> + <key>JSON_LENGTH</key> + <string>${1:json_doc}${2:, ${3:path}}</string> + <key>JSON_MERGE</key> + <string>${1:json_doc}, ${2:json_doc}${3:, ${4:...}}</string> + <key>JSON_OBJECT</key> + <string>${1:${2:key}, ${3:val}${4:, ${5:key}, ${6:val}${7:, ${8:...}}}}</string> + <key>JSON_QUOTE</key> + <string>${1:json_val}</string> + <key>JSON_REMOVE</key> + <string>${1:json_doc}, ${2:path}${3:, ${4:path}${5:, ${6:...}}}</string> + <key>JSON_REPLACE</key> + <string>${1:json_doc}, ${2:path}, ${3:val}${4:, ${5:path}, ${6:val}${7:, ${8:...}}}</string> + <key>JSON_SEARCH</key> + <string>${1:json_doc}, ${2:¦'one'¦'all'¦}, ${3:search_str}${4:, ${5:escape_char}${6:, ${7:path${8:, ${9:...}}}}}</string> + <key>JSON_SET</key> + <string>${1:json_doc}, ${2:path}, ${3:val}${4:, ${5:path}, ${6:val}${7:, ${8:...}}}</string> + <key>JSON_TYPE</key> + <string>${1:json_val}</string> + <key>JSON_UNQUOTE</key> + <string>${1:val}</string> + <key>JSON_VALID</key> + <string>${1:val}</string> </dict> </dict> </plist> diff --git a/Resources/Plists/Info.plist b/Resources/Plists/Info.plist index 2ba52aa3..278ded51 100644 --- a/Resources/Plists/Info.plist +++ b/Resources/Plists/Info.plist @@ -173,6 +173,14 @@ <string>sequelpro</string> </array> </dict> + <dict> + <key>CFBundleURLName</key> + <string>MySQL URL scheme</string> + <key>CFBundleURLSchemes</key> + <array> + <string>mysql</string> + </array> + </dict> </array> <key>CFBundleVersion</key> <string></string> @@ -194,7 +202,7 @@ <key>NSAppleScriptEnabled</key> <true/> <key>NSHumanReadableCopyright</key> - <string>Copyright 2002-2015 Sequel Pro and CocoaMySQL team.</string> + <string>Copyright 2002-2016 Sequel Pro and CocoaMySQL team.</string> <key>NSMainNibFile</key> <string>MainMenu</string> <key>NSPrincipalClass</key> @@ -232,7 +240,7 @@ <key>SUEnableSystemProfiling</key> <true/> <key>SUFeedURL</key> - <string>http://www.sequelpro.com/appcast/app-releases.xml</string> + <string>https://www.sequelpro.com/appcast/app-releases.xml</string> <key>SUPublicDSAKeyFile</key> <string>sparkle-public-key.pem</string> <key>UTExportedTypeDeclarations</key> diff --git a/Resources/Plists/PreferenceDefaults.plist b/Resources/Plists/PreferenceDefaults.plist index 687b4b09..1d55e65a 100644 --- a/Resources/Plists/PreferenceDefaults.plist +++ b/Resources/Plists/PreferenceDefaults.plist @@ -149,8 +149,6 @@ <real>3</real> <key>NewFieldsAllowNulls</key> <true/> - <key>NoBOMforSQLdumpFile</key> - <true/> <key>NullValue</key> <string>NULL</string> <key>PrintBackground</key> @@ -189,8 +187,6 @@ <true/> <key>SPFirstRun</key> <true/> - <key>SQLExportUseCompression</key> - <false/> <key>SSHMultiplexingEnabled</key> <false/> <key>TableInformationPanelCollapsed</key> |