diff options
author | rohitrao@chromium.org <rohitrao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-03 23:55:55 +0000 |
---|---|---|
committer | rohitrao@chromium.org <rohitrao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-03 23:55:55 +0000 |
commit | fc701bfe7df9de83bfbf5c93f23b455a47ba6bd8 (patch) | |
tree | 74a4fba00d45604b03d26378db27259a7b8a6ebc /chrome/app/nibs | |
parent | 5e36967c2b96745b13f3bc8d9ca56f62d888ae1d (diff) | |
download | chromium_src-fc701bfe7df9de83bfbf5c93f23b455a47ba6bd8.zip chromium_src-fc701bfe7df9de83bfbf5c93f23b455a47ba6bd8.tar.gz chromium_src-fc701bfe7df9de83bfbf5c93f23b455a47ba6bd8.tar.bz2 |
[Mac] Enables animations for the infobar. Changes the control flow for infobar opening/closing to match Windows more closely.
Nib file changes:
- Embedded the InfoBarGradientView inside an AnimatableView.
- Rebound [controller view] to the AnimatableView and added an infoBarView_ IBOutlet.
- Bound the AnimatableView's delegate_ to the InfoBarController.
BUG=http://crbug.com/25599
TEST=Infobars should animate in and out, except for during tab switches.
Review URL: http://codereview.chromium.org/354008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30893 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/nibs')
-rw-r--r-- | chrome/app/nibs/InfoBar.xib | 420 |
1 files changed, 242 insertions, 178 deletions
diff --git a/chrome/app/nibs/InfoBar.xib b/chrome/app/nibs/InfoBar.xib index 4f5cb15..8c61ab6 100644 --- a/chrome/app/nibs/InfoBar.xib +++ b/chrome/app/nibs/InfoBar.xib @@ -2,13 +2,13 @@ <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.03"> <data> <int key="IBDocument.SystemTarget">1050</int> - <string key="IBDocument.SystemVersion">9L30</string> + <string key="IBDocument.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="1"/> + <integer value="30"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -34,153 +34,163 @@ <object class="NSCustomObject" id="1004"> <string key="NSClassName">NSApplication</string> </object> - <object class="NSCustomView" id="1005"> + <object class="NSCustomView" id="374699732"> <reference key="NSNextResponder"/> <int key="NSvFlags">290</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSTextField" id="293244832"> - <reference key="NSNextResponder" ref="1005"/> - <int key="NSvFlags">258</int> - <string key="NSFrame">{{36, 7}, {205, 17}}</string> - <reference key="NSSuperview" ref="1005"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="963811960"> - <int key="NSCellFlags">67239488</int> - <int key="NSCellFlags2">272631808</int> - <string key="NSContents">InfoBar text</string> - <object class="NSFont" key="NSSupport" id="3997082"> - <string key="NSName">LucidaGrande</string> - <double key="NSSize">1.300000e+01</double> - <int key="NSfFlags">1044</int> - </object> - <reference key="NSControlView" ref="293244832"/> - <object class="NSColor" key="NSBackgroundColor"> - <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 class="NSCustomView" id="1005"> + <reference key="NSNextResponder" ref="374699732"/> + <int key="NSvFlags">290</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSTextField" id="293244832"> + <reference key="NSNextResponder" ref="1005"/> + <int key="NSvFlags">258</int> + <string key="NSFrame">{{36, 7}, {205, 17}}</string> + <reference key="NSSuperview" ref="1005"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="963811960"> + <int key="NSCellFlags">67239488</int> + <int key="NSCellFlags2">272631808</int> + <string key="NSContents">InfoBar text</string> + <object class="NSFont" key="NSSupport" id="3997082"> + <string key="NSName">LucidaGrande</string> + <double key="NSSize">1.300000e+01</double> + <int key="NSfFlags">1044</int> + </object> + <reference key="NSControlView" ref="293244832"/> + <object class="NSColor" key="NSBackgroundColor"> + <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"> + <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 class="NSColor" key="NSTextColor"> - <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 class="NSImageView" id="724203299"> + <reference key="NSNextResponder" ref="1005"/> + <int key="NSvFlags">300</int> + <object class="NSMutableSet" key="NSDragTypes"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSMutableArray" key="set.sortedObjects"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>Apple PDF pasteboard type</string> + <string>Apple PICT pasteboard type</string> + <string>Apple PNG pasteboard type</string> + <string>NSFilenamesPboardType</string> + <string>NeXT Encapsulated PostScript v1.2 pasteboard type</string> + <string>NeXT TIFF v4.0 pasteboard type</string> + </object> </object> + <string key="NSFrame">{{3, 1}, {29, 29}}</string> + <reference key="NSSuperview" ref="1005"/> + <bool key="NSEnabled">YES</bool> + <object class="NSImageCell" key="NSCell" id="905047690"> + <int key="NSCellFlags">130560</int> + <int key="NSCellFlags2">33554432</int> + <int key="NSAlign">0</int> + <int key="NSScale">3</int> + <int key="NSStyle">0</int> + <bool key="NSAnimates">NO</bool> + </object> + <bool key="NSEditable">YES</bool> </object> - </object> - </object> - <object class="NSImageView" id="724203299"> - <reference key="NSNextResponder" ref="1005"/> - <int key="NSvFlags">300</int> - <object class="NSMutableSet" key="NSDragTypes"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSMutableArray" key="set.sortedObjects"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>Apple PDF pasteboard type</string> - <string>Apple PICT pasteboard type</string> - <string>Apple PNG pasteboard type</string> - <string>NSFilenamesPboardType</string> - <string>NeXT Encapsulated PostScript v1.2 pasteboard type</string> - <string>NeXT TIFF v4.0 pasteboard type</string> - </object> - </object> - <string key="NSFrame">{{3, 1}, {29, 29}}</string> - <reference key="NSSuperview" ref="1005"/> - <bool key="NSEnabled">YES</bool> - <object class="NSImageCell" key="NSCell" id="905047690"> - <int key="NSCellFlags">130560</int> - <int key="NSCellFlags2">33554432</int> - <int key="NSAlign">0</int> - <int key="NSScale">3</int> - <int key="NSStyle">0</int> - <bool key="NSAnimates">NO</bool> - </object> - <bool key="NSEditable">YES</bool> - </object> - <object class="NSButton" id="861420161"> - <reference key="NSNextResponder" ref="1005"/> - <int key="NSvFlags">297</int> - <string key="NSFrame">{{454, 8}, {16, 16}}</string> - <reference key="NSSuperview" ref="1005"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="1030694164"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">134217728</int> - <string key="NSContents"/> - <reference key="NSSupport" ref="3997082"/> - <reference key="NSControlView" ref="861420161"/> - <int key="NSButtonFlags">139215103</int> - <int key="NSButtonFlags2">6</int> - <object class="NSCustomResource" key="NSNormalImage"> - <string key="NSClassName">NSImage</string> - <string key="NSResourceName">close_bar</string> + <object class="NSButton" id="861420161"> + <reference key="NSNextResponder" ref="1005"/> + <int key="NSvFlags">297</int> + <string key="NSFrame">{{454, 8}, {16, 16}}</string> + <reference key="NSSuperview" ref="1005"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="1030694164"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">134217728</int> + <string key="NSContents"/> + <reference key="NSSupport" ref="3997082"/> + <reference key="NSControlView" ref="861420161"/> + <int key="NSButtonFlags">139215103</int> + <int key="NSButtonFlags2">6</int> + <object class="NSCustomResource" key="NSNormalImage"> + <string key="NSClassName">NSImage</string> + <string key="NSResourceName">close_bar</string> + </object> + <object class="NSCustomResource" key="NSAlternateImage"> + <string key="NSClassName">NSImage</string> + <string key="NSResourceName">close_bar_p</string> + </object> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> </object> - <object class="NSCustomResource" key="NSAlternateImage"> - <string key="NSClassName">NSImage</string> - <string key="NSResourceName">close_bar_p</string> + <object class="NSButton" id="488415728"> + <reference key="NSNextResponder" ref="1005"/> + <int key="NSvFlags">265</int> + <string key="NSFrame">{{350, 6}, {96, 19}}</string> + <reference key="NSSuperview" ref="1005"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="24619168"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">134217728</int> + <string key="NSContents">CancelBtn</string> + <object class="NSFont" key="NSSupport" id="751943183"> + <string key="NSName">LucidaGrande</string> + <double key="NSSize">1.100000e+01</double> + <int key="NSfFlags">16</int> + </object> + <reference key="NSControlView" ref="488415728"/> + <int key="NSButtonFlags">-2038284033</int> + <int key="NSButtonFlags2">164</int> + <reference key="NSAlternateImage" ref="751943183"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> </object> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> - </object> - <object class="NSButton" id="488415728"> - <reference key="NSNextResponder" ref="1005"/> - <int key="NSvFlags">265</int> - <string key="NSFrame">{{350, 6}, {96, 19}}</string> - <reference key="NSSuperview" ref="1005"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="24619168"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">134217728</int> - <string key="NSContents">CancelBtn</string> - <object class="NSFont" key="NSSupport" id="751943183"> - <string key="NSName">LucidaGrande</string> - <double key="NSSize">1.100000e+01</double> - <int key="NSfFlags">16</int> + <object class="NSButton" id="11488953"> + <reference key="NSNextResponder" ref="1005"/> + <int key="NSvFlags">265</int> + <string key="NSFrame">{{246, 6}, {96, 19}}</string> + <reference key="NSSuperview" ref="1005"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="900516520"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">134217728</int> + <string key="NSContents">OKBtn</string> + <reference key="NSSupport" ref="751943183"/> + <reference key="NSControlView" ref="11488953"/> + <int key="NSButtonFlags">-2038284033</int> + <int key="NSButtonFlags2">164</int> + <reference key="NSAlternateImage" ref="751943183"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> </object> - <reference key="NSControlView" ref="488415728"/> - <int key="NSButtonFlags">-2038284033</int> - <int key="NSButtonFlags2">164</int> - <reference key="NSAlternateImage" ref="751943183"/> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> - </object> - <object class="NSButton" id="11488953"> - <reference key="NSNextResponder" ref="1005"/> - <int key="NSvFlags">265</int> - <string key="NSFrame">{{246, 6}, {96, 19}}</string> - <reference key="NSSuperview" ref="1005"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="900516520"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">134217728</int> - <string key="NSContents">OKBtn</string> - <reference key="NSSupport" ref="751943183"/> - <reference key="NSControlView" ref="11488953"/> - <int key="NSButtonFlags">-2038284033</int> - <int key="NSButtonFlags2">164</int> - <reference key="NSAlternateImage" ref="751943183"/> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> </object> + <string key="NSFrameSize">{480, 31}</string> + <reference key="NSSuperview" ref="374699732"/> + <string key="NSClassName">InfoBarGradientView</string> </object> </object> <string key="NSFrameSize">{480, 31}</string> <reference key="NSSuperview"/> - <string key="NSClassName">InfoBarGradientView</string> + <string key="NSClassName">AnimatableView</string> </object> </object> <object class="IBObjectContainer" key="IBDocument.Objects"> @@ -203,14 +213,6 @@ <int key="connectionID">11</int> </object> <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">view</string> - <reference key="source" ref="1001"/> - <reference key="destination" ref="1005"/> - </object> - <int key="connectionID">12</int> - </object> - <object class="IBConnectionRecord"> <object class="IBActionConnection" key="connection"> <string key="label">dismiss:</string> <reference key="source" ref="1001"/> @@ -258,6 +260,30 @@ </object> <int key="connectionID">29</int> </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">view</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="374699732"/> + </object> + <int key="connectionID">31</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">infoBarView_</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="1005"/> + </object> + <int key="connectionID">32</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">delegate_</string> + <reference key="source" ref="374699732"/> + <reference key="destination" ref="1001"/> + </object> + <int key="connectionID">33</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -289,47 +315,46 @@ <string key="objectName">Application</string> </object> <object class="IBObjectRecord"> + <int key="objectID">30</int> + <reference key="object" ref="374699732"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="1005"/> + </object> + <reference key="parent" ref="1002"/> + </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="293244832"/> - <reference ref="724203299"/> - <reference ref="488415728"/> - <reference ref="11488953"/> <reference ref="861420161"/> + <reference ref="11488953"/> + <reference ref="488415728"/> + <reference ref="724203299"/> + <reference ref="293244832"/> </object> - <reference key="parent" ref="1002"/> + <reference key="parent" ref="374699732"/> </object> <object class="IBObjectRecord"> - <int key="objectID">2</int> - <reference key="object" ref="293244832"/> + <int key="objectID">15</int> + <reference key="object" ref="861420161"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="963811960"/> + <reference ref="1030694164"/> </object> <reference key="parent" ref="1005"/> </object> <object class="IBObjectRecord"> - <int key="objectID">3</int> - <reference key="object" ref="963811960"/> - <reference key="parent" ref="293244832"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">4</int> - <reference key="object" ref="724203299"/> + <int key="objectID">22</int> + <reference key="object" ref="11488953"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="905047690"/> + <reference ref="900516520"/> </object> <reference key="parent" ref="1005"/> </object> <object class="IBObjectRecord"> - <int key="objectID">5</int> - <reference key="object" ref="905047690"/> - <reference key="parent" ref="724203299"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">20</int> <reference key="object" ref="488415728"/> <object class="NSMutableArray" key="children"> @@ -339,34 +364,44 @@ <reference key="parent" ref="1005"/> </object> <object class="IBObjectRecord"> - <int key="objectID">21</int> - <reference key="object" ref="24619168"/> - <reference key="parent" ref="488415728"/> + <int key="objectID">4</int> + <reference key="object" ref="724203299"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="905047690"/> + </object> + <reference key="parent" ref="1005"/> </object> <object class="IBObjectRecord"> - <int key="objectID">22</int> - <reference key="object" ref="11488953"/> + <int key="objectID">2</int> + <reference key="object" ref="293244832"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="900516520"/> + <reference ref="963811960"/> </object> <reference key="parent" ref="1005"/> </object> <object class="IBObjectRecord"> + <int key="objectID">3</int> + <reference key="object" ref="963811960"/> + <reference key="parent" ref="293244832"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">5</int> + <reference key="object" ref="905047690"/> + <reference key="parent" ref="724203299"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">21</int> + <reference key="object" ref="24619168"/> + <reference key="parent" ref="488415728"/> + </object> + <object class="IBObjectRecord"> <int key="objectID">23</int> <reference key="object" ref="900516520"/> <reference key="parent" ref="11488953"/> </object> <object class="IBObjectRecord"> - <int key="objectID">15</int> - <reference key="object" ref="861420161"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="1030694164"/> - </object> - <reference key="parent" ref="1005"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">16</int> <reference key="object" ref="1030694164"/> <reference key="parent" ref="861420161"/> @@ -393,6 +428,8 @@ <string>22.IBPluginDependency</string> <string>23.IBPluginDependency</string> <string>3.IBPluginDependency</string> + <string>30.IBEditorWindowLastContentRect</string> + <string>30.IBPluginDependency</string> <string>4.IBPluginDependency</string> <string>5.IBPluginDependency</string> </object> @@ -414,6 +451,8 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>{{0, 1503}, {480, 31}}</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> </object> @@ -438,12 +477,33 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">29</int> + <int key="maxID">33</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="IBPartialClassDescription"> + <string key="className">AnimatableView</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>delegate_</string> + <string>resizeDelegate_</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/animatable_view.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> <string key="className">InfoBarController</string> <string key="superclassName">NSViewController</string> <object class="NSMutableDictionary" key="actions"> @@ -466,14 +526,18 @@ <object class="NSMutableArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>cancelButton_</string> + <string>containerController_</string> <string>image_</string> + <string>infoBarView_</string> <string>label_</string> <string>okButton_</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <string>NSButton</string> + <string>id</string> <string>NSImageView</string> + <string>NSView</string> <string>NSTextField</string> <string>NSButton</string> </object> |