- Add "Clear display" command.

- Change menu item prefix to IDM.

svn path=/trunk/; revision=26924
This commit is contained in:
Eric Kohl 2007-05-27 15:27:40 +00:00
parent a9a7a6ef22
commit 77286996f0
12 changed files with 119 additions and 96 deletions

View file

@ -16,13 +16,15 @@ IDC_FDEBUG MENU DISCARDABLE
BEGIN
POPUP "&Datei"
BEGIN
MENUITEM "&Verbinden", ID_FILE_CONNECT
MENUITEM "&Trennen", ID_FILE_DISCONNECT, GRAYED
MENUITEM "&Verbinden", IDM_FILE_CONNECT
MENUITEM "&Trennen", IDM_FILE_DISCONNECT, GRAYED
MENUITEM SEPARATOR
MENUITEM "&Aufnahme starten", ID_FILE_STARTCAPTURE
MENUITEM "A&ufnahme stoppen", ID_FILE_STOPCAPTURE, GRAYED
MENUITEM "A&nzeige löschen", IDM_FILE_CLEARDISPLAY
MENUITEM SEPARATOR
MENUITEM "&Local Echo", ID_FILE_LOCALECHO
MENUITEM "&Aufnahme starten", IDM_FILE_STARTCAPTURE
MENUITEM "A&ufnahme stoppen", IDM_FILE_STOPCAPTURE, GRAYED
MENUITEM SEPARATOR
MENUITEM "&Local Echo", IDM_FILE_LOCALECHO
MENUITEM SEPARATOR
MENUITEM "B&eenden", IDM_EXIT
END
@ -116,7 +118,7 @@ END
IDD_ABOUTBOX DIALOG DISCARDABLE 22, 17, 259, 210
STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
CAPTION "About FreeLoader Debugger"
CAPTION "Über FreeLoader Debugger"
FONT 8, "Tahoma"
BEGIN
CONTROL "FreeLoader Debugger v1.0\nCopyright (C) 2003\nby Brian Palmer (brianp@reactos.org)",
@ -135,8 +137,7 @@ FONT 8, "Tahoma"
BEGIN
LTEXT "COM Port angeben (z.B. COM1):",IDC_STATIC,7,7,108,8
EDITTEXT IDC_COMPORT,7,17,182,14,ES_AUTOHSCROLL
LTEXT "Bandbreite angeben (z.B. 115200):",IDC_STATIC,7,38,114,
8
LTEXT "Bandbreite angeben (z.B. 115200):",IDC_STATIC,7,38,114, 8
EDITTEXT IDC_BAUTRATE,7,48,182,14,ES_AUTOHSCROLL
DEFPUSHBUTTON "OK",IDOK,45,79,50,14
PUSHBUTTON "Abbrechen",IDCANCEL,100,79,50,14
@ -144,10 +145,10 @@ END
IDD_CAPTURE DIALOG DISCARDABLE 0, 0, 251, 95
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Capture File"
CAPTION "Protokolldatei"
FONT 8, "Tahoma"
BEGIN
LTEXT "Name der aufgenommenden Datei:",IDC_STATIC,7,17,120,8
LTEXT "Name der Protokolldatei:",IDC_STATIC,7,17,120,8
EDITTEXT IDC_CAPTUREFILENAME,7,26,181,14,ES_AUTOHSCROLL
PUSHBUTTON "&Durchsuchen",IDC_BROWSE,194,26,50,14
DEFPUSHBUTTON "OK",IDOK,139,74,50,14

View file

@ -16,13 +16,15 @@ IDC_FDEBUG MENU DISCARDABLE
BEGIN
POPUP "&File"
BEGIN
MENUITEM "&Connect", ID_FILE_CONNECT
MENUITEM "&Disconnect", ID_FILE_DISCONNECT, GRAYED
MENUITEM "&Connect", IDM_FILE_CONNECT
MENUITEM "&Disconnect", IDM_FILE_DISCONNECT, GRAYED
MENUITEM SEPARATOR
MENUITEM "&Start Capture", ID_FILE_STARTCAPTURE
MENUITEM "S&top Capture", ID_FILE_STOPCAPTURE, GRAYED
MENUITEM "&Clear display", IDM_FILE_CLEARDISPLAY
MENUITEM SEPARATOR
MENUITEM "&Local Echo", ID_FILE_LOCALECHO
MENUITEM "&Start Capture", IDM_FILE_STARTCAPTURE
MENUITEM "S&top Capture", IDM_FILE_STOPCAPTURE, GRAYED
MENUITEM SEPARATOR
MENUITEM "&Local Echo", IDM_FILE_LOCALECHO
MENUITEM SEPARATOR
MENUITEM "E&xit", IDM_EXIT
END

View file

@ -25,13 +25,15 @@ IDC_FDEBUG MENU DISCARDABLE
BEGIN
POPUP "&Fichier"
BEGIN
MENUITEM "&Connecter", ID_FILE_CONNECT
MENUITEM "&Déconnecter", ID_FILE_DISCONNECT, GRAYED
MENUITEM "&Connecter", IDM_FILE_CONNECT
MENUITEM "&Déconnecter", IDM_FILE_DISCONNECT, GRAYED
MENUITEM SEPARATOR
MENUITEM "Démarrer la &Capture", ID_FILE_STARTCAPTURE
MENUITEM "A&rréter la Capture", ID_FILE_STOPCAPTURE, GRAYED
MENUITEM "&Clear display", IDM_FILE_CLEARDISPLAY
MENUITEM SEPARATOR
MENUITEM "Echo &Local", ID_FILE_LOCALECHO
MENUITEM "Démarrer la &Capture", IDM_FILE_STARTCAPTURE
MENUITEM "A&rréter la Capture", IDM_FILE_STOPCAPTURE, GRAYED
MENUITEM SEPARATOR
MENUITEM "Echo &Local", IDM_FILE_LOCALECHO
MENUITEM SEPARATOR
MENUITEM "&Quitter", IDM_EXIT
END

View file

@ -16,13 +16,15 @@ IDC_FDEBUG MENU DISCARDABLE
BEGIN
POPUP "&File"
BEGIN
MENUITEM "&Csatlakoztatás", ID_FILE_CONNECT
MENUITEM "Kapcsolat&bontás", ID_FILE_DISCONNECT, GRAYED
MENUITEM "&Csatlakoztatás", IDM_FILE_CONNECT
MENUITEM "Kapcsolat&bontás", IDM_FILE_DISCONNECT, GRAYED
MENUITEM SEPARATOR
MENUITEM "&Start Capture", ID_FILE_STARTCAPTURE
MENUITEM "S&top Capture", ID_FILE_STOPCAPTURE, GRAYED
MENUITEM "&Clear display", IDM_FILE_CLEARDISPLAY
MENUITEM SEPARATOR
MENUITEM "Helyi &visszhang", ID_FILE_LOCALECHO
MENUITEM "&Start Capture", IDM_FILE_STARTCAPTURE
MENUITEM "S&top Capture", IDM_FILE_STOPCAPTURE, GRAYED
MENUITEM SEPARATOR
MENUITEM "Helyi &visszhang", IDM_FILE_LOCALECHO
MENUITEM SEPARATOR
MENUITEM "&Kilépés", IDM_EXIT
END

View file

@ -17,13 +17,15 @@ IDC_FDEBUG MENU DISCARDABLE
BEGIN
POPUP "&File"
BEGIN
MENUITEM "&Sambung", ID_FILE_CONNECT
MENUITEM "&Putus", ID_FILE_DISCONNECT, GRAYED
MENUITEM "&Sambung", IDM_FILE_CONNECT
MENUITEM "&Putus", IDM_FILE_DISCONNECT, GRAYED
MENUITEM SEPARATOR
MENUITEM "&Mulai Penangkapan", ID_FILE_STARTCAPTURE
MENUITEM "&Hentikan Penangkapan", ID_FILE_STOPCAPTURE, GRAYED
MENUITEM "&Clear display", IDM_FILE_CLEARDISPLAY
MENUITEM SEPARATOR
MENUITEM "Echo &Lokal", ID_FILE_LOCALECHO
MENUITEM "&Mulai Penangkapan", IDM_FILE_STARTCAPTURE
MENUITEM "&Hentikan Penangkapan", IDM_FILE_STOPCAPTURE, GRAYED
MENUITEM SEPARATOR
MENUITEM "Echo &Lokal", IDM_FILE_LOCALECHO
MENUITEM SEPARATOR
MENUITEM "&Keluar", IDM_EXIT
END

View file

@ -16,13 +16,15 @@ IDC_FDEBUG MENU DISCARDABLE
BEGIN
POPUP "&File"
BEGIN
MENUITEM "&Connetti", ID_FILE_CONNECT
MENUITEM "&Disconnetti", ID_FILE_DISCONNECT, GRAYED
MENUITEM "&Connetti", IDM_FILE_CONNECT
MENUITEM "&Disconnetti", IDM_FILE_DISCONNECT, GRAYED
MENUITEM SEPARATOR
MENUITEM "&Inizia Cattura", ID_FILE_STARTCAPTURE
MENUITEM "&Fine Cattura", ID_FILE_STOPCAPTURE, GRAYED
MENUITEM "&Clear display", IDM_FILE_CLEARDISPLAY
MENUITEM SEPARATOR
MENUITEM "Eco &Locale", ID_FILE_LOCALECHO
MENUITEM "&Inizia Cattura", IDM_FILE_STARTCAPTURE
MENUITEM "&Fine Cattura", IDM_FILE_STOPCAPTURE, GRAYED
MENUITEM SEPARATOR
MENUITEM "Eco &Locale", IDM_FILE_LOCALECHO
MENUITEM SEPARATOR
MENUITEM "E&sci", IDM_EXIT
END

View file

@ -16,13 +16,15 @@ IDC_FDEBUG MENU DISCARDABLE
BEGIN
POPUP "ファイル(&F)"
BEGIN
MENUITEM "接続(&C)", ID_FILE_CONNECT
MENUITEM "切断(&D)", ID_FILE_DISCONNECT, GRAYED
MENUITEM "接続(&C)", IDM_FILE_CONNECT
MENUITEM "切断(&D)", IDM_FILE_DISCONNECT, GRAYED
MENUITEM SEPARATOR
MENUITEM "取り込み開始(&S)", ID_FILE_STARTCAPTURE
MENUITEM "取り込み停止(&T)", ID_FILE_STOPCAPTURE, GRAYED
MENUITEM "&Clear display", IDM_FILE_CLEARDISPLAY
MENUITEM SEPARATOR
MENUITEM "ローカル エコー(&L)", ID_FILE_LOCALECHO
MENUITEM "取り込み開始(&S)", IDM_FILE_STARTCAPTURE
MENUITEM "取り込み停止(&T)", IDM_FILE_STOPCAPTURE, GRAYED
MENUITEM SEPARATOR
MENUITEM "ローカル エコー(&L)", IDM_FILE_LOCALECHO
MENUITEM SEPARATOR
MENUITEM "終了(&X)", IDM_EXIT
END

View file

@ -16,13 +16,15 @@ IDC_FDEBUG MENU DISCARDABLE
BEGIN
POPUP "&Fil"
BEGIN
MENUITEM "Koble &til", ID_FILE_CONNECT
MENUITEM "Koble &fra", ID_FILE_DISCONNECT, GRAYED
MENUITEM "Koble &til", IDM_FILE_CONNECT
MENUITEM "Koble &fra", IDM_FILE_DISCONNECT, GRAYED
MENUITEM SEPARATOR
MENUITEM "&Start Opptak", ID_FILE_STARTCAPTURE
MENUITEM "S&topp Opptak", ID_FILE_STOPCAPTURE, GRAYED
MENUITEM "&Clear display", IDM_FILE_CLEARDISPLAY
MENUITEM SEPARATOR
MENUITEM "&Lokalt Ekko", ID_FILE_LOCALECHO
MENUITEM "&Start Opptak", IDM_FILE_STARTCAPTURE
MENUITEM "S&topp Opptak", IDM_FILE_STOPCAPTURE, GRAYED
MENUITEM SEPARATOR
MENUITEM "&Lokalt Ekko", IDM_FILE_LOCALECHO
MENUITEM SEPARATOR
MENUITEM "&Avslutt", IDM_EXIT
END

View file

@ -16,13 +16,15 @@ IDC_FDEBUG MENU DISCARDABLE
BEGIN
POPUP "&Plik"
BEGIN
MENUITEM "P&o³¹cz", ID_FILE_CONNECT
MENUITEM "&Roz³¹cz", ID_FILE_DISCONNECT, GRAYED
MENUITEM "P&o³¹cz", IDM_FILE_CONNECT
MENUITEM "&Roz³¹cz", IDM_FILE_DISCONNECT, GRAYED
MENUITEM SEPARATOR
MENUITEM "Ro&zpocznij zrzut", ID_FILE_STARTCAPTURE
MENUITEM "Za&trzymaj zrzut", ID_FILE_STOPCAPTURE, GRAYED
MENUITEM "&Clear display", IDM_FILE_CLEARDISPLAY
MENUITEM SEPARATOR
MENUITEM "Lo&kalne Echo", ID_FILE_LOCALECHO
MENUITEM "Ro&zpocznij zrzut", IDM_FILE_STARTCAPTURE
MENUITEM "Za&trzymaj zrzut", IDM_FILE_STOPCAPTURE, GRAYED
MENUITEM SEPARATOR
MENUITEM "Lo&kalne Echo", IDM_FILE_LOCALECHO
MENUITEM SEPARATOR
MENUITEM "&Wyjœcie", IDM_EXIT
END

View file

@ -16,13 +16,15 @@ IDC_FDEBUG MENU DISCARDABLE
BEGIN
POPUP "&Dosya"
BEGIN
MENUITEM "&Baðlan", ID_FILE_CONNECT
MENUITEM "Baðlantýyý &Kes", ID_FILE_DISCONNECT, GRAYED
MENUITEM "&Baðlan", IDM_FILE_CONNECT
MENUITEM "Baðlantýyý &Kes", IDM_FILE_DISCONNECT, GRAYED
MENUITEM SEPARATOR
MENUITEM "&Yakalamayý Baþlat", ID_FILE_STARTCAPTURE
MENUITEM "Yakalamayý &Durdur", ID_FILE_STOPCAPTURE, GRAYED
MENUITEM "&Clear display", IDM_FILE_CLEARDISPLAY
MENUITEM SEPARATOR
MENUITEM "Bölgesel &Yanký", ID_FILE_LOCALECHO
MENUITEM "&Yakalamayý Baþlat", IDM_FILE_STARTCAPTURE
MENUITEM "Yakalamayý &Durdur", IDM_FILE_STOPCAPTURE, GRAYED
MENUITEM SEPARATOR
MENUITEM "Bölgesel &Yanký", IDM_FILE_LOCALECHO
MENUITEM SEPARATOR
MENUITEM "&Çýkýþ", IDM_EXIT
END

View file

@ -218,7 +218,10 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
case IDM_EXIT:
DestroyWindow(hWnd);
break;
case ID_FILE_CONNECT:
case IDM_FILE_CLEARDISPLAY:
SetWindowText(hDisplayWnd, TEXT(""));
break;
case IDM_FILE_CONNECT:
if (bConnected)
{
MessageBox(hWnd, TEXT("You are already connected!"), TEXT("Error"), MB_OK|MB_ICONSTOP);
@ -234,7 +237,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
}
}
break;
case ID_FILE_DISCONNECT:
case IDM_FILE_DISCONNECT:
if (bConnected)
{
bConnected = FALSE;
@ -246,7 +249,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
MessageBox(hWnd, TEXT("You are not currently connected!"), TEXT("Error"), MB_OK|MB_ICONSTOP);
}
break;
case ID_FILE_STARTCAPTURE:
case IDM_FILE_STARTCAPTURE:
if (DialogBox(hInst, (LPCTSTR)IDD_CAPTURE, hWnd, (DLGPROC)CaptureDialogProc) == IDOK)
{
bCapturing = TRUE;
@ -255,7 +258,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
hCaptureFile = CreateFile(strCaptureFileName, FILE_APPEND_DATA, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
}
break;
case ID_FILE_STOPCAPTURE:
case IDM_FILE_STOPCAPTURE:
if (bCapturing)
{
bCapturing = FALSE;
@ -265,7 +268,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
hCaptureFile = NULL;
}
break;
case ID_FILE_LOCALECHO:
case IDM_FILE_LOCALECHO:
if (bLocalEcho)
{
bLocalEcho = FALSE;
@ -426,11 +429,11 @@ VOID EnableConnectMenuItem(BOOL Enable)
if (Enable)
{
EnableMenuItem(hFileMenu, ID_FILE_CONNECT, MF_BYCOMMAND|MF_ENABLED);
EnableMenuItem(hFileMenu, IDM_FILE_CONNECT, MF_BYCOMMAND|MF_ENABLED);
}
else
{
EnableMenuItem(hFileMenu, ID_FILE_CONNECT, MF_BYCOMMAND|MF_GRAYED);
EnableMenuItem(hFileMenu, IDM_FILE_CONNECT, MF_BYCOMMAND|MF_GRAYED);
}
}
@ -444,11 +447,11 @@ VOID EnableDisconnectMenuItem(BOOL Enable)
if (Enable)
{
EnableMenuItem(hFileMenu, ID_FILE_DISCONNECT, MF_BYCOMMAND|MF_ENABLED);
EnableMenuItem(hFileMenu, IDM_FILE_DISCONNECT, MF_BYCOMMAND|MF_ENABLED);
}
else
{
EnableMenuItem(hFileMenu, ID_FILE_DISCONNECT, MF_BYCOMMAND|MF_GRAYED);
EnableMenuItem(hFileMenu, IDM_FILE_DISCONNECT, MF_BYCOMMAND|MF_GRAYED);
}
}
@ -462,11 +465,11 @@ VOID EnableStartCaptureMenuItem(BOOL Enable)
if (Enable)
{
EnableMenuItem(hFileMenu, ID_FILE_STARTCAPTURE, MF_BYCOMMAND|MF_ENABLED);
EnableMenuItem(hFileMenu, IDM_FILE_STARTCAPTURE, MF_BYCOMMAND|MF_ENABLED);
}
else
{
EnableMenuItem(hFileMenu, ID_FILE_STARTCAPTURE, MF_BYCOMMAND|MF_GRAYED);
EnableMenuItem(hFileMenu, IDM_FILE_STARTCAPTURE, MF_BYCOMMAND|MF_GRAYED);
}
}
@ -480,11 +483,11 @@ VOID EnableStopCaptureMenuItem(BOOL Enable)
if (Enable)
{
EnableMenuItem(hFileMenu, ID_FILE_STOPCAPTURE, MF_BYCOMMAND|MF_ENABLED);
EnableMenuItem(hFileMenu, IDM_FILE_STOPCAPTURE, MF_BYCOMMAND|MF_ENABLED);
}
else
{
EnableMenuItem(hFileMenu, ID_FILE_STOPCAPTURE, MF_BYCOMMAND|MF_GRAYED);
EnableMenuItem(hFileMenu, IDM_FILE_STOPCAPTURE, MF_BYCOMMAND|MF_GRAYED);
}
}
@ -498,11 +501,11 @@ VOID CheckLocalEchoMenuItem(BOOL Checked)
if (Checked)
{
CheckMenuItem(hFileMenu, ID_FILE_LOCALECHO, MF_BYCOMMAND|MF_CHECKED);
CheckMenuItem(hFileMenu, IDM_FILE_LOCALECHO, MF_BYCOMMAND|MF_CHECKED);
}
else
{
CheckMenuItem(hFileMenu, ID_FILE_LOCALECHO, MF_BYCOMMAND|MF_UNCHECKED);
CheckMenuItem(hFileMenu, IDM_FILE_LOCALECHO, MF_BYCOMMAND|MF_UNCHECKED);
}
}

View file

@ -19,11 +19,12 @@
#define IDC_CAPTUREFILENAME 1002
#define IDC_BROWSE 1003
#define IDC_LICENSE_EDIT 1029
#define ID_FILE_CONNECT 32771
#define ID_FILE_DISCONNECT 32772
#define ID_FILE_STARTCAPTURE 32773
#define ID_FILE_STOPCAPTURE 32774
#define ID_FILE_LOCALECHO 32775
#define IDM_FILE_CLEARDISPLAY 32770
#define IDM_FILE_CONNECT 32771
#define IDM_FILE_DISCONNECT 32772
#define IDM_FILE_STARTCAPTURE 32773
#define IDM_FILE_STOPCAPTURE 32774
#define IDM_FILE_LOCALECHO 32775
#define IDS_LICENSE 32815
#define IDC_STATIC -1