From 7a3bdc0069b8ae1ed6eb115999878cee5cfa9360 Mon Sep 17 00:00:00 2001 From: "thomasvl@chromium.org" Date: Fri, 28 Aug 2009 16:40:39 +0000 Subject: Add background_tile_view for tiling an image as UI background (about box needed it) Added restart_browser as a helper like Views helper for putting up a request for the user to restart. Added a new string needed for Mac style alerts to go with the existing restart string. Make Mac Chromium use a custom about box. Give Chromium and Google Chrome an about box that matches the one on other platforms Use all the existing UI strings for the about box so we get credits, copy rights, etc. TEST=New aboutbox for Chromium and Google Chrome. About box should be fully l10n and size as needed. Chrome update messaging should more match windows and be localized. BUG=13219,19020 Review URL: http://codereview.chromium.org/173606 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24737 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/app/generated_resources.grd | 7 + chrome/app/nibs/About.xib | 705 +++++++++++++++++++++++++------------ 2 files changed, 482 insertions(+), 230 deletions(-) (limited to 'chrome/app') diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 3956679..b4cc79e 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -4867,6 +4867,13 @@ each locale. --> + + + + Please Restart $1Google Chrome + + + diff --git a/chrome/app/nibs/About.xib b/chrome/app/nibs/About.xib index bf15e81..9249b0d 100644 --- a/chrome/app/nibs/About.xib +++ b/chrome/app/nibs/About.xib @@ -2,13 +2,13 @@ 1050 - 9J61 + 9L30 677 - 949.46 + 949.54 353.00 YES - + YES @@ -37,9 +37,9 @@ 23 2 - {{196, 149}, {308, 361}} - -469762048 - About Chrome + {{196, 257}, {450, 246}} + -469761024 + ^IDS_ABOUT_CHROME_TITLE NSPanel {3.40282e+38, 3.40282e+38} @@ -48,72 +48,35 @@ 256 YES - + - 268 - - YES - - YES - Apple PDF pasteboard type - Apple PICT pasteboard type - Apple PNG pasteboard type - NSFilenamesPboardType - NeXT Encapsulated PostScript v1.2 pasteboard type - NeXT TIFF v4.0 pasteboard type - - - {{90, 213}, {128, 128}} + 266 + {{17, 52}, {416, 41}} YES - - 67239424 - 33685504 - - NSImage - app - + + -2080244224 + 1346502656 + textblock LucidaGrande 1.100000e+01 3100 - 0 - 0 - 0 - NO - - YES - - - - 268 - {{17, 177}, {274, 17}} - - YES - - 68288064 - 1212154880 - Google Chrome - - LucidaGrande - 1.300000e+01 - 1044 - - - + + 6 System - controlColor + textBackgroundColor 3 - MC42NjY2NjY2OQA + MQA - + 6 System - controlTextColor + textColor 3 MAA @@ -121,135 +84,207 @@ - + - 268 - {{17, 100}, {274, 17}} - - YES - - 68288064 - 1212154880 - - - - - + 266 + + YES + + + 266 + {{17, 81}, {230, 14}} + + YES + + 70385217 + 4326400 + version + + + + 6 + System + controlColor + + 3 + MC42NjY2NjY2OQA + + + + 6 + System + controlTextColor + + + + + + + 266 + {{17, 96}, {230, 29}} + + YES + + 68288064 + 1077937152 + ^IDS_PRODUCT_NAME + + LucidaGrande + 2.400000e+01 + 16 + + + + + + + + + 265 + + YES + + YES + Apple PDF pasteboard type + Apple PICT pasteboard type + Apple PNG pasteboard type + NSFilenamesPboardType + NeXT Encapsulated PostScript v1.2 pasteboard type + NeXT TIFF v4.0 pasteboard type + + + {{260, 0}, {190, 145}} + + YES + + 67239424 + 33685504 + + 0 + 2 + 0 + NO + + YES + - - - - 268 - {{17, 155}, {274, 14}} + {{0, 101}, {470, 145}} - YES - - 70385217 - 138544128 - - - - - - + BackgroundTileView - + - 268 - {{17, 133}, {274, 14}} - - YES - - 68288064 - 138544128 - - - - - - - - - - 268 - {{17, 20}, {274, 28}} - - YES - - -1543373312 - 138543104 - Q29weXJpZ2h0IMKpIDIwMDkgVGhlIENocm9taXVtIEF1dGhvcnMuICAgICAgICAgICAgICAgICAgIEFs -bCBSaWdodHMgUmVzZXJ2ZWQuA - - - - 6 - System - textBackgroundColor - - 3 - MQA + 266 + + YES + + + -2147483380 + + YES + + YES + Apple PDF pasteboard type + Apple PICT pasteboard type + Apple PNG pasteboard type + NSFilenamesPboardType + NeXT Encapsulated PostScript v1.2 pasteboard type + NeXT TIFF v4.0 pasteboard type + + + {{20, 7}, {17, 17}} + + YES + + 130560 + 33554432 + 0 + 2 + 0 + YES + YES - - 6 - System - textColor - + + + 1292 + + {{20, 7}, {16, 16}} + + 28938 + 1.600000e+01 + 1.000000e+02 + + + + 289 + + YES + + + 289 + {{10, 0}, {81, 28}} + + YES + + 604110336 + 134348800 + ^IDS_ABOUT_CHROME_UPDATE_CHECK + + + -2038284033 + 129 + + + 200 + 25 + + + + {{344, 0}, {106, 31}} + + GTMWidthBasedTweaker + + + + 266 + {{42, 8}, {297, 14}} + + YES + + 68288064 + 272761856 + messages + + + + + - - - - 268 - {{106, 61}, {96, 28}} - - YES - - 604110336 - 134348800 - Update Now - - - -2038284033 - 129 - - - 200 - 25 - - - - - 1292 - - {{138, 93}, {32, 32}} + {{0, 13}, {450, 31}} - 28682 - 1.600000e+01 - 1.000000e+02 + NSView - {308, 361} + {450, 246} {{0, 0}, {2560, 1578}} {3.40282e+38, 3.40282e+38} + + ChromeUILocalizer + + + GTMUILocalizerAndLayoutTweaker + YES - upToDate_ - - - - 20 - - - spinner_ @@ -266,14 +301,6 @@ bCBSaWdodHMgUmVzZXJ2ZWQuA - updateCompleted_ - - - - 27 - - - window @@ -304,6 +331,78 @@ bCBSaWdodHMgUmVzZXJ2ZWQuA 31 + + + backgroundView_ + + + + 39 + + + + logoView_ + + + + 42 + + + + legalBlock_ + + + + 46 + + + + updateBlock_ + + + + 48 + + + + localizer_ + + + + 52 + + + + uiObject_ + + + + 53 + + + + updateStatusIndicator_ + + + + 57 + + + + viewToSlideAndResize_ + + + + 60 + + + + updateText_ + + + + 61 + @@ -349,66 +448,64 @@ bCBSaWdodHMgUmVzZXJ2ZWQuA YES - - - - - + - - + - 5 - + 8 + YES - + - 6 - - + 15 + + - 7 - + 34 + YES - + + + - 8 - + 10 + YES - + - + - 9 - - - YES - - - + 13 + + - 10 - + 5 + YES - + - + + + + 17 + + 11 @@ -417,7 +514,7 @@ bCBSaWdodHMgUmVzZXJ2ZWQuA YES - + 12 @@ -425,19 +522,49 @@ bCBSaWdodHMgUmVzZXJ2ZWQuA - 13 - - + 40 + + - 14 - - + 47 + + + YES + + + + + + - 15 - - + 6 + + + + + 51 + + + + + 54 + + + YES + + + + + + 7 + + + YES + + + 16 @@ -445,23 +572,32 @@ bCBSaWdodHMgUmVzZXJ2ZWQuA - 17 - - + 55 + + + YES + + + + + + 56 + + - 25 - + 58 + YES - + - + - 26 - - + 59 + + @@ -476,22 +612,24 @@ bCBSaWdodHMgUmVzZXJ2ZWQuA 11.IBPluginDependency 12.IBPluginDependency 13.IBPluginDependency - 14.IBPluginDependency 15.IBPluginDependency 16.IBPluginDependency 17.IBPluginDependency - 25.IBPluginDependency - 26.IBPluginDependency 3.IBEditorWindowLastContentRect 3.IBPluginDependency 3.IBWindowTemplateEditedContentRect 3.NSWindowTemplate.visibleAtLaunch 4.IBPluginDependency + 4.IBUserGuides + 40.IBPluginDependency + 47.IBUserGuides 5.IBPluginDependency + 51.IBPluginDependency + 58.IBPluginDependency + 59.IBPluginDependency 6.IBPluginDependency 7.IBPluginDependency 8.IBPluginDependency - 9.IBPluginDependency YES @@ -505,13 +643,19 @@ bCBSaWdodHMgUmVzZXJ2ZWQuA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + {{652, 526}, {450, 246}} com.apple.InterfaceBuilder.CocoaPlugin + {{652, 526}, {450, 246}} + com.apple.InterfaceBuilder.CocoaPlugin + + YES + com.apple.InterfaceBuilder.CocoaPlugin - {{652, 412}, {308, 361}} + + YES + com.apple.InterfaceBuilder.CocoaPlugin - {{652, 412}, {308, 361}} - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -540,7 +684,7 @@ bCBSaWdodHMgUmVzZXJ2ZWQuA - 31 + 61 @@ -556,18 +700,30 @@ bCBSaWdodHMgUmVzZXJ2ZWQuA YES YES + backgroundView_ + legalBlock_ + logoView_ spinner_ upToDate_ + updateBlock_ updateCompleted_ updateNowButton_ + updateStatusIndicator_ + updateText_ version_ YES + BackgroundTileView + NSTextField + NSImageView NSProgressIndicator NSTextField + NSView NSTextField NSButton + NSImageView + NSTextField NSTextField @@ -577,6 +733,95 @@ bCBSaWdodHMgUmVzZXJ2ZWQuA + BackgroundTileView + NSView + + IBProjectSource + browser/cocoa/background_tile_view.h + + + + ChromeUILocalizer + GTMUILocalizer + + IBProjectSource + browser/cocoa/ui_localizer.h + + + + GTMUILocalizer + NSObject + + YES + + YES + otherObjectToLocalize_ + owner_ + yetAnotherObjectToLocalize_ + + + YES + id + id + id + + + + IBProjectSource + ../third_party/GTM/AppKit/GTMUILocalizer.h + + + + GTMUILocalizerAndLayoutTweaker + NSObject + + YES + + YES + localizerOwner_ + localizer_ + uiObject_ + + + YES + id + GTMUILocalizer + id + + + + IBProjectSource + ../third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h + + + + GTMWidthBasedTweaker + NSView + + YES + + YES + viewToResize_ + viewToSlideAndResize_ + viewToSlide_ + + + YES + id + NSView + NSView + + + + + + NSObject + + IBProjectSource + browser/cocoa/status_bubble_mac.h + + + NSObject IBProjectSource @@ -586,7 +831,7 @@ bCBSaWdodHMgUmVzZXJ2ZWQuA 0 - ../../../chrome.xcodeproj + ../../chrome.xcodeproj 3 -- cgit v1.1