diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-24 21:58:21 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-24 21:58:21 +0000 |
| commit | 3c6f8e155866a42aed692b88231f4c6a62fae8c7 (patch) | |
| tree | 1be798be384cd76533c66c3bcaf5f1365512fe7d /chrome_frame/resources | |
| parent | c2c132c637874d6d3104293791b15b38da58bfc9 (diff) | |
| download | chromium_src-3c6f8e155866a42aed692b88231f4c6a62fae8c7.zip chromium_src-3c6f8e155866a42aed692b88231f4c6a62fae8c7.tar.gz chromium_src-3c6f8e155866a42aed692b88231f4c6a62fae8c7.tar.bz2 | |
Completing Chrome Frame localization by adding the resource script containing the dialog template to Chrome's generated_resources.grd. Associated changes in CF to call _AtlBaseModule.SetResourceInstance to get it to load dialog templates from a resource dll.
BUG=24305
TEST=The Find in page dialog in full tab Chrome Frame is localized.
Review URL: http://codereview.chromium.org/1293002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42543 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/resources')
| -rw-r--r-- | chrome_frame/resources/chrome_frame_resources.grd | 5 | ||||
| -rw-r--r-- | chrome_frame/resources/structured_resources.rc | 28 |
2 files changed, 6 insertions, 27 deletions
diff --git a/chrome_frame/resources/chrome_frame_resources.grd b/chrome_frame/resources/chrome_frame_resources.grd index abd6547..a8107fd 100644 --- a/chrome_frame/resources/chrome_frame_resources.grd +++ b/chrome_frame/resources/chrome_frame_resources.grd @@ -20,11 +20,6 @@ for localizable strings <output filename="chrome_frame_resources.pak" type="data_package" /> </outputs> <release seq="1"> - <!-- TODO(robertshield): All that's left now is to localize the dialog resource. --> - <structures first_id="50000"> - <structure name="IDD_FIND_DIALOG" file="structured_resources.rc" type="dialog" > - </structure> - </structures> <structures first_id="50005"> <structure name="IDR_CHROME_FRAME_IE_FULL_TAB" file="structured_resources.rc" type="accelerators" > </structure> diff --git a/chrome_frame/resources/structured_resources.rc b/chrome_frame/resources/structured_resources.rc index d2dbed3..1d07e05 100644 --- a/chrome_frame/resources/structured_resources.rc +++ b/chrome_frame/resources/structured_resources.rc @@ -4,29 +4,13 @@ ///////////////////////////////////////////////////////////////////////////// // -// Dialog +// Accelerators // -IDD_FIND_DIALOG DIALOGEX 0, 0, 278, 60 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -EXSTYLE WS_EX_CONTROLPARENT -CAPTION "Find" -FONT 8, "MS Shell Dlg", 400, 0, 0x1 +IDR_CHROME_FRAME_IE_FULL_TAB ACCELERATORS BEGIN - EDITTEXT IDC_FIND_TEXT,51,7,154,14,ES_AUTOHSCROLL - DEFPUSHBUTTON "&Find Next",IDOK,221,7,50,14 - PUSHBUTTON "Cancel",IDCANCEL,221,24,50,14 - CONTROL "Match &case",IDC_MATCH_CASE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,24,52,10 - GROUPBOX "Direction",IDC_STATIC,85,24,119,24 - CONTROL "&Down",IDC_DIRECTION_DOWN,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,101,34,34,10 - CONTROL "&Up",IDC_DIRECTION_UP,"Button",BS_AUTORADIOBUTTON,155,34,38,10 - LTEXT "Fi&nd what:",IDC_STATIC,6,7,35,8 + VK_LEFT, IDC_BACK, VIRTKEY, ALT + VK_BACK, IDC_BACK, VIRTKEY + VK_BACK, IDC_FORWARD, VIRTKEY, SHIFT + VK_RIGHT, IDC_FORWARD, VIRTKEY, ALT END - -IDR_CHROME_FRAME_IE_FULL_TAB ACCELERATORS
-BEGIN
- VK_LEFT, IDC_BACK, VIRTKEY, ALT
- VK_BACK, IDC_BACK, VIRTKEY
- VK_BACK, IDC_FORWARD, VIRTKEY, SHIFT
- VK_RIGHT, IDC_FORWARD, VIRTKEY, ALT
-END
|