Author: gedmurphy Date: Fri Sep 9 18:52:52 2011 New Revision: 53663
URL: http://svn.reactos.org/svn/reactos?rev=53663&view=rev Log: [DEVMGMT] Some main window work.
Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/DeviceView.cpp trunk/reactos/base/applications/mscutils/devmgmt_new/DeviceView.h trunk/reactos/base/applications/mscutils/devmgmt_new/MainWindow.cpp trunk/reactos/base/applications/mscutils/devmgmt_new/MainWindow.h trunk/reactos/base/applications/mscutils/devmgmt_new/Resource.h trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt_new.vcxproj trunk/reactos/base/applications/mscutils/devmgmt_new/lang/bg-BG.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/de-DE.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/el-GR.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/en-US.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/es-ES.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/fr-FR.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/id-ID.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/it-IT.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ja-JP.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ko-KR.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/no-NO.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/pl-PL.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ro-RO.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ru-RU.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/sk-SK.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/sv-SE.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/th-TH.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/uk-UA.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/zh-CN.rc
Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/DeviceView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils/... ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/DeviceView.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/DeviceView.cpp [iso-8859-1] Fri Sep 9 18:52:52 2011 @@ -1,5 +1,4 @@ #include "StdAfx.h" -#include "Devices.h" #include "DeviceView.h"
@@ -11,3 +10,30 @@ CDeviceView::~CDeviceView(void) { } + +BOOL +CDeviceView::Initialize() +{ + return TRUE; +} + +BOOL +CDeviceView::Uninitialize() +{ + return TRUE; +} + +VOID +CDeviceView::Refresh() +{ +} + +VOID +CDeviceView::DisplayPropertySheet() +{ +} + +VOID +CDeviceView::SetFocus() +{ +}
Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/DeviceView.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils/... ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/DeviceView.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/DeviceView.h [iso-8859-1] Fri Sep 9 18:52:52 2011 @@ -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(); };
Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/MainWindow.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils/... ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/MainWindow.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/MainWindow.cpp [iso-8859-1] Fri Sep 9 18:52:52 2011 @@ -2,17 +2,170 @@ #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 @@ -22,19 +175,142 @@ 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()); - } - - return Ret; + bRet = (BOOL)SendMessageW(hStatusBar, + SB_SETTEXT, + (WPARAM)PartId, + (LPARAM)szMessage.GetBuffer()); + } + + 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 @@ 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 @@ /* 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); - break; - } - } - - return Ret; + RetCode = DefWindowProc(hwnd, msg, wParam, lParam); + break; + } + } + + return RetCode; }
BOOL @@ -148,7 +460,7 @@ MSG Msg;
/* Pump the message queue */ - while (GetMessageW(&Msg, NULL, 0, 0 )) + while (GetMessageW(&Msg, NULL, 0, 0 ) != 0) { TranslateMessage(&Msg); DispatchMessageW(&Msg);
Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/MainWindow.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils/... ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/MainWindow.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/MainWindow.h [iso-8859-1] Fri Sep 9 18:52:52 2011 @@ -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 @@ BOOL Initialize(LPCTSTR lpCaption, int nCmdShow); INT Run(); VOID Uninitialize(); + + };
Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/Resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils/... ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/Resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/Resource.h [iso-8859-1] Fri Sep 9 18:52:52 2011 @@ -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
Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt_new.vcxproj URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils/... ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt_new.vcxproj [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt_new.vcxproj [iso-8859-1] Fri Sep 9 18:52:52 2011 @@ -81,7 +81,6 @@ <ClInclude Include="MainWindow.h" /> <ClInclude Include="Resource.h" /> <ClInclude Include="stdafx.h" /> - <ClInclude Include="targetver.h_" /> </ItemGroup> <ItemGroup> <ClCompile Include="Devices.cpp" />
Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils/... ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/bg-BG.rc [iso-8859-1] Fri Sep 9 18:52:52 2011 @@ -11,8 +11,6 @@ MENUITEM "Îòïå÷àòâàíå", IDC_PRINT, GRAYED MENUITEM SEPARATOR MENUITEM "Ñâîéñòâà", IDC_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "Ïîìîù", IDC_PROGHELP, GRAYED END POPUP "Èçãëåä" BEGIN @@ -23,7 +21,6 @@ END POPUP "Ïîìîù" BEGIN - MENUITEM "Ïîìîù", IDC_PROGHELP MENUITEM "Çà", IDC_ABOUT END END @@ -33,8 +30,6 @@ POPUP "popup" BEGIN MENUITEM "Ñâîéñòâà", IDC_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "Ïîìîù", IDC_PROGHELP END END
Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils/... ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/de-DE.rc [iso-8859-1] Fri Sep 9 18:52:52 2011 @@ -11,8 +11,6 @@ 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 @@ END POPUP "&?" BEGIN - MENUITEM "Hilfe", IDC_PROGHELP MENUITEM "Info", IDC_ABOUT END END @@ -33,8 +30,6 @@ POPUP "popup" BEGIN MENUITEM "Eigenschaften", IDC_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "Hilfe", IDC_PROGHELP END END
Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils/... ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/el-GR.rc [iso-8859-1] Fri Sep 9 18:52:52 2011 @@ -11,8 +11,6 @@ MENUITEM "Åêôýðùóç", IDC_PRINT, GRAYED MENUITEM SEPARATOR MENUITEM "Éäéüôçôåò", IDC_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "ÂïÞèåéá", IDC_PROGHELP, GRAYED END POPUP "ÅìöÜíéóç" BEGIN @@ -23,7 +21,6 @@ END POPUP "ÂïÞèåéá" BEGIN - MENUITEM "ÂïÞèåéá", IDC_PROGHELP MENUITEM "Ó÷åôéêÜ...", IDC_ABOUT END END @@ -33,8 +30,6 @@ POPUP "popup" BEGIN MENUITEM "Éäéüôçôåò", IDC_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "ÂïÞèåéá", IDC_PROGHELP END END
Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils/... ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/en-US.rc [iso-8859-1] Fri Sep 9 18:52:52 2011 @@ -11,8 +11,6 @@ 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 @@ END POPUP "Help" BEGIN - MENUITEM "Help", IDC_PROGHELP MENUITEM "About", IDC_ABOUT END END @@ -33,8 +30,6 @@ POPUP "popup" BEGIN MENUITEM "Properties", IDC_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "Help", IDC_PROGHELP END END
Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils/... ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/es-ES.rc [iso-8859-1] Fri Sep 9 18:52:52 2011 @@ -15,8 +15,6 @@ 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 @@ END POPUP "Ayuda" BEGIN - MENUITEM "Ayuda", IDC_PROGHELP MENUITEM "Acerca de", IDC_ABOUT END END @@ -37,8 +34,6 @@ POPUP "popup" BEGIN MENUITEM "Propiedades", IDC_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "Ayuda", IDC_PROGHELP END END
Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils/... ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/fr-FR.rc [iso-8859-1] Fri Sep 9 18:52:52 2011 @@ -11,8 +11,6 @@ MENUITEM "Imprimer", IDC_PRINT, GRAYED MENUITEM SEPARATOR MENUITEM "Propriétés", IDC_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "Aide", IDC_PROGHELP, GRAYED END POPUP "Affichage" BEGIN @@ -23,7 +21,6 @@ END POPUP "Aide" BEGIN - MENUITEM "Aide", IDC_PROGHELP MENUITEM "À propos", IDC_ABOUT END END @@ -33,8 +30,6 @@ POPUP "popup" BEGIN MENUITEM "Propriétés", IDC_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "Aide", IDC_PROGHELP END END
Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils/... ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/id-ID.rc [iso-8859-1] Fri Sep 9 18:52:52 2011 @@ -11,8 +11,6 @@ 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 @@ END POPUP "Bantuan" BEGIN - MENUITEM "Bantuan", IDC_PROGHELP MENUITEM "Tentang", IDC_ABOUT END END @@ -33,8 +30,6 @@ POPUP "popup" BEGIN MENUITEM "Properti", IDC_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "Bantuan", IDC_PROGHELP END END
Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils/... ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/it-IT.rc [iso-8859-1] Fri Sep 9 18:52:52 2011 @@ -11,8 +11,6 @@ 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 @@ END POPUP "Aiuto" BEGIN - MENUITEM "Aiuto", IDC_PROGHELP MENUITEM "Informazioni su", IDC_ABOUT END END @@ -33,8 +30,6 @@ POPUP "popup" BEGIN MENUITEM "Proprietà", IDC_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "Aiuto", IDC_PROGHELP END END
Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils/... ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ja-JP.rc [iso-8859-1] Fri Sep 9 18:52:52 2011 @@ -11,8 +11,6 @@ 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 @@ END POPUP "wv" BEGIN - MENUITEM "wv", IDC_PROGHELP MENUITEM "o[Wîñ", IDC_ABOUT END END @@ -33,8 +30,6 @@ POPUP "popup" BEGIN MENUITEM "vpeB", IDC_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "wv", IDC_PROGHELP END END
Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils/... ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ko-KR.rc [iso-8859-1] Fri Sep 9 18:52:52 2011 @@ -14,8 +14,6 @@ MENUITEM "ÇÁ¸°Æ®", IDC_PRINT, GRAYED MENUITEM SEPARATOR MENUITEM "¼Ó¼º", IDC_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "µµ¿ò¸»", IDC_PROGHELP, GRAYED END POPUP "º¸±â" BEGIN @@ -26,7 +24,6 @@ END POPUP "µµ¿ò¸»" BEGIN - MENUITEM "µµ¿ò¸»", IDC_PROGHELP MENUITEM "Á¤º¸", IDC_ABOUT END END @@ -36,8 +33,6 @@ POPUP "Æ˾÷" BEGIN MENUITEM "¼Ó¼º", IDC_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "µµ¿ò¸»", IDC_PROGHELP END END
Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils/... ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/no-NO.rc [iso-8859-1] Fri Sep 9 18:52:52 2011 @@ -11,8 +11,6 @@ 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 @@ END POPUP "Hjelp" BEGIN - MENUITEM "Hjelp", IDC_PROGHELP MENUITEM "Om", IDC_ABOUT END END @@ -33,8 +30,6 @@ POPUP "popup" BEGIN MENUITEM "Egenskaper", IDC_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "Hjelp", IDC_PROGHELP END END
Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils/... ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/pl-PL.rc [iso-8859-1] Fri Sep 9 18:52:52 2011 @@ -18,8 +18,6 @@ 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 @@ 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 @@ POPUP "popup" BEGIN MENUITEM "WÅaÅciwoÅci", IDC_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "Pomoc", IDC_PROGHELP END END
Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils/... ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ro-RO.rc [iso-8859-1] Fri Sep 9 18:52:52 2011 @@ -11,8 +11,6 @@ MENUITEM "Imprimare", IDC_PRINT, GRAYED MENUITEM SEPARATOR MENUITEM "Proprietãþi", IDC_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "Ajutor", IDC_PROGHELP, GRAYED END POPUP "Vizualizare" BEGIN @@ -23,7 +21,6 @@ END POPUP "Ajutor" BEGIN - MENUITEM "Ajutor", IDC_PROGHELP MENUITEM "Despre", IDC_ABOUT END END @@ -33,8 +30,6 @@ POPUP "popup" BEGIN MENUITEM "Proprietãþi", IDC_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "Ajutor", IDC_PROGHELP END END
Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils/... ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ru-RU.rc [iso-8859-1] Fri Sep 9 18:52:52 2011 @@ -13,8 +13,6 @@ MENUITEM "ÐеÑаÑÑ", IDC_PRINT, GRAYED MENUITEM SEPARATOR MENUITEM "СвойÑÑва", IDC_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "СпÑавка", IDC_PROGHELP, GRAYED END POPUP "Ðид" BEGIN @@ -25,7 +23,6 @@ END POPUP "СпÑавка" BEGIN - MENUITEM "ÐомоÑÑ", IDC_PROGHELP MENUITEM "РпÑогÑамме", IDC_ABOUT END END @@ -35,8 +32,6 @@ POPUP "popup" BEGIN MENUITEM "СвойÑÑва", IDC_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "ÐомоÑÑ", IDC_PROGHELP END END
Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils/... ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/sk-SK.rc [iso-8859-1] Fri Sep 9 18:52:52 2011 @@ -16,8 +16,6 @@ MENUITEM "Tlaèi", IDC_PRINT, GRAYED MENUITEM SEPARATOR MENUITEM "Vlastnosti", IDC_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "Pomocník", IDC_PROGHELP, GRAYED END POPUP "Zobrazi" BEGIN @@ -28,7 +26,6 @@ END POPUP "Pomocník" BEGIN - MENUITEM "Pomocník", IDC_PROGHELP MENUITEM "Èo je ...", IDC_ABOUT END END @@ -38,8 +35,6 @@ POPUP "popup" BEGIN MENUITEM "Vlastnosti", IDC_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "Pomocník", IDC_PROGHELP END END
Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils/... ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/sv-SE.rc [iso-8859-1] Fri Sep 9 18:52:52 2011 @@ -17,8 +17,6 @@ MENUITEM "Skriv ut", IDC_PRINT, GRAYED MENUITEM SEPARATOR MENUITEM "Egenskaper", IDC_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "Hjälp", IDC_PROGHELP, GRAYED END POPUP "Visa" BEGIN @@ -29,7 +27,6 @@ END POPUP "Hjälp" BEGIN - MENUITEM "Hjälp", IDC_PROGHELP MENUITEM "Om", IDC_ABOUT END END @@ -39,8 +36,6 @@ POPUP "popup" BEGIN MENUITEM "Egenskaper", IDC_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "Hjälp", IDC_PROGHELP END END
Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils/... ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/th-TH.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/th-TH.rc [iso-8859-1] Fri Sep 9 18:52:52 2011 @@ -20,8 +20,6 @@ MENUITEM "¾ÔÁ¾ì", IDC_PRINT, GRAYED MENUITEM SEPARATOR MENUITEM "¤Ø³ÊÁºÑµÔ", IDC_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "ªèÇÂàËÅ×Í", IDC_PROGHELP, GRAYED END POPUP "ÁØÁÁͧ" BEGIN @@ -32,7 +30,6 @@ END POPUP "ªèÇÂàËÅ×Í" BEGIN - MENUITEM "ªèÇÂàËÅ×Í", IDC_PROGHELP MENUITEM "à¡ÕèÂǡѺ", IDC_ABOUT END END @@ -42,8 +39,6 @@ POPUP "˹éÒµèÒ§»Ñ¨¨ØºÑ¹" BEGIN MENUITEM "¤Ø³ÊÁºÑµÔ", IDC_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "ªèÇÂàËÅ×Í", IDC_PROGHELP END END
Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils/... ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/uk-UA.rc [iso-8859-1] Fri Sep 9 18:52:52 2011 @@ -19,8 +19,6 @@ MENUITEM "ÐÑÑк", IDC_PRINT, GRAYED MENUITEM SEPARATOR MENUITEM "ÐлаÑÑивоÑÑÑ", IDC_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "ÐовÑдка", IDC_PROGHELP, GRAYED END POPUP "ÐиглÑд" BEGIN @@ -31,7 +29,6 @@ END POPUP "ÐовÑдка" BEGIN - MENUITEM "ÐовÑдка", IDC_PROGHELP MENUITEM "ÐÑо пÑогÑамÑ", IDC_ABOUT END END @@ -41,8 +38,6 @@ POPUP "popup" BEGIN MENUITEM "ÐлаÑÑивоÑÑÑ", IDC_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "ÐовÑдка", IDC_PROGHELP END END
Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils/... ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/zh-CN.rc [iso-8859-1] Fri Sep 9 18:52:52 2011 @@ -15,8 +15,6 @@ MENUITEM "æå°", IDC_PRINT, GRAYED MENUITEM SEPARATOR MENUITEM "å±æ§", IDC_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "帮å©", IDC_PROGHELP, GRAYED END POPUP "æ¥ç" BEGIN @@ -27,7 +25,6 @@ END POPUP "帮å©" BEGIN - MENUITEM "帮å©å 容", IDC_PROGHELP MENUITEM "å ³äº", IDC_ABOUT END END @@ -37,8 +34,6 @@ POPUP "popup" BEGIN MENUITEM "å±æ§", IDC_PROP, GRAYED - MENUITEM SEPARATOR - MENUITEM "帮å©", IDC_PROGHELP END END