From 0241b5c4e93f6123dd459f41bd016e17dd5d6dd8 Mon Sep 17 00:00:00 2001 From: Katayama Hirofumi MZ Date: Mon, 11 Mar 2024 16:19:46 +0900 Subject: [PATCH] [EXPLORER][SHELL32] Expand/unexpand Control Panel menu (#6595) Follow-up to #6594. Improve Start Menu customization. JIRA issue: CORE-16956 - Add IDS_ADVANCED_EXPAND_CONTROL_PANEL, IDS_ADVANCED_EXPAND_PRINTERS, and IDS_ADVANCED_EXPAND_NET_CONNECTIONS resource strings. - Check the "CascadeControlPanel", "CascadeNetworkConnections", and "CascadePrinters" registry values. - Modify Start Menu by using AddOrSetMenuItem and AddStartMenuItems helper functions in CShellMenuCallback::OnGetSubMenu. --- base/shell/explorer/resource.h | 3 + base/shell/explorer/startmnucust.cpp | 13 +- dll/win32/shell32/lang/bg-BG.rc | 3 + dll/win32/shell32/lang/ca-ES.rc | 3 + dll/win32/shell32/lang/cs-CZ.rc | 3 + dll/win32/shell32/lang/da-DK.rc | 3 + dll/win32/shell32/lang/de-DE.rc | 3 + dll/win32/shell32/lang/el-GR.rc | 3 + dll/win32/shell32/lang/en-GB.rc | 3 + dll/win32/shell32/lang/en-US.rc | 3 + dll/win32/shell32/lang/es-ES.rc | 3 + dll/win32/shell32/lang/et-EE.rc | 3 + dll/win32/shell32/lang/eu-ES.rc | 3 + dll/win32/shell32/lang/fi-FI.rc | 3 + dll/win32/shell32/lang/fr-FR.rc | 3 + dll/win32/shell32/lang/he-IL.rc | 3 + dll/win32/shell32/lang/hi-IN.rc | 3 + dll/win32/shell32/lang/hu-HU.rc | 3 + dll/win32/shell32/lang/id-ID.rc | 3 + dll/win32/shell32/lang/it-IT.rc | 3 + dll/win32/shell32/lang/ja-JP.rc | 3 + dll/win32/shell32/lang/ko-KR.rc | 3 + dll/win32/shell32/lang/nl-NL.rc | 3 + dll/win32/shell32/lang/no-NO.rc | 3 + dll/win32/shell32/lang/pl-PL.rc | 3 + dll/win32/shell32/lang/pt-BR.rc | 3 + dll/win32/shell32/lang/pt-PT.rc | 3 + dll/win32/shell32/lang/ro-RO.rc | 3 + dll/win32/shell32/lang/ru-RU.rc | 3 + dll/win32/shell32/lang/sk-SK.rc | 3 + dll/win32/shell32/lang/sl-SI.rc | 3 + dll/win32/shell32/lang/sq-AL.rc | 3 + dll/win32/shell32/lang/sv-SE.rc | 3 + dll/win32/shell32/lang/tr-TR.rc | 3 + dll/win32/shell32/lang/uk-UA.rc | 3 + dll/win32/shell32/lang/zh-CN.rc | 3 + dll/win32/shell32/lang/zh-HK.rc | 3 + dll/win32/shell32/lang/zh-TW.rc | 3 + dll/win32/shell32/shellmenu/CStartMenu.cpp | 211 ++++++++++++++------- dll/win32/shell32/shresdef.h | 3 + 40 files changed, 260 insertions(+), 78 deletions(-) diff --git a/base/shell/explorer/resource.h b/base/shell/explorer/resource.h index 49f7b65d312..f78d7538e9a 100644 --- a/base/shell/explorer/resource.h +++ b/base/shell/explorer/resource.h @@ -109,8 +109,11 @@ /* These values must be synchronized with shell32 */ #define IDS_ADVANCED_DISPLAY_FAVORITES 30466 #define IDS_ADVANCED_DISPLAY_LOG_OFF 30467 +#define IDS_ADVANCED_EXPAND_CONTROL_PANEL 30468 #define IDS_ADVANCED_EXPAND_MY_DOCUMENTS 30469 +#define IDS_ADVANCED_EXPAND_PRINTERS 30470 #define IDS_ADVANCED_EXPAND_MY_PICTURES 30472 +#define IDS_ADVANCED_EXPAND_NET_CONNECTIONS 30473 #define IDS_ADVANCED_DISPLAY_RUN 30474 #define IDS_ADVANCED_DISPLAY_ADMINTOOLS 30476 diff --git a/base/shell/explorer/startmnucust.cpp b/base/shell/explorer/startmnucust.cpp index 4e0bc5f379b..303787e14ac 100644 --- a/base/shell/explorer/startmnucust.cpp +++ b/base/shell/explorer/startmnucust.cpp @@ -112,11 +112,14 @@ static const CUSTOMIZE_ENTRY s_CustomizeEntries[] = // FIXME: Make "StartMenuAdminTools" effective //{ IDS_ADVANCED_DISPLAY_ADMINTOOLS, L"StartMenuAdminTools", CustomizeRead1, CustomizeWrite1 }, // FIXME - { IDS_ADVANCED_DISPLAY_FAVORITES, L"StartMenuFavorites", CustomizeReadAdvanced, CustomizeWriteAdvanced }, - { IDS_ADVANCED_DISPLAY_LOG_OFF, L"StartMenuLogoff", CustomizeReadAdvanced, CustomizeWriteAdvanced }, - { IDS_ADVANCED_DISPLAY_RUN, L"NoRun", CustomizeReadRun, CustomizeWriteRest }, - { IDS_ADVANCED_EXPAND_MY_DOCUMENTS, L"CascadeMyDocuments", CustomizeReadAdvanced, CustomizeWriteAdvanced }, - { IDS_ADVANCED_EXPAND_MY_PICTURES, L"CascadeMyPictures", CustomizeReadAdvanced, CustomizeWriteAdvanced }, + { IDS_ADVANCED_DISPLAY_FAVORITES, L"StartMenuFavorites", CustomizeReadAdvanced, CustomizeWriteAdvanced }, + { IDS_ADVANCED_DISPLAY_LOG_OFF, L"StartMenuLogoff", CustomizeReadAdvanced, CustomizeWriteAdvanced }, + { IDS_ADVANCED_DISPLAY_RUN, L"NoRun", CustomizeReadRun, CustomizeWriteRest }, + { IDS_ADVANCED_EXPAND_MY_DOCUMENTS, L"CascadeMyDocuments", CustomizeReadAdvanced, CustomizeWriteAdvanced }, + { IDS_ADVANCED_EXPAND_MY_PICTURES, L"CascadeMyPictures", CustomizeReadAdvanced, CustomizeWriteAdvanced }, + { IDS_ADVANCED_EXPAND_CONTROL_PANEL, L"CascadeControlPanel", CustomizeReadAdvanced, CustomizeWriteAdvanced }, + { IDS_ADVANCED_EXPAND_PRINTERS, L"CascadePrinters", CustomizeReadAdvanced, CustomizeWriteAdvanced }, + { IDS_ADVANCED_EXPAND_NET_CONNECTIONS, L"CascadeNetworkConnections", CustomizeReadAdvanced, CustomizeWriteAdvanced }, }; static VOID AddCustomizeItem(HWND hTreeView, const CUSTOMIZE_ENTRY *entry) diff --git a/dll/win32/shell32/lang/bg-BG.rc b/dll/win32/shell32/lang/bg-BG.rc index c0d6e358acb..c64e11fba90 100644 --- a/dll/win32/shell32/lang/bg-BG.rc +++ b/dll/win32/shell32/lang/bg-BG.rc @@ -1014,8 +1014,11 @@ BEGIN IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop items" IDS_ADVANCED_DISPLAY_FAVORITES "Display Favorites" IDS_ADVANCED_DISPLAY_LOG_OFF "Display Log Off" + IDS_ADVANCED_EXPAND_CONTROL_PANEL "Expand Control Panel" IDS_ADVANCED_EXPAND_MY_DOCUMENTS "Expand My Documents" + IDS_ADVANCED_EXPAND_PRINTERS "Expand Printers" IDS_ADVANCED_EXPAND_MY_PICTURES "Expand My Pictures" + IDS_ADVANCED_EXPAND_NET_CONNECTIONS "Expand Network Connections" IDS_ADVANCED_DISPLAY_RUN "Display Run" IDS_ADVANCED_DISPLAY_ADMINTOOLS "Display Administrative Tools" diff --git a/dll/win32/shell32/lang/ca-ES.rc b/dll/win32/shell32/lang/ca-ES.rc index 04403bb0f74..948b4cbc51b 100644 --- a/dll/win32/shell32/lang/ca-ES.rc +++ b/dll/win32/shell32/lang/ca-ES.rc @@ -1014,8 +1014,11 @@ BEGIN IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop items" IDS_ADVANCED_DISPLAY_FAVORITES "Display Favorites" IDS_ADVANCED_DISPLAY_LOG_OFF "Display Log Off" + IDS_ADVANCED_EXPAND_CONTROL_PANEL "Expand Control Panel" IDS_ADVANCED_EXPAND_MY_DOCUMENTS "Expand My Documents" + IDS_ADVANCED_EXPAND_PRINTERS "Expand Printers" IDS_ADVANCED_EXPAND_MY_PICTURES "Expand My Pictures" + IDS_ADVANCED_EXPAND_NET_CONNECTIONS "Expand Network Connections" IDS_ADVANCED_DISPLAY_RUN "Display Run" IDS_ADVANCED_DISPLAY_ADMINTOOLS "Display Administrative Tools" diff --git a/dll/win32/shell32/lang/cs-CZ.rc b/dll/win32/shell32/lang/cs-CZ.rc index afcbedc24de..84a0ea85e5e 100644 --- a/dll/win32/shell32/lang/cs-CZ.rc +++ b/dll/win32/shell32/lang/cs-CZ.rc @@ -1022,8 +1022,11 @@ BEGIN IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop items" IDS_ADVANCED_DISPLAY_FAVORITES "Display Favorites" IDS_ADVANCED_DISPLAY_LOG_OFF "Display Log Off" + IDS_ADVANCED_EXPAND_CONTROL_PANEL "Expand Control Panel" IDS_ADVANCED_EXPAND_MY_DOCUMENTS "Expand My Documents" + IDS_ADVANCED_EXPAND_PRINTERS "Expand Printers" IDS_ADVANCED_EXPAND_MY_PICTURES "Expand My Pictures" + IDS_ADVANCED_EXPAND_NET_CONNECTIONS "Expand Network Connections" IDS_ADVANCED_DISPLAY_RUN "Display Run" IDS_ADVANCED_DISPLAY_ADMINTOOLS "Display Administrative Tools" diff --git a/dll/win32/shell32/lang/da-DK.rc b/dll/win32/shell32/lang/da-DK.rc index 981ff8c115c..50fb44e6d03 100644 --- a/dll/win32/shell32/lang/da-DK.rc +++ b/dll/win32/shell32/lang/da-DK.rc @@ -1021,8 +1021,11 @@ BEGIN IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop items" IDS_ADVANCED_DISPLAY_FAVORITES "Display Favorites" IDS_ADVANCED_DISPLAY_LOG_OFF "Display Log Off" + IDS_ADVANCED_EXPAND_CONTROL_PANEL "Expand Control Panel" IDS_ADVANCED_EXPAND_MY_DOCUMENTS "Expand My Documents" + IDS_ADVANCED_EXPAND_PRINTERS "Expand Printers" IDS_ADVANCED_EXPAND_MY_PICTURES "Expand My Pictures" + IDS_ADVANCED_EXPAND_NET_CONNECTIONS "Expand Network Connections" IDS_ADVANCED_DISPLAY_RUN "Display Run" IDS_ADVANCED_DISPLAY_ADMINTOOLS "Display Administrative Tools" diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc index 221302320bd..48a7798c2d3 100644 --- a/dll/win32/shell32/lang/de-DE.rc +++ b/dll/win32/shell32/lang/de-DE.rc @@ -1015,8 +1015,11 @@ BEGIN IDS_ADVANCED_SHOW_INFO_TIP "Popupinformationen für Ordner- und Desktop-Elemente anzeigen" IDS_ADVANCED_DISPLAY_FAVORITES "Display Favorites" IDS_ADVANCED_DISPLAY_LOG_OFF "Display Log Off" + IDS_ADVANCED_EXPAND_CONTROL_PANEL "Expand Control Panel" IDS_ADVANCED_EXPAND_MY_DOCUMENTS "Expand My Documents" + IDS_ADVANCED_EXPAND_PRINTERS "Expand Printers" IDS_ADVANCED_EXPAND_MY_PICTURES "Expand My Pictures" + IDS_ADVANCED_EXPAND_NET_CONNECTIONS "Expand Network Connections" IDS_ADVANCED_DISPLAY_RUN "Display Run" IDS_ADVANCED_DISPLAY_ADMINTOOLS "Display Administrative Tools" diff --git a/dll/win32/shell32/lang/el-GR.rc b/dll/win32/shell32/lang/el-GR.rc index 55160bede78..fa9951a6b29 100644 --- a/dll/win32/shell32/lang/el-GR.rc +++ b/dll/win32/shell32/lang/el-GR.rc @@ -1014,8 +1014,11 @@ BEGIN IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop items" IDS_ADVANCED_DISPLAY_FAVORITES "Display Favorites" IDS_ADVANCED_DISPLAY_LOG_OFF "Display Log Off" + IDS_ADVANCED_EXPAND_CONTROL_PANEL "Expand Control Panel" IDS_ADVANCED_EXPAND_MY_DOCUMENTS "Expand My Documents" + IDS_ADVANCED_EXPAND_PRINTERS "Expand Printers" IDS_ADVANCED_EXPAND_MY_PICTURES "Expand My Pictures" + IDS_ADVANCED_EXPAND_NET_CONNECTIONS "Expand Network Connections" IDS_ADVANCED_DISPLAY_RUN "Display Run" IDS_ADVANCED_DISPLAY_ADMINTOOLS "Display Administrative Tools" diff --git a/dll/win32/shell32/lang/en-GB.rc b/dll/win32/shell32/lang/en-GB.rc index 329deef5faa..d4a577ceeb2 100644 --- a/dll/win32/shell32/lang/en-GB.rc +++ b/dll/win32/shell32/lang/en-GB.rc @@ -1014,8 +1014,11 @@ BEGIN IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop items" IDS_ADVANCED_DISPLAY_FAVORITES "Display Favorites" IDS_ADVANCED_DISPLAY_LOG_OFF "Display Log Off" + IDS_ADVANCED_EXPAND_CONTROL_PANEL "Expand Control Panel" IDS_ADVANCED_EXPAND_MY_DOCUMENTS "Expand My Documents" + IDS_ADVANCED_EXPAND_PRINTERS "Expand Printers" IDS_ADVANCED_EXPAND_MY_PICTURES "Expand My Pictures" + IDS_ADVANCED_EXPAND_NET_CONNECTIONS "Expand Network Connections" IDS_ADVANCED_DISPLAY_RUN "Display Run" IDS_ADVANCED_DISPLAY_ADMINTOOLS "Display Administrative Tools" diff --git a/dll/win32/shell32/lang/en-US.rc b/dll/win32/shell32/lang/en-US.rc index 6d1776e6fd3..5f15dbff2b5 100644 --- a/dll/win32/shell32/lang/en-US.rc +++ b/dll/win32/shell32/lang/en-US.rc @@ -1014,8 +1014,11 @@ BEGIN IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop items" IDS_ADVANCED_DISPLAY_FAVORITES "Display Favorites" IDS_ADVANCED_DISPLAY_LOG_OFF "Display Log Off" + IDS_ADVANCED_EXPAND_CONTROL_PANEL "Expand Control Panel" IDS_ADVANCED_EXPAND_MY_DOCUMENTS "Expand My Documents" + IDS_ADVANCED_EXPAND_PRINTERS "Expand Printers" IDS_ADVANCED_EXPAND_MY_PICTURES "Expand My Pictures" + IDS_ADVANCED_EXPAND_NET_CONNECTIONS "Expand Network Connections" IDS_ADVANCED_DISPLAY_RUN "Display Run" IDS_ADVANCED_DISPLAY_ADMINTOOLS "Display Administrative Tools" diff --git a/dll/win32/shell32/lang/es-ES.rc b/dll/win32/shell32/lang/es-ES.rc index 3c710530e25..15ab62ac077 100644 --- a/dll/win32/shell32/lang/es-ES.rc +++ b/dll/win32/shell32/lang/es-ES.rc @@ -1023,8 +1023,11 @@ BEGIN IDS_ADVANCED_SHOW_INFO_TIP "Mostrar descripción de íconos y carpetas en el escritorio" IDS_ADVANCED_DISPLAY_FAVORITES "Display Favorites" IDS_ADVANCED_DISPLAY_LOG_OFF "Display Log Off" + IDS_ADVANCED_EXPAND_CONTROL_PANEL "Expand Control Panel" IDS_ADVANCED_EXPAND_MY_DOCUMENTS "Expand My Documents" + IDS_ADVANCED_EXPAND_PRINTERS "Expand Printers" IDS_ADVANCED_EXPAND_MY_PICTURES "Expand My Pictures" + IDS_ADVANCED_EXPAND_NET_CONNECTIONS "Expand Network Connections" IDS_ADVANCED_DISPLAY_RUN "Display Run" IDS_ADVANCED_DISPLAY_ADMINTOOLS "Display Administrative Tools" diff --git a/dll/win32/shell32/lang/et-EE.rc b/dll/win32/shell32/lang/et-EE.rc index e37ab94ffd2..bc0f0a8925e 100644 --- a/dll/win32/shell32/lang/et-EE.rc +++ b/dll/win32/shell32/lang/et-EE.rc @@ -1021,8 +1021,11 @@ BEGIN IDS_ADVANCED_SHOW_INFO_TIP "Näita kausta- ja töölauaüksuste hüpikkirjeldusi" IDS_ADVANCED_DISPLAY_FAVORITES "Display Favorites" IDS_ADVANCED_DISPLAY_LOG_OFF "Display Log Off" + IDS_ADVANCED_EXPAND_CONTROL_PANEL "Expand Control Panel" IDS_ADVANCED_EXPAND_MY_DOCUMENTS "Expand My Documents" + IDS_ADVANCED_EXPAND_PRINTERS "Expand Printers" IDS_ADVANCED_EXPAND_MY_PICTURES "Expand My Pictures" + IDS_ADVANCED_EXPAND_NET_CONNECTIONS "Expand Network Connections" IDS_ADVANCED_DISPLAY_RUN "Display Run" IDS_ADVANCED_DISPLAY_ADMINTOOLS "Display Administrative Tools" diff --git a/dll/win32/shell32/lang/eu-ES.rc b/dll/win32/shell32/lang/eu-ES.rc index 008fa729494..8d2330ae3eb 100644 --- a/dll/win32/shell32/lang/eu-ES.rc +++ b/dll/win32/shell32/lang/eu-ES.rc @@ -1019,8 +1019,11 @@ BEGIN IDS_ADVANCED_SHOW_INFO_TIP "Erakutsi ikonoen eta karpeten deskribapena mahaigainean" IDS_ADVANCED_DISPLAY_FAVORITES "Display Favorites" IDS_ADVANCED_DISPLAY_LOG_OFF "Display Log Off" + IDS_ADVANCED_EXPAND_CONTROL_PANEL "Expand Control Panel" IDS_ADVANCED_EXPAND_MY_DOCUMENTS "Expand My Documents" + IDS_ADVANCED_EXPAND_PRINTERS "Expand Printers" IDS_ADVANCED_EXPAND_MY_PICTURES "Expand My Pictures" + IDS_ADVANCED_EXPAND_NET_CONNECTIONS "Expand Network Connections" IDS_ADVANCED_DISPLAY_RUN "Display Run" IDS_ADVANCED_DISPLAY_ADMINTOOLS "Display Administrative Tools" diff --git a/dll/win32/shell32/lang/fi-FI.rc b/dll/win32/shell32/lang/fi-FI.rc index 8253c56c42c..af229c16a50 100644 --- a/dll/win32/shell32/lang/fi-FI.rc +++ b/dll/win32/shell32/lang/fi-FI.rc @@ -1014,8 +1014,11 @@ BEGIN IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop items" IDS_ADVANCED_DISPLAY_FAVORITES "Display Favorites" IDS_ADVANCED_DISPLAY_LOG_OFF "Display Log Off" + IDS_ADVANCED_EXPAND_CONTROL_PANEL "Expand Control Panel" IDS_ADVANCED_EXPAND_MY_DOCUMENTS "Expand My Documents" + IDS_ADVANCED_EXPAND_PRINTERS "Expand Printers" IDS_ADVANCED_EXPAND_MY_PICTURES "Expand My Pictures" + IDS_ADVANCED_EXPAND_NET_CONNECTIONS "Expand Network Connections" IDS_ADVANCED_DISPLAY_RUN "Display Run" IDS_ADVANCED_DISPLAY_ADMINTOOLS "Display Administrative Tools" diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc index ae34ff4fbce..cc0fe50d721 100644 --- a/dll/win32/shell32/lang/fr-FR.rc +++ b/dll/win32/shell32/lang/fr-FR.rc @@ -1014,8 +1014,11 @@ BEGIN IDS_ADVANCED_SHOW_INFO_TIP "Afficher les info-bulles pour les fichiers et les dossiers" IDS_ADVANCED_DISPLAY_FAVORITES "Display Favorites" IDS_ADVANCED_DISPLAY_LOG_OFF "Display Log Off" + IDS_ADVANCED_EXPAND_CONTROL_PANEL "Expand Control Panel" IDS_ADVANCED_EXPAND_MY_DOCUMENTS "Expand My Documents" + IDS_ADVANCED_EXPAND_PRINTERS "Expand Printers" IDS_ADVANCED_EXPAND_MY_PICTURES "Expand My Pictures" + IDS_ADVANCED_EXPAND_NET_CONNECTIONS "Expand Network Connections" IDS_ADVANCED_DISPLAY_RUN "Display Run" IDS_ADVANCED_DISPLAY_ADMINTOOLS "Display Administrative Tools" diff --git a/dll/win32/shell32/lang/he-IL.rc b/dll/win32/shell32/lang/he-IL.rc index 304bf8741f1..124e2a782c4 100644 --- a/dll/win32/shell32/lang/he-IL.rc +++ b/dll/win32/shell32/lang/he-IL.rc @@ -1021,8 +1021,11 @@ BEGIN IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop items" IDS_ADVANCED_DISPLAY_FAVORITES "Display Favorites" IDS_ADVANCED_DISPLAY_LOG_OFF "Display Log Off" + IDS_ADVANCED_EXPAND_CONTROL_PANEL "Expand Control Panel" IDS_ADVANCED_EXPAND_MY_DOCUMENTS "Expand My Documents" + IDS_ADVANCED_EXPAND_PRINTERS "Expand Printers" IDS_ADVANCED_EXPAND_MY_PICTURES "Expand My Pictures" + IDS_ADVANCED_EXPAND_NET_CONNECTIONS "Expand Network Connections" IDS_ADVANCED_DISPLAY_RUN "Display Run" IDS_ADVANCED_DISPLAY_ADMINTOOLS "Display Administrative Tools" diff --git a/dll/win32/shell32/lang/hi-IN.rc b/dll/win32/shell32/lang/hi-IN.rc index 2ff23796e69..397e975dda7 100644 --- a/dll/win32/shell32/lang/hi-IN.rc +++ b/dll/win32/shell32/lang/hi-IN.rc @@ -1016,8 +1016,11 @@ BEGIN IDS_ADVANCED_SHOW_INFO_TIP "फ़ोल्डर और डेस्कटॉप आइटम के लिए पॉप-अप विवरण दिखाएं" IDS_ADVANCED_DISPLAY_FAVORITES "Display Favorites" IDS_ADVANCED_DISPLAY_LOG_OFF "Display Log Off" + IDS_ADVANCED_EXPAND_CONTROL_PANEL "Expand Control Panel" IDS_ADVANCED_EXPAND_MY_DOCUMENTS "Expand My Documents" + IDS_ADVANCED_EXPAND_PRINTERS "Expand Printers" IDS_ADVANCED_EXPAND_MY_PICTURES "Expand My Pictures" + IDS_ADVANCED_EXPAND_NET_CONNECTIONS "Expand Network Connections" IDS_ADVANCED_DISPLAY_RUN "Display Run" IDS_ADVANCED_DISPLAY_ADMINTOOLS "Display Administrative Tools" diff --git a/dll/win32/shell32/lang/hu-HU.rc b/dll/win32/shell32/lang/hu-HU.rc index 2689ebf4f52..436dfb73792 100644 --- a/dll/win32/shell32/lang/hu-HU.rc +++ b/dll/win32/shell32/lang/hu-HU.rc @@ -1013,8 +1013,11 @@ BEGIN IDS_ADVANCED_SHOW_INFO_TIP "Felugró leírások megjelenítése a mappákhoz és az asztalon lévő elemekhez" IDS_ADVANCED_DISPLAY_FAVORITES "Display Favorites" IDS_ADVANCED_DISPLAY_LOG_OFF "Display Log Off" + IDS_ADVANCED_EXPAND_CONTROL_PANEL "Expand Control Panel" IDS_ADVANCED_EXPAND_MY_DOCUMENTS "Expand My Documents" + IDS_ADVANCED_EXPAND_PRINTERS "Expand Printers" IDS_ADVANCED_EXPAND_MY_PICTURES "Expand My Pictures" + IDS_ADVANCED_EXPAND_NET_CONNECTIONS "Expand Network Connections" IDS_ADVANCED_DISPLAY_RUN "Display Run" IDS_ADVANCED_DISPLAY_ADMINTOOLS "Display Administrative Tools" diff --git a/dll/win32/shell32/lang/id-ID.rc b/dll/win32/shell32/lang/id-ID.rc index 37750e7d5ba..261ce8d012a 100644 --- a/dll/win32/shell32/lang/id-ID.rc +++ b/dll/win32/shell32/lang/id-ID.rc @@ -1011,8 +1011,11 @@ BEGIN IDS_ADVANCED_SHOW_INFO_TIP "Tampilkan deskrisi popup untuk butir folder dan desktop" IDS_ADVANCED_DISPLAY_FAVORITES "Display Favorites" IDS_ADVANCED_DISPLAY_LOG_OFF "Display Log Off" + IDS_ADVANCED_EXPAND_CONTROL_PANEL "Expand Control Panel" IDS_ADVANCED_EXPAND_MY_DOCUMENTS "Expand My Documents" + IDS_ADVANCED_EXPAND_PRINTERS "Expand Printers" IDS_ADVANCED_EXPAND_MY_PICTURES "Expand My Pictures" + IDS_ADVANCED_EXPAND_NET_CONNECTIONS "Expand Network Connections" IDS_ADVANCED_DISPLAY_RUN "Display Run" IDS_ADVANCED_DISPLAY_ADMINTOOLS "Display Administrative Tools" diff --git a/dll/win32/shell32/lang/it-IT.rc b/dll/win32/shell32/lang/it-IT.rc index ec378727a95..6af11defb3b 100644 --- a/dll/win32/shell32/lang/it-IT.rc +++ b/dll/win32/shell32/lang/it-IT.rc @@ -1014,8 +1014,11 @@ BEGIN IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop items" IDS_ADVANCED_DISPLAY_FAVORITES "Display Favorites" IDS_ADVANCED_DISPLAY_LOG_OFF "Display Log Off" + IDS_ADVANCED_EXPAND_CONTROL_PANEL "Expand Control Panel" IDS_ADVANCED_EXPAND_MY_DOCUMENTS "Expand My Documents" + IDS_ADVANCED_EXPAND_PRINTERS "Expand Printers" IDS_ADVANCED_EXPAND_MY_PICTURES "Expand My Pictures" + IDS_ADVANCED_EXPAND_NET_CONNECTIONS "Expand Network Connections" IDS_ADVANCED_DISPLAY_RUN "Display Run" IDS_ADVANCED_DISPLAY_ADMINTOOLS "Display Administrative Tools" diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc index 2aecb43670b..75537d33a5c 100644 --- a/dll/win32/shell32/lang/ja-JP.rc +++ b/dll/win32/shell32/lang/ja-JP.rc @@ -1011,8 +1011,11 @@ BEGIN IDS_ADVANCED_SHOW_INFO_TIP "フォルダとデスクトップの項目にポップアップ式の説明を表示する" IDS_ADVANCED_DISPLAY_FAVORITES "「お気に入り」を表示" IDS_ADVANCED_DISPLAY_LOG_OFF "「ログオフ」を表示" + IDS_ADVANCED_EXPAND_CONTROL_PANEL "「コントロール パネル」を展開" IDS_ADVANCED_EXPAND_MY_DOCUMENTS "「マイ ドキュメント」を展開" + IDS_ADVANCED_EXPAND_PRINTERS "「プリンタ」を展開" IDS_ADVANCED_EXPAND_MY_PICTURES "「マイ ピクチャ」を展開" + IDS_ADVANCED_EXPAND_NET_CONNECTIONS "「マイ ネットワーク」を展開" IDS_ADVANCED_DISPLAY_RUN "「ファイル名を指定して実行」を表示" IDS_ADVANCED_DISPLAY_ADMINTOOLS "「管理者ツール」を表示" diff --git a/dll/win32/shell32/lang/ko-KR.rc b/dll/win32/shell32/lang/ko-KR.rc index 9f033c66595..81f89b1c4af 100644 --- a/dll/win32/shell32/lang/ko-KR.rc +++ b/dll/win32/shell32/lang/ko-KR.rc @@ -1021,8 +1021,11 @@ BEGIN IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop items" IDS_ADVANCED_DISPLAY_FAVORITES "Display Favorites" IDS_ADVANCED_DISPLAY_LOG_OFF "Display Log Off" + IDS_ADVANCED_EXPAND_CONTROL_PANEL "Expand Control Panel" IDS_ADVANCED_EXPAND_MY_DOCUMENTS "Expand My Documents" + IDS_ADVANCED_EXPAND_PRINTERS "Expand Printers" IDS_ADVANCED_EXPAND_MY_PICTURES "Expand My Pictures" + IDS_ADVANCED_EXPAND_NET_CONNECTIONS "Expand Network Connections" IDS_ADVANCED_DISPLAY_RUN "Display Run" IDS_ADVANCED_DISPLAY_ADMINTOOLS "Display Administrative Tools" diff --git a/dll/win32/shell32/lang/nl-NL.rc b/dll/win32/shell32/lang/nl-NL.rc index 981075f2e2c..079fd5766e4 100644 --- a/dll/win32/shell32/lang/nl-NL.rc +++ b/dll/win32/shell32/lang/nl-NL.rc @@ -1014,8 +1014,11 @@ BEGIN IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop items" IDS_ADVANCED_DISPLAY_FAVORITES "Display Favorites" IDS_ADVANCED_DISPLAY_LOG_OFF "Display Log Off" + IDS_ADVANCED_EXPAND_CONTROL_PANEL "Expand Control Panel" IDS_ADVANCED_EXPAND_MY_DOCUMENTS "Expand My Documents" + IDS_ADVANCED_EXPAND_PRINTERS "Expand Printers" IDS_ADVANCED_EXPAND_MY_PICTURES "Expand My Pictures" + IDS_ADVANCED_EXPAND_NET_CONNECTIONS "Expand Network Connections" IDS_ADVANCED_DISPLAY_RUN "Display Run" IDS_ADVANCED_DISPLAY_ADMINTOOLS "Display Administrative Tools" diff --git a/dll/win32/shell32/lang/no-NO.rc b/dll/win32/shell32/lang/no-NO.rc index bf851d2a300..ea625e68480 100644 --- a/dll/win32/shell32/lang/no-NO.rc +++ b/dll/win32/shell32/lang/no-NO.rc @@ -1014,8 +1014,11 @@ BEGIN IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop items" IDS_ADVANCED_DISPLAY_FAVORITES "Display Favorites" IDS_ADVANCED_DISPLAY_LOG_OFF "Display Log Off" + IDS_ADVANCED_EXPAND_CONTROL_PANEL "Expand Control Panel" IDS_ADVANCED_EXPAND_MY_DOCUMENTS "Expand My Documents" + IDS_ADVANCED_EXPAND_PRINTERS "Expand Printers" IDS_ADVANCED_EXPAND_MY_PICTURES "Expand My Pictures" + IDS_ADVANCED_EXPAND_NET_CONNECTIONS "Expand Network Connections" IDS_ADVANCED_DISPLAY_RUN "Display Run" IDS_ADVANCED_DISPLAY_ADMINTOOLS "Display Administrative Tools" diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc index ce50d46e630..5da6f59fc56 100644 --- a/dll/win32/shell32/lang/pl-PL.rc +++ b/dll/win32/shell32/lang/pl-PL.rc @@ -1023,8 +1023,11 @@ BEGIN IDS_ADVANCED_SHOW_INFO_TIP "Pokaż podręczny opis elementów folderów i pulpitu" IDS_ADVANCED_DISPLAY_FAVORITES "Wyświetl polecenie Ulubione" IDS_ADVANCED_DISPLAY_LOG_OFF "Wyświetl polecenie Wyloguj" + IDS_ADVANCED_EXPAND_CONTROL_PANEL "Expand Control Panel" IDS_ADVANCED_EXPAND_MY_DOCUMENTS "Expand My Documents" + IDS_ADVANCED_EXPAND_PRINTERS "Expand Printers" IDS_ADVANCED_EXPAND_MY_PICTURES "Expand My Pictures" + IDS_ADVANCED_EXPAND_NET_CONNECTIONS "Expand Network Connections" IDS_ADVANCED_DISPLAY_RUN "Wyświetl polecenie Uruchom" IDS_ADVANCED_DISPLAY_ADMINTOOLS "Wyświetl polecenie Narzędzia administracyjne" diff --git a/dll/win32/shell32/lang/pt-BR.rc b/dll/win32/shell32/lang/pt-BR.rc index d1f2bbed748..32df4c6519b 100644 --- a/dll/win32/shell32/lang/pt-BR.rc +++ b/dll/win32/shell32/lang/pt-BR.rc @@ -1014,8 +1014,11 @@ BEGIN IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop items" IDS_ADVANCED_DISPLAY_FAVORITES "Display Favorites" IDS_ADVANCED_DISPLAY_LOG_OFF "Display Log Off" + IDS_ADVANCED_EXPAND_CONTROL_PANEL "Expand Control Panel" IDS_ADVANCED_EXPAND_MY_DOCUMENTS "Expand My Documents" + IDS_ADVANCED_EXPAND_PRINTERS "Expand Printers" IDS_ADVANCED_EXPAND_MY_PICTURES "Expand My Pictures" + IDS_ADVANCED_EXPAND_NET_CONNECTIONS "Expand Network Connections" IDS_ADVANCED_DISPLAY_RUN "Display Run" IDS_ADVANCED_DISPLAY_ADMINTOOLS "Display Administrative Tools" diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc index b933142c4cd..b4370d67019 100644 --- a/dll/win32/shell32/lang/pt-PT.rc +++ b/dll/win32/shell32/lang/pt-PT.rc @@ -1013,8 +1013,11 @@ BEGIN IDS_ADVANCED_SHOW_INFO_TIP "Mostrar descrição pop-up para itens de pastas e área de trabalho" IDS_ADVANCED_DISPLAY_FAVORITES "Display Favorites" IDS_ADVANCED_DISPLAY_LOG_OFF "Display Log Off" + IDS_ADVANCED_EXPAND_CONTROL_PANEL "Expand Control Panel" IDS_ADVANCED_EXPAND_MY_DOCUMENTS "Expand My Documents" + IDS_ADVANCED_EXPAND_PRINTERS "Expand Printers" IDS_ADVANCED_EXPAND_MY_PICTURES "Expand My Pictures" + IDS_ADVANCED_EXPAND_NET_CONNECTIONS "Expand Network Connections" IDS_ADVANCED_DISPLAY_RUN "Display Run" IDS_ADVANCED_DISPLAY_ADMINTOOLS "Display Administrative Tools" diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc index b94c39eecb4..c839f9d9db9 100644 --- a/dll/win32/shell32/lang/ro-RO.rc +++ b/dll/win32/shell32/lang/ro-RO.rc @@ -1022,8 +1022,11 @@ BEGIN IDS_ADVANCED_SHOW_INFO_TIP "Permite descriere prin indicii pentru foldere și elemente de desktop" IDS_ADVANCED_DISPLAY_FAVORITES "Display Favorites" IDS_ADVANCED_DISPLAY_LOG_OFF "Display Log Off" + IDS_ADVANCED_EXPAND_CONTROL_PANEL "Expand Control Panel" IDS_ADVANCED_EXPAND_MY_DOCUMENTS "Expand My Documents" + IDS_ADVANCED_EXPAND_PRINTERS "Expand Printers" IDS_ADVANCED_EXPAND_MY_PICTURES "Expand My Pictures" + IDS_ADVANCED_EXPAND_NET_CONNECTIONS "Expand Network Connections" IDS_ADVANCED_DISPLAY_RUN "Display Run" IDS_ADVANCED_DISPLAY_ADMINTOOLS "Display Administrative Tools" diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc index c404689885b..ed408b6469d 100644 --- a/dll/win32/shell32/lang/ru-RU.rc +++ b/dll/win32/shell32/lang/ru-RU.rc @@ -1023,8 +1023,11 @@ BEGIN IDS_ADVANCED_SHOW_INFO_TIP "Отображать описание для папок и элементов рабочего стола" IDS_ADVANCED_DISPLAY_FAVORITES "Отображать папку ""Избранное""" IDS_ADVANCED_DISPLAY_LOG_OFF "Отображать команду ""Завершение сеанса""" + IDS_ADVANCED_EXPAND_CONTROL_PANEL "Expand Control Panel" IDS_ADVANCED_EXPAND_MY_DOCUMENTS "Expand My Documents" + IDS_ADVANCED_EXPAND_PRINTERS "Expand Printers" IDS_ADVANCED_EXPAND_MY_PICTURES "Expand My Pictures" + IDS_ADVANCED_EXPAND_NET_CONNECTIONS "Expand Network Connections" IDS_ADVANCED_DISPLAY_RUN "Отображать команду ""Выполнить""" IDS_ADVANCED_DISPLAY_ADMINTOOLS "Отображать меню ""Администрирование""" diff --git a/dll/win32/shell32/lang/sk-SK.rc b/dll/win32/shell32/lang/sk-SK.rc index 4143a9c3fdd..c18a52969e5 100644 --- a/dll/win32/shell32/lang/sk-SK.rc +++ b/dll/win32/shell32/lang/sk-SK.rc @@ -1014,8 +1014,11 @@ BEGIN IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop items" IDS_ADVANCED_DISPLAY_FAVORITES "Display Favorites" IDS_ADVANCED_DISPLAY_LOG_OFF "Display Log Off" + IDS_ADVANCED_EXPAND_CONTROL_PANEL "Expand Control Panel" IDS_ADVANCED_EXPAND_MY_DOCUMENTS "Expand My Documents" + IDS_ADVANCED_EXPAND_PRINTERS "Expand Printers" IDS_ADVANCED_EXPAND_MY_PICTURES "Expand My Pictures" + IDS_ADVANCED_EXPAND_NET_CONNECTIONS "Expand Network Connections" IDS_ADVANCED_DISPLAY_RUN "Display Run" IDS_ADVANCED_DISPLAY_ADMINTOOLS "Display Administrative Tools" diff --git a/dll/win32/shell32/lang/sl-SI.rc b/dll/win32/shell32/lang/sl-SI.rc index 8620536032d..8f891e7422d 100644 --- a/dll/win32/shell32/lang/sl-SI.rc +++ b/dll/win32/shell32/lang/sl-SI.rc @@ -1014,8 +1014,11 @@ BEGIN IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop items" IDS_ADVANCED_DISPLAY_FAVORITES "Display Favorites" IDS_ADVANCED_DISPLAY_LOG_OFF "Display Log Off" + IDS_ADVANCED_EXPAND_CONTROL_PANEL "Expand Control Panel" IDS_ADVANCED_EXPAND_MY_DOCUMENTS "Expand My Documents" + IDS_ADVANCED_EXPAND_PRINTERS "Expand Printers" IDS_ADVANCED_EXPAND_MY_PICTURES "Expand My Pictures" + IDS_ADVANCED_EXPAND_NET_CONNECTIONS "Expand Network Connections" IDS_ADVANCED_DISPLAY_RUN "Display Run" IDS_ADVANCED_DISPLAY_ADMINTOOLS "Display Administrative Tools" diff --git a/dll/win32/shell32/lang/sq-AL.rc b/dll/win32/shell32/lang/sq-AL.rc index 4ddcd2104f5..fe9f522ad0a 100644 --- a/dll/win32/shell32/lang/sq-AL.rc +++ b/dll/win32/shell32/lang/sq-AL.rc @@ -1021,8 +1021,11 @@ BEGIN IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop items" IDS_ADVANCED_DISPLAY_FAVORITES "Display Favorites" IDS_ADVANCED_DISPLAY_LOG_OFF "Display Log Off" + IDS_ADVANCED_EXPAND_CONTROL_PANEL "Expand Control Panel" IDS_ADVANCED_EXPAND_MY_DOCUMENTS "Expand My Documents" + IDS_ADVANCED_EXPAND_PRINTERS "Expand Printers" IDS_ADVANCED_EXPAND_MY_PICTURES "Expand My Pictures" + IDS_ADVANCED_EXPAND_NET_CONNECTIONS "Expand Network Connections" IDS_ADVANCED_DISPLAY_RUN "Display Run" IDS_ADVANCED_DISPLAY_ADMINTOOLS "Display Administrative Tools" diff --git a/dll/win32/shell32/lang/sv-SE.rc b/dll/win32/shell32/lang/sv-SE.rc index 0a61e4f1cff..514ffc671c1 100644 --- a/dll/win32/shell32/lang/sv-SE.rc +++ b/dll/win32/shell32/lang/sv-SE.rc @@ -1014,8 +1014,11 @@ BEGIN IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop items" IDS_ADVANCED_DISPLAY_FAVORITES "Display Favorites" IDS_ADVANCED_DISPLAY_LOG_OFF "Display Log Off" + IDS_ADVANCED_EXPAND_CONTROL_PANEL "Expand Control Panel" IDS_ADVANCED_EXPAND_MY_DOCUMENTS "Expand My Documents" + IDS_ADVANCED_EXPAND_PRINTERS "Expand Printers" IDS_ADVANCED_EXPAND_MY_PICTURES "Expand My Pictures" + IDS_ADVANCED_EXPAND_NET_CONNECTIONS "Expand Network Connections" IDS_ADVANCED_DISPLAY_RUN "Display Run" IDS_ADVANCED_DISPLAY_ADMINTOOLS "Display Administrative Tools" diff --git a/dll/win32/shell32/lang/tr-TR.rc b/dll/win32/shell32/lang/tr-TR.rc index a8d5dd6ca4b..be6886bd04a 100644 --- a/dll/win32/shell32/lang/tr-TR.rc +++ b/dll/win32/shell32/lang/tr-TR.rc @@ -1023,8 +1023,11 @@ BEGIN IDS_ADVANCED_SHOW_INFO_TIP "Dizin ve masaüstü ögeleri için açılan tanım göster" IDS_ADVANCED_DISPLAY_FAVORITES "Display Favorites" IDS_ADVANCED_DISPLAY_LOG_OFF "Display Log Off" + IDS_ADVANCED_EXPAND_CONTROL_PANEL "Expand Control Panel" IDS_ADVANCED_EXPAND_MY_DOCUMENTS "Expand My Documents" + IDS_ADVANCED_EXPAND_PRINTERS "Expand Printers" IDS_ADVANCED_EXPAND_MY_PICTURES "Expand My Pictures" + IDS_ADVANCED_EXPAND_NET_CONNECTIONS "Expand Network Connections" IDS_ADVANCED_DISPLAY_RUN "Display Run" IDS_ADVANCED_DISPLAY_ADMINTOOLS "Display Administrative Tools" diff --git a/dll/win32/shell32/lang/uk-UA.rc b/dll/win32/shell32/lang/uk-UA.rc index 731e69799c0..83ca1877267 100644 --- a/dll/win32/shell32/lang/uk-UA.rc +++ b/dll/win32/shell32/lang/uk-UA.rc @@ -1014,8 +1014,11 @@ BEGIN IDS_ADVANCED_SHOW_INFO_TIP "Показувати спливаючий опис для елементів папки та робочого столу" IDS_ADVANCED_DISPLAY_FAVORITES "Display Favorites" IDS_ADVANCED_DISPLAY_LOG_OFF "Display Log Off" + IDS_ADVANCED_EXPAND_CONTROL_PANEL "Expand Control Panel" IDS_ADVANCED_EXPAND_MY_DOCUMENTS "Expand My Documents" + IDS_ADVANCED_EXPAND_PRINTERS "Expand Printers" IDS_ADVANCED_EXPAND_MY_PICTURES "Expand My Pictures" + IDS_ADVANCED_EXPAND_NET_CONNECTIONS "Expand Network Connections" IDS_ADVANCED_DISPLAY_RUN "Display Run" IDS_ADVANCED_DISPLAY_ADMINTOOLS "Display Administrative Tools" diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc index 20a697ebde9..253eb1d3883 100644 --- a/dll/win32/shell32/lang/zh-CN.rc +++ b/dll/win32/shell32/lang/zh-CN.rc @@ -1024,8 +1024,11 @@ BEGIN IDS_ADVANCED_SHOW_INFO_TIP "显示文件夹和桌面项目的弹出描述" IDS_ADVANCED_DISPLAY_FAVORITES "Display Favorites" IDS_ADVANCED_DISPLAY_LOG_OFF "Display Log Off" + IDS_ADVANCED_EXPAND_CONTROL_PANEL "Expand Control Panel" IDS_ADVANCED_EXPAND_MY_DOCUMENTS "Expand My Documents" + IDS_ADVANCED_EXPAND_PRINTERS "Expand Printers" IDS_ADVANCED_EXPAND_MY_PICTURES "Expand My Pictures" + IDS_ADVANCED_EXPAND_NET_CONNECTIONS "Expand Network Connections" IDS_ADVANCED_DISPLAY_RUN "Display Run" IDS_ADVANCED_DISPLAY_ADMINTOOLS "Display Administrative Tools" diff --git a/dll/win32/shell32/lang/zh-HK.rc b/dll/win32/shell32/lang/zh-HK.rc index 4c94137da7a..7a3709ac5c6 100644 --- a/dll/win32/shell32/lang/zh-HK.rc +++ b/dll/win32/shell32/lang/zh-HK.rc @@ -1022,8 +1022,11 @@ BEGIN IDS_ADVANCED_SHOW_INFO_TIP "顯示資料夾和桌面項目的快顯描述" IDS_ADVANCED_DISPLAY_FAVORITES "Display Favorites" IDS_ADVANCED_DISPLAY_LOG_OFF "Display Log Off" + IDS_ADVANCED_EXPAND_CONTROL_PANEL "Expand Control Panel" IDS_ADVANCED_EXPAND_MY_DOCUMENTS "Expand My Documents" + IDS_ADVANCED_EXPAND_PRINTERS "Expand Printers" IDS_ADVANCED_EXPAND_MY_PICTURES "Expand My Pictures" + IDS_ADVANCED_EXPAND_NET_CONNECTIONS "Expand Network Connections" IDS_ADVANCED_DISPLAY_RUN "Display Run" IDS_ADVANCED_DISPLAY_ADMINTOOLS "Display Administrative Tools" diff --git a/dll/win32/shell32/lang/zh-TW.rc b/dll/win32/shell32/lang/zh-TW.rc index 6bd34799cc4..cc14c766b8d 100644 --- a/dll/win32/shell32/lang/zh-TW.rc +++ b/dll/win32/shell32/lang/zh-TW.rc @@ -1023,8 +1023,11 @@ BEGIN IDS_ADVANCED_SHOW_INFO_TIP "顯示資料夾和桌面項目的快顯描述" IDS_ADVANCED_DISPLAY_FAVORITES "Display Favorites" IDS_ADVANCED_DISPLAY_LOG_OFF "Display Log Off" + IDS_ADVANCED_EXPAND_CONTROL_PANEL "Expand Control Panel" IDS_ADVANCED_EXPAND_MY_DOCUMENTS "Expand My Documents" + IDS_ADVANCED_EXPAND_PRINTERS "Expand Printers" IDS_ADVANCED_EXPAND_MY_PICTURES "Expand My Pictures" + IDS_ADVANCED_EXPAND_NET_CONNECTIONS "Expand Network Connections" IDS_ADVANCED_DISPLAY_RUN "Display Run" IDS_ADVANCED_DISPLAY_ADMINTOOLS "Display Administrative Tools" diff --git a/dll/win32/shell32/shellmenu/CStartMenu.cpp b/dll/win32/shell32/shellmenu/CStartMenu.cpp index b6c2fbf7886..5dd1ed4625b 100644 --- a/dll/win32/shell32/shellmenu/CStartMenu.cpp +++ b/dll/win32/shell32/shellmenu/CStartMenu.cpp @@ -153,33 +153,41 @@ private: return S_OK; } - void InsertRecentItem(HMENU hMenu, UINT nID, INT csidl, BOOL bExpand) const + void AddOrSetMenuItem(HMENU hMenu, UINT nID, INT csidl, BOOL bExpand, + BOOL bAdd = TRUE, BOOL bSetText = TRUE) const { - WCHAR szPath[MAX_PATH]; - if (!SHGetSpecialFolderPathW(NULL, szPath, csidl, FALSE)) + MENUITEMINFOW mii = { sizeof(mii), MIIM_ID | MIIM_SUBMENU }; + mii.wID = nID; + + SHFILEINFOW fileInfo = { 0 }; + if (bAdd || bSetText) { - ERR("SHGetSpecialFolderPathW failed\n"); - return; + LPITEMIDLIST pidl; + if (SHGetSpecialFolderLocation(NULL, csidl, &pidl) != S_OK) + { + ERR("SHGetSpecialFolderLocation failed\n"); + return; + } + + SHGetFileInfoW((LPWSTR)pidl, 0, &fileInfo, sizeof(fileInfo), + SHGFI_PIDL | SHGFI_DISPLAYNAME); + CoTaskMemFree(pidl); + + mii.fMask |= MIIM_TYPE; + mii.fType = MFT_STRING; + mii.dwTypeData = fileInfo.szDisplayName; } - LPWSTR pszText = PathFindFileNameW(szPath); if (bExpand) - { - MENUITEMINFOW mii = { sizeof(mii), MIIM_TYPE | MIIM_ID | MIIM_SUBMENU }; - mii.fType = MFT_STRING; - mii.wID = nID; mii.hSubMenu = ::CreatePopupMenu(); - mii.dwTypeData = pszText; - mii.cch = lstrlenW(pszText); + + if (bAdd) InsertMenuItemW(hMenu, GetMenuItemCount(hMenu), TRUE, &mii); - } else - { - AppendMenuW(hMenu, MF_STRING | MF_ENABLED, nID, pszText); - } + SetMenuItemInfoW(hMenu, nID, FALSE, &mii); } - BOOL GetAdvancedValue(LPCWSTR pszName, BOOL bDefault) const + BOOL GetAdvancedValue(LPCWSTR pszName, BOOL bDefault = FALSE) const { return SHRegGetBoolUSValueW( L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Advanced", @@ -191,17 +199,56 @@ private: BOOL bExpandMyDocuments = GetAdvancedValue(L"CascadeMyDocuments", FALSE); BOOL bExpandMyPictures = GetAdvancedValue(L"CascadeMyPictures", FALSE); HMENU hMenu = ::CreateMenu(); - InsertRecentItem(hMenu, IDM_MYDOCUMENTS, CSIDL_MYDOCUMENTS, bExpandMyDocuments); - InsertRecentItem(hMenu, IDM_MYPICTURES, CSIDL_MYPICTURES, bExpandMyPictures); + AddOrSetMenuItem(hMenu, IDM_MYDOCUMENTS, CSIDL_MYDOCUMENTS, bExpandMyDocuments); + AddOrSetMenuItem(hMenu, IDM_MYPICTURES, CSIDL_MYPICTURES, bExpandMyPictures); AppendMenuW(hMenu, MF_SEPARATOR, 0, NULL); return hMenu; } + void UpdateSettingsMenu(HMENU hMenu) + { + BOOL bExpand; + + bExpand = GetAdvancedValue(L"CascadeControlPanel"); + AddOrSetMenuItem(hMenu, IDM_CONTROLPANEL, CSIDL_CONTROLS, bExpand, FALSE, FALSE); + + bExpand = GetAdvancedValue(L"CascadeNetworkConnections"); + AddOrSetMenuItem(hMenu, IDM_NETWORKCONNECTIONS, CSIDL_NETWORK, bExpand, FALSE, FALSE); + + bExpand = GetAdvancedValue(L"CascadePrinters"); + AddOrSetMenuItem(hMenu, IDM_PRINTERSANDFAXES, CSIDL_PRINTERS, bExpand, FALSE, FALSE); + } + + HRESULT AddStartMenuItems(IShellMenu *pShellMenu, INT csidl, DWORD dwFlags) + { + LPITEMIDLIST pidlMenu; + CComPtr psfDesktop; + CComPtr pShellFolder; + HRESULT hr; + + hr = SHGetFolderLocation(NULL, csidl, 0, 0, &pidlMenu); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + hr = SHGetDesktopFolder(&psfDesktop); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + hr = psfDesktop->BindToObject(pidlMenu, NULL, IID_PPV_ARG(IShellFolder, &pShellFolder)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + hr = pShellMenu->SetShellFolder(pShellFolder, NULL, NULL, dwFlags); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + return hr; + } + HRESULT OnGetSubMenu(LPSMDATA psmd, REFIID iid, void ** pv) { HRESULT hr; - int csidl = 0; - IShellMenu *pShellMenu; + CComPtr pShellMenu; hr = CMenuBand_CreateInstance(IID_PPV_ARG(IShellMenu, &pShellMenu)); if (FAILED_UNEXPECTEDLY(hr)) @@ -211,71 +258,89 @@ private: if (FAILED_UNEXPECTEDLY(hr)) return hr; + hr = E_FAIL; switch (psmd->uId) { - case IDM_PROGRAMS: csidl = CSIDL_PROGRAMS; break; - case IDM_FAVORITES: csidl = CSIDL_FAVORITES; break; - case IDM_DOCUMENTS: csidl = CSIDL_RECENT; break; - case IDM_MYDOCUMENTS: csidl = CSIDL_MYDOCUMENTS; break; - case IDM_MYPICTURES: csidl = CSIDL_MYPICTURES; break; - } - - if (csidl) - { - IShellFolder *psfStartMenu; - DWORD dwFlags = SMSET_TOP; - - if (csidl == CSIDL_PROGRAMS && m_psfPrograms) + case IDM_PROGRAMS: { - psfStartMenu = m_psfPrograms; + if (m_psfPrograms) + hr = pShellMenu->SetShellFolder(m_psfPrograms, NULL, NULL, SMSET_TOP); + break; } - else + case IDM_FAVORITES: { - if (csidl == CSIDL_RECENT) - { - HMENU hMenu = CreateRecentMenu(); - if (hMenu == NULL) - ERR("CreateRecentMenu failed\n"); + hr = AddStartMenuItems(pShellMenu, CSIDL_FAVORITES, SMSET_TOP); + break; + } + case IDM_DOCUMENTS: + { + HMENU hMenu = CreateRecentMenu(); + if (hMenu == NULL) + ERR("CreateRecentMenu failed\n"); - hr = pShellMenu->SetMenu(hMenu, NULL, SMSET_BOTTOM); + hr = pShellMenu->SetMenu(hMenu, NULL, SMSET_BOTTOM); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + hr = AddStartMenuItems(pShellMenu, CSIDL_RECENT, SMSET_BOTTOM); + break; + } + case IDM_MYDOCUMENTS: + { + hr = AddStartMenuItems(pShellMenu, CSIDL_MYDOCUMENTS, SMSET_TOP); + break; + } + case IDM_MYPICTURES: + { + hr = AddStartMenuItems(pShellMenu, CSIDL_MYPICTURES, SMSET_TOP); + break; + } + case IDM_CONTROLPANEL: + { + hr = AddStartMenuItems(pShellMenu, CSIDL_CONTROLS, SMSET_TOP); + break; + } + case IDM_NETWORKCONNECTIONS: + { + hr = AddStartMenuItems(pShellMenu, CSIDL_NETWORK, SMSET_TOP); + break; + } + case IDM_PRINTERSANDFAXES: + { + hr = AddStartMenuItems(pShellMenu, CSIDL_PRINTERS, SMSET_TOP); + break; + } + case IDM_SETTINGS: + { + MENUITEMINFOW mii = { sizeof(mii), MIIM_SUBMENU }; + if (GetMenuItemInfoW(psmd->hmenu, psmd->uId, FALSE, &mii)) + { + UpdateSettingsMenu(mii.hSubMenu); + + hr = pShellMenu->SetMenu(mii.hSubMenu, NULL, SMSET_BOTTOM); if (FAILED_UNEXPECTEDLY(hr)) return hr; - - dwFlags = SMSET_BOTTOM; } - - LPITEMIDLIST pidlStartMenu; - IShellFolder *psfDestop; - hr = SHGetFolderLocation(NULL, csidl, 0, 0, &pidlStartMenu); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; - - hr = SHGetDesktopFolder(&psfDestop); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; - - hr = psfDestop->BindToObject(pidlStartMenu, NULL, IID_PPV_ARG(IShellFolder, &psfStartMenu)); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; + break; } - - hr = pShellMenu->SetShellFolder(psfStartMenu, NULL, NULL, dwFlags); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; - } - else - { - MENUITEMINFO mii; - mii.cbSize = sizeof(mii); - mii.fMask = MIIM_SUBMENU; - if (GetMenuItemInfoW(psmd->hmenu, psmd->uId, FALSE, &mii)) + default: { - hr = pShellMenu->SetMenu(mii.hSubMenu, NULL, SMSET_BOTTOM); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; + MENUITEMINFOW mii = { sizeof(mii), MIIM_SUBMENU }; + if (GetMenuItemInfoW(psmd->hmenu, psmd->uId, FALSE, &mii)) + { + hr = pShellMenu->SetMenu(mii.hSubMenu, NULL, SMSET_BOTTOM); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + } } } - return pShellMenu->QueryInterface(iid, pv); + + if (FAILED(hr)) + return hr; + + hr = pShellMenu->QueryInterface(iid, pv); + pShellMenu.Detach(); + return hr; } HRESULT OnGetContextMenu(LPSMDATA psmd, REFIID iid, void ** pv) diff --git a/dll/win32/shell32/shresdef.h b/dll/win32/shell32/shresdef.h index efbd539b756..0f420421464 100644 --- a/dll/win32/shell32/shresdef.h +++ b/dll/win32/shell32/shresdef.h @@ -309,8 +309,11 @@ /* These values must be synchronized with explorer */ #define IDS_ADVANCED_DISPLAY_FAVORITES 30466 #define IDS_ADVANCED_DISPLAY_LOG_OFF 30467 +#define IDS_ADVANCED_EXPAND_CONTROL_PANEL 30468 #define IDS_ADVANCED_EXPAND_MY_DOCUMENTS 30469 +#define IDS_ADVANCED_EXPAND_PRINTERS 30470 #define IDS_ADVANCED_EXPAND_MY_PICTURES 30472 +#define IDS_ADVANCED_EXPAND_NET_CONNECTIONS 30473 #define IDS_ADVANCED_DISPLAY_RUN 30474 #define IDS_ADVANCED_DISPLAY_ADMINTOOLS 30476