adium 5138:62390297acd9: Added a lock image, and a list of tips ...
commits at adium.im
commits at adium.im
Wed Oct 17 23:21:56 UTC 2012
details: http://hg.adium.im/adium/rev/62390297acd9
revision: 5138:62390297acd9
branch: libotr4.0.0
author: Thijs Alkemade <thijsalkemade at gmail.com>
date: Thu Oct 18 01:21:45 2012 +0200
Added a lock image, and a list of tips to the SMP windows.
diffs (truncated from 1339 to 1000 lines):
diff -r 47659145332e -r 62390297acd9 Resources/AIOTRSMPSecretAnswerWindowController.xib
--- a/Resources/AIOTRSMPSecretAnswerWindowController.xib Thu Oct 18 00:32:21 2012 +0200
+++ b/Resources/AIOTRSMPSecretAnswerWindowController.xib Thu Oct 18 01:21:45 2012 +0200
@@ -14,6 +14,8 @@
<string>NSButton</string>
<string>NSButtonCell</string>
<string>NSCustomObject</string>
+ <string>NSImageCell</string>
+ <string>NSImageView</string>
<string>NSScrollView</string>
<string>NSScroller</string>
<string>NSTextField</string>
@@ -42,7 +44,7 @@
<object class="NSWindowTemplate" id="1005">
<int key="NSWindowStyleMask">7</int>
<int key="NSWindowBacking">2</int>
- <string key="NSWindowRect">{{745, 414}, {514, 280}}</string>
+ <string key="NSWindowRect">{{745, 414}, {514, 415}}</string>
<int key="NSWTFlags">544735232</int>
<string key="NSWindowTitle">Identity verification</string>
<string key="NSWindowClass">NSWindow</string>
@@ -52,17 +54,17 @@
<reference key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<array class="NSMutableArray" key="NSSubviews">
- <object class="NSTextField" id="126593570">
+ <object class="NSTextField" id="924271898">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{17, 226}, {480, 34}}</string>
+ <string key="NSFrame">{{57, 361}, {440, 34}}</string>
<reference key="NSSuperview" ref="1006"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="683836775"/>
+ <reference key="NSNextKeyView" ref="205520375"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<string key="NSAntiCompressionPriority">{250, 750}</string>
<bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="517677039">
+ <object class="NSTextFieldCell" key="NSCell" id="651334025">
<int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">272760832</int>
<string key="NSContents">%@ asks you to answer the following secret question to confirm your identity:</string>
@@ -72,21 +74,21 @@
<int key="NSfFlags">3100</int>
</object>
<string key="NSCellIdentifier">_NS:9</string>
- <reference key="NSControlView" ref="126593570"/>
- <object class="NSColor" key="NSBackgroundColor" id="787472392">
+ <reference key="NSControlView" ref="924271898"/>
+ <object class="NSColor" key="NSBackgroundColor" id="38660599">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">controlColor</string>
- <object class="NSColor" key="NSColor" id="496301184">
+ <object class="NSColor" key="NSColor" id="684595009">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
</object>
</object>
- <object class="NSColor" key="NSTextColor" id="786994808">
+ <object class="NSColor" key="NSTextColor" id="297656176">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">controlTextColor</string>
- <object class="NSColor" key="NSColor" id="382288645">
+ <object class="NSColor" key="NSColor" id="613318316">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MAA</bytes>
</object>
@@ -95,30 +97,60 @@
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<bool key="NSControlAutosetMaxLayoutWidth">YES</bool>
</object>
- <object class="NSTextField" id="481576503">
+ <object class="NSTextField" id="129577520">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">300</int>
- <string key="NSFrame">{{17, 132}, {480, 14}}</string>
+ <string key="NSFrame">{{17, 267}, {480, 14}}</string>
<reference key="NSSuperview" ref="1006"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="352712109"/>
+ <reference key="NSNextKeyView" ref="294266754"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<string key="NSAntiCompressionPriority">{250, 750}</string>
<bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="757236960">
+ <object class="NSTextFieldCell" key="NSCell" id="455467382">
<int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">272760832</int>
<string key="NSContents">Your answer:</string>
<reference key="NSSupport" ref="26"/>
<string key="NSCellIdentifier">_NS:9</string>
- <reference key="NSControlView" ref="481576503"/>
- <reference key="NSBackgroundColor" ref="787472392"/>
- <reference key="NSTextColor" ref="786994808"/>
+ <reference key="NSControlView" ref="129577520"/>
+ <reference key="NSBackgroundColor" ref="38660599"/>
+ <reference key="NSTextColor" ref="297656176"/>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<bool key="NSControlAutosetMaxLayoutWidth">YES</bool>
</object>
- <object class="NSButton" id="1682760">
+ <object class="NSTextField" id="20732819">
+ <reference key="NSNextResponder" ref="1006"/>
+ <int key="NSvFlags">300</int>
+ <string key="NSFrame">{{17, 61}, {480, 127}}</string>
+ <reference key="NSSuperview" ref="1006"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="508200382"/>
+ <string key="NSReuseIdentifierKey">_NS:9</string>
+ <string key="NSAntiCompressionPriority">{250, 750}</string>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSTextFieldCell" key="NSCell" id="601029529">
+ <int key="NSCellFlags">67108864</int>
+ <int key="NSCellFlags2">272760832</int>
+ <string type="base64-UTF8" key="NSContents">VGlwczoK4oCiICVAIHdpbGwgc2VlIHRoZSBxdWVzdGlvbiBhbmQgbXVzdCBnaXZlIGV4YWN0bHkgdGhl
+IHNhbWUgYW5zd2VyIHRvIGNvbmZpcm0gdGhlaXIgaWRlbnRpdHkuCuKAoiBZb3UgY2FuIGFkZCAiaW4g
+bG93ZXJjYXNlIiB0byB5b3VyIHF1ZXN0aW9uIHRvIG1ha2UgaXQgaGFyZGVyIHRvIG1ha2UgbWlzdGFr
+ZXMuCuKAoiBNYWtlIHN1cmUgaXQgaXMgZGlmZmljdWx0IGZvciBvdGhlcnMgdG8gZ3Vlc3Mgb3IgZmlu
+ZCB0aGUgYW5zd2VyLgrigKIgRG8gbm90IHVzZSB5b3VyIGNoYXQgY29udmVyc2F0aW9uIHRvIGdpdmUg
+dGhlIGFuc3dlciwgZXZlbiB3aXRoIGVuY3J5cHRpb24uIFlvdSBjYW4gZ2l2ZSB0aGUgYW5zd2VyIG92
+ZXIgYSBkaWZmZXJlbnQgY29tbXVuaWNhdGlvbiBjaGFubmVsLCBmb3IgZXhhbXBsZSBwaG9uZSBvciBp
+biBwZXJzb24uA</string>
+ <reference key="NSSupport" ref="26"/>
+ <string key="NSCellIdentifier">_NS:9</string>
+ <reference key="NSControlView" ref="20732819"/>
+ <reference key="NSBackgroundColor" ref="38660599"/>
+ <reference key="NSTextColor" ref="297656176"/>
+ </object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+ <bool key="NSControlAutosetMaxLayoutWidth">YES</bool>
+ </object>
+ <object class="NSButton" id="179006788">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">289</int>
<string key="NSFrame">{{409, 13}, {91, 32}}</string>
@@ -127,20 +159,20 @@
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="1034106210">
+ <object class="NSButtonCell" key="NSCell" id="562371928">
<int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">134217728</int>
<string key="NSContents">OK</string>
- <object class="NSFont" key="NSSupport" id="315292737">
+ <object class="NSFont" key="NSSupport" id="292827969">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">13</double>
<int key="NSfFlags">16</int>
</object>
<string key="NSCellIdentifier">_NS:9</string>
- <reference key="NSControlView" ref="1682760"/>
+ <reference key="NSControlView" ref="179006788"/>
<int key="NSButtonFlags">-2034876416</int>
<int key="NSButtonFlags2">1</int>
- <reference key="NSAlternateImage" ref="315292737"/>
+ <reference key="NSAlternateImage" ref="292827969"/>
<string key="NSAlternateContents"/>
<string type="base64-UTF8" key="NSKeyEquivalent">DQ</string>
<int key="NSPeriodicDelay">200</int>
@@ -148,25 +180,25 @@
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
- <object class="NSButton" id="348455558">
+ <object class="NSButton" id="508200382">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">289</int>
<string key="NSFrame">{{318, 13}, {91, 32}}</string>
<reference key="NSSuperview" ref="1006"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="1682760"/>
+ <reference key="NSNextKeyView" ref="179006788"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="127771989">
+ <object class="NSButtonCell" key="NSCell" id="945599779">
<int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">134217728</int>
<string key="NSContents">Cancel</string>
- <reference key="NSSupport" ref="315292737"/>
+ <reference key="NSSupport" ref="292827969"/>
<string key="NSCellIdentifier">_NS:9</string>
- <reference key="NSControlView" ref="348455558"/>
+ <reference key="NSControlView" ref="508200382"/>
<int key="NSButtonFlags">-2034876416</int>
<int key="NSButtonFlags2">1</int>
- <reference key="NSAlternateImage" ref="315292737"/>
+ <reference key="NSAlternateImage" ref="292827969"/>
<string key="NSAlternateContents"/>
<string type="base64-UTF8" key="NSKeyEquivalent">Gw</string>
<int key="NSPeriodicDelay">200</int>
@@ -174,16 +206,16 @@
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
- <object class="NSScrollView" id="683836775">
+ <object class="NSScrollView" id="205520375">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">256</int>
<array class="NSMutableArray" key="NSSubviews">
- <object class="NSClipView" id="137003467">
- <reference key="NSNextResponder" ref="683836775"/>
+ <object class="NSClipView" id="761354996">
+ <reference key="NSNextResponder" ref="205520375"/>
<int key="NSvFlags">2304</int>
<array class="NSMutableArray" key="NSSubviews">
- <object class="NSTextView" id="740472288">
- <reference key="NSNextResponder" ref="137003467"/>
+ <object class="NSTextView" id="767676437">
+ <reference key="NSNextResponder" ref="761354996"/>
<int key="NSvFlags">2322</int>
<set class="NSMutableSet" key="NSDragTypes">
<string>Apple HTML pasteboard type</string>
@@ -205,11 +237,11 @@
<string>public.url</string>
</set>
<string key="NSFrameSize">{457, 62}</string>
- <reference key="NSSuperview" ref="137003467"/>
+ <reference key="NSSuperview" ref="761354996"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="234578328"/>
+ <reference key="NSNextKeyView" ref="71692491"/>
<string key="NSReuseIdentifierKey">_NS:13</string>
- <object class="NSTextContainer" key="NSTextContainer" id="887900834">
+ <object class="NSTextContainer" key="NSTextContainer" id="57447406">
<object class="NSLayoutManager" key="NSLayoutManager">
<object class="NSTextStorage" key="NSTextStorage">
<object class="NSMutableString" key="NSString">
@@ -218,12 +250,12 @@
<nil key="NSDelegate"/>
</object>
<array class="NSMutableArray" key="NSTextContainers">
- <reference ref="887900834"/>
+ <reference ref="57447406"/>
</array>
<int key="NSLMFlags">166</int>
<nil key="NSDelegate"/>
</object>
- <reference key="NSTextView" ref="740472288"/>
+ <reference key="NSTextView" ref="767676437"/>
<double key="NSWidth">457</double>
<int key="NSTCFlags">1</int>
</object>
@@ -231,31 +263,31 @@
<int key="NSFlags">11523</int>
<int key="NSTextCheckingTypes">0</int>
<nil key="NSMarkedAttributes"/>
- <object class="NSColor" key="NSBackgroundColor" id="227845268">
+ <object class="NSColor" key="NSBackgroundColor" id="87608082">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MQA</bytes>
</object>
<dictionary key="NSSelectedAttributes">
- <object class="NSColor" key="NSBackgroundColor" id="280566794">
+ <object class="NSColor" key="NSBackgroundColor" id="188273939">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">selectedTextBackgroundColor</string>
- <reference key="NSColor" ref="496301184"/>
+ <reference key="NSColor" ref="684595009"/>
</object>
- <object class="NSColor" key="NSColor" id="473280375">
+ <object class="NSColor" key="NSColor" id="393613669">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">selectedTextColor</string>
- <reference key="NSColor" ref="382288645"/>
+ <reference key="NSColor" ref="613318316"/>
</object>
</dictionary>
- <reference key="NSInsertionColor" ref="382288645"/>
+ <reference key="NSInsertionColor" ref="613318316"/>
<dictionary key="NSLinkAttributes">
- <object class="NSColor" key="NSColor" id="676512003">
+ <object class="NSColor" key="NSColor" id="23262091">
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MCAwIDEAA</bytes>
</object>
- <object class="NSCursor" key="NSCursor" id="555782294">
+ <object class="NSCursor" key="NSCursor" id="515113842">
<string key="NSHotSpot">{8, -8}</string>
<int key="NSCursorType">13</int>
</object>
@@ -271,12 +303,12 @@
</object>
</array>
<string key="NSFrame">{{1, 1}, {457, 62}}</string>
- <reference key="NSSuperview" ref="683836775"/>
+ <reference key="NSSuperview" ref="205520375"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="740472288"/>
+ <reference key="NSNextKeyView" ref="767676437"/>
<string key="NSReuseIdentifierKey">_NS:11</string>
- <reference key="NSDocView" ref="740472288"/>
- <reference key="NSBGColor" ref="227845268"/>
+ <reference key="NSDocView" ref="767676437"/>
+ <reference key="NSBGColor" ref="87608082"/>
<object class="NSCursor" key="NSCursor">
<string key="NSHotSpot">{4, 5}</string>
<object class="NSImage" key="NSImage">
@@ -424,7 +456,7 @@
</object>
</array>
</array>
- <object class="NSColor" key="NSColor" id="591829695">
+ <object class="NSColor" key="NSColor" id="117597116">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MCAwAA</bytes>
</object>
@@ -432,59 +464,59 @@
</object>
<int key="NScvFlags">4</int>
</object>
- <object class="NSScroller" id="234578328">
- <reference key="NSNextResponder" ref="683836775"/>
+ <object class="NSScroller" id="71692491">
+ <reference key="NSNextResponder" ref="205520375"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{458, 1}, {15, 62}}</string>
- <reference key="NSSuperview" ref="683836775"/>
+ <reference key="NSSuperview" ref="205520375"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="481576503"/>
+ <reference key="NSNextKeyView" ref="129577520"/>
<string key="NSReuseIdentifierKey">_NS:83</string>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- <reference key="NSTarget" ref="683836775"/>
+ <reference key="NSTarget" ref="205520375"/>
<string key="NSAction">_doScroller:</string>
<double key="NSCurValue">1</double>
<double key="NSPercent">0.85256409645080566</double>
</object>
- <object class="NSScroller" id="344476855">
- <reference key="NSNextResponder" ref="683836775"/>
+ <object class="NSScroller" id="143456741">
+ <reference key="NSNextResponder" ref="205520375"/>
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{-100, -100}, {87, 18}}</string>
- <reference key="NSSuperview" ref="683836775"/>
+ <reference key="NSSuperview" ref="205520375"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="137003467"/>
+ <reference key="NSNextKeyView" ref="761354996"/>
<string key="NSReuseIdentifierKey">_NS:33</string>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<int key="NSsFlags">1</int>
- <reference key="NSTarget" ref="683836775"/>
+ <reference key="NSTarget" ref="205520375"/>
<string key="NSAction">_doScroller:</string>
<double key="NSCurValue">1</double>
<double key="NSPercent">0.94565218687057495</double>
</object>
</array>
- <string key="NSFrame">{{20, 154}, {474, 64}}</string>
+ <string key="NSFrame">{{20, 289}, {474, 64}}</string>
<reference key="NSSuperview" ref="1006"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="344476855"/>
+ <reference key="NSNextKeyView" ref="143456741"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<int key="NSsFlags">133138</int>
- <reference key="NSVScroller" ref="234578328"/>
- <reference key="NSHScroller" ref="344476855"/>
- <reference key="NSContentView" ref="137003467"/>
+ <reference key="NSVScroller" ref="71692491"/>
+ <reference key="NSHScroller" ref="143456741"/>
+ <reference key="NSContentView" ref="761354996"/>
<double key="NSMinMagnification">0.25</double>
<double key="NSMaxMagnification">4</double>
<double key="NSMagnification">1</double>
</object>
- <object class="NSScrollView" id="352712109">
+ <object class="NSScrollView" id="294266754">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">256</int>
<array class="NSMutableArray" key="NSSubviews">
- <object class="NSClipView" id="406928026">
- <reference key="NSNextResponder" ref="352712109"/>
+ <object class="NSClipView" id="884512010">
+ <reference key="NSNextResponder" ref="294266754"/>
<int key="NSvFlags">2304</int>
<array class="NSMutableArray" key="NSSubviews">
- <object class="NSTextView" id="743970013">
- <reference key="NSNextResponder" ref="406928026"/>
+ <object class="NSTextView" id="345743255">
+ <reference key="NSNextResponder" ref="884512010"/>
<int key="NSvFlags">2322</int>
<set class="NSMutableSet" key="NSDragTypes">
<string>Apple HTML pasteboard type</string>
@@ -506,11 +538,11 @@
<string>public.url</string>
</set>
<string key="NSFrameSize">{457, 61}</string>
- <reference key="NSSuperview" ref="406928026"/>
+ <reference key="NSSuperview" ref="884512010"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="180038208"/>
+ <reference key="NSNextKeyView" ref="735482434"/>
<string key="NSReuseIdentifierKey">_NS:13</string>
- <object class="NSTextContainer" key="NSTextContainer" id="205784424">
+ <object class="NSTextContainer" key="NSTextContainer" id="23309550">
<object class="NSLayoutManager" key="NSLayoutManager">
<object class="NSTextStorage" key="NSTextStorage">
<object class="NSMutableString" key="NSString">
@@ -519,12 +551,12 @@
<nil key="NSDelegate"/>
</object>
<array class="NSMutableArray" key="NSTextContainers">
- <reference ref="205784424"/>
+ <reference ref="23309550"/>
</array>
<int key="NSLMFlags">166</int>
<nil key="NSDelegate"/>
</object>
- <reference key="NSTextView" ref="743970013"/>
+ <reference key="NSTextView" ref="345743255"/>
<double key="NSWidth">457</double>
<int key="NSTCFlags">1</int>
</object>
@@ -532,15 +564,15 @@
<int key="NSFlags">67120387</int>
<int key="NSTextCheckingTypes">0</int>
<nil key="NSMarkedAttributes"/>
- <reference key="NSBackgroundColor" ref="227845268"/>
+ <reference key="NSBackgroundColor" ref="87608082"/>
<dictionary key="NSSelectedAttributes">
- <reference key="NSBackgroundColor" ref="280566794"/>
- <reference key="NSColor" ref="473280375"/>
+ <reference key="NSBackgroundColor" ref="188273939"/>
+ <reference key="NSColor" ref="393613669"/>
</dictionary>
- <reference key="NSInsertionColor" ref="382288645"/>
+ <reference key="NSInsertionColor" ref="613318316"/>
<dictionary key="NSLinkAttributes">
- <reference key="NSColor" ref="676512003"/>
- <reference key="NSCursor" ref="555782294"/>
+ <reference key="NSColor" ref="23262091"/>
+ <reference key="NSCursor" ref="515113842"/>
<integer value="1" key="NSUnderline"/>
</dictionary>
<nil key="NSDefaultParagraphStyle"/>
@@ -553,12 +585,12 @@
</object>
</array>
<string key="NSFrame">{{1, 1}, {457, 61}}</string>
- <reference key="NSSuperview" ref="352712109"/>
+ <reference key="NSSuperview" ref="294266754"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="743970013"/>
+ <reference key="NSNextKeyView" ref="345743255"/>
<string key="NSReuseIdentifierKey">_NS:11</string>
- <reference key="NSDocView" ref="743970013"/>
- <reference key="NSBGColor" ref="227845268"/>
+ <reference key="NSDocView" ref="345743255"/>
+ <reference key="NSBGColor" ref="87608082"/>
<object class="NSCursor" key="NSCursor">
<string key="NSHotSpot">{4, 5}</string>
<object class="NSImage" key="NSImage">
@@ -706,59 +738,86 @@
</object>
</array>
</array>
- <reference key="NSColor" ref="591829695"/>
+ <reference key="NSColor" ref="117597116"/>
</object>
</object>
<int key="NScvFlags">4</int>
</object>
- <object class="NSScroller" id="180038208">
- <reference key="NSNextResponder" ref="352712109"/>
+ <object class="NSScroller" id="735482434">
+ <reference key="NSNextResponder" ref="294266754"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{458, 1}, {15, 61}}</string>
- <reference key="NSSuperview" ref="352712109"/>
+ <reference key="NSSuperview" ref="294266754"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="348455558"/>
+ <reference key="NSNextKeyView" ref="20732819"/>
<string key="NSReuseIdentifierKey">_NS:83</string>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- <reference key="NSTarget" ref="352712109"/>
+ <reference key="NSTarget" ref="294266754"/>
<string key="NSAction">_doScroller:</string>
<double key="NSCurValue">1</double>
<double key="NSPercent">0.85256409645080566</double>
</object>
- <object class="NSScroller" id="1016952571">
- <reference key="NSNextResponder" ref="352712109"/>
+ <object class="NSScroller" id="249950005">
+ <reference key="NSNextResponder" ref="294266754"/>
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{-100, -100}, {87, 18}}</string>
- <reference key="NSSuperview" ref="352712109"/>
+ <reference key="NSSuperview" ref="294266754"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="406928026"/>
+ <reference key="NSNextKeyView" ref="884512010"/>
<string key="NSReuseIdentifierKey">_NS:33</string>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<int key="NSsFlags">1</int>
- <reference key="NSTarget" ref="352712109"/>
+ <reference key="NSTarget" ref="294266754"/>
<string key="NSAction">_doScroller:</string>
<double key="NSCurValue">1</double>
<double key="NSPercent">0.94565218687057495</double>
</object>
</array>
- <string key="NSFrame">{{20, 61}, {474, 63}}</string>
+ <string key="NSFrame">{{20, 196}, {474, 63}}</string>
<reference key="NSSuperview" ref="1006"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="1016952571"/>
+ <reference key="NSNextKeyView" ref="249950005"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<int key="NSsFlags">133138</int>
- <reference key="NSVScroller" ref="180038208"/>
- <reference key="NSHScroller" ref="1016952571"/>
- <reference key="NSContentView" ref="406928026"/>
+ <reference key="NSVScroller" ref="735482434"/>
+ <reference key="NSHScroller" ref="249950005"/>
+ <reference key="NSContentView" ref="884512010"/>
<double key="NSMinMagnification">0.25</double>
<double key="NSMaxMagnification">4</double>
<double key="NSMagnification">1</double>
</object>
+ <object class="NSImageView" id="711843853">
+ <reference key="NSNextResponder" ref="1006"/>
+ <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, 363}, {32, 32}}</string>
+ <reference key="NSSuperview" ref="1006"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="924271898"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSImageCell" key="NSCell" id="585043902">
+ <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>
</array>
- <string key="NSFrameSize">{514, 280}</string>
+ <string key="NSFrameSize">{514, 415}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="126593570"/>
+ <reference key="NSNextKeyView" ref="711843853"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1920, 1058}}</string>
<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
@@ -771,7 +830,7 @@
<object class="IBOutletConnection" key="connection">
<string key="label">label_intro</string>
<reference key="source" ref="1001"/>
- <reference key="destination" ref="126593570"/>
+ <reference key="destination" ref="924271898"/>
</object>
<int key="connectionID">19</int>
</object>
@@ -779,7 +838,7 @@
<object class="IBActionConnection" key="connection">
<string key="label">cancel:</string>
<reference key="source" ref="1001"/>
- <reference key="destination" ref="348455558"/>
+ <reference key="destination" ref="508200382"/>
</object>
<int key="connectionID">22</int>
</object>
@@ -787,7 +846,7 @@
<object class="IBActionConnection" key="connection">
<string key="label">okay:</string>
<reference key="source" ref="1001"/>
- <reference key="destination" ref="1682760"/>
+ <reference key="destination" ref="179006788"/>
</object>
<int key="connectionID">23</int>
</object>
@@ -795,7 +854,7 @@
<object class="IBOutletConnection" key="connection">
<string key="label">field_question</string>
<reference key="source" ref="1001"/>
- <reference key="destination" ref="740472288"/>
+ <reference key="destination" ref="767676437"/>
</object>
<int key="connectionID">40</int>
</object>
@@ -803,7 +862,7 @@
<object class="IBOutletConnection" key="connection">
<string key="label">field_answer</string>
<reference key="source" ref="1001"/>
- <reference key="destination" ref="743970013"/>
+ <reference key="destination" ref="345743255"/>
</object>
<int key="connectionID">41</int>
</object>
@@ -811,10 +870,26 @@
<object class="IBOutletConnection" key="connection">
<string key="label">label_answer</string>
<reference key="source" ref="1001"/>
- <reference key="destination" ref="481576503"/>
+ <reference key="destination" ref="129577520"/>
</object>
<int key="connectionID">42</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">imageView_lock</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="711843853"/>
+ </object>
+ <int key="connectionID">45</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">label_tips</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="20732819"/>
+ </object>
+ <int key="connectionID">48</int>
+ </object>
</array>
<object class="IBMutableOrderedSet" key="objectRecords">
<array key="orderedObjects">
@@ -854,116 +929,144 @@
<int key="objectID">2</int>
<reference key="object" ref="1006"/>
<array class="NSMutableArray" key="children">
- <reference ref="126593570"/>
- <reference ref="1682760"/>
- <reference ref="348455558"/>
- <reference ref="683836775"/>
- <reference ref="352712109"/>
- <reference ref="481576503"/>
+ <reference ref="924271898"/>
+ <reference ref="205520375"/>
+ <reference ref="294266754"/>
+ <reference ref="129577520"/>
+ <reference ref="711843853"/>
+ <reference ref="20732819"/>
+ <reference ref="179006788"/>
+ <reference ref="508200382"/>
</array>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">5</int>
- <reference key="object" ref="126593570"/>
+ <reference key="object" ref="924271898"/>
<array class="NSMutableArray" key="children">
- <reference ref="517677039"/>
+ <reference ref="651334025"/>
</array>
<reference key="parent" ref="1006"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">6</int>
- <reference key="object" ref="517677039"/>
- <reference key="parent" ref="126593570"/>
+ <reference key="object" ref="651334025"/>
+ <reference key="parent" ref="924271898"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">9</int>
- <reference key="object" ref="481576503"/>
+ <reference key="object" ref="129577520"/>
<array class="NSMutableArray" key="children">
- <reference ref="757236960"/>
+ <reference ref="455467382"/>
</array>
<reference key="parent" ref="1006"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">10</int>
- <reference key="object" ref="757236960"/>
- <reference key="parent" ref="481576503"/>
+ <reference key="object" ref="455467382"/>
+ <reference key="parent" ref="129577520"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">13</int>
- <reference key="object" ref="1682760"/>
+ <reference key="object" ref="179006788"/>
<array class="NSMutableArray" key="children">
- <reference ref="1034106210"/>
+ <reference ref="562371928"/>
</array>
<reference key="parent" ref="1006"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">14</int>
- <reference key="object" ref="1034106210"/>
- <reference key="parent" ref="1682760"/>
+ <reference key="object" ref="562371928"/>
+ <reference key="parent" ref="179006788"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">17</int>
- <reference key="object" ref="348455558"/>
+ <reference key="object" ref="508200382"/>
<array class="NSMutableArray" key="children">
- <reference ref="127771989"/>
+ <reference ref="945599779"/>
</array>
<reference key="parent" ref="1006"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">18</int>
- <reference key="object" ref="127771989"/>
- <reference key="parent" ref="348455558"/>
+ <reference key="object" ref="945599779"/>
+ <reference key="parent" ref="508200382"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">32</int>
- <reference key="object" ref="683836775"/>
+ <reference key="object" ref="205520375"/>
<array class="NSMutableArray" key="children">
- <reference ref="740472288"/>
- <reference ref="344476855"/>
- <reference ref="234578328"/>
+ <reference ref="767676437"/>
+ <reference ref="143456741"/>
+ <reference ref="71692491"/>
</array>
<reference key="parent" ref="1006"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">33</int>
- <reference key="object" ref="740472288"/>
- <reference key="parent" ref="683836775"/>
+ <reference key="object" ref="767676437"/>
+ <reference key="parent" ref="205520375"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">34</int>
- <reference key="object" ref="344476855"/>
- <reference key="parent" ref="683836775"/>
+ <reference key="object" ref="143456741"/>
+ <reference key="parent" ref="205520375"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">35</int>
- <reference key="object" ref="234578328"/>
- <reference key="parent" ref="683836775"/>
+ <reference key="object" ref="71692491"/>
+ <reference key="parent" ref="205520375"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">36</int>
- <reference key="object" ref="352712109"/>
+ <reference key="object" ref="294266754"/>
<array class="NSMutableArray" key="children">
- <reference ref="180038208"/>
- <reference ref="1016952571"/>
- <reference ref="743970013"/>
+ <reference ref="735482434"/>
+ <reference ref="249950005"/>
+ <reference ref="345743255"/>
</array>
<reference key="parent" ref="1006"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">37</int>
- <reference key="object" ref="180038208"/>
- <reference key="parent" ref="352712109"/>
+ <reference key="object" ref="735482434"/>
+ <reference key="parent" ref="294266754"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">38</int>
- <reference key="object" ref="1016952571"/>
- <reference key="parent" ref="352712109"/>
+ <reference key="object" ref="249950005"/>
+ <reference key="parent" ref="294266754"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">39</int>
- <reference key="object" ref="743970013"/>
- <reference key="parent" ref="352712109"/>
+ <reference key="object" ref="345743255"/>
+ <reference key="parent" ref="294266754"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">43</int>
+ <reference key="object" ref="711843853"/>
+ <array class="NSMutableArray" key="children">
+ <reference ref="585043902"/>
+ </array>
+ <reference key="parent" ref="1006"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">44</int>
+ <reference key="object" ref="585043902"/>
+ <reference key="parent" ref="711843853"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">46</int>
+ <reference key="object" ref="20732819"/>
+ <array class="NSMutableArray" key="children">
+ <reference ref="601029529"/>
+ </array>
+ <reference key="parent" ref="1006"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">47</int>
+ <reference key="object" ref="601029529"/>
+ <reference key="parent" ref="20732819"/>
</object>
</array>
</object>
@@ -992,6 +1095,10 @@
<string key="37.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="38.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="39.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="43.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="44.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="46.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="47.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="9.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1000,7 +1107,7 @@
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
- <int key="maxID">42</int>
+ <int key="maxID">48</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -1056,8 +1163,10 @@
<dictionary class="NSMutableDictionary" key="outlets">
<string key="field_answer">NSTextView</string>
<string key="field_question">NSTextView</string>
+ <string key="imageView_lock">NSImageView</string>
<string key="label_answer">NSTextField</string>
<string key="label_intro">NSTextField</string>
+ <string key="label_tips">NSTextField</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
<object class="IBToOneOutletInfo" key="field_answer">
@@ -1068,6 +1177,10 @@
<string key="name">field_question</string>
<string key="candidateClassName">NSTextView</string>
</object>
+ <object class="IBToOneOutletInfo" key="imageView_lock">
+ <string key="name">imageView_lock</string>
+ <string key="candidateClassName">NSImageView</string>
+ </object>
<object class="IBToOneOutletInfo" key="label_answer">
<string key="name">label_answer</string>
<string key="candidateClassName">NSTextField</string>
@@ -1076,6 +1189,10 @@
<string key="name">label_intro</string>
<string key="candidateClassName">NSTextField</string>
</object>
+ <object class="IBToOneOutletInfo" key="label_tips">
+ <string key="name">label_tips</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
diff -r 47659145332e -r 62390297acd9 Resources/AIOTRSMPSharedSecretWindowController.xib
--- a/Resources/AIOTRSMPSharedSecretWindowController.xib Thu Oct 18 00:32:21 2012 +0200
+++ b/Resources/AIOTRSMPSharedSecretWindowController.xib Thu Oct 18 01:21:45 2012 +0200
@@ -14,6 +14,8 @@
<string>NSButton</string>
<string>NSButtonCell</string>
<string>NSCustomObject</string>
+ <string>NSImageCell</string>
+ <string>NSImageView</string>
<string>NSScrollView</string>
<string>NSScroller</string>
<string>NSTextField</string>
@@ -55,10 +57,10 @@
<object class="NSTextField" id="254829700">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">266</int>
- <string key="NSFrame">{{17, 156}, {446, 34}}</string>
+ <string key="NSFrame">{{57, 156}, {406, 34}}</string>
<reference key="NSSuperview" ref="1006"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="962349894"/>
+ <reference key="NSNextKeyView" ref="492411324"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<string key="NSAntiCompressionPriority">{250, 750}</string>
<bool key="NSEnabled">YES</bool>
@@ -77,7 +79,7 @@
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">controlColor</string>
- <object class="NSColor" key="NSColor" id="925192450">
+ <object class="NSColor" key="NSColor" id="440335583">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
</object>
@@ -101,7 +103,6 @@
<string key="NSFrame">{{375, 13}, {91, 32}}</string>
<reference key="NSSuperview" ref="1006"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="230177630">
@@ -151,16 +152,16 @@
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
- <object class="NSScrollView" id="962349894">
+ <object class="NSScrollView" id="492411324">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">274</int>
<array class="NSMutableArray" key="NSSubviews">
- <object class="NSClipView" id="422631923">
- <reference key="NSNextResponder" ref="962349894"/>
+ <object class="NSClipView" id="690161976">
+ <reference key="NSNextResponder" ref="492411324"/>
<int key="NSvFlags">2304</int>
<array class="NSMutableArray" key="NSSubviews">
- <object class="NSTextView" id="300025210">
- <reference key="NSNextResponder" ref="422631923"/>
+ <object class="NSTextView" id="306073545">
+ <reference key="NSNextResponder" ref="690161976"/>
<int key="NSvFlags">2322</int>
<set class="NSMutableSet" key="NSDragTypes">
<string>Apple HTML pasteboard type</string>
@@ -182,11 +183,11 @@
<string>public.url</string>
</set>
<string key="NSFrameSize">{423, 85}</string>
- <reference key="NSSuperview" ref="422631923"/>
+ <reference key="NSSuperview" ref="690161976"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="407167597"/>
+ <reference key="NSNextKeyView" ref="52319881"/>
<string key="NSReuseIdentifierKey">_NS:13</string>
- <object class="NSTextContainer" key="NSTextContainer" id="988518487">
+ <object class="NSTextContainer" key="NSTextContainer" id="617577266">
<object class="NSLayoutManager" key="NSLayoutManager">
<object class="NSTextStorage" key="NSTextStorage">
<object class="NSMutableString" key="NSString">
@@ -195,12 +196,12 @@
<nil key="NSDelegate"/>
</object>
<array class="NSMutableArray" key="NSTextContainers">
- <reference ref="988518487"/>
+ <reference ref="617577266"/>
</array>
<int key="NSLMFlags">166</int>
<nil key="NSDelegate"/>
</object>
- <reference key="NSTextView" ref="300025210"/>
+ <reference key="NSTextView" ref="306073545"/>
<double key="NSWidth">423</double>
<int key="NSTCFlags">1</int>
</object>
@@ -208,7 +209,7 @@
<int key="NSFlags">11523</int>
<int key="NSTextCheckingTypes">0</int>
<nil key="NSMarkedAttributes"/>
- <object class="NSColor" key="NSBackgroundColor" id="468245595">
+ <object class="NSColor" key="NSBackgroundColor" id="887902950">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MQA</bytes>
</object>
@@ -217,7 +218,7 @@
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">selectedTextBackgroundColor</string>
- <reference key="NSColor" ref="925192450"/>
+ <reference key="NSColor" ref="440335583"/>
</object>
<object class="NSColor" key="NSColor">
<int key="NSColorSpace">6</int>
@@ -248,12 +249,12 @@
</object>
</array>
<string key="NSFrame">{{1, 1}, {423, 85}}</string>
- <reference key="NSSuperview" ref="962349894"/>
+ <reference key="NSSuperview" ref="492411324"/>
<reference key="NSWindow"/>
More information about the commits
mailing list