adium 3575:b4764d73621d: Fix two alignment issues that were caus...
commits at adium.im
commits at adium.im
Sun Nov 28 03:44:51 UTC 2010
details: http://hg.adium.im/adium/rev/b4764d73621d
revision: 3575:b4764d73621d
author: Frank Dowsett <wixardy at adium.im>
date: Sat Nov 27 20:36:14 2010 -0500
Fix two alignment issues that were caused by 2854e97d7e6b, and remove reference to AIPlasticPlus/Minus that were left in a nib.
Subject: adium 3576:1190bca3e731: Move the 'Forget Fingerprint' button to be under the fingerprints list.
details: http://hg.adium.im/adium/rev/1190bca3e731
revision: 3576:1190bca3e731
author: Aleksei Gorny
date: Thu Sep 10 01:18:59 2009 +0300
Move the 'Forget Fingerprint' button to be under the fingerprints list.
With help from wixardy. Fixes #1654
diffs (truncated from 2519 to 1000 lines):
diff -r c78ad2850051 -r 1190bca3e731 Frameworks/Adium Framework/Source/ESContactAlertsViewController.m
--- a/Frameworks/Adium Framework/Source/ESContactAlertsViewController.m Sat Nov 27 15:12:06 2010 +0100
+++ b/Frameworks/Adium Framework/Source/ESContactAlertsViewController.m Thu Sep 10 01:18:59 2009 +0300
@@ -73,8 +73,17 @@
selector:@selector(outlineViewColumnDidResize:)
name:NSOutlineViewColumnDidResizeNotification
object:outlineView_summary];
-
- [button_edit setTitle:AILocalizedStringFromTable(@"Edit", @"Buttons", "Verb 'edit' on a button")];
+ {
+ NSRect newFrame, oldFrame;
+ oldFrame = [button_edit frame];
+ [button_edit setTitle:AILocalizedStringFromTable(@"Edit", @"Buttons", "Verb 'edit' on a button")];
+ [button_edit sizeToFit];
+ newFrame = [button_edit frame];
+ if (newFrame.size.width < oldFrame.size.width) newFrame.size.width = oldFrame.size.width;
+ newFrame.origin.x = oldFrame.origin.x + oldFrame.size.width - newFrame.size.width;
+ [button_edit setFrame:newFrame];
+ }
+
[button_edit setToolTip:AILocalizedString(@"Configure the selected action", nil)];
[[button_addOrRemoveAlert cell] setToolTip:AILocalizedString(@"Add an action for the selected event", nil) forSegment:0];
[[button_addOrRemoveAlert cell] setToolTip:AILocalizedString(@"Remove the selected action(s)", nil) forSegment:1];
diff -r c78ad2850051 -r 1190bca3e731 Resources/AIEventsInspectorPane.nib/designable.nib
--- a/Resources/AIEventsInspectorPane.nib/designable.nib Sat Nov 27 15:12:06 2010 +0100
+++ b/Resources/AIEventsInspectorPane.nib/designable.nib Thu Sep 10 01:18:59 2009 +0300
@@ -3,15 +3,21 @@
<data>
<int key="IBDocument.SystemTarget">1060</int>
<string key="IBDocument.SystemVersion">10H574</string>
- <string key="IBDocument.InterfaceBuilderVersion">788</string>
+ <string key="IBDocument.InterfaceBuilderVersion">1246</string>
<string key="IBDocument.AppKitVersion">1038.35</string>
- <string key="IBDocument.HIToolboxVersion">461.00</string>
- <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
- <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">788</string>
- </object>
- <array class="NSMutableArray" key="IBDocument.EditedObjectIDs">
- <integer value="6"/>
+ <array key="IBDocument.IntegratedClassDependencies">
+ <string>NSSegmentedControl</string>
+ <string>NSScroller</string>
+ <string>NSButton</string>
+ <string>NSScrollView</string>
+ <string>NSTextFieldCell</string>
+ <string>NSButtonCell</string>
+ <string>NSBox</string>
+ <string>NSOutlineView</string>
+ <string>NSCustomObject</string>
+ <string>NSSegmentedCell</string>
+ <string>NSCustomView</string>
+ <string>NSTableColumn</string>
</array>
<array key="IBDocument.PluginDependencies">
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -37,9 +43,10 @@
<object class="NSButton" id="263065859">
<reference key="NSNextResponder" ref="169381318"/>
<int key="NSvFlags">289</int>
- <string key="NSFrame">{{244, 12}, {43, 23}}</string>
+ <string key="NSFrame">{{236, 12}, {50, 23}}</string>
<reference key="NSSuperview" ref="169381318"/>
- <reference key="NSNextKeyView" ref="415660178"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView"/>
<int key="NSViewLayerContentsRedrawPolicy">2</int>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="298091862">
@@ -65,6 +72,7 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{14, 12}, {49, 23}}</string>
<reference key="NSSuperview" ref="169381318"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="263065859"/>
<int key="NSViewLayerContentsRedrawPolicy">2</int>
<bool key="NSEnabled">YES</bool>
@@ -116,7 +124,8 @@
<int key="NSvFlags">4352</int>
<string key="NSFrameSize">{300, 206}</string>
<reference key="NSSuperview" ref="369262279"/>
- <reference key="NSNextKeyView" ref="31069752"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="220886628"/>
<int key="NSViewLayerContentsRedrawPolicy">2</int>
<bool key="NSEnabled">YES</bool>
<object class="_NSCornerView" key="NSCornerView">
@@ -237,6 +246,7 @@
</array>
<string key="NSFrameSize">{300, 206}</string>
<reference key="NSSuperview" ref="640796939"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="584022277"/>
<int key="NSViewLayerContentsRedrawPolicy">2</int>
<reference key="NSDocView" ref="584022277"/>
@@ -248,6 +258,7 @@
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{229, 1}, {15, 190}}</string>
<reference key="NSSuperview" ref="640796939"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="907361081"/>
<int key="NSViewLayerContentsRedrawPolicy">2</int>
<reference key="NSTarget" ref="640796939"/>
@@ -259,6 +270,7 @@
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{-100, -100}, {496, 15}}</string>
<reference key="NSSuperview" ref="640796939"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="369262279"/>
<int key="NSViewLayerContentsRedrawPolicy">2</int>
<int key="NSsFlags">1</int>
@@ -269,7 +281,8 @@
</array>
<string key="NSFrame">{{0, 47.5}, {300, 206}}</string>
<reference key="NSSuperview" ref="169381318"/>
- <reference key="NSNextKeyView" ref="369262279"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="31069752"/>
<int key="NSViewLayerContentsRedrawPolicy">2</int>
<int key="NSsFlags">528</int>
<reference key="NSVScroller" ref="220886628"/>
@@ -277,30 +290,12 @@
<reference key="NSContentView" ref="369262279"/>
<bytes key="NSScrollAmts">QSAAAEEgAABBiAAAQYgAAA</bytes>
</object>
- <object class="NSCustomView" id="206036936">
- <reference key="NSNextResponder" ref="169381318"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{-99, -13}, {23, 22}}</string>
- <reference key="NSSuperview" ref="169381318"/>
- <int key="NSViewLayerContentsRedrawPolicy">2</int>
- <string key="NSClassName">AIPlasticMinusButton</string>
- <string key="NSExtension">NSButton</string>
- </object>
- <object class="NSCustomView" id="415660178">
- <reference key="NSNextResponder" ref="169381318"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{-121, -13}, {23, 22}}</string>
- <reference key="NSSuperview" ref="169381318"/>
- <reference key="NSNextKeyView" ref="206036936"/>
- <int key="NSViewLayerContentsRedrawPolicy">2</int>
- <string key="NSClassName">AIPlasticPlusButton</string>
- <string key="NSExtension">NSButton</string>
- </object>
<object class="NSBox" id="907361081">
<reference key="NSNextResponder" ref="169381318"/>
<int key="NSvFlags">290</int>
<string key="NSFrame">{{0, 44}, {302, 5}}</string>
<reference key="NSSuperview" ref="169381318"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="38462375"/>
<int key="NSViewLayerContentsRedrawPolicy">2</int>
<string key="NSOffsets">{0, 0}</string>
@@ -328,6 +323,7 @@
</array>
<string key="NSFrameSize">{300, 253}</string>
<reference key="NSSuperview"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="640796939"/>
<int key="NSViewLayerContentsRedrawPolicy">2</int>
<object class="NSMutableString" key="NSClassName">
@@ -437,8 +433,6 @@
<reference key="object" ref="169381318"/>
<array class="NSMutableArray" key="children">
<reference ref="640796939"/>
- <reference ref="206036936"/>
- <reference ref="415660178"/>
<reference ref="907361081"/>
<reference ref="263065859"/>
<reference ref="38462375"/>
@@ -482,16 +476,6 @@
<reference key="parent" ref="584022277"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">100</int>
- <reference key="object" ref="206036936"/>
- <reference key="parent" ref="169381318"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">101</int>
- <reference key="object" ref="415660178"/>
- <reference key="parent" ref="169381318"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">120</int>
<reference key="object" ref="907361081"/>
<reference key="parent" ref="169381318"/>
@@ -553,10 +537,6 @@
<dictionary class="NSMutableDictionary" key="flattenedProperties">
<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES" key="-3.ImportedFromIB2"/>
- <string key="100.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES" key="100.ImportedFromIB2"/>
- <string key="101.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES" key="101.ImportedFromIB2"/>
<string key="120.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES" key="120.ImportedFromIB2"/>
<string key="123.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -616,16 +596,6 @@
<string key="alertsController">ESContactAlertsViewController</string>
<string key="inspectorContentView">NSView</string>
</dictionary>
- <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
- <object class="IBToOneOutletInfo" key="alertsController">
- <string key="name">alertsController</string>
- <string key="candidateClassName">ESContactAlertsViewController</string>
- </object>
- <object class="IBToOneOutletInfo" key="inspectorContentView">
- <string key="name">inspectorContentView</string>
- <string key="candidateClassName">NSView</string>
- </object>
- </dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./classes-xjh84/AIEventsInspectorPane.h</string>
@@ -640,24 +610,6 @@
<string key="window_anchorOnLeftSide">NSWindow</string>
<string key="window_anchorOnRightSide">NSWindow</string>
</dictionary>
- <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
- <object class="IBToOneOutletInfo" key="view_anchorToLeftSide">
- <string key="name">view_anchorToLeftSide</string>
- <string key="candidateClassName">NSView</string>
- </object>
- <object class="IBToOneOutletInfo" key="view_anchorToRightSide">
- <string key="name">view_anchorToRightSide</string>
- <string key="candidateClassName">NSView</string>
- </object>
- <object class="IBToOneOutletInfo" key="window_anchorOnLeftSide">
- <string key="name">window_anchorOnLeftSide</string>
- <string key="candidateClassName">NSWindow</string>
- </object>
- <object class="IBToOneOutletInfo" key="window_anchorOnRightSide">
- <string key="name">window_anchorOnRightSide</string>
- <string key="candidateClassName">NSWindow</string>
- </object>
- </dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./classes-xjh84/AILocalizationButton.h</string>
@@ -695,44 +647,12 @@
<string key="didDoubleClick:">id</string>
<string key="editAlert:">id</string>
</dictionary>
- <dictionary class="NSMutableDictionary" key="actionInfosByName">
- <object class="IBActionInfo" key="addOrRemoveAlert:">
- <string key="name">addOrRemoveAlert:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo" key="didDoubleClick:">
- <string key="name">didDoubleClick:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo" key="editAlert:">
- <string key="name">editAlert:</string>
- <string key="candidateClassName">id</string>
- </object>
- </dictionary>
<dictionary class="NSMutableDictionary" key="outlets">
<string key="button_addOrRemoveAlert">NSSegmentedControl</string>
<string key="button_edit">NSButton</string>
<string key="outlineView_summary">AIVariableHeightFlexibleColumnsOutlineView</string>
<string key="view">NSView</string>
</dictionary>
- <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
- <object class="IBToOneOutletInfo" key="button_addOrRemoveAlert">
- <string key="name">button_addOrRemoveAlert</string>
- <string key="candidateClassName">NSSegmentedControl</string>
- </object>
- <object class="IBToOneOutletInfo" key="button_edit">
- <string key="name">button_edit</string>
- <string key="candidateClassName">NSButton</string>
- </object>
- <object class="IBToOneOutletInfo" key="outlineView_summary">
- <string key="name">outlineView_summary</string>
- <string key="candidateClassName">AIVariableHeightFlexibleColumnsOutlineView</string>
- </object>
- <object class="IBToOneOutletInfo" key="view">
- <string key="name">view</string>
- <string key="candidateClassName">NSView</string>
- </object>
- </dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./classes-xjh84/ESContactAlertsViewController.h</string>
diff -r c78ad2850051 -r 1190bca3e731 Resources/AIEventsInspectorPane.nib/keyedobjects.nib
Binary file Resources/AIEventsInspectorPane.nib/keyedobjects.nib has changed
diff -r c78ad2850051 -r 1190bca3e731 Resources/OTRFingerprintDetailsWindow.nib/classes.nib
--- a/Resources/OTRFingerprintDetailsWindow.nib/classes.nib Sat Nov 27 15:12:06 2010 +0100
+++ b/Resources/OTRFingerprintDetailsWindow.nib/classes.nib Thu Sep 10 01:18:59 2009 +0300
@@ -1,38 +1,205 @@
-{
- IBClasses = (
- {
- CLASS = AILocalizationButton;
- LANGUAGE = ObjC;
- OUTLETS = {
- "view_anchorToLeftSide" = NSView;
- "view_anchorToRightSide" = NSView;
- "window_anchorOnLeftSide" = NSWindow;
- "window_anchorOnRightSide" = NSWindow;
- };
- SUPERCLASS = NSButton;
- },
- {
- ACTIONS = {closeWindow = id; };
- CLASS = AIWindowController;
- LANGUAGE = ObjC;
- SUPERCLASS = NSWindowController;
- },
- {
- ACTIONS = {forgetFingerprint = id; };
- CLASS = ESGaimOTRFingerprintDetailsWindowController;
- LANGUAGE = ObjC;
- OUTLETS = {
- "button_OK" = NSButton;
- "button_forgetFingerprint" = NSButton;
- "imageView_lock" = NSImageView;
- "imageView_service" = NSImageView;
- "textField_UID" = NSTextField;
- "textField_fingerprint" = NSTextField;
- };
- SUPERCLASS = AIWindowController;
- },
- {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
- {CLASS = NSButton; LANGUAGE = ObjC; SUPERCLASS = NSControl; }
- );
- IBVersion = 1;
-}
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>IBClasses</key>
+ <array>
+ <dict>
+ <key>CLASS</key>
+ <string>NSApplication</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSResponder</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
+ <string>RBSplitView</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>OUTLETS</key>
+ <dict>
+ <key>delegate</key>
+ <string>id</string>
+ </dict>
+ <key>SUPERCLASS</key>
+ <string>RBSplitSubview</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
+ <string>NSTextField</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSControl</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
+ <string>RBSplitSubview</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSView</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
+ <string>NSMenu</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSObject</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
+ <string>NSWindowController</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSResponder</string>
+ </dict>
+ <dict>
+ <key>ACTIONS</key>
+ <dict>
+ <key>adiumPrint</key>
+ <string>id</string>
+ <key>didAdjustSubviews</key>
+ <string>RBSplitView</string>
+ <key>prefsWindowWillClose</key>
+ <string>SS_PrefsController</string>
+ <key>toggleFindPanel</key>
+ <string>id</string>
+ <key>willAdjustSubviews</key>
+ <string>RBSplitView</string>
+ </dict>
+ <key>CLASS</key>
+ <string>NSObject</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
+ <string>ESOTRFingerprintDetailsWindowController</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>OUTLETS</key>
+ <dict>
+ <key>button_OK</key>
+ <string>NSButton</string>
+ <key>imageView_lock</key>
+ <string>NSImageView</string>
+ <key>imageView_service</key>
+ <string>NSImageView</string>
+ <key>textField_UID</key>
+ <string>NSTextField</string>
+ <key>textField_fingerprint</key>
+ <string>NSTextField</string>
+ </dict>
+ <key>SUPERCLASS</key>
+ <string>AIWindowController</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
+ <string>AILocalizationButton</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>OUTLETS</key>
+ <dict>
+ <key>view_anchorToLeftSide</key>
+ <string>NSView</string>
+ <key>view_anchorToRightSide</key>
+ <string>NSView</string>
+ <key>window_anchorOnLeftSide</key>
+ <string>NSWindow</string>
+ <key>window_anchorOnRightSide</key>
+ <string>NSWindow</string>
+ </dict>
+ <key>SUPERCLASS</key>
+ <string>NSButton</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
+ <string>NSWindow</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSResponder</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
+ <string>NSView</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSResponder</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
+ <string>FirstResponder</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSObject</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
+ <string>NSCell</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSObject</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
+ <string>NSButton</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSControl</string>
+ </dict>
+ <dict>
+ <key>ACTIONS</key>
+ <dict>
+ <key>closeWindow</key>
+ <string>id</string>
+ </dict>
+ <key>CLASS</key>
+ <string>AIWindowController</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSWindowController</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
+ <string>NSImageCell</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSCell</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
+ <string>NSButtonCell</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSActionCell</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
+ <string>SS_PrefsController</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>OUTLETS</key>
+ <dict>
+ <key>delegate</key>
+ <string>id</string>
+ </dict>
+ <key>SUPERCLASS</key>
+ <string>NSObject</string>
+ </dict>
+ </array>
+ <key>IBVersion</key>
+ <string>1</string>
+</dict>
+</plist>
diff -r c78ad2850051 -r 1190bca3e731 Resources/OTRFingerprintDetailsWindow.nib/info.nib
--- a/Resources/OTRFingerprintDetailsWindow.nib/info.nib Sat Nov 27 15:12:06 2010 +0100
+++ b/Resources/OTRFingerprintDetailsWindow.nib/info.nib Thu Sep 10 01:18:59 2009 +0300
@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
- <key>IBDocumentLocation</key>
- <string>69 73 356 240 0 0 1280 1002 </string>
- <key>IBEditorPositions</key>
- <dict>
- </dict>
<key>IBFramework Version</key>
- <string>446.1</string>
+ <string>677</string>
+ <key>IBLastKnownRelativeProjectPath</key>
+ <string>../Adium.xcodeproj</string>
+ <key>IBOldestOS</key>
+ <integer>5</integer>
<key>IBOpenObjects</key>
<array>
+ <integer>5</integer>
</array>
<key>IBSystem Version</key>
- <string>8I127</string>
- <key>IBUsesTextArchiving</key>
- <true/>
+ <string>9G55</string>
+ <key>targetFramework</key>
+ <string>IBCocoaFramework</string>
</dict>
</plist>
diff -r c78ad2850051 -r 1190bca3e731 Resources/OTRFingerprintDetailsWindow.nib/keyedobjects.nib
Binary file Resources/OTRFingerprintDetailsWindow.nib/keyedobjects.nib has changed
diff -r c78ad2850051 -r 1190bca3e731 Resources/en.lproj/OTRPrefs.nib/classes.nib
--- a/Resources/en.lproj/OTRPrefs.nib/classes.nib Sat Nov 27 15:12:06 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,251 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>IBClasses</key>
- <array>
- <dict>
- <key>CLASS</key>
- <string>NSApplication</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>SUPERCLASS</key>
- <string>NSResponder</string>
- </dict>
- <dict>
- <key>CLASS</key>
- <string>RBSplitView</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>OUTLETS</key>
- <dict>
- <key>delegate</key>
- <string>id</string>
- </dict>
- <key>SUPERCLASS</key>
- <string>RBSplitSubview</string>
- </dict>
- <dict>
- <key>CLASS</key>
- <string>NSTextField</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>SUPERCLASS</key>
- <string>NSControl</string>
- </dict>
- <dict>
- <key>CLASS</key>
- <string>AIAdvancedPreferencePane</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>SUPERCLASS</key>
- <string>AIModularPane</string>
- </dict>
- <dict>
- <key>CLASS</key>
- <string>RBSplitSubview</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>SUPERCLASS</key>
- <string>NSView</string>
- </dict>
- <dict>
- <key>CLASS</key>
- <string>NSMenu</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>SUPERCLASS</key>
- <string>NSObject</string>
- </dict>
- <dict>
- <key>ACTIONS</key>
- <dict>
- <key>adiumPrint</key>
- <string>id</string>
- <key>didAdjustSubviews</key>
- <string>RBSplitView</string>
- <key>prefsWindowWillClose</key>
- <string>SS_PrefsController</string>
- <key>toggleFindPanel</key>
- <string>id</string>
- <key>willAdjustSubviews</key>
- <string>RBSplitView</string>
- </dict>
- <key>CLASS</key>
- <string>NSObject</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- </dict>
- <dict>
- <key>CLASS</key>
- <string>NSWindow</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>SUPERCLASS</key>
- <string>NSResponder</string>
- </dict>
- <dict>
- <key>CLASS</key>
- <string>NSScrollView</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>SUPERCLASS</key>
- <string>NSView</string>
- </dict>
- <dict>
- <key>CLASS</key>
- <string>NSView</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>SUPERCLASS</key>
- <string>NSResponder</string>
- </dict>
- <dict>
- <key>CLASS</key>
- <string>NSMenuItem</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>SUPERCLASS</key>
- <string>NSObject</string>
- </dict>
- <dict>
- <key>CLASS</key>
- <string>FirstResponder</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>SUPERCLASS</key>
- <string>NSObject</string>
- </dict>
- <dict>
- <key>CLASS</key>
- <string>NSCell</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>SUPERCLASS</key>
- <string>NSObject</string>
- </dict>
- <dict>
- <key>ACTIONS</key>
- <dict>
- <key>changePreference</key>
- <string>id</string>
- </dict>
- <key>CLASS</key>
- <string>AIModularPane</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>OUTLETS</key>
- <dict>
- <key>plugin</key>
- <string>id</string>
- <key>view</key>
- <string>NSView</string>
- </dict>
- <key>SUPERCLASS</key>
- <string>NSObject</string>
- </dict>
- <dict>
- <key>CLASS</key>
- <string>NSButton</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>SUPERCLASS</key>
- <string>NSControl</string>
- </dict>
- <dict>
- <key>CLASS</key>
- <string>NSPopUpButton</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>SUPERCLASS</key>
- <string>NSButton</string>
- </dict>
- <dict>
- <key>CLASS</key>
- <string>NSPopUpButtonCell</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>SUPERCLASS</key>
- <string>NSMenuItemCell</string>
- </dict>
- <dict>
- <key>CLASS</key>
- <string>AILocalizationTextField</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>OUTLETS</key>
- <dict>
- <key>view_anchorToLeftSide</key>
- <string>NSView</string>
- <key>view_anchorToRightSide</key>
- <string>NSView</string>
- <key>window_anchorOnLeftSide</key>
- <string>NSWindow</string>
- <key>window_anchorOnRightSide</key>
- <string>NSWindow</string>
- </dict>
- <key>SUPERCLASS</key>
- <string>NSTextField</string>
- </dict>
- <dict>
- <key>CLASS</key>
- <string>NSButtonCell</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>SUPERCLASS</key>
- <string>NSActionCell</string>
- </dict>
- <dict>
- <key>ACTIONS</key>
- <dict>
- <key>generate</key>
- <string>id</string>
- <key>showFingerprint</key>
- <string>id</string>
- </dict>
- <key>CLASS</key>
- <string>ESOTRPreferences</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>OUTLETS</key>
- <dict>
- <key>button_generate</key>
- <string>NSButton</string>
- <key>button_showFingerprint</key>
- <string>NSButton</string>
- <key>popUp_accounts</key>
- <string>NSPopUpButton</string>
- <key>tableView_fingerprints</key>
- <string>NSTableView</string>
- <key>textField_privateKey</key>
- <string>NSTextField</string>
- </dict>
- <key>SUPERCLASS</key>
- <string>AIAdvancedPreferencePane</string>
- </dict>
- <dict>
- <key>CLASS</key>
- <string>SS_PrefsController</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>OUTLETS</key>
- <dict>
- <key>delegate</key>
- <string>id</string>
- </dict>
- <key>SUPERCLASS</key>
- <string>NSObject</string>
- </dict>
- <dict>
- <key>CLASS</key>
- <string>NSTableView</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>SUPERCLASS</key>
- <string>NSControl</string>
- </dict>
- </array>
- <key>IBVersion</key>
- <string>1</string>
-</dict>
-</plist>
diff -r c78ad2850051 -r 1190bca3e731 Resources/en.lproj/OTRPrefs.nib/designable.nib
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Resources/en.lproj/OTRPrefs.nib/designable.nib Thu Sep 10 01:18:59 2009 +0300
@@ -0,0 +1,1492 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
+ <data>
+ <int key="IBDocument.SystemTarget">1050</int>
+ <string key="IBDocument.SystemVersion">10H574</string>
+ <string key="IBDocument.InterfaceBuilderVersion">788</string>
+ <string key="IBDocument.AppKitVersion">1038.35</string>
+ <string key="IBDocument.HIToolboxVersion">461.00</string>
+ <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="NS.object.0">788</string>
+ </object>
+ <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <integer value="5"/>
+ </object>
+ <object class="NSArray" key="IBDocument.PluginDependencies">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ </object>
+ <object class="NSMutableDictionary" key="IBDocument.Metadata">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys" id="0">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
+ <object class="NSMutableArray" key="IBDocument.RootObjects" id="475209783">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSCustomObject" id="245285604">
+ <string key="NSClassName">ESOTRPreferences</string>
+ </object>
+ <object class="NSCustomObject" id="793451751">
+ <string key="NSClassName">FirstResponder</string>
+ </object>
+ <object class="NSCustomObject" id="600731802">
+ <string key="NSClassName">NSApplication</string>
+ </object>
+ <object class="NSCustomView" id="261192207">
+ <reference key="NSNextResponder"/>
+ <int key="NSvFlags">256</int>
+ <object class="NSMutableArray" key="NSSubviews">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSTextField" id="896186174">
+ <reference key="NSNextResponder" ref="261192207"/>
+ <int key="NSvFlags">264</int>
+ <string key="NSFrame">{{0, 296}, {324, 14}}</string>
+ <reference key="NSSuperview" ref="261192207"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSTextFieldCell" key="NSCell" id="528635364">
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">4194304</int>
+ <string key="NSContents">Private Keys</string>
+ <object class="NSFont" key="NSSupport" id="27">
+ <string key="NSName">LucidaGrande-Bold</string>
+ <double key="NSSize">11</double>
+ <int key="NSfFlags">3357</int>
+ </object>
+ <reference key="NSControlView" ref="896186174"/>
+ <object class="NSColor" key="NSBackgroundColor" id="1001302365">
+ <int key="NSColorSpace">6</int>
+ <string key="NSCatalogName">System</string>
+ <string key="NSColorName">controlColor</string>
+ <object class="NSColor" key="NSColor" id="698936443">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
+ </object>
+ </object>
+ <object class="NSColor" key="NSTextColor" id="1001647384">
+ <int key="NSColorSpace">6</int>
+ <string key="NSCatalogName">System</string>
+ <string key="NSColorName">controlTextColor</string>
+ <object class="NSColor" key="NSColor" id="426572272">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MAA</bytes>
+ </object>
+ </object>
+ </object>
+ </object>
+ <object class="NSBox" id="938362898">
+ <reference key="NSNextResponder" ref="261192207"/>
+ <int key="NSvFlags">266</int>
+ <string key="NSFrame">{{3, 294}, {324, 5}}</string>
+ <reference key="NSSuperview" ref="261192207"/>
+ <string key="NSOffsets">{0, 0}</string>
+ <object class="NSTextFieldCell" key="NSTitleCell">
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">0</int>
+ <string key="NSContents">Box</string>
+ <object class="NSFont" key="NSSupport" id="970377140">
+ <string key="NSName">LucidaGrande</string>
+ <double key="NSSize">13</double>
+ <int key="NSfFlags">1044</int>
+ </object>
+ <object class="NSColor" key="NSBackgroundColor" id="475180874">
+ <int key="NSColorSpace">6</int>
+ <string key="NSCatalogName">System</string>
+ <string key="NSColorName">textBackgroundColor</string>
+ <object class="NSColor" key="NSColor" id="866391531">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MQA</bytes>
+ </object>
+ </object>
+ <object class="NSColor" key="NSTextColor">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes>
+ </object>
+ </object>
+ <int key="NSBorderType">3</int>
+ <int key="NSBoxType">2</int>
+ <int key="NSTitlePosition">0</int>
+ <bool key="NSTransparent">NO</bool>
+ </object>
+ <object class="NSPopUpButton" id="365143233">
+ <reference key="NSNextResponder" ref="261192207"/>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrame">{{65, 265}, {169, 22}}</string>
+ <reference key="NSSuperview" ref="261192207"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSPopUpButtonCell" key="NSCell" id="495829525">
+ <int key="NSCellFlags">-2076049856</int>
+ <int key="NSCellFlags2">133120</int>
+ <object class="NSFont" key="NSSupport" id="26">
+ <string key="NSName">LucidaGrande</string>
+ <double key="NSSize">11</double>
+ <int key="NSfFlags">3100</int>
+ </object>
+ <reference key="NSControlView" ref="365143233"/>
+ <int key="NSButtonFlags">109199615</int>
+ <int key="NSButtonFlags2">1</int>
+ <object class="NSFont" key="NSAlternateImage" id="58398839">
+ <string key="NSName">LucidaGrande</string>
+ <double key="NSSize">11</double>
+ <int key="NSfFlags">16</int>
+ </object>
+ <string key="NSAlternateContents"/>
+ <object class="NSMutableString" key="NSKeyEquivalent">
+ <characters key="NS.bytes"/>
+ </object>
+ <int key="NSPeriodicDelay">400</int>
+ <int key="NSPeriodicInterval">75</int>
+ <object class="NSMenuItem" key="NSMenuItem" id="355447198">
+ <reference key="NSMenu" ref="433605837"/>
+ <string type="base64-UTF8" key="NSTitle">IA</string>
+ <string key="NSKeyEquiv"/>
+ <int key="NSKeyEquivModMask">1048576</int>
+ <int key="NSMnemonicLoc">2147483647</int>
+ <int key="NSState">1</int>
+ <object class="NSCustomResource" key="NSOnImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">NSMenuCheckmark</string>
+ </object>
+ <object class="NSCustomResource" key="NSMixedImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">NSMenuMixedState</string>
+ </object>
+ <string key="NSAction">_popUpItemAction:</string>
+ <reference key="NSTarget" ref="495829525"/>
+ </object>
+ <bool key="NSMenuItemRespectAlignment">YES</bool>
+ <object class="NSMenu" key="NSMenu" id="433605837">
+ <object class="NSMutableString" key="NSTitle">
+ <characters key="NS.bytes">OtherViews</characters>
+ </object>
+ <object class="NSMutableArray" key="NSMenuItems">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="355447198"/>
+ </object>
More information about the commits
mailing list