diff --git a/CMakeLists.txt b/CMakeLists.txt index d82e51a..2984acc 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 "2") -SET(CUBICSDR_VERSION_PATCH "3") +SET(CUBICSDR_VERSION_PATCH "4") SET(CUBICSDR_VERSION_SUFFIX "") SET(CUBICSDR_VERSION "${CUBICSDR_VERSION_MAJOR}.${CUBICSDR_VERSION_MINOR}.${CUBICSDR_VERSION_PATCH}${CUBICSDR_VERSION_SUFFIX}") diff --git a/src/forms/Dialog/AboutDialog.fbp b/src/forms/Dialog/AboutDialog.fbp index 3d91594..d94fe1f 100644 --- a/src/forms/Dialog/AboutDialog.fbp +++ b/src/forms/Dialog/AboutDialog.fbp @@ -6949,6 +6949,421 @@ + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Erfurter Feurblume + + 0 + + + 0 + + 1 + m_dErfurterFeurblume + 1 + + + protected + 1 + + Resizable + 1 + + + ; forward_declare + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Makarenko Aleksey + + 0 + + + 0 + + 1 + m_dMakarenkoAleksey + 1 + + + protected + 1 + + Resizable + 1 + + + ; forward_declare + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Anthony Lambiris + + 0 + + + 0 + + 1 + m_dAnthonyLambiris + 1 + + + protected + 1 + + Resizable + 1 + + + ; forward_declare + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Joe Burtinsky + + 0 + + + 0 + + 1 + m_dJoeBurtinsky + 1 + + + protected + 1 + + Resizable + 1 + + + ; forward_declare + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Dale Puckett + + 0 + + + 0 + + 1 + m_dDalePuckett + 1 + + + protected + 1 + + Resizable + 1 + + + ; forward_declare + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/forms/Dialog/AboutDialogBase.cpp b/src/forms/Dialog/AboutDialogBase.cpp index fd26f24..ae974d2 100644 --- a/src/forms/Dialog/AboutDialogBase.cpp +++ b/src/forms/Dialog/AboutDialogBase.cpp @@ -385,6 +385,32 @@ AboutDialogBase::AboutDialogBase( wxWindow* parent, wxWindowID id, const wxStrin m_dMarvinCalvert->Wrap( -1 ); m_dSizer->Add( m_dMarvinCalvert, 0, wxALL, 5 ); + m_dErfurterFeurblume = new wxStaticText( m_dScroll, wxID_ANY, wxT("Erfurter Feurblume"), wxDefaultPosition, wxDefaultSize, 0 ); + m_dErfurterFeurblume->Wrap( -1 ); + m_dSizer->Add( m_dErfurterFeurblume, 0, wxALL, 5 ); + + m_dMakarenkoAleksey = new wxStaticText( m_dScroll, wxID_ANY, wxT("Makarenko Aleksey"), wxDefaultPosition, wxDefaultSize, 0 ); + m_dMakarenkoAleksey->Wrap( -1 ); + m_dSizer->Add( m_dMakarenkoAleksey, 0, wxALL, 5 ); + + m_dAnthonyLambiris = new wxStaticText( m_dScroll, wxID_ANY, wxT("Anthony Lambiris"), wxDefaultPosition, wxDefaultSize, 0 ); + m_dAnthonyLambiris->Wrap( -1 ); + m_dSizer->Add( m_dAnthonyLambiris, 0, wxALL, 5 ); + + m_dJoeBurtinsky = new wxStaticText( m_dScroll, wxID_ANY, wxT("Joe Burtinsky"), wxDefaultPosition, wxDefaultSize, 0 ); + m_dJoeBurtinsky->Wrap( -1 ); + m_dSizer->Add( m_dJoeBurtinsky, 0, wxALL, 5 ); + + m_dDalePuckett + + = new wxStaticText( m_dScroll, wxID_ANY, wxT("Dale Puckett"), wxDefaultPosition, wxDefaultSize, 0 ); + m_dDalePuckett + + ->Wrap( -1 ); + m_dSizer->Add( m_dDalePuckett + + , 0, wxALL, 5 ); + m_dBSizer->Add( m_dSizer, 1, wxALL|wxEXPAND, 5 ); diff --git a/src/forms/Dialog/AboutDialogBase.h b/src/forms/Dialog/AboutDialogBase.h index a6b9cbd..2021d1d 100644 --- a/src/forms/Dialog/AboutDialogBase.h +++ b/src/forms/Dialog/AboutDialogBase.h @@ -119,6 +119,13 @@ class AboutDialogBase : public wxDialog wxStaticText* m_dJordanParker; wxStaticText* m_dRobertChave; wxStaticText* m_dMarvinCalvert; + wxStaticText* m_dErfurterFeurblume; + wxStaticText* m_dMakarenkoAleksey; + wxStaticText* m_dAnthonyLambiris; + wxStaticText* m_dJoeBurtinsky; + wxStaticText* m_dDalePuckett + + ; wxScrolledWindow* m_stScroll; wxStaticText* m_stHeader; wxStaticLine* m_stDivider1;