From 743f44efa8a9620d4995daefa23ce7f1254435e9 Mon Sep 17 00:00:00 2001 From: April Ayres-Griffiths Date: Fri, 12 Apr 2019 19:28:52 +1000 Subject: [PATCH] vm mmune --- backup/main.lfm | 54 ++++++++++++++++++++++++++++++++++++--- backup/main.pas | 30 ++++++++++++++++++++++ backup/poc.lps | 68 ++++++++++++++++++++++++------------------------- main.lfm | 60 +++++++++++++++++++++++++++++++++++++++++-- main.pas | 30 ++++++++++++++++++++++ poc.lps | 68 ++++++++++++++++++++++++------------------------- 6 files changed, 237 insertions(+), 73 deletions(-) diff --git a/backup/main.lfm b/backup/main.lfm index bc5ac3a..e18f375 100644 --- a/backup/main.lfm +++ b/backup/main.lfm @@ -1,5 +1,5 @@ object GUIForm: TGUIForm - Left = 2271 + Left = 2270 Height = 574 Top = 247 Width = 945 @@ -182,7 +182,9 @@ object GUIForm: TGUIForm Width = 64 OnChange = tbMasterVolumeChange Position = 0 - TickStyle = tsNone + ScalePos = trBottom + TickMarks = tmBoth + TickStyle = tsManual OnKeyDown = FormKeyDown OnKeyUp = FormKeyUp TabOrder = 0 @@ -215,7 +217,9 @@ object GUIForm: TGUIForm Max = 4 OnChange = TrackBar2Change Position = 0 - TickStyle = tsNone + ScalePos = trBottom + TickMarks = tmBoth + TickStyle = tsManual OnKeyDown = FormKeyDown OnKeyUp = FormKeyUp TabOrder = 1 @@ -5423,6 +5427,50 @@ object GUIForm: TGUIForm OnClick = miIntLOGOClick end end + object miVM: TMenuItem + Caption = 'VM' + OnClick = miVMClick + object miVM1: TMenuItem + Caption = '1' + ShortCut = 24625 + OnClick = miVM1Click + end + object miVM2: TMenuItem + Caption = '2' + ShortCut = 24626 + OnClick = miVM1Click + end + object miVM3: TMenuItem + Caption = '3' + ShortCut = 24627 + OnClick = miVM1Click + end + object miVM4: TMenuItem + Caption = '4' + ShortCut = 24628 + OnClick = miVM1Click + end + object miVM5: TMenuItem + Caption = '5' + ShortCut = 24629 + OnClick = miVM1Click + end + object miVM6: TMenuItem + Caption = '6' + ShortCut = 24630 + OnClick = miVM1Click + end + object miVM7: TMenuItem + Caption = '7' + ShortCut = 24631 + OnClick = miVM1Click + end + object miVM8: TMenuItem + Caption = '8' + ShortCut = 24632 + OnClick = miVM1Click + end + end object N7: TMenuItem Caption = '-' end diff --git a/backup/main.pas b/backup/main.pas index 550aa31..d2e420f 100644 --- a/backup/main.pas +++ b/backup/main.pas @@ -24,6 +24,15 @@ type MenuItem14: TMenuItem; MenuItem17: TMenuItem; MenuItem18: TMenuItem; + miVM8: TMenuItem; + miVM7: TMenuItem; + miVM6: TMenuItem; + miVM5: TMenuItem; + miVM4: TMenuItem; + miVM3: TMenuItem; + miVM2: TMenuItem; + miVM1: TMenuItem; + miVM: TMenuItem; miApps816Paint: TMenuItem; miAppsPrintShop: TMenuItem; miAppsTerminal: TMenuItem; @@ -405,6 +414,8 @@ type procedure miVCRClick(Sender: TObject); procedure miVD1Click(Sender: TObject); procedure miVDClick(Sender: TObject); + procedure miVM1Click(Sender: TObject); + procedure miVMClick(Sender: TObject); procedure miWarp25Click(Sender: TObject); procedure MouseTimerTimer(Sender: TObject); procedure sidecarPanelResize(Sender: TObject); @@ -1499,6 +1510,25 @@ begin end; end; +procedure TGUIForm.miVM1Click(Sender: TObject); +begin + SimpleGet(baseUrl+'/api/control/vm/'+TMenuItem(sender).Caption); +end; + +procedure TGUIForm.miVMClick(Sender: TObject); +begin + case SimpleGet( baseUrl+'/api/control/vm' ) of + '1': miVM1.Checked := true; + '2': miVM2.Checked := true; + '3': miVM3.Checked := true; + '4': miVM4.Checked := true; + '5': miVM5.Checked := true; + '6': miVM6.Checked := true; + '7': miVM7.Checked := true; + '8': miVM8.Checked := true; + end; +end; + procedure TGUIForm.miWarp25Click(Sender: TObject); begin UpdateConfig( 'hardware/current.cpu.warp', TMenuItem(sender).Caption, false); diff --git a/backup/poc.lps b/backup/poc.lps index d418b77..1d34234 100644 --- a/backup/poc.lps +++ b/backup/poc.lps @@ -21,8 +21,8 @@ - - + + @@ -36,136 +36,136 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/main.lfm b/main.lfm index 3eab31f..cdd6f1e 100644 --- a/main.lfm +++ b/main.lfm @@ -182,7 +182,9 @@ object GUIForm: TGUIForm Width = 64 OnChange = tbMasterVolumeChange Position = 0 - TickStyle = tsNone + ScalePos = trBottom + TickMarks = tmBoth + TickStyle = tsManual OnKeyDown = FormKeyDown OnKeyUp = FormKeyUp TabOrder = 0 @@ -215,7 +217,9 @@ object GUIForm: TGUIForm Max = 4 OnChange = TrackBar2Change Position = 0 - TickStyle = tsNone + ScalePos = trBottom + TickMarks = tmBoth + TickStyle = tsManual OnKeyDown = FormKeyDown OnKeyUp = FormKeyUp TabOrder = 1 @@ -5423,6 +5427,58 @@ object GUIForm: TGUIForm OnClick = miIntLOGOClick end end + object miVM: TMenuItem + Caption = 'VM' + OnClick = miVMClick + object miVM1: TMenuItem + Caption = '1' + RadioItem = True + ShortCut = 24625 + OnClick = miVM1Click + end + object miVM2: TMenuItem + Caption = '2' + RadioItem = True + ShortCut = 24626 + OnClick = miVM1Click + end + object miVM3: TMenuItem + Caption = '3' + RadioItem = True + ShortCut = 24627 + OnClick = miVM1Click + end + object miVM4: TMenuItem + Caption = '4' + RadioItem = True + ShortCut = 24628 + OnClick = miVM1Click + end + object miVM5: TMenuItem + Caption = '5' + RadioItem = True + ShortCut = 24629 + OnClick = miVM1Click + end + object miVM6: TMenuItem + Caption = '6' + RadioItem = True + ShortCut = 24630 + OnClick = miVM1Click + end + object miVM7: TMenuItem + Caption = '7' + RadioItem = True + ShortCut = 24631 + OnClick = miVM1Click + end + object miVM8: TMenuItem + Caption = '8' + RadioItem = True + ShortCut = 24632 + OnClick = miVM1Click + end + end object N7: TMenuItem Caption = '-' end diff --git a/main.pas b/main.pas index 550aa31..d2e420f 100644 --- a/main.pas +++ b/main.pas @@ -24,6 +24,15 @@ type MenuItem14: TMenuItem; MenuItem17: TMenuItem; MenuItem18: TMenuItem; + miVM8: TMenuItem; + miVM7: TMenuItem; + miVM6: TMenuItem; + miVM5: TMenuItem; + miVM4: TMenuItem; + miVM3: TMenuItem; + miVM2: TMenuItem; + miVM1: TMenuItem; + miVM: TMenuItem; miApps816Paint: TMenuItem; miAppsPrintShop: TMenuItem; miAppsTerminal: TMenuItem; @@ -405,6 +414,8 @@ type procedure miVCRClick(Sender: TObject); procedure miVD1Click(Sender: TObject); procedure miVDClick(Sender: TObject); + procedure miVM1Click(Sender: TObject); + procedure miVMClick(Sender: TObject); procedure miWarp25Click(Sender: TObject); procedure MouseTimerTimer(Sender: TObject); procedure sidecarPanelResize(Sender: TObject); @@ -1499,6 +1510,25 @@ begin end; end; +procedure TGUIForm.miVM1Click(Sender: TObject); +begin + SimpleGet(baseUrl+'/api/control/vm/'+TMenuItem(sender).Caption); +end; + +procedure TGUIForm.miVMClick(Sender: TObject); +begin + case SimpleGet( baseUrl+'/api/control/vm' ) of + '1': miVM1.Checked := true; + '2': miVM2.Checked := true; + '3': miVM3.Checked := true; + '4': miVM4.Checked := true; + '5': miVM5.Checked := true; + '6': miVM6.Checked := true; + '7': miVM7.Checked := true; + '8': miVM8.Checked := true; + end; +end; + procedure TGUIForm.miWarp25Click(Sender: TObject); begin UpdateConfig( 'hardware/current.cpu.warp', TMenuItem(sender).Caption, false); diff --git a/poc.lps b/poc.lps index 288cf57..a647d7d 100644 --- a/poc.lps +++ b/poc.lps @@ -21,8 +21,8 @@ - - + + @@ -36,136 +36,136 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - +