From 611989943ecbcf66269f33d014f872dec41a6b42 Mon Sep 17 00:00:00 2001 From: Eric Kohl Date: Sat, 3 Aug 2019 21:52:00 +0200 Subject: [PATCH] [DEVMGR] Change the menu id prefix from IDC_ to IDM_. --- dll/win32/devmgr/devmgmt/DeviceView.cpp | 28 +++--- dll/win32/devmgr/devmgmt/MainWindow.cpp | 109 ++++++++++++------------ dll/win32/devmgr/lang/bg-BG.rc | 20 ++--- dll/win32/devmgr/lang/cs-CZ.rc | 20 ++--- dll/win32/devmgr/lang/de-DE.rc | 20 ++--- dll/win32/devmgr/lang/el-GR.rc | 20 ++--- dll/win32/devmgr/lang/en-US.rc | 20 ++--- dll/win32/devmgr/lang/es-ES.rc | 20 ++--- dll/win32/devmgr/lang/et-EE.rc | 20 ++--- dll/win32/devmgr/lang/fr-FR.rc | 20 ++--- dll/win32/devmgr/lang/he-IL.rc | 20 ++--- dll/win32/devmgr/lang/hu-HU.rc | 20 ++--- dll/win32/devmgr/lang/id-ID.rc | 20 ++--- dll/win32/devmgr/lang/it-IT.rc | 20 ++--- dll/win32/devmgr/lang/ja-JP.rc | 20 ++--- dll/win32/devmgr/lang/no-NO.rc | 20 ++--- dll/win32/devmgr/lang/pl-PL.rc | 20 ++--- dll/win32/devmgr/lang/pt-BR.rc | 20 ++--- dll/win32/devmgr/lang/pt-PT.rc | 20 ++--- dll/win32/devmgr/lang/ro-RO.rc | 20 ++--- dll/win32/devmgr/lang/ru-RU.rc | 20 ++--- dll/win32/devmgr/lang/sk-SK.rc | 20 ++--- dll/win32/devmgr/lang/sq-AL.rc | 20 ++--- dll/win32/devmgr/lang/tr-TR.rc | 20 ++--- dll/win32/devmgr/lang/uk-UA.rc | 18 ++-- dll/win32/devmgr/lang/zh-CN.rc | 18 ++-- dll/win32/devmgr/lang/zh-TW.rc | 20 ++--- dll/win32/devmgr/resource.h | 38 +++++---- 28 files changed, 336 insertions(+), 335 deletions(-) diff --git a/dll/win32/devmgr/devmgmt/DeviceView.cpp b/dll/win32/devmgr/devmgmt/DeviceView.cpp index 690609c73ca..917140efd50 100644 --- a/dll/win32/devmgr/devmgmt/DeviceView.cpp +++ b/dll/win32/devmgr/devmgmt/DeviceView.cpp @@ -225,13 +225,13 @@ CDeviceView::OnAction( { switch (Action) { - case IDC_PROPERTIES: + case IDM_PROPERTIES: { DisplayPropertySheet(); break; } - case IDC_SCAN_HARDWARE: + case IDM_SCAN_HARDWARE: { Refresh(GetCurrentView(), true, @@ -239,7 +239,7 @@ CDeviceView::OnAction( break; } - case IDC_ENABLE_DRV: + case IDM_ENABLE_DRV: { bool NeedsReboot; if (EnableSelectedDevice(true, NeedsReboot) && @@ -250,27 +250,27 @@ CDeviceView::OnAction( break; } - case IDC_DISABLE_DRV: + case IDM_DISABLE_DRV: { bool NeedsReboot; EnableSelectedDevice(false, NeedsReboot); break; } - case IDC_UPDATE_DRV: + case IDM_UPDATE_DRV: { bool NeedsReboot; UpdateSelectedDevice(NeedsReboot); break; } - case IDC_UNINSTALL_DRV: + case IDM_UNINSTALL_DRV: { UninstallSelectedDevice(); break; } - case IDC_ADD_HARDWARE: + case IDM_ADD_HARDWARE: { RunAddHardwareWizard(); break; @@ -878,7 +878,7 @@ CDeviceView::BuildActionMenuForNode( if (DeviceNode->CanUpdate()) { String.LoadStringW(g_hThisInstance, IDS_MENU_UPDATE); - MenuItemInfo.wID = IDC_UPDATE_DRV; + MenuItemInfo.wID = IDM_UPDATE_DRV; MenuItemInfo.dwTypeData = String.GetBuffer(); InsertMenuItemW(OwnerMenu, i, TRUE, &MenuItemInfo); i++; @@ -887,7 +887,7 @@ CDeviceView::BuildActionMenuForNode( if (DeviceNode->IsDisabled()) { String.LoadStringW(g_hThisInstance, IDS_MENU_ENABLE); - MenuItemInfo.wID = IDC_ENABLE_DRV; + MenuItemInfo.wID = IDM_ENABLE_DRV; MenuItemInfo.dwTypeData = String.GetBuffer(); InsertMenuItemW(OwnerMenu, i, TRUE, &MenuItemInfo); i++; @@ -896,7 +896,7 @@ CDeviceView::BuildActionMenuForNode( if (DeviceNode->CanDisable() && !DeviceNode->IsDisabled()) { String.LoadStringW(g_hThisInstance, IDS_MENU_DISABLE); - MenuItemInfo.wID = IDC_DISABLE_DRV; + MenuItemInfo.wID = IDM_DISABLE_DRV; MenuItemInfo.dwTypeData = String.GetBuffer(); InsertMenuItemW(OwnerMenu, i, TRUE, &MenuItemInfo); i++; @@ -905,7 +905,7 @@ CDeviceView::BuildActionMenuForNode( if (DeviceNode->CanUninstall()) { String.LoadStringW(g_hThisInstance, IDS_MENU_UNINSTALL); - MenuItemInfo.wID = IDC_UNINSTALL_DRV; + MenuItemInfo.wID = IDM_UNINSTALL_DRV; MenuItemInfo.dwTypeData = String.GetBuffer(); InsertMenuItemW(OwnerMenu, i, TRUE, &MenuItemInfo); i++; @@ -917,7 +917,7 @@ CDeviceView::BuildActionMenuForNode( // All nodes have the scan option String.LoadStringW(g_hThisInstance, IDS_MENU_SCAN); - MenuItemInfo.wID = IDC_SCAN_HARDWARE; + MenuItemInfo.wID = IDM_SCAN_HARDWARE; MenuItemInfo.dwTypeData = String.GetBuffer(); InsertMenuItemW(OwnerMenu, i, TRUE, &MenuItemInfo); i++; @@ -925,7 +925,7 @@ CDeviceView::BuildActionMenuForNode( if ((Node->GetNodeType() == RootNode) || (MainMenu == true)) { String.LoadStringW(g_hThisInstance, IDS_MENU_ADD); - MenuItemInfo.wID = IDC_ADD_HARDWARE; + MenuItemInfo.wID = IDM_ADD_HARDWARE; MenuItemInfo.dwTypeData = String.GetBuffer(); InsertMenuItemW(OwnerMenu, i, TRUE, &MenuItemInfo); i++; @@ -937,7 +937,7 @@ CDeviceView::BuildActionMenuForNode( i++; String.LoadStringW(g_hThisInstance, IDS_MENU_PROPERTIES); - MenuItemInfo.wID = IDC_PROPERTIES; + MenuItemInfo.wID = IDM_PROPERTIES; MenuItemInfo.dwTypeData = String.GetBuffer(); InsertMenuItemW(OwnerMenu, i, TRUE, &MenuItemInfo); i++; diff --git a/dll/win32/devmgr/devmgmt/MainWindow.cpp b/dll/win32/devmgr/devmgmt/MainWindow.cpp index 5b3c6eb669a..3273aad5bbb 100644 --- a/dll/win32/devmgr/devmgmt/MainWindow.cpp +++ b/dll/win32/devmgr/devmgmt/MainWindow.cpp @@ -30,26 +30,25 @@ HINSTANCE g_hParentInstance = NULL; static const MENU_HINT MainMenuHintTable[] = { // File Menu - { IDC_EXIT, IDS_HINT_EXIT }, + { IDM_EXIT, IDS_HINT_EXIT }, // Action Menu - { IDC_PROPERTIES, IDS_HINT_PROPERTIES }, - { IDC_SCAN_HARDWARE, IDS_HINT_SCAN }, - { IDC_ENABLE_DRV, IDS_HINT_ENABLE }, - { IDC_DISABLE_DRV, IDS_HINT_DISABLE }, - { IDC_UPDATE_DRV, IDS_HINT_UPDATE }, - { IDC_UNINSTALL_DRV, IDS_HINT_UNINSTALL }, - { IDC_ADD_HARDWARE, IDS_HINT_ADD }, - + { IDM_PROPERTIES, IDS_HINT_PROPERTIES }, + { IDM_SCAN_HARDWARE, IDS_HINT_SCAN }, + { IDM_ENABLE_DRV, IDS_HINT_ENABLE }, + { IDM_DISABLE_DRV, IDS_HINT_DISABLE }, + { IDM_UPDATE_DRV, IDS_HINT_UPDATE }, + { IDM_UNINSTALL_DRV, IDS_HINT_UNINSTALL }, + { IDM_ADD_HARDWARE, IDS_HINT_ADD }, // View Menu - { IDC_DEVBYTYPE, IDS_HINT_DEV_BY_TYPE}, - { IDC_DEVBYCONN, IDS_HINT_DEV_BY_CONN}, - { IDC_RESBYTYPE, IDS_HINT_RES_BY_TYPE}, - { IDC_RESBYCONN, IDS_HINT_RES_BY_TYPE}, - { IDC_SHOWHIDDEN, IDS_HINT_SHOW_HIDDEN }, + { IDM_DEVBYTYPE, IDS_HINT_DEV_BY_TYPE}, + { IDM_DEVBYCONN, IDS_HINT_DEV_BY_CONN}, + { IDM_RESBYTYPE, IDS_HINT_RES_BY_TYPE}, + { IDM_RESBYCONN, IDS_HINT_RES_BY_TYPE}, + { IDM_SHOWHIDDEN, IDS_HINT_SHOW_HIDDEN }, - { IDC_ABOUT, IDS_HINT_ABOUT } + { IDM_ABOUT, IDS_HINT_ABOUT } }; @@ -67,13 +66,13 @@ static const MENU_HINT SystemMenuHintTable[] = static TBBUTTON TbButtons[] = { - { BTN_PROPERTIES, IDC_PROPERTIES, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, - { BTN_SCAN_HARDWARE, IDC_SCAN_HARDWARE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, + { BTN_PROPERTIES, IDM_PROPERTIES, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, + { BTN_SCAN_HARDWARE, IDM_SCAN_HARDWARE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, { 2, IDC_STATIC, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0 }, - { BTN_ENABLE_DRV, IDC_ENABLE_DRV, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, - { BTN_DISABLE_DRV, IDC_DISABLE_DRV, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, - { BTN_UPDATE_DRV, IDC_UPDATE_DRV, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, - { BTN_UNINSTALL_DRV, IDC_UNINSTALL_DRV, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 } + { BTN_ENABLE_DRV, IDM_ENABLE_DRV, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, + { BTN_DISABLE_DRV, IDM_DISABLE_DRV, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, + { BTN_UPDATE_DRV, IDM_UPDATE_DRV, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, + { BTN_UNINSTALL_DRV, IDM_UNINSTALL_DRV, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 } }; @@ -150,7 +149,7 @@ CDeviceManager::Initialize(_In_z_ LPCTSTR lpCaption, wc.hIcon = LoadIcon(g_hThisInstance, MAKEINTRESOURCEW(IDI_MAIN_ICON)); wc.hCursor = LoadCursor(NULL, IDC_ARROW); wc.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1); - wc.lpszMenuName = MAKEINTRESOURCEW(IDR_MAINMENU); + wc.lpszMenuName = MAKEINTRESOURCEW(IDM_MAINMENU); wc.lpszClassName = m_szMainWndClass; wc.hIconSm = (HICON)LoadImage(g_hThisInstance, MAKEINTRESOURCE(IDI_MAIN_ICON), @@ -255,19 +254,19 @@ CDeviceManager::RefreshView(_In_ ViewType Type, switch (Type) { case DevicesByType: - CheckId = IDC_DEVBYTYPE; + CheckId = IDM_DEVBYTYPE; break; case DevicesByConnection: - CheckId = IDC_DEVBYCONN; + CheckId = IDM_DEVBYCONN; break; case ResourcesByType: - CheckId = IDC_RESBYTYPE; + CheckId = IDM_RESBYTYPE; break; case ResourcesByConnection: - CheckId = IDC_RESBYCONN; + CheckId = IDM_RESBYCONN; break; default: @@ -277,8 +276,8 @@ CDeviceManager::RefreshView(_In_ ViewType Type, // Set the new check item CheckMenuRadioItem(m_hMenu, - IDC_DEVBYTYPE, - IDC_RESBYCONN, + IDM_DEVBYTYPE, + IDM_RESBYCONN, CheckId, MF_BYCOMMAND); @@ -378,9 +377,9 @@ void CDeviceManager::UpdateToolbar() { State = TBSTATE_HIDDEN; } - SendMessageW(m_hToolBar, TB_SETSTATE, IDC_PROPERTIES, MAKELPARAM(State, 0)); - SendMessageW(m_hToolBar, TB_SETSTATE, IDC_UPDATE_DRV, MAKELPARAM(State, 0)); //hack - SendMessageW(m_hToolBar, TB_SETSTATE, IDC_UNINSTALL_DRV, MAKELPARAM(State, 0)); // hack + SendMessageW(m_hToolBar, TB_SETSTATE, IDM_PROPERTIES, MAKELPARAM(State, 0)); + SendMessageW(m_hToolBar, TB_SETSTATE, IDM_UPDATE_DRV, MAKELPARAM(State, 0)); //hack + SendMessageW(m_hToolBar, TB_SETSTATE, IDM_UNINSTALL_DRV, MAKELPARAM(State, 0)); // hack // enable driver button if (Node->GetNodeType() == DeviceNode && @@ -392,7 +391,7 @@ void CDeviceManager::UpdateToolbar() { State = TBSTATE_HIDDEN; } - SendMessageW(m_hToolBar, TB_SETSTATE, IDC_ENABLE_DRV, MAKELPARAM(State, 0)); + SendMessageW(m_hToolBar, TB_SETSTATE, IDM_ENABLE_DRV, MAKELPARAM(State, 0)); // disable driver button if (Node->GetNodeType() == DeviceNode && @@ -405,7 +404,7 @@ void CDeviceManager::UpdateToolbar() { State = TBSTATE_HIDDEN; } - SendMessageW(m_hToolBar, TB_SETSTATE, IDC_DISABLE_DRV, MAKELPARAM(State, 0)); + SendMessageW(m_hToolBar, TB_SETSTATE, IDM_DISABLE_DRV, MAKELPARAM(State, 0)); } bool @@ -541,22 +540,22 @@ CDeviceManager::OnNotify(_In_ LPARAM lParam) UINT_PTR idButton = lpttt->hdr.idFrom; switch (idButton) { - case IDC_PROPERTIES: + case IDM_PROPERTIES: lpttt->lpszText = MAKEINTRESOURCEW(IDS_TOOLTIP_PROPERTIES); break; - case IDC_SCAN_HARDWARE: + case IDM_SCAN_HARDWARE: lpttt->lpszText = MAKEINTRESOURCEW(IDS_TOOLTIP_SCAN); break; - case IDC_ENABLE_DRV: + case IDM_ENABLE_DRV: lpttt->lpszText = MAKEINTRESOURCEW(IDS_TOOLTIP_ENABLE); break; - case IDC_DISABLE_DRV: + case IDM_DISABLE_DRV: lpttt->lpszText = MAKEINTRESOURCEW(IDS_TOOLTIP_DISABLE); break; - case IDC_UPDATE_DRV: + case IDM_UPDATE_DRV: lpttt->lpszText = MAKEINTRESOURCEW(IDS_TOOLTIP_UPDATE); break; - case IDC_UNINSTALL_DRV: + case IDM_UNINSTALL_DRV: lpttt->lpszText = MAKEINTRESOURCEW(IDS_TOOLTIP_UNINSTALL); break; } @@ -585,19 +584,19 @@ CDeviceManager::OnCommand(_In_ WPARAM wParam, switch (Msg) { - case IDC_PROPERTIES: - case IDC_SCAN_HARDWARE: - case IDC_ENABLE_DRV: - case IDC_DISABLE_DRV: - case IDC_UPDATE_DRV: - case IDC_UNINSTALL_DRV: - case IDC_ADD_HARDWARE: + case IDM_PROPERTIES: + case IDM_SCAN_HARDWARE: + case IDM_ENABLE_DRV: + case IDM_DISABLE_DRV: + case IDM_UPDATE_DRV: + case IDM_UNINSTALL_DRV: + case IDM_ADD_HARDWARE: { m_DeviceView->OnAction(Msg); break; } - case IDC_ACTIONMENU: + case IDM_ACTIONMENU: { // Create a popup menu with all the actions for the selected node HMENU hMenu = CreatePopupMenu(); @@ -620,38 +619,38 @@ CDeviceManager::OnCommand(_In_ WPARAM wParam, break; } - case IDC_DEVBYTYPE: + case IDM_DEVBYTYPE: { RefreshView(DevicesByType, false); break; } - case IDC_DEVBYCONN: + case IDM_DEVBYCONN: { RefreshView(DevicesByConnection, false); break; } - case IDC_SHOWHIDDEN: + case IDM_SHOWHIDDEN: { // Get the current state - UINT CurCheckState = GetMenuState(m_hMenu, IDC_SHOWHIDDEN, MF_BYCOMMAND); + UINT CurCheckState = GetMenuState(m_hMenu, IDM_SHOWHIDDEN, MF_BYCOMMAND); if (CurCheckState == MF_CHECKED) { m_DeviceView->SetHiddenDevices(false); - CheckMenuItem(m_hMenu, IDC_SHOWHIDDEN, MF_BYCOMMAND | MF_UNCHECKED); + CheckMenuItem(m_hMenu, IDM_SHOWHIDDEN, MF_BYCOMMAND | MF_UNCHECKED); } else if (CurCheckState == MF_UNCHECKED) { m_DeviceView->SetHiddenDevices(true); - CheckMenuItem(m_hMenu, IDC_SHOWHIDDEN, MF_BYCOMMAND | MF_CHECKED); + CheckMenuItem(m_hMenu, IDM_SHOWHIDDEN, MF_BYCOMMAND | MF_CHECKED); } // Refresh the device view RefreshView(m_DeviceView->GetCurrentView(), false); break; } - case IDC_ABOUT: + case IDM_ABOUT: { // Apportion blame MessageBoxW(m_hMainWnd, @@ -664,7 +663,7 @@ CDeviceManager::OnCommand(_In_ WPARAM wParam, break; } - case IDC_EXIT: + case IDM_EXIT: { // Post a close message to the window PostMessageW(m_hMainWnd, diff --git a/dll/win32/devmgr/lang/bg-BG.rc b/dll/win32/devmgr/lang/bg-BG.rc index 2a6ceefa847..47ca6224d5d 100644 --- a/dll/win32/devmgr/lang/bg-BG.rc +++ b/dll/win32/devmgr/lang/bg-BG.rc @@ -247,29 +247,29 @@ END This code relates to the device manager GUI */ -IDR_MAINMENU MENU +IDM_MAINMENU MENU BEGIN POPUP "&File" BEGIN - MENUITEM "E&xit", IDC_EXIT + MENUITEM "E&xit", IDM_EXIT END POPUP "Action" BEGIN - MENUITEM "Scan for hardware changes", IDC_SCAN_HARDWARE - MENUITEM "Add hardware", IDC_ADD_HARDWARE + MENUITEM "Scan for hardware changes", IDM_SCAN_HARDWARE + MENUITEM "Add hardware", IDM_ADD_HARDWARE END POPUP "View" BEGIN - MENUITEM "Devices by type", IDC_DEVBYTYPE - MENUITEM "Devices by connection", IDC_DEVBYCONN - MENUITEM "Resources by type", IDC_RESBYTYPE, GRAYED - MENUITEM "Resources by connection", IDC_RESBYCONN, GRAYED + MENUITEM "Devices by type", IDM_DEVBYTYPE + MENUITEM "Devices by connection", IDM_DEVBYCONN + MENUITEM "Resources by type", IDM_RESBYTYPE, GRAYED + MENUITEM "Resources by connection", IDM_RESBYCONN, GRAYED MENUITEM SEPARATOR - MENUITEM "Show hidden devices", IDC_SHOWHIDDEN + MENUITEM "Show hidden devices", IDM_SHOWHIDDEN END POPUP "Help" BEGIN - MENUITEM "About", IDC_ABOUT + MENUITEM "About", IDM_ABOUT END END diff --git a/dll/win32/devmgr/lang/cs-CZ.rc b/dll/win32/devmgr/lang/cs-CZ.rc index 58584c3e0e0..e5f8a3903a0 100644 --- a/dll/win32/devmgr/lang/cs-CZ.rc +++ b/dll/win32/devmgr/lang/cs-CZ.rc @@ -251,29 +251,29 @@ END This code relates to the device manager GUI */ -IDR_MAINMENU MENU +IDM_MAINMENU MENU BEGIN POPUP "&Soubor" BEGIN - MENUITEM "U&končit", IDC_EXIT + MENUITEM "U&končit", IDM_EXIT END POPUP "Akce" BEGIN - MENUITEM "Vyhledat změny hardwaru", IDC_SCAN_HARDWARE - MENUITEM "Přidat hardware", IDC_ADD_HARDWARE + MENUITEM "Vyhledat změny hardwaru", IDM_SCAN_HARDWARE + MENUITEM "Přidat hardware", IDM_ADD_HARDWARE END POPUP "Zobrazit" BEGIN - MENUITEM "Zařízení podle typu", IDC_DEVBYTYPE - MENUITEM "Zařízení podle připojení", IDC_DEVBYCONN - MENUITEM "Prostředky podle typu", IDC_RESBYTYPE, GRAYED - MENUITEM "Prostředky podle připojení", IDC_RESBYCONN, GRAYED + MENUITEM "Zařízení podle typu", IDM_DEVBYTYPE + MENUITEM "Zařízení podle připojení", IDM_DEVBYCONN + MENUITEM "Prostředky podle typu", IDM_RESBYTYPE, GRAYED + MENUITEM "Prostředky podle připojení", IDM_RESBYCONN, GRAYED MENUITEM SEPARATOR - MENUITEM "SZobrazit skrytá zařízení", IDC_SHOWHIDDEN + MENUITEM "SZobrazit skrytá zařízení", IDM_SHOWHIDDEN END POPUP "Nápověda" BEGIN - MENUITEM "O programu", IDC_ABOUT + MENUITEM "O programu", IDM_ABOUT END END diff --git a/dll/win32/devmgr/lang/de-DE.rc b/dll/win32/devmgr/lang/de-DE.rc index fdf4db49fe8..529044e83a5 100644 --- a/dll/win32/devmgr/lang/de-DE.rc +++ b/dll/win32/devmgr/lang/de-DE.rc @@ -248,29 +248,29 @@ END This code relates to the device manager GUI */ -IDR_MAINMENU MENU +IDM_MAINMENU MENU BEGIN POPUP "&Datei" BEGIN - MENUITEM "&Beenden", IDC_EXIT + MENUITEM "&Beenden", IDM_EXIT END POPUP "Ak&tion" BEGIN - MENUITEM "Nach geänderter Hardware suchen", IDC_SCAN_HARDWARE - MENUITEM "Hardware hinzufügen", IDC_ADD_HARDWARE + MENUITEM "Nach geänderter Hardware suchen", IDM_SCAN_HARDWARE + MENUITEM "Hardware hinzufügen", IDM_ADD_HARDWARE END POPUP "&Ansicht" BEGIN - MENUITEM "Geräte nach &Typ", IDC_DEVBYTYPE - MENUITEM "Garäte nach &Verbindung", IDC_DEVBYCONN - MENUITEM "Ressourcen nac&h Typ", IDC_RESBYTYPE, GRAYED - MENUITEM "Ressourcen nach V&erbindung", IDC_RESBYCONN, GRAYED + MENUITEM "Geräte nach &Typ", IDM_DEVBYTYPE + MENUITEM "Garäte nach &Verbindung", IDM_DEVBYCONN + MENUITEM "Ressourcen nac&h Typ", IDM_RESBYTYPE, GRAYED + MENUITEM "Ressourcen nach V&erbindung", IDM_RESBYCONN, GRAYED MENUITEM SEPARATOR - MENUITEM "Ausgeblendete &Geräte anzeigen", IDC_SHOWHIDDEN + MENUITEM "Ausgeblendete &Geräte anzeigen", IDM_SHOWHIDDEN END POPUP "&Hilfe" BEGIN - MENUITEM "Ü&ber", IDC_ABOUT + MENUITEM "Ü&ber", IDM_ABOUT END END diff --git a/dll/win32/devmgr/lang/el-GR.rc b/dll/win32/devmgr/lang/el-GR.rc index 1d655570890..8aabbd38839 100644 --- a/dll/win32/devmgr/lang/el-GR.rc +++ b/dll/win32/devmgr/lang/el-GR.rc @@ -248,29 +248,29 @@ END This code relates to the device manager GUI */ -IDR_MAINMENU MENU +IDM_MAINMENU MENU BEGIN POPUP "&File" BEGIN - MENUITEM "E&xit", IDC_EXIT + MENUITEM "E&xit", IDM_EXIT END POPUP "Action" BEGIN - MENUITEM "Scan for hardware changes", IDC_SCAN_HARDWARE - MENUITEM "Add hardware", IDC_ADD_HARDWARE + MENUITEM "Scan for hardware changes", IDM_SCAN_HARDWARE + MENUITEM "Add hardware", IDM_ADD_HARDWARE END POPUP "View" BEGIN - MENUITEM "Devices by type", IDC_DEVBYTYPE - MENUITEM "Devices by connection", IDC_DEVBYCONN - MENUITEM "Resources by type", IDC_RESBYTYPE, GRAYED - MENUITEM "Resources by connection", IDC_RESBYCONN, GRAYED + MENUITEM "Devices by type", IDM_DEVBYTYPE + MENUITEM "Devices by connection", IDM_DEVBYCONN + MENUITEM "Resources by type", IDM_RESBYTYPE, GRAYED + MENUITEM "Resources by connection", IDM_RESBYCONN, GRAYED MENUITEM SEPARATOR - MENUITEM "Show hidden devices", IDC_SHOWHIDDEN + MENUITEM "Show hidden devices", IDM_SHOWHIDDEN END POPUP "Help" BEGIN - MENUITEM "About", IDC_ABOUT + MENUITEM "About", IDM_ABOUT END END diff --git a/dll/win32/devmgr/lang/en-US.rc b/dll/win32/devmgr/lang/en-US.rc index ea212318e6c..faaadd6af82 100644 --- a/dll/win32/devmgr/lang/en-US.rc +++ b/dll/win32/devmgr/lang/en-US.rc @@ -245,29 +245,29 @@ END This code relates to the device manager GUI */ -IDR_MAINMENU MENU +IDM_MAINMENU MENU BEGIN POPUP "&File" BEGIN - MENUITEM "E&xit", IDC_EXIT + MENUITEM "E&xit", IDM_EXIT END POPUP "&Action" BEGIN - MENUITEM "Scan for hardware changes", IDC_SCAN_HARDWARE - MENUITEM "Add hardware", IDC_ADD_HARDWARE + MENUITEM "Scan for hardware changes", IDM_SCAN_HARDWARE + MENUITEM "Add hardware", IDM_ADD_HARDWARE END POPUP "&View" BEGIN - MENUITEM "D&evices by type", IDC_DEVBYTYPE - MENUITEM "De&vices by connection", IDC_DEVBYCONN - MENUITEM "Resources by t&ype", IDC_RESBYTYPE, GRAYED - MENUITEM "Resources by co&nnection", IDC_RESBYCONN, GRAYED + MENUITEM "D&evices by type", IDM_DEVBYTYPE + MENUITEM "De&vices by connection", IDM_DEVBYCONN + MENUITEM "Resources by t&ype", IDM_RESBYTYPE, GRAYED + MENUITEM "Resources by co&nnection", IDM_RESBYCONN, GRAYED MENUITEM SEPARATOR - MENUITEM "Sho&w hidden devices", IDC_SHOWHIDDEN + MENUITEM "Sho&w hidden devices", IDM_SHOWHIDDEN END POPUP "&Help" BEGIN - MENUITEM "&About", IDC_ABOUT + MENUITEM "&About", IDM_ABOUT END END diff --git a/dll/win32/devmgr/lang/es-ES.rc b/dll/win32/devmgr/lang/es-ES.rc index 63b9d57aab4..1a011c8ba7c 100644 --- a/dll/win32/devmgr/lang/es-ES.rc +++ b/dll/win32/devmgr/lang/es-ES.rc @@ -255,29 +255,29 @@ END This code relates to the device manager GUI */ -IDR_MAINMENU MENU +IDM_MAINMENU MENU BEGIN POPUP "&Archivo" BEGIN - MENUITEM "&Salir", IDC_EXIT + MENUITEM "&Salir", IDM_EXIT END POPUP "Acción" BEGIN - MENUITEM "Buscar cambios de hardware", IDC_SCAN_HARDWARE - MENUITEM "Añadir dispositivos", IDC_ADD_HARDWARE + MENUITEM "Buscar cambios de hardware", IDM_SCAN_HARDWARE + MENUITEM "Añadir dispositivos", IDM_ADD_HARDWARE END POPUP "Ver" BEGIN - MENUITEM "Dispositivos por tipo", IDC_DEVBYTYPE - MENUITEM "Dispositivos por conexión", IDC_DEVBYCONN - MENUITEM "Recursos por tipo", IDC_RESBYTYPE, GRAYED - MENUITEM "Recursos por conexión", IDC_RESBYCONN, GRAYED + MENUITEM "Dispositivos por tipo", IDM_DEVBYTYPE + MENUITEM "Dispositivos por conexión", IDM_DEVBYCONN + MENUITEM "Recursos por tipo", IDM_RESBYTYPE, GRAYED + MENUITEM "Recursos por conexión", IDM_RESBYCONN, GRAYED MENUITEM SEPARATOR - MENUITEM "Mostrar dispositivos ocultos", IDC_SHOWHIDDEN + MENUITEM "Mostrar dispositivos ocultos", IDM_SHOWHIDDEN END POPUP "Ayuda" BEGIN - MENUITEM "Acerca de", IDC_ABOUT + MENUITEM "Acerca de", IDM_ABOUT END END diff --git a/dll/win32/devmgr/lang/et-EE.rc b/dll/win32/devmgr/lang/et-EE.rc index e389d8c9c2e..498e86a6611 100644 --- a/dll/win32/devmgr/lang/et-EE.rc +++ b/dll/win32/devmgr/lang/et-EE.rc @@ -252,29 +252,29 @@ END This code relates to the device manager GUI */ -IDR_MAINMENU MENU +IDM_MAINMENU MENU BEGIN POPUP "&Fail" BEGIN - MENUITEM "&Välju", IDC_EXIT + MENUITEM "&Välju", IDM_EXIT END POPUP "&Toiming" BEGIN - MENUITEM "Otsi riistvaramuudatusi", IDC_SCAN_HARDWARE - MENUITEM "Lisa riistvara", IDC_ADD_HARDWARE + MENUITEM "Otsi riistvaramuudatusi", IDM_SCAN_HARDWARE + MENUITEM "Lisa riistvara", IDM_ADD_HARDWARE END POPUP "&Vaade" BEGIN - MENUITEM "Seadmed &tüübi järgi", IDC_DEVBYTYPE - MENUITEM "Seadmed &ühenduse järgi", IDC_DEVBYCONN - MENUITEM "R&essursid tüübi järgi", IDC_RESBYTYPE, GRAYED - MENUITEM "&Ressursid ühenduse järgi", IDC_RESBYCONN, GRAYED + MENUITEM "Seadmed &tüübi järgi", IDM_DEVBYTYPE + MENUITEM "Seadmed &ühenduse järgi", IDM_DEVBYCONN + MENUITEM "R&essursid tüübi järgi", IDM_RESBYTYPE, GRAYED + MENUITEM "&Ressursid ühenduse järgi", IDM_RESBYCONN, GRAYED MENUITEM SEPARATOR - MENUITEM "&Näita peidetud seadmeid", IDC_SHOWHIDDEN + MENUITEM "&Näita peidetud seadmeid", IDM_SHOWHIDDEN END POPUP "&Spikker" BEGIN - MENUITEM "&Teave", IDC_ABOUT + MENUITEM "&Teave", IDM_ABOUT END END diff --git a/dll/win32/devmgr/lang/fr-FR.rc b/dll/win32/devmgr/lang/fr-FR.rc index 000a43d6b82..79c33bba606 100644 --- a/dll/win32/devmgr/lang/fr-FR.rc +++ b/dll/win32/devmgr/lang/fr-FR.rc @@ -247,29 +247,29 @@ END This code relates to the device manager GUI */ -IDR_MAINMENU MENU +IDM_MAINMENU MENU BEGIN POPUP "&Fichier" BEGIN - MENUITEM "&Quitter", IDC_EXIT + MENUITEM "&Quitter", IDM_EXIT END POPUP "Action" BEGIN - MENUITEM "Vérifier les changements de matériel", IDC_SCAN_HARDWARE - MENUITEM "Ajouter un matériel", IDC_ADD_HARDWARE + MENUITEM "Vérifier les changements de matériel", IDM_SCAN_HARDWARE + MENUITEM "Ajouter un matériel", IDM_ADD_HARDWARE END POPUP "Vue" BEGIN - MENUITEM "Périphériques par type", IDC_DEVBYTYPE - MENUITEM "Périphériques par connexion", IDC_DEVBYCONN - MENUITEM "Ressources par type", IDC_RESBYTYPE, GRAYED - MENUITEM "Ressources par connexion", IDC_RESBYCONN, GRAYED + MENUITEM "Périphériques par type", IDM_DEVBYTYPE + MENUITEM "Périphériques par connexion", IDM_DEVBYCONN + MENUITEM "Ressources par type", IDM_RESBYTYPE, GRAYED + MENUITEM "Ressources par connexion", IDM_RESBYCONN, GRAYED MENUITEM SEPARATOR - MENUITEM "Afficher les périphériques cachés", IDC_SHOWHIDDEN + MENUITEM "Afficher les périphériques cachés", IDM_SHOWHIDDEN END POPUP "Aide" BEGIN - MENUITEM "À propos", IDC_ABOUT + MENUITEM "À propos", IDM_ABOUT END END diff --git a/dll/win32/devmgr/lang/he-IL.rc b/dll/win32/devmgr/lang/he-IL.rc index 9115a29851c..c8d0401390b 100644 --- a/dll/win32/devmgr/lang/he-IL.rc +++ b/dll/win32/devmgr/lang/he-IL.rc @@ -248,29 +248,29 @@ END This code relates to the device manager GUI */ -IDR_MAINMENU MENU +IDM_MAINMENU MENU BEGIN POPUP "&File" BEGIN - MENUITEM "E&xit", IDC_EXIT + MENUITEM "E&xit", IDM_EXIT END POPUP "Action" BEGIN - MENUITEM "Scan for hardware changes", IDC_SCAN_HARDWARE - MENUITEM "Add hardware", IDC_ADD_HARDWARE + MENUITEM "Scan for hardware changes", IDM_SCAN_HARDWARE + MENUITEM "Add hardware", IDM_ADD_HARDWARE END POPUP "View" BEGIN - MENUITEM "Devices by type", IDC_DEVBYTYPE - MENUITEM "Devices by connection", IDC_DEVBYCONN - MENUITEM "Resources by type", IDC_RESBYTYPE, GRAYED - MENUITEM "Resources by connection", IDC_RESBYCONN, GRAYED + MENUITEM "Devices by type", IDM_DEVBYTYPE + MENUITEM "Devices by connection", IDM_DEVBYCONN + MENUITEM "Resources by type", IDM_RESBYTYPE, GRAYED + MENUITEM "Resources by connection", IDM_RESBYCONN, GRAYED MENUITEM SEPARATOR - MENUITEM "Show hidden devices", IDC_SHOWHIDDEN + MENUITEM "Show hidden devices", IDM_SHOWHIDDEN END POPUP "Help" BEGIN - MENUITEM "About", IDC_ABOUT + MENUITEM "About", IDM_ABOUT END END diff --git a/dll/win32/devmgr/lang/hu-HU.rc b/dll/win32/devmgr/lang/hu-HU.rc index 43084284303..3e8f7f8443b 100644 --- a/dll/win32/devmgr/lang/hu-HU.rc +++ b/dll/win32/devmgr/lang/hu-HU.rc @@ -247,29 +247,29 @@ END This code relates to the device manager GUI */ -IDR_MAINMENU MENU +IDM_MAINMENU MENU BEGIN POPUP "&File" BEGIN - MENUITEM "E&xit", IDC_EXIT + MENUITEM "E&xit", IDM_EXIT END POPUP "Action" BEGIN - MENUITEM "Scan for hardware changes", IDC_SCAN_HARDWARE - MENUITEM "Add hardware", IDC_ADD_HARDWARE + MENUITEM "Scan for hardware changes", IDM_SCAN_HARDWARE + MENUITEM "Add hardware", IDM_ADD_HARDWARE END POPUP "View" BEGIN - MENUITEM "Devices by type", IDC_DEVBYTYPE - MENUITEM "Devices by connection", IDC_DEVBYCONN - MENUITEM "Resources by type", IDC_RESBYTYPE, GRAYED - MENUITEM "Resources by connection", IDC_RESBYCONN, GRAYED + MENUITEM "Devices by type", IDM_DEVBYTYPE + MENUITEM "Devices by connection", IDM_DEVBYCONN + MENUITEM "Resources by type", IDM_RESBYTYPE, GRAYED + MENUITEM "Resources by connection", IDM_RESBYCONN, GRAYED MENUITEM SEPARATOR - MENUITEM "Show hidden devices", IDC_SHOWHIDDEN + MENUITEM "Show hidden devices", IDM_SHOWHIDDEN END POPUP "Help" BEGIN - MENUITEM "About", IDC_ABOUT + MENUITEM "About", IDM_ABOUT END END diff --git a/dll/win32/devmgr/lang/id-ID.rc b/dll/win32/devmgr/lang/id-ID.rc index c3c426b85b8..a7d33717db7 100644 --- a/dll/win32/devmgr/lang/id-ID.rc +++ b/dll/win32/devmgr/lang/id-ID.rc @@ -248,29 +248,29 @@ END This code relates to the device manager GUI */ -IDR_MAINMENU MENU +IDM_MAINMENU MENU BEGIN POPUP "Be&rkas" BEGIN - MENUITEM "K&eluar", IDC_EXIT + MENUITEM "K&eluar", IDM_EXIT END POPUP "Ak&si" BEGIN - MENUITEM "Pindai perubahan perangkat keras", IDC_SCAN_HARDWARE - MENUITEM "Tambah perangkat keras", IDC_ADD_HARDWARE + MENUITEM "Pindai perubahan perangkat keras", IDM_SCAN_HARDWARE + MENUITEM "Tambah perangkat keras", IDM_ADD_HARDWARE END POPUP "Ta&mpilan" BEGIN - MENUITEM "Jenis perangkat", IDC_DEVBYTYPE - MENUITEM "Sambungan perangkat", IDC_DEVBYCONN - MENUITEM "Jenis sumber daya", IDC_RESBYTYPE, GRAYED - MENUITEM "Sambungan sumber daya", IDC_RESBYCONN, GRAYED + MENUITEM "Jenis perangkat", IDM_DEVBYTYPE + MENUITEM "Sambungan perangkat", IDM_DEVBYCONN + MENUITEM "Jenis sumber daya", IDM_RESBYTYPE, GRAYED + MENUITEM "Sambungan sumber daya", IDM_RESBYCONN, GRAYED MENUITEM SEPARATOR - MENUITEM "Tunjukkan perangkat tersembunyi", IDC_SHOWHIDDEN + MENUITEM "Tunjukkan perangkat tersembunyi", IDM_SHOWHIDDEN END POPUP "&Bantuan" BEGIN - MENUITEM "Tentang", IDC_ABOUT + MENUITEM "Tentang", IDM_ABOUT END END diff --git a/dll/win32/devmgr/lang/it-IT.rc b/dll/win32/devmgr/lang/it-IT.rc index fbd8b80096a..2920ecab544 100644 --- a/dll/win32/devmgr/lang/it-IT.rc +++ b/dll/win32/devmgr/lang/it-IT.rc @@ -249,29 +249,29 @@ END This code relates to the device manager GUI */ -IDR_MAINMENU MENU +IDM_MAINMENU MENU BEGIN POPUP "&File" BEGIN - MENUITEM "E&xit", IDC_EXIT + MENUITEM "E&xit", IDM_EXIT END POPUP "Action" BEGIN - MENUITEM "Scan for hardware changes", IDC_SCAN_HARDWARE - MENUITEM "Add hardware", IDC_ADD_HARDWARE + MENUITEM "Scan for hardware changes", IDM_SCAN_HARDWARE + MENUITEM "Add hardware", IDM_ADD_HARDWARE END POPUP "View" BEGIN - MENUITEM "Devices by type", IDC_DEVBYTYPE - MENUITEM "Devices by connection", IDC_DEVBYCONN - MENUITEM "Resources by type", IDC_RESBYTYPE, GRAYED - MENUITEM "Resources by connection", IDC_RESBYCONN, GRAYED + MENUITEM "Devices by type", IDM_DEVBYTYPE + MENUITEM "Devices by connection", IDM_DEVBYCONN + MENUITEM "Resources by type", IDM_RESBYTYPE, GRAYED + MENUITEM "Resources by connection", IDM_RESBYCONN, GRAYED MENUITEM SEPARATOR - MENUITEM "Show hidden devices", IDC_SHOWHIDDEN + MENUITEM "Show hidden devices", IDM_SHOWHIDDEN END POPUP "Help" BEGIN - MENUITEM "About", IDC_ABOUT + MENUITEM "About", IDM_ABOUT END END diff --git a/dll/win32/devmgr/lang/ja-JP.rc b/dll/win32/devmgr/lang/ja-JP.rc index 89427bb76e0..3ddfe6f5d50 100644 --- a/dll/win32/devmgr/lang/ja-JP.rc +++ b/dll/win32/devmgr/lang/ja-JP.rc @@ -245,29 +245,29 @@ END This code relates to the device manager GUI */ -IDR_MAINMENU MENU +IDM_MAINMENU MENU BEGIN POPUP "ファイル(&F)" BEGIN - MENUITEM "終了(&X)", IDC_EXIT + MENUITEM "終了(&X)", IDM_EXIT END POPUP "アクション(&A)" BEGIN - MENUITEM "ハードウェアの変更をスキャン", IDC_SCAN_HARDWARE - MENUITEM "ハードウェアを追加", IDC_ADD_HARDWARE + MENUITEM "ハードウェアの変更をスキャン", IDM_SCAN_HARDWARE + MENUITEM "ハードウェアを追加", IDM_ADD_HARDWARE END POPUP "表示(&V)" BEGIN - MENUITEM "種類別デバイス(&E)", IDC_DEVBYTYPE - MENUITEM "接続別デバイス(&V)", IDC_DEVBYCONN - MENUITEM "種類別リソース(&Y)", IDC_RESBYTYPE, GRAYED - MENUITEM "接続別リソース(&N)", IDC_RESBYCONN, GRAYED + MENUITEM "種類別デバイス(&E)", IDM_DEVBYTYPE + MENUITEM "接続別デバイス(&V)", IDM_DEVBYCONN + MENUITEM "種類別リソース(&Y)", IDM_RESBYTYPE, GRAYED + MENUITEM "接続別リソース(&N)", IDM_RESBYCONN, GRAYED MENUITEM SEPARATOR - MENUITEM "隠しデバイスを表示(&W)", IDC_SHOWHIDDEN + MENUITEM "隠しデバイスを表示(&W)", IDM_SHOWHIDDEN END POPUP "ヘルプ(&H)" BEGIN - MENUITEM "バージョン情報(&A)", IDC_ABOUT + MENUITEM "バージョン情報(&A)", IDM_ABOUT END END diff --git a/dll/win32/devmgr/lang/no-NO.rc b/dll/win32/devmgr/lang/no-NO.rc index 62c75a5876f..f6ef8e0face 100644 --- a/dll/win32/devmgr/lang/no-NO.rc +++ b/dll/win32/devmgr/lang/no-NO.rc @@ -249,29 +249,29 @@ END This code relates to the device manager GUI */ -IDR_MAINMENU MENU +IDM_MAINMENU MENU BEGIN POPUP "&File" BEGIN - MENUITEM "E&xit", IDC_EXIT + MENUITEM "E&xit", IDM_EXIT END POPUP "Action" BEGIN - MENUITEM "Scan for hardware changes", IDC_SCAN_HARDWARE - MENUITEM "Add hardware", IDC_ADD_HARDWARE + MENUITEM "Scan for hardware changes", IDM_SCAN_HARDWARE + MENUITEM "Add hardware", IDM_ADD_HARDWARE END POPUP "View" BEGIN - MENUITEM "Devices by type", IDC_DEVBYTYPE - MENUITEM "Devices by connection", IDC_DEVBYCONN - MENUITEM "Resources by type", IDC_RESBYTYPE, GRAYED - MENUITEM "Resources by connection", IDC_RESBYCONN, GRAYED + MENUITEM "Devices by type", IDM_DEVBYTYPE + MENUITEM "Devices by connection", IDM_DEVBYCONN + MENUITEM "Resources by type", IDM_RESBYTYPE, GRAYED + MENUITEM "Resources by connection", IDM_RESBYCONN, GRAYED MENUITEM SEPARATOR - MENUITEM "Show hidden devices", IDC_SHOWHIDDEN + MENUITEM "Show hidden devices", IDM_SHOWHIDDEN END POPUP "Help" BEGIN - MENUITEM "About", IDC_ABOUT + MENUITEM "About", IDM_ABOUT END END diff --git a/dll/win32/devmgr/lang/pl-PL.rc b/dll/win32/devmgr/lang/pl-PL.rc index 62b3767ac24..e85ee6b6371 100644 --- a/dll/win32/devmgr/lang/pl-PL.rc +++ b/dll/win32/devmgr/lang/pl-PL.rc @@ -257,29 +257,29 @@ END This code relates to the device manager GUI */ -IDR_MAINMENU MENU +IDM_MAINMENU MENU BEGIN POPUP "&Plik" BEGIN - MENUITEM "Z&akończ", IDC_EXIT + MENUITEM "Z&akończ", IDM_EXIT END POPUP "Akcja" BEGIN - MENUITEM "Skanuj w poszukiwaniu zmian sprzętu", IDC_SCAN_HARDWARE - MENUITEM "Dodaj urządzenie", IDC_ADD_HARDWARE + MENUITEM "Skanuj w poszukiwaniu zmian sprzętu", IDM_SCAN_HARDWARE + MENUITEM "Dodaj urządzenie", IDM_ADD_HARDWARE END POPUP "Widok" BEGIN - MENUITEM "Urządzenia według typów", IDC_DEVBYTYPE - MENUITEM "Urządzenia według połączeń", IDC_DEVBYCONN - MENUITEM "Zasoby według typów", IDC_RESBYTYPE, GRAYED - MENUITEM "Zasoby według połączeń", IDC_RESBYCONN, GRAYED + MENUITEM "Urządzenia według typów", IDM_DEVBYTYPE + MENUITEM "Urządzenia według połączeń", IDM_DEVBYCONN + MENUITEM "Zasoby według typów", IDM_RESBYTYPE, GRAYED + MENUITEM "Zasoby według połączeń", IDM_RESBYCONN, GRAYED MENUITEM SEPARATOR - MENUITEM "Pokaż ukryte urządzenia", IDC_SHOWHIDDEN + MENUITEM "Pokaż ukryte urządzenia", IDM_SHOWHIDDEN END POPUP "Pomoc" BEGIN - MENUITEM "Informacje", IDC_ABOUT + MENUITEM "Informacje", IDM_ABOUT END END diff --git a/dll/win32/devmgr/lang/pt-BR.rc b/dll/win32/devmgr/lang/pt-BR.rc index bc9b1aad877..204129cee1b 100644 --- a/dll/win32/devmgr/lang/pt-BR.rc +++ b/dll/win32/devmgr/lang/pt-BR.rc @@ -249,29 +249,29 @@ END This code relates to the device manager GUI */ -IDR_MAINMENU MENU +IDM_MAINMENU MENU BEGIN POPUP "&File" BEGIN - MENUITEM "E&xit", IDC_EXIT + MENUITEM "E&xit", IDM_EXIT END POPUP "Action" BEGIN - MENUITEM "Scan for hardware changes", IDC_SCAN_HARDWARE - MENUITEM "Add hardware", IDC_ADD_HARDWARE + MENUITEM "Scan for hardware changes", IDM_SCAN_HARDWARE + MENUITEM "Add hardware", IDM_ADD_HARDWARE END POPUP "View" BEGIN - MENUITEM "Devices by type", IDC_DEVBYTYPE - MENUITEM "Devices by connection", IDC_DEVBYCONN - MENUITEM "Resources by type", IDC_RESBYTYPE, GRAYED - MENUITEM "Resources by connection", IDC_RESBYCONN, GRAYED + MENUITEM "Devices by type", IDM_DEVBYTYPE + MENUITEM "Devices by connection", IDM_DEVBYCONN + MENUITEM "Resources by type", IDM_RESBYTYPE, GRAYED + MENUITEM "Resources by connection", IDM_RESBYCONN, GRAYED MENUITEM SEPARATOR - MENUITEM "Show hidden devices", IDC_SHOWHIDDEN + MENUITEM "Show hidden devices", IDM_SHOWHIDDEN END POPUP "Help" BEGIN - MENUITEM "About", IDC_ABOUT + MENUITEM "About", IDM_ABOUT END END diff --git a/dll/win32/devmgr/lang/pt-PT.rc b/dll/win32/devmgr/lang/pt-PT.rc index dc0ddef30a5..55986eb0356 100644 --- a/dll/win32/devmgr/lang/pt-PT.rc +++ b/dll/win32/devmgr/lang/pt-PT.rc @@ -249,29 +249,29 @@ END This code relates to the device manager GUI */ -IDR_MAINMENU MENU +IDM_MAINMENU MENU BEGIN POPUP "&Ficheiro" BEGIN - MENUITEM "&Sair", IDC_EXIT + MENUITEM "&Sair", IDM_EXIT END POPUP "Acção" BEGIN - MENUITEM "Verificar alterações de hardware", IDC_SCAN_HARDWARE - MENUITEM "Adicionar hardware", IDC_ADD_HARDWARE + MENUITEM "Verificar alterações de hardware", IDM_SCAN_HARDWARE + MENUITEM "Adicionar hardware", IDM_ADD_HARDWARE END POPUP "Vista" BEGIN - MENUITEM "Dispositivos por tipo", IDC_DEVBYTYPE - MENUITEM "Dispositivos por ligação", IDC_DEVBYCONN - MENUITEM "Recursos por tipo", IDC_RESBYTYPE, GRAYED - MENUITEM "Recursos por ligação", IDC_RESBYCONN, GRAYED + MENUITEM "Dispositivos por tipo", IDM_DEVBYTYPE + MENUITEM "Dispositivos por ligação", IDM_DEVBYCONN + MENUITEM "Recursos por tipo", IDM_RESBYTYPE, GRAYED + MENUITEM "Recursos por ligação", IDM_RESBYCONN, GRAYED MENUITEM SEPARATOR - MENUITEM "Mostrardispositivos ocultos", IDC_SHOWHIDDEN + MENUITEM "Mostrardispositivos ocultos", IDM_SHOWHIDDEN END POPUP "Ajuda" BEGIN - MENUITEM "Acerca de", IDC_ABOUT + MENUITEM "Acerca de", IDM_ABOUT END END diff --git a/dll/win32/devmgr/lang/ro-RO.rc b/dll/win32/devmgr/lang/ro-RO.rc index c3ef7dfc7cf..c5fd765ac33 100644 --- a/dll/win32/devmgr/lang/ro-RO.rc +++ b/dll/win32/devmgr/lang/ro-RO.rc @@ -252,29 +252,29 @@ END This code relates to the device manager GUI */ -IDR_MAINMENU MENU +IDM_MAINMENU MENU BEGIN POPUP "&Fișier" BEGIN - MENUITEM "I&eșire", IDC_EXIT + MENUITEM "I&eșire", IDM_EXIT END POPUP "A&cțiune" BEGIN - MENUITEM "Scanează configurația fizică", IDC_SCAN_HARDWARE - MENUITEM "Adăugare dispozitiv…", IDC_ADD_HARDWARE + MENUITEM "Scanează configurația fizică", IDM_SCAN_HARDWARE + MENUITEM "Adăugare dispozitiv…", IDM_ADD_HARDWARE END POPUP "&Afișare" BEGIN - MENUITEM "Dispozitive după tip", IDC_DEVBYTYPE - MENUITEM "Dispozitive după conexiune", IDC_DEVBYCONN - MENUITEM "Resurse după tip", IDC_RESBYTYPE, GRAYED - MENUITEM "Resurse după conexiune", IDC_RESBYCONN, GRAYED + MENUITEM "Dispozitive după tip", IDM_DEVBYTYPE + MENUITEM "Dispozitive după conexiune", IDM_DEVBYCONN + MENUITEM "Resurse după tip", IDM_RESBYTYPE, GRAYED + MENUITEM "Resurse după conexiune", IDM_RESBYCONN, GRAYED MENUITEM SEPARATOR - MENUITEM "Dispozitive ascunse", IDC_SHOWHIDDEN + MENUITEM "Dispozitive ascunse", IDM_SHOWHIDDEN END POPUP "Aj&utor" BEGIN - MENUITEM "&Despre", IDC_ABOUT + MENUITEM "&Despre", IDM_ABOUT END END diff --git a/dll/win32/devmgr/lang/ru-RU.rc b/dll/win32/devmgr/lang/ru-RU.rc index a7d32a7683c..0c0612f76d4 100644 --- a/dll/win32/devmgr/lang/ru-RU.rc +++ b/dll/win32/devmgr/lang/ru-RU.rc @@ -248,29 +248,29 @@ END This code relates to the device manager GUI */ -IDR_MAINMENU MENU +IDM_MAINMENU MENU BEGIN POPUP "&Файл" BEGIN - MENUITEM "В&ыход", IDC_EXIT + MENUITEM "В&ыход", IDM_EXIT END POPUP "&Действие" BEGIN - MENUITEM "О&бновить конфигурацию оборудования", IDC_SCAN_HARDWARE - MENUITEM "&Добавить устройство", IDC_ADD_HARDWARE + MENUITEM "О&бновить конфигурацию оборудования", IDM_SCAN_HARDWARE + MENUITEM "&Добавить устройство", IDM_ADD_HARDWARE END POPUP "&Вид" BEGIN - MENUITEM "&Устройства по типу", IDC_DEVBYTYPE - MENUITEM "Устройства по под&ключению", IDC_DEVBYCONN - MENUITEM "&Ресурсы по типу", IDC_RESBYTYPE, GRAYED - MENUITEM "Ресурсы по подк&лючению", IDC_RESBYCONN, GRAYED + MENUITEM "&Устройства по типу", IDM_DEVBYTYPE + MENUITEM "Устройства по под&ключению", IDM_DEVBYCONN + MENUITEM "&Ресурсы по типу", IDM_RESBYTYPE, GRAYED + MENUITEM "Ресурсы по подк&лючению", IDM_RESBYCONN, GRAYED MENUITEM SEPARATOR - MENUITEM "Показать &скрытые устройства", IDC_SHOWHIDDEN + MENUITEM "Показать &скрытые устройства", IDM_SHOWHIDDEN END POPUP "&Справка" BEGIN - MENUITEM "О &программе...", IDC_ABOUT + MENUITEM "О &программе...", IDM_ABOUT END END diff --git a/dll/win32/devmgr/lang/sk-SK.rc b/dll/win32/devmgr/lang/sk-SK.rc index 6b97c802ae5..c41ee067209 100644 --- a/dll/win32/devmgr/lang/sk-SK.rc +++ b/dll/win32/devmgr/lang/sk-SK.rc @@ -251,29 +251,29 @@ END This code relates to the device manager GUI */ -IDR_MAINMENU MENU +IDM_MAINMENU MENU BEGIN POPUP "&File" BEGIN - MENUITEM "E&xit", IDC_EXIT + MENUITEM "E&xit", IDM_EXIT END POPUP "Action" BEGIN - MENUITEM "Scan for hardware changes", IDC_SCAN_HARDWARE - MENUITEM "Add hardware", IDC_ADD_HARDWARE + MENUITEM "Scan for hardware changes", IDM_SCAN_HARDWARE + MENUITEM "Add hardware", IDM_ADD_HARDWARE END POPUP "View" BEGIN - MENUITEM "Devices by type", IDC_DEVBYTYPE - MENUITEM "Devices by connection", IDC_DEVBYCONN - MENUITEM "Resources by type", IDC_RESBYTYPE, GRAYED - MENUITEM "Resources by connection", IDC_RESBYCONN, GRAYED + MENUITEM "Devices by type", IDM_DEVBYTYPE + MENUITEM "Devices by connection", IDM_DEVBYCONN + MENUITEM "Resources by type", IDM_RESBYTYPE, GRAYED + MENUITEM "Resources by connection", IDM_RESBYCONN, GRAYED MENUITEM SEPARATOR - MENUITEM "Show hidden devices", IDC_SHOWHIDDEN + MENUITEM "Show hidden devices", IDM_SHOWHIDDEN END POPUP "Help" BEGIN - MENUITEM "About", IDC_ABOUT + MENUITEM "About", IDM_ABOUT END END diff --git a/dll/win32/devmgr/lang/sq-AL.rc b/dll/win32/devmgr/lang/sq-AL.rc index fd39e72e8d1..84cfc841ff1 100644 --- a/dll/win32/devmgr/lang/sq-AL.rc +++ b/dll/win32/devmgr/lang/sq-AL.rc @@ -250,29 +250,29 @@ END This code relates to the device manager GUI */ -IDR_MAINMENU MENU +IDM_MAINMENU MENU BEGIN POPUP "&File" BEGIN - MENUITEM "E&xit", IDC_EXIT + MENUITEM "E&xit", IDM_EXIT END POPUP "Action" BEGIN - MENUITEM "Scan for hardware changes", IDC_SCAN_HARDWARE - MENUITEM "Add hardware", IDC_ADD_HARDWARE + MENUITEM "Scan for hardware changes", IDM_SCAN_HARDWARE + MENUITEM "Add hardware", IDM_ADD_HARDWARE END POPUP "View" BEGIN - MENUITEM "Devices by type", IDC_DEVBYTYPE - MENUITEM "Devices by connection", IDC_DEVBYCONN - MENUITEM "Resources by type", IDC_RESBYTYPE, GRAYED - MENUITEM "Resources by connection", IDC_RESBYCONN, GRAYED + MENUITEM "Devices by type", IDM_DEVBYTYPE + MENUITEM "Devices by connection", IDM_DEVBYCONN + MENUITEM "Resources by type", IDM_RESBYTYPE, GRAYED + MENUITEM "Resources by connection", IDM_RESBYCONN, GRAYED MENUITEM SEPARATOR - MENUITEM "Show hidden devices", IDC_SHOWHIDDEN + MENUITEM "Show hidden devices", IDM_SHOWHIDDEN END POPUP "Help" BEGIN - MENUITEM "About", IDC_ABOUT + MENUITEM "About", IDM_ABOUT END END diff --git a/dll/win32/devmgr/lang/tr-TR.rc b/dll/win32/devmgr/lang/tr-TR.rc index 48da09e72ec..9af97e2193c 100644 --- a/dll/win32/devmgr/lang/tr-TR.rc +++ b/dll/win32/devmgr/lang/tr-TR.rc @@ -248,29 +248,29 @@ END This code relates to the device manager GUI */ -IDR_MAINMENU MENU +IDM_MAINMENU MENU BEGIN POPUP "&Kütük" BEGIN - MENUITEM "&Çıkış", IDC_EXIT + MENUITEM "&Çıkış", IDM_EXIT END POPUP "&Eylem" BEGIN - MENUITEM "Donanım Değişiklikleri İçin Tara", IDC_SCAN_HARDWARE - MENUITEM "Donanım Ekle", IDC_ADD_HARDWARE + MENUITEM "Donanım Değişiklikleri İçin Tara", IDM_SCAN_HARDWARE + MENUITEM "Donanım Ekle", IDM_ADD_HARDWARE END POPUP "&Görünüm" BEGIN - MENUITEM "&Türe Göre Aygıtlar", IDC_DEVBYTYPE - MENUITEM "&Bağlantıya Göre Aygıtlar", IDC_DEVBYCONN - MENUITEM "T&üre Göre Kaynaklar", IDC_RESBYTYPE, GRAYED - MENUITEM "B&ağlantıya Göre Kaynaklar", IDC_RESBYCONN, GRAYED + MENUITEM "&Türe Göre Aygıtlar", IDM_DEVBYTYPE + MENUITEM "&Bağlantıya Göre Aygıtlar", IDM_DEVBYCONN + MENUITEM "T&üre Göre Kaynaklar", IDM_RESBYTYPE, GRAYED + MENUITEM "B&ağlantıya Göre Kaynaklar", IDM_RESBYCONN, GRAYED MENUITEM SEPARATOR - MENUITEM "&Gizli Aygıtları Göster", IDC_SHOWHIDDEN + MENUITEM "&Gizli Aygıtları Göster", IDM_SHOWHIDDEN END POPUP "&Yardım" BEGIN - MENUITEM "&Üzerine", IDC_ABOUT + MENUITEM "&Üzerine", IDM_ABOUT END END diff --git a/dll/win32/devmgr/lang/uk-UA.rc b/dll/win32/devmgr/lang/uk-UA.rc index 9806950d168..eb8b5ba55b3 100644 --- a/dll/win32/devmgr/lang/uk-UA.rc +++ b/dll/win32/devmgr/lang/uk-UA.rc @@ -258,25 +258,25 @@ IDR_MAINMENU MENU BEGIN POPUP "&File" BEGIN - MENUITEM "E&xit", IDC_EXIT + MENUITEM "E&xit", IDM_EXIT END POPUP "Action" BEGIN - MENUITEM "Scan for hardware changes", IDC_SCAN_HARDWARE - MENUITEM "Add hardware", IDC_ADD_HARDWARE + MENUITEM "Scan for hardware changes", IDM_SCAN_HARDWARE + MENUITEM "Add hardware", IDM_ADD_HARDWARE END POPUP "View" BEGIN - MENUITEM "Devices by type", IDC_DEVBYTYPE - MENUITEM "Devices by connection", IDC_DEVBYCONN - MENUITEM "Resources by type", IDC_RESBYTYPE, GRAYED - MENUITEM "Resources by connection", IDC_RESBYCONN, GRAYED + MENUITEM "Devices by type", IDM_DEVBYTYPE + MENUITEM "Devices by connection", IDM_DEVBYCONN + MENUITEM "Resources by type", IDM_RESBYTYPE, GRAYED + MENUITEM "Resources by connection", IDM_RESBYCONN, GRAYED MENUITEM SEPARATOR - MENUITEM "Show hidden devices", IDC_SHOWHIDDEN + MENUITEM "Show hidden devices", IDM_SHOWHIDDEN END POPUP "Help" BEGIN - MENUITEM "About", IDC_ABOUT + MENUITEM "About", IDM_ABOUT END END diff --git a/dll/win32/devmgr/lang/zh-CN.rc b/dll/win32/devmgr/lang/zh-CN.rc index cb9d47e0e41..b4bd5e427b3 100644 --- a/dll/win32/devmgr/lang/zh-CN.rc +++ b/dll/win32/devmgr/lang/zh-CN.rc @@ -251,25 +251,25 @@ IDR_MAINMENU MENU BEGIN POPUP "文件(&F)" BEGIN - MENUITEM "关闭(&X)", IDC_EXIT + MENUITEM "关闭(&X)", IDM_EXIT END POPUP "行动" BEGIN - MENUITEM "扫描检测硬件改动", IDC_SCAN_HARDWARE - MENUITEM "添加硬件", IDC_ADD_HARDWARE + MENUITEM "扫描检测硬件改动", IDM_SCAN_HARDWARE + MENUITEM "添加硬件", IDM_ADD_HARDWARE END POPUP "视图" BEGIN - MENUITEM "按类型设备", IDC_DEVBYTYPE - MENUITEM "依连接排序设备", IDC_DEVBYCONN - MENUITEM "依类型排序资源", IDC_RESBYTYPE, GRAYED - MENUITEM "依连接排序资源", IDC_RESBYCONN, GRAYED + MENUITEM "按类型设备", IDM_DEVBYTYPE + MENUITEM "依连接排序设备", IDM_DEVBYCONN + MENUITEM "依类型排序资源", IDM_RESBYTYPE, GRAYED + MENUITEM "依连接排序资源", IDM_RESBYCONN, GRAYED MENUITEM SEPARATOR - MENUITEM "显示隐藏的设备", IDC_SHOWHIDDEN + MENUITEM "显示隐藏的设备", IDM_SHOWHIDDEN END POPUP "帮助" BEGIN - MENUITEM "关于", IDC_ABOUT + MENUITEM "关于", IDM_ABOUT END END diff --git a/dll/win32/devmgr/lang/zh-TW.rc b/dll/win32/devmgr/lang/zh-TW.rc index 6cc83d3b1b0..31af160a308 100644 --- a/dll/win32/devmgr/lang/zh-TW.rc +++ b/dll/win32/devmgr/lang/zh-TW.rc @@ -247,29 +247,29 @@ END This code relates to the device manager GUI */ -IDR_MAINMENU MENU +IDM_MAINMENU MENU BEGIN POPUP "檔案(&F)" BEGIN - MENUITEM "關閉(&X)", IDC_EXIT + MENUITEM "關閉(&X)", IDM_EXIT END POPUP "行動" BEGIN - MENUITEM "掃描檢測硬體改動", IDC_SCAN_HARDWARE - MENUITEM "添加硬體", IDC_ADD_HARDWARE + MENUITEM "掃描檢測硬體改動", IDM_SCAN_HARDWARE + MENUITEM "添加硬體", IDM_ADD_HARDWARE END POPUP "檢視" BEGIN - MENUITEM "按類型裝置", IDC_DEVBYTYPE - MENUITEM "依連線排序裝置", IDC_DEVBYCONN - MENUITEM "依類型排序資源", IDC_RESBYTYPE, GRAYED - MENUITEM "依連線排序資源", IDC_RESBYCONN, GRAYED + MENUITEM "按類型裝置", IDM_DEVBYTYPE + MENUITEM "依連線排序裝置", IDM_DEVBYCONN + MENUITEM "依類型排序資源", IDM_RESBYTYPE, GRAYED + MENUITEM "依連線排序資源", IDM_RESBYCONN, GRAYED MENUITEM SEPARATOR - MENUITEM "顯示隱藏的裝置", IDC_SHOWHIDDEN + MENUITEM "顯示隱藏的裝置", IDM_SHOWHIDDEN END POPUP "說明" BEGIN - MENUITEM "關於", IDC_ABOUT + MENUITEM "關於", IDM_ABOUT END END diff --git a/dll/win32/devmgr/resource.h b/dll/win32/devmgr/resource.h index 70894a2d0b7..bdb4c460718 100644 --- a/dll/win32/devmgr/resource.h +++ b/dll/win32/devmgr/resource.h @@ -12,30 +12,32 @@ #define IDC_TREEVIEW 30 #define IDC_TOOLBAR 31 #define IDC_STATUSBAR 32 -#define IDR_MAINMENU 33 -#define IDR_POPUP 34 + +/* Menus */ +#define IDM_MAINMENU 33 +#define IDM_POPUP 34 /* Actions */ -#define IDC_PROPERTIES 40 -#define IDC_SCAN_HARDWARE 41 -#define IDC_ENABLE_DRV 42 -#define IDC_DISABLE_DRV 43 -#define IDC_UPDATE_DRV 44 -#define IDC_UNINSTALL_DRV 45 -#define IDC_ADD_HARDWARE 46 +#define IDM_PROPERTIES 40 +#define IDM_SCAN_HARDWARE 41 +#define IDM_ENABLE_DRV 42 +#define IDM_DISABLE_DRV 43 +#define IDM_UPDATE_DRV 44 +#define IDM_UNINSTALL_DRV 45 +#define IDM_ADD_HARDWARE 46 /* Menu items */ -#define IDC_ACTIONMENU 50 -#define IDC_ABOUT 51 -#define IDC_EXIT 52 +#define IDM_ACTIONMENU 50 +#define IDM_ABOUT 51 +#define IDM_EXIT 52 /* view menu */ -#define IDC_DEVBYTYPE 60 -#define IDC_DEVBYCONN 61 -#define IDC_RESBYTYPE 62 -#define IDC_RESBYCONN 63 -#define IDC_SHOWHIDDEN 64 +#define IDM_DEVBYTYPE 60 +#define IDM_DEVBYCONN 61 +#define IDM_RESBYTYPE 62 +#define IDM_RESBYCONN 63 +#define IDM_SHOWHIDDEN 64 /* tooltips */ @@ -231,7 +233,7 @@ #define IDC_LOCATION 0x588 #define IDC_STATUS 0x586 #define IDC_TROUBLESHOOT 0x589 -#define IDC_PROPERTIES2 0x58A +#define IDC_PROPERTIES 0x58A #define IDC_DEVUSAGELABEL 0x58B #define IDC_DEVPROBLEM 0x58C #define IDC_DRVPROVIDER 0x58D -- 2.17.1