adium-1.4 2806:c30d45478bad: FIxed all springs and struts on Edi...
commits at adium.im
commits at adium.im
Mon Nov 23 22:07:38 UTC 2009
details: http://hg.adium.im/adium-1.4/rev/c30d45478bad
revision: 2806:c30d45478bad
author: Evan Schoenberg
date: Mon Nov 23 16:05:18 2009 -0600
FIxed all springs and struts on EditStateSheet nibs. Fixes #10239.
(transplanted from 4d3a8b7c1cf42e112ccb30e650b6f5d8fcfe0a07)
diffs (983 lines):
diff -r 9c32a9b78f76 -r c30d45478bad Frameworks/Adium Framework/Resources/cs.lproj/EditStateSheet.nib/keyedobjects.nib
Binary file Frameworks/Adium Framework/Resources/cs.lproj/EditStateSheet.nib/keyedobjects.nib has changed
diff -r 9c32a9b78f76 -r c30d45478bad Frameworks/Adium Framework/Resources/el_GR.lproj/EditStateSheet.nib/keyedobjects.nib
Binary file Frameworks/Adium Framework/Resources/el_GR.lproj/EditStateSheet.nib/keyedobjects.nib has changed
diff -r 9c32a9b78f76 -r c30d45478bad Frameworks/Adium Framework/Resources/en.lproj/EditStateSheet.nib/keyedobjects.nib
Binary file Frameworks/Adium Framework/Resources/en.lproj/EditStateSheet.nib/keyedobjects.nib has changed
diff -r 9c32a9b78f76 -r c30d45478bad Frameworks/Adium Framework/Resources/en_GB.lproj/EditStateSheet.nib/keyedobjects.nib
Binary file Frameworks/Adium Framework/Resources/en_GB.lproj/EditStateSheet.nib/keyedobjects.nib has changed
diff -r 9c32a9b78f76 -r c30d45478bad Frameworks/Adium Framework/Resources/es.lproj/EditStateSheet.nib/designable.nib
--- a/Frameworks/Adium Framework/Resources/es.lproj/EditStateSheet.nib/designable.nib Mon Nov 23 17:02:25 2009 -0500
+++ b/Frameworks/Adium Framework/Resources/es.lproj/EditStateSheet.nib/designable.nib Mon Nov 23 16:05:18 2009 -0600
@@ -41,14 +41,14 @@
<object class="NSWindowTemplate" id="356585049">
<int key="NSWindowStyleMask">3</int>
<int key="NSWindowBacking">2</int>
- <string key="NSWindowRect">{{447, 150}, {422, 496}}</string>
+ <string key="NSWindowRect">{{447, 150}, {422, 521}}</string>
<int key="NSWTFlags">1886912512</int>
<string key="NSWindowTitle">Estado Personalizado</string>
<string key="NSWindowClass">NSWindow</string>
<object class="NSMutableString" key="NSViewClass">
<characters key="NS.bytes">View</characters>
</object>
- <string key="NSWindowContentMaxSize">{403, 477}</string>
+ <string key="NSWindowContentMaxSize">{403, 527}</string>
<string key="NSWindowContentMinSize">{403, 477}</string>
<object class="NSView" key="NSWindowView" id="989329189">
<reference key="NSNextResponder"/>
@@ -108,7 +108,7 @@
<object class="NSButton" id="479977257">
<reference key="NSNextResponder" ref="989329189"/>
<int key="NSvFlags">264</int>
- <string key="NSFrame">{{13, 116}, {368, 18}}</string>
+ <string key="NSFrame">{{13, 141}, {368, 18}}</string>
<reference key="NSSuperview" ref="989329189"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="835196433">
@@ -135,7 +135,7 @@
<object class="NSButton" id="406923179">
<reference key="NSNextResponder" ref="989329189"/>
<int key="NSvFlags">264</int>
- <string key="NSFrame">{{12, 258}, {130, 18}}</string>
+ <string key="NSFrame">{{13, 288}, {130, 18}}</string>
<reference key="NSSuperview" ref="989329189"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="977006069">
@@ -157,7 +157,7 @@
<object class="NSButton" id="925607941">
<reference key="NSNextResponder" ref="989329189"/>
<int key="NSvFlags">264</int>
- <string key="NSFrame">{{35, 238}, {306, 18}}</string>
+ <string key="NSFrame">{{35, 263}, {306, 18}}</string>
<reference key="NSSuperview" ref="989329189"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="493391195">
@@ -332,7 +332,7 @@
<double key="NSPercent">0.94565218687057495</double>
</object>
</object>
- <string key="NSFrame">{{37, 139}, {365, 93}}</string>
+ <string key="NSFrame">{{37, 164}, {365, 93}}</string>
<reference key="NSSuperview" ref="989329189"/>
<reference key="NSNextKeyView" ref="975439586"/>
<int key="NSsFlags">530</int>
@@ -480,7 +480,7 @@
<reference key="NSSuperview" ref="1041806675"/>
</object>
</object>
- <string key="NSFrame">{{37, 87}, {330, 22}}</string>
+ <string key="NSFrame">{{37, 104}, {330, 22}}</string>
<reference key="NSSuperview" ref="989329189"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
@@ -649,7 +649,7 @@
<object class="NSTextField" id="566875291">
<reference key="NSNextResponder" ref="882632581"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{3, 105}, {126, 17}}</string>
+ <string key="NSFrame">{{2, 105}, {126, 17}}</string>
<reference key="NSSuperview" ref="882632581"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="826556214">
@@ -667,7 +667,7 @@
<reference key="NSSuperview" ref="397566868"/>
</object>
</object>
- <string key="NSFrame">{{11, 284}, {391, 119}}</string>
+ <string key="NSFrame">{{11, 309}, {391, 119}}</string>
<reference key="NSSuperview" ref="989329189"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
@@ -690,7 +690,7 @@
<object class="NSBox" id="514397697">
<reference key="NSNextResponder" ref="989329189"/>
<int key="NSvFlags">264</int>
- <string key="NSFrame">{{14, 443}, {371, 5}}</string>
+ <string key="NSFrame">{{14, 468}, {371, 5}}</string>
<reference key="NSSuperview" ref="989329189"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
@@ -712,7 +712,11 @@
<object class="NSButton" id="504446297">
<reference key="NSNextResponder" ref="989329189"/>
<int key="NSvFlags">264</int>
+<<<<<<< local
<string key="NSFrame">{{13, 19}, {119, 18}}</string>
+=======
+ <string key="NSFrame">{{13, 21}, {119, 18}}</string>
+>>>>>>> other
<reference key="NSSuperview" ref="989329189"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="574537048">
@@ -779,7 +783,7 @@
<reference key="NSSuperview" ref="176614271"/>
</object>
</object>
- <string key="NSFrame">{{15, 455}, {387, 30}}</string>
+ <string key="NSFrame">{{15, 480}, {387, 30}}</string>
<reference key="NSSuperview" ref="989329189"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
@@ -906,7 +910,7 @@
<reference key="NSSuperview" ref="174664433"/>
</object>
</object>
- <string key="NSFrame">{{15, 408}, {387, 27}}</string>
+ <string key="NSFrame">{{15, 433}, {387, 27}}</string>
<reference key="NSSuperview" ref="989329189"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
@@ -929,7 +933,7 @@
<object class="NSButton" id="560871951">
<reference key="NSNextResponder" ref="989329189"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{13, 61}, {129, 18}}</string>
+ <string key="NSFrame">{{13, 72}, {129, 18}}</string>
<reference key="NSSuperview" ref="989329189"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="816864613">
@@ -951,7 +955,7 @@
<object class="NSButton" id="890235338">
<reference key="NSNextResponder" ref="989329189"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{13, 40}, {118, 18}}</string>
+ <string key="NSFrame">{{12, 47}, {118, 18}}</string>
<reference key="NSSuperview" ref="989329189"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="997834494">
@@ -971,12 +975,12 @@
</object>
</object>
</object>
- <string key="NSFrameSize">{422, 496}</string>
+ <string key="NSFrameSize">{422, 521}</string>
<reference key="NSSuperview"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1280, 778}}</string>
<string key="NSMinSize">{403, 499}</string>
- <string key="NSMaxSize">{403, 499}</string>
+ <string key="NSMaxSize">{403, 549}</string>
</object>
</object>
<object class="IBObjectContainer" key="IBDocument.Objects">
@@ -1459,18 +1463,18 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="479977257"/>
<reference ref="597068088"/>
- <reference ref="504446297"/>
<reference ref="1041806675"/>
<reference ref="514397697"/>
<reference ref="397566868"/>
<reference ref="947966585"/>
<reference ref="797851508"/>
<reference ref="925607941"/>
- <reference ref="406923179"/>
<reference ref="176614271"/>
<reference ref="174664433"/>
+ <reference ref="504446297"/>
<reference ref="560871951"/>
<reference ref="890235338"/>
+ <reference ref="406923179"/>
</object>
<reference key="parent" ref="356585049"/>
</object>
@@ -2105,13 +2109,13 @@
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
- <string>{{63, 280}, {422, 496}}</string>
+ <string>{{441, 324}, {422, 521}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{63, 280}, {422, 496}}</string>
+ <string>{{441, 324}, {422, 521}}</string>
<boolean value="YES"/>
<boolean value="YES"/>
<boolean value="YES"/>
- <string>{403, 477}</string>
+ <string>{403, 527}</string>
<string>{403, 477}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
@@ -2235,7 +2239,11 @@
<string>AISendingTextView</string>
</object>
</object>
+<<<<<<< local
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="239177306">
+=======
+ <object class="IBClassDescriptionSource" key="sourceIdentifier" id="291206887">
+>>>>>>> other
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">Frameworks/Adium Framework/Source/AIEditStateWindowController.h</string>
</object>
@@ -2268,7 +2276,11 @@
<string>NSWindow</string>
</object>
</object>
+<<<<<<< local
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="572040983">
+=======
+ <object class="IBClassDescriptionSource" key="sourceIdentifier" id="364445955">
+>>>>>>> other
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">Frameworks/Adium Framework/Source/AILocalizationTextField.h</string>
</object>
@@ -2427,7 +2439,11 @@
</object>
<object class="IBPartialClassDescription">
<string key="className">NSCell</string>
+<<<<<<< local
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="902869543">
+=======
+ <object class="IBClassDescriptionSource" key="sourceIdentifier" id="819208286">
+>>>>>>> other
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">Frameworks/AIUtilities Framework/Source/AIVariableHeightOutlineView.h</string>
</object>
@@ -2442,7 +2458,11 @@
</object>
<object class="IBPartialClassDescription">
<string key="className">NSMenu</string>
+<<<<<<< local
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="113478506">
+=======
+ <object class="IBClassDescriptionSource" key="sourceIdentifier" id="412212719">
+>>>>>>> other
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">Frameworks/AIUtilities Framework/Source/AIMenuAdditions.h</string>
</object>
@@ -2457,7 +2477,11 @@
</object>
<object class="IBPartialClassDescription">
<string key="className">NSMenuItem</string>
+<<<<<<< local
<reference key="sourceIdentifier" ref="113478506"/>
+=======
+ <reference key="sourceIdentifier" ref="412212719"/>
+>>>>>>> other
</object>
<object class="IBPartialClassDescription">
<string key="className">NSMenuItem</string>
@@ -2511,7 +2535,11 @@
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
+<<<<<<< local
<reference key="sourceIdentifier" ref="902869543"/>
+=======
+ <reference key="sourceIdentifier" ref="819208286"/>
+>>>>>>> other
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
@@ -2540,7 +2568,11 @@
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
+<<<<<<< local
<reference key="sourceIdentifier" ref="239177306"/>
+=======
+ <reference key="sourceIdentifier" ref="291206887"/>
+>>>>>>> other
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
@@ -2548,7 +2580,11 @@
<string key="NS.key.0">adiumPrint:</string>
<string key="NS.object.0">id</string>
</object>
+<<<<<<< local
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="585928511">
+=======
+ <object class="IBClassDescriptionSource" key="sourceIdentifier" id="923334499">
+>>>>>>> other
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">Frameworks/Adium Framework/Source/AIInterfaceControllerProtocol.h</string>
</object>
@@ -2615,7 +2651,11 @@
<string key="NS.key.0">prefsWindowWillClose:</string>
<string key="NS.object.0">SS_PrefsController</string>
</object>
+<<<<<<< local
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="1012191871">
+=======
+ <object class="IBClassDescriptionSource" key="sourceIdentifier" id="614467045">
+>>>>>>> other
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">Frameworks/Adium Framework/Source/SS_PrefsController.h</string>
</object>
@@ -2635,7 +2675,11 @@
<string>RBSplitView</string>
</object>
</object>
+<<<<<<< local
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="813335145">
+=======
+ <object class="IBClassDescriptionSource" key="sourceIdentifier" id="635410044">
+>>>>>>> other
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">Frameworks/RBSplitView/Source/RBSplitView.h</string>
</object>
@@ -2747,7 +2791,11 @@
</object>
<object class="IBPartialClassDescription">
<string key="className">NSPopUpButton</string>
+<<<<<<< local
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="381462879">
+=======
+ <object class="IBClassDescriptionSource" key="sourceIdentifier" id="888563364">
+>>>>>>> other
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">Frameworks/AIUtilities Framework/Source/AIPopUpButtonAdditions.h</string>
</object>
@@ -2762,7 +2810,11 @@
</object>
<object class="IBPartialClassDescription">
<string key="className">NSPopUpButtonCell</string>
+<<<<<<< local
<reference key="sourceIdentifier" ref="381462879"/>
+=======
+ <reference key="sourceIdentifier" ref="888563364"/>
+>>>>>>> other
</object>
<object class="IBPartialClassDescription">
<string key="className">NSPopUpButtonCell</string>
@@ -2789,7 +2841,11 @@
</object>
<object class="IBPartialClassDescription">
<string key="className">NSTextField</string>
+<<<<<<< local
<reference key="sourceIdentifier" ref="572040983"/>
+=======
+ <reference key="sourceIdentifier" ref="364445955"/>
+>>>>>>> other
</object>
<object class="IBPartialClassDescription">
<string key="className">NSTextField</string>
@@ -2818,7 +2874,11 @@
<string>id</string>
</object>
</object>
+<<<<<<< local
<object class="IBClassDescriptionSource" key="sourceIdentifier">
+=======
+ <object class="IBClassDescriptionSource" key="sourceIdentifier" id="692599199">
+>>>>>>> other
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">Frameworks/AIUtilities Framework/Source/AILeopardCompatibility.h</string>
</object>
@@ -2855,6 +2915,13 @@
</object>
<object class="IBPartialClassDescription">
<string key="className">NSWindow</string>
+<<<<<<< local
+=======
+ <reference key="sourceIdentifier" ref="692599199"/>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSWindow</string>
+>>>>>>> other
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">Frameworks/AIUtilities Framework/Source/AIWindowAdditions.h</string>
@@ -2884,7 +2951,11 @@
</object>
<object class="IBPartialClassDescription">
<string key="className">NSWindowController</string>
+<<<<<<< local
<reference key="sourceIdentifier" ref="585928511"/>
+=======
+ <reference key="sourceIdentifier" ref="923334499"/>
+>>>>>>> other
</object>
<object class="IBPartialClassDescription">
<string key="className">NSWindowController</string>
@@ -2917,7 +2988,11 @@
<string key="NS.key.0">delegate</string>
<string key="NS.object.0">id</string>
</object>
+<<<<<<< local
<reference key="sourceIdentifier" ref="813335145"/>
+=======
+ <reference key="sourceIdentifier" ref="635410044"/>
+>>>>>>> other
</object>
<object class="IBPartialClassDescription">
<string key="className">RBSplitView</string>
@@ -2934,7 +3009,11 @@
<string key="NS.key.0">delegate</string>
<string key="NS.object.0">id</string>
</object>
+<<<<<<< local
<reference key="sourceIdentifier" ref="1012191871"/>
+=======
+ <reference key="sourceIdentifier" ref="614467045"/>
+>>>>>>> other
</object>
<object class="IBPartialClassDescription">
<string key="className">SS_PrefsController</string>
@@ -2958,21 +3037,33 @@
<object class="IBPartialClassDescription">
<string key="className">NSApplication</string>
<string key="superclassName">NSResponder</string>
+<<<<<<< local
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="858666581">
+=======
+ <object class="IBClassDescriptionSource" key="sourceIdentifier" id="739165087">
+>>>>>>> other
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSApplication.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSApplication</string>
+<<<<<<< local
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="957119647">
+=======
+ <object class="IBClassDescriptionSource" key="sourceIdentifier" id="780237942">
+>>>>>>> other
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSApplicationScripting.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSApplication</string>
+<<<<<<< local
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="173352404">
+=======
+ <object class="IBClassDescriptionSource" key="sourceIdentifier" id="957571596">
+>>>>>>> other
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSColorPanel.h</string>
</object>
@@ -3033,7 +3124,11 @@
<object class="IBPartialClassDescription">
<string key="className">NSControl</string>
<string key="superclassName">NSView</string>
+<<<<<<< local
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="79062585">
+=======
+ <object class="IBClassDescriptionSource" key="sourceIdentifier" id="131119711">
+>>>>>>> other
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSControl.h</string>
</object>
@@ -3049,7 +3144,11 @@
<object class="IBPartialClassDescription">
<string key="className">NSMenu</string>
<string key="superclassName">NSObject</string>
+<<<<<<< local
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="150560450">
+=======
+ <object class="IBClassDescriptionSource" key="sourceIdentifier" id="681727971">
+>>>>>>> other
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSMenu.h</string>
</object>
@@ -3057,7 +3156,11 @@
<object class="IBPartialClassDescription">
<string key="className">NSMenuItem</string>
<string key="superclassName">NSObject</string>
+<<<<<<< local
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="1064215231">
+=======
+ <object class="IBClassDescriptionSource" key="sourceIdentifier" id="952549422">
+>>>>>>> other
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSMenuItem.h</string>
</object>
@@ -3086,19 +3189,35 @@
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
+<<<<<<< local
<reference key="sourceIdentifier" ref="858666581"/>
+=======
+ <reference key="sourceIdentifier" ref="739165087"/>
+>>>>>>> other
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
+<<<<<<< local
<reference key="sourceIdentifier" ref="957119647"/>
+=======
+ <reference key="sourceIdentifier" ref="780237942"/>
+>>>>>>> other
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
+<<<<<<< local
<reference key="sourceIdentifier" ref="173352404"/>
+=======
+ <reference key="sourceIdentifier" ref="957571596"/>
+>>>>>>> other
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
+<<<<<<< local
<reference key="sourceIdentifier" ref="79062585"/>
+=======
+ <reference key="sourceIdentifier" ref="131119711"/>
+>>>>>>> other
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
@@ -3137,7 +3256,11 @@
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
+<<<<<<< local
<reference key="sourceIdentifier" ref="150560450"/>
+=======
+ <reference key="sourceIdentifier" ref="681727971"/>
+>>>>>>> other
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
@@ -3183,7 +3306,11 @@
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
+<<<<<<< local
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="905506231">
+=======
+ <object class="IBClassDescriptionSource" key="sourceIdentifier" id="138213594">
+>>>>>>> other
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSView.h</string>
</object>
@@ -3677,7 +3804,11 @@
</object>
<object class="IBPartialClassDescription">
<string key="className">NSView</string>
+<<<<<<< local
<reference key="sourceIdentifier" ref="1064215231"/>
+=======
+ <reference key="sourceIdentifier" ref="952549422"/>
+>>>>>>> other
</object>
<object class="IBPartialClassDescription">
<string key="className">NSView</string>
@@ -3689,7 +3820,11 @@
<object class="IBPartialClassDescription">
<string key="className">NSView</string>
<string key="superclassName">NSResponder</string>
+<<<<<<< local
<reference key="sourceIdentifier" ref="905506231"/>
+=======
+ <reference key="sourceIdentifier" ref="138213594"/>
+>>>>>>> other
</object>
<object class="IBPartialClassDescription">
<string key="className">NSWindow</string>
diff -r 9c32a9b78f76 -r c30d45478bad Frameworks/Adium Framework/Resources/es.lproj/EditStateSheet.nib/keyedobjects.nib
Binary file Frameworks/Adium Framework/Resources/es.lproj/EditStateSheet.nib/keyedobjects.nib has changed
diff -r 9c32a9b78f76 -r c30d45478bad Frameworks/Adium Framework/Resources/fr.lproj/EditStateSheet.nib/keyedobjects.nib
Binary file Frameworks/Adium Framework/Resources/fr.lproj/EditStateSheet.nib/keyedobjects.nib has changed
diff -r 9c32a9b78f76 -r c30d45478bad Frameworks/Adium Framework/Resources/is.lproj/EditStateSheet.nib/keyedobjects.nib
Binary file Frameworks/Adium Framework/Resources/is.lproj/EditStateSheet.nib/keyedobjects.nib has changed
diff -r 9c32a9b78f76 -r c30d45478bad Frameworks/Adium Framework/Resources/pt.lproj/EditStateSheet.nib/keyedobjects.nib
Binary file Frameworks/Adium Framework/Resources/pt.lproj/EditStateSheet.nib/keyedobjects.nib has changed
diff -r 9c32a9b78f76 -r c30d45478bad Frameworks/Adium Framework/Resources/sl.lproj/EditStateSheet.nib/keyedobjects.nib
Binary file Frameworks/Adium Framework/Resources/sl.lproj/EditStateSheet.nib/keyedobjects.nib has changed
diff -r 9c32a9b78f76 -r c30d45478bad Frameworks/Adium Framework/Resources/sv.lproj/EditStateSheet.nib/keyedobjects.nib
Binary file Frameworks/Adium Framework/Resources/sv.lproj/EditStateSheet.nib/keyedobjects.nib has changed
diff -r 9c32a9b78f76 -r c30d45478bad Frameworks/Adium Framework/Resources/tr.lproj/EditStateSheet.nib/keyedobjects.nib
Binary file Frameworks/Adium Framework/Resources/tr.lproj/EditStateSheet.nib/keyedobjects.nib has changed
diff -r 9c32a9b78f76 -r c30d45478bad Frameworks/Adium Framework/Resources/zh_TW.lproj/EditStateSheet.nib/designable.nib
--- a/Frameworks/Adium Framework/Resources/zh_TW.lproj/EditStateSheet.nib/designable.nib Mon Nov 23 17:02:25 2009 -0500
+++ b/Frameworks/Adium Framework/Resources/zh_TW.lproj/EditStateSheet.nib/designable.nib Mon Nov 23 16:05:18 2009 -0600
@@ -2,13 +2,13 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1050</int>
- <string key="IBDocument.SystemVersion">10B504</string>
- <string key="IBDocument.InterfaceBuilderVersion">732</string>
- <string key="IBDocument.AppKitVersion">1038.2</string>
- <string key="IBDocument.HIToolboxVersion">437.00</string>
+ <string key="IBDocument.SystemVersion">10C540</string>
+ <string key="IBDocument.InterfaceBuilderVersion">740</string>
+ <string key="IBDocument.AppKitVersion">1038.25</string>
+ <string key="IBDocument.HIToolboxVersion">458.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">732</string>
+ <string key="NS.object.0">740</string>
</object>
<array class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<integer value="6"/>
@@ -229,7 +229,7 @@
<string key="NSColorName">selectedTextBackgroundColor</string>
<object class="NSColor" key="NSColor" id="1040244629">
<int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MC42NjY2NjY2ODY1AA</bytes>
+ <bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
</object>
</object>
<object class="NSColor" key="NSColor" id="619902141">
@@ -644,7 +644,7 @@
<object class="NSButton" id="772666412">
<reference key="NSNextResponder" ref="480005987"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{13, 21}, {169, 18}}</string>
+ <string key="NSFrame">{{13, 21}, {100, 18}}</string>
<reference key="NSSuperview" ref="480005987"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="316327104">
@@ -858,7 +858,7 @@
<object class="NSButton" id="525619090">
<reference key="NSNextResponder" ref="480005987"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{13, 72}, {104, 18}}</string>
+ <string key="NSFrame">{{13, 72}, {48, 18}}</string>
<reference key="NSSuperview" ref="480005987"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="348103232">
@@ -880,7 +880,7 @@
<object class="NSButton" id="889977915">
<reference key="NSNextResponder" ref="480005987"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{13, 47}, {141, 18}}</string>
+ <string key="NSFrame">{{13, 47}, {132, 18}}</string>
<reference key="NSSuperview" ref="480005987"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="36292360">
@@ -1949,6 +1949,14 @@
<string key="textView_autoReply">AISendingTextView</string>
<string key="textView_statusMessage">AISendingTextView</string>
</dictionary>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier" id="218438751">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Frameworks/Adium Framework/Source/AIEditStateWindowController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">AIEditStateWindowController</string>
+ <string key="superclassName">AIWindowController</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBUserSource</string>
<string key="minorKey"/>
@@ -1963,6 +1971,14 @@
<string key="window_anchorOnLeftSide">NSWindow</string>
<string key="window_anchorOnRightSide">NSWindow</string>
</dictionary>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier" id="706385163">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Frameworks/Adium Framework/Source/AILocalizationTextField.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">AILocalizationTextField</string>
+ <string key="superclassName">NSTextField</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBUserSource</string>
<string key="minorKey"/>
@@ -1977,6 +1993,14 @@
<string key="scrollPageUp:">id</string>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Frameworks/Adium Framework/Source/AIMessageEntryTextView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">AIMessageEntryTextView</string>
+ <string key="superclassName">AISendingTextView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBUserSource</string>
<string key="minorKey"/>
</object>
@@ -2013,6 +2037,14 @@
<string key="NS.object.0">id</string>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Frameworks/Adium Framework/Source/AIWindowController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">AIWindowController</string>
+ <string key="superclassName">NSWindowController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBUserSource</string>
<string key="minorKey"/>
</object>
@@ -2035,6 +2067,13 @@
</object>
<object class="IBPartialClassDescription">
<string key="className">NSButton</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Frameworks/Adium Framework/Source/AILocalizationButton.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSButton</string>
<string key="superclassName">NSControl</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBUserSource</string>
@@ -2043,6 +2082,13 @@
</object>
<object class="IBPartialClassDescription">
<string key="className">NSButtonCell</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Frameworks/Adium Framework/Source/AILocalizationButtonCell.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSButtonCell</string>
<string key="superclassName">NSActionCell</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBUserSource</string>
@@ -2075,11 +2121,185 @@
</object>
<object class="IBPartialClassDescription">
<string key="className">NSObject</string>
+ <object class="NSMutableDictionary" key="actions">
+ <string key="NS.key.0">toggleFindPanel:</string>
+ <string key="NS.object.0">id</string>
+ </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Frameworks/Adium Framework/Source/AIAbstractListController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Frameworks/Adium Framework/Source/AIAccountControllerProtocol.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Frameworks/Adium Framework/Source/AICustomSocialNetworkingStatusWindowController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <reference key="sourceIdentifier" ref="218438751"/>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="NSMutableDictionary" key="actions">
+ <string key="NS.key.0">adiumPrint:</string>
+ <string key="NS.object.0">id</string>
+ </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier" id="471823917">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Frameworks/Adium Framework/Source/AIInterfaceControllerProtocol.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Frameworks/Adium Framework/Source/AILocalizationAssistance.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Frameworks/Adium Framework/Source/AIMenuControllerProtocol.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Frameworks/Adium Framework/Source/AIPreferenceControllerProtocol.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Frameworks/Adium Framework/Source/ESContactAlertsViewController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Frameworks/Adium Framework/Source/ESPresetManagementController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Frameworks/Adium Framework/Source/ESPresetNameSheetController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Frameworks/Adium Framework/Source/ESTextAndButtonsWindowController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Frameworks/Adium Framework/Source/JVFontPreviewField.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="NSMutableDictionary" key="actions">
+ <string key="NS.key.0">prefsWindowWillClose:</string>
+ <string key="NS.object.0">SS_PrefsController</string>
+ </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier" id="566421064">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Frameworks/Adium Framework/Source/SS_PrefsController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Frameworks/ShortcutRecorder/Source/SRRecorderCell.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Frameworks/ShortcutRecorder/Source/SRRecorderControl.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Frameworks/ShortcutRecorder/Source/SRValidator.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Source/AIListLayoutWindowController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Source/AIListThemeWindowController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Source/AIMenuItemView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Source/AINewBookmarkWindowController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Source/AIServiceMenu.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Source/KNShelfSplitView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Source/OWABSearchWindowController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
<dictionary class="NSMutableDictionary" key="actions">
- <string key="adiumPrint:">id</string>
<string key="didAdjustSubviews:">RBSplitView</string>
- <string key="prefsWindowWillClose:">SS_PrefsController</string>
- <string key="toggleFindPanel:">id</string>
<string key="willAdjustSubviews:">RBSplitView</string>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -2113,6 +2333,10 @@
</object>
<object class="IBPartialClassDescription">
<string key="className">NSTextField</string>
+ <reference key="sourceIdentifier" ref="706385163"/>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSTextField</string>
<string key="superclassName">NSControl</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBUserSource</string>
@@ -2137,6 +2361,13 @@
</object>
<object class="IBPartialClassDescription">
<string key="className">NSWindow</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Source/NSWindowScriptingAdditions.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSWindow</string>
<string key="superclassName">NSResponder</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBUserSource</string>
@@ -2145,6 +2376,10 @@
</object>
<object class="IBPartialClassDescription">
<string key="className">NSWindowController</string>
+ <reference key="sourceIdentifier" ref="471823917"/>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSWindowController</string>
<string key="superclassName">NSResponder</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBUserSource</string>
@@ -2178,6 +2413,11 @@
<string key="NS.key.0">delegate</string>
<string key="NS.object.0">id</string>
</object>
+ <reference key="sourceIdentifier" ref="566421064"/>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">SS_PrefsController</string>
+ <string key="superclassName">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBUserSource</string>
<string key="minorKey"/>
@@ -2190,6 +2430,10 @@
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
<integer value="1050" key="NS.object.0"/>
</object>
+ <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
+ <integer value="1050" key="NS.object.0"/>
+ </object>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<string key="IBDocument.LastKnownRelativeProjectPath">../../../../Adium.xcodeproj</string>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
diff -r 9c32a9b78f76 -r c30d45478bad Frameworks/Adium Framework/Resources/zh_TW.lproj/EditStateSheet.nib/keyedobjects.nib
Binary file Frameworks/Adium Framework/Resources/zh_TW.lproj/EditStateSheet.nib/keyedobjects.nib has changed
More information about the commits
mailing list