solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Rewrite wxGenericPrintSetupDialog sizer-related code

Browse source 
Use sensible variable names instead of auto-generated itemNN and
wxSizerFlags-based API.

This makes the code simpler to read and modify and also avoids tons of
asserts due to using meaningless sizer styles.
This commit is contained in:
Vadim Zeitlin 2022-11-26 20:14:03 +01:00
parent 0c97749035
commit efac76ec8e
1 changed files with 29 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

65
src/generic/prntdlgg.cpp
View file

@ -582,79 +582,72 @@ void wxGenericPrintSetupDialog::Init(wxPrintData* data)
}
}
const wxSizerFlags border = wxSizerFlags().Border();
printer_sizer->Add( m_printerListCtrl, 0, wxALL|wxGROW, 5 );
printer_sizer->Add( m_printerListCtrl, wxSizerFlags(border).Expand() );
wxBoxSizer *item1 = new wxBoxSizer( wxHORIZONTAL );
main_sizer->Add( item1, 0, wxALL, 5 );
wxBoxSizer *all_options = new wxBoxSizer( wxHORIZONTAL );
main_sizer->Add( all_options, border );
// printer options (on the left)
wxBoxSizer *item2 = new wxBoxSizer( wxVERTICAL );
wxBoxSizer *print_options = new wxBoxSizer( wxVERTICAL );
wxStaticBoxSizer *item3 = new wxStaticBoxSizer( wxVERTICAL, this, _("Paper size") );
wxStaticBoxSizer *paper_size = new wxStaticBoxSizer( wxVERTICAL, this, _("Paper size") );
m_paperTypeChoice = CreatePaperTypeChoice();
item3->Add( m_paperTypeChoice, 0, wxALIGN_CENTER|wxALL, 5 );
paper_size->Add( m_paperTypeChoice, border );
item2->Add( item3, 0, wxALIGN_CENTER|wxALL, 5 );
print_options->Add( paper_size, border );
wxString strs6[] =
wxString orientations[] =
{
_("Portrait"),
_("Landscape")
};
m_orientationRadioBox= new wxRadioBox( this, wxPRINTID_ORIENTATION, _("Orientation"), wxDefaultPosition, wxDefaultSize, 2, strs6, 1, wxRA_SPECIFY_ROWS );
item2->Add( m_orientationRadioBox, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
m_orientationRadioBox= new wxRadioBox( this, wxPRINTID_ORIENTATION, _("Orientation"), wxDefaultPosition, wxDefaultSize, 2, orientations, 1, wxRA_SPECIFY_ROWS );
print_options->Add( m_orientationRadioBox, wxSizerFlags(border).Expand() );
wxStaticBoxSizer *item7 = new wxStaticBoxSizer( wxHORIZONTAL, this, _("Options") );
wxStaticBoxSizer *other_options = new wxStaticBoxSizer( wxHORIZONTAL, this, _("Options") );
m_colourCheckBox = new wxCheckBox( this, wxPRINTID_PRINTCOLOUR, _("Print in colour") );
item7->Add( m_colourCheckBox, 0, wxALIGN_CENTER|wxALL, 5 );
other_options->Add( m_colourCheckBox, border );
item2->Add( item7, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
print_options->Add( other_options, wxSizerFlags(border).Expand() );
item1->Add( item2, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
all_options->Add( print_options );
// spooling options (on the right)
wxStaticBoxSizer *item10 = new wxStaticBoxSizer( wxVERTICAL, this, _("Print spooling") );
wxStaticBoxSizer *spool_options = new wxStaticBoxSizer( wxVERTICAL, this, _("Print spooling") );
wxStaticText *item12 = new wxStaticText( this, wxID_ANY, _("Printer command:") );
item10->Add( item12, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
wxBoxSizer *item13 = new wxBoxSizer( wxHORIZONTAL );
item13->Add( 20, 20, 0, wxALIGN_CENTER|wxALL, 5 );
spool_options->Add( new wxStaticText( this, wxID_ANY, _("Printer command:") ), border );
m_printerCommandText = new wxTextCtrl( this, wxPRINTID_COMMAND, wxEmptyString, wxDefaultPosition, wxSize(160,wxDefaultCoord) );
item13->Add( m_printerCommandText, 0, wxALIGN_CENTER|wxALL, 5 );
wxBoxSizer *command_sizer = new wxBoxSizer( wxHORIZONTAL );
command_sizer->Add( 20, 20 );
command_sizer->Add( m_printerCommandText );
spool_options->Add( command_sizer, border );
item10->Add( item13, 0, wxALIGN_CENTER|wxALL, 0 );
wxStaticText *item15 = new wxStaticText( this, wxID_ANY, _("Printer options:") );
item10->Add( item15, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
wxBoxSizer *item16 = new wxBoxSizer( wxHORIZONTAL );
item16->Add( 20, 20, 0, wxALIGN_CENTER|wxALL, 5 );
spool_options->Add( new wxStaticText( this, wxID_ANY, _("Printer options:") ), border );
m_printerOptionsText = new wxTextCtrl( this, wxPRINTID_OPTIONS, wxEmptyString, wxDefaultPosition, wxSize(160,wxDefaultCoord) );
item16->Add( m_printerOptionsText, 0, wxALIGN_CENTER|wxALL, 5 );
wxBoxSizer *options_sizer = new wxBoxSizer( wxHORIZONTAL );
options_sizer->Add( 20, 20 );
options_sizer->Add( m_printerOptionsText );
spool_options->Add( options_sizer, border );
item10->Add( item16, 0, wxALIGN_CENTER|wxALL, 0 );
item1->Add( item10, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
all_options->Add( spool_options, wxSizerFlags(border).Expand() );
#if wxUSE_STATLINE
// static line
main_sizer->Add( new wxStaticLine( this, wxID_ANY ), 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10 );
main_sizer->Add( new wxStaticLine( this, wxID_ANY ), wxSizerFlags().Expand().DoubleBorder(wxLEFT|wxRIGHT|wxTOP) );
#endif
// buttons
main_sizer->Add( CreateButtonSizer( wxOK|wxCANCEL), 0, wxEXPAND|wxALL, 10 );
main_sizer->Add( CreateButtonSizer( wxOK|wxCANCEL), wxSizerFlags().Expand().DoubleBorder() );
SetSizer( main_sizer );