[ekohl] 59823: [MMC] - Fix all bugs that keep MMC from starting and terminating properly. - Implement an MDI client window. - Add menuitem "File/New" in order to create a new console window (MDI ch...
25 Aug
2013
25 Aug
'13
9:43 p.m.
Author: ekohl
Date: Sun Aug 25 21:43:46 2013
New Revision: 59823
URL: http://svn.reactos.org/svn/reactos?rev=59823&view=rev
Log:
[MMC]
- Fix all bugs that keep MMC from starting and terminating properly.
- Implement an MDI client window.
- Add menuitem "File/New" in order to create a new console window (MDI child).
- Add a "large" menu that is used when console windows are visible.
Modified:
trunk/reactos/base/applications/mmc/console.c
trunk/reactos/base/applications/mmc/lang/bg-BG.rc
trunk/reactos/base/applications/mmc/lang/ca-ES.rc
trunk/reactos/base/applications/mmc/lang/cs-CZ.rc
trunk/reactos/base/applications/mmc/lang/de-DE.rc
trunk/reactos/base/applications/mmc/lang/el-GR.rc
trunk/reactos/base/applications/mmc/lang/en-US.rc
trunk/reactos/base/applications/mmc/lang/es-ES.rc
trunk/reactos/base/applications/mmc/lang/fr-FR.rc
trunk/reactos/base/applications/mmc/lang/he-IL.rc
trunk/reactos/base/applications/mmc/lang/it-IT.rc
trunk/reactos/base/applications/mmc/lang/ko-KR.rc
trunk/reactos/base/applications/mmc/lang/lt-LT.rc
trunk/reactos/base/applications/mmc/lang/no-NO.rc
trunk/reactos/base/applications/mmc/lang/pl-PL.rc
trunk/reactos/base/applications/mmc/lang/pt-BR.rc
trunk/reactos/base/applications/mmc/lang/ro-RO.rc
trunk/reactos/base/applications/mmc/lang/ru-RU.rc
trunk/reactos/base/applications/mmc/lang/sk-SK.rc
trunk/reactos/base/applications/mmc/lang/sv-SE.rc
trunk/reactos/base/applications/mmc/lang/tr-TR.rc
trunk/reactos/base/applications/mmc/lang/uk-UA.rc
trunk/reactos/base/applications/mmc/lang/zh-CN.rc
trunk/reactos/base/applications/mmc/lang/zh-TW.rc
trunk/reactos/base/applications/mmc/mmc.c
trunk/reactos/base/applications/mmc/precomp.h
trunk/reactos/base/applications/mmc/resource.h
Modified: trunk/reactos/base/applications/mmc/console.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/cons…
==============================================================================
--- trunk/reactos/base/applications/mmc/console.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mmc/console.c [iso-8859-1] Sun Aug 25 21:43:46 2013
@@ -22,7 +22,6 @@
static const TCHAR szMMCMainFrame[] = TEXT("MMCMainFrame");
static const TCHAR szMMCChildFrm[] = TEXT("MMCChildFrm");
-static LONG MainFrameWndCount = 0;
static ULONG NewConsoleCount = 0;
static LPTSTR
@@ -41,11 +40,16 @@
return lpTitle;
}
+
typedef struct _CONSOLE_MAINFRAME_WND
{
HWND hwnd;
+ HWND hwndMDIClient;
+
LPCTSTR lpConsoleTitle;
- HMENU hMenuConsoleRoot;
+ HMENU hMenuConsoleSmall;
+ HMENU hMenuConsoleLarge;
+ INT nConsoleCount;
union
{
DWORD Flags;
@@ -56,6 +60,173 @@
};
} CONSOLE_MAINFRAME_WND, *PCONSOLE_MAINFRAME_WND;
+
+HWND
+CreateNewMDIChild(PCONSOLE_MAINFRAME_WND Info,
+ HWND hwndMDIClient)
+{
+ MDICREATESTRUCT mcs;
+ HWND hChild;
+
+ mcs.szTitle = CreateNewConsoleTitle();
+ mcs.szClass = szMMCChildFrm;
+ mcs.hOwner = GetModuleHandle(NULL);
+ mcs.x = mcs.cx = CW_USEDEFAULT;
+ mcs.y = mcs.cy = CW_USEDEFAULT;
+ mcs.style = MDIS_ALLCHILDSTYLES;
+
+ hChild = (HWND)SendMessage(hwndMDIClient, WM_MDICREATE, 0, (LONG)&mcs);
+ if (hChild)
+ {
+ Info->nConsoleCount++;
+ }
+
+ return hChild;
+}
+
+
+static LRESULT
+FrameOnCreate(HWND hwnd,
+ LPARAM lParam)
+{
+ PCONSOLE_MAINFRAME_WND Info;
+ CLIENTCREATESTRUCT ccs;
+ LPCTSTR lpFileName = (LPCTSTR)(((LPCREATESTRUCT)lParam)->lpCreateParams);
+
+ Info = HeapAlloc(hAppHeap,
+ 0,
+ sizeof(CONSOLE_MAINFRAME_WND));
+ if (Info == NULL)
+ return -1;
+
+ ZeroMemory(Info,
+ sizeof(CONSOLE_MAINFRAME_WND));
+
+ Info->hwnd = hwnd;
+
+ SetWindowLongPtr(hwnd,
+ 0,
+ (LONG_PTR)Info);
+
+ Info->hMenuConsoleSmall = LoadMenu(hAppInstance,
+ MAKEINTRESOURCE(IDM_CONSOLE_SMALL));
+
+ Info->hMenuConsoleLarge = LoadMenu(hAppInstance,
+ MAKEINTRESOURCE(IDM_CONSOLE_LARGE));
+
+ if (lpFileName == NULL)
+ {
+ /* FIXME */
+ Info->AppAuthorMode = TRUE;
+ Info->lpConsoleTitle = TEXT("ReactOS Management Console");
+ }
+ else
+ {
+ Info->AppAuthorMode = TRUE;
+ Info->lpConsoleTitle = CreateNewConsoleTitle();
+ }
+
+ SetMenu(Info->hwnd,
+ Info->hMenuConsoleSmall);
+
+ SetWindowText(Info->hwnd,
+ Info->lpConsoleTitle);
+
+ ccs.hWindowMenu = GetSubMenu(Info->hMenuConsoleLarge, 1);
+ ccs.idFirstChild = IDM_MDI_FIRSTCHILD;
+
+ /* Create the MDI client window */
+ hwndMDIClient = CreateWindowEx(WS_EX_CLIENTEDGE,
+ L"MDICLIENT",
+ (LPCTSTR)NULL,
+ WS_CHILD | WS_CLIPCHILDREN | WS_VSCROLL | WS_HSCROLL |
WS_VISIBLE | WS_BORDER,
+ CW_USEDEFAULT,
+ CW_USEDEFAULT,
+ CW_USEDEFAULT,
+ CW_USEDEFAULT,
+ hwnd,
+ (HMENU)0xCAC,
+ hAppInstance,
+ (LPVOID)&ccs);
+
+ ShowWindow(Info->hwndMDIClient, SW_SHOW);
+
+ return 0;
+}
+
+
+static VOID
+FrameOnCommand(HWND hwnd,
+ UINT uMsg,
+ WPARAM wParam,
+ LPARAM lParam)
+{
+ PCONSOLE_MAINFRAME_WND Info;
+ HWND hChild;
+
+ Info = (PCONSOLE_MAINFRAME_WND)GetWindowLongPtr(hwnd, 0);
+
+ switch (LOWORD(wParam))
+ {
+ case IDM_FILE_NEW:
+ CreateNewMDIChild(Info, hwndMDIClient);
+ SetMenu(Info->hwnd,
+ Info->hMenuConsoleLarge);
+ break;
+
+ case IDM_FILE_EXIT:
+ PostMessage(hwnd, WM_CLOSE, 0, 0);
+ break;
+
+ default:
+ if (LOWORD(wParam) >= IDM_MDI_FIRSTCHILD)
+ {
+ DefFrameProc(hwnd, hwndMDIClient, uMsg, wParam, lParam);
+ }
+ else
+ {
+ hChild = (HWND)SendMessage(hwndMDIClient, WM_MDIGETACTIVE, 0, 0);
+ if (hChild)
+ {
+ SendMessage(hChild, WM_COMMAND, wParam, lParam);
+ }
+ }
+ break;
+ }
+}
+
+
+static VOID
+FrameOnSize(HWND hMainWnd,
+ WORD cx,
+ WORD cy)
+{
+ RECT rcClient; //, rcTool, rcStatus;
+// int lvHeight, iToolHeight, iStatusHeight;
+
+ /* Size toolbar and get height */
+// SendMessage(Info->hTool, TB_AUTOSIZE, 0, 0);
+// GetWindowRect(Info->hTool, &rcTool);
+// iToolHeight = rcTool.bottom - rcTool.top;
+
+ /* Size status bar and get height */
+// SendMessage(Info->hStatus, WM_SIZE, 0, 0);
+// GetWindowRect(Info->hStatus, &rcStatus);
+// iStatusHeight = rcStatus.bottom - rcStatus.top;
+
+ /* Calculate remaining height and size list view */
+ GetClientRect(hMainWnd, &rcClient);
+// lvHeight = rcClient.bottom - iToolHeight - iStatusHeight;
+ SetWindowPos(hwndMDIClient, //Info->hTreeView,
+ NULL,
+ 0,
+ 0, //iToolHeight,
+ rcClient.right,
+ rcClient.bottom, //lvHeight,
+ SWP_NOZORDER);
+}
+
+
static LRESULT CALLBACK
ConsoleMainFrameWndProc(IN HWND hwnd,
IN UINT uMsg,
@@ -63,111 +234,79 @@
IN LPARAM lParam)
{
PCONSOLE_MAINFRAME_WND Info;
- LRESULT Ret = FALSE;
Info = (PCONSOLE_MAINFRAME_WND)GetWindowLongPtr(hwnd,
0);
- if (Info != NULL || uMsg == WM_NCCREATE)
- {
- switch (uMsg)
- {
- case WM_COMMAND:
+ switch (uMsg)
+ {
+ case WM_CREATE:
+ return FrameOnCreate(hwnd,
+ lParam);
+
+ case WM_COMMAND:
+ FrameOnCommand(hwnd,
+ uMsg,
+ wParam,
+ lParam);
+ break;
+
+ case WM_SIZE:
+ FrameOnSize(hwnd,
+ LOWORD(lParam),
+ HIWORD(lParam));
+ break;
+
+ case WM_CLOSE:
+ DestroyWindow(hwnd);
+ break;
+
+ case WM_DESTROY:
+ if (Info != NULL)
{
- switch (LOWORD(wParam))
- {
- case ID_FILE_EXIT:
- PostMessage(hwnd,
- WM_CLOSE,
- 0,
- 0);
- break;
- }
- break;
- }
-
- case WM_NCCREATE:
- {
- MainFrameWndCount++;
-
- Info = HeapAlloc(hAppHeap,
- 0,
- sizeof(*Info));
- if (Info != NULL)
- {
- ZeroMemory(Info,
- sizeof(*Info));
-
- Info->hwnd = hwnd;
-
- SetWindowLongPtr(hwnd,
- 0,
- (LONG_PTR)Info);
-
- Info->hMenuConsoleRoot = LoadMenu(hAppInstance,
- MAKEINTRESOURCE(IDM_CONSOLEROOT));
- Ret = TRUE;
- }
- break;
- }
-
- case WM_CREATE:
- {
- LPCTSTR lpFileName =
(LPCTSTR)(((LPCREATESTRUCT)lParam)->lpCreateParams);
-
- if (lpFileName != NULL)
- {
- /* FIXME */
- }
- else
- {
- Info->AppAuthorMode = TRUE;
- Info->lpConsoleTitle = CreateNewConsoleTitle();
- }
-
- SetWindowText(Info->hwnd,
- Info->lpConsoleTitle);
- break;
- }
-
- case WM_NCDESTROY:
SetMenu(Info->hwnd,
NULL);
- if (Info->hMenuConsoleRoot != NULL)
+ if (Info->hMenuConsoleSmall != NULL)
{
- DestroyMenu(Info->hMenuConsoleRoot);
- Info->hMenuConsoleRoot = NULL;
+ DestroyMenu(Info->hMenuConsoleSmall);
+ Info->hMenuConsoleSmall = NULL;
+ }
+
+ if (Info->hMenuConsoleLarge != NULL)
+ {
+ DestroyMenu(Info->hMenuConsoleLarge);
+ Info->hMenuConsoleLarge = NULL;
}
HeapFree(hAppHeap,
0,
Info);
-
- if (--MainFrameWndCount == 0)
- PostQuitMessage(0);
- break;
-
-
- case WM_CLOSE:
- DestroyWindow(hwnd);
- break;
-
- default:
- goto HandleDefaultMsg;
- }
- }
- else
- {
-HandleDefaultMsg:
- Ret = DefWindowProc(hwnd,
- uMsg,
- wParam,
- lParam);
- }
-
- return Ret;
-}
+ }
+
+ PostQuitMessage(0);
+ break;
+
+ case WM_USER_CLOSE_CHILD:
+ Info->nConsoleCount--;
+ if (Info->nConsoleCount == 0)
+ {
+ SetMenu(Info->hwnd,
+ Info->hMenuConsoleSmall);
+ }
+ break;
+
+ default:
+ return DefFrameProc(hwnd,
+ hwndMDIClient,
+ uMsg,
+ wParam,
+ lParam);
+ }
+
+ return 0;
+}
+
typedef struct _CONSOLE_CHILDFRM_WND
{
@@ -182,65 +321,52 @@
IN LPARAM lParam)
{
PCONSOLE_CHILDFRM_WND Info;
- LRESULT Ret = FALSE;
Info = (PCONSOLE_CHILDFRM_WND)GetWindowLongPtr(hwnd,
0);
- if (Info != NULL || uMsg == WM_NCCREATE)
- {
- switch (uMsg)
- {
- case WM_NCCREATE:
- Info = HeapAlloc(hAppHeap,
+ switch (uMsg)
+ {
+ case WM_CREATE:
+ Info = HeapAlloc(hAppHeap,
+ 0,
+ sizeof(CONSOLE_CHILDFRM_WND));
+ if (Info != NULL)
+ {
+ ZeroMemory(Info,
+ sizeof(CONSOLE_CHILDFRM_WND));
+
+ Info->hwnd = hwnd;
+
+ SetWindowLongPtr(hwnd,
0,
- sizeof(*Info));
- if (Info != NULL)
- {
- ZeroMemory(Info,
- sizeof(*Info));
-
- Info->hwnd = hwnd;
-
- SetWindowLongPtr(hwnd,
- 0,
- (LONG_PTR)Info);
-
- Ret = TRUE;
- }
- break;
-
-
- case WM_NCDESTROY:
- HeapFree(hAppHeap,
- 0,
- Info);
- break;
-
- default:
- goto HandleDefaultMsg;
- }
- }
- else
- {
-HandleDefaultMsg:
- Ret = DefWindowProc(hwnd,
- uMsg,
- wParam,
- lParam);
- }
-
- return Ret;
-
-}
+ (LONG_PTR)Info);
+ }
+ break;
+
+ case WM_DESTROY:
+ if (Info != NULL)
+ HeapFree(hAppHeap, 0, Info);
+
+ PostMessage(hwndMainConsole, WM_USER_CLOSE_CHILD, 0, 0);
+ break;
+
+ default:
+ return DefMDIChildProc(hwnd, uMsg, wParam, lParam);
+ }
+
+ return 0;
+}
+
BOOL
RegisterMMCWndClasses(VOID)
{
- WNDCLASS wc;
+ WNDCLASSEX wc = {0};
BOOL Ret;
/* Register the MMCMainFrame window class */
+ wc.cbSize = sizeof(WNDCLASSEX);
wc.style = 0;
wc.lpfnWndProc = ConsoleMainFrameWndProc;
wc.cbClsExtra = 0;
@@ -254,15 +380,25 @@
wc.lpszMenuName = NULL;
wc.lpszClassName = szMMCMainFrame;
- Ret = (RegisterClass(&wc) != (ATOM)0);
+ Ret = (RegisterClassEx(&wc) != (ATOM)0);
+
if (Ret)
{
/* Register the MMCChildFrm window class */
+ wc.cbSize = sizeof(WNDCLASSEX);
+ wc.style = CS_HREDRAW | CS_VREDRAW;
wc.lpfnWndProc = ConsoleChildFrmProc;
+ wc.cbClsExtra = 0;
wc.cbWndExtra = sizeof(PCONSOLE_CHILDFRM_WND);
+ wc.hInstance = hAppInstance;
+ wc.hIcon = LoadIcon(NULL, IDI_APPLICATION);
+ wc.hCursor = LoadCursor(NULL, IDC_ARROW);
+ wc.hbrBackground = (HBRUSH)(COLOR_3DFACE+1);
+ wc.lpszMenuName = NULL;
wc.lpszClassName = szMMCChildFrm;
-
- Ret = (RegisterClass(&wc) != (ATOM)0);
+ wc.hIconSm = LoadIcon(NULL, IDI_APPLICATION);
+
+ Ret = (RegisterClassEx(&wc) != (ATOM)0);
if (!Ret)
{
UnregisterClass(szMMCMainFrame,
@@ -283,7 +419,8 @@
}
HWND
-CreateConsoleWindow(IN LPCTSTR lpFileName OPTIONAL)
+CreateConsoleWindow(IN LPCTSTR lpFileName OPTIONAL,
+ int nCmdShow)
{
HWND hWndConsole;
LONG_PTR FileName = (LONG_PTR)lpFileName;
@@ -291,7 +428,7 @@
hWndConsole = CreateWindowEx(WS_EX_WINDOWEDGE,
szMMCMainFrame,
NULL,
- WS_OVERLAPPEDWINDOW | WS_CLIPSIBLINGS,
+ WS_OVERLAPPEDWINDOW | WS_CLIPSIBLINGS |
WS_CLIPCHILDREN,
CW_USEDEFAULT,
CW_USEDEFAULT,
CW_USEDEFAULT,
@@ -303,8 +440,7 @@
if (hWndConsole != NULL)
{
- ShowWindow(hWndConsole,
- SW_SHOWDEFAULT);
+ ShowWindow(hWndConsole, nCmdShow);
}
return hWndConsole;
Modified: trunk/reactos/base/applications/mmc/lang/bg-BG.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang…
==============================================================================
--- trunk/reactos/base/applications/mmc/lang/bg-BG.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mmc/lang/bg-BG.rc [iso-8859-1] Sun Aug 25 21:43:46
2013
@@ -1,16 +1,37 @@
LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
-IDM_CONSOLEROOT MENU DISCARDABLE
+IDM_CONSOLE_SMALL MENU DISCARDABLE
BEGIN
POPUP "&Файл"
BEGIN
+ MENUITEM "New\tStrg+N", IDM_FILE_NEW
MENUITEM SEPARATOR
- MENUITEM "Ðз&Ñ
од\tAlt+F4", ID_FILE_EXIT
+ MENUITEM "Ðз&Ñ
од\tAlt+F4", IDM_FILE_EXIT
END
POPUP "Ðомо&Ñ"
BEGIN
- MENUITEM "&Ðа ÐÑибоÑа за ÑпÑавление на
РеакÑÐС...", ID_HELP_ABOUT
+ MENUITEM "&Ðа ÐÑибоÑа за ÑпÑавление на
РеакÑÐС...", IDM_HELP_ABOUT
+ END
+END
+
+IDM_CONSOLE_LARGE MENU DISCARDABLE
+BEGIN
+ POPUP "&Файл"
+ BEGIN
+ MENUITEM "New\tStrg+N", IDM_FILE_NEW
+ MENUITEM SEPARATOR
+ MENUITEM "Ðз&Ñ
од\tAlt+F4", IDM_FILE_EXIT
+ END
+
+ POPUP "&Windows"
+ BEGIN
+ MENUITEM "List", IDM_WINDOWS_LIST
+ END
+
+ POPUP "Ðомо&Ñ"
+ BEGIN
+ MENUITEM "&Ðа ÐÑибоÑа за ÑпÑавление на
РеакÑÐС...", IDM_HELP_ABOUT
END
END
Modified: trunk/reactos/base/applications/mmc/lang/ca-ES.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang…
==============================================================================
--- trunk/reactos/base/applications/mmc/lang/ca-ES.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mmc/lang/ca-ES.rc [iso-8859-1] Sun Aug 25 21:43:46
2013
@@ -1,16 +1,37 @@
LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT
-IDM_CONSOLEROOT MENU DISCARDABLE
+IDM_CONSOLE_SMALL MENU DISCARDABLE
BEGIN
POPUP "&Fitxer"
BEGIN
+ MENUITEM "New\tStrg+N", IDM_FILE_NEW
MENUITEM SEPARATOR
- MENUITEM "&Sortida\tAlt+F4", ID_FILE_EXIT
+ MENUITEM "&Sortida\tAlt+F4", IDM_FILE_EXIT
END
POPUP "&Ajuda"
BEGIN
- MENUITEM "&En quant a Consola d'administracio de ReactOS...",
ID_HELP_ABOUT
+ MENUITEM "&En quant a Consola d'administracio de ReactOS...",
IDM_HELP_ABOUT
+ END
+END
+
+IDM_CONSOLE_LARGE MENU DISCARDABLE
+BEGIN
+ POPUP "&Fitxer"
+ BEGIN
+ MENUITEM "New\tStrg+N", IDM_FILE_NEW
+ MENUITEM SEPARATOR
+ MENUITEM "&Sortida\tAlt+F4", IDM_FILE_EXIT
+ END
+
+ POPUP "&Windows"
+ BEGIN
+ MENUITEM "List", IDM_WINDOWS_LIST
+ END
+
+ POPUP "&Ajuda"
+ BEGIN
+ MENUITEM "&En quant a Consola d'administracio de ReactOS...",
IDM_HELP_ABOUT
END
END
Modified: trunk/reactos/base/applications/mmc/lang/cs-CZ.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang…
==============================================================================
--- trunk/reactos/base/applications/mmc/lang/cs-CZ.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mmc/lang/cs-CZ.rc [iso-8859-1] Sun Aug 25 21:43:46
2013
@@ -5,17 +5,38 @@
LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
-IDM_CONSOLEROOT MENU DISCARDABLE
+IDM_CONSOLE_SMALL MENU DISCARDABLE
BEGIN
POPUP "&Soubor"
BEGIN
+ MENUITEM "New\tStrg+N", IDM_FILE_NEW
MENUITEM SEPARATOR
- MENUITEM "Uk&onÄit\tAlt+F4", ID_FILE_EXIT
+ MENUITEM "Uk&onÄit\tAlt+F4", IDM_FILE_EXIT
END
POPUP "&NápovÄda"
BEGIN
- MENUITEM "&O konzoli ÅÃzenà systému ReactOS...", ID_HELP_ABOUT
+ MENUITEM "&O konzoli ÅÃzenà systému ReactOS...",
IDM_HELP_ABOUT
+ END
+END
+
+IDM_CONSOLE_LARGE MENU DISCARDABLE
+BEGIN
+ POPUP "&Soubor"
+ BEGIN
+ MENUITEM "New\tStrg+N", IDM_FILE_NEW
+ MENUITEM SEPARATOR
+ MENUITEM "Uk&onÄit\tAlt+F4", IDM_FILE_EXIT
+ END
+
+ POPUP "&Windows"
+ BEGIN
+ MENUITEM "List", IDM_WINDOWS_LIST
+ END
+
+ POPUP "&NápovÄda"
+ BEGIN
+ MENUITEM "&O konzoli ÅÃzenà systému ReactOS...",
IDM_HELP_ABOUT
END
END
Modified: trunk/reactos/base/applications/mmc/lang/de-DE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang…
==============================================================================
--- trunk/reactos/base/applications/mmc/lang/de-DE.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mmc/lang/de-DE.rc [iso-8859-1] Sun Aug 25 21:43:46
2013
@@ -1,18 +1,40 @@
LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
-IDM_CONSOLEROOT MENU DISCARDABLE
+IDM_CONSOLE_SMALL MENU DISCARDABLE
BEGIN
POPUP "&Datei"
BEGIN
+ MENUITEM "Neu\tStrg+N", IDM_FILE_NEW
MENUITEM SEPARATOR
- MENUITEM "B&eenden\tAlt+F4", ID_FILE_EXIT
+ MENUITEM "B&eenden\tAlt+F4", IDM_FILE_EXIT
END
POPUP "&Hilfe"
BEGIN
- MENUITEM "Ã&ber ReactOS Management Console...", ID_HELP_ABOUT
+ MENUITEM "Ã&ber ReactOS Management Console...", IDM_HELP_ABOUT
END
END
+
+IDM_CONSOLE_LARGE MENU DISCARDABLE
+BEGIN
+ POPUP "&Datei"
+ BEGIN
+ MENUITEM "Neu\tStrg+N", IDM_FILE_NEW
+ MENUITEM SEPARATOR
+ MENUITEM "B&eenden\tAlt+F4", IDM_FILE_EXIT
+ END
+
+ POPUP "&Fenster"
+ BEGIN
+ MENUITEM "Liste", IDM_WINDOWS_LIST
+ END
+
+ POPUP "&Hilfe"
+ BEGIN
+ MENUITEM "Ã&ber ReactOS Management Console...", IDM_HELP_ABOUT
+ END
+END
+
STRINGTABLE DISCARDABLE
BEGIN
Modified: trunk/reactos/base/applications/mmc/lang/el-GR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang…
==============================================================================
--- trunk/reactos/base/applications/mmc/lang/el-GR.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mmc/lang/el-GR.rc [iso-8859-1] Sun Aug 25 21:43:46
2013
@@ -1,16 +1,37 @@
LANGUAGE LANG_GREEK, SUBLANG_DEFAULT
-IDM_CONSOLEROOT MENU DISCARDABLE
+IDM_CONSOLE_SMALL MENU DISCARDABLE
BEGIN
POPUP "&ÎÏÏείο"
BEGIN
+ MENUITEM "New\tStrg+N", IDM_FILE_NEW
MENUITEM SEPARATOR
- MENUITEM "Î&ξοδοÏ\tAlt+F4", ID_FILE_EXIT
+ MENUITEM "Î&ξοδοÏ\tAlt+F4", IDM_FILE_EXIT
END
POPUP "&Îοήθεια"
BEGIN
- MENUITEM "&ΣÏεÏικά με Ïην ÎονÏÏλα
ÎιαÏείÏιÏÎ·Ï ÏοÏ
ReactOS...", ID_HELP_ABOUT
+ MENUITEM "&ΣÏεÏικά με Ïην ÎονÏÏλα
ÎιαÏείÏιÏÎ·Ï ÏοÏ
ReactOS...", IDM_HELP_ABOUT
+ END
+END
+
+IDM_CONSOLE_LARGE MENU DISCARDABLE
+BEGIN
+ POPUP "&ÎÏÏείο"
+ BEGIN
+ MENUITEM "New\tStrg+N", IDM_FILE_NEW
+ MENUITEM SEPARATOR
+ MENUITEM "Î&ξοδοÏ\tAlt+F4", IDM_FILE_EXIT
+ END
+
+ POPUP "&Windows"
+ BEGIN
+ MENUITEM "List", IDM_WINDOWS_LIST
+ END
+
+ POPUP "&Îοήθεια"
+ BEGIN
+ MENUITEM "&ΣÏεÏικά με Ïην ÎονÏÏλα
ÎιαÏείÏιÏÎ·Ï ÏοÏ
ReactOS...", IDM_HELP_ABOUT
END
END
Modified: trunk/reactos/base/applications/mmc/lang/en-US.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang…
==============================================================================
--- trunk/reactos/base/applications/mmc/lang/en-US.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mmc/lang/en-US.rc [iso-8859-1] Sun Aug 25 21:43:46
2013
@@ -1,16 +1,37 @@
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-IDM_CONSOLEROOT MENU DISCARDABLE
+IDM_CONSOLE_SMALL MENU DISCARDABLE
BEGIN
POPUP "&File"
BEGIN
+ MENUITEM "New\tStrg+N", IDM_FILE_NEW
MENUITEM SEPARATOR
- MENUITEM "E&xit\tAlt+F4", ID_FILE_EXIT
+ MENUITEM "E&xit\tAlt+F4", IDM_FILE_EXIT
END
POPUP "&Help"
BEGIN
- MENUITEM "&About ReactOS Management Console...", ID_HELP_ABOUT
+ MENUITEM "&About ReactOS Management Console...", IDM_HELP_ABOUT
+ END
+END
+
+IDM_CONSOLE_LARGE MENU DISCARDABLE
+BEGIN
+ POPUP "&File"
+ BEGIN
+ MENUITEM "New\tStrg+N", IDM_FILE_NEW
+ MENUITEM SEPARATOR
+ MENUITEM "E&xit\tAlt+F4", IDM_FILE_EXIT
+ END
+
+ POPUP "&Windows"
+ BEGIN
+ MENUITEM "List", IDM_WINDOWS_LIST
+ END
+
+ POPUP "&Help"
+ BEGIN
+ MENUITEM "&About ReactOS Management Console...", IDM_HELP_ABOUT
END
END
Modified: trunk/reactos/base/applications/mmc/lang/es-ES.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang…
==============================================================================
--- trunk/reactos/base/applications/mmc/lang/es-ES.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mmc/lang/es-ES.rc [iso-8859-1] Sun Aug 25 21:43:46
2013
@@ -5,17 +5,38 @@
LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
-IDM_CONSOLEROOT MENU DISCARDABLE
+IDM_CONSOLE_SMALL MENU DISCARDABLE
BEGIN
POPUP "&Archivo"
BEGIN
+ MENUITEM "New\tStrg+N", IDM_FILE_NEW
MENUITEM SEPARATOR
- MENUITEM "Sa&lir\tAlt+F4", ID_FILE_EXIT
+ MENUITEM "Sa&lir\tAlt+F4", IDM_FILE_EXIT
END
POPUP "&Ayuda"
BEGIN
- MENUITEM "&Acerca de la Consola de Administración de ReactOS...",
ID_HELP_ABOUT
+ MENUITEM "&Acerca de la Consola de Administración de ReactOS...",
IDM_HELP_ABOUT
+ END
+END
+
+IDM_CONSOLE_LARGE MENU DISCARDABLE
+BEGIN
+ POPUP "&Archivo"
+ BEGIN
+ MENUITEM "New\tStrg+N", IDM_FILE_NEW
+ MENUITEM SEPARATOR
+ MENUITEM "Sa&lir\tAlt+F4", IDM_FILE_EXIT
+ END
+
+ POPUP "&Windows"
+ BEGIN
+ MENUITEM "List", IDM_WINDOWS_LIST
+ END
+
+ POPUP "&Ayuda"
+ BEGIN
+ MENUITEM "&Acerca de la Consola de Administración de ReactOS...",
IDM_HELP_ABOUT
END
END
Modified: trunk/reactos/base/applications/mmc/lang/fr-FR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang…
==============================================================================
--- trunk/reactos/base/applications/mmc/lang/fr-FR.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mmc/lang/fr-FR.rc [iso-8859-1] Sun Aug 25 21:43:46
2013
@@ -1,16 +1,37 @@
LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
-IDM_CONSOLEROOT MENU DISCARDABLE
+IDM_CONSOLE_SMALL MENU DISCARDABLE
BEGIN
POPUP "&Fichier"
BEGIN
+ MENUITEM "New\tStrg+N", IDM_FILE_NEW
MENUITEM SEPARATOR
- MENUITEM "Quitter\tAlt+F4", ID_FILE_EXIT
+ MENUITEM "Quitter\tAlt+F4", IDM_FILE_EXIT
END
POPUP "Aide"
BEGIN
- MENUITEM "Ã propos de l&a Console de Gestion ReactOS...",
ID_HELP_ABOUT
+ MENUITEM "Ã propos de l&a Console de Gestion ReactOS...",
IDM_HELP_ABOUT
+ END
+END
+
+IDM_CONSOLE_LARGE MENU DISCARDABLE
+BEGIN
+ POPUP "&Fichier"
+ BEGIN
+ MENUITEM "New\tStrg+N", IDM_FILE_NEW
+ MENUITEM SEPARATOR
+ MENUITEM "Quitter\tAlt+F4", IDM_FILE_EXIT
+ END
+
+ POPUP "&Windows"
+ BEGIN
+ MENUITEM "List", IDM_WINDOWS_LIST
+ END
+
+ POPUP "Aide"
+ BEGIN
+ MENUITEM "Ã propos de l&a Console de Gestion ReactOS...",
IDM_HELP_ABOUT
END
END
Modified: trunk/reactos/base/applications/mmc/lang/he-IL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang…
==============================================================================
--- trunk/reactos/base/applications/mmc/lang/he-IL.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mmc/lang/he-IL.rc [iso-8859-1] Sun Aug 25 21:43:46
2013
@@ -1,16 +1,37 @@
LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT
-IDM_CONSOLEROOT MENU DISCARDABLE
+IDM_CONSOLE_SMALL MENU DISCARDABLE
BEGIN
POPUP "&ק×××¥"
BEGIN
+ MENUITEM "New\tStrg+N", IDM_FILE_NEW
MENUITEM SEPARATOR
- MENUITEM "&×צ×××\tAlt+F4", ID_FILE_EXIT
+ MENUITEM "&×צ×××\tAlt+F4", IDM_FILE_EXIT
END
POPUP "&×¢×ר×"
BEGIN
- MENUITEM "&××××ת ReactOS Management Console...",
ID_HELP_ABOUT
+ MENUITEM "&××××ת ReactOS Management Console...",
IDM_HELP_ABOUT
+ END
+END
+
+IDM_CONSOLE_LARGE MENU DISCARDABLE
+BEGIN
+ POPUP "&ק×××¥"
+ BEGIN
+ MENUITEM "New\tStrg+N", IDM_FILE_NEW
+ MENUITEM SEPARATOR
+ MENUITEM "&×צ×××\tAlt+F4", IDM_FILE_EXIT
+ END
+
+ POPUP "&Windows"
+ BEGIN
+ MENUITEM "List", IDM_WINDOWS_LIST
+ END
+
+ POPUP "&×¢×ר×"
+ BEGIN
+ MENUITEM "&××××ת ReactOS Management Console...",
IDM_HELP_ABOUT
END
END
Modified: trunk/reactos/base/applications/mmc/lang/it-IT.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang…
==============================================================================
--- trunk/reactos/base/applications/mmc/lang/it-IT.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mmc/lang/it-IT.rc [iso-8859-1] Sun Aug 25 21:43:46
2013
@@ -1,16 +1,37 @@
LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
-IDM_CONSOLEROOT MENU DISCARDABLE
+IDM_CONSOLE_SMALL MENU DISCARDABLE
BEGIN
POPUP "&File"
BEGIN
+ MENUITEM "New\tStrg+N", IDM_FILE_NEW
MENUITEM SEPARATOR
- MENUITEM "E&sci\tAlt+F4", ID_FILE_EXIT
+ MENUITEM "E&sci\tAlt+F4", IDM_FILE_EXIT
END
POPUP "&Aiuto"
BEGIN
- MENUITEM "&Informazioni su ReactOS Management Console...",
ID_HELP_ABOUT
+ MENUITEM "&Informazioni su ReactOS Management Console...",
IDM_HELP_ABOUT
+ END
+END
+
+IDM_CONSOLE_LARGE MENU DISCARDABLE
+BEGIN
+ POPUP "&File"
+ BEGIN
+ MENUITEM "New\tStrg+N", IDM_FILE_NEW
+ MENUITEM SEPARATOR
+ MENUITEM "E&sci\tAlt+F4", IDM_FILE_EXIT
+ END
+
+ POPUP "&Windows"
+ BEGIN
+ MENUITEM "List", IDM_WINDOWS_LIST
+ END
+
+ POPUP "&Aiuto"
+ BEGIN
+ MENUITEM "&Informazioni su ReactOS Management Console...",
IDM_HELP_ABOUT
END
END
Modified: trunk/reactos/base/applications/mmc/lang/ko-KR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang…
==============================================================================
--- trunk/reactos/base/applications/mmc/lang/ko-KR.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mmc/lang/ko-KR.rc [iso-8859-1] Sun Aug 25 21:43:46
2013
@@ -4,17 +4,38 @@
LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
-IDM_CONSOLEROOT MENU DISCARDABLE
+IDM_CONSOLE_SMALL MENU DISCARDABLE
BEGIN
POPUP "íì¼(&F)"
BEGIN
+ MENUITEM "New\tStrg+N", IDM_FILE_NEW
MENUITEM SEPARATOR
- MENUITEM "ì¢
ë£(&E)\tAlt+F4", ID_FILE_EXIT
+ MENUITEM "ì¢
ë£(&E)\tAlt+F4", IDM_FILE_EXIT
END
POPUP "ëìë§(&H)"
BEGIN
- MENUITEM "ReactOS ê´ë¦¬ ì½ìì ëíì¬...(&A)",
ID_HELP_ABOUT
+ MENUITEM "ReactOS ê´ë¦¬ ì½ìì ëíì¬...(&A)",
IDM_HELP_ABOUT
+ END
+END
+
+IDM_CONSOLE_LARGE MENU DISCARDABLE
+BEGIN
+ POPUP "íì¼(&F)"
+ BEGIN
+ MENUITEM "New\tStrg+N", IDM_FILE_NEW
+ MENUITEM SEPARATOR
+ MENUITEM "ì¢
ë£(&E)\tAlt+F4", IDM_FILE_EXIT
+ END
+
+ POPUP "&Windows"
+ BEGIN
+ MENUITEM "List", IDM_WINDOWS_LIST
+ END
+
+ POPUP "ëìë§(&H)"
+ BEGIN
+ MENUITEM "ReactOS ê´ë¦¬ ì½ìì ëíì¬...(&A)",
IDM_HELP_ABOUT
END
END
Modified: trunk/reactos/base/applications/mmc/lang/lt-LT.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang…
==============================================================================
--- trunk/reactos/base/applications/mmc/lang/lt-LT.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mmc/lang/lt-LT.rc [iso-8859-1] Sun Aug 25 21:43:46
2013
@@ -2,17 +2,38 @@
LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT
-IDM_CONSOLEROOT MENU DISCARDABLE
+IDM_CONSOLE_SMALL MENU DISCARDABLE
BEGIN
POPUP "&Byla"
BEGIN
+ MENUITEM "New\tStrg+N", IDM_FILE_NEW
MENUITEM SEPARATOR
- MENUITEM "&Baigti\tAlt+F4", ID_FILE_EXIT
+ MENUITEM "&Baigti\tAlt+F4", IDM_FILE_EXIT
END
POPUP "&Pagalba"
BEGIN
- MENUITEM "&Apie ReactOS Valdymo PultÄ
...", ID_HELP_ABOUT
+ MENUITEM "&Apie ReactOS Valdymo PultÄ
...", IDM_HELP_ABOUT
+ END
+END
+
+IDM_CONSOLE_LARGE MENU DISCARDABLE
+BEGIN
+ POPUP "&Byla"
+ BEGIN
+ MENUITEM "New\tStrg+N", IDM_FILE_NEW
+ MENUITEM SEPARATOR
+ MENUITEM "&Baigti\tAlt+F4", IDM_FILE_EXIT
+ END
+
+ POPUP "&Windows"
+ BEGIN
+ MENUITEM "List", IDM_WINDOWS_LIST
+ END
+
+ POPUP "&Pagalba"
+ BEGIN
+ MENUITEM "&Apie ReactOS Valdymo PultÄ
...", IDM_HELP_ABOUT
END
END
Modified: trunk/reactos/base/applications/mmc/lang/no-NO.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang…
==============================================================================
--- trunk/reactos/base/applications/mmc/lang/no-NO.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mmc/lang/no-NO.rc [iso-8859-1] Sun Aug 25 21:43:46
2013
@@ -1,16 +1,37 @@
LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL
-IDM_CONSOLEROOT MENU DISCARDABLE
+IDM_CONSOLE_SMALL MENU DISCARDABLE
BEGIN
POPUP "&Fil"
BEGIN
+ MENUITEM "New\tStrg+N", IDM_FILE_NEW
MENUITEM SEPARATOR
- MENUITEM "&Avslutt\tAlt+F4", ID_FILE_EXIT
+ MENUITEM "&Avslutt\tAlt+F4", IDM_FILE_EXIT
END
POPUP "&Hjelp"
BEGIN
- MENUITEM "&Om ReactOS Management Console...", ID_HELP_ABOUT
+ MENUITEM "&Om ReactOS Management Console...", IDM_HELP_ABOUT
+ END
+END
+
+IDM_CONSOLE_LARGE MENU DISCARDABLE
+BEGIN
+ POPUP "&Fil"
+ BEGIN
+ MENUITEM "New\tStrg+N", IDM_FILE_NEW
+ MENUITEM SEPARATOR
+ MENUITEM "&Avslutt\tAlt+F4", IDM_FILE_EXIT
+ END
+
+ POPUP "&Windows"
+ BEGIN
+ MENUITEM "List", IDM_WINDOWS_LIST
+ END
+
+ POPUP "&Hjelp"
+ BEGIN
+ MENUITEM "&Om ReactOS Management Console...", IDM_HELP_ABOUT
END
END
Modified: trunk/reactos/base/applications/mmc/lang/pl-PL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang…
==============================================================================
--- trunk/reactos/base/applications/mmc/lang/pl-PL.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mmc/lang/pl-PL.rc [iso-8859-1] Sun Aug 25 21:43:46
2013
@@ -7,17 +7,38 @@
LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
-IDM_CONSOLEROOT MENU DISCARDABLE
+IDM_CONSOLE_SMALL MENU DISCARDABLE
BEGIN
POPUP "Pl&ik"
BEGIN
+ MENUITEM "New\tStrg+N", IDM_FILE_NEW
MENUITEM SEPARATOR
- MENUITEM "Za&koÅcz\tAlt+F4", ID_FILE_EXIT
+ MENUITEM "Za&koÅcz\tAlt+F4", IDM_FILE_EXIT
END
POPUP "&Pomoc"
BEGIN
- MENUITEM "Konsola ZarzÄ
dzania ReactOS - i&nformacje...", ID_HELP_ABOUT
+ MENUITEM "Konsola ZarzÄ
dzania ReactOS - i&nformacje...", IDM_HELP_ABOUT
+ END
+END
+
+IDM_CONSOLE_LARGE MENU DISCARDABLE
+BEGIN
+ POPUP "Pl&ik"
+ BEGIN
+ MENUITEM "New\tStrg+N", IDM_FILE_NEW
+ MENUITEM SEPARATOR
+ MENUITEM "Za&koÅcz\tAlt+F4", IDM_FILE_EXIT
+ END
+
+ POPUP "&Windows"
+ BEGIN
+ MENUITEM "List", IDM_WINDOWS_LIST
+ END
+
+ POPUP "&Pomoc"
+ BEGIN
+ MENUITEM "Konsola ZarzÄ
dzania ReactOS - i&nformacje...", IDM_HELP_ABOUT
END
END
Modified: trunk/reactos/base/applications/mmc/lang/pt-BR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang…
==============================================================================
--- trunk/reactos/base/applications/mmc/lang/pt-BR.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mmc/lang/pt-BR.rc [iso-8859-1] Sun Aug 25 21:43:46
2013
@@ -1,16 +1,37 @@
LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
-IDM_CONSOLEROOT MENU DISCARDABLE
+IDM_CONSOLE_SMALL MENU DISCARDABLE
BEGIN
POPUP "&Arquivo"
BEGIN
+ MENUITEM "New\tStrg+N", IDM_FILE_NEW
MENUITEM SEPARATOR
- MENUITEM "Sai&r\tAlt+F4", ID_FILE_EXIT
+ MENUITEM "Sai&r\tAlt+F4", IDM_FILE_EXIT
END
POPUP "Aj&uda"
BEGIN
- MENUITEM "&Sobre o Console de gerenciamento ReactOS...",
ID_HELP_ABOUT
+ MENUITEM "&Sobre o Console de gerenciamento ReactOS...",
IDM_HELP_ABOUT
+ END
+END
+
+IDM_CONSOLE_LARGE MENU DISCARDABLE
+BEGIN
+ POPUP "&Arquivo"
+ BEGIN
+ MENUITEM "New\tStrg+N", IDM_FILE_NEW
+ MENUITEM SEPARATOR
+ MENUITEM "Sai&r\tAlt+F4", IDM_FILE_EXIT
+ END
+
+ POPUP "&Windows"
+ BEGIN
+ MENUITEM "List", IDM_WINDOWS_LIST
+ END
+
+ POPUP "Aj&uda"
+ BEGIN
+ MENUITEM "&Sobre o Console de gerenciamento ReactOS...",
IDM_HELP_ABOUT
END
END
Modified: trunk/reactos/base/applications/mmc/lang/ro-RO.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang…
==============================================================================
--- trunk/reactos/base/applications/mmc/lang/ro-RO.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mmc/lang/ro-RO.rc [iso-8859-1] Sun Aug 25 21:43:46
2013
@@ -7,17 +7,38 @@
LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
-IDM_CONSOLEROOT MENU DISCARDABLE
+IDM_CONSOLE_SMALL MENU DISCARDABLE
BEGIN
POPUP "&FiÈier"
BEGIN
+ MENUITEM "New\tStrg+N", IDM_FILE_NEW
MENUITEM SEPARATOR
- MENUITEM "I&eÈire\tAlt+F4", ID_FILE_EXIT
+ MENUITEM "I&eÈire\tAlt+F4", IDM_FILE_EXIT
END
POPUP "&?"
BEGIN
- MENUITEM "&Despreâ¦", ID_HELP_ABOUT
+ MENUITEM "&Despreâ¦", IDM_HELP_ABOUT
+ END
+END
+
+IDM_CONSOLE_LARGE MENU DISCARDABLE
+BEGIN
+ POPUP "&FiÈier"
+ BEGIN
+ MENUITEM "New\tStrg+N", IDM_FILE_NEW
+ MENUITEM SEPARATOR
+ MENUITEM "I&eÈire\tAlt+F4", IDM_FILE_EXIT
+ END
+
+ POPUP "&Windows"
+ BEGIN
+ MENUITEM "List", IDM_WINDOWS_LIST
+ END
+
+ POPUP "&?"
+ BEGIN
+ MENUITEM "&Despreâ¦", IDM_HELP_ABOUT
END
END
Modified: trunk/reactos/base/applications/mmc/lang/ru-RU.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang…
==============================================================================
--- trunk/reactos/base/applications/mmc/lang/ru-RU.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mmc/lang/ru-RU.rc [iso-8859-1] Sun Aug 25 21:43:46
2013
@@ -2,17 +2,38 @@
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
-IDM_CONSOLEROOT MENU DISCARDABLE
+IDM_CONSOLE_SMALL MENU DISCARDABLE
BEGIN
POPUP "&Файл"
BEGIN
+ MENUITEM "New\tStrg+N", IDM_FILE_NEW
MENUITEM SEPARATOR
- MENUITEM "&ÐÑÑ
од\tAlt+F4", ID_FILE_EXIT
+ MENUITEM "&ÐÑÑ
од\tAlt+F4", IDM_FILE_EXIT
END
POPUP "&СпÑавка"
BEGIN
- MENUITEM "&РпÑогÑамме...", ID_HELP_ABOUT
+ MENUITEM "&РпÑогÑамме...", IDM_HELP_ABOUT
+ END
+END
+
+IDM_CONSOLE_LARGE MENU DISCARDABLE
+BEGIN
+ POPUP "&Файл"
+ BEGIN
+ MENUITEM "New\tStrg+N", IDM_FILE_NEW
+ MENUITEM SEPARATOR
+ MENUITEM "&ÐÑÑ
од\tAlt+F4", IDM_FILE_EXIT
+ END
+
+ POPUP "&Windows"
+ BEGIN
+ MENUITEM "List", IDM_WINDOWS_LIST
+ END
+
+ POPUP "&СпÑавка"
+ BEGIN
+ MENUITEM "&РпÑогÑамме...", IDM_HELP_ABOUT
END
END
Modified: trunk/reactos/base/applications/mmc/lang/sk-SK.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang…
==============================================================================
--- trunk/reactos/base/applications/mmc/lang/sk-SK.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mmc/lang/sk-SK.rc [iso-8859-1] Sun Aug 25 21:43:46
2013
@@ -8,17 +8,38 @@
LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
-IDM_CONSOLEROOT MENU DISCARDABLE
+IDM_CONSOLE_SMALL MENU DISCARDABLE
BEGIN
POPUP "&Súbor"
BEGIN
+ MENUITEM "New\tStrg+N", IDM_FILE_NEW
MENUITEM SEPARATOR
- MENUITEM "&SkonÄiÅ¥\tAlt+F4", ID_FILE_EXIT
+ MENUITEM "&SkonÄiÅ¥\tAlt+F4", IDM_FILE_EXIT
END
POPUP "&PomocnÃk"
BEGIN
- MENUITEM "Ä&o je Konzola na správu systému ReactOS",
ID_HELP_ABOUT
+ MENUITEM "Ä&o je Konzola na správu systému ReactOS",
IDM_HELP_ABOUT
+ END
+END
+
+IDM_CONSOLE_LARGE MENU DISCARDABLE
+BEGIN
+ POPUP "&Súbor"
+ BEGIN
+ MENUITEM "New\tStrg+N", IDM_FILE_NEW
+ MENUITEM SEPARATOR
+ MENUITEM "&SkonÄiÅ¥\tAlt+F4", IDM_FILE_EXIT
+ END
+
+ POPUP "&Windows"
+ BEGIN
+ MENUITEM "List", IDM_WINDOWS_LIST
+ END
+
+ POPUP "&PomocnÃk"
+ BEGIN
+ MENUITEM "Ä&o je Konzola na správu systému ReactOS",
IDM_HELP_ABOUT
END
END
Modified: trunk/reactos/base/applications/mmc/lang/sv-SE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang…
==============================================================================
--- trunk/reactos/base/applications/mmc/lang/sv-SE.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mmc/lang/sv-SE.rc [iso-8859-1] Sun Aug 25 21:43:46
2013
@@ -7,17 +7,38 @@
LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
-IDM_CONSOLEROOT MENU DISCARDABLE
+IDM_CONSOLE_SMALL MENU DISCARDABLE
BEGIN
POPUP "&Arkiv"
BEGIN
+ MENUITEM "New\tStrg+N", IDM_FILE_NEW
MENUITEM SEPARATOR
- MENUITEM "&Avsluta\tAlt+F4", ID_FILE_EXIT
+ MENUITEM "&Avsluta\tAlt+F4", IDM_FILE_EXIT
END
POPUP "&Hjälp"
BEGIN
- MENUITEM "&Om ReactOS Management Console...", ID_HELP_ABOUT
+ MENUITEM "&Om ReactOS Management Console...", IDM_HELP_ABOUT
+ END
+END
+
+IDM_CONSOLE_LARGE MENU DISCARDABLE
+BEGIN
+ POPUP "&Arkiv"
+ BEGIN
+ MENUITEM "New\tStrg+N", IDM_FILE_NEW
+ MENUITEM SEPARATOR
+ MENUITEM "&Avsluta\tAlt+F4", IDM_FILE_EXIT
+ END
+
+ POPUP "&Windows"
+ BEGIN
+ MENUITEM "List", IDM_WINDOWS_LIST
+ END
+
+ POPUP "&Hjälp"
+ BEGIN
+ MENUITEM "&Om ReactOS Management Console...", IDM_HELP_ABOUT
END
END
Modified: trunk/reactos/base/applications/mmc/lang/tr-TR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang…
==============================================================================
--- trunk/reactos/base/applications/mmc/lang/tr-TR.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mmc/lang/tr-TR.rc [iso-8859-1] Sun Aug 25 21:43:46
2013
@@ -4,17 +4,38 @@
LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
-IDM_CONSOLEROOT MENU DISCARDABLE
+IDM_CONSOLE_SMALL MENU DISCARDABLE
BEGIN
POPUP "&Kütük"
BEGIN
+ MENUITEM "New\tStrg+N", IDM_FILE_NEW
MENUITEM SEPARATOR
- MENUITEM "&ÃıkıÅ\tAlt+F4", ID_FILE_EXIT
+ MENUITEM "&ÃıkıÅ\tAlt+F4", IDM_FILE_EXIT
END
POPUP "&Yardım"
BEGIN
- MENUITEM "&Hakkında...", ID_HELP_ABOUT
+ MENUITEM "&Hakkında...", IDM_HELP_ABOUT
+ END
+END
+
+IDM_CONSOLE_LARGE MENU DISCARDABLE
+BEGIN
+ POPUP "&Kütük"
+ BEGIN
+ MENUITEM "New\tStrg+N", IDM_FILE_NEW
+ MENUITEM SEPARATOR
+ MENUITEM "&ÃıkıÅ\tAlt+F4", IDM_FILE_EXIT
+ END
+
+ POPUP "&Windows"
+ BEGIN
+ MENUITEM "List", IDM_WINDOWS_LIST
+ END
+
+ POPUP "&Yardım"
+ BEGIN
+ MENUITEM "&Hakkında...", IDM_HELP_ABOUT
END
END
Modified: trunk/reactos/base/applications/mmc/lang/uk-UA.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang…
==============================================================================
--- trunk/reactos/base/applications/mmc/lang/uk-UA.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mmc/lang/uk-UA.rc [iso-8859-1] Sun Aug 25 21:43:46
2013
@@ -8,17 +8,38 @@
LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
-IDM_CONSOLEROOT MENU DISCARDABLE
+IDM_CONSOLE_SMALL MENU DISCARDABLE
BEGIN
POPUP "&Файл"
BEGIN
+ MENUITEM "New\tStrg+N", IDM_FILE_NEW
MENUITEM SEPARATOR
- MENUITEM "Ð&иÑ
Ñд\tAlt+F4", ID_FILE_EXIT
+ MENUITEM "Ð&иÑ
Ñд\tAlt+F4", IDM_FILE_EXIT
END
POPUP "&ÐовÑдка"
BEGIN
- MENUITEM "&ÐÑо конÑÐ¾Ð»Ñ ÐºÐµÑÑÐ²Ð°Ð½Ð½Ñ ReactOS...",
ID_HELP_ABOUT
+ MENUITEM "&ÐÑо конÑÐ¾Ð»Ñ ÐºÐµÑÑÐ²Ð°Ð½Ð½Ñ ReactOS...",
IDM_HELP_ABOUT
+ END
+END
+
+IDM_CONSOLE_LARGE MENU DISCARDABLE
+BEGIN
+ POPUP "&Файл"
+ BEGIN
+ MENUITEM "New\tStrg+N", IDM_FILE_NEW
+ MENUITEM SEPARATOR
+ MENUITEM "Ð&иÑ
Ñд\tAlt+F4", IDM_FILE_EXIT
+ END
+
+ POPUP "&Windows"
+ BEGIN
+ MENUITEM "List", IDM_WINDOWS_LIST
+ END
+
+ POPUP "&ÐовÑдка"
+ BEGIN
+ MENUITEM "&ÐÑо конÑÐ¾Ð»Ñ ÐºÐµÑÑÐ²Ð°Ð½Ð½Ñ ReactOS...",
IDM_HELP_ABOUT
END
END
Modified: trunk/reactos/base/applications/mmc/lang/zh-CN.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang…
==============================================================================
--- trunk/reactos/base/applications/mmc/lang/zh-CN.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mmc/lang/zh-CN.rc [iso-8859-1] Sun Aug 25 21:43:46
2013
@@ -8,17 +8,38 @@
LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
-IDM_CONSOLEROOT MENU DISCARDABLE
+IDM_CONSOLE_SMALL MENU DISCARDABLE
BEGIN
POPUP "æ¡£æ¡(&F)"
BEGIN
+ MENUITEM "New\tStrg+N", IDM_FILE_NEW
MENUITEM SEPARATOR
- MENUITEM "ç»æ(&X)\tAlt+F4", ID_FILE_EXIT
+ MENUITEM "ç»æ(&X)\tAlt+F4", IDM_FILE_EXIT
END
POPUP "帮å©(&H)"
BEGIN
- MENUITEM "å
³äº ReactOS æ§å¶å°(&A)...", ID_HELP_ABOUT
+ MENUITEM "å
³äº ReactOS æ§å¶å°(&A)...", IDM_HELP_ABOUT
+ END
+END
+
+IDM_CONSOLE_LARGE MENU DISCARDABLE
+BEGIN
+ POPUP "æ¡£æ¡(&F)"
+ BEGIN
+ MENUITEM "New\tStrg+N", IDM_FILE_NEW
+ MENUITEM SEPARATOR
+ MENUITEM "ç»æ(&X)\tAlt+F4", IDM_FILE_EXIT
+ END
+
+ POPUP "&Windows"
+ BEGIN
+ MENUITEM "List", IDM_WINDOWS_LIST
+ END
+
+ POPUP "帮å©(&H)"
+ BEGIN
+ MENUITEM "å
³äº ReactOS æ§å¶å°(&A)...", IDM_HELP_ABOUT
END
END
Modified: trunk/reactos/base/applications/mmc/lang/zh-TW.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang…
==============================================================================
--- trunk/reactos/base/applications/mmc/lang/zh-TW.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mmc/lang/zh-TW.rc [iso-8859-1] Sun Aug 25 21:43:46
2013
@@ -8,17 +8,38 @@
LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
-IDM_CONSOLEROOT MENU DISCARDABLE
+IDM_CONSOLE_SMALL MENU DISCARDABLE
BEGIN
POPUP "æªæ¡(&F)"
BEGIN
+ MENUITEM "New\tStrg+N", IDM_FILE_NEW
MENUITEM SEPARATOR
- MENUITEM "çµæ(&X)\tAlt+F4", ID_FILE_EXIT
+ MENUITEM "çµæ(&X)\tAlt+F4", IDM_FILE_EXIT
END
POPUP "說æ(&H)"
BEGIN
- MENUITEM "éæ¼ ReactOS æ§å¶å°(&A)...", ID_HELP_ABOUT
+ MENUITEM "éæ¼ ReactOS æ§å¶å°(&A)...", IDM_HELP_ABOUT
+ END
+END
+
+IDM_CONSOLE_LARGE MENU DISCARDABLE
+BEGIN
+ POPUP "æªæ¡(&F)"
+ BEGIN
+ MENUITEM "New\tStrg+N", IDM_FILE_NEW
+ MENUITEM SEPARATOR
+ MENUITEM "çµæ(&X)\tAlt+F4", IDM_FILE_EXIT
+ END
+
+ POPUP "&Windows"
+ BEGIN
+ MENUITEM "List", IDM_WINDOWS_LIST
+ END
+
+ POPUP "說æ(&H)"
+ BEGIN
+ MENUITEM "éæ¼ ReactOS æ§å¶å°(&A)...", IDM_HELP_ABOUT
END
END
Modified: trunk/reactos/base/applications/mmc/mmc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/mmc.…
==============================================================================
--- trunk/reactos/base/applications/mmc/mmc.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mmc/mmc.c [iso-8859-1] Sun Aug 25 21:43:46 2013
@@ -21,16 +21,19 @@
HINSTANCE hAppInstance;
HANDLE hAppHeap;
+HWND hwndMainConsole;
+HWND hwndMDIClient;
-int
-_tmain(IN int argc,
- IN const TCHAR *argv[])
+
+int WINAPI
+_tWinMain(HINSTANCE hInstance,
+ HINSTANCE hPrevInstance,
+ LPTSTR lpCmdLine,
+ int nCmdShow)
{
- HWND hMainConsole;
MSG Msg;
- BOOL bRet;
- hAppInstance = GetModuleHandle(NULL);
+ hAppInstance = hInstance; // GetModuleHandle(NULL);
hAppHeap = GetProcessHeap();
InitCommonControls();
@@ -41,25 +44,20 @@
return 1;
}
- hMainConsole = CreateConsoleWindow(argc > 1 ? argv[1] : NULL);
- if (hMainConsole != NULL)
+ hwndMainConsole = CreateConsoleWindow(NULL /*argc > 1 ? argv[1] : NULL*/,
nCmdShow);
+ if (hwndMainConsole != NULL)
{
- for (;;)
+ while (GetMessage(&Msg, NULL, 0, 0))
{
- bRet = GetMessage(&Msg,
- NULL,
- 0,
- 0);
- if (bRet != 0 && bRet != -1)
+ if (!TranslateMDISysAccel(hwndMDIClient, &Msg))
{
TranslateMessage(&Msg);
DispatchMessage(&Msg);
}
- else if (bRet == 0)
- break;
}
}
UnregisterMMCWndClasses();
+
return 0;
}
Modified: trunk/reactos/base/applications/mmc/precomp.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/prec…
==============================================================================
--- trunk/reactos/base/applications/mmc/precomp.h [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mmc/precomp.h [iso-8859-1] Sun Aug 25 21:43:46 2013
@@ -6,6 +6,9 @@
#include <tchar.h>
#include "resource.h"
+
+#define WM_USER_CLOSE_CHILD (WM_USER + 1)
+
/* console.c */
@@ -16,7 +19,8 @@
UnregisterMMCWndClasses(VOID);
HWND
-CreateConsoleWindow(IN LPCTSTR lpFileName OPTIONAL);
+CreateConsoleWindow(IN LPCTSTR lpFileName OPTIONAL,
+ int nCmdShow);
/* misc.c */
@@ -34,3 +38,5 @@
extern HINSTANCE hAppInstance;
extern HANDLE hAppHeap;
+extern HWND hwndMainConsole;
+extern HWND hwndMDIClient;
Modified: trunk/reactos/base/applications/mmc/resource.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/reso…
==============================================================================
--- trunk/reactos/base/applications/mmc/resource.h [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mmc/resource.h [iso-8859-1] Sun Aug 25 21:43:46 2013
@@ -1,11 +1,17 @@
#pragma once
-#define IDS_APPTITLE 101
+#define IDS_APPTITLE 101
#define IDS_CONSOLETITLE 102
-#define IDI_MAINAPP 101
+#define IDI_MAINAPP 101
-#define IDM_CONSOLEROOT 101
+#define IDM_CONSOLE_SMALL 1000
+#define IDM_CONSOLE_LARGE 1001
-#define ID_FILE_EXIT 1001
-#define ID_HELP_ABOUT 9001
+#define IDM_FILE_NEW 1002
+#define IDM_FILE_OPEN 1003
+#define IDM_FILE_EXIT 1010
+#define IDM_WINDOWS_LIST 2001
+#define IDM_HELP_ABOUT 9001
+
+#define IDM_MDI_FIRSTCHILD 9500
4141
days inactive
4141
days old
0 comments
1 participants
participants (1)
-
ekohl＠svn.reactos.org