summaryrefslogtreecommitdiffstats
path: root/chrome/app/nibs
diff options
context:
space:
mode:
authorjrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-03 21:13:37 +0000
committerjrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-03 21:13:37 +0000
commit0e8ed61c551ff09acf3401804feb7e0409486e76 (patch)
tree5b3e222bc944c21ecc6f597adeed52100c9454ef /chrome/app/nibs
parent80196bd875c45e160437adb8b3bd8e060b2f1a72 (diff)
downloadchromium_src-0e8ed61c551ff09acf3401804feb7e0409486e76.zip
chromium_src-0e8ed61c551ff09acf3401804feb7e0409486e76.tar.gz
chromium_src-0e8ed61c551ff09acf3401804feb7e0409486e76.tar.bz2
Bookmark context menu "Edit" starts with current name, not "New Folder".
"Add Folder..." from either buttons or bar happier (always adds, doesn't edit). "Add Folder..." now allows you to rename new folders the default name ("New Folder"). BUG=http://crbug.com/26364, http://crbug.com/26407 TEST=Over a bookmark button for a 'mark or folder, context menu --> Edit. Make sure initial name is current name, not "New Folder". Over button for 'mark, for folder, or bar itself: context menu --> Add Folder. Make sure initial name is "New Folder", and that it creates a folder (not a rename). Make sure you are allowed to create a folder named "New Folder". Review URL: http://codereview.chromium.org/345045 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30866 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/nibs')
-rw-r--r--chrome/app/nibs/BookmarkBar.xib42
1 files changed, 21 insertions, 21 deletions
diff --git a/chrome/app/nibs/BookmarkBar.xib b/chrome/app/nibs/BookmarkBar.xib
index 2cbbfa2..b23657e 100644
--- a/chrome/app/nibs/BookmarkBar.xib
+++ b/chrome/app/nibs/BookmarkBar.xib
@@ -12,9 +12,9 @@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
+ <integer value="1"/>
<integer value="4"/>
<integer value="18"/>
- <integer value="1"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -515,22 +515,6 @@
<int key="connectionID">59</int>
</object>
<object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">addOrRenameFolder:</string>
- <reference key="source" ref="1001"/>
- <reference key="destination" ref="595609715"/>
- </object>
- <int key="connectionID">60</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">addOrRenameFolder:</string>
- <reference key="source" ref="1001"/>
- <reference key="destination" ref="90793013"/>
- </object>
- <int key="connectionID">61</int>
- </object>
- <object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">buttonView_</string>
<reference key="source" ref="1001"/>
@@ -642,6 +626,22 @@
</object>
<int key="connectionID">95</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">addFolder:</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="595609715"/>
+ </object>
+ <int key="connectionID">96</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">addFolder:</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="90793013"/>
+ </object>
+ <int key="connectionID">97</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -971,7 +971,7 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{380, 426}, {362, 233}}</string>
+ <string>{{364, 332}, {362, 233}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -985,7 +985,7 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{268, 519}, {372, 213}}</string>
+ <string>{{40, 636}, {372, 213}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1022,7 +1022,7 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">95</int>
+ <int key="maxID">97</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -1042,7 +1042,7 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
- <string>addOrRenameFolder:</string>
+ <string>addFolder:</string>
<string>addPage:</string>
<string>copyBookmark:</string>
<string>deleteBookmark:</string>