aboutsummaryrefslogtreecommitdiffstats
path: root/Interfaces/English.lproj
diff options
context:
space:
mode:
authorrowanbeentje <rowan@beent.je>2009-11-21 22:18:27 +0000
committerrowanbeentje <rowan@beent.je>2009-11-21 22:18:27 +0000
commit7ead84b0868975752f445d1917bc693a5bf502b7 (patch)
tree8bb28e0a7b5482fc13276bc192e738d6e9761b8b /Interfaces/English.lproj
parentf184235a7f7996e68f4f6548ec8932b289e3d3c1 (diff)
downloadsequelpro-7ead84b0868975752f445d1917bc693a5bf502b7.tar.gz
sequelpro-7ead84b0868975752f445d1917bc693a5bf502b7.tar.bz2
sequelpro-7ead84b0868975752f445d1917bc693a5bf502b7.zip
- Relocate the table changed notification, allowing table info pane to update early in the change process, but ensure the change notification occurs on the main thread for stability. Added NSNotificationAdditions from the Colloquy project for this.
- Change the design of the progress indicator layer, and tweak task progress for improved feedback and less flickering by correctly updating interface as appropriate, and delaying status changes for a short time. This partially addresses Issue #455.
Diffstat (limited to 'Interfaces/English.lproj')
-rw-r--r--Interfaces/English.lproj/ProgressIndicatorLayer.xib241
1 files changed, 148 insertions, 93 deletions
diff --git a/Interfaces/English.lproj/ProgressIndicatorLayer.xib b/Interfaces/English.lproj/ProgressIndicatorLayer.xib
index de3df433..54d32869 100644
--- a/Interfaces/English.lproj/ProgressIndicatorLayer.xib
+++ b/Interfaces/English.lproj/ProgressIndicatorLayer.xib
@@ -2,10 +2,10 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1050</int>
- <string key="IBDocument.SystemVersion">10B504</string>
+ <string key="IBDocument.SystemVersion">10C540</string>
<string key="IBDocument.InterfaceBuilderVersion">740</string>
- <string key="IBDocument.AppKitVersion">1038.2</string>
- <string key="IBDocument.HIToolboxVersion">437.00</string>
+ <string key="IBDocument.AppKitVersion">1038.25</string>
+ <string key="IBDocument.HIToolboxVersion">458.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
@@ -21,7 +21,7 @@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="1"/>
+ <integer value="10"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -63,76 +63,125 @@
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSCustomView" id="602680912">
+ <object class="NSBox" id="234202374">
<reference key="NSNextResponder" ref="950529842"/>
- <int key="NSvFlags">274</int>
- <string key="NSFrame">{{50, 84}, {160, 160}}</string>
+ <int key="NSvFlags">12</int>
+ <object class="NSMutableArray" key="NSSubviews">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSView" id="172592959">
+ <reference key="NSNextResponder" ref="234202374"/>
+ <int key="NSvFlags">256</int>
+ <object class="NSMutableArray" key="NSSubviews">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSTextField" id="545295640">
+ <reference key="NSNextResponder" ref="172592959"/>
+ <int key="NSvFlags">290</int>
+ <string key="NSFrame">{{97, 30}, {326, 49}}</string>
+ <reference key="NSSuperview" ref="172592959"/>
+ <bool key="NSViewIsLayerTreeHost">YES</bool>
+ <object class="NSShadow" key="NSViewShadow">
+ <double key="NSShadowHoriz">1</double>
+ <double key="NSShadowVert">-1</double>
+ <double key="NSShadowBlurRadius">2</double>
+ <object class="NSColor" key="NSShadowColor" id="823228870">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MAA</bytes>
+ </object>
+ </object>
+ <int key="NSViewLayerContentsRedrawPolicy">2</int>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSTextFieldCell" key="NSCell" id="39991509">
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">4460544</int>
+ <string key="NSContents">Multiline Label</string>
+ <object class="NSFont" key="NSSupport">
+ <string key="NSName">LucidaGrande-Bold</string>
+ <double key="NSSize">13</double>
+ <int key="NSfFlags">16</int>
+ </object>
+ <reference key="NSControlView" ref="545295640"/>
+ <object class="NSColor" key="NSBackgroundColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MCAwIDAAA</bytes>
+ </object>
+ <object class="NSColor" key="NSTextColor" id="424449304">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MQA</bytes>
+ </object>
+ </object>
+ </object>
+ </object>
+ <string key="NSFrameSize">{436, 90}</string>
+ <reference key="NSSuperview" ref="234202374"/>
+ <int key="NSViewLayerContentsRedrawPolicy">2</int>
+ </object>
+ </object>
+ <string key="NSFrame">{{0, 70}, {436, 90}}</string>
<reference key="NSSuperview" ref="950529842"/>
- <bool key="NSViewIsLayerTreeHost">YES</bool>
- <object class="NSShadow" key="NSViewShadow">
- <double key="NSShadowHoriz">1</double>
- <double key="NSShadowVert">-1</double>
- <double key="NSShadowBlurRadius">1</double>
- <object class="NSColor" key="NSShadowColor" id="823228870">
+ <int key="NSViewLayerContentsRedrawPolicy">2</int>
+ <string key="NSOffsets">{0, 0}</string>
+ <object class="NSTextFieldCell" key="NSTitleCell">
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">0</int>
+ <string key="NSContents">Box</string>
+ <object class="NSFont" key="NSSupport" id="26">
+ <string key="NSName">LucidaGrande</string>
+ <double key="NSSize">11</double>
+ <int key="NSfFlags">3100</int>
+ </object>
+ <object class="NSColor" key="NSBackgroundColor" id="834659164">
+ <int key="NSColorSpace">6</int>
+ <string key="NSCatalogName">System</string>
+ <string key="NSColorName">textBackgroundColor</string>
+ <reference key="NSColor" ref="424449304"/>
+ </object>
+ <object class="NSColor" key="NSTextColor">
<int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MAA</bytes>
+ <bytes key="NSWhite">MCAwLjgwMDAwMDAxMTkAA</bytes>
</object>
</object>
- <int key="NSViewLayerContentsRedrawPolicy">2</int>
- <string key="NSClassName">YRKSpinningProgressIndicator</string>
+ <reference key="NSContentView" ref="172592959"/>
+ <int key="NSBorderType">0</int>
+ <int key="NSBoxType">4</int>
+ <int key="NSTitlePosition">0</int>
+ <bool key="NSTransparent">NO</bool>
+ <double key="NSCornerRadius2">9</double>
+ <object class="NSColor" key="NSFillColor2">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MC4yNTQwMzIyNTgxIDAuOAA</bytes>
+ </object>
</object>
- <object class="NSTextField" id="545295640">
+ <object class="NSCustomView" id="602680912">
<reference key="NSNextResponder" ref="950529842"/>
- <int key="NSvFlags">290</int>
- <string key="NSFrame">{{13, 34}, {234, 42}}</string>
+ <int key="NSvFlags">274</int>
+ <string key="NSFrame">{{13, 79}, {73, 73}}</string>
<reference key="NSSuperview" ref="950529842"/>
<bool key="NSViewIsLayerTreeHost">YES</bool>
<object class="NSShadow" key="NSViewShadow">
<double key="NSShadowHoriz">1</double>
<double key="NSShadowVert">-1</double>
- <double key="NSShadowBlurRadius">2</double>
+ <double key="NSShadowBlurRadius">1</double>
<reference key="NSShadowColor" ref="823228870"/>
</object>
<int key="NSViewLayerContentsRedrawPolicy">2</int>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="39991509">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">138678272</int>
- <string key="NSContents">Multiline Label</string>
- <object class="NSFont" key="NSSupport">
- <string key="NSName">LucidaGrande-Bold</string>
- <double key="NSSize">13</double>
- <int key="NSfFlags">16</int>
- </object>
- <reference key="NSControlView" ref="545295640"/>
- <object class="NSColor" key="NSBackgroundColor">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MCAwIDAAA</bytes>
- </object>
- <object class="NSColor" key="NSTextColor" id="424449304">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MQA</bytes>
- </object>
- </object>
+ <string key="NSClassName">YRKSpinningProgressIndicator</string>
</object>
<object class="BWTransparentButton" id="540103856">
<reference key="NSNextResponder" ref="950529842"/>
<int key="NSvFlags">290</int>
- <string key="NSFrame">{{64, 4}, {132, 28}}</string>
+ <string key="NSFrame">{{295, 72}, {132, 28}}</string>
<reference key="NSSuperview" ref="950529842"/>
+ <int key="NSViewLayerContentsRedrawPolicy">2</int>
<bool key="NSEnabled">YES</bool>
<object class="BWTransparentButtonCell" key="NSCell" id="1030687082">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">134348800</int>
<string key="NSContents">Cancel</string>
- <object class="NSFont" key="NSSupport" id="26">
- <string key="NSName">LucidaGrande</string>
- <double key="NSSize">11</double>
- <int key="NSfFlags">3100</int>
- </object>
+ <reference key="NSSupport" ref="26"/>
<reference key="NSControlView" ref="540103856"/>
- <int key="NSButtonFlags">-2038284033</int>
+ <int key="NSButtonFlags">-2034876161</int>
<int key="NSButtonFlags2">268435585</int>
+ <reference key="NSAlternateImage" ref="26"/>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent">.</string>
<int key="NSPeriodicDelay">200</int>
@@ -140,24 +189,21 @@
</object>
</object>
</object>
- <string key="NSFrameSize">{260, 260}</string>
+ <string key="NSFrameSize">{437, 160}</string>
<reference key="NSSuperview" ref="450247213"/>
+ <int key="NSViewLayerContentsRedrawPolicy">2</int>
</object>
</object>
- <string key="NSFrameSize">{260, 260}</string>
+ <string key="NSFrame">{{0, -70}, {437, 160}}</string>
<reference key="NSSuperview" ref="1005"/>
+ <int key="NSViewLayerContentsRedrawPolicy">2</int>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Box</string>
<reference key="NSSupport" ref="26"/>
- <object class="NSColor" key="NSBackgroundColor">
- <int key="NSColorSpace">6</int>
- <string key="NSCatalogName">System</string>
- <string key="NSColorName">textBackgroundColor</string>
- <reference key="NSColor" ref="424449304"/>
- </object>
+ <reference key="NSBackgroundColor" ref="834659164"/>
<object class="NSColor" key="NSTextColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MCAwLjgwMDAwMDAxMTkAA</bytes>
@@ -168,15 +214,16 @@
<int key="NSBoxType">4</int>
<int key="NSTitlePosition">0</int>
<bool key="NSTransparent">NO</bool>
+ <bool key="NSFullyTransparent">YES</bool>
<real value="0.0" key="NSBorderWidth2"/>
<double key="NSCornerRadius2">15</double>
<object class="NSColor" key="NSFillColor2">
<int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MCAwLjUAA</bytes>
+ <bytes key="NSWhite">MCAwLjcAA</bytes>
</object>
</object>
</object>
- <string key="NSFrameSize">{260, 260}</string>
+ <string key="NSFrameSize">{437, 90}</string>
<reference key="NSSuperview"/>
<int key="NSViewLayerContentsRedrawPolicy">2</int>
<string key="NSClassName">NSView</string>
@@ -267,32 +314,18 @@
<reference key="object" ref="450247213"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="545295640"/>
- <reference ref="540103856"/>
<reference ref="602680912"/>
+ <reference ref="234202374"/>
+ <reference ref="540103856"/>
</object>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">15</int>
- <reference key="object" ref="545295640"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="39991509"/>
- </object>
- <reference key="parent" ref="450247213"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">11</int>
<reference key="object" ref="602680912"/>
<reference key="parent" ref="450247213"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">16</int>
- <reference key="object" ref="39991509"/>
- <reference key="parent" ref="545295640"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">17</int>
<reference key="object" ref="540103856"/>
<object class="NSMutableArray" key="children">
@@ -306,6 +339,29 @@
<reference key="object" ref="1030687082"/>
<reference key="parent" ref="540103856"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">38</int>
+ <reference key="object" ref="234202374"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="545295640"/>
+ </object>
+ <reference key="parent" ref="450247213"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">15</int>
+ <reference key="object" ref="545295640"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="39991509"/>
+ </object>
+ <reference key="parent" ref="234202374"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">16</int>
+ <reference key="object" ref="39991509"/>
+ <reference key="parent" ref="545295640"/>
+ </object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -333,6 +389,10 @@
<string>16.IBPluginDependency</string>
<string>17.IBPluginDependency</string>
<string>18.IBPluginDependency</string>
+ <string>38.IBPluginDependency</string>
+ <string>38.IBViewIntegration.shadowBlurRadius</string>
+ <string>38.IBViewIntegration.shadowOffsetHeight</string>
+ <string>38.IBViewIntegration.shadowOffsetWidth</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -346,7 +406,7 @@
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{393, 332}, {260, 260}}</string>
+ <string>{{393, 502}, {437, 90}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{628, 654}</string>
<string>{{357, 416}, {480, 272}}</string>
@@ -363,6 +423,10 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.brandonwalkin.BWToolkit</string>
<string>com.brandonwalkin.BWToolkit</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <real value="3"/>
+ <real value="-3"/>
+ <real value="3"/>
</object>
</object>
<object class="NSMutableDictionary" key="unlocalizedProperties">
@@ -381,7 +445,7 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">37</int>
+ <int key="maxID">38</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -554,6 +618,13 @@
</object>
<object class="IBPartialClassDescription">
<string key="className">TableDocument</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Source/SPConnectionDelegate.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">TableDocument</string>
<string key="superclassName">NSDocument</string>
<object class="NSMutableDictionary" key="actions">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -572,11 +643,8 @@
<string>closePanelSheet:</string>
<string>closePasswordSheet:</string>
<string>closeSheet:</string>
- <string>copy:</string>
<string>copyCreateTableSyntax:</string>
<string>copyCreateTableSyntaxFromSheet:</string>
- <string>copyServerVariableName:</string>
- <string>copyServerVariableValue:</string>
<string>export:</string>
<string>exportMultipleTables:</string>
<string>exportTable:</string>
@@ -589,12 +657,12 @@
<string>repairTable:</string>
<string>saveConnectionSheet:</string>
<string>saveCreateSyntax:</string>
- <string>saveServerVariables:</string>
<string>setDatabases:</string>
<string>showCreateTableSyntax:</string>
<string>showMySQLHelp:</string>
+ <string>showServerProcesses:</string>
+ <string>showServerVariables:</string>
<string>showUserManager:</string>
- <string>showVariables:</string>
<string>validateSaveConnectionAccessory:</string>
<string>viewContent:</string>
<string>viewQuery:</string>
@@ -643,9 +711,6 @@
<string>id</string>
<string>id</string>
<string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
</object>
</object>
<object class="NSMutableDictionary" key="outlets">
@@ -685,7 +750,6 @@
<string>saveConnectionIncludeQuery</string>
<string>saveConnectionSavePassword</string>
<string>saveConnectionSavePasswordAlert</string>
- <string>saveVariablesButton</string>
<string>sidebarGrabber</string>
<string>spHistoryControllerInstance</string>
<string>tableContentInstance</string>
@@ -708,10 +772,6 @@
<string>titleImageView</string>
<string>titleStringView</string>
<string>userManagerInstance</string>
- <string>variablesCountTextField</string>
- <string>variablesSearchField</string>
- <string>variablesSheet</string>
- <string>variablesTableView</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -748,7 +808,6 @@
<string>id</string>
<string>id</string>
<string>id</string>
- <string>NSButton</string>
<string>id</string>
<string>id</string>
<string>id</string>
@@ -771,10 +830,6 @@
<string>id</string>
<string>id</string>
<string>SPUserManager</string>
- <string>NSTextField</string>
- <string>NSSearchField</string>
- <string>id</string>
- <string>id</string>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">