diff --git a/CMakeLists.txt b/CMakeLists.txt index fc4652b..e64fa45 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/") SET(CUBICSDR_VERSION_MAJOR "0") SET(CUBICSDR_VERSION_MINOR "1") -SET(CUBICSDR_VERSION_PATCH "23") +SET(CUBICSDR_VERSION_PATCH "24") SET(CUBICSDR_VERSION_REL "alpha") SET(CUBICSDR_VERSION "${CUBICSDR_VERSION_MAJOR}.${CUBICSDR_VERSION_MINOR}.${CUBICSDR_VERSION_PATCH}-${CUBICSDR_VERSION_REL}") diff --git a/src/forms/SDRDevices/SDRDeviceAdd.fbp b/src/forms/SDRDevices/SDRDeviceAdd.fbp index c89620a..cf01ab2 100644 --- a/src/forms/SDRDevices/SDRDeviceAdd.fbp +++ b/src/forms/SDRDevices/SDRDeviceAdd.fbp @@ -44,7 +44,7 @@ SDRDeviceAddForm - 395,241 + 395,293 wxDEFAULT_DIALOG_STYLE Add SoapySDR Device @@ -94,7 +94,7 @@ wxVERTICAL none - 10 + 8 wxALL 0 @@ -187,7 +187,7 @@ - 10 + 8 wxALL 0 @@ -285,7 +285,7 @@ - 10 + 8 wxALL 0 @@ -368,7 +368,7 @@ - 10 + 8 wxALL|wxEXPAND 0 @@ -428,7 +428,7 @@ - + wxHSCROLL @@ -469,7 +469,7 @@ - 5 + 8 wxEXPAND 1 @@ -488,7 +488,7 @@ - 5 + 2 wxALL 0 @@ -576,7 +576,7 @@ - 5 + 2 wxALL 0 diff --git a/src/forms/SDRDevices/SDRDeviceAddForm.cpp b/src/forms/SDRDevices/SDRDeviceAddForm.cpp index 1903ae3..6230a9d 100644 --- a/src/forms/SDRDevices/SDRDeviceAddForm.cpp +++ b/src/forms/SDRDevices/SDRDeviceAddForm.cpp @@ -18,7 +18,7 @@ SDRDeviceAddForm::SDRDeviceAddForm( wxWindow* parent, wxWindowID id, const wxStr m_staticText4 = new wxStaticText( this, wxID_ANY, wxT("Manually add a SoapyRemote or SoapySDR device. \n\nUseful for a device that is not detected automatically."), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText4->Wrap( -1 ); - bSizer6->Add( m_staticText4, 0, wxALL, 10 ); + bSizer6->Add( m_staticText4, 0, wxALL, 8 ); bSizer6->Add( 0, 0, 1, wxEXPAND, 5 ); @@ -26,17 +26,17 @@ SDRDeviceAddForm::SDRDeviceAddForm( wxWindow* parent, wxWindowID id, const wxStr wxArrayString m_soapyModuleChoices; m_soapyModule = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_soapyModuleChoices, 0 ); m_soapyModule->SetSelection( 0 ); - bSizer6->Add( m_soapyModule, 0, wxALL, 10 ); + bSizer6->Add( m_soapyModule, 0, wxALL, 8 ); bSizer6->Add( 0, 0, 1, wxEXPAND, 5 ); m_paramLabel = new wxStaticText( this, wxID_ANY, wxT(""), wxDefaultPosition, wxDefaultSize, 0 ); m_paramLabel->Wrap( -1 ); - bSizer6->Add( m_paramLabel, 0, wxALL, 10 ); + bSizer6->Add( m_paramLabel, 0, wxALL, 8 ); - m_paramText = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_DONTWRAP ); - bSizer6->Add( m_paramText, 0, wxALL|wxEXPAND, 10 ); + m_paramText = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_DONTWRAP|wxHSCROLL ); + bSizer6->Add( m_paramText, 0, wxALL|wxEXPAND, 8 ); bSizer6->Add( 0, 0, 1, wxEXPAND, 5 ); @@ -48,13 +48,13 @@ SDRDeviceAddForm::SDRDeviceAddForm( wxWindow* parent, wxWindowID id, const wxStr bSizer7->Add( 0, 0, 1, wxEXPAND, 5 ); m_cancelButton = new wxButton( this, wxID_ANY, wxT("Cancel"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer7->Add( m_cancelButton, 0, wxALL, 5 ); + bSizer7->Add( m_cancelButton, 0, wxALL, 2 ); m_OkButton = new wxButton( this, wxID_ANY, wxT("Ok"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer7->Add( m_OkButton, 0, wxALL, 5 ); + bSizer7->Add( m_OkButton, 0, wxALL, 2 ); - bSizer6->Add( bSizer7, 1, wxEXPAND, 5 ); + bSizer6->Add( bSizer7, 1, wxEXPAND, 8 ); bSizer6->Add( 0, 0, 1, wxEXPAND, 5 ); diff --git a/src/forms/SDRDevices/SDRDeviceAddForm.h b/src/forms/SDRDevices/SDRDeviceAddForm.h index fd0bc73..58ffa20 100644 --- a/src/forms/SDRDevices/SDRDeviceAddForm.h +++ b/src/forms/SDRDevices/SDRDeviceAddForm.h @@ -48,7 +48,7 @@ class SDRDeviceAddForm : public wxDialog public: - SDRDeviceAddForm( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Add SoapySDR Device"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 395,241 ), long style = wxDEFAULT_DIALOG_STYLE ); + SDRDeviceAddForm( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Add SoapySDR Device"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 395,293 ), long style = wxDEFAULT_DIALOG_STYLE ); ~SDRDeviceAddForm(); };