diff options
| author | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-28 19:03:39 +0000 |
|---|---|---|
| committer | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-28 19:03:39 +0000 |
| commit | 2feb19b125ef3fd6bebef1b5eefd08e92523d897 (patch) | |
| tree | 13d5f0ce125e06b367fc1170fdc3556655b1ba6e /chrome/app/nibs/en.lproj | |
| parent | c6b5b4f6a3f379e01299292f36b626d491912366 (diff) | |
| download | chromium_src-2feb19b125ef3fd6bebef1b5eefd08e92523d897.zip chromium_src-2feb19b125ef3fd6bebef1b5eefd08e92523d897.tar.gz chromium_src-2feb19b125ef3fd6bebef1b5eefd08e92523d897.tar.bz2 | |
Support for tabs reaching a threshold before tearing off (magnetism), showing position of where the tab will go in the destination tab strip. Use new close box icon. Don't draw the tab title over the close box. Patch from alcor@google.com
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14758 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/nibs/en.lproj')
| -rw-r--r-- | chrome/app/nibs/en.lproj/BrowserWindow.xib | 24 | ||||
| -rw-r--r-- | chrome/app/nibs/en.lproj/TabView.xib | 31 |
2 files changed, 30 insertions, 25 deletions
diff --git a/chrome/app/nibs/en.lproj/BrowserWindow.xib b/chrome/app/nibs/en.lproj/BrowserWindow.xib index d9a64e8..be26e4d 100644 --- a/chrome/app/nibs/en.lproj/BrowserWindow.xib +++ b/chrome/app/nibs/en.lproj/BrowserWindow.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">9F33</string> + <string key="IBDocument.SystemVersion">9G55</string> <string key="IBDocument.InterfaceBuilderVersion">677</string> - <string key="IBDocument.AppKitVersion">949.34</string> - <string key="IBDocument.HIToolboxVersion">352.00</string> + <string key="IBDocument.AppKitVersion">949.43</string> + <string key="IBDocument.HIToolboxVersion">353.00</string> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="2"/> + <integer value="56"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -44,7 +44,7 @@ <nil key="NSViewClass"/> <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string> <object class="NSView" key="NSWindowView" id="1006"> - <reference key="NSNextResponder"/> + <nil key="NSNextResponder"/> <int key="NSvFlags">256</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -57,19 +57,18 @@ </object> </object> <string key="NSFrameSize">{750, 600}</string> - <reference key="NSSuperview"/> </object> <string key="NSScreenRect">{{0, 0}, {1440, 878}}</string> <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string> </object> <object class="NSCustomView" id="1029219716"> - <nil key="NSNextResponder"/> + <reference key="NSNextResponder"/> <int key="NSvFlags">266</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSButton" id="131944810"> <reference key="NSNextResponder" ref="1029219716"/> - <int key="NSvFlags">300</int> + <int key="NSvFlags">-2147483356</int> <string key="NSFrame">{{295, 0}, {40, 27}}</string> <reference key="NSSuperview" ref="1029219716"/> <bool key="NSEnabled">YES</bool> @@ -96,7 +95,8 @@ </object> </object> </object> - <string key="NSFrameSize">{483, 25}</string> + <string key="NSFrameSize">{483, 36}</string> + <reference key="NSSuperview"/> <string key="NSClassName">TabStripView</string> </object> </object> @@ -244,9 +244,9 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{136, 256}, {750, 600}}</string> + <string>{{267, 167}, {750, 600}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{136, 256}, {750, 600}}</string> + <string>{{267, 167}, {750, 600}}</string> <boolean value="NO"/> <string>{196, 240}</string> <string>{{357, 418}, {480, 270}}</string> @@ -258,7 +258,7 @@ </object> <real value="0.000000e+00"/> <real value="0.000000e+00"/> - <string>{{160, 204}, {483, 25}}</string> + <string>{{138, 199}, {483, 36}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> diff --git a/chrome/app/nibs/en.lproj/TabView.xib b/chrome/app/nibs/en.lproj/TabView.xib index ff144f7..5cc215f 100644 --- a/chrome/app/nibs/en.lproj/TabView.xib +++ b/chrome/app/nibs/en.lproj/TabView.xib @@ -102,7 +102,7 @@ </object> <object class="NSProgressIndicator" id="58797509"> <reference key="NSNextResponder" ref="1005"/> - <int key="NSvFlags">1321</int> + <int key="NSvFlags">-2147482327</int> <object class="NSPSMatrix" key="NSDrawMatrix"/> <string key="NSFrame">{{131, 4}, {16, 16}}</string> <reference key="NSSuperview" ref="1005"/> @@ -113,24 +113,28 @@ <object class="NSButton" id="1054640993"> <reference key="NSNextResponder" ref="1005"/> <int key="NSvFlags">297</int> - <string key="NSFrame">{{134, 7}, {10, 10}}</string> + <string key="NSFrame">{{131, 5}, {15, 15}}</string> <reference key="NSSuperview" ref="1005"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="348599947"> <int key="NSCellFlags">67239424</int> <int key="NSCellFlags2">134217728</int> - <string key="NSContents">Close</string> + <string key="NSContents"/> <object class="NSFont" key="NSSupport"> <string key="NSName">LucidaGrande</string> <double key="NSSize">1.300000e+01</double> <int key="NSfFlags">1044</int> </object> <reference key="NSControlView" ref="1054640993"/> - <int key="NSButtonFlags">-2042347265</int> - <int key="NSButtonFlags2">134</int> + <int key="NSButtonFlags">139215103</int> + <int key="NSButtonFlags2">6</int> <object class="NSCustomResource" key="NSNormalImage"> <string key="NSClassName">NSImage</string> - <string key="NSResourceName">NSStopProgressTemplate</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"/> @@ -396,7 +400,7 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilderKit</string> <string>com.apple.InterfaceBuilderKit</string> - <string>{{831, 498}, {160, 25}}</string> + <string>{{799, 498}, {160, 25}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <boolean value="NO"/> <string>{628, 654}</string> @@ -436,6 +440,13 @@ <object class="NSMutableArray" key="referencedPartialClassDescriptions"> <bool key="EncodedWithXMLCoder">YES</bool> <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">TabCell</string> <string key="superclassName">NSButtonCell</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> @@ -455,14 +466,12 @@ <object class="NSMutableArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>backgroundButton_</string> - <string>closeButton_</string> <string>progressIndicator_</string> <string>target_</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <string>NSButton</string> - <string>NSButton</string> <string>NSProgressIndicator</string> <string>id</string> </object> @@ -475,10 +484,6 @@ <object class="IBPartialClassDescription"> <string key="className">TabView</string> <string key="superclassName">NSView</string> - <object class="NSMutableDictionary" key="actions"> - <string key="NS.key.0">closeTab:</string> - <string key="NS.object.0">id</string> - </object> <object class="NSMutableDictionary" key="outlets"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSMutableArray" key="dict.sortedKeys"> |