diff options
| author | mrossetti@chromium.org <mrossetti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-19 18:59:21 +0000 |
|---|---|---|
| committer | mrossetti@chromium.org <mrossetti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-19 18:59:21 +0000 |
| commit | 4aee5650d2929e202dad66456b90e4ca3de7b7ae (patch) | |
| tree | 6aecb1958e0733e2621e176a7ff2a1b48b8a8ef8 | |
| parent | e5ed44e3fb8e120b36a666d1c65fdfa750b6c579 (diff) | |
| download | chromium_src-4aee5650d2929e202dad66456b90e4ca3de7b7ae.zip chromium_src-4aee5650d2929e202dad66456b90e4ca3de7b7ae.tar.gz chromium_src-4aee5650d2929e202dad66456b90e4ca3de7b7ae.tar.bz2 | |
Implement "Import Bookmarks and Settings".
Changed to MainMenu.xib: Added a new menu item under the ^IDS_SHORT_PRODUCT_NAME menu with the name . This menu item has a tag of 40014 corredponsing to IDC_IMPORT_SETTINGS and is connected to the commandDispatch: action of the CrApplication (First Responder).
Changes to Toolbar.xib: Added a new menu item with the name ^IDS_IMPORT_SETTINGS in the same manner as above.
BUG=26157
TEST=Launch Chrome and inspect the current bookmarks and settings. With no browser window open and then with a browser window open choose the "Import Bookmarks and Settings..." menu option found under the "Chromium" menu. Also, with a browser window open, hoose the "Import Bookmarks and Settings..." menu option found under the page's tool menu. Select a browser from the popup, choose the items to be imported, and press OK. Then inspect the bookmarks and other settings to insure that the selected items have indeed been imported.
Review URL: http://codereview.chromium.org/378036
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32526 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/app/nibs/ImportSettingsDialog.xib | 1176 | ||||
| -rw-r--r-- | chrome/app/nibs/MainMenu.xib | 992 | ||||
| -rw-r--r-- | chrome/app/nibs/Toolbar.xib | 966 | ||||
| -rw-r--r-- | chrome/browser/app_controller_mac.mm | 13 | ||||
| -rw-r--r-- | chrome/browser/browser.cc | 1 | ||||
| -rw-r--r-- | chrome/browser/cocoa/browser_window_cocoa.mm | 6 | ||||
| -rw-r--r-- | chrome/browser/cocoa/import_settings_dialog.h | 110 | ||||
| -rw-r--r-- | chrome/browser/cocoa/import_settings_dialog.mm | 232 | ||||
| -rw-r--r-- | chrome/browser/cocoa/import_settings_dialog_unittest.mm | 137 | ||||
| -rwxr-xr-x | chrome/chrome.gyp | 1 | ||||
| -rwxr-xr-x | chrome/chrome_browser.gypi | 3 |
11 files changed, 1932 insertions, 1705 deletions
diff --git a/chrome/app/nibs/ImportSettingsDialog.xib b/chrome/app/nibs/ImportSettingsDialog.xib new file mode 100644 index 0000000..24828ae --- /dev/null +++ b/chrome/app/nibs/ImportSettingsDialog.xib @@ -0,0 +1,1176 @@ +<?xml version="1.0" encoding="UTF-8"?> +<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.03"> + <data> + <int key="IBDocument.SystemTarget">1050</int> + <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="101"/> + </object> + <object class="NSArray" key="IBDocument.PluginDependencies"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + </object> + <object class="NSMutableDictionary" key="IBDocument.Metadata"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> + </object> + <object class="NSMutableArray" key="IBDocument.RootObjects" id="1000"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSCustomObject" id="1001"> + <string key="NSClassName">ImportSettingsDialogController</string> + </object> + <object class="NSCustomObject" id="1003"> + <string key="NSClassName">FirstResponder</string> + </object> + <object class="NSCustomObject" id="1004"> + <string key="NSClassName">NSApplication</string> + </object> + <object class="NSWindowTemplate" id="1005"> + <int key="NSWindowStyleMask">1</int> + <int key="NSWindowBacking">2</int> + <string key="NSWindowRect">{{196, 289}, {290, 221}}</string> + <int key="NSWTFlags">536871936</int> + <string key="NSWindowTitle">^IDS_IMPORT_SETTINGS_TITLE</string> + <string key="NSWindowClass">NSWindow</string> + <nil key="NSViewClass"/> + <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string> + <object class="NSView" key="NSWindowView" id="1006"> + <reference key="NSNextResponder"/> + <int key="NSvFlags">256</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSCustomView" id="913870182"> + <reference key="NSNextResponder" ref="1006"/> + <int key="NSvFlags">289</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSButton" id="287263597"> + <reference key="NSNextResponder" ref="913870182"/> + <int key="NSvFlags">289</int> + <string key="NSFrame">{{14, 12}, {96, 32}}</string> + <reference key="NSSuperview" ref="913870182"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="1066198765"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">134217728</int> + <string key="NSContents">^IDS_CANCEL</string> + <object class="NSFont" key="NSSupport" id="605141190"> + <string key="NSName">LucidaGrande</string> + <double key="NSSize">1.300000e+01</double> + <int key="NSfFlags">1044</int> + </object> + <reference key="NSControlView" ref="287263597"/> + <int key="NSButtonFlags">-2038284033</int> + <int key="NSButtonFlags2">129</int> + <string key="NSAlternateContents"/> + <string type="base64-UTF8" key="NSKeyEquivalent">Gw</string> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + <object class="NSButton" id="458129764"> + <reference key="NSNextResponder" ref="913870182"/> + <int key="NSvFlags">289</int> + <string key="NSFrame">{{110, 12}, {104, 32}}</string> + <reference key="NSSuperview" ref="913870182"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="685620085"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">134217728</int> + <string key="NSContents">^IDS_IMPORT_COMMIT</string> + <reference key="NSSupport" ref="605141190"/> + <reference key="NSControlView" ref="458129764"/> + <int key="NSButtonFlags">-2038284033</int> + <int key="NSButtonFlags2">129</int> + <string key="NSAlternateContents"/> + <string type="base64-UTF8" key="NSKeyEquivalent">DQ</string> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + </object> + <string key="NSFrame">{{62, 0}, {228, 52}}</string> + <reference key="NSSuperview" ref="1006"/> + <string key="NSClassName">GTMWidthBasedTweaker</string> + </object> + <object class="NSCustomView" id="581221161"> + <reference key="NSNextResponder" ref="1006"/> + <int key="NSvFlags">292</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSPopUpButton" id="21765562"> + <reference key="NSNextResponder" ref="581221161"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{110, 3}, {146, 26}}</string> + <reference key="NSSuperview" ref="581221161"/> + <bool key="NSEnabled">YES</bool> + <object class="NSPopUpButtonCell" key="NSCell" id="983528702"> + <int key="NSCellFlags">-2076049856</int> + <int key="NSCellFlags2">2048</int> + <reference key="NSSupport" ref="605141190"/> + <reference key="NSControlView" ref="21765562"/> + <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="737825762"> + <reference key="NSMenu" ref="799908898"/> + <string key="NSTitle">Safari</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="719677793"> + <string key="NSClassName">NSImage</string> + <string key="NSResourceName">NSMenuCheckmark</string> + </object> + <object class="NSCustomResource" key="NSMixedImage" id="429918744"> + <string key="NSClassName">NSImage</string> + <string key="NSResourceName">NSMenuMixedState</string> + </object> + <string key="NSAction">_popUpItemAction:</string> + <reference key="NSTarget" ref="983528702"/> + </object> + <bool key="NSMenuItemRespectAlignment">YES</bool> + <object class="NSMenu" key="NSMenu" id="799908898"> + <string key="NSTitle">OtherViews</string> + <object class="NSMutableArray" key="NSMenuItems"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="737825762"/> + <object class="NSMenuItem" id="949625737"> + <reference key="NSMenu" ref="799908898"/> + <string key="NSTitle">Firefox</string> + <string key="NSKeyEquiv"/> + <int key="NSKeyEquivModMask">1048576</int> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="719677793"/> + <reference key="NSMixedImage" ref="429918744"/> + <string key="NSAction">_popUpItemAction:</string> + <reference key="NSTarget" ref="983528702"/> + </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 class="NSTextField" id="1020899826"> + <reference key="NSNextResponder" ref="581221161"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{17, 10}, {91, 17}}</string> + <reference key="NSSuperview" ref="581221161"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="712740622"> + <int key="NSCellFlags">68288064</int> + <int key="NSCellFlags2">272630784</int> + <string key="NSContents">^IDS_IMPORT_FROM_LABEL</string> + <reference key="NSSupport" ref="605141190"/> + <reference key="NSControlView" ref="1020899826"/> + <object class="NSColor" key="NSBackgroundColor" id="394777803"> + <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="550581985"> + <int key="NSColorSpace">6</int> + <string key="NSCatalogName">System</string> + <string key="NSColorName">controlTextColor</string> + <object class="NSColor" key="NSColor"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MAA</bytes> + </object> + </object> + </object> + </object> + </object> + <string key="NSFrame">{{0, 183}, {290, 33}}</string> + <reference key="NSSuperview" ref="1006"/> + <string key="NSClassName">GTMWidthBasedTweaker</string> + </object> + <object class="NSCustomView" id="978310322"> + <reference key="NSNextResponder" ref="1006"/> + <int key="NSvFlags">292</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSButton" id="954452115"> + <reference key="NSNextResponder" ref="978310322"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{17, 89}, {235, 18}}</string> + <reference key="NSSuperview" ref="978310322"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="241240932"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">0</int> + <string key="NSContents">^IDS_IMPORT_HISTORY_CHKBOX</string> + <reference key="NSSupport" ref="605141190"/> + <reference key="NSControlView" ref="954452115"/> + <int key="NSButtonFlags">1211912703</int> + <int key="NSButtonFlags2">130</int> + <object class="NSCustomResource" key="NSNormalImage" id="437518122"> + <string key="NSClassName">NSImage</string> + <string key="NSResourceName">NSSwitch</string> + </object> + <object class="NSButtonImageSource" key="NSAlternateImage" id="387174411"> + <string key="NSImageName">NSSwitch</string> + </object> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + <object class="NSButton" id="556808145"> + <reference key="NSNextResponder" ref="978310322"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{17, 69}, {235, 18}}</string> + <reference key="NSSuperview" ref="978310322"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="36000965"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">0</int> + <string key="NSContents">^IDS_IMPORT_FAVORITES_CHKBOX</string> + <reference key="NSSupport" ref="605141190"/> + <reference key="NSControlView" ref="556808145"/> + <int key="NSButtonFlags">1211912703</int> + <int key="NSButtonFlags2">130</int> + <reference key="NSNormalImage" ref="437518122"/> + <reference key="NSAlternateImage" ref="387174411"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + <object class="NSButton" id="1049294256"> + <reference key="NSNextResponder" ref="978310322"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{17, 49}, {235, 18}}</string> + <reference key="NSSuperview" ref="978310322"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="857709409"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">0</int> + <string key="NSContents">^IDS_IMPORT_COOKIES_CHKBOX</string> + <reference key="NSSupport" ref="605141190"/> + <reference key="NSControlView" ref="1049294256"/> + <int key="NSButtonFlags">1211912703</int> + <int key="NSButtonFlags2">130</int> + <reference key="NSNormalImage" ref="437518122"/> + <reference key="NSAlternateImage" ref="387174411"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + <object class="NSButton" id="763356826"> + <reference key="NSNextResponder" ref="978310322"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{17, 29}, {235, 18}}</string> + <reference key="NSSuperview" ref="978310322"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="460770311"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">0</int> + <string key="NSContents">^IDS_IMPORT_PASSWORDS_CHKBOX</string> + <reference key="NSSupport" ref="605141190"/> + <reference key="NSControlView" ref="763356826"/> + <int key="NSButtonFlags">1211912703</int> + <int key="NSButtonFlags2">130</int> + <reference key="NSNormalImage" ref="437518122"/> + <reference key="NSAlternateImage" ref="387174411"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + <object class="NSButton" id="642124660"> + <reference key="NSNextResponder" ref="978310322"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{17, 9}, {235, 18}}</string> + <reference key="NSSuperview" ref="978310322"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="25343378"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">0</int> + <string key="NSContents">^IDS_IMPORT_SEARCH_ENGINES_CHKBOX</string> + <reference key="NSSupport" ref="605141190"/> + <reference key="NSControlView" ref="642124660"/> + <int key="NSButtonFlags">1211912703</int> + <int key="NSButtonFlags2">130</int> + <reference key="NSNormalImage" ref="437518122"/> + <reference key="NSAlternateImage" ref="387174411"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + <object class="NSTextField" id="249453492"> + <reference key="NSNextResponder" ref="978310322"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{4, 113}, {343, 17}}</string> + <reference key="NSSuperview" ref="978310322"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="826519617"> + <int key="NSCellFlags">68288064</int> + <int key="NSCellFlags2">272630784</int> + <string key="NSContents">^IDS_IMPORT_ITEMS_LABEL</string> + <reference key="NSSupport" ref="605141190"/> + <reference key="NSControlView" ref="249453492"/> + <reference key="NSBackgroundColor" ref="394777803"/> + <reference key="NSTextColor" ref="550581985"/> + </object> + </object> + </object> + <string key="NSFrame">{{20, 51}, {270, 133}}</string> + <reference key="NSSuperview" ref="1006"/> + <string key="NSClassName">GTMWidthBasedTweaker</string> + </object> + </object> + <string key="NSFrameSize">{290, 221}</string> + <reference key="NSSuperview"/> + </object> + <string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string> + <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string> + </object> + <object class="NSCustomObject" id="689012122"> + <string key="NSClassName">ChromeUILocalizer</string> + </object> + <object class="NSCustomObject" id="287929755"> + <string key="NSClassName">GTMUILocalizerAndLayoutTweaker</string> + </object> + <object class="NSArrayController" id="142696823"> + <object class="NSMutableArray" key="NSDeclaredKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>kBrowserProfileNameKey</string> + <string>browserName</string> + </object> + <bool key="NSEditable">YES</bool> + <object class="_NSManagedProxy" key="_NSManagedProxy"/> + <bool key="NSAvoidsEmptySelection">YES</bool> + <bool key="NSPreservesSelection">YES</bool> + <bool key="NSSelectsInsertedObjects">YES</bool> + <bool key="NSFilterRestrictsInsertion">YES</bool> + <bool key="NSClearsFilterPredicateOnInsertion">YES</bool> + </object> + </object> + <object class="IBObjectContainer" key="IBDocument.Objects"> + <object class="NSMutableArray" key="connectionRecords"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">window</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="1005"/> + </object> + <int key="connectionID">65</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">cancel:</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="287263597"/> + </object> + <int key="connectionID">71</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">ok:</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="458129764"/> + </object> + <int key="connectionID">72</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">uiObject_</string> + <reference key="source" ref="287929755"/> + <reference key="destination" ref="1005"/> + </object> + <int key="connectionID">99</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">localizer_</string> + <reference key="source" ref="287929755"/> + <reference key="destination" ref="689012122"/> + </object> + <int key="connectionID">100</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">contentArray: sourceBrowsersList</string> + <reference key="source" ref="142696823"/> + <reference key="destination" ref="1001"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="142696823"/> + <reference key="NSDestination" ref="1001"/> + <string key="NSLabel">contentArray: sourceBrowsersList</string> + <string key="NSBinding">contentArray</string> + <string key="NSKeyPath">sourceBrowsersList</string> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">109</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">enabled: importSomething</string> + <reference key="source" ref="458129764"/> + <reference key="destination" ref="1001"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="458129764"/> + <reference key="NSDestination" ref="1001"/> + <string key="NSLabel">enabled: importSomething</string> + <string key="NSBinding">enabled</string> + <string key="NSKeyPath">importSomething</string> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">130</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">value: importHistory</string> + <reference key="source" ref="954452115"/> + <reference key="destination" ref="1001"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="954452115"/> + <reference key="NSDestination" ref="1001"/> + <string key="NSLabel">value: importHistory</string> + <string key="NSBinding">value</string> + <string key="NSKeyPath">importHistory</string> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">158</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">value: importFavorites</string> + <reference key="source" ref="556808145"/> + <reference key="destination" ref="1001"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="556808145"/> + <reference key="NSDestination" ref="1001"/> + <string key="NSLabel">value: importFavorites</string> + <string key="NSBinding">value</string> + <string key="NSKeyPath">importFavorites</string> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">159</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">value: importCookies</string> + <reference key="source" ref="1049294256"/> + <reference key="destination" ref="1001"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="1049294256"/> + <reference key="NSDestination" ref="1001"/> + <string key="NSLabel">value: importCookies</string> + <string key="NSBinding">value</string> + <string key="NSKeyPath">importCookies</string> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">160</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">value: importPasswords</string> + <reference key="source" ref="763356826"/> + <reference key="destination" ref="1001"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="763356826"/> + <reference key="NSDestination" ref="1001"/> + <string key="NSLabel">value: importPasswords</string> + <string key="NSBinding">value</string> + <string key="NSKeyPath">importPasswords</string> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">161</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">value: importSearchEngines</string> + <reference key="source" ref="642124660"/> + <reference key="destination" ref="1001"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="642124660"/> + <reference key="NSDestination" ref="1001"/> + <string key="NSLabel">value: importSearchEngines</string> + <string key="NSBinding">value</string> + <string key="NSKeyPath">importSearchEngines</string> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">162</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">enabled: historyAvailable</string> + <reference key="source" ref="954452115"/> + <reference key="destination" ref="1001"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="954452115"/> + <reference key="NSDestination" ref="1001"/> + <string key="NSLabel">enabled: historyAvailable</string> + <string key="NSBinding">enabled</string> + <string key="NSKeyPath">historyAvailable</string> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">164</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">enabled: favoritesAvailable</string> + <reference key="source" ref="556808145"/> + <reference key="destination" ref="1001"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="556808145"/> + <reference key="NSDestination" ref="1001"/> + <string key="NSLabel">enabled: favoritesAvailable</string> + <string key="NSBinding">enabled</string> + <string key="NSKeyPath">favoritesAvailable</string> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">165</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">enabled: cookiesAvailable</string> + <reference key="source" ref="1049294256"/> + <reference key="destination" ref="1001"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="1049294256"/> + <reference key="NSDestination" ref="1001"/> + <string key="NSLabel">enabled: cookiesAvailable</string> + <string key="NSBinding">enabled</string> + <string key="NSKeyPath">cookiesAvailable</string> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">166</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">enabled: passwordsAvailable</string> + <reference key="source" ref="763356826"/> + <reference key="destination" ref="1001"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="763356826"/> + <reference key="NSDestination" ref="1001"/> + <string key="NSLabel">enabled: passwordsAvailable</string> + <string key="NSBinding">enabled</string> + <string key="NSKeyPath">passwordsAvailable</string> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">167</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">enabled: searchEnginesAvailable</string> + <reference key="source" ref="642124660"/> + <reference key="destination" ref="1001"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="642124660"/> + <reference key="NSDestination" ref="1001"/> + <string key="NSLabel">enabled: searchEnginesAvailable</string> + <string key="NSBinding">enabled</string> + <string key="NSKeyPath">searchEnginesAvailable</string> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">168</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">delegate</string> + <reference key="source" ref="1005"/> + <reference key="destination" ref="1001"/> + </object> + <int key="connectionID">172</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">contentValues: arrangedObjects.browserName</string> + <reference key="source" ref="21765562"/> + <reference key="destination" ref="142696823"/> + <object class="NSNibBindingConnector" key="connector" id="715727727"> + <reference key="NSSource" ref="21765562"/> + <reference key="NSDestination" ref="142696823"/> + <string key="NSLabel">contentValues: arrangedObjects.browserName</string> + <string key="NSBinding">contentValues</string> + <string key="NSKeyPath">arrangedObjects.browserName</string> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">173</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">selectedIndex: sourceBrowserIndex</string> + <reference key="source" ref="21765562"/> + <reference key="destination" ref="1001"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="21765562"/> + <reference key="NSDestination" ref="1001"/> + <string key="NSLabel">selectedIndex: sourceBrowserIndex</string> + <string key="NSBinding">selectedIndex</string> + <string key="NSKeyPath">sourceBrowserIndex</string> + <reference key="NSPreviousConnector" ref="715727727"/> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">174</int> + </object> + </object> + <object class="IBMutableOrderedSet" key="objectRecords"> + <object class="NSArray" key="orderedObjects"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="IBObjectRecord"> + <int key="objectID">0</int> + <object class="NSArray" key="object" id="1002"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> + <reference key="children" ref="1000"/> + <nil key="parent"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">-2</int> + <reference key="object" ref="1001"/> + <reference key="parent" ref="1002"/> + <string type="base64-UTF8" key="objectName">RmlsZSdzIE93bmVyA</string> + </object> + <object class="IBObjectRecord"> + <int key="objectID">-1</int> + <reference key="object" ref="1003"/> + <reference key="parent" ref="1002"/> + <string key="objectName">First Responder</string> + </object> + <object class="IBObjectRecord"> + <int key="objectID">-3</int> + <reference key="object" ref="1004"/> + <reference key="parent" ref="1002"/> + <string key="objectName">Application</string> + </object> + <object class="IBObjectRecord"> + <int key="objectID">1</int> + <reference key="object" ref="1005"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="1006"/> + </object> + <reference key="parent" ref="1002"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">2</int> + <reference key="object" ref="1006"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="581221161"/> + <reference ref="978310322"/> + <reference ref="913870182"/> + </object> + <reference key="parent" ref="1005"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">91</int> + <reference key="object" ref="689012122"/> + <reference key="parent" ref="1002"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">97</int> + <reference key="object" ref="913870182"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="458129764"/> + <reference ref="287263597"/> + </object> + <reference key="parent" ref="1006"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">25</int> + <reference key="object" ref="287263597"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="1066198765"/> + </object> + <reference key="parent" ref="913870182"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">26</int> + <reference key="object" ref="1066198765"/> + <reference key="parent" ref="287263597"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">27</int> + <reference key="object" ref="458129764"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="685620085"/> + </object> + <reference key="parent" ref="913870182"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">28</int> + <reference key="object" ref="685620085"/> + <reference key="parent" ref="458129764"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">98</int> + <reference key="object" ref="287929755"/> + <reference key="parent" ref="1002"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">101</int> + <reference key="object" ref="581221161"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="1020899826"/> + <reference ref="21765562"/> + </object> + <reference key="parent" ref="1006"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">15</int> + <reference key="object" ref="21765562"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="983528702"/> + </object> + <reference key="parent" ref="581221161"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">16</int> + <reference key="object" ref="983528702"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="799908898"/> + </object> + <reference key="parent" ref="21765562"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">17</int> + <reference key="object" ref="799908898"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="949625737"/> + <reference ref="737825762"/> + </object> + <reference key="parent" ref="983528702"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">19</int> + <reference key="object" ref="949625737"/> + <reference key="parent" ref="799908898"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">18</int> + <reference key="object" ref="737825762"/> + <reference key="parent" ref="799908898"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">105</int> + <reference key="object" ref="142696823"/> + <reference key="parent" ref="1002"/> + <string key="objectName">Browser List</string> + </object> + <object class="IBObjectRecord"> + <int key="objectID">110</int> + <reference key="object" ref="1020899826"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="712740622"/> + </object> + <reference key="parent" ref="581221161"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">111</int> + <reference key="object" ref="712740622"/> + <reference key="parent" ref="1020899826"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">131</int> + <reference key="object" ref="978310322"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="954452115"/> + <reference ref="1049294256"/> + <reference ref="763356826"/> + <reference ref="642124660"/> + <reference ref="249453492"/> + <reference ref="556808145"/> + </object> + <reference key="parent" ref="1006"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">144</int> + <reference key="object" ref="954452115"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="241240932"/> + </object> + <reference key="parent" ref="978310322"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">145</int> + <reference key="object" ref="556808145"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="36000965"/> + </object> + <reference key="parent" ref="978310322"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">146</int> + <reference key="object" ref="1049294256"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="857709409"/> + </object> + <reference key="parent" ref="978310322"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">147</int> + <reference key="object" ref="763356826"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="460770311"/> + </object> + <reference key="parent" ref="978310322"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">148</int> + <reference key="object" ref="642124660"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="25343378"/> + </object> + <reference key="parent" ref="978310322"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">149</int> + <reference key="object" ref="249453492"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="826519617"/> + </object> + <reference key="parent" ref="978310322"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">150</int> + <reference key="object" ref="826519617"/> + <reference key="parent" ref="249453492"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">151</int> + <reference key="object" ref="25343378"/> + <reference key="parent" ref="642124660"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">152</int> + <reference key="object" ref="460770311"/> + <reference key="parent" ref="763356826"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">153</int> + <reference key="object" ref="857709409"/> + <reference key="parent" ref="1049294256"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">154</int> + <reference key="object" ref="36000965"/> + <reference key="parent" ref="556808145"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">155</int> + <reference key="object" ref="241240932"/> + <reference key="parent" ref="954452115"/> + </object> + </object> + </object> + <object class="NSMutableDictionary" key="flattenedProperties"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSMutableArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>-1.IBPluginDependency</string> + <string>-2.IBPluginDependency</string> + <string>-3.IBPluginDependency</string> + <string>1.IBEditorWindowLastContentRect</string> + <string>1.IBPluginDependency</string> + <string>1.IBWindowTemplateEditedContentRect</string> + <string>1.NSWindowTemplate.visibleAtLaunch</string> + <string>1.WindowOrigin</string> + <string>1.editorWindowContentRectSynchronizationRect</string> + <string>105.IBPluginDependency</string> + <string>110.IBPluginDependency</string> + <string>111.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>15.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>16.IBPluginDependency</string> + <string>17.IBEditorWindowLastContentRect</string> + <string>17.IBPluginDependency</string> + <string>18.IBPluginDependency</string> + <string>19.IBPluginDependency</string> + <string>2.IBPluginDependency</string> + <string>25.IBPluginDependency</string> + <string>26.IBPluginDependency</string> + <string>27.IBPluginDependency</string> + <string>28.IBPluginDependency</string> + <string>91.IBPluginDependency</string> + <string>98.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>{{471, 635}, {290, 221}}</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>{{471, 635}, {290, 221}}</string> + <boolean value="NO"/> + <string>{196, 240}</string> + <string>{{357, 418}, {480, 270}}</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>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>{{465, 184}, {146, 43}}</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>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + </object> + </object> + <object class="NSMutableDictionary" key="unlocalizedProperties"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> + </object> + <nil key="activeLocalization"/> + <object class="NSMutableDictionary" key="localizations"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> + </object> + <nil key="sourceID"/> + <int key="maxID">174</int> + </object> + <object class="IBClassDescriber" key="IBDocument.Classes"> + <object class="NSMutableArray" key="referencedPartialClassDescriptions"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="IBPartialClassDescription"> + <string key="className">ChromeUILocalizer</string> + <string key="superclassName">GTMUILocalizer</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">browser/cocoa/ui_localizer.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">GTMUILocalizer</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>otherObjectToLocalize_</string> + <string>owner_</string> + <string>yetAnotherObjectToLocalize_</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>id</string> + <string>id</string> + <string>id</string> + </object> + </object> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">../third_party/GTM/AppKit/GTMUILocalizer.h</string> + </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="1031264906"> + <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="1031264906"/> + </object> + <object class="IBPartialClassDescription"> + <string key="className">ImportSettingsDialogController</string> + <string key="superclassName">NSWindowController</string> + <object class="NSMutableDictionary" key="actions"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSMutableArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>cancel:</string> + <string>ok:</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>id</string> + <string>id</string> + </object> + </object> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">browser/cocoa/import_settings_dialog.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">ImportSettingsDialogController</string> + <string key="superclassName">NSWindowController</string> + <object class="NSMutableDictionary" key="outlets"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSMutableArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>sourceBrowserIndex</string> + <string>sourceBrowsersList</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>NSUInteger</string> + <string>NSArray</string> + </object> + </object> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBUserSource</string> + <string key="minorKey"/> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSMenuItem</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">browser/cocoa/nsmenuitem_additions.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">browser/cocoa/status_bubble_mac.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">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/nswindow_local_state.h</string> + </object> + </object> + </object> + </object> + <int key="IBDocument.localizationMode">0</int> + <string key="IBDocument.LastKnownRelativeProjectPath">../../chrome.xcodeproj</string> + <int key="IBDocument.defaultPropertyAccessControl">3</int> + </data> +</archive> diff --git a/chrome/app/nibs/MainMenu.xib b/chrome/app/nibs/MainMenu.xib index 5c037c5..efc2e26 100644 --- a/chrome/app/nibs/MainMenu.xib +++ b/chrome/app/nibs/MainMenu.xib @@ -1,17 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10"> +<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.03"> <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> - <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> - <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="NS.object.0">732</string> - </object> + <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="57"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -19,7 +16,7 @@ </object> <object class="NSMutableDictionary" key="IBDocument.Metadata"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys" id="0"> + <object class="NSArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> </object> <object class="NSMutableArray" key="dict.values"> @@ -108,6 +105,15 @@ <reference key="NSMixedImage" ref="549394948"/> <int key="NSTag">40013</int> </object> + <object class="NSMenuItem" id="198763083"> + <reference key="NSMenu" ref="110575045"/> + <string key="NSTitle">^IDS_IMPORT_SETTINGS_TITLE</string> + <string key="NSKeyEquiv"/> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="353210768"/> + <reference key="NSMixedImage" ref="549394948"/> + <int key="NSTag">40014</int> + </object> <object class="NSMenuItem" id="481834944"> <reference key="NSMenu" ref="110575045"/> <bool key="NSIsDisabled">YES</bool> @@ -980,7 +986,7 @@ <object class="NSMenuItem" id="1051826322"> <reference key="NSMenu" ref="835318025"/> <string key="NSTitle">^IDS_NEXT_TAB_MAC</string> - <string key="NSKeyEquiv"></string> + <string type="base64-UTF8" key="NSKeyEquiv">75yDA</string> <int key="NSKeyEquivModMask">1572864</int> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="353210768"/> @@ -990,7 +996,7 @@ <object class="NSMenuItem" id="567028653"> <reference key="NSMenu" ref="835318025"/> <string key="NSTitle">^IDS_PREV_TAB_MAC</string> - <string key="NSKeyEquiv"></string> + <string type="base64-UTF8" key="NSKeyEquiv">75yCA</string> <int key="NSKeyEquivModMask">1572864</int> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="353210768"/> @@ -1617,32 +1623,42 @@ </object> <int key="connectionID">661</int> </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">commandDispatch:</string> + <reference key="source" ref="1014"/> + <reference key="destination" ref="198763083"/> + </object> + <int key="connectionID">663</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="IBObjectRecord"> <int key="objectID">0</int> - <reference key="object" ref="0"/> + <object class="NSArray" key="object" id="953662269"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> <reference key="children" ref="1048"/> <nil key="parent"/> </object> <object class="IBObjectRecord"> <int key="objectID">-2</int> <reference key="object" ref="1021"/> - <reference key="parent" ref="0"/> - <string key="objectName">File's Owner</string> + <reference key="parent" ref="953662269"/> + <string type="base64-UTF8" key="objectName">RmlsZSdzIE93bmVyA</string> </object> <object class="IBObjectRecord"> <int key="objectID">-1</int> <reference key="object" ref="1014"/> - <reference key="parent" ref="0"/> + <reference key="parent" ref="953662269"/> <string key="objectName">First Responder</string> </object> <object class="IBObjectRecord"> <int key="objectID">-3</int> <reference key="object" ref="1050"/> - <reference key="parent" ref="0"/> + <reference key="parent" ref="953662269"/> <string key="objectName">Application</string> </object> <object class="IBObjectRecord"> @@ -1659,7 +1675,7 @@ <reference ref="586577488"/> <reference ref="445514911"/> </object> - <reference key="parent" ref="0"/> + <reference key="parent" ref="953662269"/> <string key="objectName">Main Menu</string> </object> <object class="IBObjectRecord"> @@ -1949,6 +1965,8 @@ <reference ref="446911629"/> <reference ref="481834944"/> <reference ref="52470633"/> + <reference ref="198763083"/> + <reference ref="198763083"/> </object> <reference key="parent" ref="694149608"/> </object> @@ -2092,7 +2110,7 @@ <object class="IBObjectRecord"> <int key="objectID">373</int> <reference key="object" ref="163992474"/> - <reference key="parent" ref="0"/> + <reference key="parent" ref="953662269"/> </object> <object class="IBObjectRecord"> <int key="objectID">449</int> @@ -2183,7 +2201,7 @@ <object class="IBObjectRecord"> <int key="objectID">483</int> <reference key="object" ref="168151378"/> - <reference key="parent" ref="0"/> + <reference key="parent" ref="953662269"/> </object> <object class="IBObjectRecord"> <int key="objectID">492</int> @@ -2396,7 +2414,7 @@ <object class="IBObjectRecord"> <int key="objectID">641</int> <reference key="object" ref="979722531"/> - <reference key="parent" ref="0"/> + <reference key="parent" ref="953662269"/> </object> <object class="IBObjectRecord"> <int key="objectID">648</int> @@ -2428,12 +2446,19 @@ <reference key="object" ref="1008975930"/> <reference key="parent" ref="835318025"/> </object> + <object class="IBObjectRecord"> + <int key="objectID">662</int> + <reference key="object" ref="198763083"/> + <reference key="parent" ref="110575045"/> + </object> </object> </object> <object class="NSMutableDictionary" key="flattenedProperties"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> + <object class="NSMutableArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> + <string>-1.IBPluginDependency</string> + <string>-2.IBPluginDependency</string> <string>-3.IBPluginDependency</string> <string>103.IBPluginDependency</string> <string>103.ImportedFromIB2</string> @@ -2541,6 +2566,7 @@ <string>297.IBPluginDependency</string> <string>346.IBPluginDependency</string> <string>346.ImportedFromIB2</string> + <string>373.IBPluginDependency</string> <string>449.IBPluginDependency</string> <string>450.IBPluginDependency</string> <string>451.IBPluginDependency</string> @@ -2557,6 +2583,7 @@ <string>466.IBEditorWindowLastContentRect</string> <string>466.IBPluginDependency</string> <string>473.IBPluginDependency</string> + <string>483.IBPluginDependency</string> <string>491.IBPluginDependency</string> <string>492.IBPluginDependency</string> <string>493.IBPluginDependency</string> @@ -2604,6 +2631,7 @@ <string>636.IBPluginDependency</string> <string>639.IBPluginDependency</string> <string>640.IBPluginDependency</string> + <string>641.IBPluginDependency</string> <string>648.IBPluginDependency</string> <string>648.ImportedFromIB2</string> <string>652.IBPluginDependency</string> @@ -2611,6 +2639,7 @@ <string>658.IBPluginDependency</string> <string>658.ImportedFromIB2</string> <string>660.IBPluginDependency</string> + <string>662.IBShouldRemoveOnLegacySave</string> <string>72.IBPluginDependency</string> <string>72.ImportedFromIB2</string> <string>73.IBPluginDependency</string> @@ -2640,102 +2669,104 @@ <bool key="EncodedWithXMLCoder">YES</bool> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1" id="9"/> <string>{{1616, 132}, {332, 43}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> + <reference ref="9"/> <string>{{596, 852}, {216, 23}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> + <reference ref="9"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> + <reference ref="9"/> <string>{{519, 240}, {64, 6}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> + <reference ref="9"/> <string>{{436, 809}, {64, 6}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> + <reference ref="9"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> + <reference ref="9"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> + <reference ref="9"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> + <reference ref="9"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> + <reference ref="9"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> + <reference ref="9"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> + <reference ref="9"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> + <reference ref="9"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> + <reference ref="9"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> + <reference ref="9"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> + <reference ref="9"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> + <reference ref="9"/> <string>{{621, 199}, {376, 83}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> + <reference ref="9"/> <string>{{608, 612}, {275, 83}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> + <reference ref="9"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> + <reference ref="9"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> + <reference ref="9"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> + <reference ref="9"/> <string>{{536, -194}, {361, 243}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> + <reference ref="9"/> <string>{{197, 734}, {243, 243}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> + <reference ref="9"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> + <reference ref="9"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> + <reference ref="9"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> + <reference ref="9"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> + <reference ref="9"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> + <reference ref="9"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> + <reference ref="9"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> + <reference ref="9"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> + <reference ref="9"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> + <reference ref="9"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> + <reference ref="9"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> + <reference ref="9"/> <string>{{618, 199}, {346, 103}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> + <reference ref="9"/> <string>{{608, 612}, {241, 103}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> + <reference ref="9"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> + <reference ref="9"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> + <reference ref="9"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> + <reference ref="9"/> <string>{{1382, 97}, {323, 183}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> + <reference ref="9"/> <string>{{525, 802}, {197, 73}}</string> - <string>{{192, 280}, {1578, 20}}</string> + <string>{{38, 600}, {1578, 20}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> + <reference ref="9"/> <string>{74, 862}</string> <string>{{11, 977}, {478, 20}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -2744,7 +2775,8 @@ <string>{{475, 832}, {234, 43}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> + <reference ref="9"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -2767,10 +2799,11 @@ <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>{{965, 284}, {361, 53}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> + <reference ref="9"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>{{1169, 7}, {320, 83}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -2795,13 +2828,13 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> - <string>{{42, 196}, {382, 213}}</string> + <reference ref="9"/> + <string>{{50, 367}, {385, 233}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> + <reference ref="9"/> <string>{{23, 794}, {245, 183}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> + <reference ref="9"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -2809,41 +2842,45 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <reference ref="9"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <reference ref="9"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> + <boolean value="YES"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> + <reference ref="9"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> + <reference ref="9"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> + <reference ref="9"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> + <reference ref="9"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> + <reference ref="9"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> - <string>{{160, 20}, {353, 303}}</string> + <reference ref="9"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> + <reference ref="9"/> + <string>{{305, 468}, {353, 303}}</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <reference ref="9"/> <string>{{323, 672}, {199, 203}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> + <reference ref="9"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> + <reference ref="9"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <integer value="1"/> + <reference ref="9"/> </object> </object> <object class="NSMutableDictionary" key="unlocalizedProperties"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference key="dict.sortedKeys" ref="0"/> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> </object> @@ -2851,13 +2888,15 @@ <nil key="activeLocalization"/> <object class="NSMutableDictionary" key="localizations"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference key="dict.sortedKeys" ref="0"/> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> </object> </object> <nil key="sourceID"/> - <int key="maxID">661</int> + <int key="maxID">663</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -2867,7 +2906,7 @@ <string key="superclassName">NSObject</string> <object class="NSMutableDictionary" key="actions"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> + <object class="NSMutableArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>orderFrontStandardAboutPanel:</string> <string>showPreferences:</string> @@ -2880,7 +2919,7 @@ </object> <object class="NSMutableDictionary" key="outlets"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> + <object class="NSMutableArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>closeTabMenuItem_</string> <string>closeWindowMenuItem_</string> @@ -2925,7 +2964,7 @@ <string key="superclassName">NSViewController</string> <object class="NSMutableDictionary" key="actions"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> + <object class="NSMutableArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>hide:</string> <string>show:</string> @@ -2940,7 +2979,7 @@ </object> <object class="NSMutableDictionary" key="outlets"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> + <object class="NSMutableArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>image_</string> <string>itemContainerView_</string> @@ -2965,7 +3004,7 @@ <string key="superclassName">NSViewController</string> <object class="NSMutableDictionary" key="actions"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> + <object class="NSMutableArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>hide:</string> <string>show:</string> @@ -2990,7 +3029,7 @@ <string key="superclassName">NSObject</string> <object class="NSMutableDictionary" key="actions"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> + <object class="NSMutableArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>commandDispatch:</string> <string>copyToFindPboard:</string> @@ -3011,7 +3050,7 @@ <string key="superclassName">NSObject</string> <object class="NSMutableDictionary" key="outlets"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> + <object class="NSMutableArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>otherObjectToLocalize_</string> <string>owner_</string> @@ -3070,7 +3109,7 @@ <string key="superclassName">NSViewController</string> <object class="NSMutableDictionary" key="actions"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> + <object class="NSMutableArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>closeTab:</string> <string>commandDispatch:</string> @@ -3083,7 +3122,7 @@ </object> <object class="NSMutableDictionary" key="outlets"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> + <object class="NSMutableArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>closeButton_</string> <string>contextMenu_</string> @@ -3106,767 +3145,8 @@ </object> </object> </object> - <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="IBPartialClassDescription"> - <string key="className">NSActionCell</string> - <string key="superclassName">NSCell</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSActionCell.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSApplication</string> - <string key="superclassName">NSResponder</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="938605456"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSApplication.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSApplication</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="28203823"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSApplicationScripting.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSApplication</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="944993731"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSColorPanel.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSApplication</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSHelpManager.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSApplication</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSPageLayout.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSBrowser</string> - <string key="superclassName">NSControl</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="429799339"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSBrowser.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">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSButton.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">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSButtonCell.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSCell</string> - <string key="superclassName">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSCell.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSControl</string> - <string key="superclassName">NSView</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="648987557"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSControl.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSDocument</string> - <string key="superclassName">NSObject</string> - <object class="NSMutableDictionary" key="actions"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>printDocument:</string> - <string>revertDocumentToSaved:</string> - <string>runPageLayout:</string> - <string>saveDocument:</string> - <string>saveDocumentAs:</string> - <string>saveDocumentTo:</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - </object> - </object> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSDocument.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSDocument</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSDocumentScripting.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSFontManager</string> - <string key="superclassName">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="601632290"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSFontManager.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSFormatter</string> - <string key="superclassName">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSFormatter.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSImageView</string> - <string key="superclassName">NSControl</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSImageView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSMatrix</string> - <string key="superclassName">NSControl</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSMatrix.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSMenu</string> - <string key="superclassName">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="314106953"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSMenu.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSMenuItem</string> - <string key="superclassName">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="873195787"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSMenuItem.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSMovieView</string> - <string key="superclassName">NSView</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSMovieView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSAccessibility.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSAlert.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSAnimation.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <reference key="sourceIdentifier" ref="938605456"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <reference key="sourceIdentifier" ref="28203823"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <reference key="sourceIdentifier" ref="429799339"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <reference key="sourceIdentifier" ref="944993731"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSComboBox.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSComboBoxCell.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <reference key="sourceIdentifier" ref="648987557"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSDatePickerCell.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSDictionaryController.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSDragging.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="293080842"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSDrawer.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <reference key="sourceIdentifier" ref="601632290"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSFontPanel.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSImage.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSKeyValueBinding.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <reference key="sourceIdentifier" ref="314106953"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSNibLoading.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSOutlineView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSPasteboard.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSRuleEditor.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSSavePanel.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSSound.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSSpeechRecognizer.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSSpeechSynthesizer.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSSplitView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSTabView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="437476450"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSTableView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="709131526"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSText.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSTextStorage.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSTextView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSTokenField.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSTokenFieldCell.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSToolbar.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSToolbarItem.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="1014640645"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="337527095"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSWindow.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSArchiver.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSClassDescription.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSConnection.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSError.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSFileManager.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSKeyValueCoding.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSKeyValueObserving.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSKeyedArchiver.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSMetadata.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSNetServices.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSObject.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSObjectScripting.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSPort.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSPortCoder.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSRunLoop.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSScriptClassDescription.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSScriptKeyValueCoding.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSScriptObjectSpecifiers.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSScriptWhoseTests.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSSpellServer.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSStream.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSThread.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSURL.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSURLConnection.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSURLDownload.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSXMLParser.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Print.framework/Headers/PDEPluginInterface.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">QuartzCore.framework/Headers/CAAnimation.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">QuartzCore.framework/Headers/CALayer.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">QuartzCore.framework/Headers/CIImageProvider.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">SecurityInterface.framework/Headers/SFAuthorizationView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">SecurityInterface.framework/Headers/SFCertificatePanel.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">SecurityInterface.framework/Headers/SFChooseIdentityPanel.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSResponder</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSInterfaceStyle.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSResponder</string> - <string key="superclassName">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSResponder.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSTableView</string> - <string key="superclassName">NSControl</string> - <reference key="sourceIdentifier" ref="437476450"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSText</string> - <string key="superclassName">NSView</string> - <reference key="sourceIdentifier" ref="709131526"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSTextField</string> - <string key="superclassName">NSControl</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSTextField.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSView</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSClipView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSView</string> - <reference key="sourceIdentifier" ref="873195787"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSView</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSRulerView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSView</string> - <string key="superclassName">NSResponder</string> - <reference key="sourceIdentifier" ref="1014640645"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSViewController</string> - <string key="superclassName">NSResponder</string> - <object class="NSMutableDictionary" key="outlets"> - <string key="NS.key.0">view</string> - <string key="NS.object.0">NSView</string> - </object> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSViewController.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSWindow</string> - <reference key="sourceIdentifier" ref="293080842"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSWindow</string> - <string key="superclassName">NSResponder</string> - <reference key="sourceIdentifier" ref="337527095"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSWindow</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSWindowScripting.h</string> - </object> - </object> - </object> </object> <int key="IBDocument.localizationMode">0</int> - <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies"> - <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> - <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies"> - <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string> - <integer value="3000" key="NS.object.0"/> - </object> - <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool> <string key="IBDocument.LastKnownRelativeProjectPath">../../chrome.xcodeproj</string> <int key="IBDocument.defaultPropertyAccessControl">3</int> </data> diff --git a/chrome/app/nibs/Toolbar.xib b/chrome/app/nibs/Toolbar.xib index 8d8c931..9363025 100644 --- a/chrome/app/nibs/Toolbar.xib +++ b/chrome/app/nibs/Toolbar.xib @@ -1,19 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10"> +<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.03"> <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> - <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> - <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="NS.object.0">732</string> - </object> + <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="42"/> <integer value="1"/> + <integer value="42"/> <integer value="48"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> @@ -22,7 +18,7 @@ </object> <object class="NSMutableDictionary" key="IBDocument.Metadata"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys" id="0"> + <object class="NSArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> </object> <object class="NSMutableArray" key="dict.values"> @@ -65,7 +61,7 @@ <string key="NSContents">chromium.org</string> <object class="NSFont" key="NSSupport"> <string key="NSName">LucidaGrande</string> - <double key="NSSize">13</double> + <double key="NSSize">1.300000e+01</double> <int key="NSfFlags">16</int> </object> <reference key="NSControlView" ref="535508469"/> @@ -103,7 +99,7 @@ <string key="NSContents"/> <object class="NSFont" key="NSSupport" id="64724822"> <string key="NSName">LucidaGrande</string> - <double key="NSSize">13</double> + <double key="NSSize">1.300000e+01</double> <int key="NSfFlags">1044</int> </object> <reference key="NSControlView" ref="368496192"/> @@ -131,8 +127,8 @@ <int key="NSCellFlags2">134250496</int> <string key="NSContents"/> <reference key="NSSupport" ref="64724822"/> - <reference key="NSControlView" ref="559273956"/> <int key="NSTag">-1</int> + <reference key="NSControlView" ref="559273956"/> <int key="NSButtonFlags">-2030812929</int> <int key="NSButtonFlags2">6</int> <object class="NSCustomResource" key="NSNormalImage"> @@ -186,8 +182,8 @@ <int key="NSCellFlags2">134250496</int> <string key="NSContents"/> <reference key="NSSupport" ref="64724822"/> - <reference key="NSControlView" ref="781044416"/> <int key="NSTag">1</int> + <reference key="NSControlView" ref="781044416"/> <int key="NSButtonFlags">-2031861505</int> <int key="NSButtonFlags2">6</int> <object class="NSCustomResource" key="NSNormalImage"> @@ -212,8 +208,8 @@ <int key="NSCellFlags2">134250496</int> <string key="NSContents"/> <reference key="NSSupport" ref="64724822"/> - <reference key="NSControlView" ref="634265909"/> <int key="NSTag">-2</int> + <reference key="NSControlView" ref="634265909"/> <int key="NSButtonFlags">-2030812929</int> <int key="NSButtonFlags2">6</int> <object class="NSCustomResource" key="NSNormalImage"> @@ -238,8 +234,8 @@ <int key="NSCellFlags2">134250496</int> <string key="NSContents"/> <reference key="NSSupport" ref="64724822"/> - <reference key="NSControlView" ref="480525277"/> <int key="NSTag">1</int> + <reference key="NSControlView" ref="480525277"/> <int key="NSButtonFlags">-2031861505</int> <int key="NSButtonFlags2">6</int> <object class="NSCustomResource" key="NSNormalImage"> @@ -620,6 +616,34 @@ <reference key="NSOnImage" ref="610745052"/> <reference key="NSMixedImage" ref="1070349142"/> </object> + <object class="NSMenuItem" id="118179064"> + <reference key="NSMenu" ref="558188039"/> + <string key="NSTitle">^IDS_CLEAR_BROWSING_DATA_MAC</string> + <string key="NSKeyEquiv"/> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="610745052"/> + <reference key="NSMixedImage" ref="1070349142"/> + <int key="NSTag">40013</int> + </object> + <object class="NSMenuItem" id="791058457"> + <reference key="NSMenu" ref="558188039"/> + <string key="NSTitle">^IDS_IMPORT_SETTINGS_TITLE</string> + <string key="NSKeyEquiv"/> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="610745052"/> + <reference key="NSMixedImage" ref="1070349142"/> + <int key="NSTag">40014</int> + </object> + <object class="NSMenuItem" id="1010888289"> + <reference key="NSMenu" ref="558188039"/> + <bool key="NSIsDisabled">YES</bool> + <bool key="NSIsSeparator">YES</bool> + <string key="NSTitle"/> + <string key="NSKeyEquiv"/> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="610745052"/> + <reference key="NSMixedImage" ref="1070349142"/> + </object> <object class="NSMenuItem" id="6307962"> <reference key="NSMenu" ref="558188039"/> <string key="NSTitle">^IDS_SHOW_HISTORY</string> @@ -1099,32 +1123,50 @@ </object> <int key="connectionID">147</int> </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">commandDispatch:</string> + <reference key="source" ref="1003"/> + <reference key="destination" ref="791058457"/> + </object> + <int key="connectionID">152</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">commandDispatch:</string> + <reference key="source" ref="1003"/> + <reference key="destination" ref="118179064"/> + </object> + <int key="connectionID">153</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="IBObjectRecord"> <int key="objectID">0</int> - <reference key="object" ref="0"/> + <object class="NSArray" key="object" id="835640952"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> <reference key="children" ref="1000"/> <nil key="parent"/> </object> <object class="IBObjectRecord"> <int key="objectID">-2</int> <reference key="object" ref="1001"/> - <reference key="parent" ref="0"/> - <string key="objectName">File's Owner</string> + <reference key="parent" ref="835640952"/> + <string type="base64-UTF8" key="objectName">RmlsZSdzIE93bmVyA</string> </object> <object class="IBObjectRecord"> <int key="objectID">-1</int> <reference key="object" ref="1003"/> - <reference key="parent" ref="0"/> + <reference key="parent" ref="835640952"/> <string key="objectName">First Responder</string> </object> <object class="IBObjectRecord"> <int key="objectID">-3</int> <reference key="object" ref="1004"/> - <reference key="parent" ref="0"/> + <reference key="parent" ref="835640952"/> <string key="objectName">Application</string> </object> <object class="IBObjectRecord"> @@ -1143,7 +1185,7 @@ <reference ref="571076484"/> <reference ref="421615633"/> </object> - <reference key="parent" ref="0"/> + <reference key="parent" ref="835640952"/> </object> <object class="IBObjectRecord"> <int key="objectID">2</int> @@ -1294,7 +1336,7 @@ <reference ref="236901479"/> <reference ref="633871226"/> </object> - <reference key="parent" ref="0"/> + <reference key="parent" ref="835640952"/> </object> <object class="IBObjectRecord"> <int key="objectID">43</int> @@ -1332,8 +1374,11 @@ <reference ref="163898806"/> <reference ref="1012539825"/> <reference ref="211303389"/> + <reference ref="118179064"/> + <reference ref="791058457"/> + <reference ref="1010888289"/> </object> - <reference key="parent" ref="0"/> + <reference key="parent" ref="835640952"/> </object> <object class="IBObjectRecord"> <int key="objectID">49</int> @@ -1535,7 +1580,7 @@ <object class="IBObjectRecord"> <int key="objectID">122</int> <reference key="object" ref="1044322163"/> - <reference key="parent" ref="0"/> + <reference key="parent" ref="835640952"/> </object> <object class="IBObjectRecord"> <int key="objectID">127</int> @@ -1550,7 +1595,7 @@ <object class="IBObjectRecord"> <int key="objectID">130</int> <reference key="object" ref="306232897"/> - <reference key="parent" ref="0"/> + <reference key="parent" ref="835640952"/> </object> <object class="IBObjectRecord"> <int key="objectID">141</int> @@ -1573,11 +1618,26 @@ <reference key="object" ref="211303389"/> <reference key="parent" ref="558188039"/> </object> + <object class="IBObjectRecord"> + <int key="objectID">148</int> + <reference key="object" ref="118179064"/> + <reference key="parent" ref="558188039"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">149</int> + <reference key="object" ref="791058457"/> + <reference key="parent" ref="558188039"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">150</int> + <reference key="object" ref="1010888289"/> + <reference key="parent" ref="558188039"/> + </object> </object> </object> <object class="NSMutableDictionary" key="flattenedProperties"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> + <object class="NSMutableArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>-1.IBPluginDependency</string> <string>-2.IBPluginDependency</string> @@ -1599,14 +1659,18 @@ <string>129.IBPluginDependency</string> <string>13.CustomClassName</string> <string>13.IBPluginDependency</string> + <string>130.IBPluginDependency</string> <string>14.CustomClassName</string> <string>14.IBPluginDependency</string> <string>141.IBPluginDependency</string> <string>142.IBPluginDependency</string> <string>144.IBPluginDependency</string> <string>146.IBPluginDependency</string> + <string>148.IBShouldRemoveOnLegacySave</string> + <string>149.IBShouldRemoveOnLegacySave</string> <string>15.CustomClassName</string> <string>15.IBPluginDependency</string> + <string>150.IBShouldRemoveOnLegacySave</string> <string>2.CustomClassName</string> <string>2.IBAttributePlaceholdersKey</string> <string>2.IBPluginDependency</string> @@ -1681,9 +1745,9 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{272, 827}, {618, 36}}</string> + <string>{{272, 820}, {618, 36}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> + <boolean value="YES" id="5"/> <string>ClickHoldButtonCell</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -1698,14 +1762,18 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>AutocompleteTextFieldCell</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>ToolbarButtonCell</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> + <reference ref="5"/> + <reference ref="5"/> <string>ClickHoldButtonCell</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <reference ref="5"/> <string>DelayedMenuButton</string> <object class="NSMutableDictionary"> <string key="NS.key.0">ToolTip</string> @@ -1727,7 +1795,9 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <object class="NSMutableDictionary"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference key="dict.sortedKeys" ref="0"/> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> </object> @@ -1761,12 +1831,12 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>AutocompleteTextField</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{466, 432}, {232, 293}}</string> + <string>{{444, 446}, {235, 293}}</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>{{103, 186}, {332, 283}}</string> + <string>{{48, 162}, {335, 333}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -1826,7 +1896,9 @@ </object> <object class="NSMutableDictionary" key="unlocalizedProperties"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference key="dict.sortedKeys" ref="0"/> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> </object> @@ -1834,13 +1906,15 @@ <nil key="activeLocalization"/> <object class="NSMutableDictionary" key="localizations"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference key="dict.sortedKeys" ref="0"/> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> </object> </object> <nil key="sourceID"/> - <int key="maxID">147</int> + <int key="maxID">153</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -1850,7 +1924,7 @@ <string key="superclassName">NSObject</string> <object class="NSMutableDictionary" key="actions"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> + <object class="NSMutableArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>orderFrontStandardAboutPanel:</string> <string>showPreferences:</string> @@ -1863,7 +1937,7 @@ </object> <object class="NSMutableDictionary" key="outlets"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> + <object class="NSMutableArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>closeTabMenuItem_</string> <string>closeWindowMenuItem_</string> @@ -1936,7 +2010,7 @@ <string key="superclassName">NSObject</string> <object class="NSMutableDictionary" key="actions"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> + <object class="NSMutableArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>commandDispatch:</string> <string>commandDispatchUsingKeyModifiers:</string> @@ -1957,7 +2031,7 @@ <string key="superclassName">NSObject</string> <object class="NSMutableDictionary" key="outlets"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> + <object class="NSMutableArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>otherObjectToLocalize_</string> <string>owner_</string> @@ -2028,7 +2102,7 @@ <string key="superclassName">NSWindowController</string> <object class="NSMutableDictionary" key="actions"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> + <object class="NSMutableArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>addHomepage:</string> <string>browseDownloadLocation:</string> @@ -2067,7 +2141,7 @@ </object> <object class="NSMutableDictionary" key="outlets"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> + <object class="NSMutableArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>basicsGroupDefaultBrowser_</string> <string>basicsGroupHomePage_</string> @@ -2144,7 +2218,7 @@ <string key="superclassName">NSViewController</string> <object class="NSMutableDictionary" key="actions"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> + <object class="NSMutableArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>closeTab:</string> <string>commandDispatch:</string> @@ -2157,7 +2231,7 @@ </object> <object class="NSMutableDictionary" key="outlets"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> + <object class="NSMutableArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>closeButton_</string> <string>contextMenu_</string> @@ -2200,7 +2274,7 @@ <string key="superclassName">NSViewController</string> <object class="NSMutableDictionary" key="outlets"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> + <object class="NSMutableArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>backButton_</string> <string>browserActionContainerView_</string> @@ -2253,810 +2327,8 @@ </object> </object> </object> - <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="IBPartialClassDescription"> - <string key="className">NSActionCell</string> - <string key="superclassName">NSCell</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSActionCell.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSApplication</string> - <string key="superclassName">NSResponder</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="448931471"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSApplication.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSApplication</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="24911859"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSApplicationScripting.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSApplication</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="333010959"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSColorPanel.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSApplication</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSHelpManager.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSApplication</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSPageLayout.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSArray</string> - <string key="superclassName">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSArray.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSArray</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="758534001"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSKeyValueCoding.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSArray</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="31693783"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSKeyValueObserving.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSArray</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSPathUtilities.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSArray</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSPredicate.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSArray</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSSortDescriptor.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSArrayController</string> - <string key="superclassName">NSObjectController</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSArrayController.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">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSButton.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">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSButtonCell.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSCell</string> - <string key="superclassName">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSCell.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSControl</string> - <string key="superclassName">NSView</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="495848827"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSControl.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSController</string> - <string key="superclassName">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSController.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSFormatter</string> - <string key="superclassName">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSFormatter.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSMenu</string> - <string key="superclassName">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="746478996"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSMenu.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSMenuItem</string> - <string key="superclassName">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="248912629"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSMenuItem.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSMovieView</string> - <string key="superclassName">NSView</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSMovieView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSAccessibility.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSAlert.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSAnimation.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <reference key="sourceIdentifier" ref="448931471"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <reference key="sourceIdentifier" ref="24911859"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSBrowser.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <reference key="sourceIdentifier" ref="333010959"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSComboBox.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSComboBoxCell.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <reference key="sourceIdentifier" ref="495848827"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSDatePickerCell.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSDictionaryController.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSDragging.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="695193368"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSDrawer.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSFontManager.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSFontPanel.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSImage.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSKeyValueBinding.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <reference key="sourceIdentifier" ref="746478996"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSNibLoading.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSOutlineView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSPasteboard.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSRuleEditor.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSSavePanel.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSSound.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSSpeechRecognizer.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSSpeechSynthesizer.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSSplitView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSTabView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSTableView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="848836323"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSText.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSTextStorage.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSTextView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSTokenField.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSTokenFieldCell.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="5306983"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSToolbar.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSToolbarItem.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="78763847"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="137514384"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSWindow.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSArchiver.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSClassDescription.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSConnection.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSError.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSFileManager.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <reference key="sourceIdentifier" ref="758534001"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <reference key="sourceIdentifier" ref="31693783"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSKeyedArchiver.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSMetadata.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSNetServices.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSObject.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSObjectScripting.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSPort.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSPortCoder.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSRunLoop.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSScriptClassDescription.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSScriptKeyValueCoding.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSScriptObjectSpecifiers.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSScriptWhoseTests.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSSpellServer.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSStream.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSThread.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSURL.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSURLConnection.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSURLDownload.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Foundation.framework/Headers/NSXMLParser.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">Print.framework/Headers/PDEPluginInterface.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">QuartzCore.framework/Headers/CAAnimation.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">QuartzCore.framework/Headers/CALayer.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">QuartzCore.framework/Headers/CIImageProvider.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">SecurityInterface.framework/Headers/SFAuthorizationView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">SecurityInterface.framework/Headers/SFCertificatePanel.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">SecurityInterface.framework/Headers/SFChooseIdentityPanel.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObjectController</string> - <string key="superclassName">NSController</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSObjectController.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSPathControl</string> - <string key="superclassName">NSControl</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSPathControl.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSResponder</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSInterfaceStyle.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSResponder</string> - <string key="superclassName">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSResponder.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSScrollView</string> - <string key="superclassName">NSView</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSScrollView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSText</string> - <string key="superclassName">NSView</string> - <reference key="sourceIdentifier" ref="848836323"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSTextField</string> - <string key="superclassName">NSControl</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSTextField.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSTextFieldCell</string> - <string key="superclassName">NSActionCell</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSTextFieldCell.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSToolbar</string> - <string key="superclassName">NSObject</string> - <reference key="sourceIdentifier" ref="5306983"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSUserDefaultsController</string> - <string key="superclassName">NSController</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSUserDefaultsController.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSView</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSClipView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSView</string> - <reference key="sourceIdentifier" ref="248912629"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSView</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSRulerView.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSView</string> - <string key="superclassName">NSResponder</string> - <reference key="sourceIdentifier" ref="78763847"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSViewController</string> - <string key="superclassName">NSResponder</string> - <object class="NSMutableDictionary" key="outlets"> - <string key="NS.key.0">view</string> - <string key="NS.object.0">NSView</string> - </object> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSViewController.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSWindow</string> - <reference key="sourceIdentifier" ref="695193368"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSWindow</string> - <string key="superclassName">NSResponder</string> - <reference key="sourceIdentifier" ref="137514384"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSWindow</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSWindowScripting.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSWindowController</string> - <string key="superclassName">NSResponder</string> - <object class="NSMutableDictionary" key="actions"> - <string key="NS.key.0">showWindow:</string> - <string key="NS.object.0">id</string> - </object> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSWindowController.h</string> - </object> - </object> - </object> </object> <int key="IBDocument.localizationMode">0</int> - <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies"> - <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> - <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies"> - <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string> - <integer value="3000" key="NS.object.0"/> - </object> - <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool> <string key="IBDocument.LastKnownRelativeProjectPath">../../chrome.xcodeproj</string> <int key="IBDocument.defaultPropertyAccessControl">3</int> </data> diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm index 41a97c7..ea5f817 100644 --- a/chrome/browser/app_controller_mac.mm +++ b/chrome/browser/app_controller_mac.mm @@ -21,14 +21,16 @@ #import "chrome/browser/cocoa/browser_window_cocoa.h" #import "chrome/browser/cocoa/browser_window_controller.h" #import "chrome/browser/cocoa/bug_report_window_controller.h" -#import "chrome/browser/cocoa/history_menu_bridge.h" #import "chrome/browser/cocoa/clear_browsing_data_controller.h" #import "chrome/browser/cocoa/encoding_menu_controller_delegate_mac.h" +#import "chrome/browser/cocoa/history_menu_bridge.h" +#import "chrome/browser/cocoa/import_settings_dialog.h" #import "chrome/browser/cocoa/preferences_window_controller.h" #import "chrome/browser/cocoa/tab_strip_controller.h" #import "chrome/browser/cocoa/tab_window_controller.h" #include "chrome/browser/command_updater.h" #include "chrome/browser/download/download_manager.h" +#include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/options_window.h" #include "chrome/browser/sessions/tab_restore_service.h" #include "chrome/browser/tab_contents/tab_contents.h" @@ -529,6 +531,14 @@ static bool g_is_opening_new_window = false; [controller runModalDialog]; break; } + case IDC_IMPORT_SETTINGS: { + UserMetrics::RecordAction("Import_ShowDlg", defaultProfile); + // Note that this dialog controller cleans itself up when closed + // so auto-scoping it here is not necessary. + [[[ImportSettingsDialogController alloc] + initWithProfile:defaultProfile parentWindow:nil] runModalDialog]; + break; + } case IDC_SHOW_HISTORY: Browser::OpenHistoryWindow(defaultProfile); break; @@ -588,6 +598,7 @@ static bool g_is_opening_new_window = false; menuState_->UpdateCommandEnabled(IDC_SHOW_DOWNLOADS, true); menuState_->UpdateCommandEnabled(IDC_MANAGE_EXTENSIONS, true); menuState_->UpdateCommandEnabled(IDC_HELP_PAGE, true); + menuState_->UpdateCommandEnabled(IDC_IMPORT_SETTINGS, true); menuState_->UpdateCommandEnabled(IDC_REPORT_BUG, true); // TODO(pinkerton): ...more to come... } diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc index 23c6a08..73a127b 100644 --- a/chrome/browser/browser.cc +++ b/chrome/browser/browser.cc @@ -2455,6 +2455,7 @@ void Browser::InitCommandState() { command_updater_.UpdateCommandEnabled(IDC_SHOW_EXTENSION_SHELF, true); command_updater_.UpdateCommandEnabled(IDC_SHOW_DOWNLOADS, true); command_updater_.UpdateCommandEnabled(IDC_HELP_PAGE, true); + command_updater_.UpdateCommandEnabled(IDC_IMPORT_SETTINGS, true); ExtensionsService* extensions_service = profile()->GetExtensionsService(); bool enable_extensions = diff --git a/chrome/browser/cocoa/browser_window_cocoa.mm b/chrome/browser/cocoa/browser_window_cocoa.mm index a1aff9d..ee22726 100644 --- a/chrome/browser/cocoa/browser_window_cocoa.mm +++ b/chrome/browser/cocoa/browser_window_cocoa.mm @@ -13,6 +13,7 @@ #import "chrome/browser/cocoa/clear_browsing_data_controller.h" #import "chrome/browser/cocoa/download_shelf_controller.h" #import "chrome/browser/cocoa/html_dialog_window_controller.h" +#import "chrome/browser/cocoa/import_settings_dialog.h" #import "chrome/browser/cocoa/keyword_editor_cocoa_controller.h" #import "chrome/browser/cocoa/nsmenuitem_additions.h" #include "chrome/browser/cocoa/page_info_window_mac.h" @@ -274,7 +275,10 @@ void BrowserWindowCocoa::ShowClearBrowsingDataDialog() { } void BrowserWindowCocoa::ShowImportDialog() { - NOTIMPLEMENTED(); + // Note that the dialog controller takes care of cleaning itself up + // upon dismissal so auto-scoping here is not necessary. + [[[ImportSettingsDialogController alloc] + initWithProfile:browser_->profile() parentWindow:window_] runModalDialog]; } void BrowserWindowCocoa::ShowSearchEnginesDialog() { diff --git a/chrome/browser/cocoa/import_settings_dialog.h b/chrome/browser/cocoa/import_settings_dialog.h new file mode 100644 index 0000000..5a305a2 --- /dev/null +++ b/chrome/browser/cocoa/import_settings_dialog.h @@ -0,0 +1,110 @@ +// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef CHROME_BROWSER_COCOA_IMPORT_SETTINGS_DIALOG_H_ +#define CHROME_BROWSER_COCOA_IMPORT_SETTINGS_DIALOG_H_ + +#import <Cocoa/Cocoa.h> + +#include "base/ref_counted.h" +#include "base/scoped_nsobject.h" +#include "chrome/browser/importer/importer.h" + +class Profile; + +// Controller for the Import Bookmarks and Settings dialog. This controller +// automatically autoreleases itself when its associated dialog is dismissed. +@interface ImportSettingsDialogController : NSWindowController { + @private + NSWindow* parentWindow_; // weak + Profile* profile_; // weak + scoped_ptr<ImporterList> importerList_; + scoped_nsobject<NSArray> sourceBrowsersList_; + NSUInteger sourceBrowserIndex_; + // The following are all bound via the properties below. + BOOL importHistory_; + BOOL importFavorites_; + BOOL importCookies_; + BOOL importPasswords_; + BOOL importSearchEngines_; + BOOL historyAvailable_; + BOOL favoritesAvailable_; + BOOL cookiesAvailable_; + BOOL passwordsAvailable_; + BOOL searchEnginesAvailable_; +} + +// Initialize the dialog controller with either the default profile or +// the profile for the current browser. If you wish to hang this dialog +// off of another window (such as an open browser window) then pass in the +// |parentWindow|, otherwise pass nil. +- (id)initWithProfile:(Profile*)profile + parentWindow:(NSWindow*)parentWindow; + +// Present the sheet/dialog. If parentWindow_ is nil then this will be an +// app modal dialog, otherwise this will be window modal presented as +// a sheet. +- (void)runModalDialog; + +// Called when the "Import" button is pressed. +- (IBAction)ok:(id)sender; + +// Cancel button calls this. +- (IBAction)cancel:(id)sender; + +// An array of ImportSettingsProfiles, provide the list of browser profiles +// available for importing. Bound to the Browser List array controller. +- (NSArray*)sourceBrowsersList; + +// Properties for bindings. +@property(assign, nonatomic) NSUInteger sourceBrowserIndex; +@property(assign, readonly, nonatomic) BOOL importSomething; +// Bindings for the value of the import checkboxes. +@property(assign, nonatomic) BOOL importHistory; +@property(assign, nonatomic) BOOL importFavorites; +@property(assign, nonatomic) BOOL importCookies; +@property(assign, nonatomic) BOOL importPasswords; +@property(assign, nonatomic) BOOL importSearchEngines; +// Bindings for enabling/disabling the checkboxes. +@property(assign, readonly, nonatomic) BOOL historyAvailable; +@property(assign, readonly, nonatomic) BOOL favoritesAvailable; +@property(assign, readonly, nonatomic) BOOL cookiesAvailable; +@property(assign, readonly, nonatomic) BOOL passwordsAvailable; +@property(assign, readonly, nonatomic) BOOL searchEnginesAvailable; + +@end + +@interface ImportSettingsDialogController (TestingAPI) + +// Initialize by providing an array of profile dictionaries. Exposed for +// unit testing but also called by -[initWithProfiles:parentWindow:]. +- (id)initWithProfiles:(NSArray*)profiles + parentWindow:(NSWindow*)parentWindow; + +// Return selected services to import as mapped by the ImportItem enum. +- (uint16)servicesToImport; + +@end + +// Utility class used as array elements for sourceBrowsersList, above. +@interface ImportSettingsProfile : NSObject { + @private + NSString* browserName_; + uint16 services_; // Services as defined by enum ImportItem. +} + +// Convenience creator. |services| is a bitfield of enum ImportItems. ++ (id)importSettingsProfileWithBrowserName:(NSString*)browserName + services:(uint16)services; + +// Designated initializer. |services| is a bitfield of enum ImportItems. +- (id)initWithBrowserName:(NSString*)browserName + services:(uint16)services; // Bitfield of enum ImportItems. + +@property(copy, nonatomic) NSString* browserName; +@property(assign, nonatomic) uint16 services; // Bitfield of enum ImportItems. + +@end + +#endif // CHROME_BROWSER_COCOA_IMPORT_SETTINGS_DIALOG_H_ diff --git a/chrome/browser/cocoa/import_settings_dialog.mm b/chrome/browser/cocoa/import_settings_dialog.mm new file mode 100644 index 0000000..7d8babe --- /dev/null +++ b/chrome/browser/cocoa/import_settings_dialog.mm @@ -0,0 +1,232 @@ +// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#import "chrome/browser/cocoa/import_settings_dialog.h" + +#include "base/mac_util.h" +#include "base/sys_string_conversions.h" +#include "chrome/browser/importer/importer_list.h" +#include "chrome/browser/profile.h" + +@interface ImportSettingsDialogController () + +@property(assign, readwrite, nonatomic) BOOL historyAvailable; +@property(assign, readwrite, nonatomic) BOOL favoritesAvailable; +@property(assign, readwrite, nonatomic) BOOL cookiesAvailable; +@property(assign, readwrite, nonatomic) BOOL passwordsAvailable; +@property(assign, readwrite, nonatomic) BOOL searchEnginesAvailable; + +@end + +@implementation ImportSettingsProfile + +@synthesize browserName = browserName_; +@synthesize services = services_; + ++ (id)importSettingsProfileWithBrowserName:(NSString*)browserName + services:(uint16)services { + id settingsProfile = [[[ImportSettingsProfile alloc] + initWithBrowserName:browserName + services:services] autorelease]; + return settingsProfile; +} + +- (id)initWithBrowserName:(NSString*)browserName + services:(uint16)services { + DCHECK(browserName && services); + if ((self = [super init])) { + if (browserName && services != 0) { + browserName_ = [browserName retain]; + services_ = services; + } else { + [self release]; + self = nil; + } + } + return self; +} + +- (id)init { + NOTREACHED(); // Should never be called. + return [self initWithBrowserName:NULL services:0]; +} + +- (void)dealloc { + [browserName_ release]; + [super dealloc]; +} + +@end + +@implementation ImportSettingsDialogController + +@synthesize sourceBrowserIndex = sourceBrowserIndex_; +@synthesize importHistory = importHistory_; +@synthesize importFavorites = importFavorites_; +@synthesize importCookies = importCookies_; +@synthesize importPasswords = importPasswords_; +@synthesize importSearchEngines = importSearchEngines_; +@synthesize historyAvailable = historyAvailable_; +@synthesize favoritesAvailable = favoritesAvailable_; +@synthesize cookiesAvailable = cookiesAvailable_; +@synthesize passwordsAvailable = passwordsAvailable_; +@synthesize searchEnginesAvailable = searchEnginesAvailable_; + +// Set bindings dependencies for importSomething property. ++ (NSSet*)keyPathsForValuesAffectingImportSomething { + return [NSSet setWithObjects:@"importHistory", @"importFavorites", + @"importCookies", @"importPasswords", @"importSearchEngines", nil]; +} + +- (id)initWithProfile:(Profile*)profile + parentWindow:(NSWindow*)parentWindow { + // Collect profile information (profile name and the services which can + // be imported from each) into an array of ImportSettingsProfile which + // are bound to the Browser List array controller and the popup name + // presentation. The services element is used to indirectly control + // checkbox enabling. + importerList_.reset(new ImporterList); + ImporterList& importerList(*(importerList_.get())); + importerList.DetectSourceProfiles(); + int profilesCount = importerList.GetAvailableProfileCount(); + // There shoule be at least the default profile so this should never be zero. + DCHECK(profilesCount > 0); + NSMutableArray* browserProfiles = + [NSMutableArray arrayWithCapacity:profilesCount]; + for (int i = 0; i < profilesCount; ++i) { + const ProfileInfo& sourceProfile = importerList.GetSourceProfileInfoAt(i); + NSString* browserName = + base::SysWideToNSString(sourceProfile.description); + uint16 browserServices = sourceProfile.services_supported; + ImportSettingsProfile* settingsProfile = + [ImportSettingsProfile + importSettingsProfileWithBrowserName:browserName + services:browserServices]; + [browserProfiles addObject:settingsProfile]; + } + if ((self = [self initWithProfiles:browserProfiles + parentWindow:parentWindow])) { + profile_ = profile; + parentWindow_ = parentWindow; + } + return self; +} + +- (id)initWithProfiles:(NSArray*)profiles + parentWindow:(NSWindow*)parentWindow { + NSString* nibpath = + [mac_util::MainAppBundle() pathForResource:@"ImportSettingsDialog" + ofType:@"nib"]; + if ((self = [super initWithWindowNibPath:nibpath owner:self])) { + sourceBrowsersList_.reset([profiles retain]); + // Create and initialize an importerList_ when running unit tests. + if (!importerList_.get()) { + importerList_.reset(new ImporterList); + ImporterList& importerList(*(importerList_.get())); + importerList.DetectSourceProfiles(); + } + } + return self; +} + +- (id)init { + return [self initWithProfile:NULL parentWindow:nil]; +} + +- (void)awakeFromNib { + // Force an update of the checkbox enabled states. + [self setSourceBrowserIndex:0]; +} + +- (void)runModalDialog { + // If there is no parentWindow_ then this will present as a regular + // modal dialog not hanging off of any other window. + [NSApp beginSheet:[self window] + modalForWindow:parentWindow_ + modalDelegate:self + didEndSelector:@selector(didEndSheet:returnCode:contextInfo:) + contextInfo:nil]; +} + +- (IBAction)ok:(id)sender { + const ProfileInfo& sourceProfile = + importerList_.get()->GetSourceProfileInfoAt([self sourceBrowserIndex]); + uint16 items = sourceProfile.services_supported; + // ProfileInfo.services_supported is a uint16 while the call to + // StartImportingWithUI requires an int16. + int16 servicesToImport = static_cast<int16>(items & [self servicesToImport]); + if (servicesToImport) { + if (profile_) { + ImporterHost* importerHost = new ImporterHost; + // Note that a side effect of the following call is to cause the + // importerHost to be disposed once the import has completed. + StartImportingWithUI(nil, servicesToImport, importerHost, + sourceProfile, profile_, nil, false); + } + } else { + LOG(WARNING) << "There were no settings to import from '" + << sourceProfile.description << "'."; + } + [NSApp endSheet:[self window]]; +} + +- (IBAction)cancel:(id)sender { + [NSApp endSheet:[self window]]; +} + +- (void)didEndSheet:(NSWindow*)sheet + returnCode:(int)returnCode + contextInfo:(void*)contextInfo { + [sheet close]; +} + +- (void)windowWillClose:(NSNotification*)notification { + [self autorelease]; +} + +#pragma mark Accessors + +- (NSArray*)sourceBrowsersList { + return sourceBrowsersList_.get(); +} + +// Accessor which cascades selected-browser changes into a re-evaluation of the +// available services and the associated checkbox enable and checked states. +- (void)setSourceBrowserIndex:(NSUInteger)browserIndex { + sourceBrowserIndex_ = browserIndex; + ImportSettingsProfile* profile = + [sourceBrowsersList_.get() objectAtIndex:browserIndex]; + uint16 items = [profile services]; + [self setHistoryAvailable:(items & HISTORY) ? YES : NO]; + [self setImportHistory:[self historyAvailable]]; + [self setFavoritesAvailable:(items & FAVORITES) ? YES : NO]; + [self setImportFavorites:[self favoritesAvailable]]; + [self setCookiesAvailable:(items & COOKIES) ? YES : NO]; + [self setImportCookies:[self cookiesAvailable]]; + [self setPasswordsAvailable:(items & PASSWORDS) ? YES : NO]; + [self setImportPasswords:[self passwordsAvailable]]; + [self setSearchEnginesAvailable:(items & SEARCH_ENGINES) ? YES : NO]; + [self setImportSearchEngines:[self searchEnginesAvailable]]; +} + +- (uint16)servicesToImport { + uint16 servicesToImport = 0; + if ([self importHistory]) servicesToImport |= HISTORY; + if ([self importFavorites]) servicesToImport |= FAVORITES; + if ([self importCookies]) servicesToImport |= COOKIES; + if ([self importPasswords]) servicesToImport |= PASSWORDS; + if ([self importSearchEngines]) servicesToImport |= SEARCH_ENGINES; + return servicesToImport; +} + +// KVO accessor which returns YES if at least one of the services +// provided by the selected profile has been marked for importing +// and bound to the OK button's enable property. +- (BOOL)importSomething { + return [self importHistory] || [self importFavorites] || + [self importCookies] || [self importPasswords] || + [self importSearchEngines]; +} + +@end diff --git a/chrome/browser/cocoa/import_settings_dialog_unittest.mm b/chrome/browser/cocoa/import_settings_dialog_unittest.mm new file mode 100644 index 0000000..c5585bf --- /dev/null +++ b/chrome/browser/cocoa/import_settings_dialog_unittest.mm @@ -0,0 +1,137 @@ +// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#import <Cocoa/Cocoa.h> + +#include "base/scoped_nsobject.h" +#import "chrome/browser/cocoa/browser_test_helper.h" +#import "chrome/browser/cocoa/cocoa_test_helper.h" +#import "chrome/browser/cocoa/import_settings_dialog.h" +#include "chrome/browser/importer/importer.h" +#include "testing/gtest/include/gtest/gtest.h" +#include "testing/platform_test.h" + +class ImportSettingsDialogTest : public CocoaTest { + public: + ImportSettingsDialogController* controller_; + + virtual void SetUp() { + CocoaTest::SetUp(); + unsigned int safariServices = + HISTORY | FAVORITES | COOKIES | PASSWORDS | SEARCH_ENGINES; + ImportSettingsProfile* mockSafari = + [ImportSettingsProfile + importSettingsProfileWithBrowserName:@"MockSafari" + services:safariServices]; + unsigned int fairefoxServices = HISTORY | FAVORITES | COOKIES | PASSWORDS; + ImportSettingsProfile* mockFirefox = + [ImportSettingsProfile + importSettingsProfileWithBrowserName:@"MockFirefox" + services:fairefoxServices]; + unsigned int caminoServices = HISTORY | COOKIES | SEARCH_ENGINES; + ImportSettingsProfile* mockCamino = + [ImportSettingsProfile + importSettingsProfileWithBrowserName:@"MockCamino" + services:caminoServices]; + NSArray* browsers = [NSArray arrayWithObjects: + mockSafari, mockFirefox, mockCamino, nil]; + controller_ = [[ImportSettingsDialogController alloc] + initWithProfiles:browsers parentWindow:nil]; + [controller_ runModalDialog]; // Forces a nib load. + } + + virtual void TearDown() { + controller_ = NULL; + CocoaTest::TearDown(); + } +}; + +TEST_F(ImportSettingsDialogTest, CancelDialog) { + [controller_ cancel:nil]; +} + +TEST_F(ImportSettingsDialogTest, ChooseVariousBrowsers) { + // Initial choice should already be MockSafari with all items enabled. + [controller_ setSourceBrowserIndex:0]; + EXPECT_TRUE([controller_ importHistory]); + EXPECT_TRUE([controller_ historyAvailable]); + EXPECT_TRUE([controller_ importFavorites]); + EXPECT_TRUE([controller_ favoritesAvailable]); + EXPECT_TRUE([controller_ importCookies]); + EXPECT_TRUE([controller_ cookiesAvailable]); + EXPECT_TRUE([controller_ importPasswords]); + EXPECT_TRUE([controller_ passwordsAvailable]); + EXPECT_TRUE([controller_ importSearchEngines]); + EXPECT_TRUE([controller_ searchEnginesAvailable]); + EXPECT_EQ(HISTORY | FAVORITES | COOKIES | PASSWORDS | SEARCH_ENGINES, + [controller_ servicesToImport]); + + // Next choice we test is MockCamino. + [controller_ setSourceBrowserIndex:2]; + EXPECT_TRUE([controller_ importHistory]); + EXPECT_TRUE([controller_ historyAvailable]); + EXPECT_FALSE([controller_ importFavorites]); + EXPECT_FALSE([controller_ favoritesAvailable]); + EXPECT_TRUE([controller_ importCookies]); + EXPECT_TRUE([controller_ cookiesAvailable]); + EXPECT_FALSE([controller_ importPasswords]); + EXPECT_FALSE([controller_ passwordsAvailable]); + EXPECT_TRUE([controller_ importSearchEngines]); + EXPECT_TRUE([controller_ searchEnginesAvailable]); + EXPECT_EQ(HISTORY | COOKIES | SEARCH_ENGINES, [controller_ servicesToImport]); + + // Next choice we test is MockFirefox. + [controller_ setSourceBrowserIndex:1]; + EXPECT_TRUE([controller_ importHistory]); + EXPECT_TRUE([controller_ historyAvailable]); + EXPECT_TRUE([controller_ importFavorites]); + EXPECT_TRUE([controller_ favoritesAvailable]); + EXPECT_TRUE([controller_ importCookies]); + EXPECT_TRUE([controller_ cookiesAvailable]); + EXPECT_TRUE([controller_ importPasswords]); + EXPECT_TRUE([controller_ passwordsAvailable]); + EXPECT_FALSE([controller_ importSearchEngines]); + EXPECT_FALSE([controller_ searchEnginesAvailable]); + EXPECT_EQ(HISTORY | FAVORITES | COOKIES | PASSWORDS, + [controller_ servicesToImport]); + + [controller_ cancel:nil]; +} + +TEST_F(ImportSettingsDialogTest, SetVariousSettings) { + // Leave the choice MockSafari, but toggle the settings. + [controller_ setImportHistory:NO]; + [controller_ setImportFavorites:NO]; + [controller_ setImportCookies:NO]; + [controller_ setImportPasswords:NO]; + [controller_ setImportSearchEngines:NO]; + EXPECT_EQ(0, [controller_ servicesToImport]); + EXPECT_FALSE([controller_ importSomething]); + + [controller_ setImportHistory:YES]; + EXPECT_EQ(HISTORY, [controller_ servicesToImport]); + EXPECT_TRUE([controller_ importSomething]); + + [controller_ setImportHistory:NO]; + [controller_ setImportFavorites:YES]; + EXPECT_EQ(FAVORITES, [controller_ servicesToImport]); + EXPECT_TRUE([controller_ importSomething]); + + [controller_ setImportFavorites:NO]; + [controller_ setImportCookies:YES]; + EXPECT_EQ(COOKIES, [controller_ servicesToImport]); + EXPECT_TRUE([controller_ importSomething]); + + [controller_ setImportCookies:NO]; + [controller_ setImportPasswords:YES]; + EXPECT_EQ(PASSWORDS, [controller_ servicesToImport]); + EXPECT_TRUE([controller_ importSomething]); + + [controller_ setImportPasswords:NO]; + [controller_ setImportSearchEngines:YES]; + EXPECT_EQ(SEARCH_ENGINES, [controller_ servicesToImport]); + EXPECT_TRUE([controller_ importSomething]); + + [controller_ cancel:nil]; +} diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index ffdc0c1..e55cef4 100755 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -1628,6 +1628,7 @@ 'app/nibs/FirstRunDialog.xib', 'app/nibs/HungRendererDialog.xib', 'app/nibs/HttpAuthLoginSheet.xib', + 'app/nibs/ImportSettingsDialog.xib', 'app/nibs/InfoBar.xib', 'app/nibs/InfoBarContainer.xib', 'app/nibs/ImportProgressDialog.xib', diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index f10d7f6..475eb20 100755 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -424,6 +424,8 @@ 'browser/cocoa/hung_renderer_controller.mm', 'browser/cocoa/import_progress_dialog.h', 'browser/cocoa/import_progress_dialog.mm', + 'browser/cocoa/import_settings_dialog.h', + 'browser/cocoa/import_settings_dialog.mm', 'browser/cocoa/importer_lock_dialog.h', 'browser/cocoa/importer_lock_dialog.mm', 'browser/cocoa/info_bubble_view.h', @@ -1936,6 +1938,7 @@ 'app/nibs/FirstRunDialog.xib', 'app/nibs/HttpAuthLoginSheet.xib', 'app/nibs/HungRendererDialog.xib', + 'app/nibs/ImportSettingsDialog.xib', 'app/nibs/ImportProgressDialog.xib', 'app/nibs/KeywordEditor.xib', 'app/nibs/MainMenu.xib', |