ide: fix debugger event name Window -> Windows, record 'library-loaded' events

git-svn-id: trunk@30486 -
This commit is contained in:
paul 2011-04-27 06:43:16 +00:00
parent 1ee57a68c4
commit ec09bfef6c
6 changed files with 18 additions and 17 deletions

View File

@ -76,7 +76,7 @@ const
{ ecThread } 2,
{ ecModule } 3,
{ ecOutput } 4,
{ ecWindow } 5,
{ ecWindows } 5,
{ ecDebugger } 6
);
@ -128,8 +128,8 @@ begin
Include(FFilter, ecModule);
if EnvironmentOptions.DebuggerEventLogShowOutput then
Include(FFilter, ecOutput);
if EnvironmentOptions.DebuggerEventLogShowWindow then
Include(FFilter, ecWindow);
if EnvironmentOptions.DebuggerEventLogShowWindows then
Include(FFilter, ecWindows);
if EnvironmentOptions.DebuggerEventLogShowDebugger then
Include(FFilter, ecDebugger);

View File

@ -1630,7 +1630,7 @@ type
ecThread, // Thread creation, destruction, start, etc.
ecModule, // Library load and unload
ecOutput, // DebugOutput calls
ecWindow,
ecWindows, // Windows events
ecDebugger); // debugger errors and warnings
TDBGEventCategories = set of TDBGEventCategory;

View File

@ -182,7 +182,7 @@ begin
ecThread: Result := lisDebugOptionsFrmThread;
ecModule: Result := lisDebugOptionsFrmModule;
ecOutput: Result := lisDebugOptionsFrmOutput;
ecWindow: Result := lisDebugOptionsFrmWindow;
ecWindows: Result := lisDebugOptionsFrmWindows;
ecDebugger: Result := lisDebugOptionsFrmDebugger;
else
Result := '???';
@ -253,7 +253,7 @@ begin
SetChecked(ecThread, DebuggerEventLogShowThread);
SetChecked(ecModule, DebuggerEventLogShowModule);
SetChecked(ecOutput, DebuggerEventLogShowOutput);
SetChecked(ecWindow, DebuggerEventLogShowWindow);
SetChecked(ecWindows, DebuggerEventLogShowWindows);
SetChecked(ecDebugger, DebuggerEventLogShowDebugger);
end;
end;
@ -276,7 +276,7 @@ begin
DebuggerEventLogShowThread := GetChecked(ecThread);
DebuggerEventLogShowModule := GetChecked(ecModule);
DebuggerEventLogShowOutput := GetChecked(ecOutput);
DebuggerEventLogShowWindow := GetChecked(ecWindow);
DebuggerEventLogShowWindows := GetChecked(ecWindows);
DebuggerEventLogShowDebugger := GetChecked(ecDebugger);
end;
end;

View File

@ -8545,12 +8545,13 @@ function TGDBMIDebuggerCommand.ProcessResult(var AResult: TGDBMIExecResult;ATime
EventText: String;
begin
EventText := GetPart(['='], [','], Line, False, False);
case StringCase(EventText, ['library-unloaded',
case StringCase(EventText, [
'library-loaded', 'library-unloaded',
'thread-created', 'thread-group-created',
'thread-exited', 'thread-group-exited'], False, False)
of
0: DoDbgEvent(ecModule, Line);
1..4: DoDbgEvent(ecThread, Line);
0..1: DoDbgEvent(ecModule, Line);
2..5: DoDbgEvent(ecThread, Line);
else
DebugLn('[WARNING] Debugger: Unexpected async-record: ', Line);
end;

View File

@ -260,7 +260,7 @@ type
FDebuggerEventLogShowOutput: Boolean;
FDebuggerEventLogShowProcess: Boolean;
FDebuggerEventLogShowThread: Boolean;
FDebuggerEventLogShowWindow: Boolean;
FDebuggerEventLogShowWindows: Boolean;
// recent files and directories
FRecentOpenFiles: TStringList;
@ -474,7 +474,7 @@ type
property DebuggerEventLogShowThread: Boolean read FDebuggerEventLogShowThread write FDebuggerEventLogShowThread;
property DebuggerEventLogShowModule: Boolean read FDebuggerEventLogShowModule write FDebuggerEventLogShowModule;
property DebuggerEventLogShowOutput: Boolean read FDebuggerEventLogShowOutput write FDebuggerEventLogShowOutput;
property DebuggerEventLogShowWindow: Boolean read FDebuggerEventLogShowWindow write FDebuggerEventLogShowWindow;
property DebuggerEventLogShowWindows: Boolean read FDebuggerEventLogShowWindows write FDebuggerEventLogShowWindows;
property DebuggerEventLogShowDebugger: Boolean read FDebuggerEventLogShowDebugger write FDebuggerEventLogShowDebugger;
property CompilerMessagesFilename: string read FCompilerMessagesFilename
write FCompilerMessagesFilename;
@ -1120,8 +1120,8 @@ begin
Path+'Debugger/EventLogShowModule', False);
FDebuggerEventLogShowOutput := XMLConfig.GetValue(
Path+'Debugger/EventLogShowOutput', True);
FDebuggerEventLogShowWindow := XMLConfig.GetValue(
Path+'Debugger/EventLogShowWindow', False);
FDebuggerEventLogShowWindows := XMLConfig.GetValue(
Path+'Debugger/EventLogShowWindows', False);
FDebuggerEventLogShowDebugger := XMLConfig.GetValue(
Path+'Debugger/EventLogShowDebugger', True);
end;
@ -1419,8 +1419,8 @@ begin
FDebuggerEventLogShowModule, False);
XMLConfig.SetDeleteValue(Path+'Debugger/EventLogShowOutput',
FDebuggerEventLogShowOutput, True);
XMLConfig.SetDeleteValue(Path+'Debugger/EventLogShowWindow',
FDebuggerEventLogShowWindow, False);
XMLConfig.SetDeleteValue(Path+'Debugger/EventLogShowWindows',
FDebuggerEventLogShowWindows, False);
XMLConfig.SetDeleteValue(Path+'Debugger/EventLogShowDebugger',
FDebuggerEventLogShowDebugger, True);
end;

View File

@ -4450,7 +4450,7 @@ resourcestring
lisDebugOptionsFrmThread = 'Thread';
lisDebugOptionsFrmModule = 'Module';
lisDebugOptionsFrmOutput = 'Output';
lisDebugOptionsFrmWindow = 'Window';
lisDebugOptionsFrmWindows = 'Windows';
lisDebugOptionsFrmDebugger = 'Debugger';
lisDebugOptionsFrmLanguageExceptions = 'Language Exceptions';
lisDebugOptionsFrmIgnoreTheseExceptions = 'Ignore these exceptions';