adium 5655:8420981f5434: Improved the text and alignment in the ...
commits at adium.im
commits at adium.im
Wed Jul 10 15:29:57 UTC 2013
details: http://hg.adium.im/adium/rev/8420981f5434
revision: 5655:8420981f5434
branch: libotr4.0.0
author: Thijs Alkemade <me at thijsalkema.de>
date: Wed Jul 10 15:45:05 2013 +0200
Improved the text and alignment in the OTR related top bars.
Subject: adium 5656:088707cab4f5: Implemented selecting a file to use as the shared secret too.
details: http://hg.adium.im/adium/rev/088707cab4f5
revision: 5656:088707cab4f5
branch: libotr4.0.0
author: Thijs Alkemade <me at thijsalkema.de>
date: Wed Jul 10 17:29:30 2013 +0200
Implemented selecting a file to use as the shared secret too.
diffs (truncated from 1157 to 1000 lines):
diff -r 9bd2de6aeb7f -r 088707cab4f5 Plugins/Secure Messaging/ESSecureMessagingPlugin.m
--- a/Plugins/Secure Messaging/ESSecureMessagingPlugin.m Wed Jul 10 15:32:51 2013 +0200
+++ b/Plugins/Secure Messaging/ESSecureMessagingPlugin.m Wed Jul 10 17:29:30 2013 +0200
@@ -259,6 +259,12 @@
message = CHAT_NO_LONGER_SECURE;
type = @"encryptionEnded";
}
+
+ if (inChat.shouldLog) {
+ message = [message stringByAppendingString:AILocalizedString(@" Logging for this conversation is on.", nil)];
+ } else {
+ message = [message stringByAppendingString:AILocalizedString(@" Logging for this conversation is off.", nil)];
+ }
if ([inChat isOpen]) {
[adium.contentController displayEvent:message
diff -r 9bd2de6aeb7f -r 088707cab4f5 Resources/AIOTRSMPSharedSecretWindowController.xib
--- a/Resources/AIOTRSMPSharedSecretWindowController.xib Wed Jul 10 15:32:51 2013 +0200
+++ b/Resources/AIOTRSMPSharedSecretWindowController.xib Wed Jul 10 17:29:30 2013 +0200
@@ -2,13 +2,13 @@
<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">2843</string>
- <string key="IBDocument.AppKitVersion">1187.34</string>
- <string key="IBDocument.HIToolboxVersion">625.00</string>
+ <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">2843</string>
+ <string key="NS.object.0">3084</string>
</object>
<array key="IBDocument.IntegratedClassDependencies">
<string>NSButton</string>
@@ -18,6 +18,8 @@
<string>NSImageView</string>
<string>NSScrollView</string>
<string>NSScroller</string>
+ <string>NSTabView</string>
+ <string>NSTabViewItem</string>
<string>NSTextField</string>
<string>NSTextFieldCell</string>
<string>NSTextView</string>
@@ -44,7 +46,7 @@
<object class="NSWindowTemplate" id="1005">
<int key="NSWindowStyleMask">7</int>
<int key="NSWindowBacking">2</int>
- <string key="NSWindowRect">{{745, 414}, {480, 210}}</string>
+ <string key="NSWindowRect">{{745, 414}, {514, 266}}</string>
<int key="NSWTFlags">544735232</int>
<string key="NSWindowTitle">Identity verification</string>
<string key="NSWindowClass">NSWindow</string>
@@ -57,10 +59,10 @@
<object class="NSTextField" id="254829700">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">266</int>
- <string key="NSFrame">{{57, 156}, {406, 34}}</string>
+ <string key="NSFrame">{{57, 212}, {406, 34}}</string>
<reference key="NSSuperview" ref="1006"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="492411324"/>
+ <reference key="NSNextKeyView" ref="603464824"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<string key="NSAntiCompressionPriority">{250, 750}</string>
<bool key="NSEnabled">YES</bool>
@@ -75,7 +77,7 @@
</object>
<string key="NSCellIdentifier">_NS:9</string>
<reference key="NSControlView" ref="254829700"/>
- <object class="NSColor" key="NSBackgroundColor">
+ <object class="NSColor" key="NSBackgroundColor" id="307739745">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">controlColor</string>
@@ -84,7 +86,7 @@
<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
</object>
</object>
- <object class="NSColor" key="NSTextColor">
+ <object class="NSColor" key="NSTextColor" id="702504956">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">controlTextColor</string>
@@ -100,9 +102,10 @@
<object class="NSButton" id="1062727544">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">289</int>
- <string key="NSFrame">{{375, 13}, {91, 32}}</string>
+ <string key="NSFrame">{{409, 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">
@@ -129,7 +132,7 @@
<object class="NSButton" id="285143572">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">289</int>
- <string key="NSFrame">{{284, 13}, {91, 32}}</string>
+ <string key="NSFrame">{{318, 13}, {91, 32}}</string>
<reference key="NSSuperview" ref="1006"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="1062727544"/>
@@ -152,119 +155,161 @@
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
- <object class="NSScrollView" id="492411324">
+ <object class="NSImageView" id="43843634">
<reference key="NSNextResponder" ref="1006"/>
- <int key="NSvFlags">274</int>
- <array class="NSMutableArray" key="NSSubviews">
- <object class="NSClipView" id="690161976">
- <reference key="NSNextResponder" ref="492411324"/>
- <int key="NSvFlags">2304</int>
- <array class="NSMutableArray" key="NSSubviews">
- <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>
- <string>Apple PDF pasteboard type</string>
- <string>Apple PICT pasteboard type</string>
- <string>Apple PNG pasteboard type</string>
- <string>Apple URL pasteboard type</string>
- <string>CorePasteboardFlavorType 0x6D6F6F76</string>
- <string>NSColor pasteboard type</string>
- <string>NSFilenamesPboardType</string>
- <string>NSStringPboardType</string>
- <string>NeXT Encapsulated PostScript v1.2 pasteboard type</string>
- <string>NeXT RTFD pasteboard type</string>
- <string>NeXT Rich Text Format v1.0 pasteboard type</string>
- <string>NeXT TIFF v4.0 pasteboard type</string>
- <string>NeXT font pasteboard type</string>
- <string>NeXT ruler pasteboard type</string>
- <string>WebURLsWithTitlesPboardType</string>
- <string>public.url</string>
- </set>
- <string key="NSFrameSize">{423, 85}</string>
- <reference key="NSSuperview" ref="690161976"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="52319881"/>
- <string key="NSReuseIdentifierKey">_NS:13</string>
- <object class="NSTextContainer" key="NSTextContainer" id="617577266">
- <object class="NSLayoutManager" key="NSLayoutManager">
- <object class="NSTextStorage" key="NSTextStorage">
- <object class="NSMutableString" key="NSString">
- <characters key="NS.bytes"/>
- </object>
- <nil key="NSDelegate"/>
- </object>
- <array class="NSMutableArray" key="NSTextContainers">
- <reference ref="617577266"/>
- </array>
- <int key="NSLMFlags">166</int>
- <nil key="NSDelegate"/>
- </object>
- <reference key="NSTextView" ref="306073545"/>
- <double key="NSWidth">423</double>
- <int key="NSTCFlags">1</int>
- </object>
- <object class="NSTextViewSharedData" key="NSSharedData">
- <int key="NSFlags">11523</int>
- <int key="NSTextCheckingTypes">0</int>
- <nil key="NSMarkedAttributes"/>
- <object class="NSColor" key="NSBackgroundColor" id="887902950">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MQA</bytes>
- </object>
- <dictionary key="NSSelectedAttributes">
- <object class="NSColor" key="NSBackgroundColor">
- <int key="NSColorSpace">6</int>
- <string key="NSCatalogName">System</string>
- <string key="NSColorName">selectedTextBackgroundColor</string>
- <reference key="NSColor" ref="440335583"/>
- </object>
- <object class="NSColor" key="NSColor">
- <int key="NSColorSpace">6</int>
- <string key="NSCatalogName">System</string>
- <string key="NSColorName">selectedTextColor</string>
- <reference key="NSColor" ref="655702848"/>
- </object>
- </dictionary>
- <reference key="NSInsertionColor" ref="655702848"/>
- <dictionary key="NSLinkAttributes">
- <object class="NSColor" key="NSColor">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MCAwIDEAA</bytes>
- </object>
- <object class="NSCursor" key="NSCursor">
- <string key="NSHotSpot">{8, -8}</string>
- <int key="NSCursorType">13</int>
- </object>
- <integer value="1" key="NSUnderline"/>
- </dictionary>
- <nil key="NSDefaultParagraphStyle"/>
- <nil key="NSTextFinder"/>
- <int key="NSPreferredTextFinderStyle">1</int>
- </object>
- <int key="NSTVFlags">6</int>
- <string key="NSMaxSize">{463, 10000000}</string>
- <nil key="NSDelegate"/>
- </object>
- </array>
- <string key="NSFrame">{{1, 1}, {423, 85}}</string>
- <reference key="NSSuperview" ref="492411324"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="306073545"/>
- <string key="NSReuseIdentifierKey">_NS:11</string>
- <reference key="NSDocView" ref="306073545"/>
- <reference key="NSBGColor" ref="887902950"/>
- <object class="NSCursor" key="NSCursor">
- <string key="NSHotSpot">{4, 5}</string>
- <object class="NSImage" key="NSImage">
- <int key="NSImageFlags">12582912</int>
- <array class="NSMutableArray" key="NSReps">
- <array>
- <integer value="0"/>
- <object class="NSBitmapImageRep">
- <object class="NSData" key="NSTIFFRepresentation">
- <bytes key="NS.bytes">TU0AKgAAEAj///8A////qwAAAP8AAAD/AwMD/BYWFtIFBQVuAAAABv///wD///8E6+vrTGhoaLYtLS3p
+ <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, 214}, {32, 32}}</string>
+ <reference key="NSSuperview" ref="1006"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="254829700"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSImageCell" key="NSCell" id="838988047">
+ <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="NSTabView" id="603464824">
+ <reference key="NSNextResponder" ref="1006"/>
+ <int key="NSvFlags">12</int>
+ <string key="NSFrame">{{13, 41}, {488, 171}}</string>
+ <reference key="NSSuperview" ref="1006"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="572455261"/>
+ <string key="NSReuseIdentifierKey">_NS:9</string>
+ <array class="NSMutableArray" key="NSTabViewItems">
+ <object class="NSTabViewItem" id="702959155">
+ <string key="NSIdentifier">1</string>
+ <object class="NSView" key="NSView" id="572455261">
+ <reference key="NSNextResponder" ref="603464824"/>
+ <int key="NSvFlags">256</int>
+ <array class="NSMutableArray" key="NSSubviews">
+ <object class="NSScrollView" id="207880426">
+ <reference key="NSNextResponder" ref="572455261"/>
+ <int key="NSvFlags">256</int>
+ <array class="NSMutableArray" key="NSSubviews">
+ <object class="NSClipView" id="948671615">
+ <reference key="NSNextResponder" ref="207880426"/>
+ <int key="NSvFlags">2304</int>
+ <array class="NSMutableArray" key="NSSubviews">
+ <object class="NSTextView" id="826488877">
+ <reference key="NSNextResponder" ref="948671615"/>
+ <int key="NSvFlags">2322</int>
+ <set class="NSMutableSet" key="NSDragTypes">
+ <string>Apple HTML pasteboard type</string>
+ <string>Apple PDF pasteboard type</string>
+ <string>Apple PICT pasteboard type</string>
+ <string>Apple PNG pasteboard type</string>
+ <string>Apple URL pasteboard type</string>
+ <string>CorePasteboardFlavorType 0x6D6F6F76</string>
+ <string>NSColor pasteboard type</string>
+ <string>NSFilenamesPboardType</string>
+ <string>NSStringPboardType</string>
+ <string>NeXT Encapsulated PostScript v1.2 pasteboard type</string>
+ <string>NeXT RTFD pasteboard type</string>
+ <string>NeXT Rich Text Format v1.0 pasteboard type</string>
+ <string>NeXT TIFF v4.0 pasteboard type</string>
+ <string>NeXT font pasteboard type</string>
+ <string>NeXT ruler pasteboard type</string>
+ <string>WebURLsWithTitlesPboardType</string>
+ <string>public.url</string>
+ </set>
+ <string key="NSFrameSize">{417, 103}</string>
+ <reference key="NSSuperview" ref="948671615"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="425267556"/>
+ <string key="NSReuseIdentifierKey">_NS:13</string>
+ <object class="NSTextContainer" key="NSTextContainer" id="1004706284">
+ <object class="NSLayoutManager" key="NSLayoutManager">
+ <object class="NSTextStorage" key="NSTextStorage">
+ <object class="NSMutableString" key="NSString">
+ <characters key="NS.bytes"/>
+ </object>
+ <nil key="NSDelegate"/>
+ </object>
+ <array class="NSMutableArray" key="NSTextContainers">
+ <reference ref="1004706284"/>
+ </array>
+ <int key="NSLMFlags">166</int>
+ <nil key="NSDelegate"/>
+ </object>
+ <reference key="NSTextView" ref="826488877"/>
+ <double key="NSWidth">417</double>
+ <int key="NSTCFlags">1</int>
+ </object>
+ <object class="NSTextViewSharedData" key="NSSharedData">
+ <int key="NSFlags">67120387</int>
+ <int key="NSTextCheckingTypes">0</int>
+ <nil key="NSMarkedAttributes"/>
+ <object class="NSColor" key="NSBackgroundColor" id="887902950">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MQA</bytes>
+ </object>
+ <dictionary key="NSSelectedAttributes">
+ <object class="NSColor" key="NSBackgroundColor">
+ <int key="NSColorSpace">6</int>
+ <string key="NSCatalogName">System</string>
+ <string key="NSColorName">selectedTextBackgroundColor</string>
+ <reference key="NSColor" ref="440335583"/>
+ </object>
+ <object class="NSColor" key="NSColor">
+ <int key="NSColorSpace">6</int>
+ <string key="NSCatalogName">System</string>
+ <string key="NSColorName">selectedTextColor</string>
+ <reference key="NSColor" ref="655702848"/>
+ </object>
+ </dictionary>
+ <reference key="NSInsertionColor" ref="655702848"/>
+ <dictionary key="NSLinkAttributes">
+ <object class="NSColor" key="NSColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MCAwIDEAA</bytes>
+ </object>
+ <object class="NSCursor" key="NSCursor">
+ <string key="NSHotSpot">{8, -8}</string>
+ <int key="NSCursorType">13</int>
+ </object>
+ <integer value="1" key="NSUnderline"/>
+ </dictionary>
+ <nil key="NSDefaultParagraphStyle"/>
+ <nil key="NSTextFinder"/>
+ <int key="NSPreferredTextFinderStyle">1</int>
+ </object>
+ <int key="NSTVFlags">6</int>
+ <string key="NSMaxSize">{468, 10000000}</string>
+ <nil key="NSDelegate"/>
+ </object>
+ </array>
+ <string key="NSFrame">{{1, 1}, {417, 103}}</string>
+ <reference key="NSSuperview" ref="207880426"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="826488877"/>
+ <string key="NSReuseIdentifierKey">_NS:11</string>
+ <reference key="NSDocView" ref="826488877"/>
+ <reference key="NSBGColor" ref="887902950"/>
+ <object class="NSCursor" key="NSCursor">
+ <string key="NSHotSpot">{4, 5}</string>
+ <object class="NSImage" key="NSImage">
+ <int key="NSImageFlags">12582912</int>
+ <array class="NSMutableArray" key="NSReps">
+ <array>
+ <integer value="0"/>
+ <object class="NSBitmapImageRep">
+ <object class="NSData" key="NSTIFFRepresentation">
+ <bytes key="NS.bytes">TU0AKgAAEAj///8A////qwAAAP8AAAD/AwMD/BYWFtIFBQVuAAAABv///wD///8E6+vrTGhoaLYtLS3p
BAQE/QAAAP8AAAD/////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A
////AP///wD///8A////AP///wD///+rAAAA/wAAAP8AAAD/AAAA/wAAAP8EBATSX19fK9HR0ZciIiLv
AAAA/wAAAP8AAAD/AAAA/wAAAP////8A////AP///wD///8A////AP///wD///8A////AP///wD///8A
@@ -337,14 +382,14 @@
AAABFgADAAAAAQAgAAABFwAEAAAAAQAAEAABGgAFAAAAAQAAENYBGwAFAAAAAQAAEN4BHAADAAAAAQAB
AAABKAADAAAAAQACAAABUgADAAAAAQACAAABUwADAAAABAAAEOYAAAAAAAgACAAIAAgSAAAAACAAABIA
AAAAIAAAAAEAAQABAAE</bytes>
- </object>
- </object>
- </array>
- <array>
- <integer value="0"/>
- <object class="NSBitmapImageRep">
- <object class="NSData" key="NSTIFFRepresentation">
- <bytes key="NS.bytes">TU0AKgAABAj///9VQ0ND/wAAAP////8A////AP///6pDQ0P/AAAA/////wD///8A////AP///wD///8A
+ </object>
+ </object>
+ </array>
+ <array>
+ <integer value="0"/>
+ <object class="NSBitmapImageRep">
+ <object class="NSData" key="NSTIFFRepresentation">
+ <bytes key="NS.bytes">TU0AKgAABAj///9VQ0ND/wAAAP////8A////AP///6pDQ0P/AAAA/////wD///8A////AP///wD///8A
////AP///wD///8A////AP///wD///+qAAAA/////6oAAAD/////AP///wD///8A////AP///wD///8A
////AP///wD///8A////AP///wD///8A////AP///6oAAAD/////AP///wD///8A////AP///wD///8A
////AP///wD///8A////AP///wD///8A////AP///wD///+qAAAA/////wD///8A////AP///wD///8A
@@ -398,92 +443,150 @@
Fs9YWVogAAAAAAAAdE0AAD3uAAAD0FhZWiAAAAAAAABadQAArHMAABc0WFlaIAAAAAAAACgaAAAVnwAA
uDZjdXJ2AAAAAAAAAAEBzQAAc2YzMgAAAAAAAQxCAAAF3v//8yYAAAeSAAD9kf//+6L///2jAAAD3AAA
wGw</bytes>
+ </object>
+ </object>
+ </array>
+ </array>
+ <object class="NSColor" key="NSColor">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MCAwAA</bytes>
+ </object>
+ </object>
</object>
+ <int key="NScvFlags">4</int>
+ </object>
+ <object class="NSScroller" id="425267556">
+ <reference key="NSNextResponder" ref="207880426"/>
+ <int key="NSvFlags">256</int>
+ <string key="NSFrame">{{418, 1}, {15, 103}}</string>
+ <reference key="NSSuperview" ref="207880426"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="285143572"/>
+ <string key="NSReuseIdentifierKey">_NS:83</string>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+ <reference key="NSTarget" ref="207880426"/>
+ <string key="NSAction">_doScroller:</string>
+ <double key="NSCurValue">1</double>
+ <double key="NSPercent">0.85256409645080566</double>
+ </object>
+ <object class="NSScroller" id="632616179">
+ <reference key="NSNextResponder" ref="207880426"/>
+ <int key="NSvFlags">-2147483392</int>
+ <string key="NSFrame">{{-100, -100}, {87, 18}}</string>
+ <reference key="NSSuperview" ref="207880426"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="948671615"/>
+ <string key="NSReuseIdentifierKey">_NS:33</string>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+ <int key="NSsFlags">1</int>
+ <reference key="NSTarget" ref="207880426"/>
+ <string key="NSAction">_doScroller:</string>
+ <double key="NSCurValue">1</double>
+ <double key="NSPercent">0.94565218687057495</double>
</object>
</array>
- </array>
- <object class="NSColor" key="NSColor">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MCAwAA</bytes>
+ <string key="NSFrame">{{17, 17}, {434, 105}}</string>
+ <reference key="NSSuperview" ref="572455261"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="632616179"/>
+ <string key="NSReuseIdentifierKey">_NS:9</string>
+ <int key="NSsFlags">133138</int>
+ <reference key="NSVScroller" ref="425267556"/>
+ <reference key="NSHScroller" ref="632616179"/>
+ <reference key="NSContentView" ref="948671615"/>
+ <double key="NSMinMagnification">0.25</double>
+ <double key="NSMaxMagnification">4</double>
+ <double key="NSMagnification">1</double>
</object>
- </object>
+ </array>
+ <string key="NSFrame">{{10, 33}, {468, 125}}</string>
+ <reference key="NSSuperview" ref="603464824"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="207880426"/>
+ <string key="NSReuseIdentifierKey">_NS:11</string>
</object>
- <int key="NScvFlags">4</int>
+ <string key="NSLabel">Text</string>
+ <reference key="NSColor" ref="307739745"/>
+ <reference key="NSTabView" ref="603464824"/>
</object>
- <object class="NSScroller" id="52319881">
- <reference key="NSNextResponder" ref="492411324"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{424, 1}, {15, 85}}</string>
- <reference key="NSSuperview" ref="492411324"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="285143572"/>
- <string key="NSReuseIdentifierKey">_NS:83</string>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- <reference key="NSTarget" ref="492411324"/>
- <string key="NSAction">_doScroller:</string>
- <double key="NSCurValue">1</double>
- <double key="NSPercent">0.85256409645080566</double>
- </object>
- <object class="NSScroller" id="1029680221">
- <reference key="NSNextResponder" ref="492411324"/>
- <int key="NSvFlags">-2147483392</int>
- <string key="NSFrame">{{-100, -100}, {87, 18}}</string>
- <reference key="NSSuperview" ref="492411324"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="690161976"/>
- <string key="NSReuseIdentifierKey">_NS:33</string>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- <int key="NSsFlags">1</int>
- <reference key="NSTarget" ref="492411324"/>
- <string key="NSAction">_doScroller:</string>
- <double key="NSCurValue">1</double>
- <double key="NSPercent">0.94565218687057495</double>
+ <object class="NSTabViewItem" id="899015210">
+ <string key="NSIdentifier">2</string>
+ <object class="NSView" key="NSView" id="383520333">
+ <nil key="NSNextResponder"/>
+ <int key="NSvFlags">256</int>
+ <array class="NSMutableArray" key="NSSubviews">
+ <object class="NSButton" id="708808105">
+ <reference key="NSNextResponder" ref="383520333"/>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrame">{{11, 94}, {103, 32}}</string>
+ <reference key="NSSuperview" ref="383520333"/>
+ <reference key="NSNextKeyView" ref="735598917"/>
+ <string key="NSReuseIdentifierKey">_NS:9</string>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSButtonCell" key="NSCell" id="794358549">
+ <int key="NSCellFlags">67108864</int>
+ <int key="NSCellFlags2">134217728</int>
+ <string key="NSContents">Select File</string>
+ <object class="NSFont" key="NSSupport" id="554779983">
+ <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="708808105"/>
+ <int key="NSButtonFlags">-2038284288</int>
+ <int key="NSButtonFlags2">129</int>
+ <string key="NSAlternateContents"/>
+ <string key="NSKeyEquivalent"/>
+ <int key="NSPeriodicDelay">200</int>
+ <int key="NSPeriodicInterval">25</int>
+ </object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+ </object>
+ <object class="NSTextField" id="735598917">
+ <reference key="NSNextResponder" ref="383520333"/>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrame">{{113, 103}, {341, 17}}</string>
+ <reference key="NSSuperview" ref="383520333"/>
+ <reference key="NSNextKeyView" ref="285143572"/>
+ <string key="NSReuseIdentifierKey">_NS:1535</string>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSTextFieldCell" key="NSCell" id="631389107">
+ <int key="NSCellFlags">68157504</int>
+ <int key="NSCellFlags2">272630784</int>
+ <string key="NSContents">(Nothing selected)</string>
+ <reference key="NSSupport" ref="554779983"/>
+ <string key="NSCellIdentifier">_NS:1535</string>
+ <reference key="NSControlView" ref="735598917"/>
+ <reference key="NSBackgroundColor" ref="307739745"/>
+ <reference key="NSTextColor" ref="702504956"/>
+ </object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+ </object>
+ </array>
+ <string key="NSFrame">{{10, 33}, {468, 125}}</string>
+ <reference key="NSNextKeyView" ref="708808105"/>
+ <string key="NSReuseIdentifierKey">_NS:28</string>
+ </object>
+ <string key="NSLabel">File</string>
+ <reference key="NSColor" ref="307739745"/>
+ <reference key="NSTabView" ref="603464824"/>
</object>
</array>
- <string key="NSFrame">{{20, 61}, {440, 87}}</string>
- <reference key="NSSuperview" ref="1006"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="1029680221"/>
- <string key="NSReuseIdentifierKey">_NS:9</string>
- <int key="NSsFlags">133138</int>
- <reference key="NSVScroller" ref="52319881"/>
- <reference key="NSHScroller" ref="1029680221"/>
- <reference key="NSContentView" ref="690161976"/>
- <double key="NSMinMagnification">0.25</double>
- <double key="NSMaxMagnification">4</double>
- <double key="NSMagnification">1</double>
- </object>
- <object class="NSImageView" id="43843634">
- <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, 158}, {32, 32}}</string>
- <reference key="NSSuperview" ref="1006"/>
- <reference key="NSWindow"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSImageCell" key="NSCell" id="838988047">
- <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>
+ <reference key="NSSelectedTabViewItem" ref="702959155"/>
+ <reference key="NSFont" ref="554779983"/>
+ <int key="NSTvFlags">0</int>
+ <bool key="NSAllowTruncatedLabels">YES</bool>
+ <bool key="NSDrawsBackground">YES</bool>
+ <array class="NSMutableArray" key="NSSubviews">
+ <reference ref="572455261"/>
+ </array>
</object>
</array>
- <string key="NSFrameSize">{480, 210}</string>
+ <string key="NSFrameSize">{514, 266}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="254829700"/>
+ <reference key="NSNextKeyView" ref="43843634"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1920, 1058}}</string>
<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
@@ -518,14 +621,6 @@
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
- <string key="label">field_secret</string>
- <reference key="source" ref="1001"/>
- <reference key="destination" ref="306073545"/>
- </object>
- <int key="connectionID">31</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="43843634"/>
@@ -534,6 +629,38 @@
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
+ <string key="label">field_secret</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="826488877"/>
+ </object>
+ <int key="connectionID">49</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">selectFile:</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="708808105"/>
+ </object>
+ <int key="connectionID">50</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">label_filename</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="735598917"/>
+ </object>
+ <int key="connectionID">51</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">tab_answer</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="603464824"/>
+ </object>
+ <int key="connectionID">52</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
<string key="label">window_anchorOnLeftSide</string>
<reference key="source" ref="254829700"/>
<reference key="destination" ref="1005"/>
@@ -548,6 +675,14 @@
</object>
<int key="connectionID">26</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">view_anchorToRightSide</string>
+ <reference key="source" ref="708808105"/>
+ <reference key="destination" ref="735598917"/>
+ </object>
+ <int key="connectionID">48</int>
+ </object>
</array>
<object class="IBMutableOrderedSet" key="objectRecords">
<array key="orderedObjects">
@@ -588,10 +723,10 @@
<reference key="object" ref="1006"/>
<array class="NSMutableArray" key="children">
<reference ref="254829700"/>
+ <reference ref="43843634"/>
+ <reference ref="603464824"/>
<reference ref="1062727544"/>
<reference ref="285143572"/>
- <reference ref="492411324"/>
- <reference ref="43843634"/>
</array>
<reference key="parent" ref="1005"/>
</object>
@@ -635,31 +770,6 @@
<reference key="parent" ref="285143572"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">27</int>
- <reference key="object" ref="492411324"/>
- <array class="NSMutableArray" key="children">
- <reference ref="306073545"/>
- <reference ref="1029680221"/>
- <reference ref="52319881"/>
- </array>
- <reference key="parent" ref="1006"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">28</int>
- <reference key="object" ref="306073545"/>
- <reference key="parent" ref="492411324"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">29</int>
- <reference key="object" ref="1029680221"/>
- <reference key="parent" ref="492411324"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">30</int>
- <reference key="object" ref="52319881"/>
- <reference key="parent" ref="492411324"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">32</int>
<reference key="object" ref="43843634"/>
<array class="NSMutableArray" key="children">
@@ -672,6 +782,99 @@
<reference key="object" ref="838988047"/>
<reference key="parent" ref="43843634"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">35</int>
+ <reference key="object" ref="603464824"/>
+ <array class="NSMutableArray" key="children">
+ <reference ref="899015210"/>
+ <reference ref="702959155"/>
+ </array>
+ <reference key="parent" ref="1006"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">36</int>
+ <reference key="object" ref="899015210"/>
+ <array class="NSMutableArray" key="children">
+ <reference ref="383520333"/>
+ </array>
+ <reference key="parent" ref="603464824"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">37</int>
+ <reference key="object" ref="702959155"/>
+ <array class="NSMutableArray" key="children">
+ <reference ref="572455261"/>
+ </array>
+ <reference key="parent" ref="603464824"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">38</int>
+ <reference key="object" ref="572455261"/>
+ <array class="NSMutableArray" key="children">
+ <reference ref="207880426"/>
+ </array>
+ <reference key="parent" ref="702959155"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">39</int>
+ <reference key="object" ref="207880426"/>
+ <array class="NSMutableArray" key="children">
+ <reference ref="425267556"/>
+ <reference ref="632616179"/>
+ <reference ref="826488877"/>
+ </array>
+ <reference key="parent" ref="572455261"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">40</int>
+ <reference key="object" ref="425267556"/>
+ <reference key="parent" ref="207880426"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">41</int>
+ <reference key="object" ref="632616179"/>
+ <reference key="parent" ref="207880426"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">42</int>
+ <reference key="object" ref="826488877"/>
+ <reference key="parent" ref="207880426"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">43</int>
+ <reference key="object" ref="383520333"/>
+ <array class="NSMutableArray" key="children">
+ <reference ref="735598917"/>
+ <reference ref="708808105"/>
+ </array>
+ <reference key="parent" ref="899015210"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">44</int>
+ <reference key="object" ref="735598917"/>
+ <array class="NSMutableArray" key="children">
+ <reference ref="631389107"/>
+ </array>
+ <reference key="parent" ref="383520333"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">45</int>
+ <reference key="object" ref="708808105"/>
+ <array class="NSMutableArray" key="children">
+ <reference ref="794358549"/>
+ </array>
+ <reference key="parent" ref="383520333"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">46</int>
+ <reference key="object" ref="794358549"/>
+ <reference key="parent" ref="708808105"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">47</int>
+ <reference key="object" ref="631389107"/>
+ <reference key="parent" ref="735598917"/>
+ </object>
</array>
</object>
<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -690,12 +893,22 @@
<string key="17.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="18.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="27.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="28.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="29.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="30.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="32.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="38.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="39.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="40.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="41.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="42.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="45.CustomClassName">AILocalizationButton</string>
+ <string key="45.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>
</dictionary>
@@ -703,7 +916,7 @@
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
- <int key="maxID">34</int>
+ <int key="maxID">52</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -759,7 +972,9 @@
<dictionary class="NSMutableDictionary" key="outlets">
<string key="field_secret">NSTextView</string>
<string key="imageView_lock">NSImageView</string>
+ <string key="label_filename">NSTextField</string>
<string key="label_intro">NSTextField</string>
+ <string key="tab_answer">NSTabView</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
<object class="IBToOneOutletInfo" key="field_secret">
@@ -770,10 +985,18 @@
<string key="name">imageView_lock</string>
<string key="candidateClassName">NSImageView</string>
</object>
+ <object class="IBToOneOutletInfo" key="label_filename">
+ <string key="name">label_filename</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
<object class="IBToOneOutletInfo" key="label_intro">
<string key="name">label_intro</string>
<string key="candidateClassName">NSTextField</string>
</object>
+ <object class="IBToOneOutletInfo" key="tab_answer">
+ <string key="name">tab_answer</string>
+ <string key="candidateClassName">NSTabView</string>
+ </object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
@@ -781,6 +1004,25 @@
</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">NSObject</string>
<object class="NSMutableDictionary" key="actions">
<string key="NS.key.0">selectServiceType:</string>
diff -r 9bd2de6aeb7f -r 088707cab4f5 Resources/AIOTRTopBarLoggingWarningController.xib
--- a/Resources/AIOTRTopBarLoggingWarningController.xib Wed Jul 10 15:32:51 2013 +0200
+++ b/Resources/AIOTRTopBarLoggingWarningController.xib Wed Jul 10 17:29:30 2013 +0200
@@ -49,6 +49,7 @@
<string key="NSFrame">{{551, 5}, {83, 19}}</string>
<reference key="NSSuperview" ref="709009510"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="271828053">
@@ -73,8 +74,8 @@
</object>
<object class="NSTextField" id="453567343">
<reference key="NSNextResponder" ref="709009510"/>
- <int key="NSvFlags">268</int>
- <string key="NSFrame">{{7, 7}, {549, 17}}</string>
+ <int key="NSvFlags">270</int>
+ <string key="NSFrame">{{7, 7}, {354, 17}}</string>
<reference key="NSSuperview" ref="709009510"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="382479864"/>
@@ -82,8 +83,8 @@
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="667515101">
<int key="NSCellFlags">68157504</int>
- <int key="NSCellFlags2">71304192</int>
- <string key="NSContents">Your conversation is encrypted, but still logged by you. Your security might be at risk.</string>
+ <int key="NSCellFlags2">4195328</int>
+ <string key="NSContents">Your conversation is encrypted, but still logged by you.</string>
<object class="NSFont" key="NSSupport">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">13</double>
@@ -209,8 +210,8 @@
<int key="objectID">4</int>
<reference key="object" ref="709009510"/>
<array class="NSMutableArray" key="children">
+ <reference ref="382479864"/>
<reference ref="453567343"/>
- <reference ref="382479864"/>
</array>
<reference key="parent" ref="209947746"/>
</object>
diff -r 9bd2de6aeb7f -r 088707cab4f5 Resources/AIOTRTopBarUnverifiedContactController.xib
--- a/Resources/AIOTRTopBarUnverifiedContactController.xib Wed Jul 10 15:32:51 2013 +0200
+++ b/Resources/AIOTRTopBarUnverifiedContactController.xib Wed Jul 10 17:29:30 2013 +0200
@@ -74,7 +74,7 @@
</object>
<object class="NSTextField" id="453567343">
<reference key="NSNextResponder" ref="709009510"/>
- <int key="NSvFlags">268</int>
+ <int key="NSvFlags">270</int>
<string key="NSFrame">{{7, 7}, {389, 17}}</string>
<reference key="NSSuperview" ref="709009510"/>
<reference key="NSWindow"/>
@@ -83,7 +83,7 @@
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="667515101">
<int key="NSCellFlags">68157504</int>
- <int key="NSCellFlags2">71304192</int>
+ <int key="NSCellFlags2">4195328</int>
<string key="NSContents">Your conversation is encrypted, but the contact is unverified.</string>
<object class="NSFont" key="NSSupport">
<string key="NSName">LucidaGrande</string>
diff -r 9bd2de6aeb7f -r 088707cab4f5 Source/AIOTRSMPSharedSecretWindowController.h
More information about the commits
mailing list