fix derp sound on mac high sierra

This commit is contained in:
April Ayres-Griffiths 2019-04-20 12:19:37 +10:00
parent 3e799dfb5a
commit 2ba0df3a55
7 changed files with 81 additions and 81 deletions

View File

@ -60,7 +60,7 @@ object GUIForm: TGUIForm
end end
object tbRMVoxels: TToolButton object tbRMVoxels: TToolButton
Tag = 1 Tag = 1
Left = 613 Left = 577
Hint = 'Voxel Render' Hint = 'Voxel Render'
Top = 2 Top = 2
Caption = 'Voxels' Caption = 'Voxels'
@ -74,7 +74,7 @@ object GUIForm: TGUIForm
Style = tbsCheck Style = tbsCheck
end end
object tbRMDots: TToolButton object tbRMDots: TToolButton
Left = 649 Left = 613
Hint = 'Dot Render' Hint = 'Dot Render'
Top = 2 Top = 2
Caption = 'Dots' Caption = 'Dots'
@ -87,7 +87,7 @@ object GUIForm: TGUIForm
end end
object tbRMRaster: TToolButton object tbRMRaster: TToolButton
Tag = 2 Tag = 2
Left = 685 Left = 649
Hint = 'Raster Render' Hint = 'Raster Render'
Top = 2 Top = 2
Caption = 'Raster' Caption = 'Raster'
@ -99,7 +99,7 @@ object GUIForm: TGUIForm
Style = tbsCheck Style = tbsCheck
end end
object tbRMColor: TToolButton object tbRMColor: TToolButton
Left = 721 Left = 685
Hint = 'Toggle Color/Mono' Hint = 'Toggle Color/Mono'
Top = 2 Top = 2
Caption = 'tbRMColor' Caption = 'tbRMColor'
@ -109,7 +109,7 @@ object GUIForm: TGUIForm
ShowHint = True ShowHint = True
end end
object tbRECState: TToolButton object tbRECState: TToolButton
Left = 789 Left = 753
Hint = 'Start Recording' Hint = 'Start Recording'
Top = 2 Top = 2
Caption = 'tbRECState' Caption = 'tbRECState'
@ -119,7 +119,7 @@ object GUIForm: TGUIForm
ShowHint = True ShowHint = True
end end
object ToolButton5: TToolButton object ToolButton5: TToolButton
Left = 825 Left = 789
Hint = 'Rewind' Hint = 'Rewind'
Top = 2 Top = 2
Caption = 'ToolButton5' Caption = 'ToolButton5'
@ -129,7 +129,7 @@ object GUIForm: TGUIForm
ShowHint = True ShowHint = True
end end
object ToolButton6: TToolButton object ToolButton6: TToolButton
Left = 861 Left = 825
Hint = 'Forwards' Hint = 'Forwards'
Top = 2 Top = 2
Caption = 'ToolButton6' Caption = 'ToolButton6'
@ -139,7 +139,7 @@ object GUIForm: TGUIForm
ShowHint = True ShowHint = True
end end
object ToolButton7: TToolButton object ToolButton7: TToolButton
Left = 897 Left = 861
Hint = 'Resume' Hint = 'Resume'
Top = 2 Top = 2
Caption = 'ToolButton7' Caption = 'ToolButton7'
@ -149,7 +149,7 @@ object GUIForm: TGUIForm
ShowHint = True ShowHint = True
end end
object ToolButton8: TToolButton object ToolButton8: TToolButton
Left = 933 Left = 897
Hint = 'Stop Recording' Hint = 'Stop Recording'
Top = 2 Top = 2
Caption = 'ToolButton8' Caption = 'ToolButton8'
@ -159,7 +159,7 @@ object GUIForm: TGUIForm
ShowHint = True ShowHint = True
end end
object ToolButton9: TToolButton object ToolButton9: TToolButton
Left = 969 Left = 933
Hint = 'Pause' Hint = 'Pause'
Top = 2 Top = 2
Caption = 'ToolButton9' Caption = 'ToolButton9'
@ -169,7 +169,7 @@ object GUIForm: TGUIForm
ShowHint = True ShowHint = True
end end
object ToolButton10: TToolButton object ToolButton10: TToolButton
Left = 757 Left = 721
Top = 2 Top = 2
Caption = 'ToolButton10' Caption = 'ToolButton10'
Enabled = False Enabled = False
@ -206,24 +206,14 @@ object GUIForm: TGUIForm
ParentShowHint = False ParentShowHint = False
ShowHint = True ShowHint = True
end end
object tbWebDebugger: TToolButton
Left = 145
Hint = 'Web Debugger'
Top = 2
Caption = 'tbWebDebugger'
ImageIndex = 28
OnClick = miToolsWebDebuggerClick
ParentShowHint = False
ShowHint = True
end
object ToolButton15: TToolButton object ToolButton15: TToolButton
Left = 181 Left = 145
Top = 2 Top = 2
Caption = 'ToolButton15' Caption = 'ToolButton15'
Enabled = False Enabled = False
end end
object tbVolDown: TToolButton object tbVolDown: TToolButton
Left = 213 Left = 177
Hint = 'Volume Down' Hint = 'Volume Down'
Top = 2 Top = 2
Caption = 'tbVolDown' Caption = 'tbVolDown'
@ -233,7 +223,7 @@ object GUIForm: TGUIForm
ShowHint = True ShowHint = True
end end
object tbMasterVolume: TTrackBar object tbMasterVolume: TTrackBar
Left = 249 Left = 213
Height = 38 Height = 38
Top = 2 Top = 2
Width = 96 Width = 96
@ -251,7 +241,7 @@ object GUIForm: TGUIForm
TabOrder = 0 TabOrder = 0
end end
object tbVolUp: TToolButton object tbVolUp: TToolButton
Left = 345 Left = 309
Hint = 'Volume Up' Hint = 'Volume Up'
Top = 2 Top = 2
Caption = 'tbVolUp' Caption = 'tbVolUp'
@ -261,13 +251,13 @@ object GUIForm: TGUIForm
ShowHint = True ShowHint = True
end end
object ToolButton3: TToolButton object ToolButton3: TToolButton
Left = 381 Left = 345
Top = 2 Top = 2
Caption = 'ToolButton3' Caption = 'ToolButton3'
Enabled = False Enabled = False
end end
object tbSpeedDown: TToolButton object tbSpeedDown: TToolButton
Left = 413 Left = 377
Hint = 'CPU Speed Down' Hint = 'CPU Speed Down'
Top = 2 Top = 2
Caption = 'tbSpeedDown' Caption = 'tbSpeedDown'
@ -277,7 +267,7 @@ object GUIForm: TGUIForm
ShowHint = True ShowHint = True
end end
object TrackBar2: TTrackBar object TrackBar2: TTrackBar
Left = 449 Left = 413
Height = 38 Height = 38
Top = 2 Top = 2
Width = 96 Width = 96
@ -295,7 +285,7 @@ object GUIForm: TGUIForm
TabOrder = 1 TabOrder = 1
end end
object tbSpeedUp: TToolButton object tbSpeedUp: TToolButton
Left = 545 Left = 509
Hint = 'CPU Speed Up' Hint = 'CPU Speed Up'
Top = 2 Top = 2
Caption = 'tbSpeedUp' Caption = 'tbSpeedUp'
@ -305,19 +295,19 @@ object GUIForm: TGUIForm
ShowHint = True ShowHint = True
end end
object ToolButton18: TToolButton object ToolButton18: TToolButton
Left = 581 Left = 545
Top = 2 Top = 2
Caption = 'ToolButton18' Caption = 'ToolButton18'
Enabled = False Enabled = False
end end
object ToolButton1: TToolButton object ToolButton1: TToolButton
Left = 1005 Left = 969
Top = 2 Top = 2
Caption = 'ToolButton1' Caption = 'ToolButton1'
Enabled = False Enabled = False
end end
object tbFullscreen: TToolButton object tbFullscreen: TToolButton
Left = 1037 Left = 1001
Hint = 'Fullscreen' Hint = 'Fullscreen'
Top = 2 Top = 2
Caption = 'tbFullscreen' Caption = 'tbFullscreen'
@ -6584,11 +6574,6 @@ object GUIForm: TGUIForm
Caption = 'microTracker' Caption = 'microTracker'
OnClick = miToolsTrackerClick OnClick = miToolsTrackerClick
end end
object miToolsWebDebugger: TMenuItem
Caption = 'Web Debugger'
ShortCut = 24642
OnClick = miToolsWebDebuggerClick
end
object miMemoryEdit: TMenuItem object miMemoryEdit: TMenuItem
Caption = 'Read/Write Memory' Caption = 'Read/Write Memory'
OnClick = miMemoryEditClick OnClick = miMemoryEditClick

View File

@ -75,7 +75,6 @@ type
miApps816Paint: TMenuItem; miApps816Paint: TMenuItem;
miAppsPrintShop: TMenuItem; miAppsPrintShop: TMenuItem;
miAppsTerminal: TMenuItem; miAppsTerminal: TMenuItem;
miToolsWebDebugger: TMenuItem;
miToolsTracker: TMenuItem; miToolsTracker: TMenuItem;
miTools: TMenuItem; miTools: TMenuItem;
miApps: TMenuItem; miApps: TMenuItem;
@ -223,7 +222,6 @@ type
tbJoystickAxisSwitch: TToolButton; tbJoystickAxisSwitch: TToolButton;
tbCapsMode: TToolButton; tbCapsMode: TToolButton;
tbScanlines: TToolButton; tbScanlines: TToolButton;
tbWebDebugger: TToolButton;
ToolButton15: TToolButton; ToolButton15: TToolButton;
tbSpeedDown: TToolButton; tbSpeedDown: TToolButton;
tbSpeedUp: TToolButton; tbSpeedUp: TToolButton;

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -6,7 +6,7 @@ object GUIForm: TGUIForm
AllowDropFiles = True AllowDropFiles = True
AlphaBlendValue = 128 AlphaBlendValue = 128
Caption = 'microM8 GUI' Caption = 'microM8 GUI'
ClientHeight = 625 ClientHeight = 630
ClientWidth = 1078 ClientWidth = 1078
Constraints.MinWidth = 1078 Constraints.MinWidth = 1078
DoubleBuffered = False DoubleBuffered = False
@ -31,8 +31,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 = 606 Top = 607
Width = 1078 Width = 1078
Panels = <> Panels = <>
end end
@ -60,7 +60,7 @@ object GUIForm: TGUIForm
end end
object tbRMVoxels: TToolButton object tbRMVoxels: TToolButton
Tag = 1 Tag = 1
Left = 577 Left = 613
Hint = 'Voxel Render' Hint = 'Voxel Render'
Top = 2 Top = 2
Caption = 'Voxels' Caption = 'Voxels'
@ -74,7 +74,7 @@ object GUIForm: TGUIForm
Style = tbsCheck Style = tbsCheck
end end
object tbRMDots: TToolButton object tbRMDots: TToolButton
Left = 613 Left = 649
Hint = 'Dot Render' Hint = 'Dot Render'
Top = 2 Top = 2
Caption = 'Dots' Caption = 'Dots'
@ -87,7 +87,7 @@ object GUIForm: TGUIForm
end end
object tbRMRaster: TToolButton object tbRMRaster: TToolButton
Tag = 2 Tag = 2
Left = 649 Left = 685
Hint = 'Raster Render' Hint = 'Raster Render'
Top = 2 Top = 2
Caption = 'Raster' Caption = 'Raster'
@ -99,7 +99,7 @@ object GUIForm: TGUIForm
Style = tbsCheck Style = tbsCheck
end end
object tbRMColor: TToolButton object tbRMColor: TToolButton
Left = 685 Left = 721
Hint = 'Toggle Color/Mono' Hint = 'Toggle Color/Mono'
Top = 2 Top = 2
Caption = 'tbRMColor' Caption = 'tbRMColor'
@ -109,7 +109,7 @@ object GUIForm: TGUIForm
ShowHint = True ShowHint = True
end end
object tbRECState: TToolButton object tbRECState: TToolButton
Left = 753 Left = 789
Hint = 'Start Recording' Hint = 'Start Recording'
Top = 2 Top = 2
Caption = 'tbRECState' Caption = 'tbRECState'
@ -119,7 +119,7 @@ object GUIForm: TGUIForm
ShowHint = True ShowHint = True
end end
object ToolButton5: TToolButton object ToolButton5: TToolButton
Left = 789 Left = 825
Hint = 'Rewind' Hint = 'Rewind'
Top = 2 Top = 2
Caption = 'ToolButton5' Caption = 'ToolButton5'
@ -129,7 +129,7 @@ object GUIForm: TGUIForm
ShowHint = True ShowHint = True
end end
object ToolButton6: TToolButton object ToolButton6: TToolButton
Left = 825 Left = 861
Hint = 'Forwards' Hint = 'Forwards'
Top = 2 Top = 2
Caption = 'ToolButton6' Caption = 'ToolButton6'
@ -139,7 +139,7 @@ object GUIForm: TGUIForm
ShowHint = True ShowHint = True
end end
object ToolButton7: TToolButton object ToolButton7: TToolButton
Left = 861 Left = 897
Hint = 'Resume' Hint = 'Resume'
Top = 2 Top = 2
Caption = 'ToolButton7' Caption = 'ToolButton7'
@ -149,7 +149,7 @@ object GUIForm: TGUIForm
ShowHint = True ShowHint = True
end end
object ToolButton8: TToolButton object ToolButton8: TToolButton
Left = 897 Left = 933
Hint = 'Stop Recording' Hint = 'Stop Recording'
Top = 2 Top = 2
Caption = 'ToolButton8' Caption = 'ToolButton8'
@ -159,7 +159,7 @@ object GUIForm: TGUIForm
ShowHint = True ShowHint = True
end end
object ToolButton9: TToolButton object ToolButton9: TToolButton
Left = 933 Left = 969
Hint = 'Pause' Hint = 'Pause'
Top = 2 Top = 2
Caption = 'ToolButton9' Caption = 'ToolButton9'
@ -169,7 +169,7 @@ object GUIForm: TGUIForm
ShowHint = True ShowHint = True
end end
object ToolButton10: TToolButton object ToolButton10: TToolButton
Left = 721 Left = 757
Top = 2 Top = 2
Caption = 'ToolButton10' Caption = 'ToolButton10'
Enabled = False Enabled = False
@ -206,14 +206,24 @@ object GUIForm: TGUIForm
ParentShowHint = False ParentShowHint = False
ShowHint = True ShowHint = True
end end
object ToolButton15: TToolButton object tbWebDebugger: TToolButton
Left = 145 Left = 145
Hint = 'Web Debugger'
Top = 2
Caption = 'tbWebDebugger'
ImageIndex = 28
OnClick = miToolsWebDebuggerClick
ParentShowHint = False
ShowHint = True
end
object ToolButton15: TToolButton
Left = 181
Top = 2 Top = 2
Caption = 'ToolButton15' Caption = 'ToolButton15'
Enabled = False Enabled = False
end end
object tbVolDown: TToolButton object tbVolDown: TToolButton
Left = 177 Left = 213
Hint = 'Volume Down' Hint = 'Volume Down'
Top = 2 Top = 2
Caption = 'tbVolDown' Caption = 'tbVolDown'
@ -223,8 +233,8 @@ object GUIForm: TGUIForm
ShowHint = True ShowHint = True
end end
object tbMasterVolume: TTrackBar object tbMasterVolume: TTrackBar
Left = 213 Left = 249
Height = 38 Height = 32
Top = 2 Top = 2
Width = 96 Width = 96
OnChange = tbMasterVolumeChange OnChange = tbMasterVolumeChange
@ -241,7 +251,7 @@ object GUIForm: TGUIForm
TabOrder = 0 TabOrder = 0
end end
object tbVolUp: TToolButton object tbVolUp: TToolButton
Left = 309 Left = 345
Hint = 'Volume Up' Hint = 'Volume Up'
Top = 2 Top = 2
Caption = 'tbVolUp' Caption = 'tbVolUp'
@ -251,13 +261,13 @@ object GUIForm: TGUIForm
ShowHint = True ShowHint = True
end end
object ToolButton3: TToolButton object ToolButton3: TToolButton
Left = 345 Left = 381
Top = 2 Top = 2
Caption = 'ToolButton3' Caption = 'ToolButton3'
Enabled = False Enabled = False
end end
object tbSpeedDown: TToolButton object tbSpeedDown: TToolButton
Left = 377 Left = 413
Hint = 'CPU Speed Down' Hint = 'CPU Speed Down'
Top = 2 Top = 2
Caption = 'tbSpeedDown' Caption = 'tbSpeedDown'
@ -267,8 +277,8 @@ object GUIForm: TGUIForm
ShowHint = True ShowHint = True
end end
object TrackBar2: TTrackBar object TrackBar2: TTrackBar
Left = 413 Left = 449
Height = 38 Height = 32
Top = 2 Top = 2
Width = 96 Width = 96
Max = 4 Max = 4
@ -285,7 +295,7 @@ object GUIForm: TGUIForm
TabOrder = 1 TabOrder = 1
end end
object tbSpeedUp: TToolButton object tbSpeedUp: TToolButton
Left = 509 Left = 545
Hint = 'CPU Speed Up' Hint = 'CPU Speed Up'
Top = 2 Top = 2
Caption = 'tbSpeedUp' Caption = 'tbSpeedUp'
@ -295,19 +305,19 @@ object GUIForm: TGUIForm
ShowHint = True ShowHint = True
end end
object ToolButton18: TToolButton object ToolButton18: TToolButton
Left = 545 Left = 581
Top = 2 Top = 2
Caption = 'ToolButton18' Caption = 'ToolButton18'
Enabled = False Enabled = False
end end
object ToolButton1: TToolButton object ToolButton1: TToolButton
Left = 969 Left = 1005
Top = 2 Top = 2
Caption = 'ToolButton1' Caption = 'ToolButton1'
Enabled = False Enabled = False
end end
object tbFullscreen: TToolButton object tbFullscreen: TToolButton
Left = 1001 Left = 1037
Hint = 'Fullscreen' Hint = 'Fullscreen'
Top = 2 Top = 2
Caption = 'tbFullscreen' Caption = 'tbFullscreen'
@ -319,31 +329,31 @@ object GUIForm: TGUIForm
end end
object pnlContainer: TPanel object pnlContainer: TPanel
Left = 0 Left = 0
Height = 570 Height = 571
Top = 36 Top = 36
Width = 1078 Width = 1078
Align = alClient Align = alClient
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 570 ClientHeight = 571
ClientWidth = 1078 ClientWidth = 1078
ParentColor = False ParentColor = False
TabOrder = 2 TabOrder = 2
object sidecarPanel: TPanel object sidecarPanel: TPanel
Left = 908 Left = 908
Height = 533 Height = 534
Top = 0 Top = 0
Width = 170 Width = 170
Align = alRight Align = alRight
BevelOuter = bvNone BevelOuter = bvNone
Caption = 'sidecarPanel' Caption = 'sidecarPanel'
ClientHeight = 533 ClientHeight = 534
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 = 533 Height = 534
Top = 0 Top = 0
Width = 170 Width = 170
Align = alClient Align = alClient
@ -5437,12 +5447,12 @@ object GUIForm: TGUIForm
end end
object embedPanel: TPanel object embedPanel: TPanel
Left = 0 Left = 0
Height = 533 Height = 534
Top = 0 Top = 0
Width = 908 Width = 908
Align = alClient Align = alClient
BevelOuter = bvNone BevelOuter = bvNone
ClientHeight = 533 ClientHeight = 534
ClientWidth = 908 ClientWidth = 908
Color = clBlack Color = clBlack
Font.Color = clWhite Font.Color = clWhite
@ -5454,7 +5464,7 @@ object GUIForm: TGUIForm
OnMouseUp = FormMouseUp OnMouseUp = FormMouseUp
object backdrop: TImage object backdrop: TImage
Left = 0 Left = 0
Height = 533 Height = 534
Top = 0 Top = 0
Width = 908 Width = 908
Align = alClient Align = alClient
@ -5467,7 +5477,7 @@ object GUIForm: TGUIForm
object pnlMemory: TPanel object pnlMemory: TPanel
Left = 0 Left = 0
Height = 37 Height = 37
Top = 533 Top = 534
Width = 1078 Width = 1078
Align = alBottom Align = alBottom
ClientHeight = 37 ClientHeight = 37
@ -5478,7 +5488,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
@ -5488,23 +5498,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
@ -6574,6 +6584,11 @@ object GUIForm: TGUIForm
Caption = 'microTracker' Caption = 'microTracker'
OnClick = miToolsTrackerClick OnClick = miToolsTrackerClick
end end
object miToolsWebDebugger: TMenuItem
Caption = 'Web Debugger'
ShortCut = 24642
OnClick = miToolsWebDebuggerClick
end
object miMemoryEdit: TMenuItem object miMemoryEdit: TMenuItem
Caption = 'Read/Write Memory' Caption = 'Read/Write Memory'
OnClick = miMemoryEditClick OnClick = miMemoryEditClick

View File

@ -3170,6 +3170,7 @@ begin
code := MapKeyCode(Key,Shift,false); code := MapKeyCode(Key,Shift,false);
if code <> 0 then if code <> 0 then
SendKey( code, 0, 1, MapShiftState(Key, Shift) ); SendKey( code, 0, 1, MapShiftState(Key, Shift) );
Key := 0;
//StatusBar1.SimpleText := IntToStr(code) + ' ' + keydesc; //StatusBar1.SimpleText := IntToStr(code) + ' ' + keydesc;
end; end;
@ -3185,6 +3186,7 @@ begin
code := MapKeyCode(Key,Shift,true); code := MapKeyCode(Key,Shift,true);
if code <> 0 then if code <> 0 then
SendKey( code, 0, 0, MapShiftState(Key, Shift) ); SendKey( code, 0, 0, MapShiftState(Key, Shift) );
Key := 0;
//StatusBar1.SimpleText := 'keycode ' + IntToStr(Key); //StatusBar1.SimpleText := 'keycode ' + IntToStr(Key);
end; end;