summaryrefslogtreecommitdiffstats
path: root/chrome/app/nibs/BookmarkEditor.xib
diff options
context:
space:
mode:
authormrossetti@chromium.org <mrossetti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-06 03:24:29 +0000
committermrossetti@chromium.org <mrossetti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-06 03:24:29 +0000
commita5971dc68d14d4cb063c10138133483a14cd7530 (patch)
treea141b12594ce9c79a25dd586b5b754976d14ab11 /chrome/app/nibs/BookmarkEditor.xib
parent85c55dcd717445cd3763b5c94f9902b4cdd194b0 (diff)
downloadchromium_src-a5971dc68d14d4cb063c10138133483a14cd7530.zip
chromium_src-a5971dc68d14d4cb063c10138133483a14cd7530.tar.gz
chromium_src-a5971dc68d14d4cb063c10138133483a14cd7530.tar.bz2
Implement Bookmark All Tabs... Added an abstraction of BookmarkEditorController called BookmarkEditorBaseController, from which BookmarkEditorController and the new BookmarkAllTabsController derive. The bookmark/folder name, URL and OK button now use bindings/KVO. Added BookmarkAllTabs.xib which is nearly identical to BookmarkEditor.xib. Changed unit test since an empty bookmark name is now acceptable. Added unit test for the Bookmark All Tabs...
BookmarkEditor.xib changes: Removed the bookmark name and url as outlets and instead bound their values to controller's displayName and displayURL respectively. Bound the OK button enabling to the controller's okEnabled. BUG=25099 TEST=Open two or more tabs. Bring up a contextual menu by control-clicking on one of the tabs. Choose the Bookmark All Tabs... menu item. A dialog will be presented in which you can type a folder name and select the parent folder in which the new folder will be placed. By default, the most recently touched folder will be selected as the parent. Click OK. Now check to parent folder to see that the newly created folder has been added and then check within that folder to see that the open tabs have been added. Perform the above operation again only this time choose the Bookmark All Tabs... menu item found in the Bookmarks menu. Review URL: http://codereview.chromium.org/357005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31200 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/nibs/BookmarkEditor.xib')
-rw-r--r--chrome/app/nibs/BookmarkEditor.xib87
1 files changed, 63 insertions, 24 deletions
diff --git a/chrome/app/nibs/BookmarkEditor.xib b/chrome/app/nibs/BookmarkEditor.xib
index aabecda..312cafd 100644
--- a/chrome/app/nibs/BookmarkEditor.xib
+++ b/chrome/app/nibs/BookmarkEditor.xib
@@ -1,28 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.03">
+<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.02">
<data>
<int key="IBDocument.SystemTarget">1050</int>
- <string key="IBDocument.SystemVersion">9L31a</string>
- <string key="IBDocument.InterfaceBuilderVersion">677</string>
+ <string key="IBDocument.SystemVersion">9L30</string>
+ <string key="IBDocument.InterfaceBuilderVersion">670</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="2"/>
+ <integer value="36"/>
</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">
@@ -346,14 +337,6 @@
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
- <string key="label">nameField_</string>
- <reference key="source" ref="1001"/>
- <reference key="destination" ref="921757931"/>
- </object>
- <int key="connectionID">24</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
<string key="label">urlField_</string>
<reference key="source" ref="1001"/>
<reference key="destination" ref="812603726"/>
@@ -448,6 +431,62 @@
</object>
<int key="connectionID">61</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBBindingConnection" key="connection">
+ <string key="label">value: displayURL</string>
+ <reference key="source" ref="812603726"/>
+ <reference key="destination" ref="1001"/>
+ <object class="NSNibBindingConnector" key="connector">
+ <reference key="NSSource" ref="812603726"/>
+ <reference key="NSDestination" ref="1001"/>
+ <string key="NSLabel">value: displayURL</string>
+ <string key="NSBinding">value</string>
+ <string key="NSKeyPath">displayURL</string>
+ <object class="NSDictionary" key="NSOptions">
+ <string key="NS.key.0">NSContinuouslyUpdatesValue</string>
+ <integer value="1" key="NS.object.0" id="5"/>
+ </object>
+ <int key="NSNibBindingConnectorVersion">2</int>
+ </object>
+ </object>
+ <int key="connectionID">64</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBBindingConnection" key="connection">
+ <string key="label">value: displayName</string>
+ <reference key="source" ref="921757931"/>
+ <reference key="destination" ref="1001"/>
+ <object class="NSNibBindingConnector" key="connector">
+ <reference key="NSSource" ref="921757931"/>
+ <reference key="NSDestination" ref="1001"/>
+ <string key="NSLabel">value: displayName</string>
+ <string key="NSBinding">value</string>
+ <string key="NSKeyPath">displayName</string>
+ <object class="NSDictionary" key="NSOptions">
+ <string key="NS.key.0">NSContinuouslyUpdatesValue</string>
+ <reference key="NS.object.0" ref="5"/>
+ </object>
+ <int key="NSNibBindingConnectorVersion">2</int>
+ </object>
+ </object>
+ <int key="connectionID">65</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBBindingConnection" key="connection">
+ <string key="label">enabled: okEnabled</string>
+ <reference key="source" ref="983581711"/>
+ <reference key="destination" ref="1001"/>
+ <object class="NSNibBindingConnector" key="connector">
+ <reference key="NSSource" ref="983581711"/>
+ <reference key="NSDestination" ref="1001"/>
+ <string key="NSLabel">enabled: okEnabled</string>
+ <string key="NSBinding">enabled</string>
+ <string key="NSKeyPath">okEnabled</string>
+ <int key="NSNibBindingConnectorVersion">2</int>
+ </object>
+ </object>
+ <int key="connectionID">66</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -698,10 +737,10 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{626, 873}, {480, 270}}</string>
+ <string>{{141, 558}, {480, 270}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="0" id="6"/>
- <string>{{626, 873}, {480, 270}}</string>
+ <string>{{141, 558}, {480, 270}}</string>
<reference ref="6"/>
<string>{196, 240}</string>
<string>{{357, 418}, {480, 270}}</string>
@@ -752,7 +791,7 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">61</int>
+ <int key="maxID">66</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">