diff options
| author | mrossetti@chromium.org <mrossetti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-26 20:09:18 +0000 |
|---|---|---|
| committer | mrossetti@chromium.org <mrossetti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-26 20:09:18 +0000 |
| commit | a8e4a8fa39604cd309e1e3d62cf9c552dcfe541d (patch) | |
| tree | 9ac98acea8834eff2c6298f931d03324b06fab21 /chrome/app/nibs/BookmarkBar.xib | |
| parent | 6a0ee4ec5905be6182b20218da1c276fc7e457fd (diff) | |
| download | chromium_src-a8e4a8fa39604cd309e1e3d62cf9c552dcfe541d.zip chromium_src-a8e4a8fa39604cd309e1e3d62cf9c552dcfe541d.tar.gz chromium_src-a8e4a8fa39604cd309e1e3d62cf9c552dcfe541d.tar.bz2 | |
Resize the "For quick access..." and "Import bookmarks now..." components shown in the bookmark bar when there are no bookmarks in the bar, when the window resizes. Show ellipses when each gets trimmed and hide them when they get too small.
BookmarkBar.xib changes: Connect the "Import bookmarks now..." button up to the importBookmarksButton_ outlet in the BookmarkBarView.
BUG=32557
TEST=1) Start up a browser with no bookmarks on the bookmarks bar.
2) Verify that the "For quick access..." and "Import bookmarks now..." test fully shows.
3) Start shrinking the width of the browser window.
4) Verify that the "Import bookmarks now..." text is shrunk/clipped and finally disappears as the window gets narrower.
5) Continue shrinking the width and verify that the "For quick access..." text is shrunk/clipped with ellipses as the window gets narrower.
6) Grow the window and verify that the "For quick access..." reappears and then the "Import book now..." does.
Review URL: http://codereview.chromium.org/2243002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48316 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/nibs/BookmarkBar.xib')
| -rw-r--r-- | chrome/app/nibs/BookmarkBar.xib | 38 |
1 files changed, 33 insertions, 5 deletions
diff --git a/chrome/app/nibs/BookmarkBar.xib b/chrome/app/nibs/BookmarkBar.xib index b9700e7..8a8fce6 100644 --- a/chrome/app/nibs/BookmarkBar.xib +++ b/chrome/app/nibs/BookmarkBar.xib @@ -58,8 +58,8 @@ <reference key="NSSuperview" ref="1023728927"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="458754719"> - <int key="NSCellFlags">605158976</int> - <int key="NSCellFlags2">272761856</int> + <int key="NSCellFlags">604110400</int> + <int key="NSCellFlags2">272762880</int> <string key="NSContents">^IDS_BOOKMARKS_NO_ITEMS</string> <object class="NSFont" key="NSSupport" id="26"> <string key="NSName">LucidaGrande</string> @@ -94,8 +94,8 @@ <reference key="NSSuperview" ref="1023728927"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="976310023"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">134348800</int> + <int key="NSCellFlags">67239488</int> + <int key="NSCellFlags2">133120</int> <string key="NSContents">^IDS_BOOKMARK_BAR_IMPORT_LINK</string> <reference key="NSSupport" ref="26"/> <reference key="NSControlView" ref="1020224577"/> @@ -845,6 +845,14 @@ </object> <int key="connectionID">135</int> </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">importBookmarksButton_</string> + <reference key="source" ref="610146462"/> + <reference key="destination" ref="1020224577"/> + </object> + <int key="connectionID">136</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -1323,7 +1331,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">135</int> + <int key="maxID">136</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -1428,6 +1436,13 @@ </object> </object> <object class="IBPartialClassDescription"> + <string key="className">BookmarkBarController</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier" id="1046231818"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">browser/cocoa/bookmark_bar_unittest_helper.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> <string key="className">BookmarkBarToolbarView</string> <string key="superclassName">AnimatableView</string> <object class="NSMutableDictionary" key="outlets"> @@ -1447,12 +1462,14 @@ <object class="NSMutableArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>controller_</string> + <string>importBookmarksButton_</string> <string>noItemContainer</string> <string>noItemTextfield_</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <string>BookmarkBarController</string> + <string>NSButton</string> <string>NSView</string> <string>NSTextField</string> </object> @@ -1472,6 +1489,10 @@ </object> <object class="IBPartialClassDescription"> <string key="className">BookmarkButton</string> + <reference key="sourceIdentifier" ref="1046231818"/> + </object> + <object class="IBPartialClassDescription"> + <string key="className">BookmarkButton</string> <string key="superclassName">DraggableButton</string> <object class="NSMutableDictionary" key="outlets"> <string key="NS.key.0">delegate_</string> @@ -1626,6 +1647,13 @@ <string key="className">NSObject</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> + <string key="minorKey">browser/cocoa/objc_zombie.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> |