https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0bf9f4b3017da0ea4c63e0...
commit 0bf9f4b3017da0ea4c63e013534665d1740ff7f6 Author: Katayama Hirofumi MZ katayama.hirofumi.mz@gmail.com AuthorDate: Wed Feb 12 11:06:54 2020 +0900 Commit: Katayama Hirofumi MZ katayama.hirofumi.mz@gmail.com CommitDate: Wed Feb 12 11:06:54 2020 +0900
[ZIPFLDR] Show 'Click Next to extract' on initial status --- dll/shellext/zipfldr/CZipExtract.cpp | 3 +++ dll/shellext/zipfldr/lang/de-DE.rc | 3 ++- dll/shellext/zipfldr/lang/en-US.rc | 3 ++- dll/shellext/zipfldr/lang/et-EE.rc | 3 ++- dll/shellext/zipfldr/lang/fr-FR.rc | 3 ++- dll/shellext/zipfldr/lang/hi-IN.rc | 3 ++- dll/shellext/zipfldr/lang/it-IT.rc | 3 ++- dll/shellext/zipfldr/lang/ja-JP.rc | 3 ++- dll/shellext/zipfldr/lang/pl-PL.rc | 3 ++- dll/shellext/zipfldr/lang/ro-RO.rc | 3 ++- dll/shellext/zipfldr/lang/ru-RU.rc | 3 ++- dll/shellext/zipfldr/lang/sv-SE.rc | 3 ++- dll/shellext/zipfldr/lang/zh-CN.rc | 3 ++- dll/shellext/zipfldr/resource.h | 2 ++ 14 files changed, 29 insertions(+), 12 deletions(-)
diff --git a/dll/shellext/zipfldr/CZipExtract.cpp b/dll/shellext/zipfldr/CZipExtract.cpp index 66ac782e425..f4d76898d76 100644 --- a/dll/shellext/zipfldr/CZipExtract.cpp +++ b/dll/shellext/zipfldr/CZipExtract.cpp @@ -127,6 +127,9 @@ public: ::EnableWindow(GetDlgItem(IDC_PASSWORD), FALSE); SetWizardButtons(0);
+ CStringW strExtracting(MAKEINTRESOURCEW(IDS_EXTRACTING)); + SetDlgItemTextW(IDC_STATUSTEXT, strExtracting); + if (m_pExtract->m_DirectoryChanged) UpdateDirectory();
diff --git a/dll/shellext/zipfldr/lang/de-DE.rc b/dll/shellext/zipfldr/lang/de-DE.rc index 6f50cb7d0d0..4945a2c2369 100644 --- a/dll/shellext/zipfldr/lang/de-DE.rc +++ b/dll/shellext/zipfldr/lang/de-DE.rc @@ -16,7 +16,7 @@ BEGIN EDITTEXT IDC_DIRECTORY,6,24,222,12,ES_AUTOHSCROLL PUSHBUTTON "Durchsuchen...",IDC_BROWSE,174,42,54,14 PUSHBUTTON "Kennwort",IDC_PASSWORD,174,66,54,14 - LTEXT "Extrahieren...",IDC_STATIC,6,114,42,8 + LTEXT "Click 'Next' to extract",IDC_STATUSTEXT,6,114,100,8 CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,6,126,222,6 END
@@ -73,6 +73,7 @@ BEGIN IDS_NOFILES "The specified directory '%s' is empty, so Compressed (zipped) Folders cannot add it to the archive." IDS_CANTCREATEZIP "Failed to create a compressed folder '%s' (Error Code: %d)." IDS_CANTREADFILE "Cannot read file '%s'." + IDS_EXTRACTING "Extrahieren..."
IDS_WIZ_TITLE "Extrahier-Assistent" IDS_WIZ_DEST_TITLE "Ziel auswählen" diff --git a/dll/shellext/zipfldr/lang/en-US.rc b/dll/shellext/zipfldr/lang/en-US.rc index a73ad541688..04f25b2659c 100644 --- a/dll/shellext/zipfldr/lang/en-US.rc +++ b/dll/shellext/zipfldr/lang/en-US.rc @@ -16,7 +16,7 @@ BEGIN EDITTEXT IDC_DIRECTORY,6,24,222,12,ES_AUTOHSCROLL PUSHBUTTON "Browse...",IDC_BROWSE,174,42,54,14 PUSHBUTTON "Password",IDC_PASSWORD,174,66,54,14 - LTEXT "Extracting...",IDC_STATIC,6,114,42,8 + LTEXT "Click 'Next' to extract",IDC_STATUSTEXT,6,114,100,8 CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,6,126,222,6 END
@@ -73,6 +73,7 @@ BEGIN IDS_NOFILES "The specified directory '%s' is empty, so Compressed (zipped) Folders cannot add it to the archive." IDS_CANTCREATEZIP "Failed to create a compressed folder '%s' (Error Code: %d)." IDS_CANTREADFILE "Cannot read file '%s'." + IDS_EXTRACTING "Extracting..."
IDS_WIZ_TITLE "Extraction Wizard" IDS_WIZ_DEST_TITLE "Select a Destination" diff --git a/dll/shellext/zipfldr/lang/et-EE.rc b/dll/shellext/zipfldr/lang/et-EE.rc index eb2b0280afb..7904bc15e3b 100644 --- a/dll/shellext/zipfldr/lang/et-EE.rc +++ b/dll/shellext/zipfldr/lang/et-EE.rc @@ -16,7 +16,7 @@ BEGIN EDITTEXT IDC_DIRECTORY,6,24,222,12,ES_AUTOHSCROLL PUSHBUTTON "Sirvi...",IDC_BROWSE,174,42,54,14 PUSHBUTTON "Parool",IDC_PASSWORD,174,66,54,14 - LTEXT "Ekstraktimine...",IDC_STATIC,6,114,42,8 + LTEXT "Click 'Next' to extract",IDC_STATUSTEXT,6,114,100,8 CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,6,126,222,6 END
@@ -73,6 +73,7 @@ BEGIN IDS_NOFILES "The specified directory '%s' is empty, so Compressed (zipped) Folders cannot add it to the archive." IDS_CANTCREATEZIP "Failed to create a compressed folder '%s' (Error Code: %d)." IDS_CANTREADFILE "Cannot read file '%s'." + IDS_EXTRACTING "Ekstraktimine..."
IDS_WIZ_TITLE "Ekstraktimise visard" IDS_WIZ_DEST_TITLE "Vali sihtkoht" diff --git a/dll/shellext/zipfldr/lang/fr-FR.rc b/dll/shellext/zipfldr/lang/fr-FR.rc index 24decc1fa3c..76c114e2efb 100644 --- a/dll/shellext/zipfldr/lang/fr-FR.rc +++ b/dll/shellext/zipfldr/lang/fr-FR.rc @@ -16,7 +16,7 @@ BEGIN EDITTEXT IDC_DIRECTORY,6,24,222,12,ES_AUTOHSCROLL PUSHBUTTON "Parcourir...",IDC_BROWSE,174,42,54,14 PUSHBUTTON "Mot de passe",IDC_PASSWORD,174,66,54,14 - LTEXT "Extraction...",IDC_STATIC,6,114,42,8 + LTEXT "Click 'Next' to extract",IDC_STATUSTEXT,6,114,100,8 CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,6,126,222,6 END
@@ -73,6 +73,7 @@ BEGIN IDS_NOFILES "The specified directory '%s' is empty, so Compressed (zipped) Folders cannot add it to the archive." IDS_CANTCREATEZIP "Failed to create a compressed folder '%s' (Error Code: %d)." IDS_CANTREADFILE "Cannot read file '%s'." + IDS_EXTRACTING "Extraction..."
IDS_WIZ_TITLE "Assistant d'extraction" IDS_WIZ_DEST_TITLE "Choisir une destination" diff --git a/dll/shellext/zipfldr/lang/hi-IN.rc b/dll/shellext/zipfldr/lang/hi-IN.rc index cf31cce8e32..cf2b6b8b19e 100644 --- a/dll/shellext/zipfldr/lang/hi-IN.rc +++ b/dll/shellext/zipfldr/lang/hi-IN.rc @@ -16,7 +16,7 @@ BEGIN EDITTEXT IDC_DIRECTORY,6,24,222,12,ES_AUTOHSCROLL PUSHBUTTON "ब्राउज...",IDC_BROWSE,174,42,54,14 PUSHBUTTON "पासवर्ड",IDC_PASSWORD,174,66,54,14 - LTEXT "निकाला जा रहा है...",IDC_STATIC,6,114,42,8 + LTEXT "Click 'Next' to extract",IDC_STATUSTEXT,6,114,100,8 CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,6,126,222,6 END
@@ -60,6 +60,7 @@ BEGIN IDS_NOFILES "The specified directory '%s' is empty, so Compressed (zipped) Folders cannot add it to the archive." IDS_CANTCREATEZIP "Failed to create a compressed folder '%s' (Error Code: %d)." IDS_CANTREADFILE "Cannot read file '%s'." + IDS_EXTRACTING "Extracting..."
IDS_WIZ_TITLE "निष्कर्षण विज़ार्ड" IDS_WIZ_DEST_TITLE "एक गंतव्य चुनें" diff --git a/dll/shellext/zipfldr/lang/it-IT.rc b/dll/shellext/zipfldr/lang/it-IT.rc index d3572fa0101..00b66381340 100644 --- a/dll/shellext/zipfldr/lang/it-IT.rc +++ b/dll/shellext/zipfldr/lang/it-IT.rc @@ -16,7 +16,7 @@ BEGIN EDITTEXT IDC_DIRECTORY,6,24,222,12,ES_AUTOHSCROLL PUSHBUTTON "Sfoglia...",IDC_BROWSE,174,42,54,14 PUSHBUTTON "Password",IDC_PASSWORD,174,66,54,14 - LTEXT "Estrazione...",IDC_STATIC,6,114,42,8 + LTEXT "Click 'Next' to extract",IDC_STATUSTEXT,6,114,100,8 CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,6,126,222,6 END
@@ -73,6 +73,7 @@ BEGIN IDS_NOFILES "The specified directory '%s' is empty, so Compressed (zipped) Folders cannot add it to the archive." IDS_CANTCREATEZIP "Failed to create a compressed folder '%s' (Error Code: %d)." IDS_CANTREADFILE "Cannot read file '%s'." + IDS_EXTRACTING "Estrazione..."
IDS_WIZ_TITLE "Estrazione Guidata" IDS_WIZ_DEST_TITLE "Seleziona una Destinazione" diff --git a/dll/shellext/zipfldr/lang/ja-JP.rc b/dll/shellext/zipfldr/lang/ja-JP.rc index 157e6717dac..8a87f0e825d 100644 --- a/dll/shellext/zipfldr/lang/ja-JP.rc +++ b/dll/shellext/zipfldr/lang/ja-JP.rc @@ -16,7 +16,7 @@ BEGIN EDITTEXT IDC_DIRECTORY,6,24,222,12,ES_AUTOHSCROLL PUSHBUTTON "参照...",IDC_BROWSE,174,42,54,14 PUSHBUTTON "パスワード",IDC_PASSWORD,174,66,54,14 - LTEXT "展開中...",IDC_STATIC,6,114,42,8 + LTEXT "展開するには '次へ' をクリック",IDC_STATUSTEXT,6,114,100,8 CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,6,126,222,6 END
@@ -73,6 +73,7 @@ BEGIN IDS_NOFILES "The specified directory '%s' is empty, so Compressed (zipped) Folders cannot add it to the archive." IDS_CANTCREATEZIP "Failed to create a compressed folder '%s' (Error Code: %d)." IDS_CANTREADFILE "Cannot read file '%s'." + IDS_EXTRACTING "展開中..."
IDS_WIZ_TITLE "展開ウィザード" IDS_WIZ_DEST_TITLE "展開先を選んで下さい" diff --git a/dll/shellext/zipfldr/lang/pl-PL.rc b/dll/shellext/zipfldr/lang/pl-PL.rc index fcdb0436d22..3ac36f3980d 100644 --- a/dll/shellext/zipfldr/lang/pl-PL.rc +++ b/dll/shellext/zipfldr/lang/pl-PL.rc @@ -15,7 +15,7 @@ BEGIN EDITTEXT IDC_DIRECTORY,6,24,222,12,ES_AUTOHSCROLL PUSHBUTTON "Przeglądaj...",IDC_BROWSE,174,42,54,14 PUSHBUTTON "Hasło",IDC_PASSWORD,174,66,54,14 - LTEXT "Trwa wyodrębnianie...",IDC_STATIC,6,114,82,8 + LTEXT "Click 'Next' to extract",IDC_STATUSTEXT,6,114,100,8 CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,6,126,222,6 END
@@ -72,6 +72,7 @@ BEGIN IDS_NOFILES "The specified directory '%s' is empty, so Compressed (zipped) Folders cannot add it to the archive." IDS_CANTCREATEZIP "Failed to create a compressed folder '%s' (Error Code: %d)." IDS_CANTREADFILE "Cannot read file '%s'." + IDS_EXTRACTING "Extracting..."
IDS_WIZ_TITLE "Kreator wyodrębniania" IDS_WIZ_DEST_TITLE "Wybierz miejsce docelowe" diff --git a/dll/shellext/zipfldr/lang/ro-RO.rc b/dll/shellext/zipfldr/lang/ro-RO.rc index cb15956e6cb..288544be28d 100644 --- a/dll/shellext/zipfldr/lang/ro-RO.rc +++ b/dll/shellext/zipfldr/lang/ro-RO.rc @@ -16,7 +16,7 @@ BEGIN EDITTEXT IDC_DIRECTORY,6,24,222,12,ES_AUTOHSCROLL PUSHBUTTON "Răsfoiți...",IDC_BROWSE,174,42,54,14 PUSHBUTTON "Parolă",IDC_PASSWORD,174,66,54,14 - LTEXT "Extragere...",IDC_STATIC,6,114,42,8 + LTEXT "Click 'Next' to extract",IDC_STATUSTEXT,6,114,100,8 CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,6,126,222,6 END
@@ -73,6 +73,7 @@ BEGIN IDS_NOFILES "The specified directory '%s' is empty, so Compressed (zipped) Folders cannot add it to the archive." IDS_CANTCREATEZIP "Failed to create a compressed folder '%s' (Error Code: %d)." IDS_CANTREADFILE "Cannot read file '%s'." + IDS_EXTRACTING "Extragere..."
IDS_WIZ_TITLE "Asistent de extracție" IDS_WIZ_DEST_TITLE "Selectați o Destinație" diff --git a/dll/shellext/zipfldr/lang/ru-RU.rc b/dll/shellext/zipfldr/lang/ru-RU.rc index 1791169c937..70fbe45b403 100644 --- a/dll/shellext/zipfldr/lang/ru-RU.rc +++ b/dll/shellext/zipfldr/lang/ru-RU.rc @@ -16,7 +16,7 @@ BEGIN EDITTEXT IDC_DIRECTORY,6,24,222,12,ES_AUTOHSCROLL PUSHBUTTON "Обзор...",IDC_BROWSE,174,42,54,14 PUSHBUTTON "Пароль",IDC_PASSWORD,174,66,54,14 - LTEXT "Извлечение...",IDC_STATIC,6,114,48,8 + LTEXT "Click 'Next' to extract",IDC_STATUSTEXT,6,114,100,8 CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,6,126,222,6 END
@@ -73,6 +73,7 @@ BEGIN IDS_NOFILES "The specified directory '%s' is empty, so Compressed (zipped) Folders cannot add it to the archive." IDS_CANTCREATEZIP "Failed to create a compressed folder '%s' (Error Code: %d)." IDS_CANTREADFILE "Cannot read file '%s'." + IDS_EXTRACTING "Извлечение..."
IDS_WIZ_TITLE "Мастер извлечения архивов" IDS_WIZ_DEST_TITLE "Укажите путь" diff --git a/dll/shellext/zipfldr/lang/sv-SE.rc b/dll/shellext/zipfldr/lang/sv-SE.rc index 886dddfe8bf..217cb66dbb9 100644 --- a/dll/shellext/zipfldr/lang/sv-SE.rc +++ b/dll/shellext/zipfldr/lang/sv-SE.rc @@ -16,7 +16,7 @@ BEGIN EDITTEXT IDC_DIRECTORY,6,24,222,12,ES_AUTOHSCROLL PUSHBUTTON "Bläddra...",IDC_BROWSE,174,42,54,14 PUSHBUTTON "Lösenord",IDC_PASSWORD,174,66,54,14 - LTEXT "Extraherar...",IDC_STATIC,6,114,42,8 + LTEXT "Click 'Next' to extract",IDC_STATUSTEXT,6,114,100,8 CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,6,126,222,6 END
@@ -73,6 +73,7 @@ BEGIN IDS_NOFILES "The specified directory '%s' is empty, so Compressed (zipped) Folders cannot add it to the archive." IDS_CANTCREATEZIP "Failed to create a compressed folder '%s' (Error Code: %d)." IDS_CANTREADFILE "Cannot read file '%s'." + IDS_EXTRACTING "Extraherar..."
IDS_WIZ_TITLE "Extraheringsguiden" IDS_WIZ_DEST_TITLE "Välj ett mål" diff --git a/dll/shellext/zipfldr/lang/zh-CN.rc b/dll/shellext/zipfldr/lang/zh-CN.rc index 6d69c012991..d4439bfa99f 100644 --- a/dll/shellext/zipfldr/lang/zh-CN.rc +++ b/dll/shellext/zipfldr/lang/zh-CN.rc @@ -16,7 +16,7 @@ BEGIN EDITTEXT IDC_DIRECTORY,6,24,222,12,ES_AUTOHSCROLL PUSHBUTTON "浏览...",IDC_BROWSE,174,42,54,14 PUSHBUTTON "密码",IDC_PASSWORD,174,66,54,14 - LTEXT "正在解压...",IDC_STATIC,6,114,42,8 + LTEXT "Click 'Next' to extract",IDC_STATUSTEXT,6,114,100,8 CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,6,126,222,6 END
@@ -73,6 +73,7 @@ BEGIN IDS_NOFILES "The specified directory '%s' is empty, so Compressed (zipped) Folders cannot add it to the archive." IDS_CANTCREATEZIP "Failed to create a compressed folder '%s' (Error Code: %d)." IDS_CANTREADFILE "Cannot read file '%s'." + IDS_EXTRACTING "正在解压..."
IDS_WIZ_TITLE "解压向导" IDS_WIZ_DEST_TITLE "选择一个目标文件夹" diff --git a/dll/shellext/zipfldr/resource.h b/dll/shellext/zipfldr/resource.h index b294e823b77..056c726e0f0 100644 --- a/dll/shellext/zipfldr/resource.h +++ b/dll/shellext/zipfldr/resource.h @@ -11,6 +11,7 @@ #define IDC_BROWSE 1002 #define IDC_PASSWORD 1003 #define IDC_PROGRESS 1004 +#define IDC_STATUSTEXT 1005
#define IDD_PROPPAGECOMPLETE 1100 #define IDC_DESTDIR 1101 @@ -40,6 +41,7 @@ #define IDS_NOFILES 111 #define IDS_CANTCREATEZIP 112 #define IDS_CANTREADFILE 113 +#define IDS_EXTRACTING 114
/* Wizard titles */ #define IDS_WIZ_TITLE 8000
-
Katayama Hirofumi MZ