diff options
author | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-25 19:46:16 +0000 |
---|---|---|
committer | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-25 19:46:16 +0000 |
commit | 74fe4941b0a12b9a5b01c92380fc89c2ab0cf829 (patch) | |
tree | cd035cd6dd879a1cead2d07578e90d483a96cd7d /chrome/app | |
parent | bb06e1bc0c6ebb2988a7ffcfefa22bfccdd82e23 (diff) | |
download | chromium_src-74fe4941b0a12b9a5b01c92380fc89c2ab0cf829.zip chromium_src-74fe4941b0a12b9a5b01c92380fc89c2ab0cf829.tar.gz chromium_src-74fe4941b0a12b9a5b01c92380fc89c2ab0cf829.tar.bz2 |
Remove languages tab from Mac, because languages are set in the System Preferences.
Nib changes: Change the "fonts and languages" string to refer to "fonts" only. Remove the "languages" tab from the "fonts and languages" xib.
BUG= 39008
TEST= open preferences in Mac. see no reference to languages in "Under the Hood".
Review URL: http://codereview.chromium.org/1306002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42657 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r-- | chrome/app/generated_resources.grd | 13 | ||||
-rw-r--r-- | chrome/app/nibs/FontLanguageSettings.xib | 1542 | ||||
-rw-r--r-- | chrome/app/nibs/Preferences.xib | 14 |
3 files changed, 738 insertions, 831 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 4867016..0abed42 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -4970,7 +4970,7 @@ Keep your key file in a safe place. You will need it to create new versions of y </message> <!-- Advanced Font/Language settings --> - <message name="IDS_FONT_LANGUAGE_SETTING_WINDOWS_TITLE" desc="Title that appears in the dialogue title bar for advanced font/encoding settings"> + <message name="IDS_FONT_LANGUAGE_SETTING_WINDOWS_TITLE" desc="Title that appears in the dialogue title bar for advanced font/encoding and language settings"> Fonts and Languages </message> <message name="IDS_FONT_LANGUAGE_SETTING_FONT_TAB_TITLE" desc="Title that appears in the sub-dialogue for Fonts and Encoding"> @@ -5018,6 +5018,10 @@ Keep your key file in a safe place. You will need it to create new versions of y <message name="IDS_FONT_LANGUAGE_SETTING_LANGUAGES_SELECTOR_ADD_BUTTON_LABEL" desc="Button label for Add languages"> Add </message> + <message name="IDS_FONT_SETTING_WINDOWS_TITLE" desc="Title that appears in the dialogue title bar for advanced font/encoding settings"> + Fonts and Encoding + </message> + <!-- HTTP POST Warning --> <message name="IDS_HTTP_POST_WARNING_TITLE" desc="Title for dialog that warns users about a navigation that results in a repost"> @@ -6115,10 +6119,13 @@ Keep your key file in a safe place. You will need it to create new versions of y <message name="IDS_OPTIONS_FONTSETTINGS_INFO" desc="Information text about font and language options for web pages"> Change the default font and language for webpages. </message> - <message name="IDS_OPTIONS_FONTSETTINGS_CONFIGUREFONTS_BUTTON" desc="The label of the 'configure fonts' button"> + <message name="IDS_OPTIONS_FONTSETTINGS_CONFIGUREFONTS_BUTTON" desc="The label of the 'configure fonts and languages' button"> Change font and language settings </message> - + <message name="IDS_OPTIONS_FONTSETTINGS_CONFIGUREFONTSONLY_BUTTON" desc="The label of the 'configure fonts' button"> + Change font settings + </message> + <message name="IDS_OPTIONS_CHROME_DICTIONARY_INFO" desc="The documentation string of the 'Spell check dictionary language' section"> Change the language of the spell-checking dictionary. </message> diff --git a/chrome/app/nibs/FontLanguageSettings.xib b/chrome/app/nibs/FontLanguageSettings.xib index d246583..1d54dc3 100644 --- a/chrome/app/nibs/FontLanguageSettings.xib +++ b/chrome/app/nibs/FontLanguageSettings.xib @@ -8,7 +8,7 @@ <string key="IBDocument.HIToolboxVersion">353.00</string> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="7"/> + <integer value="1"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -37,9 +37,9 @@ <object class="NSWindowTemplate" id="1005"> <int key="NSWindowStyleMask">7</int> <int key="NSWindowBacking">2</int> - <string key="NSWindowRect">{{196, 223}, {562, 287}}</string> + <string key="NSWindowRect">{{196, 253}, {527, 257}}</string> <int key="NSWTFlags">544735232</int> - <string key="NSWindowTitle">^IDS_FONT_LANGUAGE_SETTING_WINDOWS_TITLE</string> + <string key="NSWindowTitle">^IDS_FONT_SETTING_WINDOWS_TITLE</string> <string key="NSWindowClass">NSWindow</string> <nil key="NSViewClass"/> <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string> @@ -48,453 +48,399 @@ <int key="NSvFlags">256</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSTabView" id="324743742"> + <object class="NSView" id="234912857"> <reference key="NSNextResponder" ref="1006"/> - <int key="NSvFlags">12</int> - <string key="NSFrame">{{13, 47}, {536, 234}}</string> - <reference key="NSSuperview" ref="1006"/> - <object class="NSMutableArray" key="NSTabViewItems"> + <int key="NSvFlags">256</int> + <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSTabViewItem" id="328614539"> - <string key="NSIdentifier">1</string> - <object class="NSView" key="NSView" id="138873164"> - <reference key="NSNextResponder" ref="324743742"/> - <int key="NSvFlags">256</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSTextField" id="1012521134"> - <reference key="NSNextResponder" ref="138873164"/> - <int key="NSvFlags">268</int> - <string key="NSFrame">{{14, 168}, {488, 17}}</string> - <reference key="NSSuperview" ref="138873164"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="1050739220"> - <int key="NSCellFlags">68288064</int> - <int key="NSCellFlags2">272630784</int> - <string key="NSContents">^IDS_FONT_LANGUAGE_SETTING_FONT_SUB_DIALOG_FONT_TITLE</string> - <object class="NSFont" key="NSSupport" id="398885850"> - <string key="NSName">LucidaGrande-Bold</string> - <double key="NSSize">1.300000e+01</double> - <int key="NSfFlags">16</int> - </object> - <reference key="NSControlView" ref="1012521134"/> - <object class="NSColor" key="NSBackgroundColor" id="236360023"> - <int key="NSColorSpace">6</int> - <string key="NSCatalogName">System</string> - <string key="NSColorName">controlColor</string> - <object class="NSColor" key="NSColor"> - <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MC42NjY2NjY2OQA</bytes> - </object> - </object> - <object class="NSColor" key="NSTextColor" id="457126496"> - <int key="NSColorSpace">6</int> - <string key="NSCatalogName">System</string> - <string key="NSColorName">controlTextColor</string> - <object class="NSColor" key="NSColor" id="140946240"> - <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MAA</bytes> - </object> - </object> - </object> + <object class="NSTextField" id="426019583"> + <reference key="NSNextResponder" ref="234912857"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{14, 168}, {488, 17}}</string> + <reference key="NSSuperview" ref="234912857"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="137444641"> + <int key="NSCellFlags">68288064</int> + <int key="NSCellFlags2">272630784</int> + <string key="NSContents">^IDS_FONT_LANGUAGE_SETTING_FONT_SUB_DIALOG_FONT_TITLE</string> + <object class="NSFont" key="NSSupport" id="398885850"> + <string key="NSName">LucidaGrande-Bold</string> + <double key="NSSize">1.300000e+01</double> + <int key="NSfFlags">16</int> + </object> + <reference key="NSControlView" ref="426019583"/> + <object class="NSColor" key="NSBackgroundColor" id="236360023"> + <int key="NSColorSpace">6</int> + <string key="NSCatalogName">System</string> + <string key="NSColorName">controlColor</string> + <object class="NSColor" key="NSColor"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MC42NjY2NjY2OQA</bytes> </object> - <object class="NSTextField" id="588963101"> - <reference key="NSNextResponder" ref="138873164"/> - <int key="NSvFlags">268</int> - <string key="NSFrame">{{14, 40}, {488, 17}}</string> - <reference key="NSSuperview" ref="138873164"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="1051446020"> - <int key="NSCellFlags">68288064</int> - <int key="NSCellFlags2">272630784</int> - <string key="NSContents">^IDS_FONT_LANGUAGE_SETTING_FONT_SUB_DIALOG_ENCODING_TITLE</string> - <reference key="NSSupport" ref="398885850"/> - <reference key="NSControlView" ref="588963101"/> - <reference key="NSBackgroundColor" ref="236360023"/> - <reference key="NSTextColor" ref="457126496"/> - </object> + </object> + <object class="NSColor" key="NSTextColor" id="457126496"> + <int key="NSColorSpace">6</int> + <string key="NSCatalogName">System</string> + <string key="NSColorName">controlTextColor</string> + <object class="NSColor" key="NSColor" id="140946240"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MAA</bytes> </object> - <object class="NSPopUpButton" id="910704053"> - <reference key="NSNextResponder" ref="138873164"/> - <int key="NSvFlags">266</int> - <string key="NSFrame">{{132, 9}, {370, 26}}</string> - <reference key="NSSuperview" ref="138873164"/> - <bool key="NSEnabled">YES</bool> - <object class="NSPopUpButtonCell" key="NSCell" id="462066169"> - <int key="NSCellFlags">-2076049856</int> - <int key="NSCellFlags2">2048</int> - <object class="NSFont" key="NSSupport" id="30022524"> - <string key="NSName">LucidaGrande</string> - <double key="NSSize">1.300000e+01</double> - <int key="NSfFlags">1044</int> - </object> - <reference key="NSControlView" ref="910704053"/> - <int key="NSButtonFlags">109199615</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="190161827"> - <reference key="NSMenu" ref="299118344"/> - <string key="NSTitle">Item 1</string> - <string key="NSKeyEquiv"/> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <int key="NSState">1</int> - <object class="NSCustomResource" key="NSOnImage" id="566504709"> - <string key="NSClassName">NSImage</string> - <string key="NSResourceName">NSMenuCheckmark</string> - </object> - <object class="NSCustomResource" key="NSMixedImage" id="582391633"> - <string key="NSClassName">NSImage</string> - <string key="NSResourceName">NSMenuMixedState</string> - </object> - <string key="NSAction">_popUpItemAction:</string> - <reference key="NSTarget" ref="462066169"/> - </object> - <bool key="NSMenuItemRespectAlignment">YES</bool> - <object class="NSMenu" key="NSMenu" id="299118344"> - <string key="NSTitle">OtherViews</string> - <object class="NSMutableArray" key="NSMenuItems"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="190161827"/> - <object class="NSMenuItem" id="540965943"> - <reference key="NSMenu" ref="299118344"/> - <string key="NSTitle">Item 2</string> - <string key="NSKeyEquiv"/> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="566504709"/> - <reference key="NSMixedImage" ref="582391633"/> - <string key="NSAction">_popUpItemAction:</string> - <reference key="NSTarget" ref="462066169"/> - </object> - <object class="NSMenuItem" id="915492366"> - <reference key="NSMenu" ref="299118344"/> - <string key="NSTitle">Item 3</string> - <string key="NSKeyEquiv"/> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="566504709"/> - <reference key="NSMixedImage" ref="582391633"/> - <string key="NSAction">_popUpItemAction:</string> - <reference key="NSTarget" ref="462066169"/> - </object> - </object> - </object> - <int key="NSPreferredEdge">1</int> - <bool key="NSUsesItemFromMenu">YES</bool> - <bool key="NSAltersState">YES</bool> - <int key="NSArrowPosition">2</int> - </object> + </object> + </object> + </object> + <object class="NSTextField" id="131023551"> + <reference key="NSNextResponder" ref="234912857"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{14, 40}, {488, 17}}</string> + <reference key="NSSuperview" ref="234912857"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="641652821"> + <int key="NSCellFlags">68288064</int> + <int key="NSCellFlags2">272630784</int> + <string key="NSContents">^IDS_FONT_LANGUAGE_SETTING_FONT_SUB_DIALOG_ENCODING_TITLE</string> + <reference key="NSSupport" ref="398885850"/> + <reference key="NSControlView" ref="131023551"/> + <reference key="NSBackgroundColor" ref="236360023"/> + <reference key="NSTextColor" ref="457126496"/> + </object> + </object> + <object class="NSPopUpButton" id="191782641"> + <reference key="NSNextResponder" ref="234912857"/> + <int key="NSvFlags">266</int> + <string key="NSFrame">{{132, 9}, {370, 26}}</string> + <reference key="NSSuperview" ref="234912857"/> + <bool key="NSEnabled">YES</bool> + <object class="NSPopUpButtonCell" key="NSCell" id="947939277"> + <int key="NSCellFlags">-2076049856</int> + <int key="NSCellFlags2">2048</int> + <object class="NSFont" key="NSSupport" id="30022524"> + <string key="NSName">LucidaGrande</string> + <double key="NSSize">1.300000e+01</double> + <int key="NSfFlags">1044</int> + </object> + <reference key="NSControlView" ref="191782641"/> + <int key="NSButtonFlags">109199615</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="1063280698"> + <reference key="NSMenu" ref="97308908"/> + <string key="NSTitle">Item 1</string> + <string key="NSKeyEquiv"/> + <int key="NSKeyEquivModMask">1048576</int> + <int key="NSMnemonicLoc">2147483647</int> + <int key="NSState">1</int> + <object class="NSCustomResource" key="NSOnImage" id="130084428"> + <string key="NSClassName">NSImage</string> + <string key="NSResourceName">NSMenuCheckmark</string> </object> - <object class="NSCustomView" id="552471826"> - <reference key="NSNextResponder" ref="138873164"/> - <int key="NSvFlags">268</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSTextField" id="1025697156"> - <reference key="NSNextResponder" ref="552471826"/> - <int key="NSvFlags">265</int> - <string key="NSFrame">{{12, 10}, {137, 17}}</string> - <reference key="NSSuperview" ref="552471826"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="652132209"> - <int key="NSCellFlags">68288064</int> - <int key="NSCellFlags2">272630784</int> - <string key="NSContents">^IDS_FONT_LANGUAGE_SETTING_FONT_SELECTOR_FIXED_WIDTH_LABEL</string> - <reference key="NSSupport" ref="30022524"/> - <reference key="NSControlView" ref="1025697156"/> - <reference key="NSBackgroundColor" ref="236360023"/> - <reference key="NSTextColor" ref="457126496"/> - </object> - </object> - <object class="NSTextField" id="781278283"> - <reference key="NSNextResponder" ref="552471826"/> - <int key="NSvFlags">265</int> - <string key="NSFrame">{{12, 41}, {137, 17}}</string> - <reference key="NSSuperview" ref="552471826"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="850558798"> - <int key="NSCellFlags">68288064</int> - <int key="NSCellFlags2">272630784</int> - <string key="NSContents">^IDS_FONT_LANGUAGE_SETTING_FONT_SELECTOR_SANS_SERIF_LABEL</string> - <reference key="NSSupport" ref="30022524"/> - <reference key="NSControlView" ref="781278283"/> - <reference key="NSBackgroundColor" ref="236360023"/> - <reference key="NSTextColor" ref="457126496"/> - </object> - </object> - <object class="NSTextField" id="631498565"> - <reference key="NSNextResponder" ref="552471826"/> - <int key="NSvFlags">265</int> - <string key="NSFrame">{{12, 73}, {137, 17}}</string> - <reference key="NSSuperview" ref="552471826"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="696313204"> - <int key="NSCellFlags">68288064</int> - <int key="NSCellFlags2">272630784</int> - <string key="NSContents">^IDS_FONT_LANGUAGE_SETTING_FONT_SELECTOR_SERIF_LABEL</string> - <reference key="NSSupport" ref="30022524"/> - <reference key="NSControlView" ref="631498565"/> - <reference key="NSBackgroundColor" ref="236360023"/> - <reference key="NSTextColor" ref="457126496"/> - </object> - </object> - </object> - <string key="NSFrame">{{-3, 70}, {151, 110}}</string> - <reference key="NSSuperview" ref="138873164"/> - <string key="NSClassName">GTMWidthBasedTweaker</string> + <object class="NSCustomResource" key="NSMixedImage" id="356692328"> + <string key="NSClassName">NSImage</string> + <string key="NSResourceName">NSMenuMixedState</string> </object> - <object class="NSCustomView" id="139012251"> - <reference key="NSNextResponder" ref="138873164"/> - <int key="NSvFlags">268</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSTextField" id="52816081"> - <reference key="NSNextResponder" ref="139012251"/> - <int key="NSvFlags">265</int> - <string key="NSFrame">{{17, 20}, {116, 17}}</string> - <reference key="NSSuperview" ref="139012251"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="672014458"> - <int key="NSCellFlags">68288064</int> - <int key="NSCellFlags2">272630784</int> - <string key="NSContents">^IDS_FONT_LANGUAGE_SETTING_FONT_DEFAULT_ENCODING_SELECTOR_LABEL</string> - <reference key="NSSupport" ref="30022524"/> - <reference key="NSControlView" ref="52816081"/> - <reference key="NSBackgroundColor" ref="236360023"/> - <reference key="NSTextColor" ref="457126496"/> - </object> - </object> + <string key="NSAction">_popUpItemAction:</string> + <reference key="NSTarget" ref="947939277"/> + </object> + <bool key="NSMenuItemRespectAlignment">YES</bool> + <object class="NSMenu" key="NSMenu" id="97308908"> + <string key="NSTitle">OtherViews</string> + <object class="NSMutableArray" key="NSMenuItems"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="1063280698"/> + <object class="NSMenuItem" id="974199815"> + <reference key="NSMenu" ref="97308908"/> + <string key="NSTitle">Item 2</string> + <string key="NSKeyEquiv"/> + <int key="NSKeyEquivModMask">1048576</int> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="130084428"/> + <reference key="NSMixedImage" ref="356692328"/> + <string key="NSAction">_popUpItemAction:</string> + <reference key="NSTarget" ref="947939277"/> </object> - <string key="NSFrame">{{-3, -5}, {150, 57}}</string> - <reference key="NSSuperview" ref="138873164"/> - <string key="NSClassName">GTMWidthBasedTweaker</string> - </object> - <object class="NSCustomView" id="61508028"> - <reference key="NSNextResponder" ref="138873164"/> - <int key="NSvFlags">292</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSButton" id="291904614"> - <reference key="NSNextResponder" ref="61508028"/> - <int key="NSvFlags">268</int> - <string key="NSFrame">{{14, 1}, {101, 32}}</string> - <reference key="NSSuperview" ref="61508028"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="345949999"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">134217728</int> - <string key="NSContents">^IDS_FONT_LANGUAGE_SETTING_FONT_SELECTOR_BUTTON_LABEL</string> - <reference key="NSSupport" ref="30022524"/> - <reference key="NSControlView" ref="291904614"/> - <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 class="NSButton" id="867122154"> - <reference key="NSNextResponder" ref="61508028"/> - <int key="NSvFlags">268</int> - <string key="NSFrame">{{14, 32}, {101, 32}}</string> - <reference key="NSSuperview" ref="61508028"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="419948454"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">134217728</int> - <string key="NSContents">^IDS_FONT_LANGUAGE_SETTING_FONT_SELECTOR_BUTTON_LABEL</string> - <reference key="NSSupport" ref="30022524"/> - <reference key="NSControlView" ref="867122154"/> - <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 class="NSButton" id="735769204"> - <reference key="NSNextResponder" ref="61508028"/> - <int key="NSvFlags">268</int> - <string key="NSFrame">{{14, 64}, {101, 32}}</string> - <reference key="NSSuperview" ref="61508028"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="379999922"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">134217728</int> - <string key="NSContents">^IDS_FONT_LANGUAGE_SETTING_FONT_SELECTOR_BUTTON_LABEL</string> - <reference key="NSSupport" ref="30022524"/> - <reference key="NSControlView" ref="735769204"/> - <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 class="NSMenuItem" id="465594413"> + <reference key="NSMenu" ref="97308908"/> + <string key="NSTitle">Item 3</string> + <string key="NSKeyEquiv"/> + <int key="NSKeyEquivModMask">1048576</int> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="130084428"/> + <reference key="NSMixedImage" ref="356692328"/> + <string key="NSAction">_popUpItemAction:</string> + <reference key="NSTarget" ref="947939277"/> </object> - <string key="NSFrame">{{390, 70}, {129, 113}}</string> - <reference key="NSSuperview" ref="138873164"/> - <string key="NSClassName">GTMWidthBasedTweaker</string> </object> - <object class="NSBox" id="560582995"> - <reference key="NSNextResponder" ref="138873164"/> - <int key="NSvFlags">36</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSView" id="299326217"> - <reference key="NSNextResponder" ref="560582995"/> - <int key="NSvFlags">256</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSTextField" id="643651530"> - <reference key="NSNextResponder" ref="299326217"/> - <int key="NSvFlags">266</int> - <string key="NSFrame">{{0, 82}, {259, 22}}</string> - <reference key="NSSuperview" ref="299326217"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="95207710"> - <int key="NSCellFlags">-2079195584</int> - <int key="NSCellFlags2">306185216</int> - <string key="NSContents"/> - <reference key="NSSupport" ref="30022524"/> - <reference key="NSControlView" ref="643651530"/> - <bool key="NSDrawsBackground">YES</bool> - <int key="NSTextBezelStyle">1</int> - <object class="NSColor" key="NSBackgroundColor" id="255726597"> - <int key="NSColorSpace">6</int> - <string key="NSCatalogName">System</string> - <string key="NSColorName">textBackgroundColor</string> - <object class="NSColor" key="NSColor"> - <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MQA</bytes> - </object> - </object> - <object class="NSColor" key="NSTextColor" id="876664397"> - <int key="NSColorSpace">6</int> - <string key="NSCatalogName">System</string> - <string key="NSColorName">textColor</string> - <reference key="NSColor" ref="140946240"/> - </object> - </object> - </object> - <object class="NSTextField" id="543957925"> - <reference key="NSNextResponder" ref="299326217"/> - <int key="NSvFlags">266</int> - <string key="NSFrame">{{0, 50}, {259, 22}}</string> - <reference key="NSSuperview" ref="299326217"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="407170690"> - <int key="NSCellFlags">-2079195584</int> - <int key="NSCellFlags2">306185216</int> - <string key="NSContents"/> - <reference key="NSSupport" ref="30022524"/> - <reference key="NSControlView" ref="543957925"/> - <bool key="NSDrawsBackground">YES</bool> - <int key="NSTextBezelStyle">1</int> - <reference key="NSBackgroundColor" ref="255726597"/> - <reference key="NSTextColor" ref="876664397"/> - </object> - </object> - <object class="NSTextField" id="468611265"> - <reference key="NSNextResponder" ref="299326217"/> - <int key="NSvFlags">266</int> - <string key="NSFrame">{{0, 19}, {259, 22}}</string> - <reference key="NSSuperview" ref="299326217"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="518872086"> - <int key="NSCellFlags">-2079195584</int> - <int key="NSCellFlags2">306185216</int> - <string key="NSContents"/> - <reference key="NSSupport" ref="30022524"/> - <reference key="NSControlView" ref="468611265"/> - <reference key="NSBackgroundColor" ref="255726597"/> - <reference key="NSTextColor" ref="876664397"/> - </object> + </object> + <int key="NSPreferredEdge">1</int> + <bool key="NSUsesItemFromMenu">YES</bool> + <bool key="NSAltersState">YES</bool> + <int key="NSArrowPosition">2</int> + </object> + </object> + <object class="NSCustomView" id="144660324"> + <reference key="NSNextResponder" ref="234912857"/> + <int key="NSvFlags">268</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSTextField" id="9811211"> + <reference key="NSNextResponder" ref="144660324"/> + <int key="NSvFlags">265</int> + <string key="NSFrame">{{12, 10}, {137, 17}}</string> + <reference key="NSSuperview" ref="144660324"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="700506270"> + <int key="NSCellFlags">68288064</int> + <int key="NSCellFlags2">272630784</int> + <string key="NSContents">^IDS_FONT_LANGUAGE_SETTING_FONT_SELECTOR_FIXED_WIDTH_LABEL</string> + <reference key="NSSupport" ref="30022524"/> + <reference key="NSControlView" ref="9811211"/> + <reference key="NSBackgroundColor" ref="236360023"/> + <reference key="NSTextColor" ref="457126496"/> + </object> + </object> + <object class="NSTextField" id="802456298"> + <reference key="NSNextResponder" ref="144660324"/> + <int key="NSvFlags">265</int> + <string key="NSFrame">{{12, 41}, {137, 17}}</string> + <reference key="NSSuperview" ref="144660324"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="916480340"> + <int key="NSCellFlags">68288064</int> + <int key="NSCellFlags2">272630784</int> + <string key="NSContents">^IDS_FONT_LANGUAGE_SETTING_FONT_SELECTOR_SANS_SERIF_LABEL</string> + <reference key="NSSupport" ref="30022524"/> + <reference key="NSControlView" ref="802456298"/> + <reference key="NSBackgroundColor" ref="236360023"/> + <reference key="NSTextColor" ref="457126496"/> + </object> + </object> + <object class="NSTextField" id="427167220"> + <reference key="NSNextResponder" ref="144660324"/> + <int key="NSvFlags">265</int> + <string key="NSFrame">{{12, 73}, {137, 17}}</string> + <reference key="NSSuperview" ref="144660324"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="326475576"> + <int key="NSCellFlags">68288064</int> + <int key="NSCellFlags2">272630784</int> + <string key="NSContents">^IDS_FONT_LANGUAGE_SETTING_FONT_SELECTOR_SERIF_LABEL</string> + <reference key="NSSupport" ref="30022524"/> + <reference key="NSControlView" ref="427167220"/> + <reference key="NSBackgroundColor" ref="236360023"/> + <reference key="NSTextColor" ref="457126496"/> + </object> + </object> + </object> + <string key="NSFrame">{{-3, 70}, {151, 110}}</string> + <reference key="NSSuperview" ref="234912857"/> + <string key="NSClassName">GTMWidthBasedTweaker</string> + </object> + <object class="NSCustomView" id="801380756"> + <reference key="NSNextResponder" ref="234912857"/> + <int key="NSvFlags">268</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSTextField" id="726857614"> + <reference key="NSNextResponder" ref="801380756"/> + <int key="NSvFlags">265</int> + <string key="NSFrame">{{17, 20}, {116, 17}}</string> + <reference key="NSSuperview" ref="801380756"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="1047502891"> + <int key="NSCellFlags">68288064</int> + <int key="NSCellFlags2">272630784</int> + <string key="NSContents">^IDS_FONT_LANGUAGE_SETTING_FONT_DEFAULT_ENCODING_SELECTOR_LABEL</string> + <reference key="NSSupport" ref="30022524"/> + <reference key="NSControlView" ref="726857614"/> + <reference key="NSBackgroundColor" ref="236360023"/> + <reference key="NSTextColor" ref="457126496"/> + </object> + </object> + </object> + <string key="NSFrame">{{-3, -5}, {150, 57}}</string> + <reference key="NSSuperview" ref="234912857"/> + <string key="NSClassName">GTMWidthBasedTweaker</string> + </object> + <object class="NSCustomView" id="392576942"> + <reference key="NSNextResponder" ref="234912857"/> + <int key="NSvFlags">292</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSButton" id="689224103"> + <reference key="NSNextResponder" ref="392576942"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{14, 1}, {101, 32}}</string> + <reference key="NSSuperview" ref="392576942"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="892287911"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">134217728</int> + <string key="NSContents">^IDS_FONT_LANGUAGE_SETTING_FONT_SELECTOR_BUTTON_LABEL</string> + <reference key="NSSupport" ref="30022524"/> + <reference key="NSControlView" ref="689224103"/> + <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 class="NSButton" id="920096097"> + <reference key="NSNextResponder" ref="392576942"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{14, 32}, {101, 32}}</string> + <reference key="NSSuperview" ref="392576942"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="423783484"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">134217728</int> + <string key="NSContents">^IDS_FONT_LANGUAGE_SETTING_FONT_SELECTOR_BUTTON_LABEL</string> + <reference key="NSSupport" ref="30022524"/> + <reference key="NSControlView" ref="920096097"/> + <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 class="NSButton" id="293748647"> + <reference key="NSNextResponder" ref="392576942"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{14, 64}, {101, 32}}</string> + <reference key="NSSuperview" ref="392576942"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="921698346"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">134217728</int> + <string key="NSContents">^IDS_FONT_LANGUAGE_SETTING_FONT_SELECTOR_BUTTON_LABEL</string> + <reference key="NSSupport" ref="30022524"/> + <reference key="NSControlView" ref="293748647"/> + <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">{{390, 70}, {129, 113}}</string> + <reference key="NSSuperview" ref="234912857"/> + <string key="NSClassName">GTMWidthBasedTweaker</string> + </object> + <object class="NSBox" id="574545322"> + <reference key="NSNextResponder" ref="234912857"/> + <int key="NSvFlags">36</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSView" id="85789246"> + <reference key="NSNextResponder" ref="574545322"/> + <int key="NSvFlags">256</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSTextField" id="817537708"> + <reference key="NSNextResponder" ref="85789246"/> + <int key="NSvFlags">266</int> + <string key="NSFrame">{{0, 82}, {259, 22}}</string> + <reference key="NSSuperview" ref="85789246"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="204646851"> + <int key="NSCellFlags">-2079195584</int> + <int key="NSCellFlags2">306185216</int> + <string key="NSContents"/> + <reference key="NSSupport" ref="30022524"/> + <reference key="NSControlView" ref="817537708"/> + <bool key="NSDrawsBackground">YES</bool> + <int key="NSTextBezelStyle">1</int> + <object class="NSColor" key="NSBackgroundColor" id="255726597"> + <int key="NSColorSpace">6</int> + <string key="NSCatalogName">System</string> + <string key="NSColorName">textBackgroundColor</string> + <object class="NSColor" key="NSColor"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MQA</bytes> </object> </object> - <string key="NSFrameSize">{260, 115}</string> - <reference key="NSSuperview" ref="560582995"/> + <object class="NSColor" key="NSTextColor" id="876664397"> + <int key="NSColorSpace">6</int> + <string key="NSCatalogName">System</string> + <string key="NSColorName">textColor</string> + <reference key="NSColor" ref="140946240"/> + </object> </object> </object> - <string key="NSFrame">{{147, 57}, {260, 115}}</string> - <reference key="NSSuperview" ref="138873164"/> - <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"> - <string key="NSName">LucidaGrande</string> - <double key="NSSize">1.100000e+01</double> - <int key="NSfFlags">3100</int> + <object class="NSTextField" id="329906523"> + <reference key="NSNextResponder" ref="85789246"/> + <int key="NSvFlags">266</int> + <string key="NSFrame">{{0, 50}, {259, 22}}</string> + <reference key="NSSuperview" ref="85789246"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="881824787"> + <int key="NSCellFlags">-2079195584</int> + <int key="NSCellFlags2">306185216</int> + <string key="NSContents"/> + <reference key="NSSupport" ref="30022524"/> + <reference key="NSControlView" ref="329906523"/> + <bool key="NSDrawsBackground">YES</bool> + <int key="NSTextBezelStyle">1</int> + <reference key="NSBackgroundColor" ref="255726597"/> + <reference key="NSTextColor" ref="876664397"/> </object> - <reference key="NSBackgroundColor" ref="255726597"/> - <object class="NSColor" key="NSTextColor"> - <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes> + </object> + <object class="NSTextField" id="216474640"> + <reference key="NSNextResponder" ref="85789246"/> + <int key="NSvFlags">266</int> + <string key="NSFrame">{{0, 24}, {259, 17}}</string> + <reference key="NSSuperview" ref="85789246"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="553864914"> + <int key="NSCellFlags">-2079195584</int> + <int key="NSCellFlags2">306185216</int> + <string key="NSContents"/> + <reference key="NSSupport" ref="398885850"/> + <reference key="NSControlView" ref="216474640"/> + <reference key="NSBackgroundColor" ref="255726597"/> + <reference key="NSTextColor" ref="876664397"/> </object> </object> - <reference key="NSContentView" ref="299326217"/> - <int key="NSBorderType">0</int> - <int key="NSBoxType">0</int> - <int key="NSTitlePosition">0</int> - <bool key="NSTransparent">NO</bool> </object> + <string key="NSFrameSize">{260, 115}</string> + <reference key="NSSuperview" ref="574545322"/> </object> - <string key="NSFrame">{{10, 33}, {516, 188}}</string> - <reference key="NSSuperview" ref="324743742"/> </object> - <string key="NSLabel">^IDS_FONT_LANGUAGE_SETTING_FONT_TAB_TITLE</string> - <reference key="NSColor" ref="236360023"/> - <reference key="NSTabView" ref="324743742"/> - </object> - <object class="NSTabViewItem" id="544604771"> - <string key="NSIdentifier">2</string> - <object class="NSView" key="NSView" id="266567003"> - <nil key="NSNextResponder"/> - <int key="NSvFlags">256</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSTextField" id="33425503"> - <reference key="NSNextResponder" ref="266567003"/> - <int key="NSvFlags">268</int> - <string key="NSFrame">{{122, 94}, {427, 17}}</string> - <reference key="NSSuperview" ref="266567003"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="848038315"> - <int key="NSCellFlags">68288064</int> - <int key="NSCellFlags2">272630784</int> - <string key="NSContents">These settings are not yet implemented.</string> - <reference key="NSSupport" ref="30022524"/> - <reference key="NSControlView" ref="33425503"/> - <reference key="NSBackgroundColor" ref="236360023"/> - <reference key="NSTextColor" ref="457126496"/> - </object> - </object> + <string key="NSFrame">{{147, 57}, {260, 115}}</string> + <reference key="NSSuperview" ref="234912857"/> + <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"> + <string key="NSName">LucidaGrande</string> + <double key="NSSize">1.100000e+01</double> + <int key="NSfFlags">3100</int> + </object> + <reference key="NSBackgroundColor" ref="255726597"/> + <object class="NSColor" key="NSTextColor"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes> </object> - <string key="NSFrame">{{10, 33}, {516, 188}}</string> </object> - <string key="NSLabel">^IDS_FONT_LANGUAGE_SETTING_LANGUAGES_TAB_TITLE</string> - <reference key="NSColor" ref="236360023"/> - <reference key="NSTabView" ref="324743742"/> + <reference key="NSContentView" ref="85789246"/> + <int key="NSBorderType">0</int> + <int key="NSBoxType">0</int> + <int key="NSTitlePosition">0</int> + <bool key="NSTransparent">NO</bool> </object> </object> - <reference key="NSSelectedTabViewItem" ref="328614539"/> - <reference key="NSFont" ref="30022524"/> - <int key="NSTvFlags">0</int> - <bool key="NSAllowTruncatedLabels">YES</bool> - <bool key="NSDrawsBackground">YES</bool> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="138873164"/> - </object> + <string key="NSFrame">{{8, 49}, {516, 188}}</string> + <reference key="NSSuperview" ref="1006"/> </object> <object class="NSCustomView" id="435246767"> <reference key="NSNextResponder" ref="1006"/> @@ -542,12 +488,12 @@ </object> </object> </object> - <string key="NSFrame">{{342, 0}, {220, 54}}</string> + <string key="NSFrame">{{307, 0}, {220, 54}}</string> <reference key="NSSuperview" ref="1006"/> <string key="NSClassName">GTMWidthBasedTweaker</string> </object> </object> - <string key="NSFrameSize">{562, 287}</string> + <string key="NSFrameSize">{527, 257}</string> <reference key="NSSuperview"/> </object> <string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string> @@ -557,6 +503,7 @@ <object class="NSMutableArray" key="NSDeclaredKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>name</string> + <string>defaultEncodingIndex_</string> </object> <object class="_NSManagedProxy" key="_NSManagedProxy"/> <bool key="NSAvoidsEmptySelection">YES</bool> @@ -584,111 +531,6 @@ <int key="connectionID">32</int> </object> <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">fixedWidthButton_</string> - <reference key="source" ref="1001"/> - <reference key="destination" ref="291904614"/> - </object> - <int key="connectionID">33</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">sansSerifButton_</string> - <reference key="source" ref="1001"/> - <reference key="destination" ref="867122154"/> - </object> - <int key="connectionID">35</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">serifButton_</string> - <reference key="source" ref="1001"/> - <reference key="destination" ref="735769204"/> - </object> - <int key="connectionID">37</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">selectFont:</string> - <reference key="source" ref="1001"/> - <reference key="destination" ref="735769204"/> - </object> - <int key="connectionID">46</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">selectFont:</string> - <reference key="source" ref="1001"/> - <reference key="destination" ref="867122154"/> - </object> - <int key="connectionID">47</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">selectFont:</string> - <reference key="source" ref="1001"/> - <reference key="destination" ref="291904614"/> - </object> - <int key="connectionID">48</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">serifField_</string> - <reference key="source" ref="1001"/> - <reference key="destination" ref="643651530"/> - </object> - <int key="connectionID">49</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">sansSerifField_</string> - <reference key="source" ref="1001"/> - <reference key="destination" ref="543957925"/> - </object> - <int key="connectionID">50</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">fixedWidthField_</string> - <reference key="source" ref="1001"/> - <reference key="destination" ref="468611265"/> - </object> - <int key="connectionID">51</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBBindingConnection" key="connection"> - <string key="label">content: arrangedObjects.name</string> - <reference key="source" ref="910704053"/> - <reference key="destination" ref="45399218"/> - <object class="NSNibBindingConnector" key="connector" id="502479255"> - <reference key="NSSource" ref="910704053"/> - <reference key="NSDestination" ref="45399218"/> - <string key="NSLabel">content: arrangedObjects.name</string> - <string key="NSBinding">content</string> - <string key="NSKeyPath">arrangedObjects.name</string> - <int key="NSNibBindingConnectorVersion">2</int> - </object> - </object> - <int key="connectionID">64</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBBindingConnection" key="connection"> - <string key="label">selectedIndex: defaultEncodingIndex_</string> - <reference key="source" ref="910704053"/> - <reference key="destination" ref="1001"/> - <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="910704053"/> - <reference key="NSDestination" ref="1001"/> - <string key="NSLabel">selectedIndex: defaultEncodingIndex_</string> - <string key="NSBinding">selectedIndex</string> - <string key="NSKeyPath">defaultEncodingIndex_</string> - <reference key="NSPreviousConnector" ref="502479255"/> - <int key="NSNibBindingConnectorVersion">2</int> - </object> - </object> - <int key="connectionID">68</int> - </object> - <object class="IBConnectionRecord"> <object class="IBBindingConnection" key="connection"> <string key="label">contentArray: encodings</string> <reference key="source" ref="45399218"/> @@ -739,42 +581,147 @@ <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> <string key="label">viewToSlideAndResize_</string> - <reference key="source" ref="552471826"/> - <reference key="destination" ref="560582995"/> + <reference key="source" ref="144660324"/> + <reference key="destination" ref="574545322"/> </object> - <int key="connectionID">87</int> + <int key="connectionID">167</int> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> <string key="label">viewToSlideAndResize_</string> - <reference key="source" ref="139012251"/> - <reference key="destination" ref="910704053"/> + <reference key="source" ref="801380756"/> + <reference key="destination" ref="191782641"/> </object> - <int key="connectionID">89</int> + <int key="connectionID">168</int> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> <string key="label">serifLabel_</string> <reference key="source" ref="1001"/> - <reference key="destination" ref="631498565"/> + <reference key="destination" ref="427167220"/> </object> - <int key="connectionID">91</int> + <int key="connectionID">169</int> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">fixedWidthLabel_</string> + <string key="label">serifField_</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="817537708"/> + </object> + <int key="connectionID">170</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">serifButton_</string> <reference key="source" ref="1001"/> - <reference key="destination" ref="1025697156"/> + <reference key="destination" ref="293748647"/> </object> - <int key="connectionID">92</int> + <int key="connectionID">171</int> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> <string key="label">sansSerifLabel_</string> <reference key="source" ref="1001"/> - <reference key="destination" ref="781278283"/> + <reference key="destination" ref="802456298"/> </object> - <int key="connectionID">93</int> + <int key="connectionID">172</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">sansSerifField_</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="329906523"/> + </object> + <int key="connectionID">173</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">sansSerifButton_</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="920096097"/> + </object> + <int key="connectionID">174</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">fixedWidthLabel_</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="9811211"/> + </object> + <int key="connectionID">175</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">fixedWidthField_</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="216474640"/> + </object> + <int key="connectionID">176</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">fixedWidthButton_</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="689224103"/> + </object> + <int key="connectionID">177</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">selectFont:</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="293748647"/> + </object> + <int key="connectionID">179</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">selectFont:</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="920096097"/> + </object> + <int key="connectionID">180</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">selectFont:</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="689224103"/> + </object> + <int key="connectionID">181</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">content: arrangedObjects.name</string> + <reference key="source" ref="191782641"/> + <reference key="destination" ref="45399218"/> + <object class="NSNibBindingConnector" key="connector" id="502479255"> + <reference key="NSSource" ref="191782641"/> + <reference key="NSDestination" ref="45399218"/> + <string key="NSLabel">content: arrangedObjects.name</string> + <string key="NSBinding">content</string> + <string key="NSKeyPath">arrangedObjects.name</string> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">183</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">selectedIndex: defaultEncodingIndex_</string> + <reference key="source" ref="191782641"/> + <reference key="destination" ref="1001"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="191782641"/> + <reference key="NSDestination" ref="1001"/> + <string key="NSLabel">selectedIndex: defaultEncodingIndex_</string> + <string key="NSBinding">selectedIndex</string> + <string key="NSKeyPath">defaultEncodingIndex_</string> + <reference key="NSPreviousConnector" ref="502479255"/> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">187</int> </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> @@ -820,383 +767,332 @@ <reference key="object" ref="1006"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="324743742"/> <reference ref="435246767"/> + <reference ref="234912857"/> </object> <reference key="parent" ref="1005"/> </object> <object class="IBObjectRecord"> - <int key="objectID">3</int> - <reference key="object" ref="324743742"/> + <int key="objectID">62</int> + <reference key="object" ref="45399218"/> + <reference key="parent" ref="415027465"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">78</int> + <reference key="object" ref="1049709893"/> + <reference key="parent" ref="415027465"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">81</int> + <reference key="object" ref="435246767"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="328614539"/> - <reference ref="544604771"/> + <reference ref="577390425"/> + <reference ref="872321321"/> </object> <reference key="parent" ref="1006"/> </object> <object class="IBObjectRecord"> - <int key="objectID">4</int> - <reference key="object" ref="328614539"/> + <int key="objectID">73</int> + <reference key="object" ref="577390425"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="138873164"/> + <reference ref="238283370"/> </object> - <reference key="parent" ref="324743742"/> + <reference key="parent" ref="435246767"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">74</int> + <reference key="object" ref="238283370"/> + <reference key="parent" ref="577390425"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5</int> - <reference key="object" ref="544604771"/> + <int key="objectID">71</int> + <reference key="object" ref="872321321"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="266567003"/> + <reference ref="70105462"/> </object> - <reference key="parent" ref="324743742"/> + <reference key="parent" ref="435246767"/> </object> <object class="IBObjectRecord"> - <int key="objectID">6</int> - <reference key="object" ref="266567003"/> + <int key="objectID">72</int> + <reference key="object" ref="70105462"/> + <reference key="parent" ref="872321321"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">83</int> + <reference key="object" ref="693805035"/> + <reference key="parent" ref="415027465"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">132</int> + <reference key="object" ref="234912857"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="33425503"/> + <reference ref="574545322"/> + <reference ref="392576942"/> + <reference ref="801380756"/> + <reference ref="144660324"/> + <reference ref="191782641"/> + <reference ref="131023551"/> + <reference ref="426019583"/> </object> - <reference key="parent" ref="544604771"/> + <reference key="parent" ref="1006"/> </object> <object class="IBObjectRecord"> - <int key="objectID">7</int> - <reference key="object" ref="138873164"/> + <int key="objectID">133</int> + <reference key="object" ref="574545322"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="1012521134"/> - <reference ref="588963101"/> - <reference ref="910704053"/> - <reference ref="552471826"/> - <reference ref="139012251"/> - <reference ref="61508028"/> - <reference ref="560582995"/> + <reference ref="329906523"/> + <reference ref="216474640"/> + <reference ref="817537708"/> </object> - <reference key="parent" ref="328614539"/> + <reference key="parent" ref="234912857"/> </object> <object class="IBObjectRecord"> - <int key="objectID">8</int> - <reference key="object" ref="1012521134"/> + <int key="objectID">134</int> + <reference key="object" ref="392576942"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="1050739220"/> + <reference ref="689224103"/> + <reference ref="920096097"/> + <reference ref="293748647"/> </object> - <reference key="parent" ref="138873164"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">9</int> - <reference key="object" ref="1050739220"/> - <reference key="parent" ref="1012521134"/> + <reference key="parent" ref="234912857"/> </object> <object class="IBObjectRecord"> - <int key="objectID">28</int> - <reference key="object" ref="588963101"/> + <int key="objectID">135</int> + <reference key="object" ref="801380756"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="1051446020"/> + <reference ref="726857614"/> </object> - <reference key="parent" ref="138873164"/> + <reference key="parent" ref="234912857"/> </object> <object class="IBObjectRecord"> - <int key="objectID">29</int> - <reference key="object" ref="1051446020"/> - <reference key="parent" ref="588963101"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">52</int> - <reference key="object" ref="33425503"/> + <int key="objectID">136</int> + <reference key="object" ref="144660324"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="848038315"/> + <reference ref="802456298"/> + <reference ref="9811211"/> + <reference ref="427167220"/> </object> - <reference key="parent" ref="266567003"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">53</int> - <reference key="object" ref="848038315"/> - <reference key="parent" ref="33425503"/> + <reference key="parent" ref="234912857"/> </object> <object class="IBObjectRecord"> - <int key="objectID">56</int> - <reference key="object" ref="910704053"/> + <int key="objectID">137</int> + <reference key="object" ref="191782641"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="462066169"/> + <reference ref="947939277"/> </object> - <reference key="parent" ref="138873164"/> + <reference key="parent" ref="234912857"/> </object> <object class="IBObjectRecord"> - <int key="objectID">57</int> - <reference key="object" ref="462066169"/> + <int key="objectID">138</int> + <reference key="object" ref="131023551"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="299118344"/> + <reference ref="641652821"/> </object> - <reference key="parent" ref="910704053"/> + <reference key="parent" ref="234912857"/> </object> <object class="IBObjectRecord"> - <int key="objectID">58</int> - <reference key="object" ref="299118344"/> + <int key="objectID">139</int> + <reference key="object" ref="426019583"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="190161827"/> - <reference ref="540965943"/> - <reference ref="915492366"/> + <reference ref="137444641"/> </object> - <reference key="parent" ref="462066169"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">59</int> - <reference key="object" ref="190161827"/> - <reference key="parent" ref="299118344"/> + <reference key="parent" ref="234912857"/> </object> <object class="IBObjectRecord"> - <int key="objectID">60</int> - <reference key="object" ref="540965943"/> - <reference key="parent" ref="299118344"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">61</int> - <reference key="object" ref="915492366"/> - <reference key="parent" ref="299118344"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">62</int> - <reference key="object" ref="45399218"/> - <reference key="parent" ref="415027465"/> + <int key="objectID">140</int> + <reference key="object" ref="137444641"/> + <reference key="parent" ref="426019583"/> </object> <object class="IBObjectRecord"> - <int key="objectID">78</int> - <reference key="object" ref="1049709893"/> - <reference key="parent" ref="415027465"/> + <int key="objectID">141</int> + <reference key="object" ref="641652821"/> + <reference key="parent" ref="131023551"/> </object> <object class="IBObjectRecord"> - <int key="objectID">79</int> - <reference key="object" ref="552471826"/> + <int key="objectID">142</int> + <reference key="object" ref="947939277"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="631498565"/> - <reference ref="1025697156"/> - <reference ref="781278283"/> + <reference ref="97308908"/> </object> - <reference key="parent" ref="138873164"/> + <reference key="parent" ref="191782641"/> </object> <object class="IBObjectRecord"> - <int key="objectID">10</int> - <reference key="object" ref="631498565"/> + <int key="objectID">143</int> + <reference key="object" ref="97308908"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="696313204"/> + <reference ref="465594413"/> + <reference ref="974199815"/> + <reference ref="1063280698"/> </object> - <reference key="parent" ref="552471826"/> + <reference key="parent" ref="947939277"/> </object> <object class="IBObjectRecord"> - <int key="objectID">11</int> - <reference key="object" ref="696313204"/> - <reference key="parent" ref="631498565"/> + <int key="objectID">144</int> + <reference key="object" ref="465594413"/> + <reference key="parent" ref="97308908"/> </object> <object class="IBObjectRecord"> - <int key="objectID">12</int> - <reference key="object" ref="781278283"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="850558798"/> - </object> - <reference key="parent" ref="552471826"/> + <int key="objectID">145</int> + <reference key="object" ref="974199815"/> + <reference key="parent" ref="97308908"/> </object> <object class="IBObjectRecord"> - <int key="objectID">13</int> - <reference key="object" ref="850558798"/> - <reference key="parent" ref="781278283"/> + <int key="objectID">146</int> + <reference key="object" ref="1063280698"/> + <reference key="parent" ref="97308908"/> </object> <object class="IBObjectRecord"> - <int key="objectID">14</int> - <reference key="object" ref="1025697156"/> + <int key="objectID">147</int> + <reference key="object" ref="802456298"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="652132209"/> + <reference ref="916480340"/> </object> - <reference key="parent" ref="552471826"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">15</int> - <reference key="object" ref="652132209"/> - <reference key="parent" ref="1025697156"/> + <reference key="parent" ref="144660324"/> </object> <object class="IBObjectRecord"> - <int key="objectID">80</int> - <reference key="object" ref="139012251"/> + <int key="objectID">148</int> + <reference key="object" ref="9811211"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="52816081"/> + <reference ref="700506270"/> </object> - <reference key="parent" ref="138873164"/> + <reference key="parent" ref="144660324"/> </object> <object class="IBObjectRecord"> - <int key="objectID">54</int> - <reference key="object" ref="52816081"/> + <int key="objectID">149</int> + <reference key="object" ref="427167220"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="672014458"/> + <reference ref="326475576"/> </object> - <reference key="parent" ref="139012251"/> + <reference key="parent" ref="144660324"/> </object> <object class="IBObjectRecord"> - <int key="objectID">55</int> - <reference key="object" ref="672014458"/> - <reference key="parent" ref="52816081"/> + <int key="objectID">150</int> + <reference key="object" ref="326475576"/> + <reference key="parent" ref="427167220"/> </object> <object class="IBObjectRecord"> - <int key="objectID">81</int> - <reference key="object" ref="435246767"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="577390425"/> - <reference ref="872321321"/> - </object> - <reference key="parent" ref="1006"/> + <int key="objectID">151</int> + <reference key="object" ref="700506270"/> + <reference key="parent" ref="9811211"/> </object> <object class="IBObjectRecord"> - <int key="objectID">73</int> - <reference key="object" ref="577390425"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="238283370"/> - </object> - <reference key="parent" ref="435246767"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">74</int> - <reference key="object" ref="238283370"/> - <reference key="parent" ref="577390425"/> + <int key="objectID">152</int> + <reference key="object" ref="916480340"/> + <reference key="parent" ref="802456298"/> </object> <object class="IBObjectRecord"> - <int key="objectID">71</int> - <reference key="object" ref="872321321"/> + <int key="objectID">153</int> + <reference key="object" ref="726857614"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="70105462"/> + <reference ref="1047502891"/> </object> - <reference key="parent" ref="435246767"/> + <reference key="parent" ref="801380756"/> </object> <object class="IBObjectRecord"> - <int key="objectID">72</int> - <reference key="object" ref="70105462"/> - <reference key="parent" ref="872321321"/> + <int key="objectID">154</int> + <reference key="object" ref="1047502891"/> + <reference key="parent" ref="726857614"/> </object> <object class="IBObjectRecord"> - <int key="objectID">82</int> - <reference key="object" ref="61508028"/> + <int key="objectID">155</int> + <reference key="object" ref="689224103"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="735769204"/> - <reference ref="867122154"/> - <reference ref="291904614"/> + <reference ref="892287911"/> </object> - <reference key="parent" ref="138873164"/> + <reference key="parent" ref="392576942"/> </object> <object class="IBObjectRecord"> - <int key="objectID">18</int> - <reference key="object" ref="735769204"/> + <int key="objectID">156</int> + <reference key="object" ref="920096097"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="379999922"/> + <reference ref="423783484"/> </object> - <reference key="parent" ref="61508028"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">19</int> - <reference key="object" ref="379999922"/> - <reference key="parent" ref="735769204"/> + <reference key="parent" ref="392576942"/> </object> <object class="IBObjectRecord"> - <int key="objectID">21</int> - <reference key="object" ref="867122154"/> + <int key="objectID">157</int> + <reference key="object" ref="293748647"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="419948454"/> + <reference ref="921698346"/> </object> - <reference key="parent" ref="61508028"/> + <reference key="parent" ref="392576942"/> </object> <object class="IBObjectRecord"> - <int key="objectID">22</int> - <reference key="object" ref="419948454"/> - <reference key="parent" ref="867122154"/> + <int key="objectID">158</int> + <reference key="object" ref="921698346"/> + <reference key="parent" ref="293748647"/> </object> <object class="IBObjectRecord"> - <int key="objectID">25</int> - <reference key="object" ref="291904614"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="345949999"/> - </object> - <reference key="parent" ref="61508028"/> + <int key="objectID">159</int> + <reference key="object" ref="423783484"/> + <reference key="parent" ref="920096097"/> </object> <object class="IBObjectRecord"> - <int key="objectID">26</int> - <reference key="object" ref="345949999"/> - <reference key="parent" ref="291904614"/> + <int key="objectID">160</int> + <reference key="object" ref="892287911"/> + <reference key="parent" ref="689224103"/> </object> <object class="IBObjectRecord"> - <int key="objectID">83</int> - <reference key="object" ref="693805035"/> - <reference key="parent" ref="415027465"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">86</int> - <reference key="object" ref="560582995"/> + <int key="objectID">161</int> + <reference key="object" ref="329906523"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="643651530"/> - <reference ref="468611265"/> - <reference ref="543957925"/> + <reference ref="881824787"/> </object> - <reference key="parent" ref="138873164"/> + <reference key="parent" ref="574545322"/> </object> <object class="IBObjectRecord"> - <int key="objectID">16</int> - <reference key="object" ref="643651530"/> + <int key="objectID">162</int> + <reference key="object" ref="216474640"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="95207710"/> + <reference ref="553864914"/> </object> - <reference key="parent" ref="560582995"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">17</int> - <reference key="object" ref="95207710"/> - <reference key="parent" ref="643651530"/> + <reference key="parent" ref="574545322"/> </object> <object class="IBObjectRecord"> - <int key="objectID">24</int> - <reference key="object" ref="468611265"/> + <int key="objectID">163</int> + <reference key="object" ref="817537708"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="518872086"/> + <reference ref="204646851"/> </object> - <reference key="parent" ref="560582995"/> + <reference key="parent" ref="574545322"/> </object> <object class="IBObjectRecord"> - <int key="objectID">27</int> - <reference key="object" ref="518872086"/> - <reference key="parent" ref="468611265"/> + <int key="objectID">164</int> + <reference key="object" ref="204646851"/> + <reference key="parent" ref="817537708"/> </object> <object class="IBObjectRecord"> - <int key="objectID">20</int> - <reference key="object" ref="543957925"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="407170690"/> - </object> - <reference key="parent" ref="560582995"/> + <int key="objectID">165</int> + <reference key="object" ref="553864914"/> + <reference key="parent" ref="216474640"/> </object> <object class="IBObjectRecord"> - <int key="objectID">23</int> - <reference key="object" ref="407170690"/> - <reference key="parent" ref="543957925"/> + <int key="objectID">166</int> + <reference key="object" ref="881824787"/> + <reference key="parent" ref="329906523"/> </object> </object> </object> @@ -1213,60 +1109,55 @@ <string>1.NSWindowTemplate.visibleAtLaunch</string> <string>1.WindowOrigin</string> <string>1.editorWindowContentRectSynchronizationRect</string> - <string>10.IBPluginDependency</string> - <string>11.IBPluginDependency</string> - <string>12.IBPluginDependency</string> - <string>13.IBPluginDependency</string> - <string>14.IBPluginDependency</string> - <string>15.IBPluginDependency</string> - <string>16.IBPluginDependency</string> - <string>17.IBPluginDependency</string> - <string>18.IBPluginDependency</string> - <string>19.IBPluginDependency</string> + <string>132.IBPluginDependency</string> + <string>137.IBPluginDependency</string> + <string>138.IBPluginDependency</string> + <string>139.IBPluginDependency</string> + <string>140.IBPluginDependency</string> + <string>141.IBPluginDependency</string> + <string>142.IBPluginDependency</string> + <string>143.IBEditorWindowLastContentRect</string> + <string>143.IBPluginDependency</string> + <string>144.IBPluginDependency</string> + <string>145.IBPluginDependency</string> + <string>146.IBPluginDependency</string> + <string>147.IBPluginDependency</string> + <string>148.IBPluginDependency</string> + <string>149.IBPluginDependency</string> + <string>150.IBPluginDependency</string> + <string>151.IBPluginDependency</string> + <string>152.IBPluginDependency</string> + <string>153.IBPluginDependency</string> + <string>154.IBPluginDependency</string> + <string>155.IBPluginDependency</string> + <string>156.IBPluginDependency</string> + <string>157.IBPluginDependency</string> + <string>158.IBPluginDependency</string> + <string>159.IBPluginDependency</string> + <string>160.IBPluginDependency</string> + <string>161.IBPluginDependency</string> + <string>162.IBPluginDependency</string> + <string>163.IBPluginDependency</string> + <string>164.IBPluginDependency</string> + <string>165.IBPluginDependency</string> + <string>166.IBPluginDependency</string> <string>2.IBPluginDependency</string> - <string>20.IBPluginDependency</string> - <string>21.IBPluginDependency</string> - <string>22.IBPluginDependency</string> - <string>23.IBPluginDependency</string> - <string>24.IBPluginDependency</string> - <string>25.IBPluginDependency</string> - <string>26.IBPluginDependency</string> - <string>27.IBPluginDependency</string> - <string>28.IBPluginDependency</string> - <string>29.IBPluginDependency</string> - <string>3.IBPluginDependency</string> - <string>4.IBPluginDependency</string> - <string>5.IBPluginDependency</string> - <string>52.IBPluginDependency</string> - <string>53.IBPluginDependency</string> - <string>54.IBPluginDependency</string> - <string>55.IBPluginDependency</string> - <string>56.IBPluginDependency</string> - <string>57.IBPluginDependency</string> - <string>58.IBPluginDependency</string> - <string>59.IBPluginDependency</string> - <string>6.IBPluginDependency</string> - <string>60.IBPluginDependency</string> - <string>61.IBPluginDependency</string> <string>62.IBPluginDependency</string> - <string>7.IBPluginDependency</string> <string>71.IBPluginDependency</string> <string>72.IBPluginDependency</string> <string>73.IBPluginDependency</string> <string>74.IBPluginDependency</string> <string>78.IBPluginDependency</string> - <string>8.IBPluginDependency</string> <string>83.IBPluginDependency</string> - <string>9.IBPluginDependency</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{556, 370}, {562, 287}}</string> + <string>{{322, 1207}, {527, 257}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{556, 370}, {562, 287}}</string> + <string>{{322, 1207}, {527, 257}}</string> <boolean value="NO"/> <string>{196, 240}</string> <string>{{357, 418}, {480, 270}}</string> @@ -1277,12 +1168,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>com.apple.InterfaceBuilder.CocoaPlugin</string> - <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>{{719, 1290}, {370, 63}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -1337,7 +1223,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">94</int> + <int key="maxID">188</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -1489,6 +1375,20 @@ <string key="minorKey">browser/cocoa/tab_strip_model_observer_bridge.h</string> </object> </object> + <object class="IBPartialClassDescription"> + <string key="className">NSWindow</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">browser/cocoa/chrome_browser_window.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSWindow</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">browser/cocoa/themed_window.h</string> + </object> + </object> </object> </object> <int key="IBDocument.localizationMode">0</int> diff --git a/chrome/app/nibs/Preferences.xib b/chrome/app/nibs/Preferences.xib index d4b3eda..7f154e0 100644 --- a/chrome/app/nibs/Preferences.xib +++ b/chrome/app/nibs/Preferences.xib @@ -2,14 +2,14 @@ <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.03"> <data> <int key="IBDocument.SystemTarget">1050</int> - <string key="IBDocument.SystemVersion">9L30</string> - <string key="IBDocument.InterfaceBuilderVersion">680</string> + <string key="IBDocument.SystemVersion">9L31a</string> + <string key="IBDocument.InterfaceBuilderVersion">677</string> <string key="IBDocument.AppKitVersion">949.54</string> <string key="IBDocument.HIToolboxVersion">353.00</string> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="74"/> <integer value="481"/> + <integer value="74"/> <integer value="482"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> @@ -539,7 +539,7 @@ <object class="NSButtonCell" key="NSCell" id="526979400"> <int key="NSCellFlags">67239424</int> <int key="NSCellFlags2">134217728</int> - <string key="NSContents">^IDS_OPTIONS_FONTSETTINGS_CONFIGUREFONTS_BUTTON</string> + <string key="NSContents">^IDS_OPTIONS_FONTSETTINGS_CONFIGUREFONTSONLY_BUTTON</string> <reference key="NSSupport" ref="445696277"/> <reference key="NSControlView" ref="777041502"/> <int key="NSButtonFlags">-2038284033</int> @@ -5111,12 +5111,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{605, 290}, {530, 468}}</string> + <string>{{949, 302}, {530, 468}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <object class="NSMutableArray"> <bool key="EncodedWithXMLCoder">YES</bool> </object> - <string>{{48, 419}, {530, 408}}</string> + <string>{{372, 1084}, {530, 408}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>{{87, 136}, {530, 463}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -5188,7 +5188,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{433, 838}, {443, 643}}</string> + <string>{{972, 838}, {443, 643}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> |