https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5165179ad8c5c07c0c9a1…
commit 5165179ad8c5c07c0c9a1afa88048eba3651fbde
Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com>
AuthorDate: Sun Jan 16 16:34:59 2022 +0000
Commit: GitHub <noreply(a)github.com>
CommitDate: Sun Jan 16 17:34:59 2022 +0100
[NEWDEV] Disable NewFolder btn and Show browser title when selecting a directory
(#4288)
* [NEWDEV] Add browser title to rc files
* [NEWDEV] Show browser title when selecting a directory
* Update dll/win32/newdev/lang/pl-PL.rc
Co-authored-by: Adam Stachowicz <saibamenppl(a)gmail.com>
* Update dll/win32/newdev/lang/bg-BG.rc
Co-authored-by: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org>
* Update dll/win32/newdev/wizard.c
Co-authored-by: Stanislav Motylkov <x86corez(a)gmail.com>
* Update dll/win32/newdev/lang/pl-PL.rc
Co-authored-by: Adam Stachowicz <saibamenppl(a)gmail.com>
* Update dll/win32/newdev/lang/pt-PT.rc
Co-authored-by: Stanislav Motylkov <x86corez(a)gmail.com>
* Remove obvious comment
* Add de-DE and ru-RU translations
* Add French translation
Co-authored-by: Adam Stachowicz <saibamenppl(a)gmail.com>
Co-authored-by: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org>
Co-authored-by: Stanislav Motylkov <x86corez(a)gmail.com>
---
dll/win32/newdev/lang/bg-BG.rc | 1 +
dll/win32/newdev/lang/cs-CZ.rc | 1 +
dll/win32/newdev/lang/de-DE.rc | 1 +
dll/win32/newdev/lang/el-GR.rc | 1 +
dll/win32/newdev/lang/en-US.rc | 1 +
dll/win32/newdev/lang/es-ES.rc | 1 +
dll/win32/newdev/lang/fr-FR.rc | 1 +
dll/win32/newdev/lang/he-IL.rc | 1 +
dll/win32/newdev/lang/hu-HU.rc | 1 +
dll/win32/newdev/lang/id-ID.rc | 1 +
dll/win32/newdev/lang/it-IT.rc | 1 +
dll/win32/newdev/lang/ja-JP.rc | 1 +
dll/win32/newdev/lang/nl-NL.rc | 1 +
dll/win32/newdev/lang/no-NO.rc | 1 +
dll/win32/newdev/lang/pl-PL.rc | 1 +
dll/win32/newdev/lang/pt-PT.rc | 1 +
dll/win32/newdev/lang/ro-RO.rc | 1 +
dll/win32/newdev/lang/ru-RU.rc | 1 +
dll/win32/newdev/lang/sk-SK.rc | 1 +
dll/win32/newdev/lang/sq-AL.rc | 1 +
dll/win32/newdev/lang/th-TH.rc | 1 +
dll/win32/newdev/lang/tr-TR.rc | 1 +
dll/win32/newdev/lang/uk-UA.rc | 1 +
dll/win32/newdev/lang/zh-CN.rc | 1 +
dll/win32/newdev/lang/zh-TW.rc | 1 +
dll/win32/newdev/resource.h | 1 +
dll/win32/newdev/wizard.c | 5 ++++-
27 files changed, 30 insertions(+), 1 deletion(-)
diff --git a/dll/win32/newdev/lang/bg-BG.rc b/dll/win32/newdev/lang/bg-BG.rc
index bb09ef8321d..b1a1e6dee5a 100644
--- a/dll/win32/newdev/lang/bg-BG.rc
+++ b/dll/win32/newdev/lang/bg-BG.rc
@@ -93,4 +93,5 @@ BEGIN
IDS_CHSOURCE_TITLE "Choose search and install options"
IDS_SEARCHDRV_TITLE "Searching..."
IDS_INSTALLDRV_TITLE "Installing..."
+ IDS_BROWSE_FOR_FOLDER_TITLE "Select the folder containing proper drivers for
this hardware."
END
diff --git a/dll/win32/newdev/lang/cs-CZ.rc b/dll/win32/newdev/lang/cs-CZ.rc
index a2b757f221a..7b41c2dd6cf 100644
--- a/dll/win32/newdev/lang/cs-CZ.rc
+++ b/dll/win32/newdev/lang/cs-CZ.rc
@@ -98,4 +98,5 @@ BEGIN
IDS_CHSOURCE_TITLE "Zvolte možnosti vyhledávání a instalace"
IDS_SEARCHDRV_TITLE "Hledání..."
IDS_INSTALLDRV_TITLE "Instalace..."
+ IDS_BROWSE_FOR_FOLDER_TITLE "Select the folder containing proper drivers for
this hardware."
END
diff --git a/dll/win32/newdev/lang/de-DE.rc b/dll/win32/newdev/lang/de-DE.rc
index aba3e533372..2ea8df0e84e 100644
--- a/dll/win32/newdev/lang/de-DE.rc
+++ b/dll/win32/newdev/lang/de-DE.rc
@@ -93,4 +93,5 @@ BEGIN
IDS_CHSOURCE_TITLE "Wählen Sie Such- und Installationsoptionen"
IDS_SEARCHDRV_TITLE "Suche..."
IDS_INSTALLDRV_TITLE "Installiere..."
+ IDS_BROWSE_FOR_FOLDER_TITLE "Wählen Sie den Ordner aus, der den korrekten
Treiber für dieses Gerät enthält."
END
diff --git a/dll/win32/newdev/lang/el-GR.rc b/dll/win32/newdev/lang/el-GR.rc
index a2669f84dd8..8dbdf5bf637 100644
--- a/dll/win32/newdev/lang/el-GR.rc
+++ b/dll/win32/newdev/lang/el-GR.rc
@@ -93,4 +93,5 @@ BEGIN
IDS_CHSOURCE_TITLE "Choose search and install options"
IDS_SEARCHDRV_TITLE "Searching..."
IDS_INSTALLDRV_TITLE "Installing..."
+ IDS_BROWSE_FOR_FOLDER_TITLE "Select the folder containing proper drivers for
this hardware."
END
diff --git a/dll/win32/newdev/lang/en-US.rc b/dll/win32/newdev/lang/en-US.rc
index 64e3ec466a1..2641f498ac3 100644
--- a/dll/win32/newdev/lang/en-US.rc
+++ b/dll/win32/newdev/lang/en-US.rc
@@ -93,4 +93,5 @@ BEGIN
IDS_CHSOURCE_TITLE "Choose search and install options"
IDS_SEARCHDRV_TITLE "Searching..."
IDS_INSTALLDRV_TITLE "Installing..."
+ IDS_BROWSE_FOR_FOLDER_TITLE "Select the folder containing proper drivers for
this hardware."
END
diff --git a/dll/win32/newdev/lang/es-ES.rc b/dll/win32/newdev/lang/es-ES.rc
index 5981412dcf5..fe529e15607 100644
--- a/dll/win32/newdev/lang/es-ES.rc
+++ b/dll/win32/newdev/lang/es-ES.rc
@@ -98,4 +98,5 @@ BEGIN
IDS_CHSOURCE_TITLE "Elija las opciones de buscar e instalar"
IDS_SEARCHDRV_TITLE "Buscando..."
IDS_INSTALLDRV_TITLE "Instalando..."
+ IDS_BROWSE_FOR_FOLDER_TITLE "Select the folder containing proper drivers for
this hardware."
END
diff --git a/dll/win32/newdev/lang/fr-FR.rc b/dll/win32/newdev/lang/fr-FR.rc
index e38edee1fce..6f01db54b8d 100644
--- a/dll/win32/newdev/lang/fr-FR.rc
+++ b/dll/win32/newdev/lang/fr-FR.rc
@@ -93,4 +93,5 @@ BEGIN
IDS_CHSOURCE_TITLE "Options de recherche et d'installation"
IDS_SEARCHDRV_TITLE "Recherche..."
IDS_INSTALLDRV_TITLE "Installation..."
+ IDS_BROWSE_FOR_FOLDER_TITLE "Veuillez sélectionner le dossier contenant les
pilotes correspondant à ce matériel."
END
diff --git a/dll/win32/newdev/lang/he-IL.rc b/dll/win32/newdev/lang/he-IL.rc
index 078f82db4a2..3abcb514305 100644
--- a/dll/win32/newdev/lang/he-IL.rc
+++ b/dll/win32/newdev/lang/he-IL.rc
@@ -93,4 +93,5 @@ BEGIN
IDS_CHSOURCE_TITLE "בחר בין האפשרויות של חיפוש והתקנה"
IDS_SEARCHDRV_TITLE "מחפש..."
IDS_INSTALLDRV_TITLE "מתקין..."
+ IDS_BROWSE_FOR_FOLDER_TITLE "Select the folder containing proper drivers for
this hardware."
END
diff --git a/dll/win32/newdev/lang/hu-HU.rc b/dll/win32/newdev/lang/hu-HU.rc
index 7731a6790e4..3322fba87dd 100644
--- a/dll/win32/newdev/lang/hu-HU.rc
+++ b/dll/win32/newdev/lang/hu-HU.rc
@@ -98,4 +98,5 @@ BEGIN
IDS_CHSOURCE_TITLE "Keresési és telepítési beállítások kiválasztása"
IDS_SEARCHDRV_TITLE "Keresés..."
IDS_INSTALLDRV_TITLE "Telepítés..."
+ IDS_BROWSE_FOR_FOLDER_TITLE "Select the folder containing proper drivers for
this hardware."
END
diff --git a/dll/win32/newdev/lang/id-ID.rc b/dll/win32/newdev/lang/id-ID.rc
index 7a1da2465ca..1214456ef7d 100644
--- a/dll/win32/newdev/lang/id-ID.rc
+++ b/dll/win32/newdev/lang/id-ID.rc
@@ -93,4 +93,5 @@ BEGIN
IDS_CHSOURCE_TITLE "Pilih cari dan pilihan pemasangan"
IDS_SEARCHDRV_TITLE "Mencari..."
IDS_INSTALLDRV_TITLE "Memasang..."
+ IDS_BROWSE_FOR_FOLDER_TITLE "Select the folder containing proper drivers for
this hardware."
END
diff --git a/dll/win32/newdev/lang/it-IT.rc b/dll/win32/newdev/lang/it-IT.rc
index d7bc5854340..9d1581d0076 100644
--- a/dll/win32/newdev/lang/it-IT.rc
+++ b/dll/win32/newdev/lang/it-IT.rc
@@ -95,4 +95,5 @@ BEGIN
IDS_CHSOURCE_TITLE "Opzioni Scegli, cerca e installa"
IDS_SEARCHDRV_TITLE "Cercando....."
IDS_INSTALLDRV_TITLE "Installando..."
+ IDS_BROWSE_FOR_FOLDER_TITLE "Select the folder containing proper drivers for
this hardware."
END
diff --git a/dll/win32/newdev/lang/ja-JP.rc b/dll/win32/newdev/lang/ja-JP.rc
index 5557f7a7ec1..c165295844d 100644
--- a/dll/win32/newdev/lang/ja-JP.rc
+++ b/dll/win32/newdev/lang/ja-JP.rc
@@ -93,4 +93,5 @@ BEGIN
IDS_CHSOURCE_TITLE "Choose search and install options"
IDS_SEARCHDRV_TITLE "Searching..."
IDS_INSTALLDRV_TITLE "Installing..."
+ IDS_BROWSE_FOR_FOLDER_TITLE "Select the folder containing proper drivers for
this hardware."
END
diff --git a/dll/win32/newdev/lang/nl-NL.rc b/dll/win32/newdev/lang/nl-NL.rc
index 52734aa8e41..98558858f5d 100644
--- a/dll/win32/newdev/lang/nl-NL.rc
+++ b/dll/win32/newdev/lang/nl-NL.rc
@@ -100,4 +100,5 @@ BEGIN
IDS_CHSOURCE_TITLE "Choose search and install options"
IDS_SEARCHDRV_TITLE "Searching..."
IDS_INSTALLDRV_TITLE "Installing..."
+ IDS_BROWSE_FOR_FOLDER_TITLE "Select the folder containing proper drivers for
this hardware."
END
diff --git a/dll/win32/newdev/lang/no-NO.rc b/dll/win32/newdev/lang/no-NO.rc
index 14de601019f..4d402e56154 100644
--- a/dll/win32/newdev/lang/no-NO.rc
+++ b/dll/win32/newdev/lang/no-NO.rc
@@ -95,4 +95,5 @@ BEGIN
IDS_CHSOURCE_TITLE "Choose search and install options"
IDS_SEARCHDRV_TITLE "Searching..."
IDS_INSTALLDRV_TITLE "Installing..."
+ IDS_BROWSE_FOR_FOLDER_TITLE "Select the folder containing proper drivers for
this hardware."
END
diff --git a/dll/win32/newdev/lang/pl-PL.rc b/dll/win32/newdev/lang/pl-PL.rc
index 55b9ebb0514..d205da4f3b7 100644
--- a/dll/win32/newdev/lang/pl-PL.rc
+++ b/dll/win32/newdev/lang/pl-PL.rc
@@ -101,4 +101,5 @@ BEGIN
IDS_CHSOURCE_TITLE "Wybierz opcje wyszukiwania i instalacji"
IDS_SEARCHDRV_TITLE "Szukanie..."
IDS_INSTALLDRV_TITLE "Instalowanie..."
+ IDS_BROWSE_FOR_FOLDER_TITLE "Wybierz folder zawierający odpowiednie sterowniki
dla tego sprzętu."
END
diff --git a/dll/win32/newdev/lang/pt-PT.rc b/dll/win32/newdev/lang/pt-PT.rc
index 82c0c2104c3..c2671174126 100644
--- a/dll/win32/newdev/lang/pt-PT.rc
+++ b/dll/win32/newdev/lang/pt-PT.rc
@@ -98,4 +98,5 @@ BEGIN
IDS_CHSOURCE_TITLE "Escolha as opções de pesquisa e instalação"
IDS_SEARCHDRV_TITLE "A procurar..."
IDS_INSTALLDRV_TITLE "A instalar..."
+ IDS_BROWSE_FOR_FOLDER_TITLE "Seleccione a pasta que contém controladores
adequados para este hardware."
END
diff --git a/dll/win32/newdev/lang/ro-RO.rc b/dll/win32/newdev/lang/ro-RO.rc
index d9a612d2ec8..adee0696203 100644
--- a/dll/win32/newdev/lang/ro-RO.rc
+++ b/dll/win32/newdev/lang/ro-RO.rc
@@ -102,4 +102,5 @@ BEGIN
IDS_CHSOURCE_TITLE "Alegere opțiuni de căutare și instalare"
IDS_SEARCHDRV_TITLE "Căutare…"
IDS_INSTALLDRV_TITLE "Instalare…"
+ IDS_BROWSE_FOR_FOLDER_TITLE "Select the folder containing proper drivers for
this hardware."
END
diff --git a/dll/win32/newdev/lang/ru-RU.rc b/dll/win32/newdev/lang/ru-RU.rc
index 7ed91c3e63e..cab9096a7a5 100644
--- a/dll/win32/newdev/lang/ru-RU.rc
+++ b/dll/win32/newdev/lang/ru-RU.rc
@@ -93,4 +93,5 @@ BEGIN
IDS_CHSOURCE_TITLE "Выберите настройки поиска и установки"
IDS_SEARCHDRV_TITLE "Поиск..."
IDS_INSTALLDRV_TITLE "Установка..."
+ IDS_BROWSE_FOR_FOLDER_TITLE "Выберите папку, содержащую подходящие драйверы для
этого оборудования."
END
diff --git a/dll/win32/newdev/lang/sk-SK.rc b/dll/win32/newdev/lang/sk-SK.rc
index d7b68583074..d6577f7c97a 100644
--- a/dll/win32/newdev/lang/sk-SK.rc
+++ b/dll/win32/newdev/lang/sk-SK.rc
@@ -98,4 +98,5 @@ BEGIN
IDS_CHSOURCE_TITLE "Choose search and install options"
IDS_SEARCHDRV_TITLE "Searching..."
IDS_INSTALLDRV_TITLE "Installing..."
+ IDS_BROWSE_FOR_FOLDER_TITLE "Select the folder containing proper drivers for
this hardware."
END
diff --git a/dll/win32/newdev/lang/sq-AL.rc b/dll/win32/newdev/lang/sq-AL.rc
index 6a07be29be2..d34b841348f 100644
--- a/dll/win32/newdev/lang/sq-AL.rc
+++ b/dll/win32/newdev/lang/sq-AL.rc
@@ -97,4 +97,5 @@ BEGIN
IDS_CHSOURCE_TITLE "Choose search and install options"
IDS_SEARCHDRV_TITLE "Searching..."
IDS_INSTALLDRV_TITLE "Installing..."
+ IDS_BROWSE_FOR_FOLDER_TITLE "Select the folder containing proper drivers for
this hardware."
END
diff --git a/dll/win32/newdev/lang/th-TH.rc b/dll/win32/newdev/lang/th-TH.rc
index 30deb12b9c3..7e17d292f63 100644
--- a/dll/win32/newdev/lang/th-TH.rc
+++ b/dll/win32/newdev/lang/th-TH.rc
@@ -95,4 +95,5 @@ BEGIN
IDS_CHSOURCE_TITLE "Choose search and install options"
IDS_SEARCHDRV_TITLE "Searching..."
IDS_INSTALLDRV_TITLE "Installing..."
+ IDS_BROWSE_FOR_FOLDER_TITLE "Select the folder containing proper drivers for
this hardware."
END
diff --git a/dll/win32/newdev/lang/tr-TR.rc b/dll/win32/newdev/lang/tr-TR.rc
index fc4746be80a..58f3ad46db1 100644
--- a/dll/win32/newdev/lang/tr-TR.rc
+++ b/dll/win32/newdev/lang/tr-TR.rc
@@ -95,4 +95,5 @@ BEGIN
IDS_CHSOURCE_TITLE "Sürücü Arama ve Kurma Seçeneklerini Seç"
IDS_SEARCHDRV_TITLE "Arıyor..."
IDS_INSTALLDRV_TITLE "Kuruyor..."
+ IDS_BROWSE_FOR_FOLDER_TITLE "Select the folder containing proper drivers for
this hardware."
END
diff --git a/dll/win32/newdev/lang/uk-UA.rc b/dll/win32/newdev/lang/uk-UA.rc
index 346e09a5b07..5c226d729a4 100644
--- a/dll/win32/newdev/lang/uk-UA.rc
+++ b/dll/win32/newdev/lang/uk-UA.rc
@@ -101,4 +101,5 @@ BEGIN
IDS_CHSOURCE_TITLE "Виберіть налаштування пошуку"
IDS_SEARCHDRV_TITLE "Пошук драйверів..."
IDS_INSTALLDRV_TITLE "Встановлення драйверу..."
+ IDS_BROWSE_FOR_FOLDER_TITLE "Select the folder containing proper drivers for
this hardware."
END
diff --git a/dll/win32/newdev/lang/zh-CN.rc b/dll/win32/newdev/lang/zh-CN.rc
index 0332e095c32..71252a6faf1 100644
--- a/dll/win32/newdev/lang/zh-CN.rc
+++ b/dll/win32/newdev/lang/zh-CN.rc
@@ -96,4 +96,5 @@ BEGIN
IDS_CHSOURCE_TITLE "选择搜索和安装选项"
IDS_SEARCHDRV_TITLE "正在搜索..."
IDS_INSTALLDRV_TITLE "正在安装..."
+ IDS_BROWSE_FOR_FOLDER_TITLE "Select the folder containing proper drivers for
this hardware."
END
diff --git a/dll/win32/newdev/lang/zh-TW.rc b/dll/win32/newdev/lang/zh-TW.rc
index 219bbb8cf29..ea171ed8128 100644
--- a/dll/win32/newdev/lang/zh-TW.rc
+++ b/dll/win32/newdev/lang/zh-TW.rc
@@ -101,4 +101,5 @@ BEGIN
IDS_CHSOURCE_TITLE "選擇搜尋和安裝選項"
IDS_SEARCHDRV_TITLE "正在搜尋..."
IDS_INSTALLDRV_TITLE "正在安裝..."
+ IDS_BROWSE_FOR_FOLDER_TITLE "Select the folder containing proper drivers for
this hardware."
END
diff --git a/dll/win32/newdev/resource.h b/dll/win32/newdev/resource.h
index 119ee82713c..9555d8e75b0 100644
--- a/dll/win32/newdev/resource.h
+++ b/dll/win32/newdev/resource.h
@@ -34,3 +34,4 @@
#define IDS_CHSOURCE_TITLE 1002
#define IDS_SEARCHDRV_TITLE 1003
#define IDS_INSTALLDRV_TITLE 1004
+#define IDS_BROWSE_FOR_FOLDER_TITLE 1005
diff --git a/dll/win32/newdev/wizard.c b/dll/win32/newdev/wizard.c
index 9f65e1bef47..533624607bb 100644
--- a/dll/win32/newdev/wizard.c
+++ b/dll/win32/newdev/wizard.c
@@ -641,9 +641,12 @@ CHSourceDlgProc(
{
BROWSEINFO bi = { 0 };
LPITEMIDLIST pidl;
+ WCHAR Title[MAX_PATH];
+ LoadStringW(hDllInstance, IDS_BROWSE_FOR_FOLDER_TITLE, Title,
_countof(Title));
bi.hwndOwner = hwndDlg;
- bi.ulFlags = BIF_USENEWUI | BIF_RETURNONLYFSDIRS;
+ bi.ulFlags = BIF_USENEWUI | BIF_RETURNONLYFSDIRS | BIF_STATUSTEXT |
BIF_NONEWFOLDERBUTTON;
+ bi.lpszTitle = Title;
pidl = SHBrowseForFolder(&bi);
if (pidl)
{