From 50ada2e97cc6f1c1e0f1bf7ee33ff64a0d28d79a Mon Sep 17 00:00:00 2001 From: "rsesek@chromium.org" Date: Fri, 8 Jan 2010 14:51:21 +0000 Subject: Localize the Mac font and language settings dialog BUG=None TEST=Change default system language. Re-launch Chromium. Then go to Chromium--> Preferences-->Under the Hood-->Change font and language settings. Notice proper localization. Review URL: http://codereview.chromium.org/523074 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35790 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/app/nibs/FontLanguageSettings.xib | 1032 +++++++++++++++++++----------- chrome/chrome_browser.gypi | 1 + 2 files changed, 646 insertions(+), 387 deletions(-) (limited to 'chrome') diff --git a/chrome/app/nibs/FontLanguageSettings.xib b/chrome/app/nibs/FontLanguageSettings.xib index 91628ef..cacd2bd 100644 --- a/chrome/app/nibs/FontLanguageSettings.xib +++ b/chrome/app/nibs/FontLanguageSettings.xib @@ -2,10 +2,10 @@ 1050 - 10B504 + 10C540 740 - 1038.2 - 437.00 + 1038.25 + 458.00 com.apple.InterfaceBuilder.CocoaPlugin 740 @@ -41,9 +41,9 @@ 7 2 - {{196, 232}, {562, 278}} + {{196, 223}, {562, 287}} 544735232 - Fonts and Languages + ^IDS_FONT_LANGUAGE_SETTING_WINDOWS_TITLE NSWindow {1.79769e+308, 1.79769e+308} @@ -55,7 +55,7 @@ 12 - {{13, 40}, {536, 232}} + {{13, 47}, {536, 234}} YES @@ -69,13 +69,13 @@ 268 - {{14, 166}, {41, 17}} + {{14, 168}, {488, 17}} YES 68288064 272630784 - Fonts + ^IDS_FONT_LANGUAGE_SETTING_FONT_SUB_DIALOG_FONT_TITLE LucidaGrande-Bold 13 @@ -102,225 +102,36 @@ - - - 268 - {{14, 141}, {69, 17}} - - YES - - 68288064 - 272630784 - Serif Font: - - LucidaGrande - 13 - 1044 - - - - - - - - - 268 - {{14, 115}, {105, 17}} - - YES - - 68288064 - 272630784 - Sans-Serif Font: - - - - - - - - - 268 - {{14, 90}, {117, 17}} - - YES - - 68288064 - 272630784 - Fixed-width Font: - - - - - - - - - 268 - {{145, 139}, {257, 22}} - - YES - - -2079195584 - 306185216 - - - - YES - 1 - - 6 - System - textBackgroundColor - - 3 - MQA - - - - 6 - System - textColor - - - - - - - 268 - {{404, 133}, {101, 32}} - - YES - - 67239424 - 134217728 - Change… - - - -2038284033 - 129 - - - 200 - 25 - - - - - 268 - {{145, 112}, {257, 22}} - - YES - - -2079195584 - 306185216 - - - - YES - 1 - - - - - - - 268 - {{404, 106}, {101, 32}} - - YES - - 67239424 - 134217728 - Change… - - - -2038284033 - 129 - - - 200 - 25 - - - - - 268 - {{145, 86}, {257, 22}} - - YES - - -2079195584 - 306185216 - - - - - - - - - - 268 - {{404, 80}, {101, 32}} - - YES - - 67239424 - 134217728 - Change… - - - -2038284033 - 129 - - - 200 - 25 - - 268 - {{14, 45}, {66, 17}} + {{14, 40}, {488, 17}} YES 68288064 272630784 - Encoding + ^IDS_FONT_LANGUAGE_SETTING_FONT_SUB_DIALOG_ENCODING_TITLE - - - 268 - {{14, 20}, {116, 17}} - - YES - - 68288064 - 272630784 - Default Encoding: - - - - - - - 268 - {{132, 14}, {370, 26}} + 266 + {{132, 9}, {370, 26}} YES -2076049856 2048 - + + LucidaGrande + 13 + 1044 + 109199615 129 @@ -383,11 +194,269 @@ 2 + + + 268 + + YES + + + 265 + {{12, 10}, {137, 17}} + + YES + + 68288064 + 272630784 + ^IDS_FONT_LANGUAGE_SETTING_FONT_SELECTOR_FIXED_WIDTH_LABEL + + + + + + + + + 265 + {{12, 41}, {137, 17}} + + YES + + 68288064 + 272630784 + ^IDS_FONT_LANGUAGE_SETTING_FONT_SELECTOR_SANS_SERIF_LABEL + + + + + + + + + 265 + {{12, 73}, {137, 17}} + + YES + + 68288064 + 272630784 + ^IDS_FONT_LANGUAGE_SETTING_FONT_SELECTOR_SERIF_LABEL + + + + + + + + {{-3, 70}, {151, 110}} + + GTMWidthBasedTweaker + + + + 268 + + YES + + + 265 + {{17, 20}, {116, 17}} + + YES + + 68288064 + 272630784 + ^IDS_FONT_LANGUAGE_SETTING_FONT_DEFAULT_ENCODING_SELECTOR_LABEL + + + + + + + + {{-3, -5}, {150, 57}} + + GTMWidthBasedTweaker + + + + 292 + + YES + + + 268 + {{14, 1}, {101, 32}} + + YES + + 67239424 + 134217728 + ^IDS_FONT_LANGUAGE_SETTING_FONT_SELECTOR_BUTTON_LABEL + + + -2038284033 + 129 + + + 200 + 25 + + + + + 268 + {{14, 32}, {101, 32}} + + YES + + 67239424 + 134217728 + ^IDS_FONT_LANGUAGE_SETTING_FONT_SELECTOR_BUTTON_LABEL + + + -2038284033 + 129 + + + 200 + 25 + + + + + 268 + {{14, 64}, {101, 32}} + + YES + + 67239424 + 134217728 + ^IDS_FONT_LANGUAGE_SETTING_FONT_SELECTOR_BUTTON_LABEL + + + -2038284033 + 129 + + + 200 + 25 + + + + {{390, 70}, {129, 113}} + + GTMWidthBasedTweaker + + + + 36 + + YES + + + 256 + + YES + + + 266 + {{15, 82}, {259, 22}} + + YES + + -2079195584 + 306185216 + + + + YES + 1 + + 6 + System + textBackgroundColor + + 3 + MQA + + + + 6 + System + textColor + + + + + + + 266 + {{15, 50}, {259, 22}} + + YES + + -2079195584 + 306185216 + + + + YES + 1 + + + + + + + 266 + {{15, 19}, {259, 22}} + + YES + + -2079195584 + 306185216 + + + + + + + + + {289, 115} + + + + {{132, 57}, {289, 115}} + + {0, 0} + + 67239424 + 0 + Box + + LucidaGrande + 11 + 3100 + + + + 3 + MCAwLjgwMDAwMDAxMTkAA + + + + 0 + 0 + 0 + NO + - {{10, 33}, {516, 186}} + {{10, 33}, {516, 188}} - Fonts and Encodings + ^IDS_FONT_LANGUAGE_SETTING_FONT_TAB_TITLE @@ -401,7 +470,7 @@ 268 - {{122, 92}, {427, 17}} + {{122, 94}, {427, 17}} YES @@ -415,9 +484,9 @@ - {{10, 33}, {516, 186}} + {{10, 33}, {516, 188}} - Languages + ^IDS_FONT_LANGUAGE_SETTING_LANGUAGES_TAB_TITLE @@ -432,48 +501,58 @@ - + - 268 - {{452, 9}, {96, 32}} - - YES - - 67239424 - 134217728 - OK - - - -2038284033 - 129 - - DQ - 200 - 25 + 289 + + YES + + + 289 + {{110, 12}, {96, 32}} + + YES + + 67239424 + 134217728 + ^IDS_OK + + + -2038284033 + 129 + + DQ + 200 + 25 + + + + + 289 + {{14, 12}, {96, 32}} + + YES + + 67239424 + 134217728 + ^IDS_CANCEL + + + -2038284033 + 129 + + Gw + 200 + 25 + + - - - - 268 - {{356, 9}, {96, 32}} + {{342, 0}, {220, 54}} - YES - - 67239424 - 134217728 - Cancel - - - -2038284033 - 129 - - Gw - 200 - 25 - + GTMWidthBasedTweaker - {562, 278} + {562, 287} {{0, 0}, {1680, 1028}} @@ -491,6 +570,12 @@ YES YES + + ChromeUILocalizer + + + GTMUILocalizerAndLayoutTweaker + @@ -640,6 +725,38 @@ 77 + + + localizer_ + + + + 84 + + + + uiObject_ + + + + 85 + + + + viewToSlideAndResize_ + + + + 87 + + + + viewToSlideAndResize_ + + + + 89 + @@ -683,8 +800,7 @@ YES - - + @@ -731,18 +847,12 @@ YES - - - - - - - - - - + + + + @@ -761,249 +871,311 @@ - 10 - + 28 + YES - + - 11 - - + 29 + + - 12 - + 52 + YES - + - + - 13 - - + 53 + + - 14 - + 56 + YES - + - 15 - - - - - 16 - + 57 + YES - + - - - - 17 - - + - 18 - + 58 + YES - + + + - + - 19 - - + 59 + + - 20 - + 60 + + + + + 61 + + + + + 62 + + + + + 78 + + + + + 79 + YES - + + + - 21 - + 10 + YES - + - + - 22 - - + 11 + + - 23 - - + 12 + + + YES + + + - 24 - + 13 + + + + + 14 + YES - + - + - 25 - + 15 + + + + + 80 + YES - + - 26 - - + 54 + + + YES + + + - 27 - - + 55 + + - 28 - + 81 + YES - + + - - - - 29 - - + - 52 - + 73 + YES - + - + - 53 - - + 74 + + - 54 - + 71 + YES - + - + - 55 - - + 72 + + - 56 - + 82 + YES - + + + - 57 - + 18 + YES - + - + - 58 - + 19 + + + + + 21 + YES - - - + - + - 59 - - + 22 + + - 60 - - + 25 + + + YES + + + - 61 - - + 26 + + - 62 - + 83 + - 71 - + 86 + YES - + + + - + - 72 - - + 16 + + + YES + + + - 73 - + 17 + + + + + 20 + YES - + - + - 74 - - + 23 + + + + + 24 + + + YES + + + + + + 27 + + @@ -1061,7 +1233,9 @@ 72.IBPluginDependency 73.IBPluginDependency 74.IBPluginDependency + 78.IBPluginDependency 8.IBPluginDependency + 83.IBPluginDependency 9.IBPluginDependency @@ -1069,9 +1243,9 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{472, 578}, {562, 278}} + {{457, 347}, {562, 287}} com.apple.InterfaceBuilder.CocoaPlugin - {{472, 578}, {562, 278}} + {{457, 347}, {562, 287}} {196, 240} {{357, 418}, {480, 270}} @@ -1118,6 +1292,8 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin @@ -1136,12 +1312,20 @@ - 77 + 89 YES + ChromeUILocalizer + GTMUILocalizer + + IBProjectSource + browser/cocoa/ui_localizer.h + + + FontLanguageSettingsController NSWindowController @@ -1188,6 +1372,72 @@ + 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 + + + + + NSMenuItem IBProjectSource @@ -1271,6 +1521,14 @@ + NSBox + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSBox.h + + + NSButton NSControl diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 5117946..f1a2420 100755 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -2034,6 +2034,7 @@ 'app/nibs/DownloadShelf.xib', 'app/nibs/EditSearchEngine.xib', 'app/nibs/FirstRunDialog.xib', + 'app/nibs/FontLanguageSettings.xib', 'app/nibs/HttpAuthLoginSheet.xib', 'app/nibs/HungRendererDialog.xib', 'app/nibs/ImportSettingsDialog.xib', -- cgit v1.1