adium 5768:f0b077047d2a: Show the actual OTR status of a fingerp...
commits at adium.im
commits at adium.im
Sun Nov 24 15:26:59 UTC 2013
details: http://hg.adium.im/adium/rev/f0b077047d2a
revision: 5768:f0b077047d2a
branch: libotr4.0.0
author: Thijs Alkemade <me at thijsalkema.de>
date: Sun Nov 24 16:26:06 2013 +0100
Show the actual OTR status of a fingerprint in the known fingerprints list, not the status of the active conversation.
Added a popup button to the Show Fingerprint window allowing users to change the trust status manually, even when no active OTR session is active.
Fixes #16546, refs #9942
diffs (truncated from 2060 to 1000 lines):
diff -r 7c1b8533e9e5 -r f0b077047d2a Plugins/Bonjour/libezv/Private Classes/AWEzvContactManager.h
--- a/Plugins/Bonjour/libezv/Private Classes/AWEzvContactManager.h Tue Sep 10 13:47:46 2013 +0200
+++ b/Plugins/Bonjour/libezv/Private Classes/AWEzvContactManager.h Sun Nov 24 16:26:06 2013 +0100
@@ -30,7 +30,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <DNSServiceDiscovery/DNSServiceDiscovery.h>
#import <dns_sd.h>
diff -r 7c1b8533e9e5 -r f0b077047d2a Resources/OTRFingerprintDetailsWindow.xib
--- a/Resources/OTRFingerprintDetailsWindow.xib Tue Sep 10 13:47:46 2013 +0200
+++ b/Resources/OTRFingerprintDetailsWindow.xib Sun Nov 24 16:26:06 2013 +0100
@@ -1,501 +1,121 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
- <data>
- <int key="IBDocument.SystemTarget">1060</int>
- <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">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>
- </array>
- <array key="IBDocument.PluginDependencies">
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- </array>
- <object class="NSMutableDictionary" key="IBDocument.Metadata">
- <string key="NS.key.0">PluginDependencyRecalculationVersion</string>
- <integer value="1" key="NS.object.0"/>
- </object>
- <array class="NSMutableArray" key="IBDocument.RootObjects" id="703582063">
- <object class="NSCustomObject" id="863983303">
- <string key="NSClassName">ESOTRFingerprintDetailsWindowController</string>
- </object>
- <object class="NSCustomObject" id="855343907">
- <string key="NSClassName">FirstResponder</string>
- </object>
- <object class="NSCustomObject" id="154124123">
- <string key="NSClassName">NSApplication</string>
- </object>
- <object class="NSWindowTemplate" id="893767417">
- <int key="NSWindowStyleMask">3</int>
- <int key="NSWindowBacking">2</int>
- <string key="NSWindowRect">{{436, 533}, {325, 161}}</string>
- <int key="NSWTFlags">-1334312960</int>
- <string key="NSWindowTitle"/>
- <string key="NSWindowClass">NSPanel</string>
- <object class="NSMutableString" key="NSViewClass">
- <characters key="NS.bytes">View</characters>
- </object>
- <nil key="NSUserInterfaceItemIdentifier"/>
- <string key="NSWindowContentMinSize">{213, 50}</string>
- <object class="NSView" key="NSWindowView" id="646357908">
- <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">{{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">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>
- <double key="NSSize">13</double>
- <int key="NSfFlags">1044</int>
- </object>
- <reference key="NSControlView" ref="988425130"/>
- <object class="NSColor" key="NSBackgroundColor" id="762139947">
- <int key="NSColorSpace">6</int>
- <string key="NSCatalogName">System</string>
- <string key="NSColorName">controlColor</string>
- <object class="NSColor" key="NSColor">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
- </object>
- </object>
- <object class="NSColor" key="NSTextColor" id="747999109">
- <int key="NSColorSpace">6</int>
- <string key="NSCatalogName">System</string>
- <string key="NSColorName">controlTextColor</string>
- <object class="NSColor" key="NSColor">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MAA</bytes>
- </object>
- </object>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSImageView" id="139182757">
- <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">{{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">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, 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">69206017</int>
- <int key="NSCellFlags2">4194304</int>
- <string type="base64-UTF8" key="NSContents">U3lzdGVtIEZvbnQgVGV4dApMaW5lIDIKTGluZSAzA</string>
- <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">{{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">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">-2038284288</int>
- <int key="NSButtonFlags2">1</int>
- <reference key="NSAlternateImage" ref="1053190153"/>
- <string key="NSAlternateContents"/>
- <string type="base64-UTF8" key="NSKeyEquivalent">DQ</string>
- <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}, {1920, 1080}}</string>
- <string key="NSMinSize">{213, 72}</string>
- <string key="NSMaxSize">{10000000000000, 10000000000000}</string>
- <bool key="NSWindowIsRestorable">YES</bool>
- </object>
- </array>
- <object class="IBObjectContainer" key="IBDocument.Objects">
- <array class="NSMutableArray" key="connectionRecords">
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">textField_fingerprint</string>
- <reference key="source" ref="863983303"/>
- <reference key="destination" ref="1017148254"/>
- </object>
- <int key="connectionID">19</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">imageView_service</string>
- <reference key="source" ref="863983303"/>
- <reference key="destination" ref="139182757"/>
- </object>
- <int key="connectionID">16</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">textField_UID</string>
- <reference key="source" ref="863983303"/>
- <reference key="destination" ref="988425130"/>
- </object>
- <int key="connectionID">17</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">window</string>
- <reference key="source" ref="863983303"/>
- <reference key="destination" ref="893767417"/>
- </object>
- <int key="connectionID">9</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"/>
- </object>
- <int key="connectionID">27</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">closeWindow:</string>
- <reference key="source" ref="863983303"/>
- <reference key="destination" ref="184521617"/>
- </object>
- <int key="connectionID">25</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">initialFirstResponder</string>
- <reference key="source" ref="893767417"/>
- <reference key="destination" ref="184521617"/>
- </object>
- <int key="connectionID">23</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">delegate</string>
- <reference key="source" ref="893767417"/>
- <reference key="destination" ref="863983303"/>
- </object>
- <int key="connectionID">22</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">window_anchorOnRightSide</string>
- <reference key="source" ref="184521617"/>
- <reference key="destination" ref="893767417"/>
- </object>
- <int key="connectionID">30</int>
- </object>
- </array>
- <object class="IBMutableOrderedSet" key="objectRecords">
- <array key="orderedObjects">
- <object class="IBObjectRecord">
- <int key="objectID">0</int>
- <array key="object" id="0"/>
- <reference key="children" ref="703582063"/>
- <nil key="parent"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">-2</int>
- <reference key="object" ref="863983303"/>
- <reference key="parent" ref="0"/>
- <string key="objectName">File's Owner</string>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">-1</int>
- <reference key="object" ref="855343907"/>
- <reference key="parent" ref="0"/>
- <string key="objectName">First Responder</string>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">-3</int>
- <reference key="object" ref="154124123"/>
- <reference key="parent" ref="0"/>
- <string key="objectName">Application</string>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">6</int>
- <reference key="object" ref="893767417"/>
- <array class="NSMutableArray" key="children">
- <reference ref="646357908"/>
- </array>
- <reference key="parent" ref="0"/>
- <string key="objectName">Key Generation</string>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">5</int>
- <reference key="object" ref="646357908"/>
- <array class="NSMutableArray" key="children">
- <reference ref="988425130"/>
- <reference ref="1017148254"/>
- <reference ref="184521617"/>
- <reference ref="139182757"/>
- </array>
- <reference key="parent" ref="893767417"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">12</int>
- <reference key="object" ref="988425130"/>
- <array class="NSMutableArray" key="children">
- <reference ref="532814574"/>
- </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">
- <reference ref="244331114"/>
- </array>
- <reference key="parent" ref="646357908"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">18</int>
- <reference key="object" ref="1017148254"/>
- <array class="NSMutableArray" key="children">
- <reference ref="300600489"/>
- </array>
- <reference key="parent" ref="646357908"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">20</int>
- <reference key="object" ref="184521617"/>
- <array class="NSMutableArray" key="children">
- <reference ref="583519820"/>
- </array>
- <reference key="parent" ref="646357908"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">33</int>
- <reference key="object" ref="532814574"/>
- <reference key="parent" ref="988425130"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">35</int>
- <reference key="object" ref="244331114"/>
- <reference key="parent" ref="139182757"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">36</int>
- <reference key="object" ref="300600489"/>
- <reference key="parent" ref="1017148254"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">37</int>
- <reference key="object" ref="583519820"/>
- <reference key="parent" ref="184521617"/>
- </object>
- </array>
- </object>
- <dictionary class="NSMutableDictionary" key="flattenedProperties">
- <string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <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="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="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>
- <string key="5.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="6.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">37</int>
- </object>
- <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.PluginDeclaredDevelopmentDependencies">
- <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
- <real value="3200" key="NS.object.0"/>
- </object>
- <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
- <int key="IBDocument.defaultPropertyAccessControl">3</int>
- </data>
-</archive>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="4514" systemVersion="13A603" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+ <dependencies>
+ <deployment version="1060" defaultVersion="1060" identifier="macosx"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="4514"/>
+ </dependencies>
+ <objects>
+ <customObject id="-2" userLabel="File's Owner" customClass="ESOTRFingerprintDetailsWindowController">
+ <connections>
+ <outlet property="button_OK" destination="20" id="27"/>
+ <outlet property="button_cancel" destination="dXc-iq-UAp" id="ddQ-t5-OiL"/>
+ <outlet property="button_trust" destination="Aa1-C1-Xfe" id="trL-dA-wD2"/>
+ <outlet property="imageView_service" destination="14" id="16"/>
+ <outlet property="textField_UID" destination="12" id="17"/>
+ <outlet property="textField_fingerprint" destination="18" id="19"/>
+ <outlet property="window" destination="6" id="9"/>
+ </connections>
+ </customObject>
+ <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+ <customObject id="-3" userLabel="Application"/>
+ <window allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" hidesOnDeactivate="YES" wantsToBeColor="NO" visibleAtLaunch="NO" animationBehavior="default" id="6" userLabel="Key Generation" customClass="NSPanel">
+ <windowStyleMask key="styleMask" titled="YES" closable="YES"/>
+ <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
+ <rect key="contentRect" x="436" y="533" width="325" height="201"/>
+ <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1080"/>
+ <value key="minSize" type="size" width="325" height="201"/>
+ <value key="maxSize" type="size" width="325" height="201"/>
+ <view key="contentView" id="5">
+ <rect key="frame" x="0.0" y="0.0" width="325" height="201"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <subviews>
+ <textField verticalHuggingPriority="750" id="12">
+ <rect key="frame" x="17" y="149" width="211" height="32"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES"/>
+ <textFieldCell key="cell" selectable="YES" sendsActionOnEndEditing="YES" alignment="left" title="System Font Text" id="33">
+ <font key="font" metaFont="system"/>
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" id="WDe-Ro-Lzy">
+ <rect key="frame" x="17" y="64" width="100" height="17"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <textFieldCell key="cell" selectable="YES" sendsActionOnEndEditing="YES" alignment="right" title="Trust:" id="Rf1-C0-y1K">
+ <font key="font" metaFont="system"/>
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <imageView id="14">
+ <rect key="frame" x="273" y="149" width="32" height="32"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="35"/>
+ </imageView>
+ <textField verticalHuggingPriority="750" id="18">
+ <rect key="frame" x="17" y="90" width="291" height="51"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES"/>
+ <textFieldCell key="cell" selectable="YES" sendsActionOnEndEditing="YES" alignment="left" id="36">
+ <font key="font" metaFont="smallSystem"/>
+ <string key="title">System Font Text
+Line 2
+Line 3</string>
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <button verticalHuggingPriority="750" id="20" customClass="AILocalizationButton">
+ <rect key="frame" x="229" y="13" width="82" height="32"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <buttonCell key="cell" type="push" title="OK" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="37">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ <font key="font" metaFont="system"/>
+ <string key="keyEquivalent" base64-UTF8="YES">
+DQ
+</string>
+ </buttonCell>
+ <connections>
+ <action selector="okay:" target="-2" id="Yes-ml-bQO"/>
+ <outlet property="window_anchorOnRightSide" destination="6" id="30"/>
+ </connections>
+ </button>
+ <button verticalHuggingPriority="750" id="dXc-iq-UAp" customClass="AILocalizationButton">
+ <rect key="frame" x="150" y="13" width="82" height="32"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="t6F-T5-eas">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ <font key="font" metaFont="system"/>
+ <string key="keyEquivalent" base64-UTF8="YES">
+Gw
+</string>
+ </buttonCell>
+ <connections>
+ <action selector="cancel:" target="-2" id="OWx-3E-e34"/>
+ <outlet property="window_anchorOnRightSide" destination="6" id="Ysk-WZ-jT5"/>
+ </connections>
+ </button>
+ <popUpButton verticalHuggingPriority="750" id="Aa1-C1-Xfe">
+ <rect key="frame" x="121" y="58" width="187" height="26"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxY="YES"/>
+ <popUpButtonCell key="cell" type="push" title="Unverified" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="BS3-Fh-4pv" id="8KN-SR-TnG">
+ <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+ <font key="font" metaFont="system"/>
+ <menu key="menu" title="OtherViews" id="cf2-H2-fSB">
+ <items>
+ <menuItem title="Unverified" state="on" id="BS3-Fh-4pv">
+ <modifierMask key="keyEquivalentModifierMask"/>
+ </menuItem>
+ <menuItem title="Verified" id="4H6-ag-qnh"/>
+ </items>
+ </menu>
+ </popUpButtonCell>
+ </popUpButton>
+ </subviews>
+ </view>
+ <connections>
+ <outlet property="delegate" destination="-2" id="22"/>
+ <outlet property="initialFirstResponder" destination="20" id="23"/>
+ </connections>
+ </window>
+ </objects>
+</document>
\ No newline at end of file
diff -r 7c1b8533e9e5 -r f0b077047d2a Resources/Preferences-Encryption.xib
--- a/Resources/Preferences-Encryption.xib Tue Sep 10 13:47:46 2013 +0200
+++ b/Resources/Preferences-Encryption.xib Sun Nov 24 16:26:06 2013 +0100
@@ -1,1122 +1,175 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
- <data>
- <int key="IBDocument.SystemTarget">1060</int>
- <string key="IBDocument.SystemVersion">12D78</string>
- <string key="IBDocument.InterfaceBuilderVersion">3084</string>
- <string key="IBDocument.AppKitVersion">1187.37</string>
- <string key="IBDocument.HIToolboxVersion">626.00</string>
- <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
- <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">3084</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>NSSearchField</string>
- <string>NSSearchFieldCell</string>
- <string>NSTableColumn</string>
- <string>NSTableHeaderView</string>
- <string>NSTableView</string>
- <string>NSTextField</string>
- <string>NSTextFieldCell</string>
- </array>
- <array key="IBDocument.PluginDependencies">
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- </array>
- <object class="NSMutableDictionary" key="IBDocument.Metadata">
- <string key="NS.key.0">PluginDependencyRecalculationVersion</string>
- <integer value="1" key="NS.object.0"/>
- </object>
- <array class="NSMutableArray" key="IBDocument.RootObjects" id="475209783">
- <object class="NSCustomObject" id="245285604">
- <string key="NSClassName">ESOTRPreferences</string>
- </object>
- <object class="NSCustomObject" id="793451751">
- <string key="NSClassName">FirstResponder</string>
- </object>
- <object class="NSCustomObject" id="600731802">
- <string key="NSClassName">NSApplication</string>
- </object>
- <object class="NSCustomView" id="261192207">
- <reference key="NSNextResponder"/>
- <int key="NSvFlags">256</int>
- <array class="NSMutableArray" key="NSSubviews">
- <object class="NSSearchField" id="590488253">
- <reference key="NSNextResponder" ref="261192207"/>
- <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="41604946"/>
- <string key="NSReuseIdentifierKey">_NS:9</string>
- <bool key="NSEnabled">YES</bool>
- <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>
- <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">textBackgroundColor</string>
- <object class="NSColor" key="NSColor" id="399647140">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MQA</bytes>
- </object>
- </object>
- <object class="NSColor" key="NSTextColor" id="1001647384">
- <int key="NSColorSpace">6</int>
- <string key="NSCatalogName">System</string>
- <string key="NSColorName">controlTextColor</string>
- <object class="NSColor" key="NSColor" id="426572272">
- <int key="NSColorSpace">3</int>
- <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"/>
- <int key="NSvFlags">268</int>
- <string key="NSFrame">{{21, 271}, {149, 17}}</string>
- <reference key="NSSuperview" ref="261192207"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="365143233"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="523338">
- <int key="NSCellFlags">68157504</int>
- <int key="NSCellFlags2">71304192</int>
- <string key="NSContents">Private Keys:</string>
- <reference key="NSSupport" ref="970377140"/>
- <reference key="NSControlView" ref="246614867"/>
- <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"/>
- <int key="NSvFlags">268</int>
- <string key="NSFrame">{{173, 265}, {242, 26}}</string>
- <reference key="NSSuperview" ref="261192207"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="346757463"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSPopUpButtonCell" key="NSCell" id="495829525">
- <int key="NSCellFlags">-2076180416</int>
- <int key="NSCellFlags2">2048</int>
- <reference key="NSSupport" ref="970377140"/>
- <reference key="NSControlView" ref="365143233"/>
- <int key="NSButtonFlags">109199360</int>
- <int key="NSButtonFlags2">1</int>
- <object class="NSFont" key="NSAlternateImage" id="874098883">
- <string key="NSName">LucidaGrande</string>
- <double key="NSSize">13</double>
- <int key="NSfFlags">16</int>
- </object>
- <string key="NSAlternateContents"/>
- <object class="NSMutableString" key="NSKeyEquivalent">
- <characters key="NS.bytes"/>
- </object>
- <int key="NSPeriodicDelay">400</int>
- <int key="NSPeriodicInterval">75</int>
- <object class="NSMenuItem" key="NSMenuItem" id="355447198">
- <reference key="NSMenu" ref="433605837"/>
- <string type="base64-UTF8" key="NSTitle">IA</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <int key="NSState">1</int>
- <object class="NSCustomResource" key="NSOnImage">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">NSMenuCheckmark</string>
- </object>
- <object class="NSCustomResource" key="NSMixedImage">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">NSMenuMixedState</string>
- </object>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="495829525"/>
- </object>
- <bool key="NSMenuItemRespectAlignment">YES</bool>
- <object class="NSMenu" key="NSMenu" id="433605837">
- <object class="NSMutableString" key="NSTitle">
- <characters key="NS.bytes">OtherViews</characters>
- </object>
- <array class="NSMutableArray" key="NSMenuItems">
- <reference ref="355447198"/>
- </array>
- </object>
- <int key="NSPreferredEdge">3</int>
- <bool key="NSUsesItemFromMenu">YES</bool>
- <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"/>
- <int key="NSvFlags">266</int>
- <string key="NSFrame">{{173, 236}, {407, 14}}</string>
- <reference key="NSSuperview" ref="261192207"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="944557168"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="587033203">
- <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">
- <string key="NSName">LucidaGrande</string>
- <double key="NSSize">11</double>
- <int key="NSfFlags">3100</int>
- </object>
- <reference key="NSControlView" ref="152864849"/>
- <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"/>
- <int key="NSvFlags">270</int>
- <string key="NSFrame">{{414, 261}, {111, 32}}</string>
- <reference key="NSSuperview" ref="261192207"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="152864849"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="9745553">
- <int key="NSCellFlags">67108864</int>
- <int key="NSCellFlags2">134217728</int>
- <string key="NSContents">Regenerate</string>
- <reference key="NSSupport" ref="970377140"/>
- <reference key="NSControlView" ref="346757463"/>
- <int key="NSButtonFlags">-2038284288</int>
- <int key="NSButtonFlags2">1</int>
- <reference key="NSAlternateImage" ref="874098883"/>
- <string key="NSAlternateContents"/>
- <object class="NSMutableString" key="NSKeyEquivalent">
- <characters key="NS.bytes"/>
- </object>
- <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"/>
- <int key="NSvFlags">274</int>
- <array class="NSMutableArray" key="NSSubviews">
- <object class="NSClipView" id="445790025">
- <reference key="NSNextResponder" ref="476167500"/>
- <int key="NSvFlags">2304</int>
- <array class="NSMutableArray" key="NSSubviews">
- <object class="NSTableView" id="712016614">
- <reference key="NSNextResponder" ref="445790025"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrameSize">{403, 133}</string>
- <reference key="NSSuperview" ref="445790025"/>
- <reference key="NSWindow"/>
- <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>
- <string key="NSFrameSize">{403, 17}</string>
- <reference key="NSSuperview" ref="146545853"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="445790025"/>
- <reference key="NSTableView" ref="712016614"/>
- </object>
- <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">
- <string key="NSIdentifier">UID</string>
- <double key="NSWidth">141</double>
- <double key="NSMinWidth">40</double>
- <double key="NSMaxWidth">1000</double>
- <object class="NSTableHeaderCell" key="NSHeaderCell">
- <int key="NSCellFlags">75497536</int>
- <int key="NSCellFlags2">2048</int>
- <string key="NSContents">Name</string>
- <reference key="NSSupport" ref="26"/>
- <object class="NSColor" key="NSBackgroundColor" id="217103147">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MC4zMzMzMzI5OQA</bytes>
- </object>
- <object class="NSColor" key="NSTextColor" id="263411744">
- <int key="NSColorSpace">6</int>
- <string key="NSCatalogName">System</string>
- <string key="NSColorName">headerTextColor</string>
- <reference key="NSColor" ref="426572272"/>
- </object>
- </object>
- <object class="NSTextFieldCell" key="NSDataCell" id="733576058">
- <int key="NSCellFlags">337641536</int>
- <int key="NSCellFlags2">2048</int>
- <reference key="NSSupport" ref="970377140"/>
- <reference key="NSControlView" ref="712016614"/>
- <object class="NSColor" key="NSBackgroundColor" id="1055559834">
- <int key="NSColorSpace">6</int>
- <string key="NSCatalogName">System</string>
- <string key="NSColorName">controlBackgroundColor</string>
- <reference key="NSColor" ref="698936443"/>
- </object>
- <reference key="NSTextColor" ref="1001647384"/>
- </object>
- <int key="NSResizingMask">3</int>
- <bool key="NSIsResizeable">YES</bool>
- <reference key="NSTableView" ref="712016614"/>
- </object>
- <object class="NSTableColumn" id="439814957">
More information about the commits
mailing list