From 2dcc702e6f1c5cff0514270be6a96f620297b1b9 Mon Sep 17 00:00:00 2001 From: Jeremiah K <17190268+jeremiah-k@users.noreply.github.com> Date: Wed, 3 Jul 2024 13:47:47 -0500 Subject: [PATCH 1/2] trying AdjustPageElements --- mmrelay.iss | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/mmrelay.iss b/mmrelay.iss index f132943..a585528 100644 --- a/mmrelay.iss +++ b/mmrelay.iss @@ -109,6 +109,23 @@ begin OptionsPage.Add('Radio broadcasts enabled'); OptionsPage.Values[0] := True; OptionsPage.Values[1] := True; + + // Adjust the layout to add more space between elements + AdjustPageElements(MatrixPage); + AdjustPageElements(MeshtasticPage); + AdjustPageElements(MatrixMeshtasticPage); +end; + +procedure AdjustPageElements(Page: TInputQueryWizardPage); +var + i, NewTop: Integer; +begin + NewTop := 0; + for i := 0 to Page.Edits.Count - 1 do + begin + Page.Edits[i].Top := NewTop; + NewTop := NewTop + Page.Edits[i].Height + 12; // Add more space between elements + end; end; function BoolToStr(Value : Boolean): String; @@ -195,4 +212,4 @@ begin begin MsgBox('Could not create batch file "relay.bat". Close any applications that may have it open and re-run setup', mbInformation, MB_OK); end; -end; \ No newline at end of file +end; From 0cd27818b27b1c4b4e27e9486a8ea1b79a3f6098 Mon Sep 17 00:00:00 2001 From: Jeremiah K <17190268+jeremiah-k@users.noreply.github.com> Date: Wed, 3 Jul 2024 13:49:39 -0500 Subject: [PATCH 2/2] Uniform capitalization --- mmrelay.iss | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/mmrelay.iss b/mmrelay.iss index a585528..78b8be5 100644 --- a/mmrelay.iss +++ b/mmrelay.iss @@ -64,9 +64,9 @@ begin OverwriteConfig.Add('Generate configuration (overwrite any current config files)'); OverwriteConfig.Values[0] := False; - MatrixPage.Add('Homeserver: (example: https://matrix.org)', False); - MatrixPage.Add('Bot User ID (example: @mybotuser:matrix.org)', False); - MatrixPage.Add('Access Token (example: syt_bWvzaGjvdD1_PwsXoZgGItImVxBIZbBK_1XZVW8)', False); + MatrixPage.Add('Homeserver (example: https://matrix.org):', False); + MatrixPage.Add('Bot user ID (example: @mybotuser:matrix.org):', False); + MatrixPage.Add('Access token (example: syt_bWvzaGjvdD1_PwsXoZgGItImVxBIZbBK_1XZVW8):', False); TokenInfoLabel := TLabel.Create(WizardForm); TokenInfoLabel.Caption := 'For instructions on where to find your access token, visit:'; @@ -88,11 +88,11 @@ begin MatrixPage.Edits[1].Hint := '@botuser:example.matrix.org'; MatrixPage.Edits[2].Hint := 'reaalllllyloooooongsecretttttcodeeeeeeforrrrbot'; - MeshtasticPage.Add('Connection Type (network, serial, or ble)?', False); - MeshtasticPage.Add('Serial Port (if serial):', False); - MeshtasticPage.Add('Hostname/IP (If network):', False); - MeshtasticPage.Add('BLE Address/Name (if ble):', False); - MeshtasticPage.Add('Meshnet Name:', False); + MeshtasticPage.Add('Connection type (network, serial, or ble):', False); + MeshtasticPage.Add('Serial port (if serial):', False); + MeshtasticPage.Add('Hostname/IP (if network):', False); + MeshtasticPage.Add('BLE address/name (if ble):', False); + MeshtasticPage.Add('Meshnet name:', False); MeshtasticPage.Edits[0].Hint := 'network, serial, or ble'; MeshtasticPage.Edits[1].Hint := 'serial port (if serial)'; @@ -100,8 +100,8 @@ begin MeshtasticPage.Edits[3].Hint := 'BLE address or name (if ble)'; MeshtasticPage.Edits[4].Hint := 'Name for radio Meshnet'; - MatrixMeshtasticPage.Add('Matrix Room ID/Alias (example: #someroom:example.matrix.org)', False); - MatrixMeshtasticPage.Add('Meshtastic Channel # (0 is Primary, 1-7 Secondary)', False); + MatrixMeshtasticPage.Add('Matrix room ID/alias (example: #someroom:example.matrix.org):', False); + MatrixMeshtasticPage.Add('Meshtastic channel # (0 is primary, 1-7 secondary):', False); MatrixMeshtasticPage.Edits[0].Hint := '!someroomid:example.matrix.org'; MatrixMeshtasticPage.Edits[1].Hint := '0-7 (default 0)';