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

Another attempt to fix the initial button layout on GTK.

This commit is contained in:
Jeff Young 2018-05-08 20:01:29 +01:00
parent e5374981aa
commit 31b026c70f
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pcbnew/dialogs/dialog_plot.cpp
View File

@ -53,10 +53,10 @@ DIALOG_PLOT::DIALOG_PLOT( PCB_EDIT_FRAME* aParent ) :
init_Dialog(); init_Dialog();
// We use a sdbSizer here to get the order right, which is platform-dependent // We use a sdbSizer here to get the order right, which is platform-dependent
m_sdbSizer1OK->SetLabel( _( " Plot " ) ); m_sdbSizer1OK->SetLabel( _( "Plot" ) );
m_sdbSizer1Apply->SetLabel( _( "Generate Drill Files..." ) ); m_sdbSizer1Apply->SetLabel( _( "Generate Drill Files..." ) );
m_sdbSizer1Cancel->SetLabel( _( "Close" ) ); m_sdbSizer1Cancel->SetLabel( _( "Close" ) );
m_sdbSizer1->Layout(); m_sizerButtons->Layout();
m_sdbSizer1OK->SetDefault(); m_sdbSizer1OK->SetDefault();

11
pcbnew/dialogs/dialog_plot_base.cpp
View File

@ -376,14 +376,13 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr
m_MainSizer->Add( sbSizerMsg, 1, wxEXPAND, 5 ); m_MainSizer->Add( sbSizerMsg, 1, wxEXPAND, 5 );
wxBoxSizer* bSizerButtons; m_sizerButtons = new wxBoxSizer( wxHORIZONTAL );
bSizerButtons = new wxBoxSizer( wxHORIZONTAL );
m_buttonDRC = new wxButton( this, wxID_ANY, _("Run DRC..."), wxDefaultPosition, wxDefaultSize, 0 ); m_buttonDRC = new wxButton( this, wxID_ANY, _("Run DRC..."), wxDefaultPosition, wxDefaultSize, 0 );
bSizerButtons->Add( m_buttonDRC, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_sizerButtons->Add( m_buttonDRC, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
bSizerButtons->Add( 10, 0, 1, wxEXPAND, 5 ); m_sizerButtons->Add( 10, 0, 1, wxEXPAND, 5 );
m_sdbSizer1 = new wxStdDialogButtonSizer(); m_sdbSizer1 = new wxStdDialogButtonSizer();
m_sdbSizer1OK = new wxButton( this, wxID_OK ); m_sdbSizer1OK = new wxButton( this, wxID_OK );
@ -394,10 +393,10 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr
m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); m_sdbSizer1->AddButton( m_sdbSizer1Cancel );
m_sdbSizer1->Realize(); m_sdbSizer1->Realize();
bSizerButtons->Add( m_sdbSizer1, 0, wxEXPAND, 5 ); m_sizerButtons->Add( m_sdbSizer1, 0, wxEXPAND, 5 );
m_MainSizer->Add( bSizerButtons, 0, wxALIGN_RIGHT|wxEXPAND|wxLEFT, 5 ); m_MainSizer->Add( m_sizerButtons, 0, wxALIGN_RIGHT|wxEXPAND|wxLEFT, 5 );
this->SetSizer( m_MainSizer ); this->SetSizer( m_MainSizer );

4
pcbnew/dialogs/dialog_plot_base.fbp
View File

@ -4482,9 +4482,9 @@
<property name="proportion">0</property> <property name="proportion">0</property>
<object class="wxBoxSizer" expanded="1"> <object class="wxBoxSizer" expanded="1">
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="name">bSizerButtons</property> <property name="name">m_sizerButtons</property>
<property name="orient">wxHORIZONTAL</property> <property name="orient">wxHORIZONTAL</property>
<property name="permission">none</property> <property name="permission">protected</property>
<object class="sizeritem" expanded="0"> <object class="sizeritem" expanded="0">
<property name="border">5</property> <property name="border">5</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property> <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>

1
pcbnew/dialogs/dialog_plot_base.h
View File

@ -113,6 +113,7 @@ class DIALOG_PLOT_BASE : public DIALOG_SHIM
wxCheckBox* m_DXF_plotModeOpt; wxCheckBox* m_DXF_plotModeOpt;
wxCheckBox* m_DXF_plotTextStrokeFontOpt; wxCheckBox* m_DXF_plotTextStrokeFontOpt;
WX_HTML_REPORT_PANEL* m_messagesPanel; WX_HTML_REPORT_PANEL* m_messagesPanel;
wxBoxSizer* m_sizerButtons;
wxButton* m_buttonDRC; wxButton* m_buttonDRC;
wxStdDialogButtonSizer* m_sdbSizer1; wxStdDialogButtonSizer* m_sdbSizer1;
wxButton* m_sdbSizer1OK; wxButton* m_sdbSizer1OK;