Index: chrome/app/nibs/Preferences.xib |
=================================================================== |
--- chrome/app/nibs/Preferences.xib (revision 30827) |
+++ chrome/app/nibs/Preferences.xib (working copy) |
@@ -2272,7 +2272,7 @@ |
<string key="NSClassName">NSView</string> |
</object> |
<object class="NSCustomView" id="933437956"> |
- <reference key="NSNextResponder"/> |
+ <nil key="NSNextResponder"/> |
<int key="NSvFlags">268</int> |
<object class="NSMutableArray" key="NSSubviews"> |
<bool key="EncodedWithXMLCoder">YES</bool> |
@@ -2291,14 +2291,11 @@ |
<int key="NSvFlags">274</int> |
<string key="NSFrameSize">{484, 402}</string> |
<reference key="NSSuperview" ref="277407604"/> |
- <reference key="NSWindow"/> |
<string key="NSClassName">NSView</string> |
</object> |
</object> |
<string key="NSFrame">{{1, 1}, {484, 402}}</string> |
<reference key="NSSuperview" ref="14278481"/> |
- <reference key="NSWindow"/> |
- <reference key="NSNextKeyView" ref="772886817"/> |
<reference key="NSDocView" ref="772886817"/> |
<object class="NSColor" key="NSBGColor"> |
<int key="NSColorSpace">3</int> |
@@ -2311,7 +2308,6 @@ |
<int key="NSvFlags">256</int> |
<string key="NSFrame">{{485, 1}, {15, 402}}</string> |
<reference key="NSSuperview" ref="14278481"/> |
- <reference key="NSWindow"/> |
<reference key="NSTarget" ref="14278481"/> |
<string key="NSAction">_doScroller:</string> |
<double key="NSCurValue">1.000000e+00</double> |
@@ -2322,7 +2318,6 @@ |
<int key="NSvFlags">-2147483392</int> |
<string key="NSFrame">{{-100, -100}, {482, 15}}</string> |
<reference key="NSSuperview" ref="14278481"/> |
- <reference key="NSWindow"/> |
<int key="NSsFlags">1</int> |
<reference key="NSTarget" ref="14278481"/> |
<string key="NSAction">_doScroller:</string> |
@@ -2331,38 +2326,43 @@ |
</object> |
<string key="NSFrame">{{-1, 60}, {501, 404}}</string> |
<reference key="NSSuperview" ref="933437956"/> |
- <reference key="NSWindow"/> |
- <reference key="NSNextKeyView" ref="277407604"/> |
<int key="NSsFlags">18</int> |
<reference key="NSVScroller" ref="331420378"/> |
<reference key="NSHScroller" ref="470087648"/> |
<reference key="NSContentView" ref="277407604"/> |
</object> |
- <object class="NSButton" id="961419405"> |
+ <object class="NSCustomView" id="926632778"> |
<reference key="NSNextResponder" ref="933437956"/> |
<int key="NSvFlags">289</int> |
- <string key="NSFrame">{{337, 12}, {148, 32}}</string> |
+ <object class="NSMutableArray" key="NSSubviews"> |
+ <bool key="EncodedWithXMLCoder">YES</bool> |
+ <object class="NSButton" id="961419405"> |
+ <reference key="NSNextResponder" ref="926632778"/> |
+ <int key="NSvFlags">289</int> |
+ <string key="NSFrame">{{14, 12}, {85, 32}}</string> |
+ <reference key="NSSuperview" ref="926632778"/> |
+ <bool key="NSEnabled">YES</bool> |
+ <object class="NSButtonCell" key="NSCell" id="319834642"> |
+ <int key="NSCellFlags">604110336</int> |
+ <int key="NSCellFlags2">134217728</int> |
+ <string key="NSContents">^IDS_OPTIONS_RESET</string> |
+ <reference key="NSSupport" ref="445696277"/> |
+ <reference key="NSControlView" ref="961419405"/> |
+ <int key="NSButtonFlags">-2038284033</int> |
+ <int key="NSButtonFlags2">129</int> |
+ <string key="NSAlternateContents"/> |
+ <string key="NSKeyEquivalent"/> |
+ <int key="NSPeriodicDelay">200</int> |
+ <int key="NSPeriodicInterval">25</int> |
+ </object> |
+ </object> |
+ </object> |
+ <string key="NSFrame">{{386, 0}, {113, 52}}</string> |
<reference key="NSSuperview" ref="933437956"/> |
- <reference key="NSWindow"/> |
- <bool key="NSEnabled">YES</bool> |
- <object class="NSButtonCell" key="NSCell" id="319834642"> |
- <int key="NSCellFlags">604110336</int> |
- <int key="NSCellFlags2">134217728</int> |
- <string key="NSContents">^IDS_OPTIONS_RESET</string> |
- <reference key="NSSupport" ref="445696277"/> |
- <reference key="NSControlView" ref="961419405"/> |
- <int key="NSButtonFlags">-2038284033</int> |
- <int key="NSButtonFlags2">129</int> |
- <string key="NSAlternateContents"/> |
- <string key="NSKeyEquivalent"/> |
- <int key="NSPeriodicDelay">200</int> |
- <int key="NSPeriodicInterval">25</int> |
- </object> |
+ <string key="NSClassName">GTMWidthBasedTweaker</string> |
</object> |
</object> |
<string key="NSFrameSize">{499, 463}</string> |
- <reference key="NSSuperview"/> |
- <reference key="NSWindow"/> |
<string key="NSClassName">NSView</string> |
</object> |
<object class="NSCustomObject" id="385419425"> |
@@ -2401,6 +2401,9 @@ |
<object class="NSCustomObject" id="487772665"> |
<string key="NSClassName">GTMIBArray</string> |
</object> |
+ <object class="NSCustomObject" id="938815385"> |
+ <string key="NSClassName">GTMUILocalizerAndLayoutTweaker</string> |
+ </object> |
</object> |
<object class="IBObjectContainer" key="IBDocument.Objects"> |
<object class="NSMutableArray" key="connectionRecords"> |
@@ -3072,14 +3075,6 @@ |
</object> |
<object class="IBConnectionRecord"> |
<object class="IBOutletConnection" key="connection"> |
- <string key="label">otherObjectToLocalize_</string> |
- <reference key="source" ref="305848829"/> |
- <reference key="destination" ref="933437956"/> |
- </object> |
- <int key="connectionID">511</int> |
- </object> |
- <object class="IBConnectionRecord"> |
- <object class="IBOutletConnection" key="connection"> |
<string key="label">yetAnotherObjectToLocalize_</string> |
<reference key="source" ref="305848829"/> |
<reference key="destination" ref="1016273328"/> |
@@ -3458,6 +3453,22 @@ |
</object> |
<int key="connectionID">594</int> |
</object> |
+ <object class="IBConnectionRecord"> |
+ <object class="IBOutletConnection" key="connection"> |
+ <string key="label">localizer_</string> |
+ <reference key="source" ref="938815385"/> |
+ <reference key="destination" ref="305848829"/> |
+ </object> |
+ <int key="connectionID">597</int> |
+ </object> |
+ <object class="IBConnectionRecord"> |
+ <object class="IBOutletConnection" key="connection"> |
+ <string key="label">uiObject_</string> |
+ <reference key="source" ref="938815385"/> |
+ <reference key="destination" ref="933437956"/> |
+ </object> |
+ <int key="connectionID">598</int> |
+ </object> |
</object> |
<object class="IBMutableOrderedSet" key="objectRecords"> |
<object class="NSArray" key="orderedObjects"> |
@@ -4133,7 +4144,7 @@ |
<object class="NSMutableArray" key="children"> |
<bool key="EncodedWithXMLCoder">YES</bool> |
<reference ref="14278481"/> |
- <reference ref="961419405"/> |
+ <reference ref="926632778"/> |
</object> |
<reference key="parent" ref="415821041"/> |
<string key="objectName">Under the Hood View</string> |
@@ -4165,20 +4176,6 @@ |
<reference key="parent" ref="14278481"/> |
</object> |
<object class="IBObjectRecord"> |
- <int key="objectID">160</int> |
- <reference key="object" ref="961419405"/> |
- <object class="NSMutableArray" key="children"> |
- <bool key="EncodedWithXMLCoder">YES</bool> |
- <reference ref="319834642"/> |
- </object> |
- <reference key="parent" ref="933437956"/> |
- </object> |
- <object class="IBObjectRecord"> |
- <int key="objectID">161</int> |
- <reference key="object" ref="319834642"/> |
- <reference key="parent" ref="961419405"/> |
- </object> |
- <object class="IBObjectRecord"> |
<int key="objectID">485</int> |
<reference key="object" ref="530275816"/> |
<object class="NSMutableArray" key="children"> |
@@ -4618,6 +4615,34 @@ |
<reference key="parent" ref="415821041"/> |
<string key="objectName">Personal Stuff Themes Group</string> |
</object> |
+ <object class="IBObjectRecord"> |
+ <int key="objectID">595</int> |
+ <reference key="object" ref="926632778"/> |
+ <object class="NSMutableArray" key="children"> |
+ <bool key="EncodedWithXMLCoder">YES</bool> |
+ <reference ref="961419405"/> |
+ </object> |
+ <reference key="parent" ref="933437956"/> |
+ </object> |
+ <object class="IBObjectRecord"> |
+ <int key="objectID">160</int> |
+ <reference key="object" ref="961419405"/> |
+ <object class="NSMutableArray" key="children"> |
+ <bool key="EncodedWithXMLCoder">YES</bool> |
+ <reference ref="319834642"/> |
+ </object> |
+ <reference key="parent" ref="926632778"/> |
+ </object> |
+ <object class="IBObjectRecord"> |
+ <int key="objectID">161</int> |
+ <reference key="object" ref="319834642"/> |
+ <reference key="parent" ref="961419405"/> |
+ </object> |
+ <object class="IBObjectRecord"> |
+ <int key="objectID">596</int> |
+ <reference key="object" ref="938815385"/> |
+ <reference key="parent" ref="415821041"/> |
+ </object> |
</object> |
</object> |
<object class="NSMutableDictionary" key="flattenedProperties"> |
@@ -4767,6 +4792,7 @@ |
<string>57.IBPluginDependency</string> |
<string>58.IBPluginDependency</string> |
<string>59.IBPluginDependency</string> |
+ <string>596.IBPluginDependency</string> |
<string>60.IBPluginDependency</string> |
<string>61.IBPluginDependency</string> |
<string>62.IBPluginDependency</string> |
@@ -4908,7 +4934,7 @@ |
</object> |
<string>{{86, 655}, {499, 330}}</string> |
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> |
- <string>{{81, 524}, {499, 463}}</string> |
+ <string>{{81, 525}, {499, 463}}</string> |
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> |
<string>{{682, 562}, {616, 0}}</string> |
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> |
@@ -4955,6 +4981,7 @@ |
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> |
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> |
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> |
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> |
<string>{{557, 200}, {443, 665}}</string> |
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> |
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> |
@@ -4995,7 +5022,7 @@ |
</object> |
</object> |
<nil key="sourceID"/> |
- <int key="maxID">594</int> |
+ <int key="maxID">598</int> |
</object> |
<object class="IBClassDescriber" key="IBDocument.Classes"> |
<object class="NSMutableArray" key="referencedPartialClassDescriptions"> |
@@ -5059,6 +5086,49 @@ |
</object> |
</object> |
<object class="IBPartialClassDescription"> |
+ <string key="className">GTMUILocalizerAndLayoutTweaker</string> |
+ <string key="superclassName">NSObject</string> |
+ <object class="NSMutableDictionary" key="outlets"> |
+ <bool key="EncodedWithXMLCoder">YES</bool> |
+ <object class="NSMutableArray" key="dict.sortedKeys"> |
+ <bool key="EncodedWithXMLCoder">YES</bool> |
+ <string>localizerOwner_</string> |
+ <string>localizer_</string> |
+ <string>uiObject_</string> |
+ </object> |
+ <object class="NSMutableArray" key="dict.values"> |
+ <bool key="EncodedWithXMLCoder">YES</bool> |
+ <string>id</string> |
+ <string>GTMUILocalizer</string> |
+ <string>id</string> |
+ </object> |
+ </object> |
+ <object class="IBClassDescriptionSource" key="sourceIdentifier" id="255098441"> |
+ <string key="majorKey">IBProjectSource</string> |
+ <string key="minorKey">../third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h</string> |
+ </object> |
+ </object> |
+ <object class="IBPartialClassDescription"> |
+ <string key="className">GTMWidthBasedTweaker</string> |
+ <string key="superclassName">NSView</string> |
+ <object class="NSMutableDictionary" key="outlets"> |
+ <bool key="EncodedWithXMLCoder">YES</bool> |
+ <object class="NSMutableArray" key="dict.sortedKeys"> |
+ <bool key="EncodedWithXMLCoder">YES</bool> |
+ <string>viewToResize_</string> |
+ <string>viewToSlideAndResize_</string> |
+ <string>viewToSlide_</string> |
+ </object> |
+ <object class="NSMutableArray" key="dict.values"> |
+ <bool key="EncodedWithXMLCoder">YES</bool> |
+ <string>id</string> |
+ <string>NSView</string> |
+ <string>NSView</string> |
+ </object> |
+ </object> |
+ <reference key="sourceIdentifier" ref="255098441"/> |
+ </object> |
+ <object class="IBPartialClassDescription"> |
<string key="className">HyperlinkButtonCell</string> |
<string key="superclassName">NSButtonCell</string> |
<object class="IBClassDescriptionSource" key="sourceIdentifier"> |