summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authordanno@chromium.org <danno@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-01 21:46:42 +0000
committerdanno@chromium.org <danno@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-01 21:46:42 +0000
commitb03cb1e38d95c04a69902c9d4d471f79d806066e (patch)
treed8653de61b04375ecf47cb827d1a33903feca1bb /chrome/app
parentbb0a6a0af3be6d24a5c8f9ebd2e686347a5c882d (diff)
downloadchromium_src-b03cb1e38d95c04a69902c9d4d471f79d806066e.zip
chromium_src-b03cb1e38d95c04a69902c9d4d471f79d806066e.tar.gz
chromium_src-b03cb1e38d95c04a69902c9d4d471f79d806066e.tar.bz2
[Mac] Appearance tweaks for browser data exceptions window
Changed the appearance of the window to incorporate Alcor's feedback (see bug). xib changes: modified the layout, size and spacing of the buttons so that they look like this: http://img59.imageshack.us/img59/1087/picture5lr.png BUG=38208 TEST=manual tests Review URL: http://codereview.chromium.org/1584002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43388 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/nibs/ContentExceptionsWindow.xib85
1 files changed, 47 insertions, 38 deletions
diff --git a/chrome/app/nibs/ContentExceptionsWindow.xib b/chrome/app/nibs/ContentExceptionsWindow.xib
index 4fb260f..8167c46 100644
--- a/chrome/app/nibs/ContentExceptionsWindow.xib
+++ b/chrome/app/nibs/ContentExceptionsWindow.xib
@@ -3,12 +3,12 @@
<data>
<int key="IBDocument.SystemTarget">1050</int>
<string key="IBDocument.SystemVersion">9L31a</string>
- <string key="IBDocument.InterfaceBuilderVersion">677</string>
+ <string key="IBDocument.InterfaceBuilderVersion">680</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="8"/>
+ <integer value="2"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -37,7 +37,7 @@
<object class="NSWindowTemplate" id="1005">
<int key="NSWindowStyleMask">15</int>
<int key="NSWindowBacking">2</int>
- <string key="NSWindowRect">{{477, 316}, {480, 270}}</string>
+ <string key="NSWindowRect">{{477, 301}, {480, 285}}</string>
<int key="NSWTFlags">536870912</int>
<string key="NSWindowTitle">Title set by controller</string>
<string key="NSWindowClass">NSWindow</string>
@@ -82,12 +82,12 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSTableColumn" id="20203331">
<string key="NSIdentifier">hostname</string>
- <double key="NSWidth">2.180000e+02</double>
+ <double key="NSWidth">3.020000e+02</double>
<double key="NSMinWidth">4.000000e+01</double>
<double key="NSMaxWidth">1.000000e+03</double>
<object class="NSTableHeaderCell" key="NSHeaderCell">
- <int key="NSCellFlags">75628032</int>
- <int key="NSCellFlags2">0</int>
+ <int key="NSCellFlags">75628096</int>
+ <int key="NSCellFlags2">2048</int>
<string key="NSContents">^IDS_EXCEPTIONS_HOSTNAME_HEADER</string>
<object class="NSFont" key="NSSupport" id="26">
<string key="NSName">LucidaGrande</string>
@@ -112,7 +112,7 @@
<int key="NSCellFlags">337772096</int>
<int key="NSCellFlags2">2048</int>
<string key="NSContents">Text Cell</string>
- <object class="NSFont" key="NSSupport">
+ <object class="NSFont" key="NSSupport" id="22228631">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">1.300000e+01</double>
<int key="NSfFlags">1044</int>
@@ -141,12 +141,12 @@
</object>
<object class="NSTableColumn" id="332085935">
<string key="NSIdentifier">action</string>
- <double key="NSWidth">2.560000e+02</double>
+ <double key="NSWidth">1.720000e+02</double>
<double key="NSMinWidth">4.000000e+01</double>
<double key="NSMaxWidth">1.000000e+03</double>
<object class="NSTableHeaderCell" key="NSHeaderCell">
- <int key="NSCellFlags">75628032</int>
- <int key="NSCellFlags2">0</int>
+ <int key="NSCellFlags">75628096</int>
+ <int key="NSCellFlags2">2048</int>
<string key="NSContents">^IDS_EXCEPTIONS_ACTION_HEADER</string>
<reference key="NSSupport" ref="26"/>
<reference key="NSBackgroundColor" ref="531830935"/>
@@ -237,8 +237,8 @@
<reference key="NSSuperview" ref="832680793"/>
<reference key="NSTarget" ref="832680793"/>
<string key="NSAction">_doScroller:</string>
- <double key="NSCurValue">3.700000e+01</double>
- <double key="NSPercent">1.947368e-01</double>
+ <double key="NSCurValue">1.000000e+00</double>
+ <double key="NSPercent">9.356223e-01</double>
</object>
<object class="NSScroller" id="689783017">
<reference key="NSNextResponder" ref="832680793"/>
@@ -248,7 +248,7 @@
<int key="NSsFlags">1</int>
<reference key="NSTarget" ref="832680793"/>
<string key="NSAction">_doScroller:</string>
- <double key="NSPercent">8.040201e-01</double>
+ <double key="NSPercent">9.979210e-01</double>
</object>
<object class="NSClipView" id="522115304">
<reference key="NSNextResponder" ref="832680793"/>
@@ -266,7 +266,7 @@
</object>
<reference ref="274818157"/>
</object>
- <string key="NSFrame">{{-1, 20}, {482, 251}}</string>
+ <string key="NSFrame">{{-1, 35}, {482, 251}}</string>
<reference key="NSSuperview" ref="1006"/>
<reference key="NSNextKeyView" ref="854753160"/>
<int key="NSsFlags">562</int>
@@ -280,17 +280,17 @@
<object class="NSButton" id="232729973">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{0, -1}, {25, 23}}</string>
+ <string key="NSFrame">{{7, 5}, {25, 25}}</string>
<reference key="NSSuperview" ref="1006"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="723955339">
<int key="NSCellFlags">-2080244224</int>
- <int key="NSCellFlags2">134348800</int>
+ <int key="NSCellFlags2">134217728</int>
<string key="NSContents"/>
- <reference key="NSSupport" ref="26"/>
+ <reference key="NSSupport" ref="22228631"/>
<reference key="NSControlView" ref="232729973"/>
- <int key="NSButtonFlags">-2033434369</int>
- <int key="NSButtonFlags2">162</int>
+ <int key="NSButtonFlags">-2033958657</int>
+ <int key="NSButtonFlags2">163</int>
<object class="NSCustomResource" key="NSNormalImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">NSAddTemplate</string>
@@ -304,17 +304,17 @@
<object class="NSButton" id="297568762">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{23, -1}, {25, 23}}</string>
+ <string key="NSFrame">{{40, 5}, {25, 25}}</string>
<reference key="NSSuperview" ref="1006"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="655968889">
<int key="NSCellFlags">-2080244224</int>
- <int key="NSCellFlags2">134348800</int>
+ <int key="NSCellFlags2">134217728</int>
<string key="NSContents"/>
- <reference key="NSSupport" ref="26"/>
+ <reference key="NSSupport" ref="22228631"/>
<reference key="NSControlView" ref="297568762"/>
- <int key="NSButtonFlags">-2033434369</int>
- <int key="NSButtonFlags2">162</int>
+ <int key="NSButtonFlags">-2033958657</int>
+ <int key="NSButtonFlags2">163</int>
<object class="NSCustomResource" key="NSNormalImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">NSRemoveTemplate</string>
@@ -328,17 +328,17 @@
<object class="NSButton" id="882966747">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">292</int>
- <string key="NSFrame">{{46, -1}, {96, 23}}</string>
+ <string key="NSFrame">{{73, 5}, {96, 25}}</string>
<reference key="NSSuperview" ref="1006"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="1032008525">
<int key="NSCellFlags">-2080244224</int>
- <int key="NSCellFlags2">134348800</int>
+ <int key="NSCellFlags2">134217728</int>
<string key="NSContents">^IDS_EXCEPTIONS_PAGE_VIEW_REMOVE_ALL_BUTTON</string>
- <reference key="NSSupport" ref="26"/>
+ <reference key="NSSupport" ref="22228631"/>
<reference key="NSControlView" ref="882966747"/>
- <int key="NSButtonFlags">-2033434369</int>
- <int key="NSButtonFlags2">162</int>
+ <int key="NSButtonFlags">-2038152961</int>
+ <int key="NSButtonFlags2">163</int>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">400</int>
@@ -346,7 +346,7 @@
</object>
</object>
</object>
- <string key="NSFrameSize">{480, 270}</string>
+ <string key="NSFrameSize">{480, 285}</string>
<reference key="NSSuperview"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
@@ -462,7 +462,7 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBObjectRecord">
<int key="objectID">0</int>
- <object class="NSArray" key="object" id="1002">
+ <object class="NSArray" key="object" id="13599172">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
<reference key="children" ref="1000"/>
@@ -471,19 +471,19 @@
<object class="IBObjectRecord">
<int key="objectID">-2</int>
<reference key="object" ref="1001"/>
- <reference key="parent" ref="1002"/>
+ <reference key="parent" ref="13599172"/>
<string type="base64-UTF8" key="objectName">RmlsZSdzIE93bmVyA</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">-1</int>
<reference key="object" ref="1003"/>
- <reference key="parent" ref="1002"/>
+ <reference key="parent" ref="13599172"/>
<string key="objectName">First Responder</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">-3</int>
<reference key="object" ref="1004"/>
- <reference key="parent" ref="1002"/>
+ <reference key="parent" ref="13599172"/>
<string key="objectName">Application</string>
</object>
<object class="IBObjectRecord">
@@ -493,7 +493,7 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="1006"/>
</object>
- <reference key="parent" ref="1002"/>
+ <reference key="parent" ref="13599172"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">2</int>
@@ -612,7 +612,7 @@
<object class="IBObjectRecord">
<int key="objectID">20</int>
<reference key="object" ref="792052397"/>
- <reference key="parent" ref="1002"/>
+ <reference key="parent" ref="13599172"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">31</int>
@@ -680,9 +680,9 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{24, 257}, {480, 270}}</string>
+ <string>{{128, 406}, {480, 285}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{24, 257}, {480, 270}}</string>
+ <string>{{128, 406}, {480, 285}}</string>
<integer value="1"/>
<string>{196, 240}</string>
<string>{{357, 418}, {480, 270}}</string>
@@ -751,6 +751,7 @@
<object class="NSMutableArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>addException:</string>
+ <string>cancel:</string>
<string>removeAllExceptions:</string>
<string>removeException:</string>
</object>
@@ -759,6 +760,7 @@
<string>id</string>
<string>id</string>
<string>id</string>
+ <string>id</string>
</object>
</object>
<object class="NSMutableDictionary" key="outlets">
@@ -831,6 +833,13 @@
<string key="className">NSWindow</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">browser/cocoa/chrome_browser_window.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSWindow</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
<string key="minorKey">browser/cocoa/themed_window.h</string>
</object>
</object>