From 4d097cf8b4b273daccb164d5f0ba3631b489963d Mon Sep 17 00:00:00 2001 From: Brock Mammen Date: Sun, 14 Jul 2019 21:45:27 -0500 Subject: [PATCH] [EXPLORER] Open search from start menu --- base/shell/explorer/lang/bg-BG.rc | 5 +---- base/shell/explorer/lang/cs-CZ.rc | 5 +---- base/shell/explorer/lang/de-DE.rc | 5 +---- base/shell/explorer/lang/en-US.rc | 5 +---- base/shell/explorer/lang/es-ES.rc | 5 +---- base/shell/explorer/lang/et-EE.rc | 5 +---- base/shell/explorer/lang/fi-FI.rc | 5 +---- base/shell/explorer/lang/fr-FR.rc | 5 +---- base/shell/explorer/lang/he-IL.rc | 5 +---- base/shell/explorer/lang/hi-IN.rc | 5 +---- base/shell/explorer/lang/id-ID.rc | 5 +---- base/shell/explorer/lang/it-IT.rc | 5 +---- base/shell/explorer/lang/ja-JP.rc | 5 +---- base/shell/explorer/lang/ko-KR.rc | 5 +---- base/shell/explorer/lang/lt-LT.rc | 5 +---- base/shell/explorer/lang/ms-MY.rc | 5 +---- base/shell/explorer/lang/nl-NL.rc | 5 +---- base/shell/explorer/lang/no-NO.rc | 5 +---- base/shell/explorer/lang/pl-PL.rc | 5 +---- base/shell/explorer/lang/pt-BR.rc | 5 +---- base/shell/explorer/lang/pt-PT.rc | 5 +---- base/shell/explorer/lang/ro-RO.rc | 5 +---- base/shell/explorer/lang/ru-RU.rc | 5 +---- base/shell/explorer/lang/sk-SK.rc | 5 +---- base/shell/explorer/lang/sq-AL.rc | 5 +---- base/shell/explorer/lang/tr-TR.rc | 5 +---- base/shell/explorer/lang/uk-UA.rc | 5 +---- base/shell/explorer/lang/zh-CN.rc | 5 +---- base/shell/explorer/lang/zh-TW.rc | 5 +---- base/shell/explorer/startmnusite.cpp | 13 ++++++------- base/shell/explorer/traywnd.cpp | 1 + 31 files changed, 36 insertions(+), 123 deletions(-) diff --git a/base/shell/explorer/lang/bg-BG.rc b/base/shell/explorer/lang/bg-BG.rc index 50c32be9515..abed935e457 100644 --- a/base/shell/explorer/lang/bg-BG.rc +++ b/base/shell/explorer/lang/bg-BG.rc @@ -47,10 +47,7 @@ BEGIN MENUITEM "&Печатачи и факсове", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED MENUITEM "&Задачна лента и изборник „Пуск“", IDM_TASKBARANDSTARTMENU, MFT_STRING, MFS_ENABLED END - POPUP "&Търсене", IDM_SEARCH - BEGIN - MENUITEM "", -1, MFT_SEPARATOR - END + MENUITEM "&Търсене", IDM_SEARCH, MFT_STRING, MFS_ENABLED MENUITEM "&Помощ и поддръжка", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED MENUITEM "&Изпълнение...", IDM_RUN, MFT_STRING, MFS_ENABLED MENUITEM "", 450, MFT_SEPARATOR, MFS_ENABLED diff --git a/base/shell/explorer/lang/cs-CZ.rc b/base/shell/explorer/lang/cs-CZ.rc index e94f531fe61..a8d92e8e402 100644 --- a/base/shell/explorer/lang/cs-CZ.rc +++ b/base/shell/explorer/lang/cs-CZ.rc @@ -53,10 +53,7 @@ BEGIN MENUITEM "&Tiskárny a faxy", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED MENUITEM "&Hlavní panel a nabídka Start", IDM_TASKBARANDSTARTMENU, MFT_STRING, MFS_ENABLED END - POPUP "&Hledat", IDM_SEARCH - BEGIN - MENUITEM "", -1, MFT_SEPARATOR - END + MENUITEM "&Hledat", IDM_SEARCH, MFT_STRING, MFS_ENABLED MENUITEM "Nápověd&a a odborná pomoc", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED MENUITEM "&Spustit...", IDM_RUN, MFT_STRING, MFS_ENABLED MENUITEM "", 450, MFT_SEPARATOR, MFS_ENABLED diff --git a/base/shell/explorer/lang/de-DE.rc b/base/shell/explorer/lang/de-DE.rc index f87873a930f..e24726f74d7 100644 --- a/base/shell/explorer/lang/de-DE.rc +++ b/base/shell/explorer/lang/de-DE.rc @@ -47,10 +47,7 @@ BEGIN MENUITEM "&Drucker und Faxgeräte", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED MENUITEM "&Taskleiste und Startmenü", IDM_TASKBARANDSTARTMENU, MFT_STRING, MFS_ENABLED END - POPUP "&Suche", IDM_SEARCH - BEGIN - MENUITEM "", -1, MFT_SEPARATOR - END + MENUITEM "&Suche", IDM_SEARCH, MFT_STRING, MFS_ENABLED MENUITEM "&Hilfe und Support", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED MENUITEM "A&usführen...", IDM_RUN, MFT_STRING, MFS_ENABLED MENUITEM "", 450, MFT_SEPARATOR, MFS_ENABLED diff --git a/base/shell/explorer/lang/en-US.rc b/base/shell/explorer/lang/en-US.rc index d9a420e334e..5351e6c69f9 100644 --- a/base/shell/explorer/lang/en-US.rc +++ b/base/shell/explorer/lang/en-US.rc @@ -47,10 +47,7 @@ BEGIN MENUITEM "&Printers and Faxes", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED MENUITEM "&Taskbar and Start Menu", IDM_TASKBARANDSTARTMENU, MFT_STRING, MFS_ENABLED END - POPUP "Sear&ch", IDM_SEARCH - BEGIN - MENUITEM "", -1, MFT_SEPARATOR - END + MENUITEM "Sear&ch", IDM_SEARCH, MFT_STRING, MFS_ENABLED MENUITEM "&Help and Support", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED MENUITEM "&Run...", IDM_RUN, MFT_STRING, MFS_ENABLED MENUITEM "", 450, MFT_SEPARATOR, MFS_ENABLED diff --git a/base/shell/explorer/lang/es-ES.rc b/base/shell/explorer/lang/es-ES.rc index eb13428beb0..64ad3a2377b 100644 --- a/base/shell/explorer/lang/es-ES.rc +++ b/base/shell/explorer/lang/es-ES.rc @@ -58,10 +58,7 @@ BEGIN MENUITEM "&Impresoras y faxes", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED MENUITEM "&Barra de tareas y menú Inicio", IDM_TASKBARANDSTARTMENU, MFT_STRING, MFS_ENABLED END - POPUP "&Buscar", IDM_SEARCH - BEGIN - MENUITEM "", -1, MFT_SEPARATOR - END + MENUITEM "&Buscar", IDM_SEARCH, MFT_STRING, MFS_ENABLED MENUITEM "&Ayuda y soporte técnico", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED MENUITEM "&Ejecutar...", IDM_RUN, MFT_STRING, MFS_ENABLED MENUITEM "", 450, MFT_SEPARATOR, MFS_ENABLED diff --git a/base/shell/explorer/lang/et-EE.rc b/base/shell/explorer/lang/et-EE.rc index 43ef2fda632..c854df5d232 100644 --- a/base/shell/explorer/lang/et-EE.rc +++ b/base/shell/explorer/lang/et-EE.rc @@ -54,10 +54,7 @@ BEGIN MENUITEM "&Printerid ja Faks", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED MENUITEM "&Tegumiriba ja Menüü Start", IDM_TASKBARANDSTARTMENU, MFT_STRING, MFS_ENABLED END - POPUP "&Otsi", IDM_SEARCH - BEGIN - MENUITEM "", -1, MFT_SEPARATOR - END + MENUITEM "&Otsi", IDM_SEARCH, MFT_STRING, MFS_ENABLED MENUITEM "&Abi ja Tugi", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED MENUITEM "&Käivita...", IDM_RUN, MFT_STRING, MFS_ENABLED MENUITEM "", 450, MFT_SEPARATOR, MFS_ENABLED diff --git a/base/shell/explorer/lang/fi-FI.rc b/base/shell/explorer/lang/fi-FI.rc index 179106f1222..bf33bd5f463 100644 --- a/base/shell/explorer/lang/fi-FI.rc +++ b/base/shell/explorer/lang/fi-FI.rc @@ -47,10 +47,7 @@ BEGIN MENUITEM "&Tulostimet ja faksit", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED MENUITEM "Tehtäväpalkki ja &Käynnistä Valikko", IDM_TASKBARANDSTARTMENU, MFT_STRING, MFS_ENABLED END - POPUP "&Etsi", IDM_SEARCH - BEGIN - MENUITEM "", -1, MFT_SEPARATOR - END + MENUITEM "&Etsi", IDM_SEARCH, MFT_STRING, MFS_ENABLED MENUITEM "O&hjeet ja tuki", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED MENUITEM "&Suorita...", IDM_RUN, MFT_STRING, MFS_ENABLED MENUITEM "", 450, MFT_SEPARATOR, MFS_ENABLED diff --git a/base/shell/explorer/lang/fr-FR.rc b/base/shell/explorer/lang/fr-FR.rc index 0d99b22d71e..d7b9b0b1dd5 100644 --- a/base/shell/explorer/lang/fr-FR.rc +++ b/base/shell/explorer/lang/fr-FR.rc @@ -47,10 +47,7 @@ BEGIN MENUITEM "Im&primantes et fax", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED MENUITEM "Barre des &tâches et Menu Démarrer", IDM_TASKBARANDSTARTMENU, MFT_STRING, MFS_ENABLED END - POPUP "&Rechercher", IDM_SEARCH - BEGIN - MENUITEM "", -1, MFT_SEPARATOR - END + MENUITEM "&Rechercher", IDM_SEARCH, MFT_STRING, MFS_ENABLED MENUITEM "&Aide et support", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED MENUITEM "E&xécuter...", IDM_RUN, MFT_STRING, MFS_ENABLED MENUITEM "", 450, MFT_SEPARATOR, MFS_ENABLED diff --git a/base/shell/explorer/lang/he-IL.rc b/base/shell/explorer/lang/he-IL.rc index 2fafd91a418..dbe1a5d6c27 100644 --- a/base/shell/explorer/lang/he-IL.rc +++ b/base/shell/explorer/lang/he-IL.rc @@ -47,10 +47,7 @@ BEGIN MENUITEM "מדפסות ופקסים", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED MENUITEM "שורת המשימות ותפריט התחל", IDM_TASKBARANDSTARTMENU, MFT_STRING, MFS_ENABLED END - POPUP "חיפוש", IDM_SEARCH - BEGIN - MENUITEM "", -1, MFT_SEPARATOR - END + MENUITEM "חיפוש", IDM_SEARCH, MFT_STRING, MFS_ENABLED MENUITEM "עזרה ותמיכה", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED MENUITEM "הפעל...", IDM_RUN, MFT_STRING, MFS_ENABLED MENUITEM "", 450, MFT_SEPARATOR, MFS_ENABLED diff --git a/base/shell/explorer/lang/hi-IN.rc b/base/shell/explorer/lang/hi-IN.rc index 35926eee545..0ac54795ceb 100644 --- a/base/shell/explorer/lang/hi-IN.rc +++ b/base/shell/explorer/lang/hi-IN.rc @@ -47,10 +47,7 @@ BEGIN MENUITEM "&प्रिंटर और फैक्स", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED MENUITEM "&टास्कबार और प्रारंभ मेन्यू", IDM_TASKBARANDSTARTMENU, MFT_STRING, MFS_ENABLED END - POPUP "&ढूंढे", IDM_SEARCH - BEGIN - MENUITEM "", -1, MFT_SEPARATOR - END + MENUITEM "&ढूंढे", IDM_SEARCH, MFT_STRING, MFS_ENABLED MENUITEM "&सहायता और समर्थन", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED MENUITEM "&रन...", IDM_RUN, MFT_STRING, MFS_ENABLED MENUITEM "", 450, MFT_SEPARATOR, MFS_ENABLED diff --git a/base/shell/explorer/lang/id-ID.rc b/base/shell/explorer/lang/id-ID.rc index 7d59082ee8c..9490d800870 100644 --- a/base/shell/explorer/lang/id-ID.rc +++ b/base/shell/explorer/lang/id-ID.rc @@ -47,10 +47,7 @@ BEGIN MENUITEM "&Printer dan Faks", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED MENUITEM "&Bilah Tugas dan Menu Mulai", IDM_TASKBARANDSTARTMENU, MFT_STRING, MFS_ENABLED END - POPUP "&Cari", IDM_SEARCH - BEGIN - MENUITEM "", -1, MFT_SEPARATOR - END + MENUITEM "&Cari", IDM_SEARCH, MFT_STRING, MFS_ENABLED MENUITEM "&Bantuan dan Dukungan", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED MENUITEM "&Jalankan...", IDM_RUN, MFT_STRING, MFS_ENABLED MENUITEM "", 450, MFT_SEPARATOR, MFS_ENABLED diff --git a/base/shell/explorer/lang/it-IT.rc b/base/shell/explorer/lang/it-IT.rc index c8e5e594f7c..f58f97c5401 100644 --- a/base/shell/explorer/lang/it-IT.rc +++ b/base/shell/explorer/lang/it-IT.rc @@ -47,10 +47,7 @@ BEGIN MENUITEM "&Fax e stampanti", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED MENUITEM "&Barra dei task e menu avvio", IDM_TASKBARANDSTARTMENU, MFT_STRING, MFS_ENABLED END - POPUP "Cerca", IDM_SEARCH - BEGIN - MENUITEM "", -1, MFT_SEPARATOR - END + MENUITEM "Cerca", IDM_SEARCH, MFT_STRING, MFS_ENABLED MENUITEM "&Aiuto e supporto", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED MENUITEM "&Esegui...", IDM_RUN, MFT_STRING, MFS_ENABLED MENUITEM "", 450, MFT_SEPARATOR, MFS_ENABLED diff --git a/base/shell/explorer/lang/ja-JP.rc b/base/shell/explorer/lang/ja-JP.rc index 6dfef99ae89..5ff1420b7ac 100644 --- a/base/shell/explorer/lang/ja-JP.rc +++ b/base/shell/explorer/lang/ja-JP.rc @@ -47,10 +47,7 @@ BEGIN MENUITEM "プリンタとFAX(&P)", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED MENUITEM "タスク バーと[スタート] メニュー(&)", IDM_TASKBARANDSTARTMENU, MFT_STRING, MFS_ENABLED END - POPUP "検索(&C)", IDM_SEARCH - BEGIN - MENUITEM "", -1, MFT_SEPARATOR - END + MENUITEM "検索(&C)", IDM_SEARCH, MFT_STRING, MFS_ENABLED MENUITEM "ヘルプとサポート(&H)", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED MENUITEM "ファイル名を指定して実行(&R)", IDM_RUN, MFT_STRING, MFS_ENABLED MENUITEM "", 450, MFT_SEPARATOR, MFS_ENABLED diff --git a/base/shell/explorer/lang/ko-KR.rc b/base/shell/explorer/lang/ko-KR.rc index fd0bada22c7..e28bca70496 100644 --- a/base/shell/explorer/lang/ko-KR.rc +++ b/base/shell/explorer/lang/ko-KR.rc @@ -49,10 +49,7 @@ BEGIN MENUITEM "프린터와 팩스(&P)", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED MENUITEM "작업 표시줄과 시작 메뉴(&T)", IDM_TASKBARANDSTARTMENU, MFT_STRING, MFS_ENABLED END - POPUP "검색(&C)", IDM_SEARCH - BEGIN - MENUITEM "", -1, MFT_SEPARATOR - END + MENUITEM "검색(&C)", IDM_SEARCH, MFT_STRING, MFS_ENABLED MENUITEM "도움말(&H)", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED MENUITEM "실행(&R)...", IDM_RUN, MFT_STRING, MFS_ENABLED MENUITEM "", 450, MFT_SEPARATOR, MFS_ENABLED diff --git a/base/shell/explorer/lang/lt-LT.rc b/base/shell/explorer/lang/lt-LT.rc index 3632a7b685a..0f2681b1505 100644 --- a/base/shell/explorer/lang/lt-LT.rc +++ b/base/shell/explorer/lang/lt-LT.rc @@ -49,10 +49,7 @@ BEGIN MENUITEM "Spausdintuvai ir &faxai", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED MENUITEM "&Užduočių juosta ir pradžios meniu", IDM_TASKBARANDSTARTMENU, MFT_STRING, MFS_ENABLED END - POPUP "Paieš&ka", IDM_SEARCH - BEGIN - MENUITEM "", -1, MFT_SEPARATOR - END + MENUITEM "Paieš&ka", IDM_SEARCH, MFT_STRING, MFS_ENABLED MENUITEM "Pa&galba ir palaikymas", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED MENUITEM "&Vykdyti...", IDM_RUN, MFT_STRING, MFS_ENABLED MENUITEM "", 450, MFT_SEPARATOR, MFS_ENABLED diff --git a/base/shell/explorer/lang/ms-MY.rc b/base/shell/explorer/lang/ms-MY.rc index b21f90d15be..c90d84bade1 100644 --- a/base/shell/explorer/lang/ms-MY.rc +++ b/base/shell/explorer/lang/ms-MY.rc @@ -49,10 +49,7 @@ BEGIN MENUITEM "&Pencetak and Faks", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED MENUITEM "Bar &Tugas dan Menu Mula", IDM_TASKBARANDSTARTMENU, MFT_STRING, MFS_ENABLED END - POPUP "&Cari", IDM_SEARCH - BEGIN - MENUITEM "", -1, MFT_SEPARATOR - END + MENUITEM "&Cari", IDM_SEARCH, MFT_STRING, MFS_ENABLED MENUITEM "Bantuan dan sokongan(&H)", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED MENUITEM "Jalankan...(&R)", IDM_RUN, MFT_STRING, MFS_ENABLED MENUITEM "", 450, MFT_SEPARATOR, MFS_ENABLED diff --git a/base/shell/explorer/lang/nl-NL.rc b/base/shell/explorer/lang/nl-NL.rc index 8a1733778d6..d9c52184c71 100644 --- a/base/shell/explorer/lang/nl-NL.rc +++ b/base/shell/explorer/lang/nl-NL.rc @@ -47,10 +47,7 @@ BEGIN MENUITEM "&Printers en Faxapparaten", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED MENUITEM "&Taakbalk en het menu Start", IDM_TASKBARANDSTARTMENU, MFT_STRING, MFS_ENABLED END - POPUP "&Zoeken", IDM_SEARCH - BEGIN - MENUITEM "", -1, MFT_SEPARATOR - END + MENUITEM "&Zoeken", IDM_SEARCH, MFT_STRING, MFS_ENABLED MENUITEM "&Help en Ondersteuning", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED MENUITEM "&Uitvoeren...", IDM_RUN, MFT_STRING, MFS_ENABLED MENUITEM "", 450, MFT_SEPARATOR, MFS_ENABLED diff --git a/base/shell/explorer/lang/no-NO.rc b/base/shell/explorer/lang/no-NO.rc index 7553328991a..395d9e162da 100644 --- a/base/shell/explorer/lang/no-NO.rc +++ b/base/shell/explorer/lang/no-NO.rc @@ -47,10 +47,7 @@ BEGIN MENUITEM "&Skrivere og fakser", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED MENUITEM "&Oppgavelinje og Startmeny", IDM_TASKBARANDSTARTMENU, MFT_STRING, MFS_ENABLED END - POPUP "Sø&k", IDM_SEARCH - BEGIN - MENUITEM "", -1, MFT_SEPARATOR - END + MENUITEM "Sø&k", IDM_SEARCH, MFT_STRING, MFS_ENABLED MENUITEM "&Hjelp og støtte", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED MENUITEM "&Kjør...", IDM_RUN, MFT_STRING, MFS_ENABLED MENUITEM "", 450, MFT_SEPARATOR, MFS_ENABLED diff --git a/base/shell/explorer/lang/pl-PL.rc b/base/shell/explorer/lang/pl-PL.rc index 4e6eca8d4dc..0ed59d19177 100644 --- a/base/shell/explorer/lang/pl-PL.rc +++ b/base/shell/explorer/lang/pl-PL.rc @@ -57,10 +57,7 @@ BEGIN MENUITEM "&Drukarki i faksy", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED MENUITEM "P&asek zadań i menu Start", IDM_TASKBARANDSTARTMENU, MFT_STRING, MFS_ENABLED END - POPUP "&Szukaj", IDM_SEARCH - BEGIN - MENUITEM "", -1, MFT_SEPARATOR - END + MENUITEM "&Szukaj", IDM_SEARCH, MFT_STRING, MFS_ENABLED MENUITEM "Po&moc", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED MENUITEM "&Uruchom...", IDM_RUN, MFT_STRING, MFS_ENABLED MENUITEM "", 450, MFT_SEPARATOR, MFS_ENABLED diff --git a/base/shell/explorer/lang/pt-BR.rc b/base/shell/explorer/lang/pt-BR.rc index 45de6a77780..1ee4135c8cb 100644 --- a/base/shell/explorer/lang/pt-BR.rc +++ b/base/shell/explorer/lang/pt-BR.rc @@ -49,10 +49,7 @@ BEGIN MENUITEM "&Impressoras e Fax", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED MENUITEM "&Barra de Tarefas e Menu Iniciar", IDM_TASKBARANDSTARTMENU, MFT_STRING, MFS_ENABLED END - POPUP "P&rocurar", IDM_SEARCH - BEGIN - MENUITEM "", -1, MFT_SEPARATOR - END + MENUITEM "P&rocurar", IDM_SEARCH, MFT_STRING, MFS_ENABLED MENUITEM "&Ajuda e Suporte", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED MENUITEM "&Executar...", IDM_RUN, MFT_STRING, MFS_ENABLED MENUITEM "", 450, MFT_SEPARATOR, MFS_ENABLED diff --git a/base/shell/explorer/lang/pt-PT.rc b/base/shell/explorer/lang/pt-PT.rc index 14cb98880a3..8c32893d75c 100644 --- a/base/shell/explorer/lang/pt-PT.rc +++ b/base/shell/explorer/lang/pt-PT.rc @@ -49,10 +49,7 @@ BEGIN MENUITEM "&Impressoras e Fax", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED MENUITEM "&Barra de Tarefas e Menu Iniciar", IDM_TASKBARANDSTARTMENU, MFT_STRING, MFS_ENABLED END - POPUP "P&rocurar", IDM_SEARCH - BEGIN - MENUITEM "", -1, MFT_SEPARATOR - END + MENUITEM "P&rocurar", IDM_SEARCH, MFT_STRING, MFS_ENABLED MENUITEM "&Ajuda e Suporte", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED MENUITEM "&Executar...", IDM_RUN, MFT_STRING, MFS_ENABLED MENUITEM "", 450, MFT_SEPARATOR, MFS_ENABLED diff --git a/base/shell/explorer/lang/ro-RO.rc b/base/shell/explorer/lang/ro-RO.rc index 4b3655343c8..a8d609c58f6 100644 --- a/base/shell/explorer/lang/ro-RO.rc +++ b/base/shell/explorer/lang/ro-RO.rc @@ -49,10 +49,7 @@ BEGIN MENUITEM "I&mprimante și faxuri", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED MENUITEM "&Bara de activități și Meniul „Pornire”", IDM_TASKBARANDSTARTMENU, MFT_STRING, MFS_ENABLED END - POPUP "Căut&are", IDM_SEARCH - BEGIN - MENUITEM "", -1, MFT_SEPARATOR - END + MENUITEM "Căut&are", IDM_SEARCH, MFT_STRING, MFS_ENABLED MENUITEM "&Manuale de utilizare", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED MENUITEM "E&xecutare…", IDM_RUN, MFT_STRING, MFS_ENABLED MENUITEM "", 450, MFT_SEPARATOR, MFS_ENABLED diff --git a/base/shell/explorer/lang/ru-RU.rc b/base/shell/explorer/lang/ru-RU.rc index 0c67da5fa4a..15ad76a321a 100644 --- a/base/shell/explorer/lang/ru-RU.rc +++ b/base/shell/explorer/lang/ru-RU.rc @@ -49,10 +49,7 @@ BEGIN MENUITEM "Пр&интеры и факсы", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED MENUITEM "Панель &задач и меню ""Пуск""", IDM_TASKBARANDSTARTMENU, MFT_STRING, MFS_ENABLED END - POPUP "П&оиск", IDM_SEARCH - BEGIN - MENUITEM "", -1, MFT_SEPARATOR - END + MENUITEM "П&оиск", IDM_SEARCH, MFT_STRING, MFS_ENABLED MENUITEM "Сп&равка и поддержка", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED MENUITEM "&Выполнить...", IDM_RUN, MFT_STRING, MFS_ENABLED MENUITEM "", 450, MFT_SEPARATOR, MFS_ENABLED diff --git a/base/shell/explorer/lang/sk-SK.rc b/base/shell/explorer/lang/sk-SK.rc index c6c65838b96..90e30583a8e 100644 --- a/base/shell/explorer/lang/sk-SK.rc +++ b/base/shell/explorer/lang/sk-SK.rc @@ -52,10 +52,7 @@ BEGIN MENUITEM "&Tlačiarne a faxy", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED MENUITEM "P&anel úloh a ponuka Štart", IDM_TASKBARANDSTARTMENU, MFT_STRING, MFS_ENABLED END - POPUP "&Hľadať", IDM_SEARCH - BEGIN - MENUITEM "", -1, MFT_SEPARATOR - END + MENUITEM "&Hľadať", IDM_SEARCH, MFT_STRING, MFS_ENABLED MENUITEM "&Pomoc a technická podpora", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED MENUITEM "Sp&ustiť...", IDM_RUN, MFT_STRING, MFS_ENABLED MENUITEM "", 450, MFT_SEPARATOR, MFS_ENABLED diff --git a/base/shell/explorer/lang/sq-AL.rc b/base/shell/explorer/lang/sq-AL.rc index 2750b8ad2d4..99053ce72b2 100644 --- a/base/shell/explorer/lang/sq-AL.rc +++ b/base/shell/explorer/lang/sq-AL.rc @@ -51,10 +51,7 @@ BEGIN MENUITEM "&Printerat dhe Fakset", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED MENUITEM "&Taskbar dhe Start Menu", IDM_TASKBARANDSTARTMENU, MFT_STRING, MFS_ENABLED END - POPUP "&Kërko", IDM_SEARCH - BEGIN - MENUITEM "", -1, MFT_SEPARATOR - END + MENUITEM "&Kërko", IDM_SEARCH, MFT_STRING, MFS_ENABLED MENUITEM "&Ndihma dhe Suporti", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED MENUITEM "&Fillo...", IDM_RUN, MFT_STRING, MFS_ENABLED MENUITEM "", 450, MFT_SEPARATOR, MFS_ENABLED diff --git a/base/shell/explorer/lang/tr-TR.rc b/base/shell/explorer/lang/tr-TR.rc index c1f25d400d2..625e769be29 100644 --- a/base/shell/explorer/lang/tr-TR.rc +++ b/base/shell/explorer/lang/tr-TR.rc @@ -49,10 +49,7 @@ BEGIN MENUITEM "&Yazıcılar ve Belgegeçerler", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED MENUITEM "G&örev Çubuğu ve Başlat Seçkesi", IDM_TASKBARANDSTARTMENU, MFT_STRING, MFS_ENABLED END - POPUP "A&ra", IDM_SEARCH - BEGIN - MENUITEM "", -1, MFT_SEPARATOR - END + MENUITEM "A&ra", IDM_SEARCH, MFT_STRING, MFS_ENABLED MENUITEM "Yar&dım ve Destek", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED MENUITEM "&Çalıştır...", IDM_RUN, MFT_STRING, MFS_ENABLED MENUITEM "", 450, MFT_SEPARATOR, MFS_ENABLED diff --git a/base/shell/explorer/lang/uk-UA.rc b/base/shell/explorer/lang/uk-UA.rc index 2399b8d4c9e..03fbaa8b7cf 100644 --- a/base/shell/explorer/lang/uk-UA.rc +++ b/base/shell/explorer/lang/uk-UA.rc @@ -55,10 +55,7 @@ BEGIN MENUITEM "Пр&интери й факси", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED MENUITEM "Панель &завдань і меню ""Пуск""", IDM_TASKBARANDSTARTMENU, MFT_STRING, MFS_ENABLED END - POPUP "З&найти", IDM_SEARCH - BEGIN - MENUITEM "", -1, MFT_SEPARATOR - END + MENUITEM "З&найти", IDM_SEARCH, MFT_STRING, MFS_ENABLED MENUITEM "&Довідка та підтримка", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED MENUITEM "&Виконати...", IDM_RUN, MFT_STRING, MFS_ENABLED MENUITEM "", 450, MFT_SEPARATOR, MFS_ENABLED diff --git a/base/shell/explorer/lang/zh-CN.rc b/base/shell/explorer/lang/zh-CN.rc index 9ff6d7e2363..e33c79d94dd 100644 --- a/base/shell/explorer/lang/zh-CN.rc +++ b/base/shell/explorer/lang/zh-CN.rc @@ -56,10 +56,7 @@ BEGIN MENUITEM "打印机和传真(&P)", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED MENUITEM "任务栏和开始菜单(&T)", IDM_TASKBARANDSTARTMENU, MFT_STRING, MFS_ENABLED END - POPUP "查找(&C)", IDM_SEARCH - BEGIN - MENUITEM "", -1, MFT_SEPARATOR - END + MENUITEM "查找(&C)", IDM_SEARCH, MFT_STRING, MFS_ENABLED MENUITEM "帮助与支持(&H)", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED MENUITEM "运行(&R)...", IDM_RUN, MFT_STRING, MFS_ENABLED MENUITEM "", 450, MFT_SEPARATOR, MFS_ENABLED diff --git a/base/shell/explorer/lang/zh-TW.rc b/base/shell/explorer/lang/zh-TW.rc index 070870f7695..1dc06869f14 100644 --- a/base/shell/explorer/lang/zh-TW.rc +++ b/base/shell/explorer/lang/zh-TW.rc @@ -56,10 +56,7 @@ BEGIN MENUITEM "印表機和傳真(&P)", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED MENUITEM "工作列及「開始」功能表(&T)", IDM_TASKBARANDSTARTMENU, MFT_STRING, MFS_ENABLED END - POPUP "搜尋(&C)", IDM_SEARCH - BEGIN - MENUITEM "", -1, MFT_SEPARATOR - END + MENUITEM "搜尋(&C)", IDM_SEARCH, MFT_STRING, MFS_ENABLED MENUITEM "說明及支援(&H)", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED MENUITEM "執行(&R)...", IDM_RUN, MFT_STRING, MFS_ENABLED MENUITEM "", 450, MFT_SEPARATOR, MFS_ENABLED diff --git a/base/shell/explorer/startmnusite.cpp b/base/shell/explorer/startmnusite.cpp index 215ed8c8291..6189c59cb8a 100644 --- a/base/shell/explorer/startmnusite.cpp +++ b/base/shell/explorer/startmnusite.cpp @@ -208,13 +208,12 @@ public: } /* Search */ - /* FIXME: Enable after implementing */ - /* if (SHRestricted(REST_NOFIND)) */ - { - DeleteMenu(hMenu, - IDM_SEARCH, - MF_BYCOMMAND); - } + if (SHRestricted(REST_NOFIND)) + { + DeleteMenu(hMenu, + IDM_SEARCH, + MF_BYCOMMAND); + } /* FIXME: Help */ diff --git a/base/shell/explorer/traywnd.cpp b/base/shell/explorer/traywnd.cpp index 49d3ae40886..b27a4689fee 100644 --- a/base/shell/explorer/traywnd.cpp +++ b/base/shell/explorer/traywnd.cpp @@ -753,6 +753,7 @@ public: case TRAYCMD_SWITCH_USER_DIALOG: // TODO: break; + case IDM_SEARCH: case TRAYCMD_SEARCH_FILES: SHFindFiles(NULL, NULL); break;