Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix minor issues with the Easy Setup dialog. #484

Merged
merged 2 commits into from
Jul 25, 2023
Merged

Fix minor issues with the Easy Setup dialog. #484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f4a7eb
Fix minor issues with the Easy Setup dialog.
tmiw Jul 25, 2023
2befdfd
Add PR #484 to changelog.
tmiw Jul 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions USER_MANUAL.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -891,6 +891,7 @@ LDPC | Low Density Parity Check Codes - a family of powerful FEC codes
1. Bugfixes:
* Fix bug preventing proper Options window sizing on Windows. (PR #478)
* Fix various screen reader accessibility issues. (PR #481)
* Fix minor UI issues with the Easy Setup dialog. (PR #484)
2. Build system:
* Update Codec2 to v1.2.0. (PR #483)
3. Cleanup:
Expand Down
11 changes: 9 additions & 2 deletions src/dlg_easy_setup.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,8 @@ EasySetupDialog::EasySetupDialog(wxWindow* parent, wxWindowID id, const wxString
m_cbPttMethod->Append(wxT("CAT"));
m_cbPttMethod->Append(wxT("RTS"));
m_cbPttMethod->Append(wxT("DTR"));

m_cbPttMethod->SetSelection(0);

/* Serial port box */
m_serialBox = new wxStaticBox(setupCatControlBox, wxID_ANY, _("Serial PTT"));
m_serialBox->Hide();
Expand Down Expand Up @@ -239,7 +240,7 @@ EasySetupDialog::EasySetupDialog(wxWindow* parent, wxWindowID id, const wxString
m_txt_callsign = new wxTextCtrl(setupPskReporterBox, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(90,-1), 0, wxTextValidator(wxFILTER_ALPHANUMERIC));
sbSizer_psk->Add(m_txt_callsign, 0, wxALL | wxALIGN_CENTER_VERTICAL, 2);

wxStaticText* labelPskGridSquare = new wxStaticText(setupPskReporterBox, wxID_ANY, wxT("Grid Square: "), wxDefaultPosition, wxDefaultSize, 0);
wxStaticText* labelPskGridSquare = new wxStaticText(setupPskReporterBox, wxID_ANY, wxT("Grid Square/Locator: "), wxDefaultPosition, wxDefaultSize, 0);
sbSizer_psk->Add(labelPskGridSquare, 0, wxALL | wxALIGN_CENTER_VERTICAL, 2);

m_txt_grid_square = new wxTextCtrl(setupPskReporterBox, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(80,-1), 0, wxTextValidator(wxFILTER_ALPHANUMERIC));
Expand Down Expand Up @@ -636,6 +637,12 @@ void EasySetupDialog::resetIcomCIVStatus_()
{
m_stIcomCIVHex->Show();
m_tcIcomCIVHex->Show();

// Load existing CIV address so we can make sure we get the default.
if (m_tcIcomCIVHex->GetValue().length() == 0)
{
m_tcIcomCIVHex->SetValue(wxString::Format(wxT("%02X"), wxGetApp().appConfiguration.rigControlConfiguration.hamlibIcomCIVAddress.get()));
}
}
else
{
Expand Down