comicsansg/CubicSDR
comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2024-11-26 21:58:37 -05:00
Code Issues Projects Releases Wiki Activity

About Dialog code update, passive vcredist install

Browse Source
This commit is contained in:
Charles J. Cliffe 2018-01-02 00:13:09 -05:00
parent f625cb6eea
commit 8609667f33
3 changed files with 584 additions and 564 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -1003,7 +1003,7 @@ IF (WIN32 AND BUILD_INSTALLER)
IF (MSVC)
install(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/external/msvc/${EX_PLATFORM_NAME}/vc_redist.${EX_PLATFORM_NAME}.exe DESTINATION vc_redist)
set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "ExecWait '\\\"$INSTDIR\\\\vc_redist\\\\vc_redist.${EX_PLATFORM_NAME}.exe\\\" /q:a'")
set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "ExecWait '\\\"$INSTDIR\\\\vc_redist\\\\vc_redist.${EX_PLATFORM_NAME}.exe\\\" /passive /norestart'")
ENDIF (MSVC)

20
src/forms/Dialog/AboutDialogBase.cpp
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Oct 27 2017)
// C++ code generated with wxFormBuilder (version Nov 6 2017)
// http://www.wxformbuilder.org/
//
// PLEASE DO *NOT* EDIT THIS FILE!
@ -179,7 +179,7 @@ AboutDialogBase::AboutDialogBase(wxWindow* parent, wxWindowID id, const wxString
m_dbScroll->SetSizer( m_dbPane );
m_dbScroll->Layout();
m_dbPane->Fit( m_dbScroll );
m_aboutNotebook->AddPage(m_dbScroll, wxT("Developers"), false);
m_aboutNotebook->AddPage( m_dbScroll, wxT("Developers"), true );
m_dScroll = new wxScrolledWindow( m_aboutNotebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
m_dScroll->SetScrollRate( 5, 5 );
wxBoxSizer* m_dBSizer;
@ -365,6 +365,22 @@ AboutDialogBase::AboutDialogBase(wxWindow* parent, wxWindowID id, const wxString
m_dPetrikaJaneku->Wrap( -1 );
m_dSizer->Add( m_dPetrikaJaneku, 0, wxALL, 5 );
m_dChadMyslinsky = new wxStaticText( m_dScroll, wxID_ANY, wxT("Chad Myslinsky"), wxDefaultPosition, wxDefaultSize, 0 );
m_dChadMyslinsky->Wrap( -1 );
m_dSizer->Add( m_dChadMyslinsky, 0, wxALL, 5 );
m_dCharlieBruckner = new wxStaticText( m_dScroll, wxID_ANY, wxT("Charlie Bruckner"), wxDefaultPosition, wxDefaultSize, 0 );
m_dCharlieBruckner->Wrap( -1 );
m_dSizer->Add( m_dCharlieBruckner, 0, wxALL, 5 );
m_dJordanParker = new wxStaticText( m_dScroll, wxID_ANY, wxT("Jordan Parker"), wxDefaultPosition, wxDefaultSize, 0 );
m_dJordanParker->Wrap( -1 );
m_dSizer->Add( m_dJordanParker, 0, wxALL, 5 );
m_dRobertChave = new wxStaticText( m_dScroll, wxID_ANY, wxT("Robert Chave"), wxDefaultPosition, wxDefaultSize, 0 );
m_dRobertChave->Wrap( -1 );
m_dSizer->Add( m_dRobertChave, 0, wxALL, 5 );
m_dBSizer->Add( m_dSizer, 1, wxALL|wxEXPAND, 5 );

6
src/forms/Dialog/AboutDialogBase.h
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Oct 27 2017)
// C++ code generated with wxFormBuilder (version Nov 6 2017)
// http://www.wxformbuilder.org/
//
// PLEASE DO *NOT* EDIT THIS FILE!
@ -114,6 +114,10 @@ protected:
wxStaticText* m_dSergeVanderTorre;
wxStaticText* m_dDieterSchneider;
wxStaticText* m_dPetrikaJaneku;
wxStaticText* m_dChadMyslinsky;
wxStaticText* m_dCharlieBruckner;
wxStaticText* m_dJordanParker;
wxStaticText* m_dRobertChave;
wxScrolledWindow* m_stScroll;
wxStaticText* m_stHeader;
wxStaticLine* m_stDivider1;