fix focus regression in windows

This commit is contained in:
April Ayres-Griffiths 2019-04-18 11:57:44 +10:00
parent 68b30613f5
commit 2d5cc156f0
8 changed files with 374 additions and 347 deletions

View File

@ -5,7 +5,7 @@ object GUIForm: TGUIForm
Width = 1078 Width = 1078
AlphaBlendValue = 128 AlphaBlendValue = 128
Caption = 'microM8 GUI' Caption = 'microM8 GUI'
ClientHeight = 658 ClientHeight = 663
ClientWidth = 1078 ClientWidth = 1078
Constraints.MinWidth = 1078 Constraints.MinWidth = 1078
DoubleBuffered = False DoubleBuffered = False
@ -29,8 +29,8 @@ object GUIForm: TGUIForm
LCLVersion = '2.0.0.4' LCLVersion = '2.0.0.4'
object StatusBar1: TStatusBar object StatusBar1: TStatusBar
Left = 0 Left = 0
Height = 19 Height = 23
Top = 639 Top = 640
Width = 1078 Width = 1078
Panels = <> Panels = <>
end end
@ -232,7 +232,7 @@ object GUIForm: TGUIForm
end end
object tbMasterVolume: TTrackBar object tbMasterVolume: TTrackBar
Left = 249 Left = 249
Height = 38 Height = 32
Top = 2 Top = 2
Width = 96 Width = 96
OnChange = tbMasterVolumeChange OnChange = tbMasterVolumeChange
@ -276,7 +276,7 @@ object GUIForm: TGUIForm
end end
object TrackBar2: TTrackBar object TrackBar2: TTrackBar
Left = 449 Left = 449
Height = 38 Height = 32
Top = 2 Top = 2
Width = 96 Width = 96
Max = 4 Max = 4
@ -327,31 +327,31 @@ object GUIForm: TGUIForm
end end
object pnlContainer: TPanel object pnlContainer: TPanel
Left = 0 Left = 0
Height = 603 Height = 604
Top = 36 Top = 36
Width = 1078 Width = 1078
Align = alClient Align = alClient
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 603 ClientHeight = 604
ClientWidth = 1078 ClientWidth = 1078
ParentColor = False ParentColor = False
TabOrder = 2 TabOrder = 2
object sidecarPanel: TPanel object sidecarPanel: TPanel
Left = 908 Left = 908
Height = 566 Height = 567
Top = 0 Top = 0
Width = 170 Width = 170
Align = alRight Align = alRight
BevelOuter = bvNone BevelOuter = bvNone
Caption = 'sidecarPanel' Caption = 'sidecarPanel'
ClientHeight = 566 ClientHeight = 567
ClientWidth = 170 ClientWidth = 170
Color = clBlack Color = clBlack
ParentColor = False ParentColor = False
TabOrder = 0 TabOrder = 0
object Image1: TImage object Image1: TImage
Left = 0 Left = 0
Height = 566 Height = 567
Top = 0 Top = 0
Width = 170 Width = 170
Align = alClient Align = alClient
@ -5444,12 +5444,12 @@ object GUIForm: TGUIForm
end end
object embedPanel: TPanel object embedPanel: TPanel
Left = 0 Left = 0
Height = 566 Height = 567
Top = 0 Top = 0
Width = 908 Width = 908
Align = alClient Align = alClient
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 566 ClientHeight = 567
ClientWidth = 908 ClientWidth = 908
Color = clBlack Color = clBlack
Font.Color = clWhite Font.Color = clWhite
@ -5461,7 +5461,7 @@ object GUIForm: TGUIForm
OnMouseUp = FormMouseUp OnMouseUp = FormMouseUp
object backdrop: TImage object backdrop: TImage
Left = 0 Left = 0
Height = 566 Height = 567
Top = 0 Top = 0
Width = 908 Width = 908
Align = alClient Align = alClient
@ -5474,7 +5474,7 @@ object GUIForm: TGUIForm
object pnlMemory: TPanel object pnlMemory: TPanel
Left = 0 Left = 0
Height = 37 Height = 37
Top = 566 Top = 567
Width = 1078 Width = 1078
Align = alBottom Align = alBottom
ClientHeight = 37 ClientHeight = 37
@ -5485,7 +5485,7 @@ object GUIForm: TGUIForm
OnResize = pnlMemoryResize OnResize = pnlMemoryResize
object txtAddress: TEdit object txtAddress: TEdit
Left = 136 Left = 136
Height = 29 Height = 23
Top = 8 Top = 8
Width = 80 Width = 80
OnKeyPress = txtAddressKeyPress OnKeyPress = txtAddressKeyPress
@ -5495,23 +5495,23 @@ object GUIForm: TGUIForm
end end
object Label1: TLabel object Label1: TLabel
Left = 9 Left = 9
Height = 17 Height = 15
Top = 10 Top = 10
Width = 130 Width = 122
Caption = 'Memory Address (hex):' Caption = 'Memory Address (hex):'
ParentColor = False ParentColor = False
end end
object Label2: TLabel object Label2: TLabel
Left = 240 Left = 240
Height = 17 Height = 15
Top = 10 Top = 10
Width = 65 Width = 60
Caption = 'Value (hex):' Caption = 'Value (hex):'
ParentColor = False ParentColor = False
end end
object txtValue: TEdit object txtValue: TEdit
Left = 312 Left = 312
Height = 29 Height = 23
Top = 8 Top = 8
Width = 80 Width = 80
OnKeyPress = txtValueKeyPress OnKeyPress = txtValueKeyPress

View File

@ -701,7 +701,9 @@ begin
RepaintWindow; RepaintWindow;
if not IsMicroM8Active then if not IsMicroM8Active then
HideM8; HideM8
else
lastFocusLostTime:=Now();
//log.Lines.Add('app is deactivating'); //log.Lines.Add('app is deactivating');
end; end;
@ -3253,7 +3255,7 @@ begin
exit; exit;
{ okay not running and we want to start it } { okay not running and we want to start it }
MicroM8Process.Active := true; MicroM8Process.Active := true;
Sleep(50); Sleep(1000);
lx := -1; lx := -1;
ReposWindow; ReposWindow;
end; end;

View File

@ -1,13 +1,13 @@
object GUIForm: TGUIForm object GUIForm: TGUIForm
Left = 81 Left = 275
Height = 668 Height = 683
Top = 109 Top = 109
Width = 1014 Width = 1078
AlphaBlendValue = 128 AlphaBlendValue = 128
Caption = 'microM8 GUI' Caption = 'microM8 GUI'
ClientHeight = 648 ClientHeight = 663
ClientWidth = 1014 ClientWidth = 1078
Constraints.MinWidth = 1014 Constraints.MinWidth = 1078
DoubleBuffered = False DoubleBuffered = False
Menu = MainMenu1 Menu = MainMenu1
OnChangeBounds = FormChangeBounds OnChangeBounds = FormChangeBounds
@ -30,15 +30,15 @@ object GUIForm: TGUIForm
object StatusBar1: TStatusBar object StatusBar1: TStatusBar
Left = 0 Left = 0
Height = 23 Height = 23
Top = 625 Top = 640
Width = 1014 Width = 1078
Panels = <> Panels = <>
end end
object ToolBar1: TToolBar object ToolBar1: TToolBar
Left = 0 Left = 0
Height = 36 Height = 36
Top = 0 Top = 0
Width = 1014 Width = 1078
ButtonHeight = 32 ButtonHeight = 32
ButtonWidth = 32 ButtonWidth = 32
Caption = 'ToolBar1' Caption = 'ToolBar1'
@ -58,7 +58,7 @@ object GUIForm: TGUIForm
end end
object tbRMVoxels: TToolButton object tbRMVoxels: TToolButton
Tag = 1 Tag = 1
Left = 549 Left = 613
Hint = 'Voxel Render' Hint = 'Voxel Render'
Top = 2 Top = 2
Caption = 'Voxels' Caption = 'Voxels'
@ -72,7 +72,7 @@ object GUIForm: TGUIForm
Style = tbsCheck Style = tbsCheck
end end
object tbRMDots: TToolButton object tbRMDots: TToolButton
Left = 585 Left = 649
Hint = 'Dot Render' Hint = 'Dot Render'
Top = 2 Top = 2
Caption = 'Dots' Caption = 'Dots'
@ -85,7 +85,7 @@ object GUIForm: TGUIForm
end end
object tbRMRaster: TToolButton object tbRMRaster: TToolButton
Tag = 2 Tag = 2
Left = 621 Left = 685
Hint = 'Raster Render' Hint = 'Raster Render'
Top = 2 Top = 2
Caption = 'Raster' Caption = 'Raster'
@ -97,7 +97,7 @@ object GUIForm: TGUIForm
Style = tbsCheck Style = tbsCheck
end end
object tbRMColor: TToolButton object tbRMColor: TToolButton
Left = 657 Left = 721
Hint = 'Toggle Color/Mono' Hint = 'Toggle Color/Mono'
Top = 2 Top = 2
Caption = 'tbRMColor' Caption = 'tbRMColor'
@ -107,7 +107,7 @@ object GUIForm: TGUIForm
ShowHint = True ShowHint = True
end end
object tbRECState: TToolButton object tbRECState: TToolButton
Left = 725 Left = 789
Hint = 'Start Recording' Hint = 'Start Recording'
Top = 2 Top = 2
Caption = 'tbRECState' Caption = 'tbRECState'
@ -117,7 +117,7 @@ object GUIForm: TGUIForm
ShowHint = True ShowHint = True
end end
object ToolButton5: TToolButton object ToolButton5: TToolButton
Left = 761 Left = 825
Hint = 'Rewind' Hint = 'Rewind'
Top = 2 Top = 2
Caption = 'ToolButton5' Caption = 'ToolButton5'
@ -127,7 +127,7 @@ object GUIForm: TGUIForm
ShowHint = True ShowHint = True
end end
object ToolButton6: TToolButton object ToolButton6: TToolButton
Left = 797 Left = 861
Hint = 'Forwards' Hint = 'Forwards'
Top = 2 Top = 2
Caption = 'ToolButton6' Caption = 'ToolButton6'
@ -137,7 +137,7 @@ object GUIForm: TGUIForm
ShowHint = True ShowHint = True
end end
object ToolButton7: TToolButton object ToolButton7: TToolButton
Left = 833 Left = 897
Hint = 'Resume' Hint = 'Resume'
Top = 2 Top = 2
Caption = 'ToolButton7' Caption = 'ToolButton7'
@ -147,7 +147,7 @@ object GUIForm: TGUIForm
ShowHint = True ShowHint = True
end end
object ToolButton8: TToolButton object ToolButton8: TToolButton
Left = 869 Left = 933
Hint = 'Stop Recording' Hint = 'Stop Recording'
Top = 2 Top = 2
Caption = 'ToolButton8' Caption = 'ToolButton8'
@ -157,7 +157,7 @@ object GUIForm: TGUIForm
ShowHint = True ShowHint = True
end end
object ToolButton9: TToolButton object ToolButton9: TToolButton
Left = 905 Left = 969
Hint = 'Pause' Hint = 'Pause'
Top = 2 Top = 2
Caption = 'ToolButton9' Caption = 'ToolButton9'
@ -167,7 +167,7 @@ object GUIForm: TGUIForm
ShowHint = True ShowHint = True
end end
object ToolButton10: TToolButton object ToolButton10: TToolButton
Left = 693 Left = 757
Top = 2 Top = 2
Caption = 'ToolButton10' Caption = 'ToolButton10'
Enabled = False Enabled = False
@ -234,19 +234,22 @@ object GUIForm: TGUIForm
Left = 249 Left = 249
Height = 32 Height = 32
Top = 2 Top = 2
Width = 64 Width = 96
OnChange = tbMasterVolumeChange OnChange = tbMasterVolumeChange
Position = 0 Position = 0
ScalePos = trBottom ScalePos = trBottom
TabStop = False TabStop = False
TickMarks = tmBoth TickMarks = tmBoth
TickStyle = tsManual TickStyle = tsManual
OnEnter = tbMasterVolumeEnter
OnMouseDown = tbMasterVolumeMouseDown
OnMouseUp = tbMasterVolumeMouseUp
OnKeyDown = FormKeyDown OnKeyDown = FormKeyDown
OnKeyUp = FormKeyUp OnKeyUp = FormKeyUp
TabOrder = 0 TabOrder = 0
end end
object tbVolUp: TToolButton object tbVolUp: TToolButton
Left = 313 Left = 345
Hint = 'Volume Up' Hint = 'Volume Up'
Top = 2 Top = 2
Caption = 'tbVolUp' Caption = 'tbVolUp'
@ -256,13 +259,13 @@ object GUIForm: TGUIForm
ShowHint = True ShowHint = True
end end
object ToolButton3: TToolButton object ToolButton3: TToolButton
Left = 349 Left = 381
Top = 2 Top = 2
Caption = 'ToolButton3' Caption = 'ToolButton3'
Enabled = False Enabled = False
end end
object tbSpeedDown: TToolButton object tbSpeedDown: TToolButton
Left = 381 Left = 413
Hint = 'CPU Speed Down' Hint = 'CPU Speed Down'
Top = 2 Top = 2
Caption = 'tbSpeedDown' Caption = 'tbSpeedDown'
@ -272,10 +275,10 @@ object GUIForm: TGUIForm
ShowHint = True ShowHint = True
end end
object TrackBar2: TTrackBar object TrackBar2: TTrackBar
Left = 417 Left = 449
Height = 32 Height = 32
Top = 2 Top = 2
Width = 64 Width = 96
Max = 4 Max = 4
OnChange = TrackBar2Change OnChange = TrackBar2Change
Position = 0 Position = 0
@ -283,12 +286,14 @@ object GUIForm: TGUIForm
TabStop = False TabStop = False
TickMarks = tmBoth TickMarks = tmBoth
TickStyle = tsManual TickStyle = tsManual
OnMouseDown = TrackBar2MouseDown
OnMouseUp = TrackBar2MouseUp
OnKeyDown = FormKeyDown OnKeyDown = FormKeyDown
OnKeyUp = FormKeyUp OnKeyUp = FormKeyUp
TabOrder = 1 TabOrder = 1
end end
object tbSpeedUp: TToolButton object tbSpeedUp: TToolButton
Left = 481 Left = 545
Hint = 'CPU Speed Up' Hint = 'CPU Speed Up'
Top = 2 Top = 2
Caption = 'tbSpeedUp' Caption = 'tbSpeedUp'
@ -298,19 +303,19 @@ object GUIForm: TGUIForm
ShowHint = True ShowHint = True
end end
object ToolButton18: TToolButton object ToolButton18: TToolButton
Left = 517 Left = 581
Top = 2 Top = 2
Caption = 'ToolButton18' Caption = 'ToolButton18'
Enabled = False Enabled = False
end end
object ToolButton1: TToolButton object ToolButton1: TToolButton
Left = 941 Left = 1005
Top = 2 Top = 2
Caption = 'ToolButton1' Caption = 'ToolButton1'
Enabled = False Enabled = False
end end
object tbFullscreen: TToolButton object tbFullscreen: TToolButton
Left = 973 Left = 1037
Hint = 'Fullscreen' Hint = 'Fullscreen'
Top = 2 Top = 2
Caption = 'tbFullscreen' Caption = 'tbFullscreen'
@ -322,31 +327,31 @@ object GUIForm: TGUIForm
end end
object pnlContainer: TPanel object pnlContainer: TPanel
Left = 0 Left = 0
Height = 589 Height = 604
Top = 36 Top = 36
Width = 1014 Width = 1078
Align = alClient Align = alClient
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 589 ClientHeight = 604
ClientWidth = 1014 ClientWidth = 1078
ParentColor = False ParentColor = False
TabOrder = 2 TabOrder = 2
object sidecarPanel: TPanel object sidecarPanel: TPanel
Left = 844 Left = 908
Height = 552 Height = 567
Top = 0 Top = 0
Width = 170 Width = 170
Align = alRight Align = alRight
BevelOuter = bvNone BevelOuter = bvNone
Caption = 'sidecarPanel' Caption = 'sidecarPanel'
ClientHeight = 552 ClientHeight = 567
ClientWidth = 170 ClientWidth = 170
Color = clBlack Color = clBlack
ParentColor = False ParentColor = False
TabOrder = 0 TabOrder = 0
object Image1: TImage object Image1: TImage
Left = 0 Left = 0
Height = 552 Height = 567
Top = 0 Top = 0
Width = 170 Width = 170
Align = alClient Align = alClient
@ -5439,13 +5444,13 @@ object GUIForm: TGUIForm
end end
object embedPanel: TPanel object embedPanel: TPanel
Left = 0 Left = 0
Height = 552 Height = 567
Top = 0 Top = 0
Width = 844 Width = 908
Align = alClient Align = alClient
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 552 ClientHeight = 567
ClientWidth = 844 ClientWidth = 908
Color = clBlack Color = clBlack
Font.Color = clWhite Font.Color = clWhite
ParentColor = False ParentColor = False
@ -5456,9 +5461,9 @@ object GUIForm: TGUIForm
OnMouseUp = FormMouseUp OnMouseUp = FormMouseUp
object backdrop: TImage object backdrop: TImage
Left = 0 Left = 0
Height = 552 Height = 567
Top = 0 Top = 0
Width = 844 Width = 908
Align = alClient Align = alClient
OnClick = backdropClick OnClick = backdropClick
OnMouseDown = FormMouseDown OnMouseDown = FormMouseDown
@ -5469,11 +5474,11 @@ object GUIForm: TGUIForm
object pnlMemory: TPanel object pnlMemory: TPanel
Left = 0 Left = 0
Height = 37 Height = 37
Top = 552 Top = 567
Width = 1014 Width = 1078
Align = alBottom Align = alBottom
ClientHeight = 37 ClientHeight = 37
ClientWidth = 1014 ClientWidth = 1078
ParentColor = False ParentColor = False
TabOrder = 2 TabOrder = 2
Visible = False Visible = False
@ -5515,7 +5520,7 @@ object GUIForm: TGUIForm
Text = '$00' Text = '$00'
end end
object pnlMemButtons: TPanel object pnlMemButtons: TPanel
Left = 760 Left = 824
Height = 35 Height = 35
Top = 1 Top = 1
Width = 253 Width = 253
@ -5680,17 +5685,17 @@ object GUIForm: TGUIForm
object MenuItem4: TMenuItem object MenuItem4: TMenuItem
Caption = 'Drive 1' Caption = 'Drive 1'
OnClick = MenuItem4Click OnClick = MenuItem4Click
object miD1Blank: TMenuItem object miD1Eject: TMenuItem
Caption = 'Eject' Caption = 'Eject'
OnClick = miD1BlankClick OnClick = miD1EjectClick
end end
object miD1File: TMenuItem object miD1File: TMenuItem
Caption = 'Insert Disk...' Caption = 'Insert Disk...'
OnClick = miD1FileClick OnClick = miD1FileClick
end end
object MenuItem17: TMenuItem object miD1InsBlank: TMenuItem
Caption = 'Insert Blank' Caption = 'Insert Blank'
OnClick = MenuItem17Click OnClick = miD1InsBlankClick
end end
object miDisk1WPToggle: TMenuItem object miDisk1WPToggle: TMenuItem
Caption = 'Write Protected' Caption = 'Write Protected'
@ -5700,17 +5705,17 @@ object GUIForm: TGUIForm
object MenuItem5: TMenuItem object MenuItem5: TMenuItem
Caption = 'Drive 2' Caption = 'Drive 2'
OnClick = MenuItem5Click OnClick = MenuItem5Click
object miD2Blank: TMenuItem object miD2Eject: TMenuItem
Caption = 'Eject' Caption = 'Eject'
OnClick = miD2BlankClick OnClick = miD2EjectClick
end end
object miD2File: TMenuItem object miD2File: TMenuItem
Caption = 'Insert Disk...' Caption = 'Insert Disk...'
OnClick = miD2FileClick OnClick = miD2FileClick
end end
object MenuItem18: TMenuItem object miD2InsBlank: TMenuItem
Caption = 'Insert Blank' Caption = 'Insert Blank'
OnClick = MenuItem18Click OnClick = miD2InsBlankClick
end end
object miDisk2WPToggle: TMenuItem object miDisk2WPToggle: TMenuItem
Caption = 'Write Protected' Caption = 'Write Protected'
@ -5759,6 +5764,249 @@ object GUIForm: TGUIForm
OnClick = MenuItem2Click OnClick = MenuItem2Click
end end
end end
object miAudio: TMenuItem
Caption = 'Audio'
OnClick = miAudioClick
object miSNDMuted: TMenuItem
Caption = 'Mute'
OnClick = miSNDMutedClick
end
object miSNDMaster: TMenuItem
Caption = 'Master Volume'
OnClick = miSNDMasterClick
object miMVOL000: TMenuItem
Caption = '0'
RadioItem = True
OnClick = miMVOL000Click
end
object miMVOL010: TMenuItem
Caption = '1'
RadioItem = True
OnClick = miMVOL000Click
end
object miMVOL020: TMenuItem
Caption = '2'
RadioItem = True
OnClick = miMVOL000Click
end
object miMVOL030: TMenuItem
Caption = '3'
RadioItem = True
OnClick = miMVOL000Click
end
object miMVOL040: TMenuItem
Caption = '4'
RadioItem = True
OnClick = miMVOL000Click
end
object miMVOL050: TMenuItem
Caption = '5'
RadioItem = True
OnClick = miMVOL000Click
end
object miMVOL060: TMenuItem
Caption = '6'
RadioItem = True
OnClick = miMVOL000Click
end
object miMVOL070: TMenuItem
Caption = '7'
RadioItem = True
OnClick = miMVOL000Click
end
object miMVOL080: TMenuItem
Caption = '8'
RadioItem = True
OnClick = miMVOL000Click
end
object miMVOL090: TMenuItem
Caption = '9'
RadioItem = True
OnClick = miMVOL000Click
end
object miMVOL100: TMenuItem
Caption = '10'
RadioItem = True
OnClick = miMVOL000Click
end
end
object miSNDSpeaker: TMenuItem
Caption = 'Speaker Volume'
OnClick = miSNDSpeakerClick
object miSVOL000: TMenuItem
Caption = '0'
RadioItem = True
OnClick = miSVOL000Click
end
object miSVOL010: TMenuItem
Caption = '1'
RadioItem = True
OnClick = miSVOL000Click
end
object miSVOL020: TMenuItem
Caption = '2'
RadioItem = True
OnClick = miSVOL000Click
end
object miSVOL030: TMenuItem
Caption = '3'
RadioItem = True
OnClick = miSVOL000Click
end
object miSVOL040: TMenuItem
Caption = '4'
RadioItem = True
OnClick = miSVOL000Click
end
object miSVOL050: TMenuItem
Caption = '5'
RadioItem = True
OnClick = miSVOL000Click
end
object miSVOL060: TMenuItem
Caption = '6'
RadioItem = True
OnClick = miSVOL000Click
end
object miSVOL070: TMenuItem
Caption = '7'
RadioItem = True
OnClick = miSVOL000Click
end
object miSVOL080: TMenuItem
Caption = '8'
RadioItem = True
OnClick = miSVOL000Click
end
object miSVOL090: TMenuItem
Caption = '9'
RadioItem = True
OnClick = miSVOL000Click
end
object miSVOL100: TMenuItem
Caption = '10'
RadioItem = True
OnClick = miSVOL000Click
end
end
object miSNDMockingboard: TMenuItem
Caption = 'Mockingboard'
object miSNDPSG0: TMenuItem
Caption = 'PSG0 Balance'
OnClick = miSNDPSG0Click
object miPSG0m100: TMenuItem
Tag = -100
Caption = 'Left'
RadioItem = True
OnClick = miPSG0m100Click
end
object miPSG0m75: TMenuItem
Tag = -75
Caption = '...'
RadioItem = True
OnClick = miPSG0m100Click
end
object miPSG0m50: TMenuItem
Tag = -50
Caption = '...'
RadioItem = True
OnClick = miPSG0m100Click
end
object miPSG0m25: TMenuItem
Tag = -25
Caption = '...'
RadioItem = True
OnClick = miPSG0m100Click
end
object miPSG0p0: TMenuItem
Caption = 'Center'
RadioItem = True
OnClick = miPSG0m100Click
end
object miPSG0p25: TMenuItem
Tag = 25
Caption = '...'
RadioItem = True
OnClick = miPSG0m100Click
end
object miPSG0p50: TMenuItem
Tag = 50
Caption = '...'
RadioItem = True
OnClick = miPSG0m100Click
end
object miPSG0p75: TMenuItem
Tag = 75
Caption = '...'
RadioItem = True
OnClick = miPSG0m100Click
end
object miPSG0p100: TMenuItem
Tag = 100
Caption = 'Right'
RadioItem = True
OnClick = miPSG0m100Click
end
end
object miSNDPSG1: TMenuItem
Caption = 'PSG1 Balance'
OnClick = miSNDPSG1Click
object miPSG1m100: TMenuItem
Tag = -100
Caption = 'Left'
RadioItem = True
OnClick = miPSG1m100Click
end
object miPSG1m75: TMenuItem
Tag = -75
Caption = '...'
RadioItem = True
OnClick = miPSG1m100Click
end
object miPSG1m50: TMenuItem
Tag = -50
Caption = '...'
RadioItem = True
OnClick = miPSG1m100Click
end
object miPSG1m25: TMenuItem
Tag = -25
Caption = '...'
RadioItem = True
OnClick = miPSG1m100Click
end
object miPSG1p0: TMenuItem
Caption = 'Center'
RadioItem = True
OnClick = miPSG1m100Click
end
object miPSG1p25: TMenuItem
Tag = 25
Caption = '...'
RadioItem = True
OnClick = miPSG1m100Click
end
object miPSG1p50: TMenuItem
Tag = 50
Caption = '...'
RadioItem = True
OnClick = miPSG1m100Click
end
object miPSG1p75: TMenuItem
Tag = 75
Caption = '...'
RadioItem = True
OnClick = miPSG1m100Click
end
object miPSG1p100: TMenuItem
Tag = 100
Caption = 'Right'
RadioItem = True
OnClick = miPSG1m100Click
end
end
end
end
object miVideo: TMenuItem object miVideo: TMenuItem
Caption = 'Video' Caption = 'Video'
object miScanLineInt: TMenuItem object miScanLineInt: TMenuItem
@ -6152,249 +6400,6 @@ object GUIForm: TGUIForm
OnClick = miPasteTextClick OnClick = miPasteTextClick
end end
end end
object miAudio: TMenuItem
Caption = 'Audio'
OnClick = miAudioClick
object miSNDMuted: TMenuItem
Caption = 'Mute'
OnClick = miSNDMutedClick
end
object miSNDMaster: TMenuItem
Caption = 'Master Volume'
OnClick = miSNDMasterClick
object miMVOL000: TMenuItem
Caption = '0'
RadioItem = True
OnClick = miMVOL000Click
end
object miMVOL010: TMenuItem
Caption = '1'
RadioItem = True
OnClick = miMVOL000Click
end
object miMVOL020: TMenuItem
Caption = '2'
RadioItem = True
OnClick = miMVOL000Click
end
object miMVOL030: TMenuItem
Caption = '3'
RadioItem = True
OnClick = miMVOL000Click
end
object miMVOL040: TMenuItem
Caption = '4'
RadioItem = True
OnClick = miMVOL000Click
end
object miMVOL050: TMenuItem
Caption = '5'
RadioItem = True
OnClick = miMVOL000Click
end
object miMVOL060: TMenuItem
Caption = '6'
RadioItem = True
OnClick = miMVOL000Click
end
object miMVOL070: TMenuItem
Caption = '7'
RadioItem = True
OnClick = miMVOL000Click
end
object miMVOL080: TMenuItem
Caption = '8'
RadioItem = True
OnClick = miMVOL000Click
end
object miMVOL090: TMenuItem
Caption = '9'
RadioItem = True
OnClick = miMVOL000Click
end
object miMVOL100: TMenuItem
Caption = '10'
RadioItem = True
OnClick = miMVOL000Click
end
end
object miSNDSpeaker: TMenuItem
Caption = 'Speaker Volume'
OnClick = miSNDSpeakerClick
object miSVOL000: TMenuItem
Caption = '0'
RadioItem = True
OnClick = miSVOL000Click
end
object miSVOL010: TMenuItem
Caption = '1'
RadioItem = True
OnClick = miSVOL000Click
end
object miSVOL020: TMenuItem
Caption = '2'
RadioItem = True
OnClick = miSVOL000Click
end
object miSVOL030: TMenuItem
Caption = '3'
RadioItem = True
OnClick = miSVOL000Click
end
object miSVOL040: TMenuItem
Caption = '4'
RadioItem = True
OnClick = miSVOL000Click
end
object miSVOL050: TMenuItem
Caption = '5'
RadioItem = True
OnClick = miSVOL000Click
end
object miSVOL060: TMenuItem
Caption = '6'
RadioItem = True
OnClick = miSVOL000Click
end
object miSVOL070: TMenuItem
Caption = '7'
RadioItem = True
OnClick = miSVOL000Click
end
object miSVOL080: TMenuItem
Caption = '8'
RadioItem = True
OnClick = miSVOL000Click
end
object miSVOL090: TMenuItem
Caption = '9'
RadioItem = True
OnClick = miSVOL000Click
end
object miSVOL100: TMenuItem
Caption = '10'
RadioItem = True
OnClick = miSVOL000Click
end
end
object miSNDMockingboard: TMenuItem
Caption = 'Mockingboard'
object miSNDPSG0: TMenuItem
Caption = 'PSG0 Balance'
OnClick = miSNDPSG0Click
object miPSG0m100: TMenuItem
Tag = -100
Caption = 'Left'
RadioItem = True
OnClick = miPSG0m100Click
end
object miPSG0m75: TMenuItem
Tag = -75
Caption = '...'
RadioItem = True
OnClick = miPSG0m100Click
end
object miPSG0m50: TMenuItem
Tag = -50
Caption = '...'
RadioItem = True
OnClick = miPSG0m100Click
end
object miPSG0m25: TMenuItem
Tag = -25
Caption = '...'
RadioItem = True
OnClick = miPSG0m100Click
end
object miPSG0p0: TMenuItem
Caption = 'Center'
RadioItem = True
OnClick = miPSG0m100Click
end
object miPSG0p25: TMenuItem
Tag = 25
Caption = '...'
RadioItem = True
OnClick = miPSG0m100Click
end
object miPSG0p50: TMenuItem
Tag = 50
Caption = '...'
RadioItem = True
OnClick = miPSG0m100Click
end
object miPSG0p75: TMenuItem
Tag = 75
Caption = '...'
RadioItem = True
OnClick = miPSG0m100Click
end
object miPSG0p100: TMenuItem
Tag = 100
Caption = 'Right'
RadioItem = True
OnClick = miPSG0m100Click
end
end
object miSNDPSG1: TMenuItem
Caption = 'PSG1 Balance'
OnClick = miSNDPSG1Click
object miPSG1m100: TMenuItem
Tag = -100
Caption = 'Left'
RadioItem = True
OnClick = miPSG1m100Click
end
object miPSG1m75: TMenuItem
Tag = -75
Caption = '...'
RadioItem = True
OnClick = miPSG1m100Click
end
object miPSG1m50: TMenuItem
Tag = -50
Caption = '...'
RadioItem = True
OnClick = miPSG1m100Click
end
object miPSG1m25: TMenuItem
Tag = -25
Caption = '...'
RadioItem = True
OnClick = miPSG1m100Click
end
object miPSG1p0: TMenuItem
Caption = 'Center'
RadioItem = True
OnClick = miPSG1m100Click
end
object miPSG1p25: TMenuItem
Tag = 25
Caption = '...'
RadioItem = True
OnClick = miPSG1m100Click
end
object miPSG1p50: TMenuItem
Tag = 50
Caption = '...'
RadioItem = True
OnClick = miPSG1m100Click
end
object miPSG1p75: TMenuItem
Tag = 75
Caption = '...'
RadioItem = True
OnClick = miPSG1m100Click
end
object miPSG1p100: TMenuItem
Tag = 100
Caption = 'Right'
RadioItem = True
OnClick = miPSG1m100Click
end
end
end
end
object miHardware: TMenuItem object miHardware: TMenuItem
Caption = 'Hardware' Caption = 'Hardware'
object miSerial: TMenuItem object miSerial: TMenuItem
@ -6588,6 +6593,10 @@ object GUIForm: TGUIForm
ShortCut = 24648 ShortCut = 24648
OnClick = miMMHelpClick OnClick = miMMHelpClick
end end
object miIssue: TMenuItem
Caption = 'Report an Issue...'
OnClick = miIssueClick
end
end end
end end
object ToolbarIcons: TImageList object ToolbarIcons: TImageList
@ -10449,11 +10458,13 @@ object GUIForm: TGUIForm
Caption = 'Insert Disk' Caption = 'Insert Disk'
OnClick = MenuItem10Click OnClick = MenuItem10Click
end end
object MenuItem11: TMenuItem object miDiskMenuBlank: TMenuItem
Caption = 'Insert Blank' Caption = 'Insert Blank'
OnClick = miDiskMenuBlankClick
end end
object MenuItem12: TMenuItem object miDiskMenuEject: TMenuItem
Caption = 'Eject' Caption = 'Eject'
OnClick = miDiskMenuEjectClick
end end
object miDiskMenuWP: TMenuItem object miDiskMenuWP: TMenuItem
Caption = 'Write Protected' Caption = 'Write Protected'
@ -10538,6 +10549,7 @@ object GUIForm: TGUIForm
WindowTop = 0 WindowTop = 0
WindowWidth = 0 WindowWidth = 0
FillAttribute = 0 FillAttribute = 0
OnTerminate = MicroM8ProcessTerminate
left = 240 left = 240
top = 160 top = 160
end end
@ -10611,4 +10623,18 @@ object GUIForm: TGUIForm
left = 238 left = 238
top = 223 top = 223
end end
object SPMenu: TPopupMenu
OnPopup = DiskMenuPopup
OnClose = DiskMenuClose
left = 24
top = 272
object miSPConnect: TMenuItem
Caption = 'Connect Disk'
OnClick = miSPFileClick
end
object miSPMenuEject: TMenuItem
Caption = 'Eject'
OnClick = miSPEjectClick
end
end
end end

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -5,7 +5,7 @@ object GUIForm: TGUIForm
Width = 1078 Width = 1078
AlphaBlendValue = 128 AlphaBlendValue = 128
Caption = 'microM8 GUI' Caption = 'microM8 GUI'
ClientHeight = 658 ClientHeight = 663
ClientWidth = 1078 ClientWidth = 1078
Constraints.MinWidth = 1078 Constraints.MinWidth = 1078
DoubleBuffered = False DoubleBuffered = False
@ -29,8 +29,8 @@ object GUIForm: TGUIForm
LCLVersion = '2.0.0.4' LCLVersion = '2.0.0.4'
object StatusBar1: TStatusBar object StatusBar1: TStatusBar
Left = 0 Left = 0
Height = 19 Height = 23
Top = 639 Top = 640
Width = 1078 Width = 1078
Panels = <> Panels = <>
end end
@ -232,7 +232,7 @@ object GUIForm: TGUIForm
end end
object tbMasterVolume: TTrackBar object tbMasterVolume: TTrackBar
Left = 249 Left = 249
Height = 38 Height = 32
Top = 2 Top = 2
Width = 96 Width = 96
OnChange = tbMasterVolumeChange OnChange = tbMasterVolumeChange
@ -276,7 +276,7 @@ object GUIForm: TGUIForm
end end
object TrackBar2: TTrackBar object TrackBar2: TTrackBar
Left = 449 Left = 449
Height = 38 Height = 32
Top = 2 Top = 2
Width = 96 Width = 96
Max = 4 Max = 4
@ -327,31 +327,31 @@ object GUIForm: TGUIForm
end end
object pnlContainer: TPanel object pnlContainer: TPanel
Left = 0 Left = 0
Height = 603 Height = 604
Top = 36 Top = 36
Width = 1078 Width = 1078
Align = alClient Align = alClient
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 603 ClientHeight = 604
ClientWidth = 1078 ClientWidth = 1078
ParentColor = False ParentColor = False
TabOrder = 2 TabOrder = 2
object sidecarPanel: TPanel object sidecarPanel: TPanel
Left = 908 Left = 908
Height = 566 Height = 567
Top = 0 Top = 0
Width = 170 Width = 170
Align = alRight Align = alRight
BevelOuter = bvNone BevelOuter = bvNone
Caption = 'sidecarPanel' Caption = 'sidecarPanel'
ClientHeight = 566 ClientHeight = 567
ClientWidth = 170 ClientWidth = 170
Color = clBlack Color = clBlack
ParentColor = False ParentColor = False
TabOrder = 0 TabOrder = 0
object Image1: TImage object Image1: TImage
Left = 0 Left = 0
Height = 566 Height = 567
Top = 0 Top = 0
Width = 170 Width = 170
Align = alClient Align = alClient
@ -5444,12 +5444,12 @@ object GUIForm: TGUIForm
end end
object embedPanel: TPanel object embedPanel: TPanel
Left = 0 Left = 0
Height = 566 Height = 567
Top = 0 Top = 0
Width = 908 Width = 908
Align = alClient Align = alClient
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 566 ClientHeight = 567
ClientWidth = 908 ClientWidth = 908
Color = clBlack Color = clBlack
Font.Color = clWhite Font.Color = clWhite
@ -5461,7 +5461,7 @@ object GUIForm: TGUIForm
OnMouseUp = FormMouseUp OnMouseUp = FormMouseUp
object backdrop: TImage object backdrop: TImage
Left = 0 Left = 0
Height = 566 Height = 567
Top = 0 Top = 0
Width = 908 Width = 908
Align = alClient Align = alClient
@ -5474,7 +5474,7 @@ object GUIForm: TGUIForm
object pnlMemory: TPanel object pnlMemory: TPanel
Left = 0 Left = 0
Height = 37 Height = 37
Top = 566 Top = 567
Width = 1078 Width = 1078
Align = alBottom Align = alBottom
ClientHeight = 37 ClientHeight = 37
@ -5485,7 +5485,7 @@ object GUIForm: TGUIForm
OnResize = pnlMemoryResize OnResize = pnlMemoryResize
object txtAddress: TEdit object txtAddress: TEdit
Left = 136 Left = 136
Height = 29 Height = 23
Top = 8 Top = 8
Width = 80 Width = 80
OnKeyPress = txtAddressKeyPress OnKeyPress = txtAddressKeyPress
@ -5495,23 +5495,23 @@ object GUIForm: TGUIForm
end end
object Label1: TLabel object Label1: TLabel
Left = 9 Left = 9
Height = 17 Height = 15
Top = 10 Top = 10
Width = 130 Width = 122
Caption = 'Memory Address (hex):' Caption = 'Memory Address (hex):'
ParentColor = False ParentColor = False
end end
object Label2: TLabel object Label2: TLabel
Left = 240 Left = 240
Height = 17 Height = 15
Top = 10 Top = 10
Width = 65 Width = 60
Caption = 'Value (hex):' Caption = 'Value (hex):'
ParentColor = False ParentColor = False
end end
object txtValue: TEdit object txtValue: TEdit
Left = 312 Left = 312
Height = 29 Height = 23
Top = 8 Top = 8
Width = 80 Width = 80
OnKeyPress = txtValueKeyPress OnKeyPress = txtValueKeyPress

View File

@ -701,7 +701,9 @@ begin
RepaintWindow; RepaintWindow;
if not IsMicroM8Active then if not IsMicroM8Active then
HideM8; HideM8
else
lastFocusLostTime:=Now();
//log.Lines.Add('app is deactivating'); //log.Lines.Add('app is deactivating');
end; end;
@ -2748,9 +2750,6 @@ begin
{$ENDIF} {$ENDIF}
//StatusBar1.SimpleText := 'App is refocussing'; //StatusBar1.SimpleText := 'App is refocussing';
lastShowTime := Now(); lastShowTime := Now();
lastFocusLostTime:=Now();
//SimpleGet( baseUrl + '/api/control/mouse/buttonclick' );
SendKey( $e05d, 0, 1, 0 ); SendKey( $e05d, 0, 1, 0 );
end; end;
ReposWindow; ReposWindow;