comicsansg/CubicSDR
comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2025-09-09 10:17:58 -04:00
Code Issues Projects Releases Wiki Activity

About Dialog panel padding tweak

Browse Source
This commit is contained in:
Charles J. Cliffe 2017-02-08 21:22:56 -05:00
parent a4ae7fefb9
commit 8c1d785ff6
3 changed files with 4769 additions and 4744 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/forms/Dialog/AboutDialog.fbp
View File

@ -44,7 +44,7 @@
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="name">AboutDialogBase</property> <property name="name">AboutDialogBase</property>
<property name="pos"></property> <property name="pos"></property>
<property name="size">436,378</property> <property name="size">530,420</property>
<property name="style">wxDEFAULT_DIALOG_STYLE</property> <property name="style">wxDEFAULT_DIALOG_STYLE</property>
<property name="subclass"></property> <property name="subclass"></property>
<property name="title">About</property> <property name="title">About</property>
@ -431,7 +431,7 @@
<property name="permission">none</property> <property name="permission">none</property>
<object class="sizeritem" expanded="1"> <object class="sizeritem" expanded="1">
<property name="border">5</property> <property name="border">5</property>
<property name="flag">wxEXPAND</property> <property name="flag">wxALL|wxEXPAND</property>
<property name="proportion">0</property> <property name="proportion">0</property>
<object class="wxFlexGridSizer" expanded="0"> <object class="wxFlexGridSizer" expanded="0">
<property name="cols">3</property> <property name="cols">3</property>
@ -1196,7 +1196,7 @@
</object> </object>
<object class="sizeritem" expanded="0"> <object class="sizeritem" expanded="0">
<property name="border">10</property> <property name="border">10</property>
<property name="flag">wxBOTTOM|wxEXPAND|wxTOP</property> <property name="flag">wxALL|wxEXPAND</property>
<property name="proportion">0</property> <property name="proportion">0</property>
<object class="wxStaticLine" expanded="0"> <object class="wxStaticLine" expanded="0">
<property name="BottomDockable">1</property> <property name="BottomDockable">1</property>
@ -1277,7 +1277,7 @@
</object> </object>
<object class="sizeritem" expanded="1"> <object class="sizeritem" expanded="1">
<property name="border">5</property> <property name="border">5</property>
<property name="flag">wxEXPAND</property> <property name="flag">wxALL|wxEXPAND</property>
<property name="proportion">0</property> <property name="proportion">0</property>
<object class="wxFlexGridSizer" expanded="0"> <object class="wxFlexGridSizer" expanded="0">
<property name="cols">2</property> <property name="cols">2</property>
@ -2870,18 +2870,20 @@
<event name="OnSetFocus"></event> <event name="OnSetFocus"></event>
<event name="OnSize"></event> <event name="OnSize"></event>
<event name="OnUpdateUI"></event> <event name="OnUpdateUI"></event>
<object class="wxFlexGridSizer" expanded="0"> <object class="wxBoxSizer" expanded="1">
<property name="cols">1</property> <property name="minimum_size"></property>
<property name="flexible_direction">wxBOTH</property> <property name="name">m_dBSizer</property>
<property name="growablecols"></property> <property name="orient">wxVERTICAL</property>
<property name="growablerows"></property> <property name="permission">none</property>
<property name="hgap">20</property> <object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALL|wxEXPAND</property>
<property name="proportion">1</property>
<object class="wxBoxSizer" expanded="0">
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="name">m_dSizer</property> <property name="name">m_dSizer</property>
<property name="non_flexible_grow_mode">wxFLEX_GROWMODE_ALL</property> <property name="orient">wxVERTICAL</property>
<property name="permission">none</property> <property name="permission">none</property>
<property name="rows">0</property>
<property name="vgap">2</property>
<object class="sizeritem" expanded="0"> <object class="sizeritem" expanded="0">
<property name="border">5</property> <property name="border">5</property>
<property name="flag">wxALL</property> <property name="flag">wxALL</property>
@ -6037,11 +6039,13 @@
</object> </object>
</object> </object>
</object> </object>
</object>
</object>
<object class="notebookpage" expanded="1"> <object class="notebookpage" expanded="1">
<property name="bitmap"></property> <property name="bitmap"></property>
<property name="label">Special Thanks</property> <property name="label">Special Thanks</property>
<property name="select">0</property> <property name="select">0</property>
<object class="wxScrolledWindow" expanded="0"> <object class="wxScrolledWindow" expanded="1">
<property name="BottomDockable">1</property> <property name="BottomDockable">1</property>
<property name="LeftDockable">1</property> <property name="LeftDockable">1</property>
<property name="RightDockable">1</property> <property name="RightDockable">1</property>
@ -6117,6 +6121,15 @@
<event name="OnSetFocus"></event> <event name="OnSetFocus"></event>
<event name="OnSize"></event> <event name="OnSize"></event>
<event name="OnUpdateUI"></event> <event name="OnUpdateUI"></event>
<object class="wxBoxSizer" expanded="1">
<property name="minimum_size"></property>
<property name="name">m_stBSizer</property>
<property name="orient">wxVERTICAL</property>
<property name="permission">none</property>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALL|wxEXPAND</property>
<property name="proportion">1</property>
<object class="wxBoxSizer" expanded="0"> <object class="wxBoxSizer" expanded="0">
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="name">m_stSizer</property> <property name="name">m_stSizer</property>
@ -7701,4 +7714,6 @@
</object> </object>
</object> </object>
</object> </object>
</object>
</object>
</wxFormBuilder_Project> </wxFormBuilder_Project>

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

@ -86,10 +86,10 @@ AboutDialogBase::AboutDialogBase( wxWindow* parent, wxWindowID id, const wxStrin
m_dbSizer->Add( m_dbtVS, 0, wxALL, 5 ); m_dbSizer->Add( m_dbtVS, 0, wxALL, 5 );
m_dbPane->Add( m_dbSizer, 0, wxEXPAND, 5 ); m_dbPane->Add( m_dbSizer, 0, wxALL|wxEXPAND, 5 );
m_dbDivider1 = new wxStaticLine( m_dbScroll, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); m_dbDivider1 = new wxStaticLine( m_dbScroll, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
m_dbPane->Add( m_dbDivider1, 0, wxBOTTOM|wxEXPAND|wxTOP, 10 ); m_dbPane->Add( m_dbDivider1, 0, wxALL|wxEXPAND, 10 );
wxFlexGridSizer* m_cSizer; wxFlexGridSizer* m_cSizer;
m_cSizer = new wxFlexGridSizer( 0, 2, 2, 20 ); m_cSizer = new wxFlexGridSizer( 0, 2, 2, 20 );
@ -173,7 +173,7 @@ AboutDialogBase::AboutDialogBase( wxWindow* parent, wxWindowID id, const wxStrin
m_cSizer->Add( m_cghIC, 0, wxALL, 5 ); m_cSizer->Add( m_cghIC, 0, wxALL, 5 );
m_dbPane->Add( m_cSizer, 0, wxEXPAND, 5 ); m_dbPane->Add( m_cSizer, 0, wxALL|wxEXPAND, 5 );
m_dbScroll->SetSizer( m_dbPane ); m_dbScroll->SetSizer( m_dbPane );
@ -182,10 +182,11 @@ AboutDialogBase::AboutDialogBase( wxWindow* parent, wxWindowID id, const wxStrin
m_aboutNotebook->AddPage( m_dbScroll, wxT("Developers"), false ); m_aboutNotebook->AddPage( m_dbScroll, wxT("Developers"), false );
m_dScroll = new wxScrolledWindow( m_aboutNotebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL ); m_dScroll = new wxScrolledWindow( m_aboutNotebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
m_dScroll->SetScrollRate( 5, 5 ); m_dScroll->SetScrollRate( 5, 5 );
wxFlexGridSizer* m_dSizer; wxBoxSizer* m_dBSizer;
m_dSizer = new wxFlexGridSizer( 0, 1, 2, 20 ); m_dBSizer = new wxBoxSizer( wxVERTICAL );
m_dSizer->SetFlexibleDirection( wxBOTH );
m_dSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_ALL ); wxBoxSizer* m_dSizer;
m_dSizer = new wxBoxSizer( wxVERTICAL );
m_dHeader = new wxStaticText( m_dScroll, wxID_ANY, wxT("Thanks to everyone who donated at cubicsdr.com!"), wxDefaultPosition, wxDefaultSize, wxST_NO_AUTORESIZE ); m_dHeader = new wxStaticText( m_dScroll, wxID_ANY, wxT("Thanks to everyone who donated at cubicsdr.com!"), wxDefaultPosition, wxDefaultSize, wxST_NO_AUTORESIZE );
m_dHeader->Wrap( -1 ); m_dHeader->Wrap( -1 );
@ -341,12 +342,18 @@ AboutDialogBase::AboutDialogBase( wxWindow* parent, wxWindowID id, const wxStrin
m_dSizer->Add( m_dKeshavlalPatel, 0, wxALL, 5 ); m_dSizer->Add( m_dKeshavlalPatel, 0, wxALL, 5 );
m_dScroll->SetSizer( m_dSizer ); m_dBSizer->Add( m_dSizer, 1, wxALL|wxEXPAND, 5 );
m_dScroll->SetSizer( m_dBSizer );
m_dScroll->Layout(); m_dScroll->Layout();
m_dSizer->Fit( m_dScroll ); m_dBSizer->Fit( m_dScroll );
m_aboutNotebook->AddPage( m_dScroll, wxT("Donations"), false ); m_aboutNotebook->AddPage( m_dScroll, wxT("Donations"), false );
m_stScroll = new wxScrolledWindow( m_aboutNotebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL ); m_stScroll = new wxScrolledWindow( m_aboutNotebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
m_stScroll->SetScrollRate( 5, 5 ); m_stScroll->SetScrollRate( 5, 5 );
wxBoxSizer* m_stBSizer;
m_stBSizer = new wxBoxSizer( wxVERTICAL );
wxBoxSizer* m_stSizer; wxBoxSizer* m_stSizer;
m_stSizer = new wxBoxSizer( wxVERTICAL ); m_stSizer = new wxBoxSizer( wxVERTICAL );
@ -432,9 +439,12 @@ AboutDialogBase::AboutDialogBase( wxWindow* parent, wxWindowID id, const wxStrin
m_stSizer->Add( m_stNominate, 0, wxALL, 5 ); m_stSizer->Add( m_stNominate, 0, wxALL, 5 );
m_stScroll->SetSizer( m_stSizer ); m_stBSizer->Add( m_stSizer, 1, wxALL|wxEXPAND, 5 );
m_stScroll->SetSizer( m_stBSizer );
m_stScroll->Layout(); m_stScroll->Layout();
m_stSizer->Fit( m_stScroll ); m_stBSizer->Fit( m_stScroll );
m_aboutNotebook->AddPage( m_stScroll, wxT("Special Thanks"), false ); m_aboutNotebook->AddPage( m_stScroll, wxT("Special Thanks"), false );
dlgSizer->Add( m_aboutNotebook, 1, wxEXPAND | wxALL, 5 ); dlgSizer->Add( m_aboutNotebook, 1, wxEXPAND | wxALL, 5 );

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

@ -131,7 +131,7 @@ class AboutDialogBase : public wxDialog
public: public:
AboutDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("About"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 436,378 ), long style = wxDEFAULT_DIALOG_STYLE ); AboutDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("About"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 530,420 ), long style = wxDEFAULT_DIALOG_STYLE );
~AboutDialogBase(); ~AboutDialogBase();
}; };