adium 5270:f7f70ee380e8: More tweaks to the OTR preferences:
commits at adium.im
commits at adium.im
Wed Jan 23 11:41:51 UTC 2013
details: http://hg.adium.im/adium/rev/f7f70ee380e8
revision: 5270:f7f70ee380e8
branch: libotr4.0.0
author: Thijs Alkemade <me at thijsalkema.de>
date: Wed Jan 23 12:40:49 2013 +0100
More tweaks to the OTR preferences:
- Text in the fingerpint inspection is now selectable (fixes #15082), and the window is aligned more according to the HID
- Added a filter bar.
diffs (truncated from 1095 to 1000 lines):
diff -r 522f5ad1b16c -r f7f70ee380e8 Resources/OTRFingerprintDetailsWindow.xib
--- a/Resources/OTRFingerprintDetailsWindow.xib Wed Jan 23 11:54:44 2013 +0100
+++ b/Resources/OTRFingerprintDetailsWindow.xib Wed Jan 23 12:40:49 2013 +0100
@@ -2,24 +2,24 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1060</int>
- <string key="IBDocument.SystemVersion">11D50b</string>
- <string key="IBDocument.InterfaceBuilderVersion">2182</string>
- <string key="IBDocument.AppKitVersion">1138.32</string>
- <string key="IBDocument.HIToolboxVersion">568.00</string>
+ <string key="IBDocument.SystemVersion">12C60</string>
+ <string key="IBDocument.InterfaceBuilderVersion">2844</string>
+ <string key="IBDocument.AppKitVersion">1187.34</string>
+ <string key="IBDocument.HIToolboxVersion">625.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">2182</string>
+ <string key="NS.object.0">2844</string>
</object>
<array key="IBDocument.IntegratedClassDependencies">
+ <string>NSButton</string>
+ <string>NSButtonCell</string>
+ <string>NSCustomObject</string>
+ <string>NSImageCell</string>
+ <string>NSImageView</string>
<string>NSTextField</string>
+ <string>NSTextFieldCell</string>
<string>NSView</string>
<string>NSWindowTemplate</string>
- <string>NSTextFieldCell</string>
- <string>NSImageCell</string>
- <string>NSButtonCell</string>
- <string>NSImageView</string>
- <string>NSButton</string>
- <string>NSCustomObject</string>
</array>
<array key="IBDocument.PluginDependencies">
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -51,18 +51,20 @@
<nil key="NSUserInterfaceItemIdentifier"/>
<string key="NSWindowContentMinSize">{213, 50}</string>
<object class="NSView" key="NSWindowView" id="646357908">
- <nil key="NSNextResponder"/>
+ <reference key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="NSTextField" id="988425130">
<reference key="NSNextResponder" ref="646357908"/>
<int key="NSvFlags">258</int>
- <string key="NSFrame">{{57, 119}, {211, 32}}</string>
+ <string key="NSFrame">{{17, 109}, {211, 32}}</string>
<reference key="NSSuperview" ref="646357908"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="139182757"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="532814574">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">138412032</int>
+ <int key="NSCellFlags">69206017</int>
+ <int key="NSCellFlags2">4194304</int>
<string key="NSContents">System Font Text</string>
<object class="NSFont" key="NSSupport" id="1053190153">
<string key="NSName">LucidaGrande</string>
@@ -89,30 +91,7 @@
</object>
</object>
</object>
- </object>
- <object class="NSImageView" id="76942126">
- <reference key="NSNextResponder" ref="646357908"/>
- <int key="NSvFlags">256</int>
- <set class="NSMutableSet" key="NSDragTypes">
- <string>Apple PDF pasteboard type</string>
- <string>Apple PICT pasteboard type</string>
- <string>Apple PNG pasteboard type</string>
- <string>NSFilenamesPboardType</string>
- <string>NeXT Encapsulated PostScript v1.2 pasteboard type</string>
- <string>NeXT TIFF v4.0 pasteboard type</string>
- </set>
- <string key="NSFrame">{{20, 119}, {32, 32}}</string>
- <reference key="NSSuperview" ref="646357908"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSImageCell" key="NSCell" id="999652167">
- <int key="NSCellFlags">130560</int>
- <int key="NSCellFlags2">33554432</int>
- <int key="NSAlign">0</int>
- <int key="NSScale">0</int>
- <int key="NSStyle">0</int>
- <bool key="NSAnimates">NO</bool>
- </object>
- <bool key="NSEditable">YES</bool>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSImageView" id="139182757">
<reference key="NSNextResponder" ref="646357908"/>
@@ -125,48 +104,59 @@
<string>NeXT Encapsulated PostScript v1.2 pasteboard type</string>
<string>NeXT TIFF v4.0 pasteboard type</string>
</set>
- <string key="NSFrame">{{273, 119}, {32, 32}}</string>
+ <string key="NSFrame">{{273, 109}, {32, 32}}</string>
<reference key="NSSuperview" ref="646357908"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="1017148254"/>
<bool key="NSEnabled">YES</bool>
<object class="NSImageCell" key="NSCell" id="244331114">
- <int key="NSCellFlags">130560</int>
+ <int key="NSCellFlags">134217728</int>
<int key="NSCellFlags2">33554432</int>
<int key="NSAlign">0</int>
<int key="NSScale">0</int>
<int key="NSStyle">0</int>
<bool key="NSAnimates">NO</bool>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<bool key="NSEditable">YES</bool>
</object>
<object class="NSTextField" id="1017148254">
<reference key="NSNextResponder" ref="646357908"/>
<int key="NSvFlags">258</int>
- <string key="NSFrame">{{17, 60}, {291, 51}}</string>
+ <string key="NSFrame">{{17, 50}, {291, 51}}</string>
<reference key="NSSuperview" ref="646357908"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="184521617"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="300600489">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">138412032</int>
+ <int key="NSCellFlags">69206017</int>
+ <int key="NSCellFlags2">4194304</int>
<string type="base64-UTF8" key="NSContents">U3lzdGVtIEZvbnQgVGV4dApMaW5lIDIKTGluZSAzA</string>
- <reference key="NSSupport" ref="1053190153"/>
+ <object class="NSFont" key="NSSupport">
+ <string key="NSName">LucidaGrande</string>
+ <double key="NSSize">11</double>
+ <int key="NSfFlags">16</int>
+ </object>
<reference key="NSControlView" ref="1017148254"/>
<reference key="NSBackgroundColor" ref="762139947"/>
<reference key="NSTextColor" ref="747999109"/>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSButton" id="184521617">
<reference key="NSNextResponder" ref="646357908"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{121, 12}, {82, 32}}</string>
+ <string key="NSFrame">{{229, 13}, {82, 32}}</string>
<reference key="NSSuperview" ref="646357908"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="583519820">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">134217728</int>
<string key="NSContents">OK</string>
<reference key="NSSupport" ref="1053190153"/>
<reference key="NSControlView" ref="184521617"/>
- <int key="NSButtonFlags">-2038284033</int>
+ <int key="NSButtonFlags">-2038284288</int>
<int key="NSButtonFlags2">1</int>
<reference key="NSAlternateImage" ref="1053190153"/>
<string key="NSAlternateContents"/>
@@ -174,11 +164,15 @@
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
</array>
<string key="NSFrameSize">{325, 161}</string>
+ <reference key="NSSuperview"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView"/>
</object>
- <string key="NSScreenRect">{{0, 0}, {1400, 1050}}</string>
+ <string key="NSScreenRect">{{0, 0}, {1920, 1080}}</string>
<string key="NSMinSize">{213, 72}</string>
<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
<bool key="NSWindowIsRestorable">YES</bool>
@@ -220,14 +214,6 @@
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
- <string key="label">imageView_lock</string>
- <reference key="source" ref="863983303"/>
- <reference key="destination" ref="76942126"/>
- </object>
- <int key="connectionID">15</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
<string key="label">button_OK</string>
<reference key="source" ref="863983303"/>
<reference key="destination" ref="184521617"/>
@@ -307,10 +293,9 @@
<reference key="object" ref="646357908"/>
<array class="NSMutableArray" key="children">
<reference ref="988425130"/>
- <reference ref="76942126"/>
- <reference ref="139182757"/>
<reference ref="1017148254"/>
<reference ref="184521617"/>
+ <reference ref="139182757"/>
</array>
<reference key="parent" ref="893767417"/>
</object>
@@ -323,14 +308,6 @@
<reference key="parent" ref="646357908"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">13</int>
- <reference key="object" ref="76942126"/>
- <array class="NSMutableArray" key="children">
- <reference ref="999652167"/>
- </array>
- <reference key="parent" ref="646357908"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">14</int>
<reference key="object" ref="139182757"/>
<array class="NSMutableArray" key="children">
@@ -360,11 +337,6 @@
<reference key="parent" ref="988425130"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">34</int>
- <reference key="object" ref="999652167"/>
- <reference key="parent" ref="76942126"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">35</int>
<reference key="object" ref="244331114"/>
<reference key="parent" ref="139182757"/>
@@ -386,13 +358,11 @@
<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="12.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="13.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="14.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="18.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="20.CustomClassName">AILocalizationButton</string>
<string key="20.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="33.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="34.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="35.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="36.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="37.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -405,17 +375,122 @@
<nil key="sourceID"/>
<int key="maxID">37</int>
</object>
- <object class="IBClassDescriber" key="IBDocument.Classes"/>
+ <object class="IBClassDescriber" key="IBDocument.Classes">
+ <array class="NSMutableArray" key="referencedPartialClassDescriptions">
+ <object class="IBPartialClassDescription">
+ <string key="className">AILocalizationButton</string>
+ <string key="superclassName">NSButton</string>
+ <dictionary class="NSMutableDictionary" key="outlets">
+ <string key="view_anchorToLeftSide">NSView</string>
+ <string key="view_anchorToRightSide">NSView</string>
+ <string key="window_anchorOnLeftSide">NSWindow</string>
+ <string key="window_anchorOnRightSide">NSWindow</string>
+ </dictionary>
+ <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <object class="IBToOneOutletInfo" key="view_anchorToLeftSide">
+ <string key="name">view_anchorToLeftSide</string>
+ <string key="candidateClassName">NSView</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="view_anchorToRightSide">
+ <string key="name">view_anchorToRightSide</string>
+ <string key="candidateClassName">NSView</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="window_anchorOnLeftSide">
+ <string key="name">window_anchorOnLeftSide</string>
+ <string key="candidateClassName">NSWindow</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="window_anchorOnRightSide">
+ <string key="name">window_anchorOnRightSide</string>
+ <string key="candidateClassName">NSWindow</string>
+ </object>
+ </dictionary>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">./Classes/AILocalizationButton.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">AIWindowController</string>
+ <string key="superclassName">NSWindowController</string>
+ <object class="NSMutableDictionary" key="actions">
+ <string key="NS.key.0">closeWindow:</string>
+ <string key="NS.object.0">id</string>
+ </object>
+ <object class="NSMutableDictionary" key="actionInfosByName">
+ <string key="NS.key.0">closeWindow:</string>
+ <object class="IBActionInfo" key="NS.object.0">
+ <string key="name">closeWindow:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">./Classes/AIWindowController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">ESOTRFingerprintDetailsWindowController</string>
+ <string key="superclassName">AIWindowController</string>
+ <dictionary class="NSMutableDictionary" key="outlets">
+ <string key="button_OK">NSButton</string>
+ <string key="imageView_lock">NSImageView</string>
+ <string key="imageView_service">NSImageView</string>
+ <string key="textField_UID">NSTextField</string>
+ <string key="textField_fingerprint">NSTextField</string>
+ </dictionary>
+ <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <object class="IBToOneOutletInfo" key="button_OK">
+ <string key="name">button_OK</string>
+ <string key="candidateClassName">NSButton</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="imageView_lock">
+ <string key="name">imageView_lock</string>
+ <string key="candidateClassName">NSImageView</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="imageView_service">
+ <string key="name">imageView_service</string>
+ <string key="candidateClassName">NSImageView</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="textField_UID">
+ <string key="name">textField_UID</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="textField_fingerprint">
+ <string key="name">textField_fingerprint</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ </dictionary>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">./Classes/ESOTRFingerprintDetailsWindowController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="NSMutableDictionary" key="actions">
+ <string key="NS.key.0">selectServiceType:</string>
+ <string key="NS.object.0">id</string>
+ </object>
+ <object class="NSMutableDictionary" key="actionInfosByName">
+ <string key="NS.key.0">selectServiceType:</string>
+ <object class="IBActionInfo" key="NS.object.0">
+ <string key="name">selectServiceType:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">./Classes/NSObject.h</string>
+ </object>
+ </object>
+ </array>
+ </object>
<int key="IBDocument.localizationMode">0</int>
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
<real value="1060" key="NS.object.0"/>
</object>
- <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
- <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
- <real value="1060" key="NS.object.0"/>
- </object>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
<real value="3200" key="NS.object.0"/>
diff -r 522f5ad1b16c -r f7f70ee380e8 Resources/Preferences-Encryption.xib
--- a/Resources/Preferences-Encryption.xib Wed Jan 23 11:54:44 2013 +0100
+++ b/Resources/Preferences-Encryption.xib Wed Jan 23 12:40:49 2013 +0100
@@ -2,30 +2,32 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1060</int>
- <string key="IBDocument.SystemVersion">11D50b</string>
- <string key="IBDocument.InterfaceBuilderVersion">2182</string>
- <string key="IBDocument.AppKitVersion">1138.32</string>
- <string key="IBDocument.HIToolboxVersion">568.00</string>
+ <string key="IBDocument.SystemVersion">12C60</string>
+ <string key="IBDocument.InterfaceBuilderVersion">2844</string>
+ <string key="IBDocument.AppKitVersion">1187.34</string>
+ <string key="IBDocument.HIToolboxVersion">625.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">2182</string>
+ <string key="NS.object.0">2844</string>
</object>
<array key="IBDocument.IntegratedClassDependencies">
+ <string>NSButton</string>
+ <string>NSButtonCell</string>
+ <string>NSCustomObject</string>
+ <string>NSCustomView</string>
+ <string>NSMenu</string>
+ <string>NSMenuItem</string>
<string>NSPopUpButton</string>
+ <string>NSPopUpButtonCell</string>
+ <string>NSScrollView</string>
<string>NSScroller</string>
- <string>NSButton</string>
- <string>NSMenu</string>
- <string>NSScrollView</string>
- <string>NSTextFieldCell</string>
- <string>NSButtonCell</string>
- <string>NSMenuItem</string>
+ <string>NSSearchField</string>
+ <string>NSSearchFieldCell</string>
+ <string>NSTableColumn</string>
<string>NSTableHeaderView</string>
<string>NSTableView</string>
- <string>NSCustomView</string>
- <string>NSCustomObject</string>
- <string>NSPopUpButtonCell</string>
- <string>NSTableColumn</string>
<string>NSTextField</string>
+ <string>NSTextFieldCell</string>
</array>
<array key="IBDocument.PluginDependencies">
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -48,31 +50,35 @@
<reference key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<array class="NSMutableArray" key="NSSubviews">
- <object class="NSTextField" id="944557168">
+ <object class="NSSearchField" id="590488253">
<reference key="NSNextResponder" ref="261192207"/>
- <int key="NSvFlags">268</int>
- <string key="NSFrame">{{21, 198}, {149, 17}}</string>
+ <int key="NSvFlags">265</int>
+ <string key="NSFrame">{{172, 20}, {153, 22}}</string>
<reference key="NSSuperview" ref="261192207"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="476167500"/>
+ <reference key="NSNextKeyView" ref="41604946"/>
+ <string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="718859564">
- <int key="NSCellFlags">68288064</int>
- <int key="NSCellFlags2">71304192</int>
- <string key="NSContents">Known Fingerprints:</string>
+ <object class="NSSearchFieldCell" key="NSCell" id="119300789">
+ <int key="NSCellFlags">342884416</int>
+ <int key="NSCellFlags2">272630848</int>
+ <string key="NSContents"/>
<object class="NSFont" key="NSSupport" id="970377140">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">13</double>
<int key="NSfFlags">1044</int>
</object>
- <reference key="NSControlView" ref="944557168"/>
- <object class="NSColor" key="NSBackgroundColor" id="1001302365">
+ <string key="NSCellIdentifier">_NS:9</string>
+ <reference key="NSControlView" ref="590488253"/>
+ <bool key="NSDrawsBackground">YES</bool>
+ <int key="NSTextBezelStyle">1</int>
+ <object class="NSColor" key="NSBackgroundColor">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
- <string key="NSColorName">controlColor</string>
- <object class="NSColor" key="NSColor" id="698936443">
+ <string key="NSColorName">textBackgroundColor</string>
+ <object class="NSColor" key="NSColor" id="399647140">
<int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
+ <bytes key="NSWhite">MQA</bytes>
</object>
</object>
<object class="NSColor" key="NSTextColor" id="1001647384">
@@ -84,7 +90,68 @@
<bytes key="NSWhite">MAA</bytes>
</object>
</object>
+ <object class="NSButtonCell" key="NSSearchButtonCell">
+ <int key="NSCellFlags">0</int>
+ <int key="NSCellFlags2">0</int>
+ <string key="NSContents">search</string>
+ <reference key="NSControlView" ref="590488253"/>
+ <string key="NSAction">_searchFieldSearch:</string>
+ <reference key="NSTarget" ref="119300789"/>
+ <int key="NSButtonFlags">138690560</int>
+ <int key="NSButtonFlags2">0</int>
+ <string key="NSKeyEquivalent"/>
+ <int key="NSPeriodicDelay">400</int>
+ <int key="NSPeriodicInterval">75</int>
+ </object>
+ <object class="NSButtonCell" key="NSCancelButtonCell">
+ <int key="NSCellFlags">0</int>
+ <int key="NSCellFlags2">0</int>
+ <string key="NSContents">clear</string>
+ <array class="NSMutableArray" key="NSAccessibilityOverriddenAttributes">
+ <dictionary class="NSMutableDictionary">
+ <string key="AXDescription">cancel</string>
+ <integer value="1" key="NSAccessibilityEncodedAttributesValueType"/>
+ </dictionary>
+ </array>
+ <reference key="NSControlView" ref="590488253"/>
+ <string key="NSAction">_searchFieldCancel:</string>
+ <reference key="NSTarget" ref="119300789"/>
+ <int key="NSButtonFlags">138690560</int>
+ <int key="NSButtonFlags2">0</int>
+ <string key="NSKeyEquivalent"/>
+ <int key="NSPeriodicDelay">400</int>
+ <int key="NSPeriodicInterval">75</int>
+ </object>
+ <int key="NSMaximumRecents">255</int>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+ </object>
+ <object class="NSTextField" id="944557168">
+ <reference key="NSNextResponder" ref="261192207"/>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrame">{{18, 189}, {149, 17}}</string>
+ <reference key="NSSuperview" ref="261192207"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="476167500"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSTextFieldCell" key="NSCell" id="718859564">
+ <int key="NSCellFlags">68157504</int>
+ <int key="NSCellFlags2">71304192</int>
+ <string key="NSContents">Known Fingerprints:</string>
+ <reference key="NSSupport" ref="970377140"/>
+ <reference key="NSControlView" ref="944557168"/>
+ <object class="NSColor" key="NSBackgroundColor" id="1001302365">
+ <int key="NSColorSpace">6</int>
+ <string key="NSCatalogName">System</string>
+ <string key="NSColorName">controlColor</string>
+ <object class="NSColor" key="NSColor" id="698936443">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
+ </object>
+ </object>
+ <reference key="NSTextColor" ref="1001647384"/>
+ </object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSTextField" id="246614867">
<reference key="NSNextResponder" ref="261192207"/>
@@ -95,7 +162,7 @@
<reference key="NSNextKeyView" ref="365143233"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="523338">
- <int key="NSCellFlags">68288064</int>
+ <int key="NSCellFlags">68157504</int>
<int key="NSCellFlags2">71304192</int>
<string key="NSContents">Private Keys:</string>
<reference key="NSSupport" ref="970377140"/>
@@ -103,6 +170,7 @@
<reference key="NSBackgroundColor" ref="1001302365"/>
<reference key="NSTextColor" ref="1001647384"/>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSPopUpButton" id="365143233">
<reference key="NSNextResponder" ref="261192207"/>
@@ -113,11 +181,11 @@
<reference key="NSNextKeyView" ref="346757463"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="495829525">
- <int key="NSCellFlags">-2076049856</int>
+ <int key="NSCellFlags">-2076180416</int>
<int key="NSCellFlags2">2048</int>
<reference key="NSSupport" ref="970377140"/>
<reference key="NSControlView" ref="365143233"/>
- <int key="NSButtonFlags">109199615</int>
+ <int key="NSButtonFlags">109199360</int>
<int key="NSButtonFlags2">1</int>
<object class="NSFont" key="NSAlternateImage" id="874098883">
<string key="NSName">LucidaGrande</string>
@@ -162,6 +230,7 @@
<bool key="NSAltersState">YES</bool>
<int key="NSArrowPosition">1</int>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSTextField" id="152864849">
<reference key="NSNextResponder" ref="261192207"/>
@@ -172,7 +241,7 @@
<reference key="NSNextKeyView" ref="944557168"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="587033203">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">205520896</int>
<string key="NSContents">The private key is displayed here...</string>
<object class="NSFont" key="NSSupport" id="26">
@@ -184,6 +253,7 @@
<reference key="NSBackgroundColor" ref="1001302365"/>
<reference key="NSTextColor" ref="1001647384"/>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSButton" id="346757463">
<reference key="NSNextResponder" ref="261192207"/>
@@ -194,12 +264,12 @@
<reference key="NSNextKeyView" ref="152864849"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="9745553">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">134217728</int>
<string key="NSContents">Generate</string>
<reference key="NSSupport" ref="970377140"/>
<reference key="NSControlView" ref="346757463"/>
- <int key="NSButtonFlags">-2038284033</int>
+ <int key="NSButtonFlags">-2038284288</int>
<int key="NSButtonFlags2">1</int>
<reference key="NSAlternateImage" ref="874098883"/>
<string key="NSAlternateContents"/>
@@ -209,6 +279,7 @@
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSScrollView" id="476167500">
<reference key="NSNextResponder" ref="261192207"/>
@@ -221,11 +292,13 @@
<object class="NSTableView" id="712016614">
<reference key="NSNextResponder" ref="445790025"/>
<int key="NSvFlags">256</int>
- <string key="NSFrameSize">{403, 148}</string>
+ <string key="NSFrameSize">{403, 133}</string>
<reference key="NSSuperview" ref="445790025"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="146545853"/>
+ <reference key="NSNextKeyView" ref="293354221"/>
<bool key="NSEnabled">YES</bool>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+ <bool key="NSControlAllowsExpansionToolTips">YES</bool>
<object class="NSTableHeaderView" key="NSHeaderView" id="44990423">
<reference key="NSNextResponder" ref="146545853"/>
<int key="NSvFlags">256</int>
@@ -235,10 +308,13 @@
<reference key="NSNextKeyView" ref="445790025"/>
<reference key="NSTableView" ref="712016614"/>
</object>
- <object class="_NSCornerView" key="NSCornerView">
- <nil key="NSNextResponder"/>
+ <object class="_NSCornerView" key="NSCornerView" id="705249390">
+ <reference key="NSNextResponder" ref="476167500"/>
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{-22, 0}, {12, 17}}</string>
+ <reference key="NSSuperview" ref="476167500"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="146545853"/>
</object>
<array class="NSMutableArray" key="NSTableColumns">
<object class="NSTableColumn" id="493648427">
@@ -247,7 +323,7 @@
<double key="NSMinWidth">40</double>
<double key="NSMaxWidth">1000</double>
<object class="NSTableHeaderCell" key="NSHeaderCell">
- <int key="NSCellFlags">75628096</int>
+ <int key="NSCellFlags">75497536</int>
<int key="NSCellFlags2">2048</int>
<string key="NSContents">Name</string>
<reference key="NSSupport" ref="26"/>
@@ -263,7 +339,7 @@
</object>
</object>
<object class="NSTextFieldCell" key="NSDataCell" id="733576058">
- <int key="NSCellFlags">337772096</int>
+ <int key="NSCellFlags">337641536</int>
<int key="NSCellFlags2">2048</int>
<reference key="NSSupport" ref="970377140"/>
<reference key="NSControlView" ref="712016614"/>
@@ -285,7 +361,7 @@
<double key="NSMinWidth">40</double>
<double key="NSMaxWidth">1000</double>
<object class="NSTableHeaderCell" key="NSHeaderCell">
- <int key="NSCellFlags">75628096</int>
+ <int key="NSCellFlags">75497536</int>
<int key="NSCellFlags2">2048</int>
<string key="NSContents">Status</string>
<reference key="NSSupport" ref="26"/>
@@ -293,7 +369,7 @@
<reference key="NSTextColor" ref="263411744"/>
</object>
<object class="NSTextFieldCell" key="NSDataCell" id="131921218">
- <int key="NSCellFlags">337772096</int>
+ <int key="NSCellFlags">337641536</int>
<int key="NSCellFlags2">2048</int>
<reference key="NSSupport" ref="970377140"/>
<reference key="NSControlView" ref="712016614"/>
@@ -307,10 +383,7 @@
</array>
<double key="NSIntercellSpacingWidth">3</double>
<double key="NSIntercellSpacingHeight">2</double>
- <object class="NSColor" key="NSBackgroundColor">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MQA</bytes>
- </object>
+ <reference key="NSBackgroundColor" ref="399647140"/>
<object class="NSColor" key="NSGridColor">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
@@ -332,7 +405,7 @@
<int key="NSTableViewGroupRowStyle">1</int>
</object>
</array>
- <string key="NSFrame">{{1, 17}, {403, 148}}</string>
+ <string key="NSFrame">{{1, 17}, {403, 133}}</string>
<reference key="NSSuperview" ref="476167500"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="712016614"/>
@@ -346,7 +419,8 @@
<string key="NSFrame">{{296, 17}, {11, 151}}</string>
<reference key="NSSuperview" ref="476167500"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="41604946"/>
+ <reference key="NSNextKeyView" ref="590488253"/>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<int key="NSsFlags">256</int>
<reference key="NSTarget" ref="476167500"/>
<string key="NSAction">_doScroller:</string>
@@ -359,6 +433,7 @@
<reference key="NSSuperview" ref="476167500"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="849894620"/>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<int key="NSsFlags">257</int>
<reference key="NSTarget" ref="476167500"/>
<string key="NSAction">_doScroller:</string>
@@ -378,32 +453,38 @@
<reference key="NSBGColor" ref="1055559834"/>
<int key="NScvFlags">4</int>
</object>
+ <reference ref="705249390"/>
</array>
- <string key="NSFrame">{{175, 49}, {405, 166}}</string>
+ <string key="NSFrame">{{172, 55}, {405, 151}}</string>
<reference key="NSSuperview" ref="261192207"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="445790025"/>
+ <reference key="NSNextKeyView" ref="705249390"/>
<int key="NSsFlags">133682</int>
<reference key="NSVScroller" ref="849894620"/>
<reference key="NSHScroller" ref="293354221"/>
<reference key="NSContentView" ref="445790025"/>
<reference key="NSHeaderClipView" ref="146545853"/>
+ <reference key="NSCornerView" ref="705249390"/>
<bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>
+ <double key="NSMinMagnification">0.25</double>
+ <double key="NSMaxMagnification">4</double>
+ <double key="NSMagnification">1</double>
</object>
<object class="NSButton" id="953884195">
<reference key="NSNextResponder" ref="261192207"/>
<int key="NSvFlags">289</int>
- <string key="NSFrame">{{433, 12}, {155, 32}}</string>
+ <string key="NSFrame">{{503, 13}, {80, 32}}</string>
<reference key="NSSuperview" ref="261192207"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="893620119">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">134217728</int>
- <string key="NSContents">Forget Fingerprint</string>
+ <string key="NSContents">Delete</string>
<reference key="NSSupport" ref="970377140"/>
<reference key="NSControlView" ref="953884195"/>
- <int key="NSButtonFlags">-2038284033</int>
+ <int key="NSButtonFlags">-2038284288</int>
<int key="NSButtonFlags2">1</int>
<reference key="NSAlternateImage" ref="874098883"/>
<string key="NSAlternateContents"/>
@@ -413,22 +494,23 @@
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSButton" id="41604946">
<reference key="NSNextResponder" ref="261192207"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{168, 13}, {160, 32}}</string>
+ <string key="NSFrame">{{417, 13}, {86, 32}}</string>
<reference key="NSSuperview" ref="261192207"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="953884195"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="830856661">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">134217728</int>
- <string key="NSContents">Show Fingerprint…</string>
+ <string key="NSContents">Show...</string>
<reference key="NSSupport" ref="970377140"/>
<reference key="NSControlView" ref="41604946"/>
- <int key="NSButtonFlags">-2038284033</int>
+ <int key="NSButtonFlags">-2038284288</int>
<int key="NSButtonFlags2">1</int>
<reference key="NSAlternateImage" ref="874098883"/>
<string key="NSAlternateContents"/>
@@ -438,6 +520,7 @@
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
</array>
<string key="NSFrameSize">{600, 309}</string>
@@ -548,6 +631,30 @@
</object>
<int key="connectionID">73</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">filter:</string>
+ <reference key="source" ref="245285604"/>
+ <reference key="destination" ref="590488253"/>
+ </object>
+ <int key="connectionID">77</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">field_filter</string>
+ <reference key="source" ref="245285604"/>
+ <reference key="destination" ref="590488253"/>
+ </object>
+ <int key="connectionID">78</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">view_anchorToLeftSide</string>
+ <reference key="source" ref="346757463"/>
+ <reference key="destination" ref="365143233"/>
+ </object>
+ <int key="connectionID">74</int>
+ </object>
</array>
<object class="IBMutableOrderedSet" key="objectRecords">
<array key="orderedObjects">
@@ -581,12 +688,13 @@
<array class="NSMutableArray" key="children">
<reference ref="365143233"/>
<reference ref="152864849"/>
- <reference ref="944557168"/>
- <reference ref="476167500"/>
- <reference ref="41604946"/>
<reference ref="346757463"/>
<reference ref="246614867"/>
<reference ref="953884195"/>
+ <reference ref="41604946"/>
+ <reference ref="590488253"/>
+ <reference ref="476167500"/>
+ <reference ref="944557168"/>
</array>
<reference key="parent" ref="0"/>
<string key="objectName">View</string>
@@ -759,6 +867,19 @@
<reference key="object" ref="718859564"/>
<reference key="parent" ref="944557168"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">75</int>
+ <reference key="object" ref="590488253"/>
+ <array class="NSMutableArray" key="children">
+ <reference ref="119300789"/>
+ </array>
+ <reference key="parent" ref="261192207"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">76</int>
+ <reference key="object" ref="119300789"/>
+ <reference key="parent" ref="590488253"/>
+ </object>
</array>
</object>
<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -799,12 +920,14 @@
<string key="68.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="69.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="70.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="75.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="76.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
- <int key="maxID">73</int>
+ <int key="maxID">78</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -882,11 +1005,16 @@
<string key="className">ESOTRPreferences</string>
<string key="superclassName">AIPreferencePane</string>
<dictionary class="NSMutableDictionary" key="actions">
+ <string key="filter:">id</string>
<string key="forgetFingerprint:">id</string>
<string key="generate:">id</string>
<string key="showFingerprint:">id</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="actionInfosByName">
+ <object class="IBActionInfo" key="filter:">
+ <string key="name">filter:</string>
+ <string key="candidateClassName">id</string>
+ </object>
<object class="IBActionInfo" key="forgetFingerprint:">
<string key="name">forgetFingerprint:</string>
<string key="candidateClassName">id</string>
@@ -904,6 +1032,7 @@
<string key="button_forgetFingerprint">NSButton</string>
<string key="button_generate">NSButton</string>
<string key="button_showFingerprint">NSButton</string>
+ <string key="field_filter">NSSearchField</string>
<string key="label_knownFingerprints">NSTextField</string>
<string key="label_privateKeys">NSTextField</string>
<string key="popUp_accounts">NSPopUpButton</string>
@@ -923,6 +1052,10 @@
<string key="name">button_showFingerprint</string>
<string key="candidateClassName">NSButton</string>
</object>
+ <object class="IBToOneOutletInfo" key="field_filter">
+ <string key="name">field_filter</string>
+ <string key="candidateClassName">NSSearchField</string>
+ </object>
<object class="IBToOneOutletInfo" key="label_knownFingerprints">
<string key="name">label_knownFingerprints</string>
<string key="candidateClassName">NSTextField</string>
@@ -975,10 +1108,6 @@
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
<real value="1060" key="NS.object.0"/>
</object>
- <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
- <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
- <real value="1060" key="NS.object.0"/>
- </object>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
<real value="3200" key="NS.object.0"/>
diff -r 522f5ad1b16c -r f7f70ee380e8 Source/ESOTRFingerprintDetailsWindowController.m
--- a/Source/ESOTRFingerprintDetailsWindowController.m Wed Jan 23 11:54:44 2013 +0100
+++ b/Source/ESOTRFingerprintDetailsWindowController.m Wed Jan 23 12:40:49 2013 +0100
@@ -71,7 +71,7 @@
//Ensure the window is loaded
[self window];
- [textField_UID setStringValue:[fingerprintDict objectForKey:@"UID"]];
+ [textField_UID setStringValue:[NSString stringWithFormat:AILocalizedString(@"Fingerpint for %@:", "used for OTR, %@ is a name"), [fingerprintDict objectForKey:@"UID"]]];
[textField_fingerprint setStringValue:[fingerprintDict objectForKey:@"FingerprintString"]];
[imageView_service setImage:[AIServiceIcons serviceIconForObject:account
diff -r 522f5ad1b16c -r f7f70ee380e8 Source/ESOTRPreferences.h
--- a/Source/ESOTRPreferences.h Wed Jan 23 11:54:44 2013 +0100
+++ b/Source/ESOTRPreferences.h Wed Jan 23 12:40:49 2013 +0100
@@ -26,9 +26,12 @@
IBOutlet NSButton *button_showFingerprint;
IBOutlet NSButton *button_forgetFingerprint;
+ IBOutlet NSSearchField *field_filter;
+
BOOL viewIsOpen;
NSMutableArray *fingerprintDictArray;
+ NSMutableArray *filteredFingerprintDictArray;
AIAccountMenu *accountMenu;
NSTextField *label_knownFingerprints;
NSTextField *label_privateKeys;
@@ -40,6 +43,7 @@
- (IBAction)generate:(id)sender;
- (IBAction)showFingerprint:(id)sender;
- (IBAction)forgetFingerprint:(id)sender;
+- (IBAction)filter:(id)sender;
- (void)updateFingerprintsList;
- (void)updatePrivateKeyList;
diff -r 522f5ad1b16c -r f7f70ee380e8 Source/ESOTRPreferences.m
--- a/Source/ESOTRPreferences.m Wed Jan 23 11:54:44 2013 +0100
+++ b/Source/ESOTRPreferences.m Wed Jan 23 12:40:49 2013 +0100
@@ -78,8 +78,8 @@
{
[label_privateKeys setStringValue:AILocalizedString(@"Private Keys:", nil)];
[label_knownFingerprints setStringValue:AILocalizedString(@"Known Fingerprints:", nil)];
- [button_forgetFingerprint setTitle:AILocalizedString(@"Forget Fingerprint", nil)];
- [button_showFingerprint setTitle:[AILocalizedString(@"Show Fingerprint", nil) stringByAppendingEllipsis]];
+ [button_forgetFingerprint setTitle:AILocalizedString(@"Delete", nil)];
+ [button_showFingerprint setTitle:[AILocalizedString(@"Show", nil) stringByAppendingEllipsis]];
[button_generate setTitle:AILocalizedString(@"Generate", nil)];
[[[tableView_fingerprints tableColumnWithIdentifier:@"UID"] headerCell] setStringValue:AILocalizedString(@"Name", nil)];
[[[tableView_fingerprints tableColumnWithIdentifier:@"Status"] headerCell] setStringValue:AILocalizedString(@"Status", nil)];
@@ -102,6 +102,7 @@
- (void)dealloc
{
[fingerprintDictArray release]; fingerprintDictArray = nil;
+ [filteredFingerprintDictArray release]; filteredFingerprintDictArray = nil;
More information about the commits
mailing list