Skip to content

Commit

Permalink
Remove small screen limitation, allow more/less to work on Android. R…
Browse files Browse the repository at this point in the history 
…emove GRMN mode checkbox from network connections. Remove SignalK server discovery controls. When selecting UDP, if both Input and Output are checked, uncheck output. Do not allow both Input/Output at same time.
  • Loading branch information
@wholybee
wholybee committed Apr 20, 2024
1 parent b459d8f commit 349d276
Showing 1 changed file with 35 additions and 26 deletions.
61 changes: 35 additions & 26 deletions gui/src/connection_edit.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ void ConnectionEditDialog::Init() {
LESS += "...</span>";

// For small displays, skip the "More" text.
if (g_Platform->getDisplaySize().x < 80 * GetCharWidth()) MORE = "";
// if (g_Platform->getDisplaySize().x < 80 * GetCharWidth()) MORE = "";


// Setup some inital values
Expand Down Expand Up @@ -525,8 +525,8 @@ void ConnectionEditDialog::Init() {
m_stNetAddr = new wxStaticText(m_scrolledwin, wxID_ANY, _("Address"),
wxDefaultPosition, wxDefaultSize, 0);
m_stNetAddr->Wrap(-1);
int column1Width = 16 * m_stNetProto->GetCharWidth();
m_stNetAddr->SetMinSize(wxSize(column1Width, -1));
int column1width = 16 * m_stNetProto->GetCharWidth();
m_stNetAddr->SetMinSize(wxSize(column1width, -1));
gSizerNetProps->Add(m_stNetAddr, 0, wxALL, 5);

m_tNetAddress = new wxTextCtrl(m_scrolledwin, wxID_ANY, wxEmptyString,
Expand All @@ -550,19 +550,6 @@ void ConnectionEditDialog::Init() {
gSizerNetProps->AddSpacer(1);
gSizerNetProps->AddSpacer(1);

// Authentication token
m_stAuthToken = new wxStaticText(m_scrolledwin, wxID_ANY, _("Auth Token"),
wxDefaultPosition, wxDefaultSize, 0);
m_stAuthToken->Wrap(-1);
gSizerNetProps->Add(m_stAuthToken, 0, wxALL, 5);
m_stAuthToken->Hide();

m_tAuthToken = new wxTextCtrl(m_scrolledwin, wxID_ANY, wxEmptyString,
wxDefaultPosition, wxDefaultSize, 0);
gSizerNetProps->Add(m_tAuthToken, 1, wxEXPAND | wxTOP, 5);
gSizerNetProps->AddSpacer(1);
gSizerNetProps->AddSpacer(1);
m_tAuthToken->Hide();


gSizerCanProps = new wxGridSizer(0, 1, 0, 0);
Expand All @@ -576,7 +563,7 @@ void ConnectionEditDialog::Init() {
m_stCANSource = new wxStaticText(m_scrolledwin, wxID_ANY, _("socketCAN Source"),
wxDefaultPosition, wxDefaultSize, 0);
m_stCANSource->Wrap(-1);
m_stCANSource->SetMinSize(wxSize(column1Width, -1));
m_stCANSource->SetMinSize(wxSize(column1width, -1));
fgSizer1C->Add(m_stCANSource, 0, wxALL, 5);

wxArrayString choices = GetAvailableSocketCANInterfaces();
Expand Down Expand Up @@ -604,7 +591,7 @@ void ConnectionEditDialog::Init() {
m_stSerPort =
new wxStaticText(m_scrolledwin, wxID_ANY, _("Data port"),
wxDefaultPosition, wxDefaultSize, wxST_ELLIPSIZE_END);
m_stSerPort->SetMinSize(wxSize(column1Width, -1));
m_stSerPort->SetMinSize(wxSize(column1width, -1));
m_stSerPort->Wrap(-1);

fgSizer1->Add(m_stSerPort, 0, wxALL, 5);
Expand Down Expand Up @@ -671,7 +658,7 @@ void ConnectionEditDialog::Init() {
m_stNetComment = new wxStaticText(m_scrolledwin, wxID_ANY, _("User Comment"),
wxDefaultPosition, wxDefaultSize, 0);
m_stNetComment->Wrap(-1);
m_stNetComment->SetMinSize(wxSize(column1Width, -1));
m_stNetComment->SetMinSize(wxSize(column1width, -1));
commentSizer->Add(m_stNetComment, 0, wxALL, 5);

m_tNetComment = new wxTextCtrl(m_scrolledwin, wxID_ANY, wxEmptyString,
Expand All @@ -686,7 +673,7 @@ void ConnectionEditDialog::Init() {
m_stSerialComment = new wxStaticText(m_scrolledwin, wxID_ANY, _("User Comment"),
wxDefaultPosition, wxDefaultSize, 0);
m_stSerialComment->Wrap(-1);
m_stSerialComment->SetMinSize(wxSize(column1Width, -1));
m_stSerialComment->SetMinSize(wxSize(column1width, -1));
commentSizer->Add(m_stSerialComment, 0, wxALL, 5);

m_tSerialComment = new wxTextCtrl(m_scrolledwin, wxID_ANY, wxEmptyString,
Expand Down Expand Up @@ -738,6 +725,23 @@ void ConnectionEditDialog::Init() {
fgSizer5->Add(m_cbOutput, 0, wxALL, 2);
fgSizer5->AddSpacer(1);

// Authentication token

m_stAuthToken = new wxStaticText(m_scrolledwin, wxID_ANY, _("Auth Token"),
wxDefaultPosition, wxDefaultSize, 0);
m_stAuthToken->SetMinSize(wxSize(column1width, -1));
m_stAuthToken->Wrap(-1);
fgSizer5->Add(m_stAuthToken, 0, wxALL, 5);
m_stAuthToken->Hide();

m_tAuthToken = new wxTextCtrl(m_scrolledwin, wxID_ANY, wxEmptyString,
wxDefaultPosition, wxDefaultSize, 0);
m_tAuthToken->SetMinSize(wxSize(column2width, -1));
fgSizer5->Add(m_tAuthToken, 1, wxEXPAND | wxTOP, 5);

m_tAuthToken->Hide();


m_cbCheckCRC = new wxCheckBox(m_scrolledwin, wxID_ANY, _("Control checksum"),
wxDefaultPosition, wxDefaultSize, 0);
m_cbCheckCRC->SetValue(TRUE);
Expand Down Expand Up @@ -765,9 +769,9 @@ void ConnectionEditDialog::Init() {
wxDefaultPosition, wxDefaultSize, 0);
m_cbMultiCast->SetValue(FALSE);
// m_cbMultiCast->SetToolTip(_("Advanced Use Only. Enable UDP Multicast."));

fgSizer5->Add(m_cbMultiCast, 0, wxALL, 2);
fgSizer5->AddSpacer(1);
// Don't use Multicast for now
// fgSizer5->Add(m_cbMultiCast, 0, wxALL, 2);
// fgSizer5->AddSpacer(1);

m_stTalkerIdText = new wxStaticText(
m_scrolledwin, wxID_ANY,
Expand Down Expand Up @@ -808,13 +812,14 @@ void ConnectionEditDialog::Init() {
m_cbCheckSKDiscover->SetValue(TRUE);
m_cbCheckSKDiscover->SetToolTip(
_("If checked, signal K server will be discovered automatically"));
fgSizer5->Add(m_cbCheckSKDiscover, 0, wxALL, 2);
// Disabled until actually working.
// fgSizer5->Add(m_cbCheckSKDiscover, 0, wxALL, 2);

// signal K "Discover now" button
m_ButtonSKDiscover = new wxButton(m_scrolledwin, wxID_ANY, _("Discover now..."),
wxDefaultPosition, wxDefaultSize, 0);
m_ButtonSKDiscover->Hide();
fgSizer5->Add(m_ButtonSKDiscover, 0, wxALL, 2);
// fgSizer5->Add(m_ButtonSKDiscover, 0, wxALL, 2);

// signalK Server Status
m_StaticTextSKServerStatus = new wxStaticText(
Expand Down Expand Up @@ -1148,6 +1153,7 @@ void ConnectionEditDialog::ShowNMEANet(bool visible) {
m_tNetComment->Show(visible);
m_stAuthToken->Show(visible);
m_tAuthToken->Show(visible);
m_cbGarminHost->Hide();
}

void ConnectionEditDialog::ShowNMEASerial(bool visible) {
Expand Down Expand Up @@ -1450,6 +1456,7 @@ void ConnectionEditDialog::SetDSFormOptionVizStates(void) {
m_StaticTextSKServerStatus->Hide();
m_stNetDataProtocol->Show();
m_choiceNetDataProtocol->Show();
m_cbGarminHost->Hide();

if (m_rbNetProtoUDP->GetValue()) m_cbMultiCast->Show(advanced);

Expand All @@ -1473,7 +1480,7 @@ void ConnectionEditDialog::SetDSFormOptionVizStates(void) {
m_choicePrecision->Show(advanced);
m_stTalkerIdText->Show(advanced);
m_TalkerIdText->Show(advanced);
m_cbGarminHost->Show(advanced);
// m_cbGarminHost->Show(advanced);
m_stPrecision->Enable(m_cbOutput->IsChecked() && advanced);
m_choicePrecision->Enable(m_cbOutput->IsChecked() && advanced);
m_stTalkerIdText->Enable(m_cbOutput->IsChecked() && advanced);
Expand Down Expand Up @@ -1875,6 +1882,8 @@ void ConnectionEditDialog::OnNetProtocolSelected(wxCommandEvent& event) {
m_tNetAddress->SetValue(DEFAULT_IP_ADDRESS);
if (m_cbInput->GetValue() && !m_cbMultiCast->GetValue() && m_rbNetProtoUDP->GetValue())
m_tNetAddress->SetValue(DEFAULT_IP_ADDRESS);
if (m_cbInput->GetValue() && m_cbOutput->GetValue())
m_cbOutput->SetValue(false);

} else if (m_rbNetProtoSignalK->GetValue()) {
if (IsDefaultPort(m_tNetPort->GetValue())) {
Expand Down

0 comments on commit 349d276

Please sign in to comment.