--- a/Resources/AIOTRSMPSecretAnswerWindowController.xib Fri Dec 06 00:02:36 2013 +0100
+++ b/Resources/AIOTRSMPSecretAnswerWindowController.xib Fri Dec 06 00:15:27 2013 +0100
@@ -2,13 +2,13 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<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>
+ <string key="IBDocument.SystemVersion">13A603</string> + <string key="IBDocument.InterfaceBuilderVersion">4514</string> + <string key="IBDocument.AppKitVersion">1265</string> + <string key="IBDocument.HIToolboxVersion">695.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>
+ <string key="NS.object.0">4514</string> <array key="IBDocument.IntegratedClassDependencies">
<string>NSButton</string>
@@ -16,6 +16,8 @@
<string>NSCustomObject</string>
<string>NSImageCell</string>
<string>NSImageView</string>
+ <string>NSPathCell</string> + <string>NSPathControl</string> <string>NSScrollView</string>
<string>NSScroller</string>
<string>NSTabView</string>
@@ -71,7 +73,7 @@
<int key="NSCellFlags2">272760832</int>
<string key="NSContents">%@ asks you to answer the following secret question to confirm your identity:</string>
<object class="NSFont" key="NSSupport" id="26">
- <string key="NSName">LucidaGrande</string>
+ <string key="NSName">.LucidaGrandeUI</string> <double key="NSSize">11</double>
<int key="NSfFlags">3100</int>
@@ -98,6 +100,8 @@
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<bool key="NSControlAutosetMaxLayoutWidth">YES</bool>
+ <double key="NSPreferredMaxLayoutWidth">436</double> + <int key="NSTextFieldAlignmentRectInsetsVersion">1</int> <object class="NSTextField" id="129577520">
<reference key="NSNextResponder" ref="1006"/>
@@ -121,6 +125,8 @@
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<bool key="NSControlAutosetMaxLayoutWidth">YES</bool>
+ <double key="NSPreferredMaxLayoutWidth">476</double> + <int key="NSTextFieldAlignmentRectInsetsVersion">1</int> <object class="NSTextField" id="20732819">
<reference key="NSNextResponder" ref="1006"/>
@@ -151,6 +157,8 @@
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<bool key="NSControlAutosetMaxLayoutWidth">YES</bool>
+ <double key="NSPreferredMaxLayoutWidth">476</double> + <int key="NSTextFieldAlignmentRectInsetsVersion">1</int> <object class="NSButton" id="179006788">
<reference key="NSNextResponder" ref="1006"/>
@@ -165,16 +173,20 @@
<int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">134217728</int>
<string key="NSContents">OK</string>
- <object class="NSFont" key="NSSupport" id="292827969">
- <string key="NSName">LucidaGrande</string>
+ <object class="NSFont" key="NSSupport" id="160923183"> + <string key="NSName">.LucidaGrandeUI</string> <double key="NSSize">13</double>
- <int key="NSfFlags">16</int>
+ <int key="NSfFlags">1044</int> <string key="NSCellIdentifier">_NS:9</string>
<reference key="NSControlView" ref="179006788"/>
<int key="NSButtonFlags">-2034876416</int>
<int key="NSButtonFlags2">1</int>
- <reference key="NSAlternateImage" ref="292827969"/>
+ <object class="NSFont" key="NSAlternateImage" id="292827969"> + <string key="NSName">LucidaGrande</string> + <double key="NSSize">13</double> + <int key="NSfFlags">16</int> <string key="NSAlternateContents"/>
<string type="base64-UTF8" key="NSKeyEquivalent">DQ</string>
<int key="NSPeriodicDelay">200</int>
@@ -195,7 +207,7 @@
<int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">134217728</int>
<string key="NSContents">Cancel</string>
- <reference key="NSSupport" ref="292827969"/>
+ <reference key="NSSupport" ref="160923183"/> <string key="NSCellIdentifier">_NS:9</string>
<reference key="NSControlView" ref="508200382"/>
<int key="NSButtonFlags">-2034876416</int>
@@ -214,7 +226,7 @@
<array class="NSMutableArray" key="NSSubviews">
<object class="NSClipView" id="761354996">
<reference key="NSNextResponder" ref="205520375"/>
- <int key="NSvFlags">2304</int>
+ <int key="NSvFlags">2322</int> <array class="NSMutableArray" key="NSSubviews">
<object class="NSTextView" id="767676437">
<reference key="NSNextResponder" ref="761354996"/>
@@ -388,11 +400,63 @@
AAAA/wAAAP8AAAD/////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A
////AP///wD///8A////AP///wD///+rAAAA/wAAAP8AAAD/FBQU1AUFBXEAAAAG////AP///wTr6+tO
ZWVluC4uLuoAAAD/AAAA/wAAAP////8A////AP///wD///8A////AP///wD///8A////AP///wD///8A
-////AP///wD///8A////AP///wD///8AABABAAADAAAAAQAgAAABAQADAAAAAQAgAAABAgADAAAABAAA
-EM4BAwADAAAAAQABAAABBgADAAAAAQACAAABEQAEAAAAAQAAAAgBEgADAAAAAQABAAABFQADAAAAAQAE
-AAABFgADAAAAAQAgAAABFwAEAAAAAQAAEAABGgAFAAAAAQAAENYBGwAFAAAAAQAAEN4BHAADAAAAAQAB
-AAABKAADAAAAAQACAAABUgADAAAAAQACAAABUwADAAAABAAAEOYAAAAAAAgACAAIAAgSAAAAACAAABIA
-AAAAIAAAAAEAAQABAAE</bytes>
+////AP///wD///8A////AP///wD///8AABEBAAADAAAAAQAgAAABAQADAAAAAQAgAAABAgADAAAABAAA +EOoBAwADAAAAAQABAAABBgADAAAAAQACAAABEQAEAAAAAQAAAAgBEgADAAAAAQABAAABFQADAAAAAQAE +AAABFgADAAAAAQAgAAABFwAEAAAAAQAAEAABGgAFAAAAAQAAENoBGwAFAAAAAQAAEOIBHAADAAAAAQAB +AAABKAADAAAAAQACAAABUgADAAAAAQACAAABUwADAAAABAAAEPKHcwAHAAAMSAAAEPoAAAAAAAAAkAAA +AAEAAACQAAAAAQAIAAgACAAIAAEAAQABAAEAAAxITGlubwIQAABtbnRyUkdCIFhZWiAHzgACAAkABgAx +AABhY3NwTVNGVAAAAABJRUMgc1JHQgAAAAAAAAAAAAAAAAAA9tYAAQAAAADTLUhQICAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABFjcHJ0AAABUAAAADNkZXNjAAABhAAA +AGx3dHB0AAAB8AAAABRia3B0AAACBAAAABRyWFlaAAACGAAAABRnWFlaAAACLAAAABRiWFlaAAACQAAA +ABRkbW5kAAACVAAAAHBkbWRkAAACxAAAAIh2dWVkAAADTAAAAIZ2aWV3AAAD1AAAACRsdW1pAAAD+AAA +ABRtZWFzAAAEDAAAACR0ZWNoAAAEMAAAAAxyVFJDAAAEPAAACAxnVFJDAAAEPAAACAxiVFJDAAAEPAAA +CAx0ZXh0AAAAAENvcHlyaWdodCAoYykgMTk5OCBIZXdsZXR0LVBhY2thcmQgQ29tcGFueQAAZGVzYwAA +AAAAAAASc1JHQiBJRUM2MTk2Ni0yLjEAAAAAAAAAAAAAABJzUkdCIElFQzYxOTY2LTIuMQAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWFlaIAAAAAAAAPNRAAEAAAAB +FsxYWVogAAAAAAAAAAAAAAAAAAAAAFhZWiAAAAAAAABvogAAOPUAAAOQWFlaIAAAAAAAAGKZAAC3hQAA +GNpYWVogAAAAAAAAJKAAAA+EAAC2z2Rlc2MAAAAAAAAAFklFQyBodHRwOi8vd3d3LmllYy5jaAAAAAAA +AAAAAAAAFklFQyBodHRwOi8vd3d3LmllYy5jaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAABkZXNjAAAAAAAAAC5JRUMgNjE5NjYtMi4xIERlZmF1bHQgUkdCIGNvbG91ciBz +cGFjZSAtIHNSR0IAAAAAAAAAAAAAAC5JRUMgNjE5NjYtMi4xIERlZmF1bHQgUkdCIGNvbG91ciBzcGFj +ZSAtIHNSR0IAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZGVzYwAAAAAAAAAsUmVmZXJlbmNlIFZpZXdpbmcg +Q29uZGl0aW9uIGluIElFQzYxOTY2LTIuMQAAAAAAAAAAAAAALFJlZmVyZW5jZSBWaWV3aW5nIENvbmRp +dGlvbiBpbiBJRUM2MTk2Ni0yLjEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHZpZXcAAAAAABOk/gAU +Xy4AEM8UAAPtzAAEEwsAA1yeAAAAAVhZWiAAAAAAAEwJVgBQAAAAVx/nbWVhcwAAAAAAAAABAAAAAAAA +AAAAAAAAAAAAAAAAAo8AAAACc2lnIAAAAABDUlQgY3VydgAAAAAAAAQAAAAABQAKAA8AFAAZAB4AIwAo +AC0AMgA3ADsAQABFAEoATwBUAFkAXgBjAGgAbQByAHcAfACBAIYAiwCQAJUAmgCfAKQAqQCuALIAtwC8 +AMEAxgDLANAA1QDbAOAA5QDrAPAA9gD7AQEBBwENARMBGQEfASUBKwEyATgBPgFFAUwBUgFZAWABZwFu +AXUBfAGDAYsBkgGaAaEBqQGxAbkBwQHJAdEB2QHhAekB8gH6AgMCDAIUAh0CJgIvAjgCQQJLAlQCXQJn +AnECegKEAo4CmAKiAqwCtgLBAssC1QLgAusC9QMAAwsDFgMhAy0DOANDA08DWgNmA3IDfgOKA5YDogOu +A7oDxwPTA+AD7AP5BAYEEwQgBC0EOwRIBFUEYwRxBH4EjASaBKgEtgTEBNME4QTwBP4FDQUcBSsFOgVJ +BVgFZwV3BYYFlgWmBbUFxQXVBeUF9gYGBhYGJwY3BkgGWQZqBnsGjAadBq8GwAbRBuMG9QcHBxkHKwc9 +B08HYQd0B4YHmQesB78H0gflB/gICwgfCDIIRghaCG4IggiWCKoIvgjSCOcI+wkQCSUJOglPCWQJeQmP +CaQJugnPCeUJ+woRCicKPQpUCmoKgQqYCq4KxQrcCvMLCwsiCzkLUQtpC4ALmAuwC8gL4Qv5DBIMKgxD +DFwMdQyODKcMwAzZDPMNDQ0mDUANWg10DY4NqQ3DDd4N+A4TDi4OSQ5kDn8Omw62DtIO7g8JDyUPQQ9e +D3oPlg+zD88P7BAJECYQQxBhEH4QmxC5ENcQ9RETETERTxFtEYwRqhHJEegSBxImEkUSZBKEEqMSwxLj +EwMTIxNDE2MTgxOkE8UT5RQGFCcUSRRqFIsUrRTOFPAVEhU0FVYVeBWbFb0V4BYDFiYWSRZsFo8WshbW +FvoXHRdBF2UXiReuF9IX9xgbGEAYZRiKGK8Y1Rj6GSAZRRlrGZEZtxndGgQaKhpRGncanhrFGuwbFBs7 +G2MbihuyG9ocAhwqHFIcexyjHMwc9R0eHUcdcB2ZHcMd7B4WHkAeah6UHr4e6R8THz4faR+UH78f6iAV +IEEgbCCYIMQg8CEcIUghdSGhIc4h+yInIlUigiKvIt0jCiM4I2YjlCPCI/AkHyRNJHwkqyTaJQklOCVo +JZclxyX3JicmVyaHJrcm6CcYJ0kneierJ9woDSg/KHEooijUKQYpOClrKZ0p0CoCKjUqaCqbKs8rAis2 +K2krnSvRLAUsOSxuLKIs1y0MLUEtdi2rLeEuFi5MLoIuty7uLyQvWi+RL8cv/jA1MGwwpDDbMRIxSjGC +Mbox8jIqMmMymzLUMw0zRjN/M7gz8TQrNGU0njTYNRM1TTWHNcI1/TY3NnI2rjbpNyQ3YDecN9c4FDhQ +OIw4yDkFOUI5fzm8Ofk6Njp0OrI67zstO2s7qjvoPCc8ZTykPOM9Ij1hPaE94D4gPmA+oD7gPyE/YT+i +P+JAI0BkQKZA50EpQWpBrEHuQjBCckK1QvdDOkN9Q8BEA0RHRIpEzkUSRVVFmkXeRiJGZ0arRvBHNUd7 +R8BIBUhLSJFI10kdSWNJqUnwSjdKfUrESwxLU0uaS+JMKkxyTLpNAk1KTZNN3E4lTm5Ot08AT0lPk0/d +UCdQcVC7UQZRUFGbUeZSMVJ8UsdTE1NfU6pT9lRCVI9U21UoVXVVwlYPVlxWqVb3V0RXklfgWC9YfVjL +WRpZaVm4WgdaVlqmWvVbRVuVW+VcNVyGXNZdJ114XcleGl5sXr1fD19hX7NgBWBXYKpg/GFPYaJh9WJJ +Ypxi8GNDY5dj62RAZJRk6WU9ZZJl52Y9ZpJm6Gc9Z5Nn6Wg/aJZo7GlDaZpp8WpIap9q92tPa6dr/2xX +bK9tCG1gbbluEm5rbsRvHm94b9FwK3CGcOBxOnGVcfByS3KmcwFzXXO4dBR0cHTMdSh1hXXhdj52m3b4 +d1Z3s3gReG54zHkqeYl553pGeqV7BHtje8J8IXyBfOF9QX2hfgF+Yn7CfyN/hH/lgEeAqIEKgWuBzYIw +gpKC9INXg7qEHYSAhOOFR4Wrhg6GcobXhzuHn4gEiGmIzokziZmJ/opkisqLMIuWi/yMY4zKjTGNmI3/ +jmaOzo82j56QBpBukNaRP5GokhGSepLjk02TtpQglIqU9JVflcmWNJaflwqXdZfgmEyYuJkkmZCZ/Jpo +mtWbQpuvnByciZz3nWSd0p5Anq6fHZ+Ln/qgaaDYoUehtqImopajBqN2o+akVqTHpTilqaYapoum/adu +p+CoUqjEqTepqaocqo+rAqt1q+msXKzQrUStuK4trqGvFq+LsACwdbDqsWCx1rJLssKzOLOutCW0nLUT +tYq2AbZ5tvC3aLfguFm40blKucK6O7q1uy67p7whvJu9Fb2Pvgq+hL7/v3q/9cBwwOzBZ8Hjwl/C28NY +w9TEUcTOxUvFyMZGxsPHQce/yD3IvMk6ybnKOMq3yzbLtsw1zLXNNc21zjbOts83z7jQOdC60TzRvtI/ +0sHTRNPG1EnUy9VO1dHWVdbY11zX4Nhk2OjZbNnx2nba+9uA3AXcit0Q3ZbeHN6i3ynfr+A24L3hROHM +4lPi2+Nj4+vkc+T85YTmDeaW5x/nqegy6LzpRunQ6lvq5etw6/vshu0R7ZzuKO6070DvzPBY8OXxcvH/ +8ozzGfOn9DT0wvVQ9d72bfb794r4Gfio+Tj5x/pX+uf7d/wH/Jj9Kf26/kv+3P9t//8</bytes> @@ -538,7 +602,7 @@
<object class="NSTabView" id="88114479">
<reference key="NSNextResponder" ref="1006"/>
- <int key="NSvFlags">12</int>
+ <int key="NSvFlags">268</int> <string key="NSFrame">{{13, 191}, {488, 171}}</string>
<reference key="NSSuperview" ref="1006"/>
<reference key="NSWindow"/>
@@ -549,7 +613,7 @@
<string key="NSIdentifier">1</string>
<object class="NSView" key="NSView" id="379122707">
<reference key="NSNextResponder" ref="88114479"/>
- <int key="NSvFlags">256</int>
+ <int key="NSvFlags">274</int> <array class="NSMutableArray" key="NSSubviews">
<object class="NSScrollView" id="294266754">
<reference key="NSNextResponder" ref="379122707"/>
@@ -557,7 +621,7 @@
<array class="NSMutableArray" key="NSSubviews">
<object class="NSClipView" id="884512010">
<reference key="NSNextResponder" ref="294266754"/>
- <int key="NSvFlags">2304</int>
+ <int key="NSvFlags">2322</int> <array class="NSMutableArray" key="NSSubviews">
<object class="NSTextView" id="345743255">
<reference key="NSNextResponder" ref="884512010"/>
@@ -712,11 +776,63 @@
AAAA/wAAAP8AAAD/////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A
////AP///wD///8A////AP///wD///+rAAAA/wAAAP8AAAD/FBQU1AUFBXEAAAAG////AP///wTr6+tO
ZWVluC4uLuoAAAD/AAAA/wAAAP////8A////AP///wD///8A////AP///wD///8A////AP///wD///8A
-////AP///wD///8A////AP///wD///8AABABAAADAAAAAQAgAAABAQADAAAAAQAgAAABAgADAAAABAAA
-EM4BAwADAAAAAQABAAABBgADAAAAAQACAAABEQAEAAAAAQAAAAgBEgADAAAAAQABAAABFQADAAAAAQAE
-AAABFgADAAAAAQAgAAABFwAEAAAAAQAAEAABGgAFAAAAAQAAENYBGwAFAAAAAQAAEN4BHAADAAAAAQAB
-AAABKAADAAAAAQACAAABUgADAAAAAQACAAABUwADAAAABAAAEOYAAAAAAAgACAAIAAgSAAAAACAAABIA
-AAAAIAAAAAEAAQABAAE</bytes>
+////AP///wD///8A////AP///wD///8AABEBAAADAAAAAQAgAAABAQADAAAAAQAgAAABAgADAAAABAAA +EOoBAwADAAAAAQABAAABBgADAAAAAQACAAABEQAEAAAAAQAAAAgBEgADAAAAAQABAAABFQADAAAAAQAE +AAABFgADAAAAAQAgAAABFwAEAAAAAQAAEAABGgAFAAAAAQAAENoBGwAFAAAAAQAAEOIBHAADAAAAAQAB +AAABKAADAAAAAQACAAABUgADAAAAAQACAAABUwADAAAABAAAEPKHcwAHAAAMSAAAEPoAAAAAAAAAkAAA +AAEAAACQAAAAAQAIAAgACAAIAAEAAQABAAEAAAxITGlubwIQAABtbnRyUkdCIFhZWiAHzgACAAkABgAx +AABhY3NwTVNGVAAAAABJRUMgc1JHQgAAAAAAAAAAAAAAAAAA9tYAAQAAAADTLUhQICAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABFjcHJ0AAABUAAAADNkZXNjAAABhAAA +AGx3dHB0AAAB8AAAABRia3B0AAACBAAAABRyWFlaAAACGAAAABRnWFlaAAACLAAAABRiWFlaAAACQAAA +ABRkbW5kAAACVAAAAHBkbWRkAAACxAAAAIh2dWVkAAADTAAAAIZ2aWV3AAAD1AAAACRsdW1pAAAD+AAA +ABRtZWFzAAAEDAAAACR0ZWNoAAAEMAAAAAxyVFJDAAAEPAAACAxnVFJDAAAEPAAACAxiVFJDAAAEPAAA +CAx0ZXh0AAAAAENvcHlyaWdodCAoYykgMTk5OCBIZXdsZXR0LVBhY2thcmQgQ29tcGFueQAAZGVzYwAA +AAAAAAASc1JHQiBJRUM2MTk2Ni0yLjEAAAAAAAAAAAAAABJzUkdCIElFQzYxOTY2LTIuMQAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWFlaIAAAAAAAAPNRAAEAAAAB +FsxYWVogAAAAAAAAAAAAAAAAAAAAAFhZWiAAAAAAAABvogAAOPUAAAOQWFlaIAAAAAAAAGKZAAC3hQAA +GNpYWVogAAAAAAAAJKAAAA+EAAC2z2Rlc2MAAAAAAAAAFklFQyBodHRwOi8vd3d3LmllYy5jaAAAAAAA +AAAAAAAAFklFQyBodHRwOi8vd3d3LmllYy5jaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAABkZXNjAAAAAAAAAC5JRUMgNjE5NjYtMi4xIERlZmF1bHQgUkdCIGNvbG91ciBz +cGFjZSAtIHNSR0IAAAAAAAAAAAAAAC5JRUMgNjE5NjYtMi4xIERlZmF1bHQgUkdCIGNvbG91ciBzcGFj +ZSAtIHNSR0IAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZGVzYwAAAAAAAAAsUmVmZXJlbmNlIFZpZXdpbmcg +Q29uZGl0aW9uIGluIElFQzYxOTY2LTIuMQAAAAAAAAAAAAAALFJlZmVyZW5jZSBWaWV3aW5nIENvbmRp +dGlvbiBpbiBJRUM2MTk2Ni0yLjEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHZpZXcAAAAAABOk/gAU +Xy4AEM8UAAPtzAAEEwsAA1yeAAAAAVhZWiAAAAAAAEwJVgBQAAAAVx/nbWVhcwAAAAAAAAABAAAAAAAA +AAAAAAAAAAAAAAAAAo8AAAACc2lnIAAAAABDUlQgY3VydgAAAAAAAAQAAAAABQAKAA8AFAAZAB4AIwAo +AC0AMgA3ADsAQABFAEoATwBUAFkAXgBjAGgAbQByAHcAfACBAIYAiwCQAJUAmgCfAKQAqQCuALIAtwC8 +AMEAxgDLANAA1QDbAOAA5QDrAPAA9gD7AQEBBwENARMBGQEfASUBKwEyATgBPgFFAUwBUgFZAWABZwFu +AXUBfAGDAYsBkgGaAaEBqQGxAbkBwQHJAdEB2QHhAekB8gH6AgMCDAIUAh0CJgIvAjgCQQJLAlQCXQJn +AnECegKEAo4CmAKiAqwCtgLBAssC1QLgAusC9QMAAwsDFgMhAy0DOANDA08DWgNmA3IDfgOKA5YDogOu +A7oDxwPTA+AD7AP5BAYEEwQgBC0EOwRIBFUEYwRxBH4EjASaBKgEtgTEBNME4QTwBP4FDQUcBSsFOgVJ +BVgFZwV3BYYFlgWmBbUFxQXVBeUF9gYGBhYGJwY3BkgGWQZqBnsGjAadBq8GwAbRBuMG9QcHBxkHKwc9 +B08HYQd0B4YHmQesB78H0gflB/gICwgfCDIIRghaCG4IggiWCKoIvgjSCOcI+wkQCSUJOglPCWQJeQmP +CaQJugnPCeUJ+woRCicKPQpUCmoKgQqYCq4KxQrcCvMLCwsiCzkLUQtpC4ALmAuwC8gL4Qv5DBIMKgxD +DFwMdQyODKcMwAzZDPMNDQ0mDUANWg10DY4NqQ3DDd4N+A4TDi4OSQ5kDn8Omw62DtIO7g8JDyUPQQ9e +D3oPlg+zD88P7BAJECYQQxBhEH4QmxC5ENcQ9RETETERTxFtEYwRqhHJEegSBxImEkUSZBKEEqMSwxLj +EwMTIxNDE2MTgxOkE8UT5RQGFCcUSRRqFIsUrRTOFPAVEhU0FVYVeBWbFb0V4BYDFiYWSRZsFo8WshbW +FvoXHRdBF2UXiReuF9IX9xgbGEAYZRiKGK8Y1Rj6GSAZRRlrGZEZtxndGgQaKhpRGncanhrFGuwbFBs7 +G2MbihuyG9ocAhwqHFIcexyjHMwc9R0eHUcdcB2ZHcMd7B4WHkAeah6UHr4e6R8THz4faR+UH78f6iAV +IEEgbCCYIMQg8CEcIUghdSGhIc4h+yInIlUigiKvIt0jCiM4I2YjlCPCI/AkHyRNJHwkqyTaJQklOCVo +JZclxyX3JicmVyaHJrcm6CcYJ0kneierJ9woDSg/KHEooijUKQYpOClrKZ0p0CoCKjUqaCqbKs8rAis2 +K2krnSvRLAUsOSxuLKIs1y0MLUEtdi2rLeEuFi5MLoIuty7uLyQvWi+RL8cv/jA1MGwwpDDbMRIxSjGC +Mbox8jIqMmMymzLUMw0zRjN/M7gz8TQrNGU0njTYNRM1TTWHNcI1/TY3NnI2rjbpNyQ3YDecN9c4FDhQ +OIw4yDkFOUI5fzm8Ofk6Njp0OrI67zstO2s7qjvoPCc8ZTykPOM9Ij1hPaE94D4gPmA+oD7gPyE/YT+i +P+JAI0BkQKZA50EpQWpBrEHuQjBCckK1QvdDOkN9Q8BEA0RHRIpEzkUSRVVFmkXeRiJGZ0arRvBHNUd7 +R8BIBUhLSJFI10kdSWNJqUnwSjdKfUrESwxLU0uaS+JMKkxyTLpNAk1KTZNN3E4lTm5Ot08AT0lPk0/d +UCdQcVC7UQZRUFGbUeZSMVJ8UsdTE1NfU6pT9lRCVI9U21UoVXVVwlYPVlxWqVb3V0RXklfgWC9YfVjL +WRpZaVm4WgdaVlqmWvVbRVuVW+VcNVyGXNZdJ114XcleGl5sXr1fD19hX7NgBWBXYKpg/GFPYaJh9WJJ +Ypxi8GNDY5dj62RAZJRk6WU9ZZJl52Y9ZpJm6Gc9Z5Nn6Wg/aJZo7GlDaZpp8WpIap9q92tPa6dr/2xX +bK9tCG1gbbluEm5rbsRvHm94b9FwK3CGcOBxOnGVcfByS3KmcwFzXXO4dBR0cHTMdSh1hXXhdj52m3b4 +d1Z3s3gReG54zHkqeYl553pGeqV7BHtje8J8IXyBfOF9QX2hfgF+Yn7CfyN/hH/lgEeAqIEKgWuBzYIw +gpKC9INXg7qEHYSAhOOFR4Wrhg6GcobXhzuHn4gEiGmIzokziZmJ/opkisqLMIuWi/yMY4zKjTGNmI3/ +jmaOzo82j56QBpBukNaRP5GokhGSepLjk02TtpQglIqU9JVflcmWNJaflwqXdZfgmEyYuJkkmZCZ/Jpo +mtWbQpuvnByciZz3nWSd0p5Anq6fHZ+Ln/qgaaDYoUehtqImopajBqN2o+akVqTHpTilqaYapoum/adu +p+CoUqjEqTepqaocqo+rAqt1q+msXKzQrUStuK4trqGvFq+LsACwdbDqsWCx1rJLssKzOLOutCW0nLUT +tYq2AbZ5tvC3aLfguFm40blKucK6O7q1uy67p7whvJu9Fb2Pvgq+hL7/v3q/9cBwwOzBZ8Hjwl/C28NY +w9TEUcTOxUvFyMZGxsPHQce/yD3IvMk6ybnKOMq3yzbLtsw1zLXNNc21zjbOts83z7jQOdC60TzRvtI/ +0sHTRNPG1EnUy9VO1dHWVdbY11zX4Nhk2OjZbNnx2nba+9uA3AXcit0Q3ZbeHN6i3ynfr+A24L3hROHM +4lPi2+Nj4+vkc+T85YTmDeaW5x/nqegy6LzpRunQ6lvq5etw6/vshu0R7ZzuKO6070DvzPBY8OXxcvH/ +8ozzGfOn9DT0wvVQ9d72bfb794r4Gfio+Tj5x/pX+uf7d/wH/Jj9Kf26/kv+3P9t//8</bytes> @@ -845,25 +961,21 @@
<string key="NSIdentifier">2</string>
<object class="NSView" key="NSView" id="865951720">
<nil key="NSNextResponder"/>
- <int key="NSvFlags">256</int>
+ <int key="NSvFlags">274</int> <array class="NSMutableArray" key="NSSubviews">
<object class="NSButton" id="501581535">
<reference key="NSNextResponder" ref="865951720"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{11, 94}, {103, 32}}</string>
<reference key="NSSuperview" ref="865951720"/>
- <reference key="NSNextKeyView" ref="701206078"/>
+ <reference key="NSNextKeyView" ref="583587021"/> <string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="134945105">
<int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">134217728</int>
<string key="NSContents">Select File</string>
- <object class="NSFont" key="NSSupport" id="160923183">
- <string key="NSName">LucidaGrande</string>
- <double key="NSSize">13</double>
- <int key="NSfFlags">1044</int>
+ <reference key="NSSupport" ref="160923183"/> <string key="NSCellIdentifier">_NS:9</string>
<reference key="NSControlView" ref="501581535"/>
<int key="NSButtonFlags">-2038284288</int>
@@ -875,25 +987,66 @@
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- <object class="NSTextField" id="701206078">
+ <object class="NSPathControl" id="583587021"> <reference key="NSNextResponder" ref="865951720"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{113, 103}, {341, 17}}</string>
+ <set class="NSMutableSet" key="NSDragTypes"> + <string>Apple URL pasteboard type</string> + <string>NSFilenamesPboardType</string> + <string key="NSFrame">{{115, 101}, {337, 20}}</string> <reference key="NSSuperview" ref="865951720"/>
<reference key="NSNextKeyView" ref="20732819"/>
- <string key="NSReuseIdentifierKey">_NS:1535</string>
+ <string key="NSReuseIdentifierKey">_NS:9</string> <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="341410860">
- <int key="NSCellFlags">68157504</int>
- <int key="NSCellFlags2">272630784</int>
- <string key="NSContents">(Nothing selected)</string>
- <reference key="NSSupport" ref="160923183"/>
- <string key="NSCellIdentifier">_NS:1535</string>
- <reference key="NSControlView" ref="701206078"/>
- <reference key="NSBackgroundColor" ref="38660599"/>
- <reference key="NSTextColor" ref="297656176"/>
+ <object class="NSPathCell" key="NSCell" id="628626439"> + <int key="NSCellFlags">337641473</int> + <int key="NSCellFlags2">131072</int> + <object class="NSURL" key="NSContents"> + <string key="NS.relative">file://localhost/Applications/</string> + <reference key="NSSupport" ref="26"/> + <string key="NSCellIdentifier">_NS:9</string> + <reference key="NSControlView" ref="583587021"/> + <array class="NSMutableArray" key="NSPathComponentCells"> + <object class="NSPathComponentCell"> + <int key="NSCellFlags">67108928</int> + <int key="NSCellFlags2">132096</int> + <string key="NSContents">Leopard</string> + <reference key="NSSupport" ref="26"/> + <reference key="NSControlView" ref="583587021"/> + <object class="NSColor" key="NSBackgroundColor" id="203738141"> + <int key="NSColorSpace">6</int> + <string key="NSCatalogName">System</string> + <string key="NSColorName">textBackgroundColor</string> + <reference key="NSColor" ref="87608082"/> + <reference key="NSTextColor" ref="297656176"/> + <object class="NSURL" key="NSURL"> + <string key="NS.relative">file://localhost//</string> + <object class="NSPathComponentCell"> + <int key="NSCellFlags">67108928</int> + <int key="NSCellFlags2">132096</int> + <string key="NSContents">Applications</string> + <reference key="NSSupport" ref="26"/> + <reference key="NSControlView" ref="583587021"/> + <reference key="NSBackgroundColor" ref="203738141"/> + <reference key="NSTextColor" ref="297656176"/> + <object class="NSURL" key="NSURL"> + <string key="NS.relative">file://localhost/Applications</string> + <int key="NSPathStyle">1</int> + <reference key="NSDelegate" ref="583587021"/> <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+ <bool key="NSControlAllowsExpansionToolTips">YES</bool> <string key="NSFrame">{{10, 33}, {468, 125}}</string>
@@ -926,6 +1079,7 @@
<object class="IBObjectContainer" key="IBDocument.Objects">
+ <bool key="usesAutoincrementingIDs">NO</bool> <array class="NSMutableArray" key="connectionRecords">
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
@@ -933,7 +1087,7 @@
<reference key="source" ref="1001"/>
<reference key="destination" ref="924271898"/>
- <int key="connectionID">19</int>
+ <string key="id">19</string> <object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
@@ -941,7 +1095,7 @@
<reference key="source" ref="1001"/>
<reference key="destination" ref="508200382"/>
- <int key="connectionID">22</int>
+ <string key="id">22</string> <object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
@@ -949,15 +1103,7 @@
<reference key="source" ref="1001"/>
<reference key="destination" ref="179006788"/>
- <int key="connectionID">23</int>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">field_question</string>
- <reference key="source" ref="1001"/>
- <reference key="destination" ref="767676437"/>
- <int key="connectionID">40</int>
+ <string key="id">23</string> <object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
@@ -965,7 +1111,7 @@
<reference key="source" ref="1001"/>
<reference key="destination" ref="129577520"/>
- <int key="connectionID">42</int>
+ <string key="id">42</string> <object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
@@ -973,7 +1119,7 @@
<reference key="source" ref="1001"/>
<reference key="destination" ref="711843853"/>
- <int key="connectionID">45</int>
+ <string key="id">45</string> <object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
@@ -981,7 +1127,39 @@
<reference key="source" ref="1001"/>
<reference key="destination" ref="20732819"/>
- <int key="connectionID">48</int>
+ <string key="id">48</string> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">selectFile:</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="501581535"/> + <string key="id">64</string> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">tab_answer</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="88114479"/> + <string key="id">66</string> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">path_file</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="583587021"/> + <string key="id">hkP-Ct-utd</string> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">field_question</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="767676437"/> + <string key="id">40</string> <object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
@@ -989,69 +1167,37 @@
<reference key="source" ref="1001"/>
<reference key="destination" ref="345743255"/>
- <int key="connectionID">41</int>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">selectFile:</string>
- <reference key="source" ref="1001"/>
- <reference key="destination" ref="501581535"/>
- <int key="connectionID">64</int>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">tab_answer</string>
- <reference key="source" ref="1001"/>
- <reference key="destination" ref="88114479"/>
- <int key="connectionID">66</int>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">label_filename</string>
- <reference key="source" ref="1001"/>
- <reference key="destination" ref="701206078"/>
- <int key="connectionID">67</int>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">view_anchorToRightSide</string>
- <reference key="source" ref="501581535"/>
- <reference key="destination" ref="701206078"/>
- <int key="connectionID">65</int>
+ <string key="id">41</string> <object class="IBMutableOrderedSet" key="objectRecords">
<array key="orderedObjects">
<object class="IBObjectRecord">
- <int key="objectID">0</int>
+ <string key="id">0</string> <array key="object" id="0"/>
<reference key="children" ref="1000"/>
<object class="IBObjectRecord">
- <int key="objectID">-2</int>
+ <string key="id">-2</string> <reference key="object" ref="1001"/>
<reference key="parent" ref="0"/>
<string key="objectName">File's Owner</string>
<object class="IBObjectRecord">
- <int key="objectID">-1</int>
+ <string key="id">-1</string> <reference key="object" ref="1003"/>
<reference key="parent" ref="0"/>
<string key="objectName">First Responder</string>
<object class="IBObjectRecord">
- <int key="objectID">-3</int>
+ <string key="id">-3</string> <reference key="object" ref="1004"/>
<reference key="parent" ref="0"/>
<string key="objectName">Application</string>
<object class="IBObjectRecord">
- <int key="objectID">1</int>
+ <string key="id">1</string> <reference key="object" ref="1005"/>
<array class="NSMutableArray" key="children">
@@ -1059,7 +1205,7 @@
<reference key="parent" ref="0"/>
<object class="IBObjectRecord">
- <int key="objectID">2</int>
+ <string key="id">2</string> <reference key="object" ref="1006"/>
<array class="NSMutableArray" key="children">
<reference ref="924271898"/>
@@ -1074,7 +1220,7 @@
<reference key="parent" ref="1005"/>
<object class="IBObjectRecord">
- <int key="objectID">5</int>
+ <string key="id">5</string> <reference key="object" ref="924271898"/>
<array class="NSMutableArray" key="children">
<reference ref="651334025"/>
@@ -1082,12 +1228,12 @@
<reference key="parent" ref="1006"/>
<object class="IBObjectRecord">
- <int key="objectID">6</int>
+ <string key="id">6</string> <reference key="object" ref="651334025"/>
<reference key="parent" ref="924271898"/>
<object class="IBObjectRecord">
- <int key="objectID">9</int>
+ <string key="id">9</string> <reference key="object" ref="129577520"/>
<array class="NSMutableArray" key="children">
<reference ref="455467382"/>
@@ -1095,12 +1241,12 @@
<reference key="parent" ref="1006"/>
<object class="IBObjectRecord">
- <int key="objectID">10</int>
+ <string key="id">10</string> <reference key="object" ref="455467382"/>
<reference key="parent" ref="129577520"/>
<object class="IBObjectRecord">
- <int key="objectID">13</int>
+ <string key="id">13</string> <reference key="object" ref="179006788"/>
<array class="NSMutableArray" key="children">
<reference ref="562371928"/>
@@ -1108,12 +1254,12 @@
<reference key="parent" ref="1006"/>
<object class="IBObjectRecord">
- <int key="objectID">14</int>
+ <string key="id">14</string> <reference key="object" ref="562371928"/>
<reference key="parent" ref="179006788"/>
<object class="IBObjectRecord">
- <int key="objectID">17</int>
+ <string key="id">17</string> <reference key="object" ref="508200382"/>
<array class="NSMutableArray" key="children">
<reference ref="945599779"/>
@@ -1121,37 +1267,32 @@
<reference key="parent" ref="1006"/>
<object class="IBObjectRecord">
- <int key="objectID">18</int>
+ <string key="id">18</string> <reference key="object" ref="945599779"/>
<reference key="parent" ref="508200382"/>
<object class="IBObjectRecord">
- <int key="objectID">32</int>
+ <string key="id">32</string> <reference key="object" ref="205520375"/>
<array class="NSMutableArray" key="children">
- <reference ref="767676437"/>
<reference ref="143456741"/>
<reference ref="71692491"/>
+ <reference ref="767676437"/> <reference key="parent" ref="1006"/>
<object class="IBObjectRecord">
- <int key="objectID">33</int>
- <reference key="object" ref="767676437"/>
- <reference key="parent" ref="205520375"/>
- <object class="IBObjectRecord">
- <int key="objectID">34</int>
+ <string key="id">34</string> <reference key="object" ref="143456741"/>
<reference key="parent" ref="205520375"/>
<object class="IBObjectRecord">
- <int key="objectID">35</int>
+ <string key="id">35</string> <reference key="object" ref="71692491"/>
<reference key="parent" ref="205520375"/>
<object class="IBObjectRecord">
- <int key="objectID">43</int>
+ <string key="id">43</string> <reference key="object" ref="711843853"/>
<array class="NSMutableArray" key="children">
<reference ref="585043902"/>
@@ -1159,12 +1300,12 @@
<reference key="parent" ref="1006"/>
<object class="IBObjectRecord">
- <int key="objectID">44</int>
+ <string key="id">44</string> <reference key="object" ref="585043902"/>
<reference key="parent" ref="711843853"/>
<object class="IBObjectRecord">
- <int key="objectID">46</int>
+ <string key="id">46</string> <reference key="object" ref="20732819"/>
<array class="NSMutableArray" key="children">
<reference ref="601029529"/>
@@ -1172,12 +1313,12 @@
<reference key="parent" ref="1006"/>
<object class="IBObjectRecord">
- <int key="objectID">47</int>
+ <string key="id">47</string> <reference key="object" ref="601029529"/>
<reference key="parent" ref="20732819"/>
<object class="IBObjectRecord">
- <int key="objectID">53</int>
+ <string key="id">53</string> <reference key="object" ref="88114479"/>
<array class="NSMutableArray" key="children">
<reference ref="199853298"/>
@@ -1186,7 +1327,7 @@
<reference key="parent" ref="1006"/>
<object class="IBObjectRecord">
- <int key="objectID">54</int>
+ <string key="id">54</string> <reference key="object" ref="199853298"/>
<array class="NSMutableArray" key="children">
<reference ref="379122707"/>
@@ -1194,7 +1335,7 @@
<reference key="parent" ref="88114479"/>
<object class="IBObjectRecord">
- <int key="objectID">55</int>
+ <string key="id">55</string> <reference key="object" ref="116104966"/>
<array class="NSMutableArray" key="children">
<reference ref="865951720"/>
@@ -1202,16 +1343,16 @@
<reference key="parent" ref="88114479"/>
<object class="IBObjectRecord">
- <int key="objectID">56</int>
+ <string key="id">56</string> <reference key="object" ref="865951720"/>
<array class="NSMutableArray" key="children">
<reference ref="501581535"/>
- <reference ref="701206078"/>
+ <reference ref="583587021"/> <reference key="parent" ref="116104966"/>
<object class="IBObjectRecord">
- <int key="objectID">57</int>
+ <string key="id">57</string> <reference key="object" ref="379122707"/>
<array class="NSMutableArray" key="children">
<reference ref="294266754"/>
@@ -1219,32 +1360,27 @@
<reference key="parent" ref="199853298"/>
<object class="IBObjectRecord">
- <int key="objectID">36</int>
+ <string key="id">36</string> <reference key="object" ref="294266754"/>
<array class="NSMutableArray" key="children">
- <reference ref="345743255"/>
<reference ref="249950005"/>
<reference ref="735482434"/>
+ <reference ref="345743255"/> <reference key="parent" ref="379122707"/>
<object class="IBObjectRecord">
- <int key="objectID">39</int>
- <reference key="object" ref="345743255"/>
- <reference key="parent" ref="294266754"/>
- <object class="IBObjectRecord">
- <int key="objectID">38</int>
+ <string key="id">38</string> <reference key="object" ref="249950005"/>
<reference key="parent" ref="294266754"/>
<object class="IBObjectRecord">
- <int key="objectID">37</int>
+ <string key="id">37</string> <reference key="object" ref="735482434"/>
<reference key="parent" ref="294266754"/>
<object class="IBObjectRecord">
- <int key="objectID">60</int>
+ <string key="id">60</string> <reference key="object" ref="501581535"/>
<array class="NSMutableArray" key="children">
<reference ref="134945105"/>
@@ -1252,22 +1388,32 @@
<reference key="parent" ref="865951720"/>
<object class="IBObjectRecord">
- <int key="objectID">61</int>
+ <string key="id">61</string> <reference key="object" ref="134945105"/>
<reference key="parent" ref="501581535"/>
<object class="IBObjectRecord">
- <int key="objectID">62</int>
- <reference key="object" ref="701206078"/>
+ <string key="id">Coj-X8-YRb</string> + <reference key="object" ref="583587021"/> <array class="NSMutableArray" key="children">
- <reference ref="341410860"/>
+ <reference ref="628626439"/> <reference key="parent" ref="865951720"/>
<object class="IBObjectRecord">
- <int key="objectID">63</int>
- <reference key="object" ref="341410860"/>
- <reference key="parent" ref="701206078"/>
+ <string key="id">xKR-lg-nCB</string> + <reference key="object" ref="628626439"/> + <reference key="parent" ref="583587021"/> + <object class="IBObjectRecord"> + <string key="id">33</string> + <reference key="object" ref="767676437"/> + <reference key="parent" ref="205520375"/> + <object class="IBObjectRecord"> + <string key="id">39</string> + <reference key="object" ref="345743255"/> + <reference key="parent" ref="294266754"/> @@ -1310,15 +1456,14 @@
<string key="60.CustomClassName">AILocalizationButton</string>
<string key="60.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="61.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="62.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="63.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="9.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="Coj-X8-YRb.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="xKR-lg-nCB.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
- <int key="maxID">67</int>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -1381,9 +1526,9 @@
<string key="field_question">NSTextView</string>
<string key="imageView_lock">NSImageView</string>
<string key="label_answer">NSTextField</string>
- <string key="label_filename">NSTextField</string>
<string key="label_intro">NSTextField</string>
<string key="label_tips">NSTextField</string>
+ <string key="path_file">NSPathControl</string> <string key="tab_answer">NSTabView</string>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
@@ -1403,10 +1548,6 @@
<string key="name">label_answer</string>
<string key="candidateClassName">NSTextField</string>
- <object class="IBToOneOutletInfo" key="label_filename">
- <string key="name">label_filename</string>
- <string key="candidateClassName">NSTextField</string>
<object class="IBToOneOutletInfo" key="label_intro">
<string key="name">label_intro</string>
<string key="candidateClassName">NSTextField</string>
@@ -1415,6 +1556,10 @@
<string key="name">label_tips</string>
<string key="candidateClassName">NSTextField</string>
+ <object class="IBToOneOutletInfo" key="path_file"> + <string key="name">path_file</string> + <string key="candidateClassName">NSPathControl</string> <object class="IBToOneOutletInfo" key="tab_answer">
<string key="name">tab_answer</string>
<string key="candidateClassName">NSTabView</string>
@@ -1462,17 +1607,43 @@
<string key="minorKey">./Classes/NSObject.h</string>
+ <object class="IBPartialClassDescription"> + <string key="className">NSTextView</string> + <dictionary class="NSMutableDictionary" key="actions"> + <string key="orderFrontSharingServicePicker:">id</string> + <string key="toggleQuickLookPreviewPanel:">id</string> + <dictionary class="NSMutableDictionary" key="actionInfosByName"> + <object class="IBActionInfo" key="orderFrontSharingServicePicker:"> + <string key="name">orderFrontSharingServicePicker:</string> + <string key="candidateClassName">id</string> + <object class="IBActionInfo" key="toggleQuickLookPreviewPanel:"> + <string key="name">toggleQuickLookPreviewPanel:</string> + <string key="candidateClassName">id</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">./Classes/NSTextView.h</string> <int key="IBDocument.localizationMode">0</int>
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
+ <bool key="IBDocument.previouslyAttemptedUpgradeToXcode5">YES</bool> <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 class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults"> + <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string> + <real value="1060" key="NS.object.0"/> <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
- <real value="4000" key="NS.object.0"/>
+ <integer value="4600" key="NS.object.0"/> <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
--- a/Resources/AIOTRSMPSharedSecretWindowController.xib Fri Dec 06 00:02:36 2013 +0100
+++ b/Resources/AIOTRSMPSharedSecretWindowController.xib Fri Dec 06 00:15:27 2013 +0100
@@ -2,13 +2,13 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<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">13A603</string> + <string key="IBDocument.InterfaceBuilderVersion">4514</string> + <string key="IBDocument.AppKitVersion">1265</string> + <string key="IBDocument.HIToolboxVersion">695.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">4514</string> <array key="IBDocument.IntegratedClassDependencies">
<string>NSButton</string>
@@ -16,8 +16,12 @@
<string>NSCustomObject</string>
<string>NSImageCell</string>
<string>NSImageView</string>
+ <string>NSPathCell</string> + <string>NSPathControl</string> <string>NSScrollView</string>
<string>NSScroller</string>
+ <string>NSTabView</string> + <string>NSTabViewItem</string> <string>NSTextField</string>
<string>NSTextFieldCell</string>
<string>NSTextView</string>
@@ -44,7 +48,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 +61,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>
@@ -68,14 +72,14 @@
<int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">4325376</int>
<string key="NSContents">%@ asks you to confirm your identity by giving your shared secret:</string>
- <object class="NSFont" key="NSSupport">
- <string key="NSName">LucidaGrande</string>
+ <object class="NSFont" key="NSSupport" id="26"> + <string key="NSName">.LucidaGrandeUI</string> <double key="NSSize">11</double>
<int key="NSfFlags">3100</int>
<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 +88,7 @@
<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
- <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>
@@ -96,11 +100,13 @@
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<bool key="NSControlAutosetMaxLayoutWidth">YES</bool>
+ <double key="NSPreferredMaxLayoutWidth">402</double> + <int key="NSTextFieldAlignmentRectInsetsVersion">1</int> <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"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
@@ -109,16 +115,20 @@
<int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">134217728</int>
<string key="NSContents">OK</string>
- <object class="NSFont" key="NSSupport" id="238773064">
- <string key="NSName">LucidaGrande</string>
+ <object class="NSFont" key="NSSupport" id="554779983"> + <string key="NSName">.LucidaGrandeUI</string> <double key="NSSize">13</double>
- <int key="NSfFlags">16</int>
+ <int key="NSfFlags">1044</int> <string key="NSCellIdentifier">_NS:9</string>
<reference key="NSControlView" ref="1062727544"/>
<int key="NSButtonFlags">-2034876416</int>
<int key="NSButtonFlags2">1</int>
- <reference key="NSAlternateImage" ref="238773064"/>
+ <object class="NSFont" key="NSAlternateImage" id="238773064"> + <string key="NSName">LucidaGrande</string> + <double key="NSSize">13</double> + <int key="NSfFlags">16</int> <string key="NSAlternateContents"/>
<string type="base64-UTF8" key="NSKeyEquivalent">DQ</string>
<int key="NSPeriodicDelay">200</int>
@@ -129,7 +139,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"/>
@@ -139,7 +149,7 @@
<int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">134217728</int>
<string key="NSContents">Cancel</string>
- <reference key="NSSupport" ref="238773064"/>
+ <reference key="NSSupport" ref="554779983"/> <string key="NSCellIdentifier">_NS:9</string>
<reference key="NSControlView" ref="285143572"/>
<int key="NSButtonFlags">-2034876416</int>
@@ -152,119 +162,161 @@
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- <object class="NSScrollView" id="492411324">
+ <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> + <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> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> + <bool key="NSEditable">YES</bool> + <object class="NSTabView" id="603464824"> <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>
- <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"/>
- <nil key="NSDelegate"/>
- <array class="NSMutableArray" key="NSTextContainers">
- <reference ref="617577266"/>
- <int key="NSLMFlags">166</int>
- <nil key="NSDelegate"/>
- <reference key="NSTextView" ref="306073545"/>
- <double key="NSWidth">423</double>
- <int key="NSTCFlags">1</int>
- <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>
- <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 class="NSColor" key="NSColor">
- <int key="NSColorSpace">6</int>
- <string key="NSCatalogName">System</string>
- <string key="NSColorName">selectedTextColor</string>
- <reference key="NSColor" ref="655702848"/>
- <reference key="NSInsertionColor" ref="655702848"/>
- <dictionary key="NSLinkAttributes">
- <object class="NSColor" key="NSColor">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MCAwIDEAA</bytes>
- <object class="NSCursor" key="NSCursor">
- <string key="NSHotSpot">{8, -8}</string>
- <int key="NSCursorType">13</int>
- <integer value="1" key="NSUnderline"/>
- <nil key="NSDefaultParagraphStyle"/>
- <nil key="NSTextFinder"/>
- <int key="NSPreferredTextFinderStyle">1</int>
- <int key="NSTVFlags">6</int>
- <string key="NSMaxSize">{463, 10000000}</string>
- <nil key="NSDelegate"/>
- <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">
- <object class="NSBitmapImageRep">
- <object class="NSData" key="NSTIFFRepresentation">
- <bytes key="NS.bytes">TU0AKgAAEAj///8A////qwAAAP8AAAD/AwMD/BYWFtIFBQVuAAAABv///wD///8E6+vrTGhoaLYtLS3p
+ <int key="NSvFlags">268</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">274</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">2322</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> + <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"/> + <nil key="NSDelegate"/> + <array class="NSMutableArray" key="NSTextContainers"> + <reference ref="1004706284"/> + <int key="NSLMFlags">166</int> + <nil key="NSDelegate"/> + <reference key="NSTextView" ref="826488877"/> + <double key="NSWidth">417</double> + <int key="NSTCFlags">1</int> + <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> + <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 class="NSColor" key="NSColor"> + <int key="NSColorSpace">6</int> + <string key="NSCatalogName">System</string> + <string key="NSColorName">selectedTextColor</string> + <reference key="NSColor" ref="655702848"/> + <reference key="NSInsertionColor" ref="655702848"/> + <dictionary key="NSLinkAttributes"> + <object class="NSColor" key="NSColor"> + <int key="NSColorSpace">1</int> + <bytes key="NSRGB">MCAwIDEAA</bytes> + <object class="NSCursor" key="NSCursor"> + <string key="NSHotSpot">{8, -8}</string> + <int key="NSCursorType">13</int> + <integer value="1" key="NSUnderline"/> + <nil key="NSDefaultParagraphStyle"/> + <nil key="NSTextFinder"/> + <int key="NSPreferredTextFinderStyle">1</int> + <int key="NSTVFlags">6</int> + <string key="NSMaxSize">{468, 10000000}</string> + <nil key="NSDelegate"/> + <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"> + <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
@@ -332,19 +384,71 @@
AAAA/wAAAP8AAAD/////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A
////AP///wD///8A////AP///wD///+rAAAA/wAAAP8AAAD/FBQU1AUFBXEAAAAG////AP///wTr6+tO
ZWVluC4uLuoAAAD/AAAA/wAAAP////8A////AP///wD///8A////AP///wD///8A////AP///wD///8A
-////AP///wD///8A////AP///wD///8AABABAAADAAAAAQAgAAABAQADAAAAAQAgAAABAgADAAAABAAA
-EM4BAwADAAAAAQABAAABBgADAAAAAQACAAABEQAEAAAAAQAAAAgBEgADAAAAAQABAAABFQADAAAAAQAE
-AAABFgADAAAAAQAgAAABFwAEAAAAAQAAEAABGgAFAAAAAQAAENYBGwAFAAAAAQAAEN4BHAADAAAAAQAB
-AAABKAADAAAAAQACAAABUgADAAAAAQACAAABUwADAAAABAAAEOYAAAAAAAgACAAIAAgSAAAAACAAABIA
-AAAAIAAAAAEAAQABAAE</bytes>
- <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///8AABEBAAADAAAAAQAgAAABAQADAAAAAQAgAAABAgADAAAABAAA +EOoBAwADAAAAAQABAAABBgADAAAAAQACAAABEQAEAAAAAQAAAAgBEgADAAAAAQABAAABFQADAAAAAQAE +AAABFgADAAAAAQAgAAABFwAEAAAAAQAAEAABGgAFAAAAAQAAENoBGwAFAAAAAQAAEOIBHAADAAAAAQAB +AAABKAADAAAAAQACAAABUgADAAAAAQACAAABUwADAAAABAAAEPKHcwAHAAAMSAAAEPoAAAAAAAAAkAAA +AAEAAACQAAAAAQAIAAgACAAIAAEAAQABAAEAAAxITGlubwIQAABtbnRyUkdCIFhZWiAHzgACAAkABgAx +AABhY3NwTVNGVAAAAABJRUMgc1JHQgAAAAAAAAAAAAAAAAAA9tYAAQAAAADTLUhQICAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABFjcHJ0AAABUAAAADNkZXNjAAABhAAA +AGx3dHB0AAAB8AAAABRia3B0AAACBAAAABRyWFlaAAACGAAAABRnWFlaAAACLAAAABRiWFlaAAACQAAA +ABRkbW5kAAACVAAAAHBkbWRkAAACxAAAAIh2dWVkAAADTAAAAIZ2aWV3AAAD1AAAACRsdW1pAAAD+AAA +ABRtZWFzAAAEDAAAACR0ZWNoAAAEMAAAAAxyVFJDAAAEPAAACAxnVFJDAAAEPAAACAxiVFJDAAAEPAAA +CAx0ZXh0AAAAAENvcHlyaWdodCAoYykgMTk5OCBIZXdsZXR0LVBhY2thcmQgQ29tcGFueQAAZGVzYwAA +AAAAAAASc1JHQiBJRUM2MTk2Ni0yLjEAAAAAAAAAAAAAABJzUkdCIElFQzYxOTY2LTIuMQAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWFlaIAAAAAAAAPNRAAEAAAAB +FsxYWVogAAAAAAAAAAAAAAAAAAAAAFhZWiAAAAAAAABvogAAOPUAAAOQWFlaIAAAAAAAAGKZAAC3hQAA +GNpYWVogAAAAAAAAJKAAAA+EAAC2z2Rlc2MAAAAAAAAAFklFQyBodHRwOi8vd3d3LmllYy5jaAAAAAAA +AAAAAAAAFklFQyBodHRwOi8vd3d3LmllYy5jaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAABkZXNjAAAAAAAAAC5JRUMgNjE5NjYtMi4xIERlZmF1bHQgUkdCIGNvbG91ciBz +cGFjZSAtIHNSR0IAAAAAAAAAAAAAAC5JRUMgNjE5NjYtMi4xIERlZmF1bHQgUkdCIGNvbG91ciBzcGFj +ZSAtIHNSR0IAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZGVzYwAAAAAAAAAsUmVmZXJlbmNlIFZpZXdpbmcg +Q29uZGl0aW9uIGluIElFQzYxOTY2LTIuMQAAAAAAAAAAAAAALFJlZmVyZW5jZSBWaWV3aW5nIENvbmRp +dGlvbiBpbiBJRUM2MTk2Ni0yLjEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHZpZXcAAAAAABOk/gAU +Xy4AEM8UAAPtzAAEEwsAA1yeAAAAAVhZWiAAAAAAAEwJVgBQAAAAVx/nbWVhcwAAAAAAAAABAAAAAAAA +AAAAAAAAAAAAAAAAAo8AAAACc2lnIAAAAABDUlQgY3VydgAAAAAAAAQAAAAABQAKAA8AFAAZAB4AIwAo +AC0AMgA3ADsAQABFAEoATwBUAFkAXgBjAGgAbQByAHcAfACBAIYAiwCQAJUAmgCfAKQAqQCuALIAtwC8 +AMEAxgDLANAA1QDbAOAA5QDrAPAA9gD7AQEBBwENARMBGQEfASUBKwEyATgBPgFFAUwBUgFZAWABZwFu +AXUBfAGDAYsBkgGaAaEBqQGxAbkBwQHJAdEB2QHhAekB8gH6AgMCDAIUAh0CJgIvAjgCQQJLAlQCXQJn +AnECegKEAo4CmAKiAqwCtgLBAssC1QLgAusC9QMAAwsDFgMhAy0DOANDA08DWgNmA3IDfgOKA5YDogOu +A7oDxwPTA+AD7AP5BAYEEwQgBC0EOwRIBFUEYwRxBH4EjASaBKgEtgTEBNME4QTwBP4FDQUcBSsFOgVJ +BVgFZwV3BYYFlgWmBbUFxQXVBeUF9gYGBhYGJwY3BkgGWQZqBnsGjAadBq8GwAbRBuMG9QcHBxkHKwc9 +B08HYQd0B4YHmQesB78H0gflB/gICwgfCDIIRghaCG4IggiWCKoIvgjSCOcI+wkQCSUJOglPCWQJeQmP +CaQJugnPCeUJ+woRCicKPQpUCmoKgQqYCq4KxQrcCvMLCwsiCzkLUQtpC4ALmAuwC8gL4Qv5DBIMKgxD +DFwMdQyODKcMwAzZDPMNDQ0mDUANWg10DY4NqQ3DDd4N+A4TDi4OSQ5kDn8Omw62DtIO7g8JDyUPQQ9e +D3oPlg+zD88P7BAJECYQQxBhEH4QmxC5ENcQ9RETETERTxFtEYwRqhHJEegSBxImEkUSZBKEEqMSwxLj +EwMTIxNDE2MTgxOkE8UT5RQGFCcUSRRqFIsUrRTOFPAVEhU0FVYVeBWbFb0V4BYDFiYWSRZsFo8WshbW +FvoXHRdBF2UXiReuF9IX9xgbGEAYZRiKGK8Y1Rj6GSAZRRlrGZEZtxndGgQaKhpRGncanhrFGuwbFBs7 +G2MbihuyG9ocAhwqHFIcexyjHMwc9R0eHUcdcB2ZHcMd7B4WHkAeah6UHr4e6R8THz4faR+UH78f6iAV +IEEgbCCYIMQg8CEcIUghdSGhIc4h+yInIlUigiKvIt0jCiM4I2YjlCPCI/AkHyRNJHwkqyTaJQklOCVo +JZclxyX3JicmVyaHJrcm6CcYJ0kneierJ9woDSg/KHEooijUKQYpOClrKZ0p0CoCKjUqaCqbKs8rAis2 +K2krnSvRLAUsOSxuLKIs1y0MLUEtdi2rLeEuFi5MLoIuty7uLyQvWi+RL8cv/jA1MGwwpDDbMRIxSjGC +Mbox8jIqMmMymzLUMw0zRjN/M7gz8TQrNGU0njTYNRM1TTWHNcI1/TY3NnI2rjbpNyQ3YDecN9c4FDhQ +OIw4yDkFOUI5fzm8Ofk6Njp0OrI67zstO2s7qjvoPCc8ZTykPOM9Ij1hPaE94D4gPmA+oD7gPyE/YT+i +P+JAI0BkQKZA50EpQWpBrEHuQjBCckK1QvdDOkN9Q8BEA0RHRIpEzkUSRVVFmkXeRiJGZ0arRvBHNUd7 +R8BIBUhLSJFI10kdSWNJqUnwSjdKfUrESwxLU0uaS+JMKkxyTLpNAk1KTZNN3E4lTm5Ot08AT0lPk0/d +UCdQcVC7UQZRUFGbUeZSMVJ8UsdTE1NfU6pT9lRCVI9U21UoVXVVwlYPVlxWqVb3V0RXklfgWC9YfVjL +WRpZaVm4WgdaVlqmWvVbRVuVW+VcNVyGXNZdJ114XcleGl5sXr1fD19hX7NgBWBXYKpg/GFPYaJh9WJJ +Ypxi8GNDY5dj62RAZJRk6WU9ZZJl52Y9ZpJm6Gc9Z5Nn6Wg/aJZo7GlDaZpp8WpIap9q92tPa6dr/2xX +bK9tCG1gbbluEm5rbsRvHm94b9FwK3CGcOBxOnGVcfByS3KmcwFzXXO4dBR0cHTMdSh1hXXhdj52m3b4 +d1Z3s3gReG54zHkqeYl553pGeqV7BHtje8J8IXyBfOF9QX2hfgF+Yn7CfyN/hH/lgEeAqIEKgWuBzYIw +gpKC9INXg7qEHYSAhOOFR4Wrhg6GcobXhzuHn4gEiGmIzokziZmJ/opkisqLMIuWi/yMY4zKjTGNmI3/ +jmaOzo82j56QBpBukNaRP5GokhGSepLjk02TtpQglIqU9JVflcmWNJaflwqXdZfgmEyYuJkkmZCZ/Jpo +mtWbQpuvnByciZz3nWSd0p5Anq6fHZ+Ln/qgaaDYoUehtqImopajBqN2o+akVqTHpTilqaYapoum/adu +p+CoUqjEqTepqaocqo+rAqt1q+msXKzQrUStuK4trqGvFq+LsACwdbDqsWCx1rJLssKzOLOutCW0nLUT +tYq2AbZ5tvC3aLfguFm40blKucK6O7q1uy67p7whvJu9Fb2Pvgq+hL7/v3q/9cBwwOzBZ8Hjwl/C28NY +w9TEUcTOxUvFyMZGxsPHQce/yD3IvMk6ybnKOMq3yzbLtsw1zLXNNc21zjbOts83z7jQOdC60TzRvtI/ +0sHTRNPG1EnUy9VO1dHWVdbY11zX4Nhk2OjZbNnx2nba+9uA3AXcit0Q3ZbeHN6i3ynfr+A24L3hROHM +4lPi2+Nj4+vkc+T85YTmDeaW5x/nqegy6LzpRunQ6lvq5etw6/vshu0R7ZzuKO6070DvzPBY8OXxcvH/ +8ozzGfOn9DT0wvVQ9d72bfb794r4Gfio+Tj5x/pX+uf7d/wH/Jj9Kf26/kv+3P9t//8</bytes> + <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 +502,187 @@
Fs9YWVogAAAAAAAAdE0AAD3uAAAD0FhZWiAAAAAAAABadQAArHMAABc0WFlaIAAAAAAAACgaAAAVnwAA
uDZjdXJ2AAAAAAAAAAEBzQAAc2YzMgAAAAAAAQxCAAAF3v//8yYAAAeSAAD9kf//+6L///2jAAAD3AAA
+ <object class="NSColor" key="NSColor"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MCAwAA</bytes> + <int key="NScvFlags">4</int> + <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="603464824"/> + <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 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 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>
+ <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> - <int key="NScvFlags">4</int>
+ <string key="NSLabel">Text</string> + <reference key="NSColor" ref="307739745"/> + <reference key="NSTabView" ref="603464824"/> - <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 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">274</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="674159296"/> + <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> + <reference key="NSSupport" ref="554779983"/> + <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> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> + <object class="NSPathControl" id="674159296"> + <reference key="NSNextResponder" ref="383520333"/> + <int key="NSvFlags">268</int> + <set class="NSMutableSet" key="NSDragTypes"> + <string>Apple URL pasteboard type</string> + <string>NSFilenamesPboardType</string> + <string key="NSFrame">{{115, 101}, {337, 20}}</string> + <reference key="NSSuperview" ref="383520333"/> + <reference key="NSNextKeyView" ref="603464824"/> + <string key="NSReuseIdentifierKey">_NS:9</string> + <bool key="NSEnabled">YES</bool> + <object class="NSPathCell" key="NSCell" id="571494174"> + <int key="NSCellFlags">337641473</int> + <int key="NSCellFlags2">131072</int> + <object class="NSURL" key="NSContents"> + <string key="NS.relative">file://localhost/Applications/</string> + <reference key="NSSupport" ref="26"/> + <string key="NSCellIdentifier">_NS:9</string> + <reference key="NSControlView" ref="674159296"/> + <array class="NSMutableArray" key="NSPathComponentCells"> + <object class="NSPathComponentCell"> + <int key="NSCellFlags">67108928</int> + <int key="NSCellFlags2">132096</int> + <string key="NSContents">Leopard</string> + <reference key="NSSupport" ref="26"/> + <reference key="NSControlView" ref="674159296"/> + <object class="NSColor" key="NSBackgroundColor" id="1026920993"> + <int key="NSColorSpace">6</int> + <string key="NSCatalogName">System</string> + <string key="NSColorName">textBackgroundColor</string> + <reference key="NSColor" ref="887902950"/> + <reference key="NSTextColor" ref="702504956"/> + <object class="NSURL" key="NSURL"> + <string key="NS.relative">file://localhost//</string> + <object class="NSPathComponentCell"> + <int key="NSCellFlags">67108928</int> + <int key="NSCellFlags2">132096</int> + <string key="NSContents">Applications</string> + <reference key="NSSupport" ref="26"/> + <reference key="NSControlView" ref="674159296"/> + <reference key="NSBackgroundColor" ref="1026920993"/> + <reference key="NSTextColor" ref="702504956"/> + <object class="NSURL" key="NSURL"> + <string key="NS.relative">file://localhost/Applications</string> + <int key="NSPathStyle">1</int> + <reference key="NSDelegate" ref="674159296"/> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> + <bool key="NSControlAllowsExpansionToolTips">YES</bool> + <string key="NSFrame">{{10, 33}, {468, 125}}</string> + <reference key="NSNextKeyView" ref="708808105"/> + <string key="NSReuseIdentifierKey">_NS:28</string> + <string key="NSLabel">File</string> + <reference key="NSColor" ref="307739745"/> + <reference key="NSTabView" ref="603464824"/> - <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 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>
- <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>
- <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"/> - <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"/> <string key="NSScreenRect">{{0, 0}, {1920, 1058}}</string>
<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
@@ -491,6 +690,7 @@
<object class="IBObjectContainer" key="IBDocument.Objects">
+ <bool key="usesAutoincrementingIDs">NO</bool> <array class="NSMutableArray" key="connectionRecords">
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
@@ -498,7 +698,7 @@
<reference key="source" ref="1001"/>
<reference key="destination" ref="254829700"/>
- <int key="connectionID">19</int>
+ <string key="id">19</string> <object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
@@ -506,7 +706,7 @@
<reference key="source" ref="1001"/>
<reference key="destination" ref="285143572"/>
- <int key="connectionID">22</int>
+ <string key="id">22</string> <object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
@@ -514,15 +714,7 @@
<reference key="source" ref="1001"/>
<reference key="destination" ref="1062727544"/>
- <int key="connectionID">23</int>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">field_secret</string>
- <reference key="source" ref="1001"/>
- <reference key="destination" ref="306073545"/>
- <int key="connectionID">31</int>
+ <string key="id">23</string> <object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
@@ -530,7 +722,39 @@
<reference key="source" ref="1001"/>
<reference key="destination" ref="43843634"/>
- <int key="connectionID">34</int>
+ <string key="id">34</string> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">selectFile:</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="708808105"/> + <string key="id">50</string> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">tab_answer</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="603464824"/> + <string key="id">52</string> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">path_file</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="674159296"/> + <string key="id">nqe-cP-xPQ</string> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">field_secret</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="826488877"/> + <string key="id">49</string> <object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
@@ -538,7 +762,7 @@
<reference key="source" ref="254829700"/>
<reference key="destination" ref="1005"/>
- <int key="connectionID">25</int>
+ <string key="id">25</string> <object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
@@ -546,37 +770,37 @@
<reference key="source" ref="254829700"/>
<reference key="destination" ref="1005"/>
- <int key="connectionID">26</int>
+ <string key="id">26</string> <object class="IBMutableOrderedSet" key="objectRecords">
<array key="orderedObjects">
<object class="IBObjectRecord">
- <int key="objectID">0</int>
+ <string key="id">0</string> <array key="object" id="0"/>
<reference key="children" ref="1000"/>
<object class="IBObjectRecord">
- <int key="objectID">-2</int>
+ <string key="id">-2</string> <reference key="object" ref="1001"/>
<reference key="parent" ref="0"/>
<string key="objectName">File's Owner</string>
<object class="IBObjectRecord">
- <int key="objectID">-1</int>
+ <string key="id">-1</string> <reference key="object" ref="1003"/>
<reference key="parent" ref="0"/>
<string key="objectName">First Responder</string>
<object class="IBObjectRecord">
- <int key="objectID">-3</int>
+ <string key="id">-3</string> <reference key="object" ref="1004"/>
<reference key="parent" ref="0"/>
<string key="objectName">Application</string>
<object class="IBObjectRecord">
- <int key="objectID">1</int>
+ <string key="id">1</string> <reference key="object" ref="1005"/>
<array class="NSMutableArray" key="children">
@@ -584,19 +808,19 @@
<reference key="parent" ref="0"/>
<object class="IBObjectRecord">
- <int key="objectID">2</int>
+ <string key="id">2</string> <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"/>
<reference key="parent" ref="1005"/>
<object class="IBObjectRecord">
- <int key="objectID">5</int>
+ <string key="id">5</string> <reference key="object" ref="254829700"/>
<array class="NSMutableArray" key="children">
<reference ref="532627846"/>
@@ -604,12 +828,12 @@
<reference key="parent" ref="1006"/>
<object class="IBObjectRecord">
- <int key="objectID">6</int>
+ <string key="id">6</string> <reference key="object" ref="532627846"/>
<reference key="parent" ref="254829700"/>
<object class="IBObjectRecord">
- <int key="objectID">13</int>
+ <string key="id">13</string> <reference key="object" ref="1062727544"/>
<array class="NSMutableArray" key="children">
<reference ref="230177630"/>
@@ -617,12 +841,12 @@
<reference key="parent" ref="1006"/>
<object class="IBObjectRecord">
- <int key="objectID">14</int>
+ <string key="id">14</string> <reference key="object" ref="230177630"/>
<reference key="parent" ref="1062727544"/>
<object class="IBObjectRecord">
- <int key="objectID">17</int>
+ <string key="id">17</string> <reference key="object" ref="285143572"/>
<array class="NSMutableArray" key="children">
<reference ref="703654423"/>
@@ -630,37 +854,12 @@
<reference key="parent" ref="1006"/>
<object class="IBObjectRecord">
- <int key="objectID">18</int>
+ <string key="id">18</string> <reference key="object" ref="703654423"/>
<reference key="parent" ref="285143572"/>
<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"/>
- <reference key="parent" ref="1006"/>
- <object class="IBObjectRecord">
- <int key="objectID">28</int>
- <reference key="object" ref="306073545"/>
- <reference key="parent" ref="492411324"/>
- <object class="IBObjectRecord">
- <int key="objectID">29</int>
- <reference key="object" ref="1029680221"/>
- <reference key="parent" ref="492411324"/>
- <object class="IBObjectRecord">
- <int key="objectID">30</int>
- <reference key="object" ref="52319881"/>
- <reference key="parent" ref="492411324"/>
- <object class="IBObjectRecord">
- <int key="objectID">32</int>
+ <string key="id">32</string> <reference key="object" ref="43843634"/>
<array class="NSMutableArray" key="children">
<reference ref="838988047"/>
@@ -668,10 +867,103 @@
<reference key="parent" ref="1006"/>
<object class="IBObjectRecord">
- <int key="objectID">33</int>
+ <string key="id">33</string> <reference key="object" ref="838988047"/>
<reference key="parent" ref="43843634"/>
+ <object class="IBObjectRecord"> + <string key="id">35</string> + <reference key="object" ref="603464824"/> + <array class="NSMutableArray" key="children"> + <reference ref="899015210"/> + <reference ref="702959155"/> + <reference key="parent" ref="1006"/> + <object class="IBObjectRecord"> + <string key="id">36</string> + <reference key="object" ref="899015210"/> + <array class="NSMutableArray" key="children"> + <reference ref="383520333"/> + <reference key="parent" ref="603464824"/> + <object class="IBObjectRecord"> + <string key="id">37</string> + <reference key="object" ref="702959155"/> + <array class="NSMutableArray" key="children"> + <reference ref="572455261"/> + <reference key="parent" ref="603464824"/> + <object class="IBObjectRecord"> + <string key="id">38</string> + <reference key="object" ref="572455261"/> + <array class="NSMutableArray" key="children"> + <reference ref="207880426"/> + <reference key="parent" ref="702959155"/> + <object class="IBObjectRecord"> + <string key="id">39</string> + <reference key="object" ref="207880426"/> + <array class="NSMutableArray" key="children"> + <reference ref="425267556"/> + <reference ref="632616179"/> + <reference ref="826488877"/> + <reference key="parent" ref="572455261"/> + <object class="IBObjectRecord"> + <string key="id">40</string> + <reference key="object" ref="425267556"/> + <reference key="parent" ref="207880426"/> + <object class="IBObjectRecord"> + <string key="id">41</string> + <reference key="object" ref="632616179"/> + <reference key="parent" ref="207880426"/> + <object class="IBObjectRecord"> + <string key="id">43</string> + <reference key="object" ref="383520333"/> + <array class="NSMutableArray" key="children"> + <reference ref="708808105"/> + <reference ref="674159296"/> + <reference key="parent" ref="899015210"/> + <object class="IBObjectRecord"> + <string key="id">45</string> + <reference key="object" ref="708808105"/> + <array class="NSMutableArray" key="children"> + <reference ref="794358549"/> + <reference key="parent" ref="383520333"/> + <object class="IBObjectRecord"> + <string key="id">46</string> + <reference key="object" ref="794358549"/> + <reference key="parent" ref="708808105"/> + <object class="IBObjectRecord"> + <string key="id">r9b-We-wte</string> + <reference key="object" ref="674159296"/> + <array class="NSMutableArray" key="children"> + <reference ref="571494174"/> + <reference key="parent" ref="383520333"/> + <object class="IBObjectRecord"> + <string key="id">Fgp-Qh-V9g</string> + <reference key="object" ref="571494174"/> + <reference key="parent" ref="674159296"/> + <object class="IBObjectRecord"> + <string key="id">42</string> + <reference key="object" ref="826488877"/> + <reference key="parent" ref="207880426"/> <dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -690,20 +982,29 @@
<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="45.CustomClassName">AILocalizationButton</string> + <string key="45.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="46.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="Fgp-Qh-V9g.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="r9b-We-wte.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
- <int key="maxID">34</int>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -745,6 +1046,7 @@
<dictionary class="NSMutableDictionary" key="actions">
<string key="cancel:">id</string>
<string key="okay:">id</string>
+ <string key="selectFile:">id</string> <dictionary class="NSMutableDictionary" key="actionInfosByName">
<object class="IBActionInfo" key="cancel:">
@@ -755,11 +1057,17 @@
<string key="name">okay:</string>
<string key="candidateClassName">id</string>
+ <object class="IBActionInfo" key="selectFile:"> + <string key="name">selectFile:</string> + <string key="candidateClassName">id</string> <dictionary class="NSMutableDictionary" key="outlets">
<string key="field_secret">NSTextView</string>
<string key="imageView_lock">NSImageView</string>
<string key="label_intro">NSTextField</string>
+ <string key="path_file">NSPathControl</string> + <string key="tab_answer">NSTabView</string> <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
<object class="IBToOneOutletInfo" key="field_secret">
@@ -774,6 +1082,14 @@
<string key="name">label_intro</string>
<string key="candidateClassName">NSTextField</string>
+ <object class="IBToOneOutletInfo" key="path_file"> + <string key="name">path_file</string> + <string key="candidateClassName">NSPathControl</string> + <object class="IBToOneOutletInfo" key="tab_answer"> + <string key="name">tab_answer</string> + <string key="candidateClassName">NSTabView</string> <object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
@@ -781,6 +1097,25 @@
<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 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 class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">./Classes/AIWindowController.h</string> + <object class="IBPartialClassDescription"> <string key="className">NSObject</string>
<object class="NSMutableDictionary" key="actions">
<string key="NS.key.0">selectServiceType:</string>
@@ -802,13 +1137,18 @@
<int key="IBDocument.localizationMode">0</int>
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
+ <bool key="IBDocument.previouslyAttemptedUpgradeToXcode5">YES</bool> <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 class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults"> + <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string> + <real value="1060" key="NS.object.0"/> <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
- <real value="4000" key="NS.object.0"/>
+ <integer value="4600" key="NS.object.0"/> <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
--- a/Resources/OTRFingerprintDetailsWindow.xib Fri Dec 06 00:02:36 2013 +0100
+++ b/Resources/OTRFingerprintDetailsWindow.xib Fri Dec 06 00:15:27 2013 +0100
@@ -2,13 +2,13 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<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>
+ <string key="IBDocument.SystemVersion">13A603</string> + <string key="IBDocument.InterfaceBuilderVersion">4514</string> + <string key="IBDocument.AppKitVersion">1265</string> + <string key="IBDocument.HIToolboxVersion">695.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>
+ <string key="NS.object.0">4514</string> <array key="IBDocument.IntegratedClassDependencies">
<string>NSButton</string>
@@ -16,6 +16,10 @@
<string>NSCustomObject</string>
<string>NSImageCell</string>
<string>NSImageView</string>
+ <string>NSMenu</string> + <string>NSMenuItem</string> + <string>NSPopUpButton</string> + <string>NSPopUpButtonCell</string> <string>NSTextField</string>
<string>NSTextFieldCell</string>
@@ -41,7 +45,7 @@
<object class="NSWindowTemplate" id="893767417">
<int key="NSWindowStyleMask">3</int>
<int key="NSWindowBacking">2</int>
- <string key="NSWindowRect">{{436, 533}, {325, 161}}</string>
+ <string key="NSWindowRect">{{436, 533}, {325, 201}}</string> <int key="NSWTFlags">-1334312960</int>
<string key="NSWindowTitle"/>
<string key="NSWindowClass">NSPanel</string>
@@ -49,7 +53,8 @@
<characters key="NS.bytes">View</characters>
<nil key="NSUserInterfaceItemIdentifier"/>
- <string key="NSWindowContentMinSize">{213, 50}</string>
+ <string key="NSWindowContentMaxSize">{325, 201}</string> + <string key="NSWindowContentMinSize">{325, 201}</string> <object class="NSView" key="NSWindowView" id="646357908">
<reference key="NSNextResponder"/>
<int key="NSvFlags">256</int>
@@ -57,7 +62,7 @@
<object class="NSTextField" id="988425130">
<reference key="NSNextResponder" ref="646357908"/>
<int key="NSvFlags">258</int>
- <string key="NSFrame">{{17, 109}, {211, 32}}</string>
+ <string key="NSFrame">{{17, 149}, {211, 32}}</string> <reference key="NSSuperview" ref="646357908"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="139182757"/>
@@ -67,7 +72,7 @@
<int key="NSCellFlags2">4194304</int>
<string key="NSContents">System Font Text</string>
<object class="NSFont" key="NSSupport" id="1053190153">
- <string key="NSName">LucidaGrande</string>
+ <string key="NSName">.LucidaGrandeUI</string> <double key="NSSize">13</double>
<int key="NSfFlags">1044</int>
@@ -92,6 +97,27 @@
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+ <int key="NSTextFieldAlignmentRectInsetsVersion">1</int> + <object class="NSTextField" id="1056527301"> + <reference key="NSNextResponder" ref="646357908"/> + <int key="NSvFlags">294</int> + <string key="NSFrame">{{17, 64}, {100, 17}}</string> + <reference key="NSSuperview" ref="646357908"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="882416767"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="915668216"> + <int key="NSCellFlags">69206017</int> + <int key="NSCellFlags2">71303168</int> + <string key="NSContents">Trust:</string> + <reference key="NSSupport" ref="1053190153"/> + <reference key="NSControlView" ref="1056527301"/> + <reference key="NSBackgroundColor" ref="762139947"/> + <reference key="NSTextColor" ref="747999109"/> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> + <int key="NSTextFieldAlignmentRectInsetsVersion">1</int> <object class="NSImageView" id="139182757">
<reference key="NSNextResponder" ref="646357908"/>
@@ -104,7 +130,7 @@
<string>NeXT Encapsulated PostScript v1.2 pasteboard type</string>
<string>NeXT TIFF v4.0 pasteboard type</string>
- <string key="NSFrame">{{273, 109}, {32, 32}}</string>
+ <string key="NSFrame">{{273, 149}, {32, 32}}</string> <reference key="NSSuperview" ref="646357908"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="1017148254"/>
@@ -123,25 +149,26 @@
<object class="NSTextField" id="1017148254">
<reference key="NSNextResponder" ref="646357908"/>
<int key="NSvFlags">258</int>
- <string key="NSFrame">{{17, 50}, {291, 51}}</string>
+ <string key="NSFrame">{{17, 90}, {291, 51}}</string> <reference key="NSSuperview" ref="646357908"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="184521617"/>
+ <reference key="NSNextKeyView" ref="1056527301"/> <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>
+ <string key="NSName">.LucidaGrandeUI</string> <double key="NSSize">11</double>
- <int key="NSfFlags">16</int>
+ <int key="NSfFlags">3100</int> <reference key="NSControlView" ref="1017148254"/>
<reference key="NSBackgroundColor" ref="762139947"/>
<reference key="NSTextColor" ref="747999109"/>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+ <int key="NSTextFieldAlignmentRectInsetsVersion">1</int> <object class="NSButton" id="184521617">
<reference key="NSNextResponder" ref="646357908"/>
@@ -166,19 +193,108 @@
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+ <object class="NSButton" id="30442345"> + <reference key="NSNextResponder" ref="646357908"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{150, 13}, {82, 32}}</string> + <reference key="NSSuperview" ref="646357908"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="184521617"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="797271541"> + <int key="NSCellFlags">67108864</int> + <int key="NSCellFlags2">134217728</int> + <string key="NSContents">Cancel</string> + <reference key="NSSupport" ref="1053190153"/> + <reference key="NSControlView" ref="30442345"/> + <int key="NSButtonFlags">-2038284288</int> + <int key="NSButtonFlags2">1</int> + <reference key="NSAlternateImage" ref="1053190153"/> + <string key="NSAlternateContents"/> + <string type="base64-UTF8" key="NSKeyEquivalent">Gw</string> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> + <object class="NSPopUpButton" id="882416767"> + <reference key="NSNextResponder" ref="646357908"/> + <int key="NSvFlags">291</int> + <string key="NSFrame">{{121, 58}, {187, 26}}</string> + <reference key="NSSuperview" ref="646357908"/> + <reference key="NSWindow"/> + <reference key="NSNextKeyView" ref="30442345"/> + <string key="NSReuseIdentifierKey">_NS:9</string> + <bool key="NSEnabled">YES</bool> + <object class="NSPopUpButtonCell" key="NSCell" id="357086644"> + <int key="NSCellFlags">-2076180416</int> + <int key="NSCellFlags2">2048</int> + <reference key="NSSupport" ref="1053190153"/> + <string key="NSCellIdentifier">_NS:9</string> + <reference key="NSControlView" ref="882416767"/> + <int key="NSButtonFlags">109199360</int> + <int key="NSButtonFlags2">129</int> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">400</int> + <int key="NSPeriodicInterval">75</int> + <object class="NSMenuItem" key="NSMenuItem" id="631245806"> + <reference key="NSMenu" ref="735546377"/> + <string key="NSTitle">Unverified</string> + <string key="NSKeyEquiv"/> + <int key="NSMnemonicLoc">2147483647</int> + <int key="NSState">1</int> + <object class="NSCustomResource" key="NSOnImage" id="1018352838"> + <string key="NSClassName">NSImage</string> + <string key="NSResourceName">NSMenuCheckmark</string> + <object class="NSCustomResource" key="NSMixedImage" id="740565008"> + <string key="NSClassName">NSImage</string> + <string key="NSResourceName">NSMenuMixedState</string> + <string key="NSAction">_popUpItemAction:</string> + <reference key="NSTarget" ref="357086644"/> + <bool key="NSMenuItemRespectAlignment">YES</bool> + <object class="NSMenu" key="NSMenu" id="735546377"> + <string key="NSTitle">OtherViews</string> + <array class="NSMutableArray" key="NSMenuItems"> + <reference ref="631245806"/> + <object class="NSMenuItem" id="339151870"> + <reference key="NSMenu" ref="735546377"/> + <string key="NSTitle">Verified</string> + <string key="NSKeyEquiv"/> + <int key="NSKeyEquivModMask">1048576</int> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="1018352838"/> + <reference key="NSMixedImage" ref="740565008"/> + <string key="NSAction">_popUpItemAction:</string> + <reference key="NSTarget" ref="357086644"/> + <reference key="NSMenuFont" ref="1053190153"/> + <int key="NSPreferredEdge">1</int> + <bool key="NSUsesItemFromMenu">YES</bool> + <bool key="NSAltersState">YES</bool> + <int key="NSArrowPosition">2</int> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> - <string key="NSFrameSize">{325, 161}</string>
+ <string key="NSFrameSize">{325, 201}</string> <reference key="NSSuperview"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView"/>
+ <reference key="NSNextKeyView" ref="988425130"/> <string key="NSScreenRect">{{0, 0}, {1920, 1080}}</string>
- <string key="NSMinSize">{213, 72}</string>
- <string key="NSMaxSize">{10000000000000, 10000000000000}</string>
+ <string key="NSMinSize">{325, 223}</string> + <string key="NSMaxSize">{325, 223}</string> <bool key="NSWindowIsRestorable">YES</bool>
<object class="IBObjectContainer" key="IBDocument.Objects">
+ <bool key="usesAutoincrementingIDs">NO</bool> <array class="NSMutableArray" key="connectionRecords">
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
@@ -186,7 +302,7 @@
<reference key="source" ref="863983303"/>
<reference key="destination" ref="1017148254"/>
- <int key="connectionID">19</int>
+ <string key="id">19</string> <object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
@@ -194,7 +310,7 @@
<reference key="source" ref="863983303"/>
<reference key="destination" ref="139182757"/>
- <int key="connectionID">16</int>
+ <string key="id">16</string> <object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
@@ -202,7 +318,7 @@
<reference key="source" ref="863983303"/>
<reference key="destination" ref="988425130"/>
- <int key="connectionID">17</int>
+ <string key="id">17</string> <object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
@@ -210,7 +326,7 @@
<reference key="source" ref="863983303"/>
<reference key="destination" ref="893767417"/>
- <int key="connectionID">9</int>
+ <string key="id">9</string> <object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
@@ -218,15 +334,39 @@
<reference key="source" ref="863983303"/>
<reference key="destination" ref="184521617"/>
- <int key="connectionID">27</int>
+ <string key="id">27</string> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">cancel:</string> + <reference key="source" ref="863983303"/> + <reference key="destination" ref="30442345"/> + <string key="id">OWx-3E-e34</string> <object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
- <string key="label">closeWindow:</string>
+ <string key="label">okay:</string> <reference key="source" ref="863983303"/>
<reference key="destination" ref="184521617"/>
- <int key="connectionID">25</int>
+ <string key="id">Yes-ml-bQO</string> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">button_trust</string> + <reference key="source" ref="863983303"/> + <reference key="destination" ref="882416767"/> + <string key="id">trL-dA-wD2</string> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">button_cancel</string> + <reference key="source" ref="863983303"/> + <reference key="destination" ref="30442345"/> + <string key="id">ddQ-t5-OiL</string> <object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
@@ -234,7 +374,7 @@
<reference key="source" ref="893767417"/>
<reference key="destination" ref="184521617"/>
- <int key="connectionID">23</int>
+ <string key="id">23</string> <object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
@@ -242,7 +382,7 @@
<reference key="source" ref="893767417"/>
<reference key="destination" ref="863983303"/>
- <int key="connectionID">22</int>
+ <string key="id">22</string> <object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
@@ -250,37 +390,45 @@
<reference key="source" ref="184521617"/>
<reference key="destination" ref="893767417"/>
- <int key="connectionID">30</int>
+ <string key="id">30</string> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">window_anchorOnRightSide</string> + <reference key="source" ref="30442345"/> + <reference key="destination" ref="893767417"/> + <string key="id">Ysk-WZ-jT5</string> <object class="IBMutableOrderedSet" key="objectRecords">
<array key="orderedObjects">
<object class="IBObjectRecord">
- <int key="objectID">0</int>
+ <string key="id">0</string> <array key="object" id="0"/>
<reference key="children" ref="703582063"/>
<object class="IBObjectRecord">
- <int key="objectID">-2</int>
+ <string key="id">-2</string> <reference key="object" ref="863983303"/>
<reference key="parent" ref="0"/>
<string key="objectName">File's Owner</string>
<object class="IBObjectRecord">
- <int key="objectID">-1</int>
+ <string key="id">-1</string> <reference key="object" ref="855343907"/>
<reference key="parent" ref="0"/>
<string key="objectName">First Responder</string>
<object class="IBObjectRecord">
- <int key="objectID">-3</int>
+ <string key="id">-3</string> <reference key="object" ref="154124123"/>
<reference key="parent" ref="0"/>
<string key="objectName">Application</string>
<object class="IBObjectRecord">
- <int key="objectID">6</int>
+ <string key="id">6</string> <reference key="object" ref="893767417"/>
<array class="NSMutableArray" key="children">
<reference ref="646357908"/>
@@ -289,18 +437,21 @@
<string key="objectName">Key Generation</string>
<object class="IBObjectRecord">
- <int key="objectID">5</int>
+ <string key="id">5</string> <reference key="object" ref="646357908"/>
<array class="NSMutableArray" key="children">
<reference ref="988425130"/>
<reference ref="1017148254"/>
+ <reference ref="139182757"/> + <reference ref="1056527301"/> <reference ref="184521617"/>
- <reference ref="139182757"/>
+ <reference ref="882416767"/> + <reference ref="30442345"/> <reference key="parent" ref="893767417"/>
<object class="IBObjectRecord">
- <int key="objectID">12</int>
+ <string key="id">12</string> <reference key="object" ref="988425130"/>
<array class="NSMutableArray" key="children">
<reference ref="532814574"/>
@@ -308,7 +459,7 @@
<reference key="parent" ref="646357908"/>
<object class="IBObjectRecord">
- <int key="objectID">14</int>
+ <string key="id">14</string> <reference key="object" ref="139182757"/>
<array class="NSMutableArray" key="children">
<reference ref="244331114"/>
@@ -316,7 +467,7 @@
<reference key="parent" ref="646357908"/>
<object class="IBObjectRecord">
- <int key="objectID">18</int>
+ <string key="id">18</string> <reference key="object" ref="1017148254"/>
<array class="NSMutableArray" key="children">
<reference ref="300600489"/>
@@ -324,7 +475,7 @@
<reference key="parent" ref="646357908"/>
<object class="IBObjectRecord">
- <int key="objectID">20</int>
+ <string key="id">20</string> <reference key="object" ref="184521617"/>
<array class="NSMutableArray" key="children">
<reference ref="583519820"/>
@@ -332,25 +483,86 @@
<reference key="parent" ref="646357908"/>
<object class="IBObjectRecord">
- <int key="objectID">33</int>
+ <string key="id">33</string> <reference key="object" ref="532814574"/>
<reference key="parent" ref="988425130"/>
<object class="IBObjectRecord">
- <int key="objectID">35</int>
+ <string key="id">35</string> <reference key="object" ref="244331114"/>
<reference key="parent" ref="139182757"/>
<object class="IBObjectRecord">
- <int key="objectID">36</int>
+ <string key="id">36</string> <reference key="object" ref="300600489"/>
<reference key="parent" ref="1017148254"/>
<object class="IBObjectRecord">
- <int key="objectID">37</int>
+ <string key="id">37</string> <reference key="object" ref="583519820"/>
<reference key="parent" ref="184521617"/>
+ <object class="IBObjectRecord"> + <string key="id">Aa1-C1-Xfe</string> + <reference key="object" ref="882416767"/> + <array class="NSMutableArray" key="children"> + <reference ref="357086644"/> + <reference key="parent" ref="646357908"/> + <object class="IBObjectRecord"> + <string key="id">8KN-SR-TnG</string> + <reference key="object" ref="357086644"/> + <array class="NSMutableArray" key="children"> + <reference ref="735546377"/> + <reference key="parent" ref="882416767"/> + <object class="IBObjectRecord"> + <string key="id">cf2-H2-fSB</string> + <reference key="object" ref="735546377"/> + <array class="NSMutableArray" key="children"> + <reference ref="631245806"/> + <reference ref="339151870"/> + <reference key="parent" ref="357086644"/> + <object class="IBObjectRecord"> + <string key="id">BS3-Fh-4pv</string> + <reference key="object" ref="631245806"/> + <reference key="parent" ref="735546377"/> + <object class="IBObjectRecord"> + <string key="id">4H6-ag-qnh</string> + <reference key="object" ref="339151870"/> + <reference key="parent" ref="735546377"/> + <object class="IBObjectRecord"> + <string key="id">WDe-Ro-Lzy</string> + <reference key="object" ref="1056527301"/> + <array class="NSMutableArray" key="children"> + <reference ref="915668216"/> + <reference key="parent" ref="646357908"/> + <object class="IBObjectRecord"> + <string key="id">Rf1-C0-y1K</string> + <reference key="object" ref="915668216"/> + <reference key="parent" ref="1056527301"/> + <object class="IBObjectRecord"> + <string key="id">dXc-iq-UAp</string> + <reference key="object" ref="30442345"/> + <array class="NSMutableArray" key="children"> + <reference ref="797271541"/> + <reference key="parent" ref="646357908"/> + <object class="IBObjectRecord"> + <string key="id">t6F-T5-eas</string> + <reference key="object" ref="797271541"/> + <reference key="parent" ref="30442345"/> <dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -366,63 +578,29 @@
<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="4H6-ag-qnh.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="8KN-SR-TnG.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="Aa1-C1-Xfe.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="BS3-Fh-4pv.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="Rf1-C0-y1K.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="WDe-Ro-Lzy.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="cf2-H2-fSB.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="dXc-iq-UAp.CustomClassName">AILocalizationButton</string> + <string key="dXc-iq-UAp.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="t6F-T5-eas.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
- <int key="maxID">37</int>
<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 class="NSMutableDictionary" key="toOneOutletInfosByName">
- <object class="IBToOneOutletInfo" key="view_anchorToLeftSide">
- <string key="name">view_anchorToLeftSide</string>
- <string key="candidateClassName">NSView</string>
- <object class="IBToOneOutletInfo" key="view_anchorToRightSide">
- <string key="name">view_anchorToRightSide</string>
- <string key="candidateClassName">NSView</string>
- <object class="IBToOneOutletInfo" key="window_anchorOnLeftSide">
- <string key="name">window_anchorOnLeftSide</string>
- <string key="candidateClassName">NSWindow</string>
- <object class="IBToOneOutletInfo" key="window_anchorOnRightSide">
- <string key="name">window_anchorOnRightSide</string>
- <string key="candidateClassName">NSWindow</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">./Classes/AILocalizationButton.h</string>
- <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 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 class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/AIWindowController.h</string>
@@ -431,8 +609,24 @@
<object class="IBPartialClassDescription">
<string key="className">ESOTRFingerprintDetailsWindowController</string>
<string key="superclassName">AIWindowController</string>
+ <dictionary class="NSMutableDictionary" key="actions"> + <string key="cancel:">id</string> + <string key="okay:">id</string> + <dictionary class="NSMutableDictionary" key="actionInfosByName"> + <object class="IBActionInfo" key="cancel:"> + <string key="name">cancel:</string> + <string key="candidateClassName">id</string> + <object class="IBActionInfo" key="okay:"> + <string key="name">okay:</string> + <string key="candidateClassName">id</string> <dictionary class="NSMutableDictionary" key="outlets">
<string key="button_OK">NSButton</string>
+ <string key="button_cancel">NSButton</string> + <string key="button_trust">NSPopUpButton</string> <string key="imageView_lock">NSImageView</string>
<string key="imageView_service">NSImageView</string>
<string key="textField_UID">NSTextField</string>
@@ -443,6 +637,14 @@
<string key="name">button_OK</string>
<string key="candidateClassName">NSButton</string>
+ <object class="IBToOneOutletInfo" key="button_cancel"> + <string key="name">button_cancel</string> + <string key="candidateClassName">NSButton</string> + <object class="IBToOneOutletInfo" key="button_trust"> + <string key="name">button_trust</string> + <string key="candidateClassName">NSPopUpButton</string> <object class="IBToOneOutletInfo" key="imageView_lock">
<string key="name">imageView_lock</string>
<string key="candidateClassName">NSImageView</string>
@@ -465,37 +667,28 @@
<string key="minorKey">./Classes/ESOTRFingerprintDetailsWindowController.h</string>
- <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 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 class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">./Classes/NSObject.h</string>
<int key="IBDocument.localizationMode">0</int>
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
+ <bool key="IBDocument.previouslyAttemptedUpgradeToXcode5">YES</bool> <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 class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults"> + <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string> + <real value="1060" key="NS.object.0"/> <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
- <real value="3200" key="NS.object.0"/>
+ <integer value="4600" key="NS.object.0"/> <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
+ <dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes"> + <string key="NSMenuCheckmark">{11, 11}</string> + <string key="NSMenuMixedState">{10, 3}</string> --- a/Resources/Preferences-Encryption.xib Fri Dec 06 00:02:36 2013 +0100
+++ b/Resources/Preferences-Encryption.xib Fri Dec 06 00:15:27 2013 +0100
@@ -2,13 +2,13 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<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>
+ <string key="IBDocument.SystemVersion">13A603</string> + <string key="IBDocument.InterfaceBuilderVersion">4514</string> + <string key="IBDocument.AppKitVersion">1265</string> + <string key="IBDocument.HIToolboxVersion">695.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>
+ <string key="NS.object.0">4514</string> <array key="IBDocument.IntegratedClassDependencies">
<string>NSButton</string>
@@ -64,7 +64,7 @@
<int key="NSCellFlags2">272630848</int>
<string key="NSContents"/>
<object class="NSFont" key="NSSupport" id="970377140">
- <string key="NSName">LucidaGrande</string>
+ <string key="NSName">.LucidaGrandeUI</string> <double key="NSSize">13</double>
<int key="NSfFlags">1044</int>
@@ -125,6 +125,7 @@
<int key="NSMaximumRecents">255</int>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+ <int key="NSTextFieldAlignmentRectInsetsVersion">1</int> <object class="NSTextField" id="944557168">
<reference key="NSNextResponder" ref="261192207"/>
@@ -152,6 +153,7 @@
<reference key="NSTextColor" ref="1001647384"/>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+ <int key="NSTextFieldAlignmentRectInsetsVersion">1</int> <object class="NSTextField" id="246614867">
<reference key="NSNextResponder" ref="261192207"/>
@@ -171,6 +173,7 @@
<reference key="NSTextColor" ref="1001647384"/>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+ <int key="NSTextFieldAlignmentRectInsetsVersion">1</int> <object class="NSPopUpButton" id="365143233">
<reference key="NSNextResponder" ref="261192207"/>
@@ -245,7 +248,7 @@
<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>
+ <string key="NSName">.LucidaGrandeUI</string> <double key="NSSize">11</double>
<int key="NSfFlags">3100</int>
@@ -254,6 +257,7 @@
<reference key="NSTextColor" ref="1001647384"/>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+ <int key="NSTextFieldAlignmentRectInsetsVersion">1</int> <object class="NSButton" id="346757463">
<reference key="NSNextResponder" ref="261192207"/>
@@ -287,7 +291,7 @@
<array class="NSMutableArray" key="NSSubviews">
<object class="NSClipView" id="445790025">
<reference key="NSNextResponder" ref="476167500"/>
- <int key="NSvFlags">2304</int>
+ <int key="NSvFlags">2322</int> <array class="NSMutableArray" key="NSSubviews">
<object class="NSTableView" id="712016614">
<reference key="NSNextResponder" ref="445790025"/>
@@ -295,7 +299,7 @@
<string key="NSFrameSize">{403, 133}</string>
<reference key="NSSuperview" ref="445790025"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="293354221"/>
+ <reference key="NSNextKeyView" ref="705249390"/> <bool key="NSEnabled">YES</bool>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<bool key="NSControlAllowsExpansionToolTips">YES</bool>
@@ -441,7 +445,7 @@
<object class="NSClipView" id="146545853">
<reference key="NSNextResponder" ref="476167500"/>
- <int key="NSvFlags">2304</int>
+ <int key="NSvFlags">2338</int> <array class="NSMutableArray" key="NSSubviews">
<reference ref="44990423"/>
@@ -458,7 +462,7 @@
<string key="NSFrame">{{172, 55}, {405, 151}}</string>
<reference key="NSSuperview" ref="261192207"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="705249390"/>
+ <reference key="NSNextKeyView" ref="445790025"/> <int key="NSsFlags">133682</int>
<reference key="NSVScroller" ref="849894620"/>
<reference key="NSHScroller" ref="293354221"/>
@@ -476,7 +480,6 @@
<string key="NSFrame">{{503, 13}, {80, 32}}</string>
<reference key="NSSuperview" ref="261192207"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="893620119">
<int key="NSCellFlags">67108864</int>
@@ -534,6 +537,7 @@
<object class="IBObjectContainer" key="IBDocument.Objects">
+ <bool key="usesAutoincrementingIDs">NO</bool> <array class="NSMutableArray" key="connectionRecords">
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
@@ -541,7 +545,7 @@
<reference key="source" ref="245285604"/>
<reference key="destination" ref="261192207"/>
- <int key="connectionID">37</int>
+ <string key="id">37</string> <object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
@@ -549,15 +553,7 @@
<reference key="source" ref="245285604"/>
<reference key="destination" ref="41604946"/>
- <int key="connectionID">38</int>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">tableView_fingerprints</string>
- <reference key="source" ref="245285604"/>
- <reference key="destination" ref="712016614"/>
- <int key="connectionID">39</int>
+ <string key="id">38</string> <object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
@@ -565,7 +561,7 @@
<reference key="source" ref="245285604"/>
<reference key="destination" ref="152864849"/>
- <int key="connectionID">40</int>
+ <string key="id">40</string> <object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
@@ -573,7 +569,7 @@
<reference key="source" ref="245285604"/>
<reference key="destination" ref="365143233"/>
- <int key="connectionID">41</int>
+ <string key="id">41</string> <object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
@@ -581,7 +577,7 @@
<reference key="source" ref="245285604"/>
<reference key="destination" ref="41604946"/>
- <int key="connectionID">45</int>
+ <string key="id">45</string> <object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
@@ -589,7 +585,7 @@
<reference key="source" ref="245285604"/>
<reference key="destination" ref="346757463"/>
- <int key="connectionID">47</int>
+ <string key="id">47</string> <object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
@@ -597,7 +593,7 @@
<reference key="source" ref="245285604"/>
<reference key="destination" ref="346757463"/>
- <int key="connectionID">48</int>
+ <string key="id">48</string> <object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
@@ -605,7 +601,7 @@
<reference key="source" ref="245285604"/>
<reference key="destination" ref="953884195"/>
- <int key="connectionID">65</int>
+ <string key="id">65</string> <object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
@@ -613,7 +609,7 @@
<reference key="source" ref="245285604"/>
<reference key="destination" ref="953884195"/>
- <int key="connectionID">66</int>
+ <string key="id">66</string> <object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
@@ -621,7 +617,7 @@
<reference key="source" ref="245285604"/>
<reference key="destination" ref="944557168"/>
- <int key="connectionID">72</int>
+ <string key="id">72</string> <object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
@@ -629,7 +625,7 @@
<reference key="source" ref="245285604"/>
<reference key="destination" ref="246614867"/>
- <int key="connectionID">73</int>
+ <string key="id">73</string> <object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
@@ -637,7 +633,7 @@
<reference key="source" ref="245285604"/>
<reference key="destination" ref="590488253"/>
- <int key="connectionID">77</int>
+ <string key="id">77</string> <object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
@@ -645,7 +641,15 @@
<reference key="source" ref="245285604"/>
<reference key="destination" ref="590488253"/>
- <int key="connectionID">78</int>
+ <string key="id">78</string> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">tableView_fingerprints</string> + <reference key="source" ref="245285604"/> + <reference key="destination" ref="712016614"/> + <string key="id">39</string> <object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
@@ -653,37 +657,37 @@
<reference key="source" ref="346757463"/>
<reference key="destination" ref="365143233"/>
- <int key="connectionID">74</int>
+ <string key="id">74</string> <object class="IBMutableOrderedSet" key="objectRecords">
<array key="orderedObjects">
<object class="IBObjectRecord">
- <int key="objectID">0</int>
+ <string key="id">0</string> <array key="object" id="0"/>
<reference key="children" ref="475209783"/>
<object class="IBObjectRecord">
- <int key="objectID">-2</int>
+ <string key="id">-2</string> <reference key="object" ref="245285604"/>
<reference key="parent" ref="0"/>
<string key="objectName">File's Owner</string>
<object class="IBObjectRecord">
- <int key="objectID">-1</int>
+ <string key="id">-1</string> <reference key="object" ref="793451751"/>
<reference key="parent" ref="0"/>
<string key="objectName">First Responder</string>
<object class="IBObjectRecord">
- <int key="objectID">-3</int>
+ <string key="id">-3</string> <reference key="object" ref="600731802"/>
<reference key="parent" ref="0"/>
<string key="objectName">Application</string>
<object class="IBObjectRecord">
- <int key="objectID">5</int>
+ <string key="id">5</string> <reference key="object" ref="261192207"/>
<array class="NSMutableArray" key="children">
<reference ref="365143233"/>
@@ -700,7 +704,7 @@
<string key="objectName">View</string>
<object class="IBObjectRecord">
- <int key="objectID">18</int>
+ <string key="id">18</string> <reference key="object" ref="365143233"/>
<array class="NSMutableArray" key="children">
<reference ref="495829525"/>
@@ -708,7 +712,7 @@
<reference key="parent" ref="261192207"/>
<object class="IBObjectRecord">
- <int key="objectID">25</int>
+ <string key="id">25</string> <reference key="object" ref="152864849"/>
<array class="NSMutableArray" key="children">
<reference ref="587033203"/>
@@ -716,18 +720,137 @@
<reference key="parent" ref="261192207"/>
<object class="IBObjectRecord">
- <int key="objectID">26</int>
+ <string key="id">26</string> <reference key="object" ref="476167500"/>
<array class="NSMutableArray" key="children">
- <reference ref="712016614"/>
<reference ref="849894620"/>
<reference ref="293354221"/>
<reference ref="44990423"/>
+ <reference ref="712016614"/> + <reference key="parent" ref="261192207"/> + <object class="IBObjectRecord"> + <string key="id">35</string> + <reference key="object" ref="41604946"/> + <array class="NSMutableArray" key="children"> + <reference ref="830856661"/> + <reference key="parent" ref="261192207"/> + <object class="IBObjectRecord"> + <string key="id">46</string> + <reference key="object" ref="346757463"/> + <array class="NSMutableArray" key="children"> + <reference ref="9745553"/> <reference key="parent" ref="261192207"/>
<object class="IBObjectRecord">
- <int key="objectID">27</int>
+ <string key="id">51</string> + <reference key="object" ref="495829525"/> + <array class="NSMutableArray" key="children"> + <reference ref="433605837"/> + <reference key="parent" ref="365143233"/> + <object class="IBObjectRecord"> + <string key="id">53</string> + <reference key="object" ref="587033203"/> + <reference key="parent" ref="152864849"/> + <object class="IBObjectRecord"> + <string key="id">55</string> + <reference key="object" ref="830856661"/> + <reference key="parent" ref="41604946"/> + <object class="IBObjectRecord"> + <string key="id">56</string> + <reference key="object" ref="9745553"/> + <reference key="parent" ref="346757463"/> + <object class="IBObjectRecord"> + <string key="id">19</string> + <reference key="object" ref="433605837"/> + <array class="NSMutableArray" key="children"> + <reference ref="355447198"/> + <reference key="parent" ref="495829525"/> + <object class="IBObjectRecord"> + <string key="id">22</string> + <reference key="object" ref="355447198"/> + <reference key="parent" ref="433605837"/> + <object class="IBObjectRecord"> + <string key="id">59</string> + <reference key="object" ref="849894620"/> + <reference key="parent" ref="476167500"/> + <object class="IBObjectRecord"> + <string key="id">60</string> + <reference key="object" ref="293354221"/> + <reference key="parent" ref="476167500"/> + <object class="IBObjectRecord"> + <string key="id">61</string> + <reference key="object" ref="44990423"/> + <reference key="parent" ref="476167500"/> + <object class="IBObjectRecord"> + <string key="id">62</string> + <reference key="object" ref="953884195"/> + <array class="NSMutableArray" key="children"> + <reference ref="893620119"/> + <reference key="parent" ref="261192207"/> + <object class="IBObjectRecord"> + <string key="id">63</string> + <reference key="object" ref="893620119"/> + <reference key="parent" ref="953884195"/> + <object class="IBObjectRecord"> + <string key="id">67</string> + <reference key="object" ref="246614867"/> + <array class="NSMutableArray" key="children"> + <reference ref="523338"/> + <reference key="parent" ref="261192207"/> + <object class="IBObjectRecord"> + <string key="id">68</string> + <reference key="object" ref="523338"/> + <reference key="parent" ref="246614867"/> + <object class="IBObjectRecord"> + <string key="id">69</string> + <reference key="object" ref="944557168"/> + <array class="NSMutableArray" key="children"> + <reference ref="718859564"/> + <reference key="parent" ref="261192207"/> + <object class="IBObjectRecord"> + <string key="id">70</string> + <reference key="object" ref="718859564"/> + <reference key="parent" ref="944557168"/> + <object class="IBObjectRecord"> + <string key="id">75</string> + <reference key="object" ref="590488253"/> + <array class="NSMutableArray" key="children"> + <reference ref="119300789"/> + <reference key="parent" ref="261192207"/> + <object class="IBObjectRecord"> + <string key="id">76</string> + <reference key="object" ref="119300789"/> + <reference key="parent" ref="590488253"/> + <object class="IBObjectRecord"> + <string key="id">27</string> <reference key="object" ref="712016614"/>
<array class="NSMutableArray" key="children">
<reference ref="493648427"/>
@@ -736,7 +859,7 @@
<reference key="parent" ref="476167500"/>
<object class="IBObjectRecord">
- <int key="objectID">28</int>
+ <string key="id">28</string> <reference key="object" ref="493648427"/>
<array class="NSMutableArray" key="children">
<reference ref="733576058"/>
@@ -744,7 +867,7 @@
<reference key="parent" ref="712016614"/>
<object class="IBObjectRecord">
- <int key="objectID">29</int>
+ <string key="id">29</string> <reference key="object" ref="439814957"/>
<array class="NSMutableArray" key="children">
<reference ref="131921218"/>
@@ -752,133 +875,14 @@
<reference key="parent" ref="712016614"/>
<object class="IBObjectRecord">
- <int key="objectID">35</int>
- <reference key="object" ref="41604946"/>
- <array class="NSMutableArray" key="children">
- <reference ref="830856661"/>
- <reference key="parent" ref="261192207"/>
- <object class="IBObjectRecord">
- <int key="objectID">46</int>
- <reference key="object" ref="346757463"/>
- <array class="NSMutableArray" key="children">
- <reference ref="9745553"/>
- <reference key="parent" ref="261192207"/>
- <object class="IBObjectRecord">
- <int key="objectID">51</int>
- <reference key="object" ref="495829525"/>
- <array class="NSMutableArray" key="children">
- <reference ref="433605837"/>
- <reference key="parent" ref="365143233"/>
- <object class="IBObjectRecord">
- <int key="objectID">53</int>
- <reference key="object" ref="587033203"/>
- <reference key="parent" ref="152864849"/>
- <object class="IBObjectRecord">
- <int key="objectID">55</int>
- <reference key="object" ref="830856661"/>
- <reference key="parent" ref="41604946"/>
- <object class="IBObjectRecord">
- <int key="objectID">56</int>
- <reference key="object" ref="9745553"/>
- <reference key="parent" ref="346757463"/>
- <object class="IBObjectRecord">
- <int key="objectID">57</int>
- <reference key="object" ref="733576058"/>
- <reference key="parent" ref="493648427"/>
- <object class="IBObjectRecord">
- <int key="objectID">58</int>
+ <string key="id">58</string> <reference key="object" ref="131921218"/>
<reference key="parent" ref="439814957"/>
<object class="IBObjectRecord">
- <int key="objectID">19</int>
- <reference key="object" ref="433605837"/>
- <array class="NSMutableArray" key="children">
- <reference ref="355447198"/>
- <reference key="parent" ref="495829525"/>
- <object class="IBObjectRecord">
- <int key="objectID">22</int>
- <reference key="object" ref="355447198"/>
- <reference key="parent" ref="433605837"/>
- <object class="IBObjectRecord">
- <int key="objectID">59</int>
- <reference key="object" ref="849894620"/>
- <reference key="parent" ref="476167500"/>
- <object class="IBObjectRecord">
- <int key="objectID">60</int>
- <reference key="object" ref="293354221"/>
- <reference key="parent" ref="476167500"/>
- <object class="IBObjectRecord">
- <int key="objectID">61</int>
- <reference key="object" ref="44990423"/>
- <reference key="parent" ref="476167500"/>
- <object class="IBObjectRecord">
- <int key="objectID">62</int>
- <reference key="object" ref="953884195"/>
- <array class="NSMutableArray" key="children">
- <reference ref="893620119"/>
- <reference key="parent" ref="261192207"/>
- <object class="IBObjectRecord">
- <int key="objectID">63</int>
- <reference key="object" ref="893620119"/>
- <reference key="parent" ref="953884195"/>
- <object class="IBObjectRecord">
- <int key="objectID">67</int>
- <reference key="object" ref="246614867"/>
- <array class="NSMutableArray" key="children">
- <reference ref="523338"/>
- <reference key="parent" ref="261192207"/>
- <object class="IBObjectRecord">
- <int key="objectID">68</int>
- <reference key="object" ref="523338"/>
- <reference key="parent" ref="246614867"/>
- <object class="IBObjectRecord">
- <int key="objectID">69</int>
- <reference key="object" ref="944557168"/>
- <array class="NSMutableArray" key="children">
- <reference ref="718859564"/>
- <reference key="parent" ref="261192207"/>
- <object class="IBObjectRecord">
- <int key="objectID">70</int>
- <reference key="object" ref="718859564"/>
- <reference key="parent" ref="944557168"/>
- <object class="IBObjectRecord">
- <int key="objectID">75</int>
- <reference key="object" ref="590488253"/>
- <array class="NSMutableArray" key="children">
- <reference ref="119300789"/>
- <reference key="parent" ref="261192207"/>
- <object class="IBObjectRecord">
- <int key="objectID">76</int>
- <reference key="object" ref="119300789"/>
- <reference key="parent" ref="590488253"/>
+ <string key="id">57</string> + <reference key="object" ref="733576058"/> + <reference key="parent" ref="493648427"/> @@ -927,7 +931,6 @@
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
- <int key="maxID">79</int>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -1104,13 +1107,18 @@
<int key="IBDocument.localizationMode">0</int>
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
+ <bool key="IBDocument.previouslyAttemptedUpgradeToXcode5">YES</bool> <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 class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults"> + <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string> + <real value="1060" key="NS.object.0"/> <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
- <real value="3200" key="NS.object.0"/>
+ <integer value="4600" key="NS.object.0"/> <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
--- a/Source/AdiumOTREncryption.m Fri Dec 06 00:02:36 2013 +0100
+++ b/Source/AdiumOTREncryption.m Fri Dec 06 00:15:27 2013 +0100
@@ -37,7 +37,7 @@
#import "AIOTRSMPSecretAnswerWindowController.h"
#import "AIOTRSMPSharedSecretWindowController.h"
-#import "AIOTRTopBarLoggingWarningController.h"
+#import "AIOTRTopBarUnverifiedContactController.h" #import "AIMessageViewController.h"
@@ -67,23 +67,23 @@
- (void)adiumFinishedLaunching:(NSNotification *)inNotification;
- (void)adiumWillTerminate:(NSNotification *)inNotification;
- (void)updateSecurityDetails:(NSNotification *)inNotification;
-- (void)verifyUnknownFingerprint:(NSValue *)contextValue;
@implementation AdiumOTREncryption
/* We'll only use the one OtrlUserState. */
-static OtrlUserState otrg_plugin_userstate = NULL;
+static OtrlUserState otrg_plugin_userstate = NULL; static AdiumOTREncryption *adiumOTREncryption = nil;
+static OtrlMessageAppOps ui_ops; -void otrg_ui_update_fingerprint(void);
-void update_security_details_for_context(ConnContext *context);
void send_default_query_to_chat(AIChat *inChat);
void disconnect_from_chat(AIChat *inChat);
void disconnect_from_context(ConnContext *context);
static OtrlMessageAppOps ui_ops;
TrustLevel otrg_plugin_context_to_trust(ConnContext *context);
+#pragma mark Singleton management @@ -95,18 +95,12 @@
if ((self = [super init])) {
adiumOTREncryption = self;
//Wait for Adium to finish launching to prepare encryption so that accounts will be loaded
[[NSNotificationCenter defaultCenter] addObserver:self
- selector:@selector(adiumFinishedLaunching:)
- name:AIApplicationDidFinishLoadingNotification
- gaim_signal_connect(conn_handle, "signed-on", otrg_plugin_handle,
- GAIM_CALLBACK(process_connection_change), NULL);
- gaim_signal_connect(conn_handle, "signed-off", otrg_plugin_handle,
- GAIM_CALLBACK(process_connection_change), NULL);
+ selector:@selector(adiumFinishedLaunching:) + name:AIApplicationDidFinishLoadingNotification @@ -154,22 +148,22 @@
[[NSNotificationCenter defaultCenter] addObserver:self
- selector:@selector(adiumWillTerminate:)
- name:AIAppWillTerminateNotification
+ selector:@selector(adiumWillTerminate:) + name:AIAppWillTerminateNotification [[NSNotificationCenter defaultCenter] addObserver:self
- selector:@selector(updateSecurityDetails:)
- name:Chat_SourceChanged
+ selector:@selector(updateSecurityDetails:) + name:Chat_SourceChanged [[NSNotificationCenter defaultCenter] addObserver:self
- selector:@selector(updateSecurityDetails:)
- name:Chat_DestinationChanged
+ selector:@selector(updateSecurityDetails:) + name:Chat_DestinationChanged [[NSNotificationCenter defaultCenter] addObserver:self
- selector:@selector(updateSecurityDetails:)
+ selector:@selector(updateSecurityDetails:) //Add the Encryption preferences
OTRPrefs = [(ESOTRPreferences *)[ESOTRPreferences preferencePane] retain];
@@ -184,7 +178,7 @@
+#pragma mark Lookup functions between OTR contexts and accounts/chats * @brief Return an NSDictionary* describing a ConnContext.
@@ -199,13 +193,14 @@
* @"who" : The UID of the remote user *
-static NSDictionary* details_for_context(ConnContext *context)
+details_for_context(ConnContext *context) if (!context) return nil;
+ if (context->recent_child) context = context->recent_child; - NSDictionary *securityDetailsDict;
- if (context->recent_child) context = context->recent_child;
- Fingerprint *fprint = context->active_fingerprint;
+ NSDictionary *securityDetailsDict; + Fingerprint *fprint = context->active_fingerprint; if (!fprint || !(fprint->fingerprint)) return nil;
@@ -214,7 +209,6 @@
encryptionStatus = EncryptionStatus_None;
@@ -229,7 +223,7 @@
- char our_hash[45], their_hash[45];
+ char our_hash[OTRL_PRIVKEY_FPRINT_HUMAN_LEN], their_hash[OTRL_PRIVKEY_FPRINT_HUMAN_LEN]; otrl_privkey_fingerprint(otrg_get_userstate(), our_hash,
context->accountname, context->protocol);
@@ -237,14 +231,21 @@
otrl_privkey_hash_to_human(their_hash, fprint->fingerprint);
unsigned char *sessionid;
- char sess1[21], sess2[21];
BOOL sess1_outgoing = (context->sessionid_half == OTRL_SESSIONID_FIRST_HALF_BOLD);
size_t idhalflen = (context->sessionid_len) / 2;
+ NSMutableString *sess1, *sess2; + sess1 = [[[NSMutableString alloc] initWithCapacity:21] autorelease]; + sess2 = [[[NSMutableString alloc] initWithCapacity:21] autorelease]; /* Make a human-readable version of the sessionid (in two parts) */
sessionid = context->sessionid;
- for(NSUInteger i = 0; i < idhalflen; ++i) sprintf(sess1+(2*i), "%02x", sessionid[i]);
- for(NSUInteger i = 0; i < idhalflen; ++i) sprintf(sess2+(2*i), "%02x", sessionid[i+idhalflen]);
+ for (i = 0; i < idhalflen; i++){ + [sess1 appendFormat:@"%02x", sessionid[i]]; + [sess2 appendFormat:@"%02x", sessionid[i+idhalflen]]; account = [adium.accountController accountWithInternalObjectID:[NSString stringWithUTF8String:context->accountname]];
@@ -253,40 +254,47 @@
@"EncryptionStatus": @(encryptionStatus),
@"who": [NSString stringWithUTF8String:context->username],
- (sess1_outgoing ? @"Outgoing SessionID" : @"Incoming SessionID"): [NSString stringWithUTF8String:sess1],
- (sess1_outgoing ? @"Incoming SessionID" : @"Outgoing SessionID"): [NSString stringWithUTF8String:sess2] };
+ (sess1_outgoing ? @"Outgoing SessionID" : @"Incoming SessionID"): sess1, + (sess1_outgoing ? @"Incoming SessionID" : @"Outgoing SessionID"): sess2 }; - AILog(@"Security details: %@",securityDetailsDict);
+ AILog(@"Security details: %@", securityDetailsDict); return securityDetailsDict;
-static AIAccount* accountFromAccountID(const char *accountID)
+accountFromAccountID(const char *accountID) return [adium.accountController accountWithInternalObjectID:[NSString stringWithUTF8String:accountID]];
-static AIService* serviceFromServiceID(const char *serviceID)
+serviceFromServiceID(const char *serviceID) return [adium.accountController serviceWithUniqueID:[NSString stringWithUTF8String:serviceID]];
-static AIListContact* contactFromInfo(const char *accountID, const char *serviceID, const char *username)
+contactFromInfo(const char *accountID, const char *serviceID, const char *username) return [adium.contactController contactWithService:serviceFromServiceID(serviceID)
- account:accountFromAccountID(accountID)
- UID:[NSString stringWithUTF8String:username]];
+ account:accountFromAccountID(accountID) + UID:[NSString stringWithUTF8String:username]]; -static AIListContact* contactForContext(ConnContext *context)
+contactForContext(ConnContext *context) return contactFromInfo(context->accountname, context->protocol, context->username);
-static AIChat* chatForContext(ConnContext *context)
+chatForContext(ConnContext *context) AIListContact *listContact = contactForContext(context);
AIChat *chat = [adium.chatController existingChatWithContact:listContact];
chat = [adium.chatController chatWithContact:listContact];
@@ -295,11 +303,12 @@
-static OtrlPolicy policyForContact(AIListContact *contact)
+policyForContact(AIListContact *contact) - OtrlPolicy policy = OTRL_POLICY_MANUAL_AND_RESPOND_TO_WHITESPACE;
+ OtrlPolicy policy = OTRL_POLICY_MANUAL_AND_RESPOND_TO_WHITESPACE; + AIEncryptedChatPreference pref = contact.encryptedChatPreferences; - AIEncryptedChatPreference pref = contact.encryptedChatPreferences;
case EncryptedChat_Never:
policy = OTRL_POLICY_NEVER;
@@ -321,12 +330,13 @@
//Return the ConnContext for a Conversation, or NULL if none exists
-static ConnContext* contextForChat(AIChat *chat)
+contextForChat(AIChat *chat) - const char *username, *accountname, *proto;
+ const char *username, *accountname, *proto; /* Do nothing if this isn't an IM conversation */
if (chat.isGroupChat) return NULL;
@@ -346,7 +356,8 @@
/* What level of trust do we have in the privacy of this ConnContext? */
-TrustLevel otrg_plugin_context_to_trust(ConnContext *context)
+otrg_plugin_context_to_trust(ConnContext *context) TrustLevel level = TRUST_NOT_PRIVATE;
@@ -364,10 +375,11 @@
+#pragma mark Implementations of the app ops /* Return the OTR policy for the given context. */
-static OtrlPolicy policy_cb(void *opdata, ConnContext *context)
+policy_cb(void *opdata, ConnContext *context) NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
@@ -378,9 +390,9 @@
-/* Generate a private key for the given accountname/protocol */
-void otrg_plugin_create_privkey(const char *accountname,
+/* Asynchronously generate a private key for the given accountname/protocol */ +otrg_plugin_create_privkey(const char *accountname, const char *protocol) static BOOL alreadyGenerating = FALSE;
static dispatch_queue_t keyGenerationQueue = NULL;
@@ -419,8 +431,8 @@
/* Create a private key for the given accountname/protocol if
-static void create_privkey_cb(void *opdata, const char *accountname,
+create_privkey_cb(void *opdata, const char *accountname, const char *protocol) NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
otrg_plugin_create_privkey(accountname, protocol);
@@ -433,8 +445,8 @@
* If you return 1, messages such as heartbeats or other
* notifications may be sent to the user, which could result in "not
* logged in" errors if you're wrong. */
-static int is_logged_in_cb(void *opdata, const char *accountname,
- const char *protocol, const char *recipient)
+is_logged_in_cb(void *opdata, const char *accountname, const char *protocol, const char *recipient) NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
@@ -452,18 +464,19 @@
/* Send the given IM to the given recipient from the given
* accountname/protocol. */
-static void inject_message_cb(void *opdata, const char *accountname,
- const char *protocol, const char *recipient, const char *message)
+inject_message_cb(void *opdata, const char *accountname, const char *protocol, const char *recipient, const char *message) NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
[adium.contentController sendRawMessage:[NSString stringWithUTF8String:message]
- toContact:contactFromInfo(accountname, protocol, recipient)];
+ toContact:contactFromInfo(accountname, protocol, recipient)]; /* When the list of ConnContexts changes (including a change in
* state), this is called so the UI can be updated. */
-static void update_context_list_cb(void *opdata)
+update_context_list_cb(void *opdata) NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
@@ -474,7 +487,8 @@
/* Return a newly allocated string containing a human-friendly
* representation for the given account */
-static const char *account_display_name_cb(void *opdata, const char *accountname, const char *protocol)
+account_display_name_cb(void *opdata, const char *accountname, const char *protocol) NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
@@ -486,7 +500,8 @@
/* Deallocate a string returned by account_name */
-static void account_display_name_free_cb(void *opdata, const char *account_display_name)
+account_display_name_free_cb(void *opdata, const char *account_display_name) if (account_display_name)
free((char *)account_display_name);
@@ -494,11 +509,10 @@
/* A new fingerprint for the given user has been received. */
-static void new_fingerprint_cb(void *opdata, OtrlUserState us,
- const char *accountname, const char *protocol, const char *username,
- unsigned char fingerprint[20])
+new_fingerprint_cb(void *opdata, OtrlUserState us, const char *accountname, const char *protocol, const char *username, unsigned char fingerprint[20]) - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+ NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; context = otrl_context_find(us, username, accountname,
@@ -509,20 +523,19 @@
- [adiumOTREncryption performSelector:@selector(verifyUnknownFingerprint:)
- withObject:[NSValue valueWithPointer:context]
/* The list of known fingerprints has changed. Write them to disk. */
-static void write_fingerprints_cb(void *opdata)
+write_fingerprints_cb(void *opdata) otrg_plugin_write_fingerprints();
-/* A ConnContext has entered a secure state. */
-static void gone_secure_cb(void *opdata, ConnContext *context)
+/* A ConnContext has entered a secure state. Refresh the chat and the fingerprint list. */ +gone_secure_cb(void *opdata, ConnContext *context) NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
@@ -533,7 +546,8 @@
/* A ConnContext has left a secure state. */
-static void gone_insecure_cb(void *opdata, ConnContext *context)
+gone_insecure_cb(void *opdata, ConnContext *context) NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
@@ -545,12 +559,12 @@
/* We have completed an authentication, using the D-H keys we
* already knew. is_reply indicates whether we initiated the AKE. */
-static void still_secure_cb(void *opdata, ConnContext *context, int is_reply)
+still_secure_cb(void *opdata, ConnContext *context, int is_reply) NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
- // otrg_dialog_stillconnected(context);
AILog(@"Still secure...");
@@ -569,7 +583,8 @@
* of a particular message. The latter is useful, for example, for
* protocols like XMPP (Jabber) that do not require fragmentation at all.
-int max_message_size_cb(void *opdata, ConnContext *context)
+max_message_size_cb(void *opdata, ConnContext *context) NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
@@ -577,15 +592,14 @@
/* Values from https://otr.cypherpunks.ca/UPGRADING-libotr-3.1.0.txt */
static NSDictionary *maxSizeByServiceClassDict = nil;
- if (!maxSizeByServiceClassDict) {
- maxSizeByServiceClassDict = [[NSDictionary alloc] initWithObjectsAndKeys:
- [NSNumber numberWithInteger:2343], @"AIM-compatible",
- [NSNumber numberWithInteger:1409], @"MSN",
- [NSNumber numberWithInteger:832], @"Yahoo!",
- [NSNumber numberWithInteger:1999], @"Gadu-Gadu",
- [NSNumber numberWithInteger:417], @"IRC",
+ static dispatch_once_t onceToken; + dispatch_once(&onceToken, ^{ + maxSizeByServiceClassDict = [@{ @"AIM-compatible": @(2343), + @"IRC" : @(417) } retain]; /* This will return 0 if we don't know (unknown protocol) or don't need it (Jabber),
* which will disable fragmentation.
@@ -597,7 +611,9 @@
-static const char *error_message_cb(void *opdata, ConnContext *context, OtrlErrorCode err_code)
+/* Create a string describing an error message event. */ +error_message_cb(void *opdata, ConnContext *context, OtrlErrorCode err_code) NSString *errorMessage = nil;
@@ -607,11 +623,13 @@
case OTRL_ERRCODE_MSG_NOT_IN_PRIVATE:
errorMessage = AILocalizedStringFromTableInBundle(@"Sent encrypted message to somebody who is not in a mutual OTR session", nil, [NSBundle bundleForClass:[AdiumOTREncryption class]], nil);
case OTRL_ERRCODE_MSG_UNREADABLE:
errorMessage = AILocalizedStringFromTableInBundle(@"Sent an unreadable encrypted message", nil, [NSBundle bundleForClass:[AdiumOTREncryption class]], nil);
case OTRL_ERRCODE_MSG_MALFORMED:
errorMessage = AILocalizedStringFromTableInBundle(@"Message sent is malformed", nil, [NSBundle bundleForClass:[AdiumOTREncryption class]], nil);
@@ -621,29 +639,43 @@
-static void error_message_free_cb(void *opdata, const char *err_msg)
+/* Free a string allocated by error_message_cb. */ +error_message_free_cb(void *opdata, const char *err_msg)
+ if (err_msg) free((char *)err_msg); -static const char *resent_msg_prefix_cb(void *opdata, ConnContext *context)
+/* Translate "[resent]" to the sender's own localization. */ +resent_msg_prefix_cb(void *opdata, ConnContext *context) const char *prefix_str = strdup([AILocalizedStringFromTableInBundle(@"[resent]", @"Prefix used by OTR for resent messages", [NSBundle bundleForClass:[AdiumOTREncryption class]], nil) UTF8String]);
-static void resent_msg_prefix_free_cb(void *opdata, const char *prefix)
+/* Free the string allocated by resent_msg_prefix_cb. */ +resent_msg_prefix_free_cb(void *opdata, const char *prefix)
+ if (prefix) free((char *)prefix); -static void timer_control_cb(void *opdata, unsigned int interval) {
+/* Create a timer for libotr to clean up. The timer doesn't need to be + * exact, so we give it a 1 sec leeway. */ +timer_control_cb(void *opdata, unsigned int interval) { static dispatch_source_t timer = NULL;
- if (!timer && interval > 0) {
- timer = dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER, 0, 0, dispatch_get_main_queue());
- dispatch_source_set_timer(timer, dispatch_time(DISPATCH_TIME_NOW, interval * NSEC_PER_SEC), interval * NSEC_PER_SEC, NSEC_PER_MSEC);
+ dispatch_source_cancel(timer); + dispatch_release(timer); + dispatch_source_set_timer(timer, dispatch_time(DISPATCH_TIME_NOW, interval * NSEC_PER_SEC), interval * NSEC_PER_SEC, NSEC_PER_SEC); dispatch_source_set_event_handler(timer, ^{
otrl_message_poll(otrg_plugin_userstate, &ui_ops, opdata);
@@ -651,19 +683,12 @@
- if (timer && interval == 0) {
- dispatch_source_cancel(timer);
- dispatch_release(timer);
-handle_msg_event_cb(void *opdata, OtrlMessageEvent msg_event,
- ConnContext *context, const char *message,
+handle_msg_event_cb(void *opdata, OtrlMessageEvent msg_event, ConnContext *context, const char *message, gcry_error_t err) - AILogWithSignature(@"Something happened in this conversation: %s", message);
+ AILogWithSignature(@"Something happened in this conversation: %d %s", msg_event, message); AIListContact *listContact = contactForContext(context);
AIChat *chat = chatForContext(context);
@@ -676,16 +701,17 @@
- message:[AIHTMLDecoder decodeHTML:[AILocalizedStringFromTableInBundle(@"The following message was <b>not encrypted</b>: ", @"libotr error message", [NSBundle bundleForClass:[AdiumOTREncryption class]], nil) stringByAppendingString:[NSString stringWithUTF8String:message]]]
+ message:[AIHTMLDecoder decodeHTML:[AILocalizedStringFromTableInBundle(@"The following message was <b>not encrypted</b>: ", + @"libotr error message", + [NSBundle bundleForClass:[AdiumOTREncryption class]], nil) + stringByAppendingString:[NSString stringWithUTF8String:message]]] [adium.contentController receiveContentObject:messageObject];
case OTRL_MSGEVENT_RCVDMSG_FOR_OTHER_INSTANCE:
AILogWithSignature(@"Received an OTR message for a different instance. We will silently ignore it: %s", message);
case OTRL_MSGEVENT_LOG_HEARTBEAT_RCVD:
case OTRL_MSGEVENT_LOG_HEARTBEAT_SENT:
AILogWithSignature(@"I'm still alive");
@@ -700,26 +726,34 @@
[adium.contentController displayEvent:[[AIHTMLDecoder decodeHTML:localizedMessage] string]
case OTRL_MSGEVENT_CONNECTION_ENDED: {
- NSString *localizedMessage = [NSString stringWithFormat:AILocalizedStringFromTableInBundle(@"%@ is no longer using encryption; you should cancel encryption on your side.", @"Message when the remote contact cancels his half of an encrypted conversation. %@ will be a name.", [NSBundle bundleForClass:[AdiumOTREncryption class]], nil), listContact.UID];
+ NSString *localizedMessage = [NSString stringWithFormat:AILocalizedStringFromTableInBundle(@"%@ is no longer using encryption; you should cancel encryption on your side.", + @"libotr error message", [NSBundle bundleForClass:[AdiumOTREncryption class]], + @"Message when the remote contact cancels his half of an encrypted conversation. %@ will be a name."), listContact.UID]; if (!chat) chat = [adium.chatController chatWithContact:listContact];
[adium.contentController displayEvent:[[AIHTMLDecoder decodeHTML:localizedMessage] string]
-void create_instag_cb(void *opdata, const char *accountname,
+/* Create an instag for this account. */ +create_instag_cb(void *opdata, const char *accountname, const char *protocol) otrl_instag_generate(otrg_plugin_userstate, INSTAG_PATH, accountname, protocol);
+/* Something related to Socialis Millionaire Protocol happened. Handle it. */ handle_smp_event_cb(void *opdata, OtrlSMPEvent smp_event, ConnContext *context, unsigned short progress_percent, char *question)
@@ -746,43 +780,46 @@
case OTRL_SMPEVENT_ASK_FOR_SECRET: {
AIOTRSMPSharedSecretWindowController *questionController = [[AIOTRSMPSharedSecretWindowController alloc]
- completionHandler:^(NSString *answer){
- otrl_message_respond_smp(otrg_get_userstate(), &ui_ops, opdata, context, (const unsigned char*)[answer UTF8String], answer.length);
+ completionHandler:^(NSData *answer){ + otrl_message_respond_smp(otrg_get_userstate(), &ui_ops, opdata, context, [answer bytes], [answer length]); [questionController showWindow:nil];
[questionController.window orderFront:nil];
case OTRL_SMPEVENT_CHEATED:
case OTRL_SMPEVENT_ERROR:
- /* case OTRL_SMPEVENT_FAILURE: */ // I'm not actually sure what this event indicates, but it's not fatal failure of SMP.
+ case OTRL_SMPEVENT_FAILURE: case OTRL_SMPEVENT_ABORT: {
- NSString *localizedMessage = [NSString stringWithFormat:AILocalizedStringFromTableInBundle(@"Failed to verify %@'s identity.",
- [NSBundle bundleForClass:[AdiumOTREncryption class]], nil),
+ NSString *localizedMessage = AILocalizedStringFromTableInBundle(@"The secret question was <b>not</b> answered correctly. You might be talking to an imposter.", + [NSBundle bundleForClass:[AdiumOTREncryption class]], nil); AIChat *chat = chatForContext(context);
if (!chat) chat = [adium.chatController chatWithContact:listContact];
- [adium.contentController displayEvent:[[AIHTMLDecoder decodeHTML:localizedMessage] string]
+ [adium.contentController displayEvent:localizedMessage case OTRL_SMPEVENT_SUCCESS: {
- NSString *localizedMessage = [NSString stringWithFormat:AILocalizedStringFromTableInBundle(@"Successfully verified %@'s identity.",
- [NSBundle bundleForClass:[AdiumOTREncryption class]], nil),
+ NSString *localizedMessage = AILocalizedStringFromTableInBundle(@"The secret question was answered correctly.", + [NSBundle bundleForClass:[AdiumOTREncryption class]], nil); AIChat *chat = chatForContext(context);
if (!chat) chat = [adium.chatController chatWithContact:listContact];
- [adium.contentController displayEvent:[[AIHTMLDecoder decodeHTML:localizedMessage] string]
+ [adium.contentController displayEvent:localizedMessage + update_security_details_for_context(context); otrg_plugin_write_fingerprints();
otrg_ui_update_keylist();
@@ -817,7 +854,7 @@
+#pragma mark Input/output of messages between Adium and libotr - (void)willSendContentMessage:(AIContentMessage *)inContentMessage
@@ -899,7 +936,6 @@
send_default_query_to_chat(inChat);
disconnect_from_chat(inChat);
@@ -943,13 +979,12 @@
AIOTRSMPSharedSecretWindowController *windowController = [[AIOTRSMPSharedSecretWindowController alloc]
initFrom:inChat.listObject
- completionHandler:^(NSString *answer) {
- const char *answerStr = [answer UTF8String];
+ completionHandler:^(NSData *answer) { otrl_message_initiate_smp(otrg_get_userstate(),
- (const unsigned char*)answerStr,
@@ -1044,8 +1079,9 @@
NSInteger newEncryptionStatus = [[securityDetailsDict objectForKey:@"EncryptionStatus"] integerValue];
- if (newEncryptionStatus != EncryptionStatus_None && oldEncryptionStatus == EncryptionStatus_None && inChat.shouldLog) {
- AIOTRTopBarLoggingWarningController *warningController = [[AIOTRTopBarLoggingWarningController alloc] init];
+ if (newEncryptionStatus == EncryptionStatus_Unverified) { + AIOTRTopBarUnverifiedContactController *warningController = [[AIOTRTopBarUnverifiedContactController alloc] init]; AIMessageViewController *mvc = [[inChat chatContainer] messageViewController];
[mvc addTopBarController:warningController];
@@ -1054,28 +1090,31 @@
-void send_default_query_to_chat(AIChat *inChat)
+send_default_query_to_chat(AIChat *inChat) //Note that we pass a name for display, not internal usage
char *msg = otrl_proto_default_query_msg([inChat.account.formattedUID UTF8String],
policyForContact([inChat listObject]));
[adium.contentController sendRawMessage:[NSString stringWithUTF8String:(msg ? msg : "?OTRv2?")]
- toContact:[inChat listObject]];
+ toContact:[inChat listObject]]; /* Disconnect a context, sending a notice to the other side, if
-void disconnect_from_context(ConnContext *context)
+disconnect_from_context(ConnContext *context) otrl_message_disconnect(otrg_plugin_userstate, &ui_ops, NULL,
context->accountname, context->protocol, context->username, OTRL_INSTAG_RECENT);
gone_insecure_cb(NULL, context);
-void disconnect_from_chat(AIChat *inChat)
+disconnect_from_chat(AIChat *inChat) disconnect_from_context(contextForChat(inChat));
@@ -1083,7 +1122,8 @@
/* Forget a fingerprint */
-void otrg_ui_forget_fingerprint(Fingerprint *fingerprint)
+otrg_ui_forget_fingerprint(Fingerprint *fingerprint) @@ -1097,38 +1137,33 @@
otrg_plugin_write_fingerprints();
-void otrg_plugin_write_fingerprints(void)
+otrg_plugin_write_fingerprints(void) otrl_privkey_write_fingerprints(otrg_plugin_userstate, STORE_PATH);
otrg_ui_update_fingerprint();
-void otrg_ui_update_keylist(void)
+otrg_ui_update_keylist(void) [adiumOTREncryption prefsShouldUpdatePrivateKeyList];
-void otrg_ui_update_fingerprint(void)
+otrg_ui_update_fingerprint(void) [adiumOTREncryption prefsShouldUpdateFingerprintsList];
-OtrlUserState otrg_get_userstate(void)
+otrg_get_userstate(void) return otrg_plugin_userstate;
-- (void)verifyUnknownFingerprint:(NSValue *)contextValue
- NSDictionary *responseInfo;
- responseInfo = details_for_context([contextValue pointerValue]);
- [ESOTRUnknownFingerprintController showUnknownFingerprintPromptWithResponseInfo:responseInfo];
* @brief Call this function when our DSA key is updated; it will redraw the Encryption preferences item, if visible.