From f2e207f2c3aeb07187a87bcb2ed979b7551081e2 Mon Sep 17 00:00:00 2001 From: "bauerb@chromium.org" Date: Fri, 18 Mar 2011 15:06:04 +0000 Subject: [Mac] Show collected cookies in a tab view. Old and boring: http://www.dropmocks.com/mSiEY New hotness: http://www.dropmocks.com/mSiEM XIB changes: Move the two subviews of the NSSplitView into an NSTabView instead, change the |splitView_| outlet to |tabView_| and |lowerScrollView_| to |blockedScrollView_|. Add a placeholder below the tab view, hooked up to the |cookieDetailsViewPlaceholder_| outlet. BUG=63650 TEST=See bug for manual test. Review URL: http://codereview.chromium.org/6673114 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78692 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/app/nibs/CollectedCookies.xib | 1243 ++++++++++++++++------------------ 1 file changed, 571 insertions(+), 672 deletions(-) (limited to 'chrome/app/nibs/CollectedCookies.xib') diff --git a/chrome/app/nibs/CollectedCookies.xib b/chrome/app/nibs/CollectedCookies.xib index d6eb251..ee4e076 100644 --- a/chrome/app/nibs/CollectedCookies.xib +++ b/chrome/app/nibs/CollectedCookies.xib @@ -2,18 +2,18 @@ 1050 - 10F2108 - 823 - 1038.29 - 461.00 + 10J567 + 762 + 1038.35 + 462.00 com.apple.InterfaceBuilder.CocoaPlugin - 823 + 762 YES - + YES @@ -42,421 +42,447 @@ 15 2 - {{736, 217}, {499, 720}} + {{736, 344}, {537, 593}} 544735232 NSWindow {1.79769e+308, 1.79769e+308} - {499, 513} + {537, 200} 274 YES - + - 274 - + 18 + {{13, 249}, {511, 338}} + + YES - - - 274 - - YES - - - 274 - - YES - - - 2304 - - YES - - - 256 - {457, 274} - - YES - - - -2147483392 - {{443, 0}, {16, 17}} - - - YES - - 455 - 16 - 1000 - - 75628096 - 2048 - - - LucidaGrande - 11 - 3100 - - - 3 - MC4zMzMzMzI5OQA - - - 6 - System - headerTextColor - - 3 - MAA + + 2 + + + 256 + + YES + + + 266 + {{14, 272}, {463, 17}} + + YES + + 67239424 + 272629760 + ^IDS_COLLECTED_COOKIES_ALLOWED_COOKIES_LABEL + + LucidaGrande + 13 + 1044 + + + + 6 + System + controlColor + + 3 + MC42NjY2NjY2NjY3AA + + + + 6 + System + controlTextColor + + 3 + MAA + + + + + + + 274 + + YES + + + 2304 + + YES + + + 256 + {455, 205} + + YES + + + -2147483392 + {{443, 0}, {16, 17}} + + + YES + + 453 + 16 + 1000 + + 75628096 + 2048 + + + LucidaGrande + 11 + 3100 - - - - 69336641 - 133120 - Text Cell - - - - 6 - System - controlBackgroundColor - + 3 - MC42NjY2NjY2NjY3AA + MC4zMzMzMzI5OQA + + + 6 + System + headerTextColor + - - 6 - System - controlTextColor - + + 69336641 + 133120 + Text Cell + + + + 6 + System + controlBackgroundColor + + + + 3 + YES + - 3 - YES - - - 2 - 3 - - - 6 - System - gridColor - - 3 - MC41AA + 2 + 3 + + + 6 + System + gridColor + + 3 + MC41AA + + 14 + -633339904 + + + 4 + 15 + 0 + YES + 0 - 14 - -633339904 - - - 4 - 15 - 0 - YES - 0 + {{1, 1}, {455, 205}} + + + + + 4 + + + + -2147483392 + {{447, 1}, {11, 17}} + + 256 + + _doScroller: + 0.99512195121951219 + + + + -2147483392 + {{1, 2}, {446, 15}} + + 513 + + _doScroller: + 0.16192560175054707 + 0.97592999999999996 - {{1, 1}, {457, 274}} - - - - - 4 - - - - -2147483392 - {{447, 1}, {11, 17}} - - 256 - - _doScroller: - 0.94117649999999997 - - - - -2147483392 - {{1, 2}, {446, 15}} - - 513 - - _doScroller: - 0.97592999999999996 - - - {{20, 40}, {459, 276}} - - - 562 - - - - QSAAAEEgAABBiAAAQYgAAA - - - - 266 - {{17, 324}, {465, 17}} - - YES - - 68288064 - 272630784 - ^IDS_COLLECTED_COOKIES_ALLOWED_COOKIES_LABEL - - LucidaGrande - 13 - 1044 - - - - 6 - System - controlColor - - + {{17, 57}, {457, 207}} + + + 562 + + + + QSAAAEEgAABBiAAAQYgAAA - - - - 292 - - YES - - - 268 - {{14, 0}, {146, 32}} - - YES - - 67239424 - 134217728 - ^IDS_COLLECTED_COOKIES_BLOCK_BUTTON - - - -2038284033 - 129 - - - 200 - 25 + + + 292 + + YES + + + 268 + {{14, 12}, {146, 32}} + + YES + + 67239424 + 134217728 + ^IDS_COLLECTED_COOKIES_BLOCK_BUTTON + + + -2038284033 + 129 + + + 200 + 25 + + {{-3, -3}, {174, 60}} + + GTMWidthBasedTweaker - {174, 37} - - GTMWidthBasedTweaker + {{10, 33}, {491, 292}} + - {499, 350} - - NSView + ^IDS_COLLECTED_COOKIES_ALLOWED_COOKIES_TAB_LABEL + + - - - 274 - - YES - - - 266 - {{17, 344}, {465, 17}} - - YES - - 67239424 - 272629760 - ^IDS_COLLECTED_COOKIES_BLOCKED_COOKIES_LABEL - - - - - - - - - 274 - - YES - - - 2304 - - YES - - - 256 - {457, 285} - - YES - - - -2147483392 - {{443, 0}, {16, 17}} - - - YES - - 455 - 16 - 1000 - - 75628096 - 2048 - - - - 3 - MC4zMzMzMzI5OQA + + 1 + + + 256 + + YES + + + 274 + + YES + + + 2304 + + YES + + + 256 + {455, 205} + + YES + + + -2147483392 + {{443, 0}, {16, 17}} + + + YES + + 453 + 16 + 1000 + + 75628096 + 2048 + + + + 3 + MC4zMzMzMzI5OQA + + - - - - 69336641 - 133120 - Text Cell - - - - + + 69336641 + 133120 + Text Cell + + + + + + 3 + YES + - 3 - YES - + 2 + 3 + + + 14 + -633339904 + + + 4 + 15 + 0 + YES + 0 - 2 - 3 - - - 14 - -633339904 - - - 4 - 15 - 0 - YES - 0 + {{1, 1}, {455, 205}} + + + + + 4 + + + + -2147483392 + {{447, 1}, {11, 222}} + + 256 + + _doScroller: + 0.037974679999999997 + 1 + + + + -2147483392 + {{1, 223}, {446, 15}} + + 513 + + _doScroller: + 1 - {{1, 1}, {457, 285}} - - - - - 4 - - - - -2147483392 - {{447, 1}, {11, 222}} - - 256 - - _doScroller: - 0.037974679999999997 - 1 - - - -2147483392 - {{1, 223}, {446, 15}} - - 513 - - _doScroller: - 1 + {{17, 57}, {457, 207}} + + + 562 + + + + QSAAAEEgAABBiAAAQYgAAA + + + + 266 + {{14, 272}, {463, 17}} + + YES + + 67239424 + 272629760 + ^IDS_COLLECTED_COOKIES_BLOCKED_COOKIES_LABEL + + + + - {{20, 49}, {459, 287}} - - - 562 - - - - QSAAAEEgAABBiAAAQYgAAA - - - - 292 - - YES - - - 268 - {{160, 9}, {142, 32}} - - 1 - YES - - 67239424 - 134217728 - ^IDS_COLLECTED_COOKIES_SESSION_ONLY_BUTTON - - - -2038284033 - 129 - - - 200 - 25 + + + 292 + + YES + + + 268 + {{14, 12}, {146, 32}} + + YES + + 67239424 + 134217728 + ^IDS_COLLECTED_COOKIES_ALLOW_BUTTON + + + -2038284033 + 129 + + + 200 + 25 + - - - - 268 - {{14, 9}, {146, 32}} - - YES - - 67239424 - 134217728 - ^IDS_COLLECTED_COOKIES_ALLOW_BUTTON - - - -2038284033 - 129 - - - 200 - 25 + + + 268 + {{160, 12}, {142, 32}} + + 1 + YES + + 67239424 + 134217728 + ^IDS_COLLECTED_COOKIES_SESSION_ONLY_BUTTON + + + -2038284033 + 129 + + + 200 + 25 + + {{-3, -3}, {316, 60}} + + GTMWidthBasedTweaker - {316, 57} - - GTMWidthBasedTweaker + {{10, 33}, {491, 292}} - {{0, 359}, {499, 361}} - - NSView + ^IDS_COLLECTED_COOKIES_BLOCKED_COOKIES_TAB_LABEL + + - {499, 720} + + + 0 + YES + YES + + YES + + + + + + 290 + {{17, 57}, {503, 197}} + NSView - + - 289 + 292 YES - + 289 {{14, 12}, {96, 32}} - + YES 67239424 @@ -473,16 +499,16 @@ - {{377, -3}, {124, 51}} + {{413, 0}, {124, 60}} GTMWidthBasedTweaker - {499, 720} + {537, 593} {{0, 0}, {1920, 1178}} - {499, 535} + {537, 222} {1.79769e+308, 1.79769e+308} @@ -821,14 +847,6 @@ - delegate - - - - 404 - - - infoBar_ @@ -853,27 +871,43 @@ - lowerScrollView_ + blockedCookiesText_ - + - 417 + 419 - splitView_ + tabView_ - + - 418 + 433 - blockedCookiesText_ + blockedScrollView_ - + - 419 + 434 + + + + cookieDetailsViewPlaceholder_ + + + + 437 + + + + delegate + + + + 440 @@ -917,8 +951,9 @@ YES - - + + + @@ -929,64 +964,109 @@ Allowed Tree Controller - 131 - + 136 + + + + + 137 + + + + + 357 + + + Blocked Tree Controller + + + 405 + YES - + + - + + Infobar - 19 - + 406 + YES - + - + - 20 - - + 407 + + + YES + + + - 136 - - + 408 + + - 137 - - + 409 + + - 357 - - - Blocked Tree Controller + 420 + + + YES + + + + - 380 - + 421 + YES - - + - + - 379 - + 422 + + + YES + + + + + + + + 423 + + + YES + + + + + + 424 + YES - - + + - + 3 @@ -995,7 +1075,12 @@ YES - + + + + 4 + + 5 @@ -1006,7 +1091,7 @@ - + 8 @@ -1042,22 +1127,6 @@ - 4 - - - - - 378 - - - YES - - - - - - - 350 @@ -1066,7 +1135,7 @@ - + 353 @@ -1108,7 +1177,7 @@ YES - + 356 @@ -1116,37 +1185,14 @@ - 402 - - - YES - - - - - - 381 - - - YES - - - - - - 382 - - - - - 403 - + 429 + YES - + 388 @@ -1155,7 +1201,7 @@ YES - + 389 @@ -1169,7 +1215,7 @@ YES - + 390 @@ -1177,43 +1223,58 @@ - 405 - + 430 + YES - - + - - Infobar + - 406 - + 381 + YES - + - + - 407 - + 382 + + + + + 436 + YES - + - + - 408 - - + 19 + + + YES + + + - 409 - - + 20 + + + + + 435 + + + YES + + @@ -1226,7 +1287,6 @@ -3.IBPluginDependency 1.IBEditorWindowLastContentRect 1.IBPluginDependency - 1.IBViewEditorWindowController.showingLayoutRectangles 1.IBWindowTemplateEditedContentRect 1.NSWindowTemplate.visibleAtLaunch 1.WindowOrigin @@ -1266,6 +1326,7 @@ 407.IBPluginDependency 408.IBPluginDependency 409.IBPluginDependency + 435.IBPluginDependency 5.IBPluginDependency 51.IBPluginDependency 6.IBPluginDependency @@ -1277,15 +1338,14 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{594, 136}, {499, 720}} + {{613, 335}, {537, 593}} com.apple.InterfaceBuilder.CocoaPlugin - - {{594, 136}, {499, 720}} + {{613, 335}, {537, 593}} {196, 240} {{357, 418}, {480, 270}} - {499, 513} + {537, 200} com.apple.InterfaceBuilder.CocoaPlugin ImageAndTextCell com.apple.InterfaceBuilder.CocoaPlugin @@ -1295,11 +1355,6 @@ com.apple.InterfaceBuilder.CocoaPlugin YES - - - 15 - 1 - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -1331,6 +1386,7 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin @@ -1349,7 +1405,7 @@ - 419 + 440 @@ -1382,35 +1438,6 @@ id - - YES - - YES - allowForSessionFromOrigin: - allowOrigin: - blockOrigin: - closeSheet: - - - YES - - allowForSessionFromOrigin: - id - - - allowOrigin: - id - - - blockOrigin: - id - - - closeSheet: - id - - - YES @@ -1419,12 +1446,13 @@ allowedTreeController_ blockedCookiesText_ blockedOutlineView_ + blockedScrollView_ blockedTreeController_ + cookieDetailsViewPlaceholder_ infoBarIcon_ infoBarText_ infoBar_ - lowerScrollView_ - splitView_ + tabView_ YES @@ -1432,71 +1460,13 @@ NSTreeController NSTextField NSOutlineView + NSScrollView NSTreeController + NSView NSImageView NSTextField VerticalGradientView - NSScrollView - NSSplitView - - - - YES - - YES - allowedOutlineView_ - allowedTreeController_ - blockedCookiesText_ - blockedOutlineView_ - blockedTreeController_ - infoBarIcon_ - infoBarText_ - infoBar_ - lowerScrollView_ - splitView_ - - - YES - - allowedOutlineView_ - NSOutlineView - - - allowedTreeController_ - NSTreeController - - - blockedCookiesText_ - NSTextField - - - blockedOutlineView_ - NSOutlineView - - - blockedTreeController_ - NSTreeController - - - infoBarIcon_ - NSImageView - - - infoBarText_ - NSTextField - - - infoBar_ - VerticalGradientView - - - lowerScrollView_ - NSScrollView - - - splitView_ - NSSplitView - + NSTabView @@ -1522,30 +1492,6 @@ id - - YES - - YES - otherObjectToLocalize_ - owner_ - yetAnotherObjectToLocalize_ - - - YES - - otherObjectToLocalize_ - id - - - owner_ - id - - - yetAnotherObjectToLocalize_ - id - - - IBProjectSource ../third_party/GTM/AppKit/GTMUILocalizer.h @@ -1569,30 +1515,6 @@ id - - YES - - YES - localizerOwner_ - localizer_ - uiObject_ - - - YES - - localizerOwner_ - id - - - localizer_ - GTMUILocalizer - - - uiObject_ - id - - - IBProjectSource ../third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h @@ -1616,30 +1538,6 @@ NSView - - YES - - YES - viewToResize_ - viewToSlideAndResize_ - viewToSlide_ - - - YES - - viewToResize_ - id - - - viewToSlideAndResize_ - NSView - - - viewToSlide_ - NSView - - - @@ -2009,14 +1907,14 @@ NSObject - + IBFrameworkSource AppKit.framework/Headers/NSSplitView.h NSObject - + IBFrameworkSource AppKit.framework/Headers/NSTabView.h @@ -2367,9 +2265,17 @@ - NSSplitView + NSTabView NSView - + + + + NSTabViewItem + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSTabViewItem.h + NSTableColumn @@ -2457,13 +2363,6 @@ showWindow: id - - showWindow: - - showWindow: - id - - IBFrameworkSource AppKit.framework/Headers/NSWindowController.h -- cgit v1.1