diff --git a/reactos/base/applications/mscutils/devmgmt_new/DeviceView.cpp b/reactos/base/applications/mscutils/devmgmt_new/DeviceView.cpp index fb6f1ca19ac..b19b12cc70d 100644 --- a/reactos/base/applications/mscutils/devmgmt_new/DeviceView.cpp +++ b/reactos/base/applications/mscutils/devmgmt_new/DeviceView.cpp @@ -1,5 +1,4 @@ #include "StdAfx.h" -#include "Devices.h" #include "DeviceView.h" @@ -11,3 +10,30 @@ CDeviceView::CDeviceView(void) CDeviceView::~CDeviceView(void) { } + +BOOL +CDeviceView::Initialize() +{ + return TRUE; +} + +BOOL +CDeviceView::Uninitialize() +{ + return TRUE; +} + +VOID +CDeviceView::Refresh() +{ +} + +VOID +CDeviceView::DisplayPropertySheet() +{ +} + +VOID +CDeviceView::SetFocus() +{ +} \ No newline at end of file diff --git a/reactos/base/applications/mscutils/devmgmt_new/DeviceView.h b/reactos/base/applications/mscutils/devmgmt_new/DeviceView.h index b936112b040..8e3983ba99c 100644 --- a/reactos/base/applications/mscutils/devmgmt_new/DeviceView.h +++ b/reactos/base/applications/mscutils/devmgmt_new/DeviceView.h @@ -1,8 +1,20 @@ #pragma once +#include "Devices.h" + class CDeviceView : public CDevices { + HWND m_hPropertyDialog; + HWND m_hShortcutMenu; + public: CDeviceView(void); ~CDeviceView(void); + + BOOL Initialize(); + BOOL Uninitialize(); + + VOID Refresh(); + VOID DisplayPropertySheet(); + VOID SetFocus(); }; diff --git a/reactos/base/applications/mscutils/devmgmt_new/MainWindow.cpp b/reactos/base/applications/mscutils/devmgmt_new/MainWindow.cpp index 34a7ed72ef2..6e742f03213 100644 --- a/reactos/base/applications/mscutils/devmgmt_new/MainWindow.cpp +++ b/reactos/base/applications/mscutils/devmgmt_new/MainWindow.cpp @@ -2,19 +2,172 @@ #include "devmgmt.h" #include "MainWindow.h" +/* menu hints */ +static const MENU_HINT MainMenuHintTable[] = +{ + /* File Menu */ + {IDC_EXIT, IDS_HINT_EXIT}, + + /* Action Menu */ + {IDC_REFRESH, IDS_HINT_REFRESH}, + {IDC_PROP, IDS_HINT_PROP}, + + {IDC_ABOUT, IDS_HINT_ABOUT} +}; + +/* system menu hints */ +static const MENU_HINT SystemMenuHintTable[] = +{ + {SC_RESTORE, IDS_HINT_SYS_RESTORE}, + {SC_MOVE, IDS_HINT_SYS_MOVE}, + {SC_SIZE, IDS_HINT_SYS_SIZE}, + {SC_MINIMIZE, IDS_HINT_SYS_MINIMIZE}, + {SC_MAXIMIZE, IDS_HINT_SYS_MAXIMIZE}, + {SC_CLOSE, IDS_HINT_SYS_CLOSE}, +}; + + CMainWindow::CMainWindow(void) : m_hMainWnd(NULL), + m_hStatusBar(NULL), + m_hToolBar(NULL), m_CmdShow(0) { m_szMainWndClass = L"DevMgmtWndClass"; } - CMainWindow::~CMainWindow(void) { } +BOOL +CMainWindow::CreateToolBar() +{ + HIMAGELIST hImageList; + HBITMAP hBitmap; + UINT StartResource, EndResource; + INT NumButtons; + BOOL bRet = FALSE; + + static TBBUTTON ToolbarButtons [] = + { + {TBICON_PROP, IDC_PROP, TBSTATE_INDETERMINATE, BTNS_BUTTON, {0}, 0, 0}, + {TBICON_REFRESH, IDC_REFRESH, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, + + /* Add a seperator: First item for a seperator is its width in pixels */ + {15, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, + }; + + /* Get the number of buttons */ + NumButtons = sizeof(ToolbarButtons) / sizeof(ToolbarButtons[0]); + + /* Create the toolbar window */ + m_hToolBar = CreateWindowExW(0, + TOOLBARCLASSNAME, + NULL, + WS_CHILD | WS_VISIBLE | TBSTYLE_FLAT | TBSTYLE_TOOLTIPS, + 0, 0, 0, 0, + m_hMainWnd, + (HMENU)IDC_TOOLBAR, + g_hInstance, + NULL); + if (m_hToolBar) + { + /* Don't show clipped buttons */ + SendMessageW(m_hToolBar, + TB_SETEXTENDEDSTYLE, + 0, + TBSTYLE_EX_HIDECLIPPEDBUTTONS); + + /* Set the struct size, the toobar needs this... */ + SendMessageW(m_hToolBar, + TB_BUTTONSTRUCTSIZE, + sizeof(ToolbarButtons[0]), + 0); + + /* Create the toolbar icon image list */ + hImageList = ImageList_Create(16, + 16, + ILC_MASK | ILC_COLOR24, + NumButtons, + 0); + if (hImageList) + { + /* Set the index endpoints */ + StartResource = IDB_PROP; + EndResource = IDB_REFRESH; + + /* Add all icons to the image list */ + for (UINT i = StartResource; i <= EndResource; i++) + { + /* Load the image resource */ + hBitmap = (HBITMAP)LoadImage(g_hInstance, + MAKEINTRESOURCE(i), + IMAGE_BITMAP, + 16, + 16, + LR_LOADTRANSPARENT); + if (hBitmap) + { + /* Add it to the image list */ + ImageList_AddMasked(hImageList, + hBitmap, + RGB(255, 0, 128)); + + /* Delete the bitmap */ + DeleteObject(hBitmap); + } + } + + /* Set the new image list */ + hImageList = (HIMAGELIST)SendMessageW(m_hToolBar, + TB_SETIMAGELIST, + 0, + (LPARAM)hImageList); + + /* Destroy any previous list */ + if (hImageList) ImageList_Destroy(hImageList); + + /* Add the buttons */ + bRet = (BOOL)SendMessageW(m_hToolBar, + TB_ADDBUTTONS, + NumButtons, + (LPARAM)ToolbarButtons); + } + } + + return bRet; +} + +BOOL +CMainWindow::CreateStatusBar() +{ + INT StatWidths[] = {110, -1}; /* widths of status bar */ + BOOL bRet = FALSE; + + /* Create the status bar */ + m_hStatusBar = CreateWindowExW(0, + STATUSCLASSNAME, + NULL, + WS_CHILD | WS_VISIBLE | SBARS_SIZEGRIP, + 0, 0, 0, 0, + m_hMainWnd, + (HMENU)IDC_STATUSBAR, + g_hInstance, + NULL); + if (m_hStatusBar) + { + /* Set the width */ + bRet = (BOOL)SendMessage(m_hStatusBar, + SB_SETPARTS, + sizeof(StatWidths) / sizeof(INT), + (LPARAM)StatWidths); + } + + return bRet; +} + BOOL CMainWindow::StatusBarLoadString(IN HWND hStatusBar, IN INT PartId, @@ -22,19 +175,142 @@ CMainWindow::StatusBarLoadString(IN HWND hStatusBar, IN UINT uID) { CAtlString szMessage; - BOOL Ret = FALSE; + BOOL bRet = FALSE; /* Load the string */ if (szMessage.LoadStringW(hInstance, uID)) { /* Send the message to the status bar */ - Ret = (BOOL)SendMessageW(hStatusBar, - SB_SETTEXT, - (WPARAM)PartId, - (LPARAM)szMessage.GetBuffer()); + bRet = (BOOL)SendMessageW(hStatusBar, + SB_SETTEXT, + (WPARAM)PartId, + (LPARAM)szMessage.GetBuffer()); } - return Ret; + return bRet; +} + +LRESULT +CMainWindow::OnCreate(HWND hwnd) +{ + LRESULT RetCode; + + /* Assume failure */ + RetCode = -1; + + /* Store the window handle */ + m_hMainWnd = hwnd; + + /* Create the toolbar */ + if (CreateToolBar()) + { + /* Create the statusbar */ + if (CreateStatusBar()) + { + /* Create the device view object */ + m_DeviceView = new CDeviceView(); + + /* Initialize it */ + if (m_DeviceView->Initialize()) + { + /* Display the window according to the user request */ + ShowWindow(hwnd, m_CmdShow); + + /* Set as handled */ + //RetCode = 0; + } + } + } + + return RetCode; +} + +LRESULT +CMainWindow::OnNotify(LPARAM lParam) +{ + + return 0; +} + +LRESULT +CMainWindow::OnContext(LPARAM lParam) +{ + return 0; +} + +LRESULT +CMainWindow::OnCommand(WPARAM wParam, + LPARAM lParam) +{ + LRESULT RetCode = 0; + WORD Msg; + + /* Get the message */ + Msg = LOWORD(wParam); + + switch (Msg) + { + case IDC_PROP: + { + /* Display the device property sheet */ + m_DeviceView->DisplayPropertySheet(); + break; + } + + case IDC_REFRESH: + { + /* Refresh the device list */ + m_DeviceView->Refresh(); + break; + } + + case IDC_ABOUT: + { + /* Blow my own trumpet */ + MessageBoxW(m_hMainWnd, + L"ReactOS Device Manager\r\nCopyright Ged Murphy 2011", + L"About", + MB_OK); + + /* Set focus back to the treeview */ + m_DeviceView->SetFocus(); + break; + } + + case IDC_EXIT: + { + /* Post a close message to the window */ + PostMessageW(m_hMainWnd, + WM_CLOSE, + 0, + 0); + break; + } + + default: + break; + } + + return RetCode; +} + +LRESULT +CMainWindow::OnDestroy() +{ + /* Uninitialize the device view */ + m_DeviceView->Uninitialize(); + + /* Kill the object */ + delete m_DeviceView; + m_DeviceView = NULL; + + /* Clear the user data pointer */ + SetWindowLongPtr(m_hMainWnd, GWLP_USERDATA, 0); + + /* Break the message loop */ + PostQuitMessage(0); + + return 0; } LRESULT CALLBACK @@ -44,7 +320,7 @@ CMainWindow::MainWndProc(HWND hwnd, LPARAM lParam) { CMainWindow *pThis; - LRESULT Ret = 0; + LRESULT RetCode = 0; /* Get the object pointer from window context */ pThis = (CMainWindow *)GetWindowLongPtr(hwnd, GWLP_USERDATA); @@ -70,21 +346,57 @@ CMainWindow::MainWndProc(HWND hwnd, /* Store the info pointer in the window's global user data */ SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)pThis); - /* Display the window according to the user request */ - ShowWindow(hwnd, pThis->m_CmdShow); + /* Call the create handler */ + RetCode = pThis->OnCreate(hwnd); + break; + } + case WM_NOTIFY: + { + /* Handle the notify message */ + RetCode = pThis->OnNotify(lParam); + break; + } + + case WM_CONTEXTMENU: + { + /* Handle creating the context menu */ + RetCode = pThis->OnContext(lParam); + break; + } + + case WM_COMMAND: + { + /* Handle the command message */ + RetCode = pThis->OnCommand(wParam, lParam); + + /* Hand it off to the default message handler */ + goto HandleDefaultMessage; + } + + case WM_CLOSE: + { + /* Destroy the main window */ + DestroyWindow(hwnd); + } + break; + + case WM_DESTROY: + { + /* Call the destroy handler */ + RetCode = pThis->OnDestroy(); break; } default: { HandleDefaultMessage: - Ret = DefWindowProc(hwnd, msg, wParam, lParam); + RetCode = DefWindowProc(hwnd, msg, wParam, lParam); break; } } - return Ret; + return RetCode; } BOOL @@ -148,7 +460,7 @@ CMainWindow::Run() MSG Msg; /* Pump the message queue */ - while (GetMessageW(&Msg, NULL, 0, 0 )) + while (GetMessageW(&Msg, NULL, 0, 0 ) != 0) { TranslateMessage(&Msg); DispatchMessageW(&Msg); diff --git a/reactos/base/applications/mscutils/devmgmt_new/MainWindow.h b/reactos/base/applications/mscutils/devmgmt_new/MainWindow.h index 16c291a4009..b8f74e51972 100644 --- a/reactos/base/applications/mscutils/devmgmt_new/MainWindow.h +++ b/reactos/base/applications/mscutils/devmgmt_new/MainWindow.h @@ -1,13 +1,33 @@ #pragma once +#include "DeviceView.h" + +typedef struct _MENU_HINT +{ + WORD CmdId; + UINT HintId; +} MENU_HINT, *PMENU_HINT; + class CMainWindow { CAtlString m_szMainWndClass; + CDeviceView *m_DeviceView; HWND m_hMainWnd; + HWND m_hStatusBar; + HWND m_hToolBar; int m_CmdShow; private: static LRESULT CALLBACK MainWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam); + LRESULT OnCreate(HWND hwnd); + LRESULT OnDestroy(); + LRESULT OnSize(); + LRESULT OnNotify(LPARAM lParam); + LRESULT OnContext(LPARAM lParam); + LRESULT OnCommand(WPARAM wParam, LPARAM lParam); + + BOOL CreateToolBar(); + BOOL CreateStatusBar(); BOOL StatusBarLoadString(HWND hStatusBar, INT PartId, HINSTANCE hInstance, UINT uID); public: @@ -17,5 +37,7 @@ public: BOOL Initialize(LPCTSTR lpCaption, int nCmdShow); INT Run(); VOID Uninitialize(); + + }; diff --git a/reactos/base/applications/mscutils/devmgmt_new/Resource.h b/reactos/base/applications/mscutils/devmgmt_new/Resource.h index ab547c3a5fa..9d6feb50932 100644 --- a/reactos/base/applications/mscutils/devmgmt_new/Resource.h +++ b/reactos/base/applications/mscutils/devmgmt_new/Resource.h @@ -12,8 +12,7 @@ #define IDC_PROP 2000 #define IDC_REFRESH 2001 #define IDC_PRINT 2002 -#define IDC_PROGHELP 2003 -#define IDC_EXIT 2004 +#define IDC_EXIT 2003 #define IDC_ABOUT 4031 /* menus */ @@ -30,8 +29,6 @@ /* button bitmaps */ #define IDB_PROP 10000 #define IDB_REFRESH 10001 -#define IDB_HELP 10002 -#define IDB_EXIT 10003 /* toolbar buttons */ #define TBICON_PROP 0 diff --git a/reactos/base/applications/mscutils/devmgmt_new/devmgmt_new.vcxproj b/reactos/base/applications/mscutils/devmgmt_new/devmgmt_new.vcxproj index 86c0a055e96..489cc3a531d 100644 --- a/reactos/base/applications/mscutils/devmgmt_new/devmgmt_new.vcxproj +++ b/reactos/base/applications/mscutils/devmgmt_new/devmgmt_new.vcxproj @@ -81,7 +81,6 @@ - diff --git a/reactos/base/applications/mscutils/devmgmt_new/lang/bg-BG.rc b/reactos/base/applications/mscutils/devmgmt_new/lang/bg-BG.rc index 5b5951f3abd..702ffe69337 100644 --- a/reactos/base/applications/mscutils/devmgmt_new/lang/bg-BG.rc +++ b/reactos/base/applications/mscutils/devmgmt_new/lang/bg-BG.rc @@ -11,8 +11,6 @@ BEGIN MENUITEM "", IDC_PRINT, GRAYED MENUITEM SEPARATOR MENUITEM "", IDC_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "", IDC_PROGHELP, GRAYED END POPUP "" BEGIN @@ -23,7 +21,6 @@ BEGIN END POPUP "" BEGIN - MENUITEM "", IDC_PROGHELP MENUITEM "", IDC_ABOUT END END @@ -33,8 +30,6 @@ BEGIN POPUP "popup" BEGIN MENUITEM "", IDC_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "", IDC_PROGHELP END END diff --git a/reactos/base/applications/mscutils/devmgmt_new/lang/de-DE.rc b/reactos/base/applications/mscutils/devmgmt_new/lang/de-DE.rc index 6e5f6fb4900..687823e40ec 100644 --- a/reactos/base/applications/mscutils/devmgmt_new/lang/de-DE.rc +++ b/reactos/base/applications/mscutils/devmgmt_new/lang/de-DE.rc @@ -11,8 +11,6 @@ BEGIN MENUITEM "Drucken", IDC_PRINT, GRAYED MENUITEM SEPARATOR MENUITEM "Eigenschaften", IDC_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "Hilfe", IDC_PROGHELP, GRAYED END POPUP "Ansicht" BEGIN @@ -23,7 +21,6 @@ BEGIN END POPUP "&?" BEGIN - MENUITEM "Hilfe", IDC_PROGHELP MENUITEM "Info", IDC_ABOUT END END @@ -33,8 +30,6 @@ BEGIN POPUP "popup" BEGIN MENUITEM "Eigenschaften", IDC_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "Hilfe", IDC_PROGHELP END END diff --git a/reactos/base/applications/mscutils/devmgmt_new/lang/el-GR.rc b/reactos/base/applications/mscutils/devmgmt_new/lang/el-GR.rc index 30ecc87fb8d..9e0d61c3ff2 100644 --- a/reactos/base/applications/mscutils/devmgmt_new/lang/el-GR.rc +++ b/reactos/base/applications/mscutils/devmgmt_new/lang/el-GR.rc @@ -11,8 +11,6 @@ BEGIN MENUITEM "", IDC_PRINT, GRAYED MENUITEM SEPARATOR MENUITEM "", IDC_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "", IDC_PROGHELP, GRAYED END POPUP "" BEGIN @@ -23,7 +21,6 @@ BEGIN END POPUP "" BEGIN - MENUITEM "", IDC_PROGHELP MENUITEM "...", IDC_ABOUT END END @@ -33,8 +30,6 @@ BEGIN POPUP "popup" BEGIN MENUITEM "", IDC_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "", IDC_PROGHELP END END diff --git a/reactos/base/applications/mscutils/devmgmt_new/lang/en-US.rc b/reactos/base/applications/mscutils/devmgmt_new/lang/en-US.rc index 19f6474a5d7..fbcdd9af710 100644 --- a/reactos/base/applications/mscutils/devmgmt_new/lang/en-US.rc +++ b/reactos/base/applications/mscutils/devmgmt_new/lang/en-US.rc @@ -11,8 +11,6 @@ BEGIN MENUITEM "Print", IDC_PRINT, GRAYED MENUITEM SEPARATOR MENUITEM "Properties", IDC_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "Help", IDC_PROGHELP, GRAYED END POPUP "View" BEGIN @@ -23,7 +21,6 @@ BEGIN END POPUP "Help" BEGIN - MENUITEM "Help", IDC_PROGHELP MENUITEM "About", IDC_ABOUT END END @@ -33,8 +30,6 @@ BEGIN POPUP "popup" BEGIN MENUITEM "Properties", IDC_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "Help", IDC_PROGHELP END END diff --git a/reactos/base/applications/mscutils/devmgmt_new/lang/es-ES.rc b/reactos/base/applications/mscutils/devmgmt_new/lang/es-ES.rc index 2f8872f87d8..19ea7fc332f 100644 --- a/reactos/base/applications/mscutils/devmgmt_new/lang/es-ES.rc +++ b/reactos/base/applications/mscutils/devmgmt_new/lang/es-ES.rc @@ -15,8 +15,6 @@ BEGIN MENUITEM "Imprimir", IDC_PRINT, GRAYED MENUITEM SEPARATOR MENUITEM "Propiedades", IDC_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "Ayuda", IDC_PROGHELP, GRAYED END POPUP "Ver" BEGIN @@ -27,7 +25,6 @@ BEGIN END POPUP "Ayuda" BEGIN - MENUITEM "Ayuda", IDC_PROGHELP MENUITEM "Acerca de", IDC_ABOUT END END @@ -37,8 +34,6 @@ BEGIN POPUP "popup" BEGIN MENUITEM "Propiedades", IDC_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "Ayuda", IDC_PROGHELP END END diff --git a/reactos/base/applications/mscutils/devmgmt_new/lang/fr-FR.rc b/reactos/base/applications/mscutils/devmgmt_new/lang/fr-FR.rc index 9313aba0f5b..25fe2fd2738 100644 --- a/reactos/base/applications/mscutils/devmgmt_new/lang/fr-FR.rc +++ b/reactos/base/applications/mscutils/devmgmt_new/lang/fr-FR.rc @@ -11,8 +11,6 @@ BEGIN MENUITEM "Imprimer", IDC_PRINT, GRAYED MENUITEM SEPARATOR MENUITEM "Proprits", IDC_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "Aide", IDC_PROGHELP, GRAYED END POPUP "Affichage" BEGIN @@ -23,7 +21,6 @@ BEGIN END POPUP "Aide" BEGIN - MENUITEM "Aide", IDC_PROGHELP MENUITEM " propos", IDC_ABOUT END END @@ -33,8 +30,6 @@ BEGIN POPUP "popup" BEGIN MENUITEM "Proprits", IDC_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "Aide", IDC_PROGHELP END END diff --git a/reactos/base/applications/mscutils/devmgmt_new/lang/id-ID.rc b/reactos/base/applications/mscutils/devmgmt_new/lang/id-ID.rc index 7fca6587c53..a170a4a4886 100644 --- a/reactos/base/applications/mscutils/devmgmt_new/lang/id-ID.rc +++ b/reactos/base/applications/mscutils/devmgmt_new/lang/id-ID.rc @@ -11,8 +11,6 @@ BEGIN MENUITEM "Cetak", IDC_PRINT, GRAYED MENUITEM SEPARATOR MENUITEM "Properti", IDC_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "Bantuan", IDC_PROGHELP, GRAYED END POPUP "Lihat" BEGIN @@ -23,7 +21,6 @@ BEGIN END POPUP "Bantuan" BEGIN - MENUITEM "Bantuan", IDC_PROGHELP MENUITEM "Tentang", IDC_ABOUT END END @@ -33,8 +30,6 @@ BEGIN POPUP "popup" BEGIN MENUITEM "Properti", IDC_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "Bantuan", IDC_PROGHELP END END diff --git a/reactos/base/applications/mscutils/devmgmt_new/lang/it-IT.rc b/reactos/base/applications/mscutils/devmgmt_new/lang/it-IT.rc index 78c8b967344..47975e427ca 100644 --- a/reactos/base/applications/mscutils/devmgmt_new/lang/it-IT.rc +++ b/reactos/base/applications/mscutils/devmgmt_new/lang/it-IT.rc @@ -11,8 +11,6 @@ BEGIN MENUITEM "Stampa", IDC_PRINT, GRAYED MENUITEM SEPARATOR MENUITEM "Propriet", IDC_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "Aiuto", IDC_PROGHELP, GRAYED END POPUP "Visualizza" BEGIN @@ -23,7 +21,6 @@ BEGIN END POPUP "Aiuto" BEGIN - MENUITEM "Aiuto", IDC_PROGHELP MENUITEM "Informazioni su", IDC_ABOUT END END @@ -33,8 +30,6 @@ BEGIN POPUP "popup" BEGIN MENUITEM "Propriet", IDC_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "Aiuto", IDC_PROGHELP END END diff --git a/reactos/base/applications/mscutils/devmgmt_new/lang/ja-JP.rc b/reactos/base/applications/mscutils/devmgmt_new/lang/ja-JP.rc index 2a0afdf9f23..11db0d1785b 100644 --- a/reactos/base/applications/mscutils/devmgmt_new/lang/ja-JP.rc +++ b/reactos/base/applications/mscutils/devmgmt_new/lang/ja-JP.rc @@ -11,8 +11,6 @@ BEGIN MENUITEM "", IDC_PRINT, GRAYED MENUITEM SEPARATOR MENUITEM "vpeB", IDC_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "wv", IDC_PROGHELP, GRAYED END POPUP "\\" BEGIN @@ -23,7 +21,6 @@ BEGIN END POPUP "wv" BEGIN - MENUITEM "wv", IDC_PROGHELP MENUITEM "o[W", IDC_ABOUT END END @@ -33,8 +30,6 @@ BEGIN POPUP "popup" BEGIN MENUITEM "vpeB", IDC_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "wv", IDC_PROGHELP END END diff --git a/reactos/base/applications/mscutils/devmgmt_new/lang/ko-KR.rc b/reactos/base/applications/mscutils/devmgmt_new/lang/ko-KR.rc index 5506faf58a7..08516f30660 100644 --- a/reactos/base/applications/mscutils/devmgmt_new/lang/ko-KR.rc +++ b/reactos/base/applications/mscutils/devmgmt_new/lang/ko-KR.rc @@ -14,8 +14,6 @@ BEGIN MENUITEM "Ʈ", IDC_PRINT, GRAYED MENUITEM SEPARATOR MENUITEM "Ӽ", IDC_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "", IDC_PROGHELP, GRAYED END POPUP "" BEGIN @@ -26,7 +24,6 @@ BEGIN END POPUP "" BEGIN - MENUITEM "", IDC_PROGHELP MENUITEM "", IDC_ABOUT END END @@ -36,8 +33,6 @@ BEGIN POPUP "˾" BEGIN MENUITEM "Ӽ", IDC_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "", IDC_PROGHELP END END diff --git a/reactos/base/applications/mscutils/devmgmt_new/lang/no-NO.rc b/reactos/base/applications/mscutils/devmgmt_new/lang/no-NO.rc index 0521157d3f7..fdd86474e81 100644 --- a/reactos/base/applications/mscutils/devmgmt_new/lang/no-NO.rc +++ b/reactos/base/applications/mscutils/devmgmt_new/lang/no-NO.rc @@ -11,8 +11,6 @@ BEGIN MENUITEM "Skriv ut", IDC_PRINT, GRAYED MENUITEM SEPARATOR MENUITEM "Egenskaper", IDC_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "Hjelp", IDC_PROGHELP, GRAYED END POPUP "Vis" BEGIN @@ -23,7 +21,6 @@ BEGIN END POPUP "Hjelp" BEGIN - MENUITEM "Hjelp", IDC_PROGHELP MENUITEM "Om", IDC_ABOUT END END @@ -33,8 +30,6 @@ BEGIN POPUP "popup" BEGIN MENUITEM "Egenskaper", IDC_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "Hjelp", IDC_PROGHELP END END diff --git a/reactos/base/applications/mscutils/devmgmt_new/lang/pl-PL.rc b/reactos/base/applications/mscutils/devmgmt_new/lang/pl-PL.rc index b7b2f8b640a..0b3ab9c383b 100644 --- a/reactos/base/applications/mscutils/devmgmt_new/lang/pl-PL.rc +++ b/reactos/base/applications/mscutils/devmgmt_new/lang/pl-PL.rc @@ -18,8 +18,6 @@ BEGIN MENUITEM "&Drukuj", IDC_PRINT, GRAYED MENUITEM SEPARATOR MENUITEM "&Właściwości", IDC_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "Pomo&c", IDC_PROGHELP, GRAYED END POPUP "&Widok" BEGIN @@ -30,7 +28,6 @@ BEGIN END POPUP "Pomo&c" BEGIN - MENUITEM "&Tematy pomocy", IDC_PROGHELP MENUITEM "Menedżer urządzeń - i&nformacje", IDC_ABOUT END END @@ -40,8 +37,6 @@ BEGIN POPUP "popup" BEGIN MENUITEM "Właściwości", IDC_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "Pomoc", IDC_PROGHELP END END diff --git a/reactos/base/applications/mscutils/devmgmt_new/lang/ro-RO.rc b/reactos/base/applications/mscutils/devmgmt_new/lang/ro-RO.rc index 8b69ba4dffe..89669539842 100644 --- a/reactos/base/applications/mscutils/devmgmt_new/lang/ro-RO.rc +++ b/reactos/base/applications/mscutils/devmgmt_new/lang/ro-RO.rc @@ -11,8 +11,6 @@ BEGIN MENUITEM "Imprimare", IDC_PRINT, GRAYED MENUITEM SEPARATOR MENUITEM "Proprieti", IDC_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "Ajutor", IDC_PROGHELP, GRAYED END POPUP "Vizualizare" BEGIN @@ -23,7 +21,6 @@ BEGIN END POPUP "Ajutor" BEGIN - MENUITEM "Ajutor", IDC_PROGHELP MENUITEM "Despre", IDC_ABOUT END END @@ -33,8 +30,6 @@ BEGIN POPUP "popup" BEGIN MENUITEM "Proprieti", IDC_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "Ajutor", IDC_PROGHELP END END diff --git a/reactos/base/applications/mscutils/devmgmt_new/lang/ru-RU.rc b/reactos/base/applications/mscutils/devmgmt_new/lang/ru-RU.rc index d3c0d0bbdb8..b2c2675a394 100644 --- a/reactos/base/applications/mscutils/devmgmt_new/lang/ru-RU.rc +++ b/reactos/base/applications/mscutils/devmgmt_new/lang/ru-RU.rc @@ -13,8 +13,6 @@ BEGIN MENUITEM "Печать", IDC_PRINT, GRAYED MENUITEM SEPARATOR MENUITEM "Свойства", IDC_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "Справка", IDC_PROGHELP, GRAYED END POPUP "Вид" BEGIN @@ -25,7 +23,6 @@ BEGIN END POPUP "Справка" BEGIN - MENUITEM "Помощь", IDC_PROGHELP MENUITEM "О программе", IDC_ABOUT END END @@ -35,8 +32,6 @@ BEGIN POPUP "popup" BEGIN MENUITEM "Свойства", IDC_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "Помощь", IDC_PROGHELP END END diff --git a/reactos/base/applications/mscutils/devmgmt_new/lang/sk-SK.rc b/reactos/base/applications/mscutils/devmgmt_new/lang/sk-SK.rc index d5cb7a3a57e..0278c685059 100644 --- a/reactos/base/applications/mscutils/devmgmt_new/lang/sk-SK.rc +++ b/reactos/base/applications/mscutils/devmgmt_new/lang/sk-SK.rc @@ -16,8 +16,6 @@ BEGIN MENUITEM "Tlai", IDC_PRINT, GRAYED MENUITEM SEPARATOR MENUITEM "Vlastnosti", IDC_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "Pomocnk", IDC_PROGHELP, GRAYED END POPUP "Zobrazi" BEGIN @@ -28,7 +26,6 @@ BEGIN END POPUP "Pomocnk" BEGIN - MENUITEM "Pomocnk", IDC_PROGHELP MENUITEM "o je ...", IDC_ABOUT END END @@ -38,8 +35,6 @@ BEGIN POPUP "popup" BEGIN MENUITEM "Vlastnosti", IDC_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "Pomocnk", IDC_PROGHELP END END diff --git a/reactos/base/applications/mscutils/devmgmt_new/lang/sv-SE.rc b/reactos/base/applications/mscutils/devmgmt_new/lang/sv-SE.rc index 84b0652bbe6..5ef7b455f81 100644 --- a/reactos/base/applications/mscutils/devmgmt_new/lang/sv-SE.rc +++ b/reactos/base/applications/mscutils/devmgmt_new/lang/sv-SE.rc @@ -17,8 +17,6 @@ BEGIN MENUITEM "Skriv ut", IDC_PRINT, GRAYED MENUITEM SEPARATOR MENUITEM "Egenskaper", IDC_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "Hjlp", IDC_PROGHELP, GRAYED END POPUP "Visa" BEGIN @@ -29,7 +27,6 @@ BEGIN END POPUP "Hjlp" BEGIN - MENUITEM "Hjlp", IDC_PROGHELP MENUITEM "Om", IDC_ABOUT END END @@ -39,8 +36,6 @@ BEGIN POPUP "popup" BEGIN MENUITEM "Egenskaper", IDC_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "Hjlp", IDC_PROGHELP END END diff --git a/reactos/base/applications/mscutils/devmgmt_new/lang/th-TH.rc b/reactos/base/applications/mscutils/devmgmt_new/lang/th-TH.rc index 50bf21a94e0..95e50dc9b51 100644 --- a/reactos/base/applications/mscutils/devmgmt_new/lang/th-TH.rc +++ b/reactos/base/applications/mscutils/devmgmt_new/lang/th-TH.rc @@ -20,8 +20,6 @@ BEGIN MENUITEM "", IDC_PRINT, GRAYED MENUITEM SEPARATOR MENUITEM "سѵ", IDC_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "", IDC_PROGHELP, GRAYED END POPUP "ͧ" BEGIN @@ -32,7 +30,6 @@ BEGIN END POPUP "" BEGIN - MENUITEM "", IDC_PROGHELP MENUITEM "ǡѺ", IDC_ABOUT END END @@ -42,8 +39,6 @@ BEGIN POPUP "˹ҵҧѨغѹ" BEGIN MENUITEM "سѵ", IDC_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "", IDC_PROGHELP END END diff --git a/reactos/base/applications/mscutils/devmgmt_new/lang/uk-UA.rc b/reactos/base/applications/mscutils/devmgmt_new/lang/uk-UA.rc index aa0c1e15d1c..1aae4afdf3e 100644 --- a/reactos/base/applications/mscutils/devmgmt_new/lang/uk-UA.rc +++ b/reactos/base/applications/mscutils/devmgmt_new/lang/uk-UA.rc @@ -19,8 +19,6 @@ BEGIN MENUITEM "Друк", IDC_PRINT, GRAYED MENUITEM SEPARATOR MENUITEM "Властивості", IDC_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "Довідка", IDC_PROGHELP, GRAYED END POPUP "Вигляд" BEGIN @@ -31,7 +29,6 @@ BEGIN END POPUP "Довідка" BEGIN - MENUITEM "Довідка", IDC_PROGHELP MENUITEM "Про програму", IDC_ABOUT END END @@ -41,8 +38,6 @@ BEGIN POPUP "popup" BEGIN MENUITEM "Властивості", IDC_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "Довідка", IDC_PROGHELP END END diff --git a/reactos/base/applications/mscutils/devmgmt_new/lang/zh-CN.rc b/reactos/base/applications/mscutils/devmgmt_new/lang/zh-CN.rc index 8a1023fbb1d..b550a811473 100644 --- a/reactos/base/applications/mscutils/devmgmt_new/lang/zh-CN.rc +++ b/reactos/base/applications/mscutils/devmgmt_new/lang/zh-CN.rc @@ -15,8 +15,6 @@ BEGIN MENUITEM "打印", IDC_PRINT, GRAYED MENUITEM SEPARATOR MENUITEM "属性", IDC_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "帮助", IDC_PROGHELP, GRAYED END POPUP "查看" BEGIN @@ -27,7 +25,6 @@ BEGIN END POPUP "帮助" BEGIN - MENUITEM "帮助内容", IDC_PROGHELP MENUITEM "关于", IDC_ABOUT END END @@ -37,8 +34,6 @@ BEGIN POPUP "popup" BEGIN MENUITEM "属性", IDC_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "帮助", IDC_PROGHELP END END