diff options
author | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-02 17:13:09 +0000 |
---|---|---|
committer | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-02 17:13:09 +0000 |
commit | b3092a5c2de45d030bef7042f7546320baf1cb57 (patch) | |
tree | f4b5f72fca2b28f01e809f390300571fce663e54 /chrome/app/nibs | |
parent | 102957f8a81d2aeb4e0069603977221a3b93a0bd (diff) | |
download | chromium_src-b3092a5c2de45d030bef7042f7546320baf1cb57.zip chromium_src-b3092a5c2de45d030bef7042f7546320baf1cb57.tar.gz chromium_src-b3092a5c2de45d030bef7042f7546320baf1cb57.tar.bz2 |
Change chrome://crash (sad tab page) "Learn more" link to:
"If you're seeing this frequently, try these suggestions."
Link "these suggestions" to the "Learn more" help article.
Update Views, GTK, and Cocoa implementations.
chrome://kill (unused) changes on Mac, but not on Views nor GTK.
Not wrapping this line on overflow for Views and GTK seems acceptable.
Strings: Add sad tab help message and embedded link resources.
Views: Rewrite the SadTabView to use ImageView, GridLayout, etc.
GTK: Add new prefix and suffix Label Widgets to an hbox with the link.
Cocoa Support: Create HyperlinkTextView for non-selectable text & link.
Cocoa IB: Replace SadTab.xib NSButton with a NSTextfield placeholder.
Cocoa: Replace the placeholder with a customized HyperlinkTextView.
BUG=80428
TEST=chrome://crash and chrome://kill on all platforms.
Review URL: http://codereview.chromium.org/7610011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99393 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/nibs')
-rw-r--r-- | chrome/app/nibs/SadTab.xib | 162 |
1 files changed, 75 insertions, 87 deletions
diff --git a/chrome/app/nibs/SadTab.xib b/chrome/app/nibs/SadTab.xib index 8f60903..e609c58 100644 --- a/chrome/app/nibs/SadTab.xib +++ b/chrome/app/nibs/SadTab.xib @@ -2,9 +2,9 @@ <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10"> <data> <int key="IBDocument.SystemTarget">1050</int> - <string key="IBDocument.SystemVersion">10F2108</string> + <string key="IBDocument.SystemVersion">10J869</string> <string key="IBDocument.InterfaceBuilderVersion">823</string> - <string key="IBDocument.AppKitVersion">1038.29</string> + <string key="IBDocument.AppKitVersion">1038.35</string> <string key="IBDocument.HIToolboxVersion">461.00</string> <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -98,44 +98,40 @@ </object> </object> </object> - <object class="NSTextField" id="685519067"> + <object class="NSTextField" id="796295772"> <reference key="NSNextResponder" ref="1005"/> - <int key="NSvFlags">301</int> - <string key="NSFrame">{{14, 29}, {68, 17}}</string> + <int key="NSvFlags">303</int> + <string key="NSFrame">{{14, 4}, {68, 17}}</string> <reference key="NSSuperview" ref="1005"/> <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="865139789"> + <object class="NSTextFieldCell" key="NSCell" id="755651743"> <int key="NSCellFlags">67239424</int> <int key="NSCellFlags2">138412032</int> - <string key="NSContents">^IDS_SAD_TAB_MESSAGE</string> - <object class="NSFont" key="NSSupport"> + <string key="NSContents">Help text</string> + <object class="NSFont" key="NSSupport" id="413085122"> <string key="NSName">LucidaGrande</string> <double key="NSSize">13</double> <int key="NSfFlags">16</int> </object> - <reference key="NSControlView" ref="685519067"/> + <reference key="NSControlView" ref="796295772"/> <reference key="NSBackgroundColor" ref="78971029"/> <reference key="NSTextColor" ref="7040190"/> </object> </object> - <object class="NSButton" id="437803890"> + <object class="NSTextField" id="685519067"> <reference key="NSNextResponder" ref="1005"/> <int key="NSvFlags">301</int> - <string key="NSFrame">{{27, 0}, {42, 32}}</string> + <string key="NSFrame">{{14, 29}, {68, 17}}</string> <reference key="NSSuperview" ref="1005"/> <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="968909108"> + <object class="NSTextFieldCell" key="NSCell" id="865139789"> <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">134217728</int> - <string key="NSContents">^IDS_LEARN_MORE</string> - <reference key="NSSupport" ref="958586153"/> - <reference key="NSControlView" ref="437803890"/> - <int key="NSButtonFlags">-2046672641</int> - <int key="NSButtonFlags2">134</int> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> + <int key="NSCellFlags2">138412032</int> + <string key="NSContents">^IDS_SAD_TAB_MESSAGE</string> + <reference key="NSSupport" ref="413085122"/> + <reference key="NSControlView" ref="685519067"/> + <reference key="NSBackgroundColor" ref="78971029"/> + <reference key="NSTextColor" ref="7040190"/> </object> </object> </object> @@ -178,14 +174,6 @@ <int key="connectionID">22</int> </object> <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">openLearnMoreAboutCrashLink:</string> - <reference key="source" ref="1001"/> - <reference key="destination" ref="437803890"/> - </object> - <int key="connectionID">37</int> - </object> - <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> <string key="label">image_</string> <reference key="source" ref="1005"/> @@ -195,35 +183,35 @@ </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">linkButton_</string> + <string key="label">message_</string> <reference key="source" ref="1005"/> - <reference key="destination" ref="437803890"/> + <reference key="destination" ref="685519067"/> </object> - <int key="connectionID">41</int> + <int key="connectionID">43</int> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">linkCell_</string> + <string key="label">title_</string> <reference key="source" ref="1005"/> - <reference key="destination" ref="968909108"/> + <reference key="destination" ref="261676766"/> </object> - <int key="connectionID">42</int> + <int key="connectionID">44</int> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">message_</string> + <string key="label">helpPlaceholder_</string> <reference key="source" ref="1005"/> - <reference key="destination" ref="685519067"/> + <reference key="destination" ref="796295772"/> </object> - <int key="connectionID">43</int> + <int key="connectionID">50</int> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">title_</string> + <string key="label">controller_</string> <reference key="source" ref="1005"/> - <reference key="destination" ref="261676766"/> + <reference key="destination" ref="1001"/> </object> - <int key="connectionID">44</int> + <int key="connectionID">51</int> </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> @@ -262,8 +250,8 @@ <bool key="EncodedWithXMLCoder">YES</bool> <reference ref="685519067"/> <reference ref="261676766"/> - <reference ref="437803890"/> <reference ref="48169842"/> + <reference ref="796295772"/> </object> <reference key="parent" ref="1002"/> </object> @@ -320,18 +308,18 @@ <reference key="parent" ref="685519067"/> </object> <object class="IBObjectRecord"> - <int key="objectID">27</int> - <reference key="object" ref="437803890"/> + <int key="objectID">47</int> + <reference key="object" ref="796295772"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="968909108"/> + <reference ref="755651743"/> </object> <reference key="parent" ref="1005"/> </object> <object class="IBObjectRecord"> - <int key="objectID">28</int> - <reference key="object" ref="968909108"/> - <reference key="parent" ref="437803890"/> + <int key="objectID">48</int> + <reference key="object" ref="755651743"/> + <reference key="parent" ref="796295772"/> </object> </object> </object> @@ -345,30 +333,40 @@ <string>1.WindowOrigin</string> <string>1.editorWindowContentRectSynchronizationRect</string> <string>24.IBPluginDependency</string> + <string>24.IBViewBoundsToFrameTransform</string> <string>25.IBPluginDependency</string> + <string>25.IBViewBoundsToFrameTransform</string> <string>26.IBPluginDependency</string> - <string>27.IBPluginDependency</string> - <string>28.CustomClassName</string> - <string>28.IBPluginDependency</string> <string>29.IBPluginDependency</string> <string>30.IBPluginDependency</string> <string>31.IBPluginDependency</string> + <string>47.IBPluginDependency</string> + <string>47.IBViewBoundsToFrameTransform</string> + <string>48.IBPluginDependency</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{333, 671}, {97, 95}}</string> + <string>{{305, 671}, {97, 95}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>{628, 654}</string> <string>{{217, 442}, {480, 272}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABBYAAAwjAAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABBMAAAwooAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>HyperlinkButtonCell</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABBmAAAwhwAAA</bytes> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> </object> </object> @@ -388,7 +386,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">44</int> + <int key="maxID">51</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -504,18 +502,17 @@ </object> </object> <object class="IBPartialClassDescription"> - <string key="className">HyperlinkButtonCell</string> - <string key="superclassName">NSButtonCell</string> + <string key="className">NSObject</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> - <string key="minorKey">browser/ui/cocoa/hyperlink_button_cell.h</string> + <string key="minorKey">../third_party/GTM/Foundation/GTMNSObject+KeyValueObserving.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">../third_party/GTM/Foundation/GTMNSObject+KeyValueObserving.h</string> + <string key="minorKey">browser/renderer_host/accelerated_plugin_view_mac.h</string> </object> </object> <object class="IBPartialClassDescription"> @@ -543,6 +540,13 @@ <string key="className">NSView</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> + <string key="minorKey">browser/ui/cocoa/nsview_additions.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSView</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> <string key="minorKey">browser/ui/cocoa/view_id_util.h</string> </object> </object> @@ -572,17 +576,17 @@ <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> + <string>controller_</string> + <string>helpPlaceholder_</string> <string>image_</string> - <string>linkButton_</string> - <string>linkCell_</string> <string>message_</string> <string>title_</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> + <string>SadTabController</string> + <string>NSTextField</string> <string>NSImageView</string> - <string>NSButton</string> - <string>HyperlinkButtonCell</string> <string>NSTextField</string> <string>NSTextField</string> </object> @@ -591,25 +595,25 @@ <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> + <string>controller_</string> + <string>helpPlaceholder_</string> <string>image_</string> - <string>linkButton_</string> - <string>linkCell_</string> <string>message_</string> <string>title_</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="IBToOneOutletInfo"> - <string key="name">image_</string> - <string key="candidateClassName">NSImageView</string> + <string key="name">controller_</string> + <string key="candidateClassName">SadTabController</string> </object> <object class="IBToOneOutletInfo"> - <string key="name">linkButton_</string> - <string key="candidateClassName">NSButton</string> + <string key="name">helpPlaceholder_</string> + <string key="candidateClassName">NSTextField</string> </object> <object class="IBToOneOutletInfo"> - <string key="name">linkCell_</string> - <string key="candidateClassName">HyperlinkButtonCell</string> + <string key="name">image_</string> + <string key="candidateClassName">NSImageView</string> </object> <object class="IBToOneOutletInfo"> <string key="name">message_</string> @@ -674,22 +678,6 @@ </object> </object> <object class="IBPartialClassDescription"> - <string key="className">NSButton</string> - <string key="superclassName">NSControl</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSButton.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSButtonCell</string> - <string key="superclassName">NSActionCell</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">AppKit.framework/Headers/NSButtonCell.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> <string key="className">NSCell</string> <string key="superclassName">NSObject</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> |