From 82aa2df3b4c37b76a89f276bdd795056a0a852b8 Mon Sep 17 00:00:00 2001 From: April Ayres-Griffiths Date: Mon, 15 Apr 2019 20:03:44 +1000 Subject: [PATCH] update menu order --- backup/main.pas | 15 +- backup/poc.lps | 388 +++++++++++++++++++------------------- main.lfm | 486 ++++++++++++++++++++++++------------------------ poc.lps | 70 +++---- 4 files changed, 480 insertions(+), 479 deletions(-) diff --git a/backup/main.pas b/backup/main.pas index 75d53b4..294cacd 100644 --- a/backup/main.pas +++ b/backup/main.pas @@ -2459,13 +2459,14 @@ begin if path = 'hardware/current.cpu.warp' then begin - case value of - '0.25': TrackBar2.Position := 0; - '0.50': TrackBar2.Position := 1; - '1.00': TrackBar2.Position := 2; - '2.00': TrackBar2.Position := 3; - '4.00': TrackBar2.Position := 4; - end; + d := StrToFloat(value); + case Round(d * 100) of + 25: WarpPosition := 0; + 50: WarpPosition := 1; + 100: WarpPosition := 2; + 200: WarpPosition := 3; + 400: WarpPosition := 4; + end; end; //self.StatusBar1.SimpleText:=json; diff --git a/backup/poc.lps b/backup/poc.lps index 6a1ad5b..825d4ba 100644 --- a/backup/poc.lps +++ b/backup/poc.lps @@ -1,194 +1,194 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/main.lfm b/main.lfm index e9ed6f8..e770c3b 100644 --- a/main.lfm +++ b/main.lfm @@ -5764,6 +5764,249 @@ object GUIForm: TGUIForm OnClick = MenuItem2Click 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 Caption = 'Video' object miScanLineInt: TMenuItem @@ -6157,249 +6400,6 @@ object GUIForm: TGUIForm OnClick = miPasteTextClick 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 Caption = 'Hardware' object miSerial: TMenuItem diff --git a/poc.lps b/poc.lps index 825d4ba..8128275 100644 --- a/poc.lps +++ b/poc.lps @@ -21,8 +21,8 @@ - - + + @@ -43,7 +43,7 @@ - + @@ -51,7 +51,7 @@ - + @@ -61,129 +61,129 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - +