haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cvpcb: allows more room to display messages to avoid long strings to overlap buttons

This commit is contained in:
jean-pierre charras 2018-04-18 09:25:14 +02:00
parent ad0deb16a2
commit 90741a9d76
1 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
cvpcb/cvpcb_mainframe.cpp
View File

@ -170,40 +170,37 @@ CVPCB_MAINFRAME::CVPCB_MAINFRAME( KIWAY* aKiway, wxWindow* aParent ) :
wxAuiPaneInfo( info ).Name( wxT( "m_footprintListBox" ) ). wxAuiPaneInfo( info ).Name( wxT( "m_footprintListBox" ) ).
Right().BestSize( (int) ( m_FrameSize.x * 0.30 ), m_FrameSize.y ) ); Right().BestSize( (int) ( m_FrameSize.x * 0.30 ), m_FrameSize.y ) );
// Build the bottom panel, to display 2 sttaus texts and the buttons:
auto bottomPanel = new wxPanel( this ); auto bottomPanel = new wxPanel( this );
auto panelSizer = new wxBoxSizer( wxVERTICAL );
auto panelSizer = new wxBoxSizer( wxHORIZONTAL );
auto statusSizer = new wxBoxSizer( wxVERTICAL );
m_statusLine1 = new wxStaticText( bottomPanel, wxID_ANY, wxEmptyString ); m_statusLine1 = new wxStaticText( bottomPanel, wxID_ANY, wxEmptyString );
m_statusLine1->SetFont( wxFont( 10, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, panelSizer->Add( m_statusLine1, 0, wxTOP, 5 );
wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
statusSizer->Add( m_statusLine1, 0, wxTOP, 5 );
m_statusLine2 = new wxStaticText( bottomPanel, wxID_ANY, wxEmptyString ); m_statusLine2 = new wxStaticText( bottomPanel, wxID_ANY, wxEmptyString );
m_statusLine2->SetFont( wxFont( 10, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, panelSizer->Add( m_statusLine2, 0, wxTOP, 4 );
wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
statusSizer->Add( m_statusLine2, 0, wxTOP, 4 );
panelSizer->Add( statusSizer, 1, wxEXPAND|wxLEFT, 5 ); // Add buttons:
auto buttonsSizer = new wxBoxSizer( wxHORIZONTAL );
auto sdbSizer = new wxStdDialogButtonSizer();
m_saveAndContinue = new wxButton( bottomPanel, wxID_SAVE, m_saveAndContinue = new wxButton( bottomPanel, wxID_SAVE,
wxT("Apply, Save Schematic && Continue") ); "Apply, Save Schematic && Continue" );
panelSizer->Add( m_saveAndContinue, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); buttonsSizer->Add( m_saveAndContinue, 0, wxALL, 5 );
auto sdbSizer1 = new wxStdDialogButtonSizer(); auto sdbSizerOK = new wxButton( bottomPanel, wxID_OK );
auto sdbSizer1OK = new wxButton( bottomPanel, wxID_OK ); sdbSizer->AddButton( sdbSizerOK );
sdbSizer1->AddButton( sdbSizer1OK ); auto sdbSizerCancel = new wxButton( bottomPanel, wxID_CANCEL );
auto sdbSizer1Cancel = new wxButton( bottomPanel, wxID_CANCEL ); sdbSizer->AddButton( sdbSizerCancel );
sdbSizer1->AddButton( sdbSizer1Cancel ); sdbSizer->Realize();
sdbSizer1->Realize();
panelSizer->Add( sdbSizer1, 0, wxEXPAND|wxLEFT, 10 ); buttonsSizer->Add( sdbSizer, 0, wxALL, 5 );
panelSizer->Add( buttonsSizer, 0, wxALIGN_RIGHT, 5 );
bottomPanel->SetSizer( panelSizer ); bottomPanel->SetSizer( panelSizer );
bottomPanel->Fit(); bottomPanel->Fit();
sdbSizer1OK->SetDefault(); sdbSizerOK->SetDefault();
m_auimgr.AddPane( bottomPanel, wxAuiPaneInfo( horiz ).Name( wxT( "buttons" ) ).Bottom() ); m_auimgr.AddPane( bottomPanel, wxAuiPaneInfo( horiz ).Name( wxT( "buttons" ) ).Bottom() );