aboutsummaryrefslogtreecommitdiffstats
path: root/Interfaces
diff options
context:
space:
mode:
authorBibiko <bibiko@eva.mpg.de>2009-09-02 13:57:22 +0000
committerBibiko <bibiko@eva.mpg.de>2009-09-02 13:57:22 +0000
commit511b8720c8964de9c6d8d3d2780e271d18bd9c7c (patch)
tree39f0f42492e31ed31e1db8480531a5ed2de87d95 /Interfaces
parent2f6b8c6ae98afc27202135d6d676a9a3282df966 (diff)
downloadsequelpro-511b8720c8964de9c6d8d3d2780e271d18bd9c7c.tar.gz
sequelpro-511b8720c8964de9c6d8d3d2780e271d18bd9c7c.tar.bz2
sequelpro-511b8720c8964de9c6d8d3d2780e271d18bd9c7c.zip
• simplified and unified the issue to set the title of a tableWindow
- everything will be configured in [TableDocument displayName] - to update the title call [TableDocument setTitle:[TableDocument displayName]] - this removes dozens of lines • first steps to support more the document-based approach ( a document is nothing else than a connection with view properties and preferences ) - renamed/added/changed in Main Menu items into "New", "Open", "Save", and "Save As" - if user opened a spf file -> fileURL will be set - "Save" will save the current connection/view data according to the "Save As" setting - ie if one saved a doc with do not "Remember window state" - "Save" won't save the window state; to enable this hit "Save As" [this works for encrypted file data as well] - if the current doc was opened from file and the user closes it or quits the entire app all connection/document-based preferences (up to now query favs and history) will be updated silently [not yet implemented fully in CustomQuery] [works for encrypted file as well] • delete saveSPFAccessory view from DBView since it was outsourced • fixed some issues for the NSSecureTextField in the Save accessory panel (but still a warning appears)
Diffstat (limited to 'Interfaces')
-rw-r--r--Interfaces/English.lproj/DBView.xib307
-rw-r--r--Interfaces/English.lproj/MainMenu.xib56
-rw-r--r--Interfaces/English.lproj/SaveSPFAccessory.xib338
3 files changed, 345 insertions, 356 deletions
diff --git a/Interfaces/English.lproj/DBView.xib b/Interfaces/English.lproj/DBView.xib
index 1c594cd5..0066449f 100644
--- a/Interfaces/English.lproj/DBView.xib
+++ b/Interfaces/English.lproj/DBView.xib
@@ -8981,8 +8981,9 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string key="NSWindowTitle">Secure Text Input Sheet</string>
<string key="NSWindowClass">NSPanel</string>
<nil key="NSViewClass"/>
+ <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
<object class="NSView" key="NSWindowView" id="978976687">
- <reference key="NSNextResponder"/>
+ <nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -8991,7 +8992,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{228, 12}, {96, 32}}</string>
<reference key="NSSuperview" ref="978976687"/>
- <reference key="NSWindow"/>
<int key="NSTag">1</int>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="137468004">
@@ -9013,7 +9013,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{132, 12}, {96, 32}}</string>
<reference key="NSSuperview" ref="978976687"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="680933316">
<int key="NSCellFlags">67239424</int>
@@ -9034,7 +9033,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{20, 48}, {298, 22}}</string>
<reference key="NSSuperview" ref="978976687"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSSecureTextFieldCell" key="NSCell" id="973880651">
<int key="NSCellFlags">343014976</int>
@@ -9056,7 +9054,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{17, 101}, {304, 17}}</string>
<reference key="NSSuperview" ref="978976687"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="696861397">
<int key="NSCellFlags">68288064</int>
@@ -9073,7 +9070,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{17, 78}, {304, 14}}</string>
<reference key="NSSuperview" ref="978976687"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="332003389">
<int key="NSCellFlags">68288064</int>
@@ -9087,8 +9083,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
</object>
<string key="NSFrameSize">{338, 138}</string>
- <reference key="NSSuperview"/>
- <reference key="NSWindow"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1280, 778}}</string>
<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
@@ -11380,102 +11374,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string key="NSFrameSize">{110, 20}</string>
<string key="NSClassName">NSView</string>
</object>
- <object class="NSCustomView" id="721763950">
- <nil key="NSNextResponder"/>
- <int key="NSvFlags">268</int>
- <object class="NSMutableArray" key="NSSubviews">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSButton" id="612342309">
- <reference key="NSNextResponder" ref="721763950"/>
- <int key="NSvFlags">268</int>
- <string key="NSFrame">{{18, 57}, {151, 18}}</string>
- <reference key="NSSuperview" ref="721763950"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="557172944">
- <int key="NSCellFlags">-2080244224</int>
- <int key="NSCellFlags2">0</int>
- <string key="NSContents">Include session data</string>
- <reference key="NSSupport" ref="244931163"/>
- <reference key="NSControlView" ref="612342309"/>
- <int key="NSButtonFlags">1211912703</int>
- <int key="NSButtonFlags2">130</int>
- <reference key="NSNormalImage" ref="653588312"/>
- <reference key="NSAlternateImage" ref="386686735"/>
- <string key="NSAlternateContents"/>
- <string key="NSKeyEquivalent"/>
- <int key="NSPeriodicDelay">200</int>
- <int key="NSPeriodicInterval">25</int>
- </object>
- </object>
- <object class="NSButton" id="33459578">
- <reference key="NSNextResponder" ref="721763950"/>
- <int key="NSvFlags">268</int>
- <string key="NSFrame">{{18, 32}, {121, 18}}</string>
- <reference key="NSSuperview" ref="721763950"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="735841378">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">0</int>
- <string key="NSContents">Save passwords</string>
- <reference key="NSSupport" ref="244931163"/>
- <reference key="NSControlView" ref="33459578"/>
- <int key="NSButtonFlags">1211912703</int>
- <int key="NSButtonFlags2">130</int>
- <reference key="NSNormalImage" ref="653588312"/>
- <reference key="NSAlternateImage" ref="386686735"/>
- <string key="NSAlternateContents"/>
- <string key="NSKeyEquivalent"/>
- <int key="NSPeriodicDelay">200</int>
- <int key="NSPeriodicInterval">25</int>
- </object>
- </object>
- <object class="NSButton" id="842051747">
- <reference key="NSNextResponder" ref="721763950"/>
- <int key="NSvFlags">268</int>
- <string key="NSFrame">{{47, 7}, {166, 18}}</string>
- <reference key="NSSuperview" ref="721763950"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="256201367">
- <int key="NSCellFlags">-1543373312</int>
- <int key="NSCellFlags2">131072</int>
- <string key="NSContents">Encrypt file with password:</string>
- <reference key="NSSupport" ref="26"/>
- <reference key="NSControlView" ref="842051747"/>
- <int key="NSButtonFlags">1211912703</int>
- <int key="NSButtonFlags2">130</int>
- <reference key="NSNormalImage" ref="653588312"/>
- <reference key="NSAlternateImage" ref="386686735"/>
- <string key="NSAlternateContents"/>
- <string key="NSKeyEquivalent"/>
- <int key="NSPeriodicDelay">200</int>
- <int key="NSPeriodicInterval">25</int>
- </object>
- </object>
- <object class="NSSecureTextField" id="953813003">
- <reference key="NSNextResponder" ref="721763950"/>
- <int key="NSvFlags">268</int>
- <string key="NSFrame">{{215, 7}, {117, 19}}</string>
- <reference key="NSSuperview" ref="721763950"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSSecureTextFieldCell" key="NSCell" id="856645815">
- <int key="NSCellFlags">879885888</int>
- <int key="NSCellFlags2">272761856</int>
- <string key="NSContents"/>
- <reference key="NSSupport" ref="26"/>
- <reference key="NSControlView" ref="953813003"/>
- <bool key="NSDrawsBackground">YES</bool>
- <reference key="NSBackgroundColor" ref="480189472"/>
- <reference key="NSTextColor" ref="690893883"/>
- <object class="NSArray" key="NSAllowedInputLocales">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>NSAllRomanInputSourcesLocaleIdentifier</string>
- </object>
- </object>
- </object>
- </object>
- <string key="NSFrameSize">{352, 84}</string>
- <string key="NSClassName">NSView</string>
- </object>
<object class="NSCustomView" id="532635418">
<nil key="NSNextResponder"/>
<int key="NSvFlags">4364</int>
@@ -11623,10 +11521,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string key="NSClassName">NSView</string>
</object>
<object class="NSUserDefaultsController" id="461189245">
- <object class="NSMutableArray" key="NSDeclaredKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>_dummy</string>
- </object>
<bool key="NSSharedInstance">YES</bool>
</object>
<object class="NSCustomObject" id="601471102">
@@ -15255,94 +15149,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
- <string key="label">saveConnectionAccessory</string>
- <reference key="source" ref="427689665"/>
- <reference key="destination" ref="721763950"/>
- </object>
- <int key="connectionID">6387</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">saveConnectionIncludeData</string>
- <reference key="source" ref="427689665"/>
- <reference key="destination" ref="612342309"/>
- </object>
- <int key="connectionID">6388</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">saveConnectionSavePassword</string>
- <reference key="source" ref="427689665"/>
- <reference key="destination" ref="33459578"/>
- </object>
- <int key="connectionID">6389</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">saveConnectionEncrypt</string>
- <reference key="source" ref="427689665"/>
- <reference key="destination" ref="842051747"/>
- </object>
- <int key="connectionID">6390</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">saveConnectionEncryptString</string>
- <reference key="source" ref="427689665"/>
- <reference key="destination" ref="953813003"/>
- </object>
- <int key="connectionID">6391</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">nextKeyView</string>
- <reference key="source" ref="612342309"/>
- <reference key="destination" ref="33459578"/>
- </object>
- <int key="connectionID">6392</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">nextKeyView</string>
- <reference key="source" ref="33459578"/>
- <reference key="destination" ref="842051747"/>
- </object>
- <int key="connectionID">6393</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">nextKeyView</string>
- <reference key="source" ref="842051747"/>
- <reference key="destination" ref="953813003"/>
- </object>
- <int key="connectionID">6394</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">saveConnectionAccessoryPasswordButton:</string>
- <reference key="source" ref="427689665"/>
- <reference key="destination" ref="33459578"/>
- </object>
- <int key="connectionID">6401</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">saveConnectionAccessoryPasswordButton:</string>
- <reference key="source" ref="427689665"/>
- <reference key="destination" ref="842051747"/>
- </object>
- <int key="connectionID">6402</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">delegate</string>
- <reference key="source" ref="953813003"/>
- <reference key="destination" ref="427689665"/>
- </object>
- <int key="connectionID">6404</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
<string key="label">queryFavoritesSheet</string>
<reference key="source" ref="601471102"/>
<reference key="destination" ref="434046103"/>
@@ -21663,75 +21469,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<reference key="parent" ref="538700903"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">6375</int>
- <reference key="object" ref="721763950"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="33459578"/>
- <reference ref="612342309"/>
- <reference ref="842051747"/>
- <reference ref="953813003"/>
- </object>
- <reference key="parent" ref="1043842561"/>
- <string key="objectName">Save SPF Accessory</string>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">6376</int>
- <reference key="object" ref="612342309"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="557172944"/>
- </object>
- <reference key="parent" ref="721763950"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">6377</int>
- <reference key="object" ref="557172944"/>
- <reference key="parent" ref="612342309"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">6378</int>
- <reference key="object" ref="33459578"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="735841378"/>
- </object>
- <reference key="parent" ref="721763950"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">6379</int>
- <reference key="object" ref="735841378"/>
- <reference key="parent" ref="33459578"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">6380</int>
- <reference key="object" ref="842051747"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="256201367"/>
- </object>
- <reference key="parent" ref="721763950"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">6381</int>
- <reference key="object" ref="256201367"/>
- <reference key="parent" ref="842051747"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">6384</int>
- <reference key="object" ref="953813003"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="856645815"/>
- </object>
- <reference key="parent" ref="721763950"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">6385</int>
- <reference key="object" ref="856645815"/>
- <reference key="parent" ref="953813003"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">6405</int>
<reference key="object" ref="434046103"/>
<object class="NSMutableArray" key="children">
@@ -23228,18 +22965,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string>6370.IBPluginDependency</string>
<string>6371.IBPluginDependency</string>
<string>6372.IBPluginDependency</string>
- <string>6375.IBEditorWindowLastContentRect</string>
- <string>6375.IBPluginDependency</string>
- <string>6376.IBAttributePlaceholdersKey</string>
- <string>6376.IBPluginDependency</string>
- <string>6377.IBPluginDependency</string>
- <string>6378.IBAttributePlaceholdersKey</string>
- <string>6378.IBPluginDependency</string>
- <string>6379.IBPluginDependency</string>
- <string>6380.IBPluginDependency</string>
- <string>6381.IBPluginDependency</string>
- <string>6384.IBPluginDependency</string>
- <string>6385.IBPluginDependency</string>
<string>6405.IBEditorWindowLastContentRect</string>
<string>6405.IBWindowTemplateEditedContentRect</string>
<string>6405.ImportedFromIB2</string>
@@ -23280,7 +23005,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string>6466.IBAttributePlaceholdersKey</string>
<string>6466.IBPluginDependency</string>
<string>6492.IBEditorWindowLastContentRect</string>
- <string>6492.IBPluginDependency</string>
<string>6492.IBWindowTemplateEditedContentRect</string>
<string>6492.NSWindowTemplate.visibleAtLaunch</string>
<string>6493.IBPluginDependency</string>
@@ -25083,32 +24807,6 @@ aGUgYWN0aXZlIHNlbGVjdGlvbiAo4oyl4oyYUik</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{275, 661}, {352, 84}}</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <object class="NSMutableDictionary">
- <string key="NS.key.0">ToolTip</string>
- <object class="IBToolTipAttribute" key="NS.object.0">
- <string key="name">ToolTip</string>
- <reference key="object" ref="612342309"/>
- <string key="toolTip">Save current selected table, view status, and queries</string>
- </object>
- </object>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <object class="NSMutableDictionary">
- <string key="NS.key.0">ToolTip</string>
- <object class="IBToolTipAttribute" key="NS.object.0">
- <string key="name">ToolTip</string>
- <reference key="object" ref="33459578"/>
- <string key="toolTip">ATTENTION: All passwords will be saved in the file! For safety reasons it is recommended to encrypt the file.</string>
- </object>
- </object>
- <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>{{719, 432}, {260, 112}}</string>
<string>{{719, 432}, {260, 112}}</string>
<reference ref="9"/>
@@ -25173,7 +24871,6 @@ dXJyZW50IHF1ZXJ5IG9yIHNlbGVjdGlvbi4</string>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{370, 428}, {338, 138}}</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{370, 428}, {338, 138}}</string>
<reference ref="6"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
diff --git a/Interfaces/English.lproj/MainMenu.xib b/Interfaces/English.lproj/MainMenu.xib
index 7689dbae..33e98b33 100644
--- a/Interfaces/English.lproj/MainMenu.xib
+++ b/Interfaces/English.lproj/MainMenu.xib
@@ -233,12 +233,13 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSMenuItem" id="617509313">
<reference key="NSMenu" ref="709725194"/>
- <string key="NSTitle">New Connection</string>
+ <string type="base64-UTF8" key="NSTitle">TmV34oCmA</string>
<string key="NSKeyEquiv">n</string>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="625762401"/>
<reference key="NSMixedImage" ref="315854375"/>
+ <int key="NSTag">1000</int>
</object>
<object class="NSMenuItem" id="320151386">
<reference key="NSMenu" ref="709725194"/>
@@ -248,6 +249,7 @@
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="625762401"/>
<reference key="NSMixedImage" ref="315854375"/>
+ <int key="NSTag">1001</int>
</object>
<object class="NSMenuItem" id="849728981">
<reference key="NSMenu" ref="709725194"/>
@@ -257,6 +259,7 @@
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="625762401"/>
<reference key="NSMixedImage" ref="315854375"/>
+ <int key="NSTag">1002</int>
</object>
<object class="NSMenuItem" id="3878246">
<reference key="NSMenu" ref="709725194"/>
@@ -277,25 +280,37 @@
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="625762401"/>
<reference key="NSMixedImage" ref="315854375"/>
+ <int key="NSTag">1003</int>
</object>
- <object class="NSMenuItem" id="256715652">
+ <object class="NSMenuItem" id="759865633">
<reference key="NSMenu" ref="709725194"/>
- <string type="base64-UTF8" key="NSTitle">U2F2ZSBRdWVyeeKApg</string>
+ <string key="NSTitle">Save</string>
<string key="NSKeyEquiv">s</string>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="625762401"/>
<reference key="NSMixedImage" ref="315854375"/>
+ <int key="NSTag">1004</int>
</object>
- <object class="NSMenuItem" id="759865633">
+ <object class="NSMenuItem" id="643339783">
<reference key="NSMenu" ref="709725194"/>
- <string type="base64-UTF8" key="NSTitle">U2F2ZSBDb25uZWN0aW9u4oCmA</string>
+ <string type="base64-UTF8" key="NSTitle">U2F2ZSBBc+KApg</string>
<string key="NSKeyEquiv">S</string>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="625762401"/>
<reference key="NSMixedImage" ref="315854375"/>
- <int key="NSTag">1</int>
+ <int key="NSTag">1005</int>
+ </object>
+ <object class="NSMenuItem" id="256715652">
+ <reference key="NSMenu" ref="709725194"/>
+ <string type="base64-UTF8" key="NSTitle">U2F2ZSBRdWVyeeKApg</string>
+ <string key="NSKeyEquiv">s</string>
+ <int key="NSKeyEquivModMask">1310720</int>
+ <int key="NSMnemonicLoc">2147483647</int>
+ <reference key="NSOnImage" ref="625762401"/>
+ <reference key="NSMixedImage" ref="315854375"/>
+ <int key="NSTag">1006</int>
</object>
<object class="NSMenuItem" id="985746359">
<reference key="NSMenu" ref="709725194"/>
@@ -316,6 +331,7 @@
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="625762401"/>
<reference key="NSMixedImage" ref="315854375"/>
+ <int key="NSTag">1007</int>
</object>
<object class="NSMenuItem" id="934534577">
<reference key="NSMenu" ref="709725194"/>
@@ -540,6 +556,7 @@
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="625762401"/>
<reference key="NSMixedImage" ref="315854375"/>
+ <int key="NSTag">1009</int>
</object>
<object class="NSMenuItem" id="197057557">
<reference key="NSMenu" ref="709725194"/>
@@ -549,6 +566,7 @@
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="625762401"/>
<reference key="NSMixedImage" ref="315854375"/>
+ <int key="NSTag">1010</int>
</object>
</object>
</object>
@@ -2601,6 +2619,14 @@
</object>
<int key="connectionID">964</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">saveConnectionSheet:</string>
+ <reference key="source" ref="63651044"/>
+ <reference key="destination" ref="643339783"/>
+ </object>
+ <int key="connectionID">966</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -2825,8 +2851,9 @@
<reference ref="934534577"/>
<reference ref="849728981"/>
<reference ref="320151386"/>
- <reference ref="256715652"/>
<reference ref="759865633"/>
+ <reference ref="256715652"/>
+ <reference ref="643339783"/>
</object>
<reference key="parent" ref="86447006"/>
</object>
@@ -3869,6 +3896,11 @@
<reference key="object" ref="759865633"/>
<reference key="parent" ref="709725194"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">965</int>
+ <reference key="object" ref="643339783"/>
+ <reference key="parent" ref="709725194"/>
+ </object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -4220,6 +4252,7 @@
<string>956.IBPluginDependency</string>
<string>960.IBPluginDependency</string>
<string>963.IBPluginDependency</string>
+ <string>965.IBPluginDependency</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -4323,7 +4356,7 @@
<reference ref="9"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
- <string>{{570, 390}, {213, 133}}</string>
+ <string>{{570, 370}, {213, 133}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<string>{{399, 465}, {213, 93}}</string>
@@ -4333,7 +4366,7 @@
<reference ref="9"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
- <string>{{783, 430}, {136, 43}}</string>
+ <string>{{783, 410}, {136, 43}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -4490,7 +4523,7 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{350, 450}, {220, 253}}</string>
+ <string>{{350, 430}, {220, 273}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<string>{{180, 535}, {182, 253}}</string>
@@ -4618,6 +4651,7 @@ w6gg4oaSIGZhY2FkZV0</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>
</object>
</object>
<object class="NSMutableDictionary" key="unlocalizedProperties">
@@ -4640,7 +4674,7 @@ w6gg4oaSIGZhY2FkZV0</string>
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">964</int>
+ <int key="maxID">966</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
diff --git a/Interfaces/English.lproj/SaveSPFAccessory.xib b/Interfaces/English.lproj/SaveSPFAccessory.xib
index 91704d63..579fe9af 100644
--- a/Interfaces/English.lproj/SaveSPFAccessory.xib
+++ b/Interfaces/English.lproj/SaveSPFAccessory.xib
@@ -8,6 +8,7 @@
<string key="IBDocument.HIToolboxVersion">353.00</string>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
+ <integer value="1" id="9"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -43,7 +44,6 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{18, 33}, {177, 18}}</string>
<reference key="NSSuperview" ref="920946966"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="916395634">
<int key="NSCellFlags">-2080244224</int>
@@ -75,7 +75,6 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{18, 8}, {225, 18}}</string>
<reference key="NSSuperview" ref="920946966"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="1023988499">
<int key="NSCellFlags">67239424</int>
@@ -98,7 +97,6 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{18, 113}, {139, 18}}</string>
<reference key="NSSuperview" ref="920946966"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="54680337">
<int key="NSCellFlags">67239424</int>
@@ -121,7 +119,6 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{18, 60}, {176, 18}}</string>
<reference key="NSSuperview" ref="920946966"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="793938016">
<int key="NSCellFlags">67239424</int>
@@ -144,7 +141,6 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{193, 59}, {138, 19}}</string>
<reference key="NSSuperview" ref="920946966"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSSecureTextFieldCell" key="NSCell" id="23878540">
<int key="NSCellFlags">343014976</int>
@@ -177,7 +173,251 @@
</object>
<object class="NSArray" key="NSAllowedInputLocales">
<bool key="EncodedWithXMLCoder">YES</bool>
- <string>NSAllRomanInputSourcesLocaleIdentifier</string>
+ <string>ti_ER</string>
+ <string>ar_LY</string>
+ <string>kok_IN</string>
+ <string>mk_MK</string>
+ <string>eo</string>
+ <string>fr_CH</string>
+ <string>sw</string>
+ <string>so_ET</string>
+ <string>gv</string>
+ <string>ar_BH</string>
+ <string>hy_AM_REVISED</string>
+ <string>it_IT</string>
+ <string>bg_BG</string>
+ <string>ro</string>
+ <string>es_HN</string>
+ <string>en_BE</string>
+ <string>is</string>
+ <string>kw_GB</string>
+ <string>kl</string>
+ <string>ga_IE</string>
+ <string>nl_NL</string>
+ <string>uk</string>
+ <string>fr_CA</string>
+ <string>sk_SK</string>
+ <string>es_AR</string>
+ <string>en_MT</string>
+ <string>fr_BE</string>
+ <string>ca</string>
+ <string>cs_CZ</string>
+ <string>fr_FR</string>
+ <string>en_ZA</string>
+ <string>sl</string>
+ <string>fa</string>
+ <string>so</string>
+ <string>pt</string>
+ <string>et_EE</string>
+ <string>eu_ES</string>
+ <string>fi</string>
+ <string>de_CH</string>
+ <string>or</string>
+ <string>gu_IN</string>
+ <string>mt_MT</string>
+ <string>nb</string>
+ <string>ms</string>
+ <string>es_CR</string>
+ <string>as_IN</string>
+ <string>ar_SA</string>
+ <string>am</string>
+ <string>pl</string>
+ <string>hu</string>
+ <string>lv</string>
+ <string>ar_DZ</string>
+ <string>ur</string>
+ <string>pt_PT</string>
+ <string>eu</string>
+ <string>so_DJ</string>
+ <string>de</string>
+ <string>en_IN</string>
+ <string>hr_HR</string>
+ <string>ar_AE</string>
+ <string>gu</string>
+ <string>lt</string>
+ <string>te_IN</string>
+ <string>ar_KW</string>
+ <string>sr_Latn</string>
+ <string>de_AT</string>
+ <string>en_US</string>
+ <string>es_PR</string>
+ <string>pl_PL</string>
+ <string>uz_Cyrl_UZ</string>
+ <string>ar_EG</string>
+ <string>it_CH</string>
+ <string>nl</string>
+ <string>haw_US</string>
+ <string>is_IS</string>
+ <string>en_IE</string>
+ <string>kl_GL</string>
+ <string>ps</string>
+ <string>zh_Hans_CN</string>
+ <string>ar</string>
+ <string>ru_UA</string>
+ <string>th_TH</string>
+ <string>fr_LU</string>
+ <string>uz_Latn_UZ</string>
+ <string>az</string>
+ <string>bn_IN</string>
+ <string>es_MX</string>
+ <string>kk_KZ</string>
+ <string>en_US_POSIX</string>
+ <string>el_GR</string>
+ <string>he</string>
+ <string>es_UY</string>
+ <string>nn_NO</string>
+ <string>sr</string>
+ <string>sk</string>
+ <string>ur_PK</string>
+ <string>es_PA</string>
+ <string>sv_FI</string>
+ <string>zh</string>
+ <string>es_DO</string>
+ <string>en_CA</string>
+ <string>en_BW</string>
+ <string>de_DE</string>
+ <string>haw</string>
+ <string>pa_IN</string>
+ <string>sq</string>
+ <string>kw</string>
+ <string>ga</string>
+ <string>ml</string>
+ <string>mt</string>
+ <string>af_ZA</string>
+ <string>az_Latn</string>
+ <string>ko_KR</string>
+ <string>fa_AF</string>
+ <string>ps_AF</string>
+ <string>be_BY</string>
+ <string>bn</string>
+ <string>it</string>
+ <string>sr_Latn_CS</string>
+ <string>zh_Hans</string>
+ <string>as</string>
+ <string>ms_MY</string>
+ <string>be</string>
+ <string>sl_SI</string>
+ <string>fa_IR</string>
+ <string>es_EC</string>
+ <string>kok</string>
+ <string>es_PY</string>
+ <string>ta_IN</string>
+ <string>am_ET</string>
+ <string>es_CO</string>
+ <string>uz_Latn</string>
+ <string>el</string>
+ <string>zh_Hant_MO</string>
+ <string>kk</string>
+ <string>kn</string>
+ <string>zh_Hant</string>
+ <string>en</string>
+ <string>es_PE</string>
+ <string>pt_BR</string>
+ <string>ar_LB</string>
+ <string>en_NZ</string>
+ <string>es_ES</string>
+ <string>en_HK</string>
+ <string>es_BO</string>
+ <string>hu_HU</string>
+ <string>sr_Cyrl</string>
+ <string>nb_NO</string>
+ <string>sv</string>
+ <string>vi</string>
+ <string>ti_ET</string>
+ <string>bg</string>
+ <string>om</string>
+ <string>de_LU</string>
+ <string>en_SG</string>
+ <string>id_ID</string>
+ <string>ur_IN</string>
+ <string>uz</string>
+ <string>da</string>
+ <string>ru_RU</string>
+ <string>es_US</string>
+ <string>es_VE</string>
+ <string>ko</string>
+ <string>ja</string>
+ <string>af</string>
+ <string>ar_YE</string>
+ <string>lt_LT</string>
+ <string>om_KE</string>
+ <string>zh_Hans_SG</string>
+ <string>es_NI</string>
+ <string>he_IL</string>
+ <string>en_PK</string>
+ <string>en_PH</string>
+ <string>az_Cyrl_AZ</string>
+ <string>en_AU</string>
+ <string>az_Cyrl</string>
+ <string>ta</string>
+ <string>ar_MA</string>
+ <string>sw_KE</string>
+ <string>tr_TR</string>
+ <string>zh_Hant_HK</string>
+ <string>en_ZW</string>
+ <string>de_BE</string>
+ <string>mk</string>
+ <string>pa</string>
+ <string>da_DK</string>
+ <string>es_GT</string>
+ <string>es</string>
+ <string>ar_IQ</string>
+ <string>az_Latn_AZ</string>
+ <string>so_SO</string>
+ <string>lv_LV</string>
+ <string>mr</string>
+ <string>te</string>
+ <string>sq_AL</string>
+ <string>ml_IN</string>
+ <string>uk_UA</string>
+ <string>hi_IN</string>
+ <string>ca_ES</string>
+ <string>ar_TN</string>
+ <string>id</string>
+ <string>om_ET</string>
+ <string>cs</string>
+ <string>fo_FO</string>
+ <string>hy_AM</string>
+ <string>en_GB</string>
+ <string>sr_Cyrl_CS</string>
+ <string>gl_ES</string>
+ <string>sw_TZ</string>
+ <string>ro_RO</string>
+ <string>cy</string>
+ <string>fr</string>
+ <string>ms_BN</string>
+ <string>so_KE</string>
+ <string>tr</string>
+ <string>gl</string>
+ <string>cy_GB</string>
+ <string>ar_OM</string>
+ <string>fo</string>
+ <string>es_CL</string>
+ <string>sv_SE</string>
+ <string>ar_JO</string>
+ <string>uz_Cyrl</string>
+ <string>zh_Hant_TW</string>
+ <string>et</string>
+ <string>hi</string>
+ <string>fi_FI</string>
+ <string>nn</string>
+ <string>th</string>
+ <string>ar_SY</string>
+ <string>ja_JP</string>
+ <string>gv_GB</string>
+ <string>hy</string>
+ <string>en_VI</string>
+ <string>kn_IN</string>
+ <string>ti</string>
+ <string>ar_QA</string>
+ <string>es_SV</string>
+ <string>hr</string>
+ <string>ru</string>
+ <string>ar_SD</string>
+ <string>mr_IN</string>
+ <string>vi_VN</string>
+ <string>nl_BE</string>
+ <string>or_IN</string>
</object>
</object>
</object>
@@ -186,7 +426,6 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{40, 86}, {199, 18}}</string>
<reference key="NSSuperview" ref="920946966"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="739923402">
<int key="NSCellFlags">-1543373312</int>
@@ -209,7 +448,6 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{181, 102}, {163, 33}}</string>
<reference key="NSSuperview" ref="920946966"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="767039719">
<int key="NSCellFlags">67239424</int>
@@ -237,14 +475,9 @@
</object>
<string key="NSFrameSize">{350, 139}</string>
<reference key="NSSuperview"/>
- <reference key="NSWindow"/>
<string key="NSClassName">NSView</string>
</object>
<object class="NSUserDefaultsController" id="425440671">
- <object class="NSMutableArray" key="NSDeclaredKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>_dummy</string>
- </object>
<bool key="NSSharedInstance">YES</bool>
</object>
</object>
@@ -329,7 +562,7 @@
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="1" id="9"/>
+ <reference ref="9"/>
<reference ref="9"/>
<reference ref="9"/>
<reference ref="9"/>
@@ -341,14 +574,6 @@
<int key="connectionID">42</int>
</object>
<object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">saveConnectionAccessoryPasswordButton:</string>
- <reference key="source" ref="1001"/>
- <reference key="destination" ref="84390822"/>
- </object>
- <int key="connectionID">43</int>
- </object>
- <object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">saveConnectionSavePasswordAlert</string>
<reference key="source" ref="1001"/>
@@ -357,12 +582,44 @@
<int key="connectionID">44</int>
</object>
<object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">nextKeyView</string>
+ <reference key="source" ref="844460307"/>
+ <reference key="destination" ref="438732615"/>
+ </object>
+ <int key="connectionID">51</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">delegate</string>
+ <reference key="source" ref="844460307"/>
+ <reference key="destination" ref="1001"/>
+ </object>
+ <int key="connectionID">52</int>
+ </object>
+ <object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
- <string key="label">saveConnectionAccessoryPasswordButton:</string>
+ <string key="label">validateSaveConnectionAccessory:</string>
<reference key="source" ref="1001"/>
<reference key="destination" ref="251605173"/>
</object>
- <int key="connectionID">45</int>
+ <int key="connectionID">54</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">saveConnectionAccessory</string>
+ <reference key="source" ref="1004"/>
+ <reference key="destination" ref="920946966"/>
+ </object>
+ <int key="connectionID">55</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">validateSaveConnectionAccessory:</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="84390822"/>
+ </object>
+ <int key="connectionID">57</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
@@ -411,15 +668,6 @@
<string key="objectName">Save SPF Accessory</string>
</object>
<object class="IBObjectRecord">
- <int key="objectID">2</int>
- <reference key="object" ref="844460307"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="23878540"/>
- </object>
- <reference key="parent" ref="920946966"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">3</int>
<reference key="object" ref="251605173"/>
<object class="NSMutableArray" key="children">
@@ -462,11 +710,6 @@
<reference key="parent" ref="251605173"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">9</int>
- <reference key="object" ref="23878540"/>
- <reference key="parent" ref="844460307"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">13</int>
<reference key="object" ref="216845609"/>
<object class="NSMutableArray" key="children">
@@ -513,6 +756,20 @@
<reference key="object" ref="425440671"/>
<reference key="parent" ref="1002"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">2</int>
+ <reference key="object" ref="844460307"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="23878540"/>
+ </object>
+ <reference key="parent" ref="920946966"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">9</int>
+ <reference key="object" ref="23878540"/>
+ <reference key="parent" ref="844460307"/>
+ </object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -619,7 +876,7 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">45</int>
+ <int key="maxID">57</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -656,6 +913,7 @@
</object>
<object class="IBPartialClassDescription">
<string key="className">NSView</string>
+ <string key="superclassName">NSResponder</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBUserSource</string>
<string key="minorKey"/>
@@ -692,7 +950,6 @@
<string>optimizeTable:</string>
<string>removeDatabase:</string>
<string>repairTable:</string>
- <string>saveConnectionAccessoryPasswordButton:</string>
<string>saveConnectionSheet:</string>
<string>saveServerVariables:</string>
<string>setDatabases:</string>
@@ -700,6 +957,7 @@
<string>showMySQLHelp:</string>
<string>showUserManager:</string>
<string>showVariables:</string>
+ <string>validateSaveConnectionAccessory:</string>
<string>viewContent:</string>
<string>viewQuery:</string>
<string>viewRelations:</string>