date:20230222

[ros-diffs] [reactos] 01/01: [NOTEPAD] Improve DIALOG_GoTo (#5082)

2023-02-22 Thread Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a351943caa8ecb60b330c0c8404c063a5a7fb297

commit a351943caa8ecb60b330c0c8404c063a5a7fb297
Author: Katayama Hirofumi MZ 
AuthorDate: Wed Feb 22 21:18:05 2023 +0900
Commit: GitHub 
CommitDate: Wed Feb 22 21:18:05 2023 +0900

[NOTEPAD] Improve DIALOG_GoTo (#5082)

- Don't use text directly in DIALOG_GoTo function. Rely the EM_* message 
handlers.
- Fix and improve DIALOG_GOTO resource dialog (that was wrong in some 
points).
- Add STRING_LINE_NUMBER_OUT_OF_RANGE.
CORE-18837
---
 base/applications/notepad/dialog.c  | 110 +---
 base/applications/notepad/lang/bg-BG.rc |   9 +--
 base/applications/notepad/lang/cs-CZ.rc |   9 +--
 base/applications/notepad/lang/da-DK.rc |   9 +--
 base/applications/notepad/lang/de-DE.rc |   9 +--
 base/applications/notepad/lang/el-GR.rc |   9 +--
 base/applications/notepad/lang/en-US.rc |   9 +--
 base/applications/notepad/lang/es-ES.rc |   9 +--
 base/applications/notepad/lang/et-EE.rc |   9 +--
 base/applications/notepad/lang/eu-ES.rc |   9 +--
 base/applications/notepad/lang/fi-FI.rc |   9 +--
 base/applications/notepad/lang/fr-FR.rc |   9 +--
 base/applications/notepad/lang/he-IL.rc |   9 +--
 base/applications/notepad/lang/hi-IN.rc |   9 +--
 base/applications/notepad/lang/hr-HR.rc |   9 +--
 base/applications/notepad/lang/hu-HU.rc |   9 +--
 base/applications/notepad/lang/hy-AM.rc |   9 +--
 base/applications/notepad/lang/id-ID.rc |   9 +--
 base/applications/notepad/lang/it-IT.rc |   9 +--
 base/applications/notepad/lang/ja-JP.rc |   9 +--
 base/applications/notepad/lang/lt-LT.rc |   9 +--
 base/applications/notepad/lang/ms-MY.rc |   9 +--
 base/applications/notepad/lang/nl-NL.rc |   9 +--
 base/applications/notepad/lang/no-NO.rc |   9 +--
 base/applications/notepad/lang/pl-PL.rc |   9 +--
 base/applications/notepad/lang/pt-BR.rc |   9 +--
 base/applications/notepad/lang/pt-PT.rc |   9 +--
 base/applications/notepad/lang/ro-RO.rc |   9 +--
 base/applications/notepad/lang/ru-RU.rc |   9 +--
 base/applications/notepad/lang/sk-SK.rc |   9 +--
 base/applications/notepad/lang/sl-SI.rc |   9 +--
 base/applications/notepad/lang/sq-AL.rc |   9 +--
 base/applications/notepad/lang/sv-SE.rc |   9 +--
 base/applications/notepad/lang/th-TH.rc |   9 +--
 base/applications/notepad/lang/tr-TR.rc |   9 +--
 base/applications/notepad/lang/uk-UA.rc |   9 +--
 base/applications/notepad/lang/uz-UZ.rc |   9 +--
 base/applications/notepad/lang/zh-CN.rc |   9 +--
 base/applications/notepad/lang/zh-HK.rc |   9 +--
 base/applications/notepad/lang/zh-TW.rc |   9 +--
 base/applications/notepad/notepad_res.h |   1 +
 41 files changed, 255 insertions(+), 207 deletions(-)

diff --git a/base/applications/notepad/dialog.c 
b/base/applications/notepad/dialog.c
index 27f651c67c1..b62c2768b09 100644
--- a/base/applications/notepad/dialog.c
+++ b/base/applications/notepad/dialog.c
@@ -1083,82 +1083,90 @@ VOID DIALOG_Replace(VOID)
 DIALOG_SearchDialog(ReplaceText);
 }
 
+typedef struct tagGOTO_DATA
+{
+UINT iLine;
+UINT cLines;
+} GOTO_DATA, *PGOTO_DATA;
+
 static INT_PTR
 CALLBACK
 DIALOG_GoTo_DialogProc(HWND hwndDialog, UINT uMsg, WPARAM wParam, LPARAM 
lParam)
 {
-BOOL bResult = FALSE;
-HWND hTextBox;
-TCHAR szText[32];
+static PGOTO_DATA s_pGotoData;
 
-switch(uMsg) {
-case WM_INITDIALOG:
-hTextBox = GetDlgItem(hwndDialog, ID_LINENUMBER);
-_sntprintf(szText, ARRAY_SIZE(szText), _T("%Id"), lParam);
-SetWindowText(hTextBox, szText);
-break;
-case WM_COMMAND:
-if (HIWORD(wParam) == BN_CLICKED)
+switch (uMsg)
+{
+case WM_INITDIALOG:
+s_pGotoData = (PGOTO_DATA)lParam;
+SetDlgItemInt(hwndDialog, ID_LINENUMBER, s_pGotoData->iLine, 
FALSE);
+return TRUE; /* Set focus */
+
+case WM_COMMAND:
 {
 if (LOWORD(wParam) == IDOK)
 {
-hTextBox = GetDlgItem(hwndDialog, ID_LINENUMBER);
-GetWindowText(hTextBox, szText, ARRAY_SIZE(szText));
-EndDialog(hwndDialog, _ttoi(szText));
-bResult = TRUE;
+UINT iLine = GetDlgItemInt(hwndDialog, ID_LINENUMBER, NULL, 
FALSE);
+if (iLine <= 0 || s_pGotoData->cLines < iLine) /* Out of range 
*/
+{
+/* Show error message */
+WCHAR title[128], text[256];
+LoadStringW(Globals.hInstance, STRING_NOTEPAD, title, 
ARRAY_SIZE(title));
+LoadStringW(Globals.hInstance, 
STRING_LINE_NUMBER_OUT_OF_RANGE, text, ARRAY_SIZE(text));
+MessageBoxW(hwndDialog, text, title, MB_OK);
+
+SendDlgItemMessageW(hwndDialog, ID_LINENUMBER, EM_SETSEL, 
0, -1);
+SetFocus(GetDlgItem(hwndDialog, ID_LINENUMBER));
+break;
+}
+s_pGotoData->iLine

[ros-diffs] [reactos] 01/01: [SHELL32] Move error message to rc files so can be translated (CORE-18786) (#4997)

2023-02-22 Thread Jose Carlos Jesus

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=23cd14d78bbfc8421ba7830ed71b6088e5a1e40f

commit 23cd14d78bbfc8421ba7830ed71b6088e5a1e40f
Author: Jose Carlos Jesus 
AuthorDate: Wed Feb 22 20:43:53 2023 -0400
Commit: GitHub 
CommitDate: Thu Feb 23 09:43:53 2023 +0900

[SHELL32] Move error message to rc files so can be translated (CORE-18786) 
(#4997)

CORE-18786
---
 dll/win32/shell32/CNewMenu.cpp  | 6 --
 dll/win32/shell32/lang/bg-BG.rc | 2 ++
 dll/win32/shell32/lang/ca-ES.rc | 2 ++
 dll/win32/shell32/lang/cs-CZ.rc | 2 ++
 dll/win32/shell32/lang/da-DK.rc | 2 ++
 dll/win32/shell32/lang/de-DE.rc | 2 ++
 dll/win32/shell32/lang/el-GR.rc | 2 ++
 dll/win32/shell32/lang/en-GB.rc | 2 ++
 dll/win32/shell32/lang/en-US.rc | 2 ++
 dll/win32/shell32/lang/es-ES.rc | 2 ++
 dll/win32/shell32/lang/et-EE.rc | 2 ++
 dll/win32/shell32/lang/eu-ES.rc | 2 ++
 dll/win32/shell32/lang/fi-FI.rc | 2 ++
 dll/win32/shell32/lang/fr-FR.rc | 2 ++
 dll/win32/shell32/lang/he-IL.rc | 2 ++
 dll/win32/shell32/lang/hi-IN.rc | 2 ++
 dll/win32/shell32/lang/hu-HU.rc | 2 ++
 dll/win32/shell32/lang/id-ID.rc | 2 ++
 dll/win32/shell32/lang/it-IT.rc | 2 ++
 dll/win32/shell32/lang/ja-JP.rc | 2 ++
 dll/win32/shell32/lang/ko-KR.rc | 2 ++
 dll/win32/shell32/lang/nl-NL.rc | 2 ++
 dll/win32/shell32/lang/no-NO.rc | 2 ++
 dll/win32/shell32/lang/pl-PL.rc | 2 ++
 dll/win32/shell32/lang/pt-BR.rc | 2 ++
 dll/win32/shell32/lang/pt-PT.rc | 6 --
 dll/win32/shell32/lang/ro-RO.rc | 2 ++
 dll/win32/shell32/lang/ru-RU.rc | 2 ++
 dll/win32/shell32/lang/sk-SK.rc | 2 ++
 dll/win32/shell32/lang/sl-SI.rc | 2 ++
 dll/win32/shell32/lang/sq-AL.rc | 2 ++
 dll/win32/shell32/lang/sv-SE.rc | 2 ++
 dll/win32/shell32/lang/tr-TR.rc | 2 ++
 dll/win32/shell32/lang/uk-UA.rc | 2 ++
 dll/win32/shell32/lang/zh-CN.rc | 2 ++
 dll/win32/shell32/lang/zh-HK.rc | 2 ++
 dll/win32/shell32/lang/zh-TW.rc | 2 ++
 dll/win32/shell32/shresdef.h| 2 ++
 38 files changed, 80 insertions(+), 4 deletions(-)

diff --git a/dll/win32/shell32/CNewMenu.cpp b/dll/win32/shell32/CNewMenu.cpp
index 87559e017f4..f3ec59cf3da 100644
--- a/dll/win32/shell32/CNewMenu.cpp
+++ b/dll/win32/shell32/CNewMenu.cpp
@@ -565,8 +565,10 @@ HRESULT CNewMenu::NewItemByNonCommand(SHELLNEW_ITEM 
*pItem, LPWSTR wszName,
 }
 else
 {
-StringCbPrintfW(wszBuf, sizeof(wszBuf), L"Cannot create file: %s", 
wszName);
-MessageBoxW(NULL, wszBuf, L"Cannot create file", MB_OK | 
MB_ICONERROR); // FIXME load localized error msg
+CStringW Caption(MAKEINTRESOURCEW(IDS_CREATEFILE_CAPTION));
+CStringW Message(MAKEINTRESOURCEW(IDS_CREATEFILE_DENIED));
+Message.FormatMessage(Message.GetString(), wszName);
+MessageBoxW(0, Message, Caption, MB_ICONEXCLAMATION | MB_OK);
 }
 
 return S_OK;
diff --git a/dll/win32/shell32/lang/bg-BG.rc b/dll/win32/shell32/lang/bg-BG.rc
index 889ca032828..be62be7fa57 100644
--- a/dll/win32/shell32/lang/bg-BG.rc
+++ b/dll/win32/shell32/lang/bg-BG.rc
@@ -809,6 +809,8 @@ BEGIN
 IDS_MOVEERROR "Cannot move '%s': %s"
 IDS_COPYERROR "Cannot copy '%s': %s"
 
+IDS_CREATEFILE_DENIED "Could not create file %1"
+IDS_CREATEFILE_CAPTION "Error creating file"
 IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'"
 IDS_CREATEFOLDER_CAPTION "Unable to create folder"
 IDS_DELETEITEM_CAPTION "Потвърдете изтриване на файла"
diff --git a/dll/win32/shell32/lang/ca-ES.rc b/dll/win32/shell32/lang/ca-ES.rc
index cb45cb2c1be..b96f2a33e8e 100644
--- a/dll/win32/shell32/lang/ca-ES.rc
+++ b/dll/win32/shell32/lang/ca-ES.rc
@@ -808,6 +808,8 @@ BEGIN
 IDS_MOVEERROR "Cannot move '%s': %s"
 IDS_COPYERROR "Cannot copy '%s': %s"
 
+IDS_CREATEFILE_DENIED "Could not create file %1"
+IDS_CREATEFILE_CAPTION "Error creating file"
 IDS_CREATEFOLDER_DENIED "Unable to create the folder '%1'"
 IDS_CREATEFOLDER_CAPTION "Unable to create folder"
 IDS_DELETEITEM_CAPTION "Confirm File Deletion"
diff --git a/dll/win32/shell32/lang/cs-CZ.rc b/dll/win32/shell32/lang/cs-CZ.rc
index 585feead1c6..a5508bc23ac 100644
--- a/dll/win32/shell32/lang/cs-CZ.rc
+++ b/dll/win32/shell32/lang/cs-CZ.rc
@@ -814,6 +814,8 @@ BEGIN
 IDS_MOVEERROR "Cannot move '%s': %s"
 IDS_COPYERROR "Cannot copy '%s': %s"
 
+IDS_CREATEFILE_DENIED "Could not create file %1"
+IDS_CREATEFILE_CAPTION "Error creating file"
 IDS_CREATEFOLDER_DENIED "Složku '%1' nebylo možné vytvořit"
 IDS_CREATEFOLDER_CAPTION "Složku nebylo možné vytvořit"
 IDS_DELETEITEM_CAPTION "Potvrdit odstranění souboru"
diff --git a/dll/win32/shell32/lang/da-DK.rc b/dll/win32/shell32/lang/da-DK.rc
index 150485e6b78..f8041238667 100644
--- a/dll/win32/shell32/lang/da-DK.rc
+++ b/dll/win32/shell32/lang/da-DK.rc
@@ -814,6 +814,8 @@ BEGIN
 IDS_MOVEERROR "Cannot move '%s': %s"
 IDS_COPYERROR "Cannot copy '%s': %s"
 
+IDS_CREATEFILE_DENIED "Could not create file %1"
+IDS_CREATEFILE_CAPTION "Error creating file"
 IDS_CREATEFOLDER_DENIED "Unable to c

[ros-diffs] [reactos] 01/01: [BOOTDATA][INF] Add pt-PT translation (#4926)

2023-02-22 Thread Jose Carlos Jesus

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6d2012ac3b4dddb0f19fff79ccc9738709979715

commit 6d2012ac3b4dddb0f19fff79ccc9738709979715
Author: Jose Carlos Jesus 
AuthorDate: Wed Feb 22 20:51:33 2023 -0400
Commit: GitHub 
CommitDate: Thu Feb 23 09:51:33 2023 +0900

[BOOTDATA][INF] Add pt-PT translation (#4926)
---
 boot/bootdata/hivesft.inf | 587 ++
 1 file changed, 587 insertions(+)

diff --git a/boot/bootdata/hivesft.inf b/boot/bootdata/hivesft.inf
index 9affb07c433..dc9903f7d34 100644
--- a/boot/bootdata/hivesft.inf
+++ b/boot/bootdata/hivesft.inf
@@ -5431,6 +5431,593 @@ GMT_PLUS_13_A_DESC="(GMT+13:00) ヌクアロファ"
 GMT_PLUS_13_A_DAYLIGHT="トンガ夏時間"
 GMT_PLUS_13_A_STANDARD="トンガ標準時"
 
+; LANG_PORTUGUESE SUBLANG_NEUTRAL
+[Strings.0816]
+COUNTRY_AD="Andorra"
+COUNTRY_AE="Emirados Árabes Unidos"
+COUNTRY_AF="Afghanistão"
+COUNTRY_AG="Antigua e Barbuda"
+COUNTRY_AI="Anguilla"
+COUNTRY_AL="Albânia"
+COUNTRY_AM="Arménia"
+COUNTRY_AO="Angola"
+COUNTRY_AQ="Antárctica"
+COUNTRY_AR="Argentina"
+COUNTRY_AS="Samoa Americana"
+COUNTRY_AT="Austria"
+COUNTRY_AU="Austrália"
+COUNTRY_AW="Aruba"
+COUNTRY_AX="Ilhas Åland"
+COUNTRY_AZ="Azerbaijão"
+COUNTRY_BA="Bósnia e Herzegovina"
+COUNTRY_BB="Barbados"
+COUNTRY_BD="Bangladesh"
+COUNTRY_BE="Bélgica"
+COUNTRY_BF="Burkina Faso"
+COUNTRY_BG="Bulgária"
+COUNTRY_BH="Bahrain"
+COUNTRY_BI="Burundi"
+COUNTRY_BJ="Benin"
+COUNTRY_BL="Saint Barthélemy"
+COUNTRY_BM="Bermuda"
+COUNTRY_BN="Brunei Darussalam"
+COUNTRY_BO="Bolívia, Estado plurinacional da"
+COUNTRY_BQ="Bonaire, Saint Eustatius and Saba"
+COUNTRY_BR="Brasil"
+COUNTRY_BS="Bahamas"
+COUNTRY_BT="Butão"
+COUNTRY_BV="Bouvet Island"
+COUNTRY_BW="Botswana"
+COUNTRY_BY="Belarus"
+COUNTRY_BZ="Belize"
+COUNTRY_CA="Canadá"
+COUNTRY_CC="Cocos (Keeling) Islands"
+COUNTRY_CD="Congo, República Democrática do"
+COUNTRY_CF="República Central Africana"
+COUNTRY_CG="Congo"
+COUNTRY_CH="Suissa"
+COUNTRY_CI="Côte d'Ivoire"
+COUNTRY_CK="Ilhas Cook"
+COUNTRY_CL="Chile"
+COUNTRY_CM="Camarões"
+COUNTRY_CN="China"
+COUNTRY_CO="Colombia"
+COUNTRY_CR="Costa Rica"
+COUNTRY_CU="Cuba"
+COUNTRY_CV="Cabo Verde"
+COUNTRY_CW="Curação"
+COUNTRY_CX="Ihas Natal"
+COUNTRY_CY="Chipre"
+COUNTRY_CZ="República Checa"
+COUNTRY_DE="Alemanha"
+COUNTRY_DJ="Djibouti"
+COUNTRY_DK="Dinamarca"
+COUNTRY_DM="Dominica"
+COUNTRY_DO="República Dominicana"
+COUNTRY_DZ="Algéria"
+COUNTRY_EC="Equador"
+COUNTRY_EE="Estónia"
+COUNTRY_EG="Egipto"
+COUNTRY_EH="Sahara Oeste"
+COUNTRY_ER="Eritreia"
+COUNTRY_ES="Espanha"
+COUNTRY_ET="Ethiópia"
+COUNTRY_FI="Finlandia"
+COUNTRY_FJ="Fiji"
+COUNTRY_FK="Ilhas Falkland (Malvinas)"
+COUNTRY_FM="Micronésia, Estados Federados da"
+COUNTRY_FO="Faroe Islands"
+COUNTRY_FR="França"
+COUNTRY_GA="Gabão"
+COUNTRY_GD="Granada"
+COUNTRY_GE="Geórgia"
+COUNTRY_GF="Guiana Francesa"
+COUNTRY_GG="Guernsey"
+COUNTRY_GH="Ghana"
+COUNTRY_GI="Gibraltar"
+COUNTRY_GL="Greenland"
+COUNTRY_GM="Gambia"
+COUNTRY_GN="Guiné"
+COUNTRY_GP="Guadeloupe"
+COUNTRY_GQ="Guiné Equatorial"
+COUNTRY_GR="Grécia"
+COUNTRY_GS="South Georgia and the South Sandwich Islands"
+COUNTRY_GT="Guatemala"
+COUNTRY_GU="Guam"
+COUNTRY_GW="Guiné-Bissau"
+COUNTRY_GY="Guyana"
+COUNTRY_HK="Hong Kong"
+COUNTRY_HM="Heard Island and McDonald Islands"
+COUNTRY_HN="Honduras"
+COUNTRY_HR="Croácia"
+COUNTRY_HT="Haiti"
+COUNTRY_HU="Hungria"
+COUNTRY_ID="Indonésia"
+COUNTRY_IE="Irlanda"
+COUNTRY_IL="Israel"
+COUNTRY_IM="Isle of Man"
+COUNTRY_IN="Índia"
+COUNTRY_IO="British Indian Ocean Territory"
+COUNTRY_IQ="Iraque"
+COUNTRY_IR="Irão, Repúblic Islamica do"
+COUNTRY_IS="Iceland"
+COUNTRY_IT="Itália"
+COUNTRY_JE="Jersey"
+COUNTRY_JM="Jamaica"
+COUNTRY_JO="Jordania"
+COUNTRY_JP="Japão"
+COUNTRY_KE="Quénia"
+COUNTRY_KG="Kyrgyzstan"
+COUNTRY_KH="Cambójia"
+COUNTRY_KI="Kiribati"
+COUNTRY_KM="Comoros"
+COUNTRY_KN="Saint Kitts and Nevis"
+COUNTRY_KP="Coreia, República Popular Democrática da"
+COUNTRY_KR="Coreia, República da"
+COUNTRY_KW="Kuwait"
+COUNTRY_KY="Ilhas Caimão"
+COUNTRY_KZ="Cazaquistão"
+COUNTRY_LA="República Popular Democrática do Laos"
+COUNTRY_LB="Líbano"
+COUNTRY_LC="Santa Lúcia"
+COUNTRY_LI="Liechtenstein"
+COUNTRY_LK="Sri Lanka"
+COUNTRY_LR="Libéria"
+COUNTRY_LS="Lesotho"
+COUNTRY_LT="Lithuania"
+COUNTRY_LU="Luxemburgo"
+COUNTRY_LV="Latvia"
+COUNTRY_LY="Libyan Arab Jamahiriya"
+COUNTRY_MA="Marrocos"
+COUNTRY_MC="Monaco"
+COUNTRY_MD="Moldova, República da"
+COUNTRY_ME="Montenegro"
+COUNTRY_MF="Saint Martin (French part)"
+COUNTRY_MG="Madagascar"
+COUNTRY_MH="Ilhas Marshall"
+COUNTRY_MK="Macedónia, the former Yugoslav Republic of"
+COUNTRY_ML="Mali"
+COUNTRY_MM="Myanmar"
+COUNTRY_MN="Mongólia"
+COUNTRY_MO="Macau"
+COUNTRY_MP="Northern Mariana Islands"
+COUNTRY_MQ="Martinique"
+COUNTRY_MR="Mauritania"
+COUNTRY_MS="Montserrat"
+COUNTRY_MT="Malta"
+COUNTRY_MU="Mauritius"
+COUNTRY_MV="Maldives"
+COUNTRY_MW="Malawi"
+COUNTRY_MX="Mexico"
+COUNTRY_MY="Malásia"
+COUNTRY_MZ="Moçambique"
+COUNTRY_NA="Namibia"
+COUNTRY_NC="Nova Caledonia"
+COUNTRY_NE="

[ros-diffs] [reactos] 01/01: [NOTEPAD] Improve DIALOG_GoTo (#5082)

[ros-diffs] [reactos] 01/01: [SHELL32] Move error message to rc files so can be translated (CORE-18786) (#4997)

[ros-diffs] [reactos] 01/01: [BOOTDATA][INF] Add pt-PT translation (#4926)

3 matches

Site Navigation

Mail list logo

Footer information