Skip to content

Commit

Permalink
Merge pull request #71 from jeremiah-k/installer-sizing-fix
Browse files Browse the repository at this point in the history
Installer sizing fix
  • Loading branch information
jeremiah-k authored Jul 3, 2024
2 parents 1ab9662 + 0cd2781 commit a487ada
Showing 1 changed file with 28 additions and 11 deletions.
39 changes: 28 additions & 11 deletions mmrelay.iss
Original file line number Diff line number Diff line change
Expand Up @@ -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:';
Expand All @@ -88,27 +88,44 @@ 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)';
MeshtasticPage.Edits[2].Hint := 'hostname/IP (if network)';
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)';
OptionsPage.Add('Detailed logging');
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;
Expand Down Expand Up @@ -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;
end;

0 comments on commit a487ada

Please sign in to comment.