Merge pull request #908 from keymanapp/developer-hide-debug-status-form-in-test-mode-5412

[Developer] Hide Debug Status form in Test Mode, prevents uninitialised data errors
This commit is contained in:
Marc Durdin 2018-05-29 09:24:24 +07:00 committed by GitHub
commit aff84c2f73
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 26 additions and 15 deletions

View file

@ -151,12 +151,14 @@ object modActionsKeyboardEditor: TmodActionsKeyboardEditor
object actDebugTestMode: TAction
Category = 'Debug Control'
Caption = '&Test Mode'
GroupIndex = 1
OnExecute = actDebugTestModeExecute
OnUpdate = actDebugTestModeUpdate
end
object actDebugDebuggerMode: TAction
Category = 'Debug Control'
Caption = '&Debugger Mode'
GroupIndex = 2
OnExecute = actDebugDebuggerModeExecute
OnUpdate = actDebugDebuggerModeUpdate
end

View file

@ -22,21 +22,10 @@ inherited frmDebug: TfrmDebug
Width = 755
Height = 73
Cursor = crIBeam
Align = alClient
Alignment = taLeftJustify
BorderStyle = bsNone
Font.Charset = ANSI_CHARSET
Font.Color = clWindowText
Font.Height = -11
Font.Name = 'Arial'
Font.Style = []
ParentFont = False
PopupMenu = mnuPopup
ScrollBars = ssVertical
TabOrder = 0
OnChange = memoChange
OnClick = memoClick
OnEnter = memoGotFocus
OnExit = memoLostFocus
AltFont.Charset = DEFAULT_CHARSET
AltFont.Color = clWindowText
AltFont.Height = -11
@ -65,6 +54,19 @@ inherited frmDebug: TfrmDebug
UpdateMode = umImmediate
Version = 'v7.1 Professional ed.'
OnSelMove = memoSelMove
Align = alClient
Font.Charset = ANSI_CHARSET
Font.Color = clWindowText
Font.Height = -11
Font.Name = 'Arial'
Font.Style = []
ParentFont = False
PopupMenu = mnuPopup
TabOrder = 0
TabStop = True
OnClick = memoClick
OnEnter = memoGotFocus
OnExit = memoLostFocus
OnMessage = memoMessage
end
object sgChars: TStringGrid

View file

@ -1287,13 +1287,16 @@ begin
UpdateDebugStatusForm; // I4809
if FOldUIStatus = duiTest then
begin
frmDebugStatus.Parent.Visible := True;
if memo.Focused then
begin
GetParentForm(memo).ActiveControl := nil;
//ActiveControl := memo;
memo.SetFocus;
end;
end;
end
else if FUIStatus = duiTest then
frmDebugStatus.Parent.Visible := False;
end;
end;

View file

@ -76,6 +76,8 @@ inherited frmKeymanDeveloper: TfrmKeymanDeveloper
Width = 82
Height = 22
Action = modActionsKeyboardEditor.actDebugTestMode
AllowAllUp = True
GroupIndex = 1
end
object SpeedButton2: TSpeedButton
Left = 83
@ -83,6 +85,8 @@ inherited frmKeymanDeveloper: TfrmKeymanDeveloper
Width = 98
Height = 22
Action = modActionsKeyboardEditor.actDebugDebuggerMode
AllowAllUp = True
GroupIndex = 2
end
object cbDebugSystemKeyboard: TComboBox
Left = 359
@ -297,7 +301,7 @@ inherited frmKeymanDeveloper: TfrmKeymanDeveloper
Left = 304
Top = 236
Bitmap = {
494C01010A000E00EC0010001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
494C01010A000E00F00010001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
0000000000003600000028000000400000003000000001002000000000000030
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
@ -706,7 +710,7 @@ inherited frmKeymanDeveloper: TfrmKeymanDeveloper
Left = 236
Top = 236
Bitmap = {
494C01013B004000EC0010001000C0C0C000FF10FFFFFFFFFFFFFFFF424D3600
494C01013B004000F00010001000C0C0C000FF10FFFFFFFFFFFFFFFF424D3600
000000000000360000002800000040000000F0000000010020000000000000F0
000000000000000000000000000000000000C0C0C000C0C0C000C0C0C000C0C0
C000C0C0C000C6C6C600F7730000CE5A0000CE5A0000F7730000C6C6C600C0C0