paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-14 18:39:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debugger/debugeventsform.pp
View File

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

2
debugger/debugger.pp
View File

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

6
debugger/frames/debugger_eventlog_options.pas
View File

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

7
debugger/gdbmidebugger.pp
View File

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

12
ide/environmentopts.pp
View File

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

2
ide/lazarusidestrconsts.pas
View File

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