diff --git a/common/dialogs/dialog_edit_library_tables.cpp b/common/dialogs/dialog_edit_library_tables.cpp index c2ae903974..7f357d2920 100644 --- a/common/dialogs/dialog_edit_library_tables.cpp +++ b/common/dialogs/dialog_edit_library_tables.cpp @@ -41,12 +41,9 @@ void DIALOG_EDIT_LIBRARY_TABLES::InstallPanel( wxPanel* aPanel ) auto mainSizer = new wxBoxSizer( wxVERTICAL ); SetSizer( mainSizer ); - mainSizer->Add( m_contentPanel, 1, wxEXPAND|wxALL, 5 ); + mainSizer->Add( m_contentPanel, 1, wxEXPAND|wxLEFT|wxTOP|wxRIGHT, 5 ); m_contentPanel->SetMinSize( wxSize( 1000, 600 ) ); - auto line = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - mainSizer->Add( line, 0, wxEXPAND|wxLEFT|wxTOP|wxRIGHT, 10 ); - auto sdbSizer = new wxStdDialogButtonSizer(); auto sdbSizerOK = new wxButton( this, wxID_OK ); sdbSizer->AddButton( sdbSizerOK ); diff --git a/eeschema/dialogs/dialog_annotate_base.cpp b/eeschema/dialogs/dialog_annotate_base.cpp index fc169a2128..221d066767 100644 --- a/eeschema/dialogs/dialog_annotate_base.cpp +++ b/eeschema/dialogs/dialog_annotate_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jul 11 2018) +// C++ code generated with wxFormBuilder (version Dec 30 2017) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -115,10 +115,10 @@ DIALOG_ANNOTATE_BASE::DIALOG_ANNOTATE_BASE( wxWindow* parent, wxWindowID id, con m_MessageWindow = new WX_HTML_REPORT_PANEL( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); m_MessageWindow->SetMinSize( wxSize( -1,120 ) ); - bupperSizer->Add( m_MessageWindow, 5, wxEXPAND | wxALL, 5 ); + bupperSizer->Add( m_MessageWindow, 5, wxEXPAND|wxRIGHT|wxLEFT, 5 ); - bmainSizer->Add( bupperSizer, 1, wxALL|wxEXPAND, 6 ); + bmainSizer->Add( bupperSizer, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 6 ); wxBoxSizer* m_buttonsSizer; m_buttonsSizer = new wxBoxSizer( wxHORIZONTAL ); @@ -136,7 +136,7 @@ DIALOG_ANNOTATE_BASE::DIALOG_ANNOTATE_BASE( wxWindow* parent, wxWindowID id, con m_buttonsSizer->Add( m_sdbSizer1, 1, wxALL|wxEXPAND, 5 ); - bmainSizer->Add( m_buttonsSizer, 0, wxEXPAND, 5 ); + bmainSizer->Add( m_buttonsSizer, 0, wxEXPAND|wxLEFT, 5 ); this->SetSizer( bmainSizer ); diff --git a/eeschema/dialogs/dialog_annotate_base.fbp b/eeschema/dialogs/dialog_annotate_base.fbp index 13129e5385..0780a1988e 100644 --- a/eeschema/dialogs/dialog_annotate_base.fbp +++ b/eeschema/dialogs/dialog_annotate_base.fbp @@ -1,6 +1,6 @@ - + C++ @@ -14,7 +14,6 @@ dialog_annotate_base 1000 none - 1 dialog_annotate_base @@ -55,20 +54,13 @@ - + - - - - - - - OnClose @@ -83,23 +75,17 @@ - - - - - - @@ -109,7 +95,7 @@ none 6 - wxALL|wxEXPAND + wxEXPAND|wxTOP|wxRIGHT|wxLEFT 1 @@ -149,7 +135,6 @@ 1 wxID_ANY - 0 0 @@ -175,14 +160,7 @@ 1 - - - - - - - @@ -287,14 +265,7 @@ - - - - - - - @@ -404,14 +375,7 @@ - - - - - - - @@ -503,14 +467,7 @@ - - - - - - - @@ -608,14 +565,7 @@ - - - - - - - @@ -707,14 +657,7 @@ - - - - - - - @@ -807,14 +750,7 @@ - - - - - - - @@ -933,14 +869,7 @@ - - - - - - - @@ -1031,14 +960,7 @@ - - - - - - - @@ -1132,14 +1054,7 @@ - - - - - - - @@ -1230,14 +1145,7 @@ - - - - - - - @@ -1271,7 +1179,7 @@ 5 - wxEXPAND | wxALL + wxEXPAND|wxRIGHT|wxLEFT 5 1 @@ -1324,14 +1232,7 @@ wxTAB_TRAVERSAL - - - - - - - @@ -1360,7 +1261,7 @@ 5 - wxEXPAND + wxEXPAND|wxLEFT 0 @@ -1382,31 +1283,25 @@ - 1 0 1 1 - 0 0 - Dock 0 Left 1 1 - 0 0 ID_CLEAR_ANNOTATION_CMP Clear Annotation - - 0 0 @@ -1421,8 +1316,6 @@ protected 1 - - Resizable 1 @@ -1437,15 +1330,8 @@ - - - - - - OnClearAnnotationCmpClick - diff --git a/eeschema/dialogs/dialog_annotate_base.h b/eeschema/dialogs/dialog_annotate_base.h index 478fb65324..7ea011d4af 100644 --- a/eeschema/dialogs/dialog_annotate_base.h +++ b/eeschema/dialogs/dialog_annotate_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jul 11 2018) +// C++ code generated with wxFormBuilder (version Dec 30 2017) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! diff --git a/eeschema/dialogs/dialog_bom.cpp b/eeschema/dialogs/dialog_bom.cpp index 1e6ed5c860..d095681f77 100644 --- a/eeschema/dialogs/dialog_bom.cpp +++ b/eeschema/dialogs/dialog_bom.cpp @@ -221,8 +221,8 @@ DIALOG_BOM::DIALOG_BOM( SCH_EDIT_FRAME* parent ) : m_config = Kiface().KifaceSettings(); m_initialized = false; - m_buttonAddPlugin->SetBitmap( KiBitmap( plus_xpm ) ); - m_buttonDelPlugin->SetBitmap( KiBitmap( delete_xpm ) ); + m_buttonAddPlugin->SetBitmap( KiBitmap( small_plus_xpm ) ); + m_buttonDelPlugin->SetBitmap( KiBitmap( trash_xpm ) ); m_buttonEdit->SetBitmap( KiBitmap( small_edit_xpm ) ); installPluginsList(); diff --git a/eeschema/dialogs/dialog_bom_base.cpp b/eeschema/dialogs/dialog_bom_base.cpp index 5e835e7705..4977db2fb4 100644 --- a/eeschema/dialogs/dialog_bom_base.cpp +++ b/eeschema/dialogs/dialog_bom_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 5 2018) +// C++ code generated with wxFormBuilder (version Dec 30 2017) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -64,24 +64,24 @@ DIALOG_BOM_BASE::DIALOG_BOM_BASE( wxWindow* parent, wxWindowID id, const wxStrin wxBoxSizer* bPluginButtons; bPluginButtons = new wxBoxSizer( wxHORIZONTAL ); - m_buttonAddPlugin = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW ); + m_buttonAddPlugin = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), wxBU_AUTODRAW ); m_buttonAddPlugin->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); m_buttonAddPlugin->SetToolTip( _("Add a new plugin and its command line to the list") ); bPluginButtons->Add( m_buttonAddPlugin, 0, wxRIGHT|wxLEFT, 5 ); - m_buttonDelPlugin = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW ); - m_buttonDelPlugin->SetToolTip( _("Remove the current plugin from list") ); + m_buttonEdit = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), wxBU_AUTODRAW ); + m_buttonEdit->SetToolTip( _("Edit the plugin file in the text editor") ); - bPluginButtons->Add( m_buttonDelPlugin, 0, wxRIGHT, 5 ); + bPluginButtons->Add( m_buttonEdit, 0, wxRIGHT, 5 ); bPluginButtons->Add( 0, 0, 0, wxRIGHT|wxLEFT, 5 ); - m_buttonEdit = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW ); - m_buttonEdit->SetToolTip( _("Edit the plugin file in the text editor") ); + m_buttonDelPlugin = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), wxBU_AUTODRAW ); + m_buttonDelPlugin->SetToolTip( _("Remove the current plugin from list") ); - bPluginButtons->Add( m_buttonEdit, 0, wxRIGHT, 5 ); + bPluginButtons->Add( m_buttonDelPlugin, 0, wxRIGHT, 5 ); bMainSizer->Add( bPluginButtons, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 10 ); @@ -132,8 +132,8 @@ DIALOG_BOM_BASE::DIALOG_BOM_BASE( wxWindow* parent, wxWindowID id, const wxStrin m_lbPlugins->Connect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( DIALOG_BOM_BASE::OnPluginSelected ), NULL, this ); m_textCtrlName->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_BOM_BASE::OnNameEdited ), NULL, this ); m_buttonAddPlugin->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_BOM_BASE::OnAddPlugin ), NULL, this ); - m_buttonDelPlugin->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_BOM_BASE::OnRemovePlugin ), NULL, this ); m_buttonEdit->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_BOM_BASE::OnEditPlugin ), NULL, this ); + m_buttonDelPlugin->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_BOM_BASE::OnRemovePlugin ), NULL, this ); m_textCtrlCommand->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_BOM_BASE::OnCommandLineEdited ), NULL, this ); m_checkBoxShowConsole->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_BOM_BASE::OnShowConsoleChanged ), NULL, this ); m_sdbSizer1Help->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_BOM_BASE::OnHelp ), NULL, this ); @@ -147,8 +147,8 @@ DIALOG_BOM_BASE::~DIALOG_BOM_BASE() m_lbPlugins->Disconnect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( DIALOG_BOM_BASE::OnPluginSelected ), NULL, this ); m_textCtrlName->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_BOM_BASE::OnNameEdited ), NULL, this ); m_buttonAddPlugin->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_BOM_BASE::OnAddPlugin ), NULL, this ); - m_buttonDelPlugin->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_BOM_BASE::OnRemovePlugin ), NULL, this ); m_buttonEdit->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_BOM_BASE::OnEditPlugin ), NULL, this ); + m_buttonDelPlugin->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_BOM_BASE::OnRemovePlugin ), NULL, this ); m_textCtrlCommand->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_BOM_BASE::OnCommandLineEdited ), NULL, this ); m_checkBoxShowConsole->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_BOM_BASE::OnShowConsoleChanged ), NULL, this ); m_sdbSizer1Help->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_BOM_BASE::OnHelp ), NULL, this ); diff --git a/eeschema/dialogs/dialog_bom_base.fbp b/eeschema/dialogs/dialog_bom_base.fbp index 16774fa12a..32f7c3c189 100644 --- a/eeschema/dialogs/dialog_bom_base.fbp +++ b/eeschema/dialogs/dialog_bom_base.fbp @@ -14,7 +14,6 @@ dialog_bom_base 1000 none - 1 dialog_bom_base @@ -638,7 +637,7 @@ Resizable 1 - -1,-1 + 30,30 wxBU_AUTODRAW ; forward_declare 0 @@ -721,7 +720,7 @@ 0 1 - m_buttonDelPlugin + m_buttonEdit 1 @@ -731,11 +730,11 @@ Resizable 1 - -1,-1 + 30,30 wxBU_AUTODRAW ; forward_declare 0 - Remove the current plugin from list + Edit the plugin file in the text editor wxFILTER_NONE wxDefaultValidator @@ -743,7 +742,7 @@ - OnRemovePlugin + OnEditPlugin @@ -824,7 +823,7 @@ 0 1 - m_buttonEdit + m_buttonDelPlugin 1 @@ -834,11 +833,11 @@ Resizable 1 - -1,-1 + 30,30 wxBU_AUTODRAW ; forward_declare 0 - Edit the plugin file in the text editor + Remove the current plugin from list wxFILTER_NONE wxDefaultValidator @@ -846,7 +845,7 @@ - OnEditPlugin + OnRemovePlugin diff --git a/eeschema/dialogs/dialog_bom_base.h b/eeschema/dialogs/dialog_bom_base.h index 8e5a857a83..e02edbef9c 100644 --- a/eeschema/dialogs/dialog_bom_base.h +++ b/eeschema/dialogs/dialog_bom_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 5 2018) +// C++ code generated with wxFormBuilder (version Dec 30 2017) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -52,8 +52,8 @@ class DIALOG_BOM_BASE : public DIALOG_SHIM wxTextCtrl* m_textCtrlName; wxTextCtrl* m_Messages; wxBitmapButton* m_buttonAddPlugin; - wxBitmapButton* m_buttonDelPlugin; wxBitmapButton* m_buttonEdit; + wxBitmapButton* m_buttonDelPlugin; wxStaticText* m_staticTextCmd; wxTextCtrl* m_textCtrlCommand; wxCheckBox* m_checkBoxShowConsole; @@ -68,8 +68,8 @@ class DIALOG_BOM_BASE : public DIALOG_SHIM virtual void OnPluginSelected( wxCommandEvent& event ) { event.Skip(); } virtual void OnNameEdited( wxCommandEvent& event ) { event.Skip(); } virtual void OnAddPlugin( wxCommandEvent& event ) { event.Skip(); } - virtual void OnRemovePlugin( wxCommandEvent& event ) { event.Skip(); } virtual void OnEditPlugin( wxCommandEvent& event ) { event.Skip(); } + virtual void OnRemovePlugin( wxCommandEvent& event ) { event.Skip(); } virtual void OnCommandLineEdited( wxCommandEvent& event ) { event.Skip(); } virtual void OnShowConsoleChanged( wxCommandEvent& event ) { event.Skip(); } virtual void OnHelp( wxCommandEvent& event ) { event.Skip(); } diff --git a/eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp b/eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp index 949a2b0b5a..e82f46004b 100644 --- a/eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp +++ b/eeschema/dialogs/dialog_edit_component_in_schematic_base.cpp @@ -222,7 +222,7 @@ DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_BASE::DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_BASE m_stdDialogButtonSizer->AddButton( m_stdDialogButtonSizerCancel ); m_stdDialogButtonSizer->Realize(); - bSizer101->Add( m_stdDialogButtonSizer, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); + bSizer101->Add( m_stdDialogButtonSizer, 0, wxEXPAND|wxALL, 5 ); mainSizer->Add( bSizer101, 0, wxEXPAND, 5 ); diff --git a/eeschema/dialogs/dialog_edit_component_in_schematic_base.fbp b/eeschema/dialogs/dialog_edit_component_in_schematic_base.fbp index 35be9dac7a..4ec8245ae3 100644 --- a/eeschema/dialogs/dialog_edit_component_in_schematic_base.fbp +++ b/eeschema/dialogs/dialog_edit_component_in_schematic_base.fbp @@ -1888,7 +1888,7 @@ 5 - wxEXPAND|wxRIGHT|wxLEFT + wxEXPAND|wxALL 0 0 diff --git a/eeschema/dialogs/dialog_plot_schematic_base.cpp b/eeschema/dialogs/dialog_plot_schematic_base.cpp index 2eb128dbe4..f3b6b66412 100644 --- a/eeschema/dialogs/dialog_plot_schematic_base.cpp +++ b/eeschema/dialogs/dialog_plot_schematic_base.cpp @@ -147,10 +147,10 @@ DIALOG_PLOT_SCHEMATIC_BASE::DIALOG_PLOT_SCHEMATIC_BASE( wxWindow* parent, wxWind m_MessagesBox = new WX_HTML_REPORT_PANEL( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); m_MessagesBox->SetMinSize( wxSize( 300,150 ) ); - bSizerMsgPanel->Add( m_MessagesBox, 1, wxEXPAND | wxALL, 5 ); + bSizerMsgPanel->Add( m_MessagesBox, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); - bMainSizer->Add( bSizerMsgPanel, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); + bMainSizer->Add( bSizerMsgPanel, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 ); m_sdbSizer1 = new wxStdDialogButtonSizer(); m_sdbSizer1OK = new wxButton( this, wxID_OK ); diff --git a/eeschema/dialogs/dialog_plot_schematic_base.fbp b/eeschema/dialogs/dialog_plot_schematic_base.fbp index 70962f4291..a72f893b67 100644 --- a/eeschema/dialogs/dialog_plot_schematic_base.fbp +++ b/eeschema/dialogs/dialog_plot_schematic_base.fbp @@ -1692,7 +1692,7 @@ 5 - wxEXPAND|wxTOP|wxRIGHT|wxLEFT + wxEXPAND|wxRIGHT|wxLEFT 1 @@ -1701,7 +1701,7 @@ none 5 - wxEXPAND | wxALL + wxEXPAND|wxTOP|wxRIGHT|wxLEFT 1 1 diff --git a/eeschema/dialogs/panel_sym_lib_table_base.cpp b/eeschema/dialogs/panel_sym_lib_table_base.cpp index 260da51c65..a5a87d25b5 100644 --- a/eeschema/dialogs/panel_sym_lib_table_base.cpp +++ b/eeschema/dialogs/panel_sym_lib_table_base.cpp @@ -187,7 +187,7 @@ PANEL_SYM_LIB_TABLE_BASE::PANEL_SYM_LIB_TABLE_BASE( wxWindow* parent, wxWindowID sbSizer1->Add( m_path_subs_grid, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - bSizer1->Add( sbSizer1, 0, wxALL|wxEXPAND, 5 ); + bSizer1->Add( sbSizer1, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); this->SetSizer( bSizer1 ); diff --git a/eeschema/dialogs/panel_sym_lib_table_base.fbp b/eeschema/dialogs/panel_sym_lib_table_base.fbp index ce76451685..19e425d1f1 100644 --- a/eeschema/dialogs/panel_sym_lib_table_base.fbp +++ b/eeschema/dialogs/panel_sym_lib_table_base.fbp @@ -1494,7 +1494,7 @@ 5 - wxALL|wxEXPAND + wxEXPAND|wxRIGHT|wxLEFT 0 wxID_ANY diff --git a/pcbnew/dialogs/dialog_drc_base.cpp b/pcbnew/dialogs/dialog_drc_base.cpp index c43584cdf7..988c20d6bc 100644 --- a/pcbnew/dialogs/dialog_drc_base.cpp +++ b/pcbnew/dialogs/dialog_drc_base.cpp @@ -196,7 +196,7 @@ DIALOG_DRC_CONTROL_BASE::DIALOG_DRC_CONTROL_BASE( wxWindow* parent, wxWindowID i m_sizerButtons->Add( m_DeleteCurrentMarkerButton, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 10 ); m_DeleteAllMarkersButton = new wxButton( this, wxID_ANY, _("Delete All Markers"), wxDefaultPosition, wxDefaultSize, 0 ); - m_sizerButtons->Add( m_DeleteAllMarkersButton, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 ); + m_sizerButtons->Add( m_DeleteAllMarkersButton, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); m_sdbSizer1 = new wxStdDialogButtonSizer(); m_sdbSizer1OK = new wxButton( this, wxID_OK ); @@ -207,10 +207,10 @@ DIALOG_DRC_CONTROL_BASE::DIALOG_DRC_CONTROL_BASE( wxWindow* parent, wxWindowID i m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); m_sdbSizer1->Realize(); - m_sizerButtons->Add( m_sdbSizer1, 1, wxEXPAND, 5 ); + m_sizerButtons->Add( m_sdbSizer1, 1, wxEXPAND|wxALL, 5 ); - m_MainSizer->Add( m_sizerButtons, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + m_MainSizer->Add( m_sizerButtons, 0, wxEXPAND|wxLEFT, 5 ); this->SetSizer( m_MainSizer ); diff --git a/pcbnew/dialogs/dialog_drc_base.fbp b/pcbnew/dialogs/dialog_drc_base.fbp index b89ae88b00..079316f1b6 100644 --- a/pcbnew/dialogs/dialog_drc_base.fbp +++ b/pcbnew/dialogs/dialog_drc_base.fbp @@ -2199,7 +2199,7 @@ 5 - wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT + wxEXPAND|wxLEFT 0 @@ -2296,7 +2296,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT + wxALIGN_CENTER_VERTICAL|wxRIGHT 0 1 @@ -2384,7 +2384,7 @@ 5 - wxEXPAND + wxEXPAND|wxALL 1 1 diff --git a/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp b/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp index d6dfc4dc78..f7a839141e 100644 --- a/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp +++ b/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor.cpp @@ -97,12 +97,6 @@ DIALOG_FOOTPRINT_BOARD_EDITOR::DIALOG_FOOTPRINT_BOARD_EDITOR( PCB_EDIT_FRAME* aP m_config->Read( FootprintTextShownColumnsKey, &shownColumns, wxT( "0 1 2 3 4 5 6" ) ); m_itemsGrid->ShowHideColumns( shownColumns ); -#ifdef __WXOSX_MAC__ - // Knock the margins off on Mac - m_sizerAP->GetItem( m_sizerAllow90 )->SetFlag( wxEXPAND ); - m_sizerAP->GetItem( m_sizerAllow180 )->SetFlag( wxEXPAND ); -#endif - // Set up the 3D models grid wxGridCellAttr* attr = new wxGridCellAttr; attr->SetRenderer( new wxGridCellBoolRenderer() ); @@ -277,7 +271,7 @@ bool DIALOG_FOOTPRINT_BOARD_EDITOR::TransferDataToWindow() && !m_Orient270->GetValue() && !m_Orient180->GetValue() ); m_OrientValidator.TransferToWindow(); - m_LayerCtrl->SetSelection( (m_footprint->GetLayer() == B_Cu) ? 1 : 0 ); + m_BoardSideCtrl->SetSelection( (m_footprint->GetLayer() == B_Cu) ? 1 : 0 ); if( m_footprint->IsLocked() ) m_AutoPlaceCtrl->SetSelection( 2 ); @@ -689,7 +683,7 @@ bool DIALOG_FOOTPRINT_BOARD_EDITOR::TransferDataFromWindow() // Set component side, that also have effect on the fields positions on board bool change_layer = false; - if( m_LayerCtrl->GetSelection() == 0 ) // layer req = COMPONENT + if( m_BoardSideCtrl->GetSelection() == 0 ) // layer req = COMPONENT { if( m_footprint->GetLayer() == B_Cu ) change_layer = true; @@ -760,7 +754,6 @@ void DIALOG_FOOTPRINT_BOARD_EDITOR::OnDeleteField( wxCommandEvent& ) { m_itemsGrid->CommitPendingChanges( true /* quiet mode */ ); - int rowCount = m_itemsGrid->GetNumberRows(); int curRow = m_itemsGrid->GetGridCursorRow(); if( curRow < 0 ) diff --git a/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp b/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp index 11f8129100..4ef307d09f 100644 --- a/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp +++ b/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.cpp @@ -109,7 +109,7 @@ DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::DIALOG_FOOTPRINT_BOARD_EDITOR_BASE( wxWindow bSizerLeft->Add( 0, 0, 0, wxEXPAND|wxTOP, 5 ); wxFlexGridSizer* fgSizerPos; - fgSizerPos = new wxFlexGridSizer( 2, 3, 3, 0 ); + fgSizerPos = new wxFlexGridSizer( 2, 3, 4, 0 ); fgSizerPos->AddGrowableCol( 1 ); fgSizerPos->AddGrowableRow( 0 ); fgSizerPos->AddGrowableRow( 1 ); @@ -142,7 +142,7 @@ DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::DIALOG_FOOTPRINT_BOARD_EDITOR_BASE( wxWindow bSizerLeft->Add( fgSizerPos, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); - bSizerLeft->Add( 0, 0, 0, wxEXPAND|wxTOP, 3 ); + bSizerLeft->Add( 0, 0, 0, wxEXPAND|wxTOP|wxBOTTOM, 3 ); wxStaticBoxSizer* sbOrientationSizer; sbOrientationSizer = new wxStaticBoxSizer( new wxStaticBox( m_PanelGeneral, wxID_ANY, _("Orientation") ), wxVERTICAL ); @@ -176,13 +176,23 @@ DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::DIALOG_FOOTPRINT_BOARD_EDITOR_BASE( wxWindow sbOrientationSizer->Add( gbSizer1, 1, wxEXPAND, 5 ); - bSizerLeft->Add( sbOrientationSizer, 1, wxEXPAND|wxALL, 5 ); + bSizerLeft->Add( sbOrientationSizer, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); - wxString m_LayerCtrlChoices[] = { _("Front"), _("Back") }; - int m_LayerCtrlNChoices = sizeof( m_LayerCtrlChoices ) / sizeof( wxString ); - m_LayerCtrl = new wxRadioBox( m_PanelGeneral, wxID_ANY, _("Board Side"), wxDefaultPosition, wxDefaultSize, m_LayerCtrlNChoices, m_LayerCtrlChoices, 1, wxRA_SPECIFY_COLS ); - m_LayerCtrl->SetSelection( 0 ); - bSizerLeft->Add( m_LayerCtrl, 0, wxALL|wxEXPAND, 5 ); + wxBoxSizer* bSizerBoardSize; + bSizerBoardSize = new wxBoxSizer( wxHORIZONTAL ); + + m_BoardSideLabel = new wxStaticText( m_PanelGeneral, wxID_ANY, _("Board side:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_BoardSideLabel->Wrap( -1 ); + bSizerBoardSize->Add( m_BoardSideLabel, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + + wxString m_BoardSideCtrlChoices[] = { _("Front"), _("Back") }; + int m_BoardSideCtrlNChoices = sizeof( m_BoardSideCtrlChoices ) / sizeof( wxString ); + m_BoardSideCtrl = new wxChoice( m_PanelGeneral, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_BoardSideCtrlNChoices, m_BoardSideCtrlChoices, 0 ); + m_BoardSideCtrl->SetSelection( 0 ); + bSizerBoardSize->Add( m_BoardSideCtrl, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + + + bSizerLeft->Add( bSizerBoardSize, 0, wxEXPAND|wxALL, 5 ); bSizerProperties->Add( bSizerLeft, 1, wxEXPAND, 5 ); @@ -206,11 +216,14 @@ DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::DIALOG_FOOTPRINT_BOARD_EDITOR_BASE( wxWindow m_sizerAllow90->Add( m_allow90Label, 0, 0, 5 ); - m_CostRot90Ctrl = new wxSlider( m_sizerAP->GetStaticBox(), wxID_ANY, 0, 0, 10, wxDefaultPosition, wxDefaultSize, wxSL_AUTOTICKS|wxSL_HORIZONTAL|wxSL_LABELS ); + m_CostRot90Ctrl = new wxSlider( m_sizerAP->GetStaticBox(), wxID_ANY, 0, 0, 10, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSL_LABELS ); m_sizerAllow90->Add( m_CostRot90Ctrl, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); - m_sizerAP->Add( m_sizerAllow90, 1, wxEXPAND|wxTOP, 5 ); + m_sizerAP->Add( m_sizerAllow90, 0, wxEXPAND, 5 ); + + + m_sizerAP->Add( 0, 8, 1, wxEXPAND, 5 ); m_sizerAllow180 = new wxBoxSizer( wxVERTICAL ); @@ -218,13 +231,13 @@ DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::DIALOG_FOOTPRINT_BOARD_EDITOR_BASE( wxWindow m_allow180Label->Wrap( -1 ); m_allow180Label->SetFont( wxFont( 11, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); - m_sizerAllow180->Add( m_allow180Label, 0, wxTOP, 5 ); + m_sizerAllow180->Add( m_allow180Label, 0, 0, 5 ); - m_CostRot180Ctrl = new wxSlider( m_sizerAP->GetStaticBox(), wxID_ANY, 0, 0, 10, wxDefaultPosition, wxDefaultSize, wxSL_AUTOTICKS|wxSL_HORIZONTAL|wxSL_LABELS ); + m_CostRot180Ctrl = new wxSlider( m_sizerAP->GetStaticBox(), wxID_ANY, 0, 0, 10, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSL_LABELS ); m_sizerAllow180->Add( m_CostRot180Ctrl, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - m_sizerAP->Add( m_sizerAllow180, 1, wxEXPAND|wxTOP, 5 ); + m_sizerAP->Add( m_sizerAllow180, 0, wxEXPAND, 5 ); bSizerMiddle->Add( m_sizerAP, 0, wxEXPAND|wxALL, 5 ); @@ -365,21 +378,21 @@ DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::DIALOG_FOOTPRINT_BOARD_EDITOR_BASE( wxWindow bSizerPanelClearances->Add( sbSizerLocalProperties, 0, wxEXPAND|wxALL, 10 ); - wxStaticBoxSizer* sbSizer5; - sbSizer5 = new wxStaticBoxSizer( new wxStaticBox( m_PanelClearances, wxID_ANY, _("Connection to Copper Zones") ), wxHORIZONTAL ); + wxStaticBoxSizer* sbSizerZoneConnection; + sbSizerZoneConnection = new wxStaticBoxSizer( new wxStaticBox( m_PanelClearances, wxID_ANY, _("Connection to Copper Zones") ), wxHORIZONTAL ); - m_staticText16 = new wxStaticText( sbSizer5->GetStaticBox(), wxID_ANY, _("Pad connection to zones:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText16 = new wxStaticText( sbSizerZoneConnection->GetStaticBox(), wxID_ANY, _("Pad connection to zones:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText16->Wrap( -1 ); - sbSizer5->Add( m_staticText16, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 ); + sbSizerZoneConnection->Add( m_staticText16, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 ); wxString m_ZoneConnectionChoiceChoices[] = { _("Use zone setting"), _("Solid"), _("Thermal relief"), _("None") }; int m_ZoneConnectionChoiceNChoices = sizeof( m_ZoneConnectionChoiceChoices ) / sizeof( wxString ); - m_ZoneConnectionChoice = new wxChoice( sbSizer5->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_ZoneConnectionChoiceNChoices, m_ZoneConnectionChoiceChoices, 0 ); + m_ZoneConnectionChoice = new wxChoice( sbSizerZoneConnection->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_ZoneConnectionChoiceNChoices, m_ZoneConnectionChoiceChoices, 0 ); m_ZoneConnectionChoice->SetSelection( 0 ); - sbSizer5->Add( m_ZoneConnectionChoice, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + sbSizerZoneConnection->Add( m_ZoneConnectionChoice, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - bSizerPanelClearances->Add( sbSizer5, 0, wxALL|wxEXPAND, 10 ); + bSizerPanelClearances->Add( sbSizerZoneConnection, 0, wxALL|wxEXPAND, 10 ); m_PanelClearances->SetSizer( bSizerPanelClearances ); @@ -392,7 +405,7 @@ DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::DIALOG_FOOTPRINT_BOARD_EDITOR_BASE( wxWindow wxStaticBoxSizer* sbSizer3; sbSizer3 = new wxStaticBoxSizer( new wxStaticBox( m_Panel3D, wxID_ANY, wxEmptyString ), wxVERTICAL ); - m_modelsGrid = new wxGrid( sbSizer3->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBORDER_SIMPLE ); + m_modelsGrid = new WX_GRID( sbSizer3->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBORDER_SIMPLE ); // Grid m_modelsGrid->CreateGrid( 3, 2 ); @@ -470,8 +483,8 @@ DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::DIALOG_FOOTPRINT_BOARD_EDITOR_BASE( wxWindow m_GeneralBoxSizer->Add( m_NoteBook, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 ); - wxBoxSizer* bSizer16; - bSizer16 = new wxBoxSizer( wxHORIZONTAL ); + wxBoxSizer* bSizerButtons; + bSizerButtons = new wxBoxSizer( wxHORIZONTAL ); wxFlexGridSizer* fgSizerSymbolRef; fgSizerSymbolRef = new wxFlexGridSizer( 2, 2, 1, 0 ); @@ -482,28 +495,16 @@ DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::DIALOG_FOOTPRINT_BOARD_EDITOR_BASE( wxWindow m_libraryIDLabel->Wrap( -1 ); m_libraryIDLabel->SetFont( wxFont( 11, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); - fgSizerSymbolRef->Add( m_libraryIDLabel, 0, wxTOP|wxRIGHT|wxLEFT, 3 ); + fgSizerSymbolRef->Add( m_libraryIDLabel, 0, wxBOTTOM|wxRIGHT|wxLEFT, 3 ); m_staticLibraryID = new wxStaticText( this, wxID_ANY, _("MyLabel"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticLibraryID->Wrap( -1 ); m_staticLibraryID->SetFont( wxFont( 11, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); - fgSizerSymbolRef->Add( m_staticLibraryID, 0, wxTOP, 3 ); - - m_sheetPathLabel = new wxStaticText( this, wxID_ANY, _("Schematic sheet:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_sheetPathLabel->Wrap( -1 ); - m_sheetPathLabel->SetFont( wxFont( 11, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); - - fgSizerSymbolRef->Add( m_sheetPathLabel, 0, wxRIGHT|wxLEFT, 3 ); - - m_staticSheetPath = new wxStaticText( this, wxID_ANY, _("MyLabel"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticSheetPath->Wrap( -1 ); - m_staticSheetPath->SetFont( wxFont( 11, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); - - fgSizerSymbolRef->Add( m_staticSheetPath, 0, 0, 3 ); + fgSizerSymbolRef->Add( m_staticLibraryID, 0, wxBOTTOM, 3 ); - bSizer16->Add( fgSizerSymbolRef, 1, wxRIGHT|wxLEFT, 10 ); + bSizerButtons->Add( fgSizerSymbolRef, 1, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 10 ); m_sdbSizerStdButtons = new wxStdDialogButtonSizer(); m_sdbSizerStdButtonsOK = new wxButton( this, wxID_OK ); @@ -512,10 +513,10 @@ DIALOG_FOOTPRINT_BOARD_EDITOR_BASE::DIALOG_FOOTPRINT_BOARD_EDITOR_BASE( wxWindow m_sdbSizerStdButtons->AddButton( m_sdbSizerStdButtonsCancel ); m_sdbSizerStdButtons->Realize(); - bSizer16->Add( m_sdbSizerStdButtons, 0, wxEXPAND|wxALL, 5 ); + bSizerButtons->Add( m_sdbSizerStdButtons, 0, wxEXPAND|wxALL, 5 ); - m_GeneralBoxSizer->Add( bSizer16, 0, wxEXPAND, 5 ); + m_GeneralBoxSizer->Add( bSizerButtons, 0, wxEXPAND|wxLEFT, 5 ); this->SetSizer( m_GeneralBoxSizer ); diff --git a/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.fbp b/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.fbp index 5b9d6069dc..63db9e184f 100644 --- a/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.fbp +++ b/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.fbp @@ -666,7 +666,7 @@ wxFLEX_GROWMODE_SPECIFIED none 2 - 3 + 4 5 wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT @@ -1185,7 +1185,7 @@ 3 - wxEXPAND|wxTOP + wxEXPAND|wxTOP|wxBOTTOM 0 0 @@ -1195,7 +1195,7 @@ 5 - wxEXPAND|wxALL + wxEXPAND|wxTOP|wxRIGHT|wxLEFT 1 wxID_ANY @@ -1774,94 +1774,186 @@ - + 5 - wxALL|wxEXPAND + wxEXPAND|wxALL 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - "Front" "Back" - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Board Side - 1 - - 0 - - - 0 + - 1 - m_LayerCtrl - 1 - - - protected - 1 - - Resizable - 0 - 1 - - wxRA_SPECIFY_COLS - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - + bSizerBoardSize + wxHORIZONTAL + none + + 5 + wxALIGN_CENTER_VERTICAL|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Board side: + + 0 + + + 0 + + 1 + m_BoardSideLabel + 1 + + + protected + 1 + + Resizable + 1 + + + ; forward_declare + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxALL + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + "Front" "Back" + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_BoardSideCtrl + 1 + + + protected + 1 + + Resizable + 0 + 1 + + + ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1980,8 +2072,8 @@ 5 - wxEXPAND|wxTOP - 1 + wxEXPAND + 0 m_sizerAllow90 @@ -2121,7 +2213,7 @@ Resizable 1 - wxSL_AUTOTICKS|wxSL_HORIZONTAL|wxSL_LABELS + wxSL_HORIZONTAL|wxSL_LABELS 0 @@ -2182,8 +2274,18 @@ 5 - wxEXPAND|wxTOP + wxEXPAND 1 + + 8 + protected + 0 + + + + 5 + wxEXPAND + 0 m_sizerAllow180 @@ -2191,7 +2293,7 @@ protected 5 - wxTOP + 0 1 @@ -2323,7 +2425,7 @@ Resizable 1 - wxSL_AUTOTICKS|wxSL_HORIZONTAL|wxSL_LABELS + wxSL_HORIZONTAL|wxSL_LABELS 0 @@ -4261,7 +4363,7 @@ wxID_ANY Connection to Copper Zones - sbSizer5 + sbSizerZoneConnection wxHORIZONTAL 1 none @@ -4618,7 +4720,7 @@ 3 1 - ; forward_declare + WX_GRID; widgets/wx_grid.h; forward_declare 0 @@ -5099,16 +5201,16 @@ 5 - wxEXPAND + wxEXPAND|wxLEFT 0 - bSizer16 + bSizerButtons wxHORIZONTAL none 10 - wxRIGHT|wxLEFT + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT 1 2 @@ -5124,7 +5226,7 @@ 1 3 - wxTOP|wxRIGHT|wxLEFT + wxBOTTOM|wxRIGHT|wxLEFT 0 1 @@ -5207,7 +5309,7 @@ 3 - wxTOP + wxBOTTOM 0 1 @@ -5288,172 +5390,6 @@ - - 3 - wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - ,90,90,11,70,0 - 0 - 0 - wxID_ANY - Schematic sheet: - - 0 - - - 0 - - 1 - m_sheetPathLabel - 1 - - - protected - 1 - - Resizable - 1 - - - ; forward_declare - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 3 - - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - ,90,90,11,70,0 - 0 - 0 - wxID_ANY - MyLabel - - 0 - - - 0 - - 1 - m_staticSheetPath - 1 - - - protected - 1 - - Resizable - 1 - - - ; forward_declare - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.h b/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.h index 1bfa8a1e17..b0087a835a 100644 --- a/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.h +++ b/pcbnew/dialogs/dialog_edit_footprint_for_BoardEditor_base.h @@ -32,10 +32,10 @@ class WX_GRID; #include #include #include +#include #include #include #include -#include #include #include @@ -73,7 +73,8 @@ class DIALOG_FOOTPRINT_BOARD_EDITOR_BASE : public DIALOG_SHIM wxRadioButton* m_Orient180; wxRadioButton* m_OrientOther; wxTextCtrl* m_OrientValueCtrl; - wxRadioBox* m_LayerCtrl; + wxStaticText* m_BoardSideLabel; + wxChoice* m_BoardSideCtrl; wxRadioBox* m_AutoPlaceCtrl; wxStaticBoxSizer* m_sizerAP; wxBoxSizer* m_sizerAllow90; @@ -107,7 +108,7 @@ class DIALOG_FOOTPRINT_BOARD_EDITOR_BASE : public DIALOG_SHIM wxChoice* m_ZoneConnectionChoice; wxPanel* m_Panel3D; wxBoxSizer* bSizerMain3D; - wxGrid* m_modelsGrid; + WX_GRID* m_modelsGrid; wxBitmapButton* m_buttonAdd; wxBitmapButton* m_buttonBrowse; wxBitmapButton* m_buttonRemove; @@ -115,8 +116,6 @@ class DIALOG_FOOTPRINT_BOARD_EDITOR_BASE : public DIALOG_SHIM wxBoxSizer* bLowerSizer3D; wxStaticText* m_libraryIDLabel; wxStaticText* m_staticLibraryID; - wxStaticText* m_sheetPathLabel; - wxStaticText* m_staticSheetPath; wxStdDialogButtonSizer* m_sdbSizerStdButtons; wxButton* m_sdbSizerStdButtonsOK; wxButton* m_sdbSizerStdButtonsCancel; diff --git a/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp b/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp index f3367b7dd1..5dfd2c2936 100644 --- a/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp +++ b/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp @@ -94,12 +94,6 @@ DIALOG_FOOTPRINT_FP_EDITOR::DIALOG_FOOTPRINT_FP_EDITOR( FOOTPRINT_EDIT_FRAME* aP m_config->Read( LibFootprintTextShownColumnsKey, &shownColumns, wxT( "0 1 2 3 4 5 6" ) ); m_itemsGrid->ShowHideColumns( shownColumns ); -#ifdef __WXOSX_MAC__ - // Knock the margins off on Mac - m_sizerAP->GetItem( m_sizerAllow90 )->SetFlag( wxEXPAND ); - m_sizerAP->GetItem( m_sizerAllow180 )->SetFlag( wxEXPAND ); -#endif - // Set up the 3D models grid wxGridCellAttr* attr = new wxGridCellAttr; attr->SetRenderer( new wxGridCellBoolRenderer() ); diff --git a/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp b/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp index 75a01e9bc9..0cf5bbe639 100644 --- a/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp +++ b/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.cpp @@ -151,11 +151,14 @@ DIALOG_FOOTPRINT_FP_EDITOR_BASE::DIALOG_FOOTPRINT_FP_EDITOR_BASE( wxWindow* pare m_sizerAllow90->Add( m_allow90Label, 0, 0, 5 ); - m_CostRot90Ctrl = new wxSlider( m_sizerAP->GetStaticBox(), wxID_ANY, 0, 0, 10, wxDefaultPosition, wxDefaultSize, wxSL_AUTOTICKS|wxSL_HORIZONTAL|wxSL_LABELS ); + m_CostRot90Ctrl = new wxSlider( m_sizerAP->GetStaticBox(), wxID_ANY, 0, 0, 10, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSL_LABELS ); m_sizerAllow90->Add( m_CostRot90Ctrl, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); - m_sizerAP->Add( m_sizerAllow90, 1, wxEXPAND|wxTOP, 5 ); + m_sizerAP->Add( m_sizerAllow90, 0, wxEXPAND, 5 ); + + + m_sizerAP->Add( 0, 8, 1, wxEXPAND, 5 ); m_sizerAllow180 = new wxBoxSizer( wxVERTICAL ); @@ -163,13 +166,13 @@ DIALOG_FOOTPRINT_FP_EDITOR_BASE::DIALOG_FOOTPRINT_FP_EDITOR_BASE( wxWindow* pare m_allow180Label->Wrap( -1 ); m_allow180Label->SetFont( wxFont( 11, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); - m_sizerAllow180->Add( m_allow180Label, 0, wxTOP, 5 ); + m_sizerAllow180->Add( m_allow180Label, 0, 0, 5 ); - m_CostRot180Ctrl = new wxSlider( m_sizerAP->GetStaticBox(), wxID_ANY, 0, 0, 10, wxDefaultPosition, wxDefaultSize, wxSL_AUTOTICKS|wxSL_HORIZONTAL|wxSL_LABELS ); + m_CostRot180Ctrl = new wxSlider( m_sizerAP->GetStaticBox(), wxID_ANY, 0, 0, 10, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSL_LABELS ); m_sizerAllow180->Add( m_CostRot180Ctrl, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - m_sizerAP->Add( m_sizerAllow180, 1, wxEXPAND|wxTOP, 5 ); + m_sizerAP->Add( m_sizerAllow180, 0, wxEXPAND, 5 ); bSizerProperties->Add( m_sizerAP, 1, wxEXPAND|wxTOP, 5 ); diff --git a/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.fbp b/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.fbp index fdfa9e7d9c..530f8a8aca 100644 --- a/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.fbp +++ b/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor_base.fbp @@ -1277,8 +1277,8 @@ 5 - wxEXPAND|wxTOP - 1 + wxEXPAND + 0 m_sizerAllow90 @@ -1418,7 +1418,7 @@ Resizable 1 - wxSL_AUTOTICKS|wxSL_HORIZONTAL|wxSL_LABELS + wxSL_HORIZONTAL|wxSL_LABELS 0 @@ -1479,8 +1479,18 @@ 5 - wxEXPAND|wxTOP + wxEXPAND 1 + + 8 + protected + 0 + + + + 5 + wxEXPAND + 0 m_sizerAllow180 @@ -1488,7 +1498,7 @@ protected 5 - wxTOP + 0 1 @@ -1620,7 +1630,7 @@ Resizable 1 - wxSL_AUTOTICKS|wxSL_HORIZONTAL|wxSL_LABELS + wxSL_HORIZONTAL|wxSL_LABELS 0 diff --git a/pcbnew/dialogs/dialog_exchange_footprints_base.cpp b/pcbnew/dialogs/dialog_exchange_footprints_base.cpp index 7819dcd64e..4f3b267e7b 100644 --- a/pcbnew/dialogs/dialog_exchange_footprints_base.cpp +++ b/pcbnew/dialogs/dialog_exchange_footprints_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 5 2018) +// C++ code generated with wxFormBuilder (version Dec 30 2017) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -115,11 +115,7 @@ DIALOG_EXCHANGE_FOOTPRINTS_BASE::DIALOG_EXCHANGE_FOOTPRINTS_BASE( wxWindow* pare m_MessageWindow = new WX_HTML_REPORT_PANEL( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); m_MessageWindow->SetMinSize( wxSize( -1,240 ) ); - m_mainSizer->Add( m_MessageWindow, 5, wxALL|wxEXPAND, 10 ); - - wxStaticLine* staticline2; - staticline2 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - m_mainSizer->Add( staticline2, 0, wxEXPAND|wxRIGHT|wxLEFT, 10 ); + m_mainSizer->Add( m_MessageWindow, 5, wxEXPAND|wxRIGHT|wxLEFT, 10 ); m_sdbSizer = new wxStdDialogButtonSizer(); m_sdbSizerApply = new wxButton( this, wxID_APPLY ); @@ -133,6 +129,7 @@ DIALOG_EXCHANGE_FOOTPRINTS_BASE::DIALOG_EXCHANGE_FOOTPRINTS_BASE( wxWindow* pare this->SetSizer( m_mainSizer ); this->Layout(); + m_mainSizer->Fit( this ); // Connect Events this->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_EXCHANGE_FOOTPRINTS_BASE::updateMatchModeRadioButtons ) ); diff --git a/pcbnew/dialogs/dialog_exchange_footprints_base.fbp b/pcbnew/dialogs/dialog_exchange_footprints_base.fbp index b5af38adc9..2adf26b92e 100644 --- a/pcbnew/dialogs/dialog_exchange_footprints_base.fbp +++ b/pcbnew/dialogs/dialog_exchange_footprints_base.fbp @@ -14,7 +14,6 @@ dialog_exchange_footprints_base 4200 none - 1 dialog_exchange_footprints_base @@ -45,7 +44,7 @@ DIALOG_EXCHANGE_FOOTPRINTS_BASE - 570,416 + -1,-1 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER DIALOG_SHIM; dialog_shim.h %s @@ -1691,7 +1690,7 @@ 10 - wxALL|wxEXPAND + wxEXPAND|wxRIGHT|wxLEFT 5 1 @@ -1769,87 +1768,6 @@ - - 10 - wxEXPAND|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - staticline2 - 1 - - - none - 1 - - Resizable - 1 - - wxLI_HORIZONTAL - - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 wxEXPAND|wxALL diff --git a/pcbnew/dialogs/dialog_exchange_footprints_base.h b/pcbnew/dialogs/dialog_exchange_footprints_base.h index c804dc9c47..7ced8ef693 100644 --- a/pcbnew/dialogs/dialog_exchange_footprints_base.h +++ b/pcbnew/dialogs/dialog_exchange_footprints_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 5 2018) +// C++ code generated with wxFormBuilder (version Dec 30 2017) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -82,7 +82,7 @@ class DIALOG_EXCHANGE_FOOTPRINTS_BASE : public DIALOG_SHIM public: - DIALOG_EXCHANGE_FOOTPRINTS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("%s"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 570,416 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + DIALOG_EXCHANGE_FOOTPRINTS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("%s"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_EXCHANGE_FOOTPRINTS_BASE(); }; diff --git a/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp b/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp index 20bbe1f368..ef5e43b5cb 100644 --- a/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp +++ b/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 5 2018) +// C++ code generated with wxFormBuilder (version Dec 30 2017) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -153,6 +153,9 @@ DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE sbAction->Add( m_netclassGrid, 0, wxEXPAND|wxLEFT, 15 ); + sbAction->Add( 0, 0, 1, wxEXPAND|wxTOP, 5 ); + + bMainSizer->Add( sbAction, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); m_sdbSizer = new wxStdDialogButtonSizer(); diff --git a/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.fbp b/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.fbp index e39d978d9e..bf3be74e47 100644 --- a/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.fbp +++ b/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.fbp @@ -14,7 +14,6 @@ dialog_global_edit_tracks_and_vias_base 1000 none - 1 dialog_global_edit_tracks_and_vias_base @@ -1507,6 +1506,16 @@ + + 5 + wxEXPAND|wxTOP + 1 + + 0 + protected + 0 + + diff --git a/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.h b/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.h index 9c4c29453c..a0b13f9cef 100644 --- a/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.h +++ b/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 5 2018) +// C++ code generated with wxFormBuilder (version Dec 30 2017) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! diff --git a/pcbnew/dialogs/dialog_plot_base.cpp b/pcbnew/dialogs/dialog_plot_base.cpp index 24dd937ec6..5a2b2744b5 100644 --- a/pcbnew/dialogs/dialog_plot_base.cpp +++ b/pcbnew/dialogs/dialog_plot_base.cpp @@ -322,7 +322,7 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr bmiddleSizer->Add( m_PlotOptionsSizer, 0, 0, 5 ); - m_MainSizer->Add( bmiddleSizer, 0, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); + m_MainSizer->Add( bmiddleSizer, 0, wxEXPAND|wxALL, 5 ); wxBoxSizer* sbSizerMsg; sbSizerMsg = new wxBoxSizer( wxVERTICAL ); @@ -330,7 +330,7 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr m_messagesPanel = new WX_HTML_REPORT_PANEL( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); m_messagesPanel->SetMinSize( wxSize( -300,150 ) ); - sbSizerMsg->Add( m_messagesPanel, 1, wxEXPAND | wxALL, 5 ); + sbSizerMsg->Add( m_messagesPanel, 1, wxEXPAND|wxRIGHT|wxLEFT, 10 ); m_MainSizer->Add( sbSizerMsg, 1, wxEXPAND, 5 ); diff --git a/pcbnew/dialogs/dialog_plot_base.fbp b/pcbnew/dialogs/dialog_plot_base.fbp index aa146f55dd..33cb087084 100644 --- a/pcbnew/dialogs/dialog_plot_base.fbp +++ b/pcbnew/dialogs/dialog_plot_base.fbp @@ -554,7 +554,7 @@ 5 - wxEXPAND|wxLEFT|wxRIGHT|wxTOP + wxEXPAND|wxALL 0 @@ -4395,14 +4395,14 @@ 5 wxEXPAND 1 - + sbSizerMsg wxVERTICAL none - 5 - wxEXPAND | wxALL + 10 + wxEXPAND|wxRIGHT|wxLEFT 1 1 diff --git a/pcbnew/dialogs/dialog_set_grid_base.cpp b/pcbnew/dialogs/dialog_set_grid_base.cpp index 4fb36e2d26..604afe913a 100644 --- a/pcbnew/dialogs/dialog_set_grid_base.cpp +++ b/pcbnew/dialogs/dialog_set_grid_base.cpp @@ -54,7 +54,7 @@ DIALOG_SET_GRID_BASE::DIALOG_SET_GRID_BASE( wxWindow* parent, wxWindowID id, con sbLeftSizer->Add( fgSizerGridOrigin, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); - bUpperSizer->Add( sbLeftSizer, 0, wxEXPAND|wxTOP|wxBOTTOM|wxRIGHT, 5 ); + bUpperSizer->Add( sbLeftSizer, 0, wxEXPAND|wxALL, 5 ); wxStaticBoxSizer* sbUserGridSizer; sbUserGridSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("User Defined Grid") ), wxVERTICAL ); @@ -127,13 +127,13 @@ DIALOG_SET_GRID_BASE::DIALOG_SET_GRID_BASE( wxWindow* parent, wxWindowID id, con sbFastSwitchSizer->Add( fgSizer3, 0, wxEXPAND|wxLEFT, 5 ); - bSizerMain->Add( sbFastSwitchSizer, 0, wxEXPAND|wxALL, 5 ); + bSizerMain->Add( sbFastSwitchSizer, 0, wxEXPAND|wxRIGHT|wxLEFT, 10 ); wxBoxSizer* bButtonSizer; bButtonSizer = new wxBoxSizer( wxHORIZONTAL ); m_buttonReset = new wxButton( this, wxID_ANY, _("Reset Grid Origin"), wxDefaultPosition, wxDefaultSize, 0 ); - bButtonSizer->Add( m_buttonReset, 0, wxALL|wxEXPAND, 5 ); + bButtonSizer->Add( m_buttonReset, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); bButtonSizer->Add( 0, 0, 1, wxEXPAND, 5 ); @@ -145,7 +145,7 @@ DIALOG_SET_GRID_BASE::DIALOG_SET_GRID_BASE( wxWindow* parent, wxWindowID id, con m_sdbSizer->AddButton( m_sdbSizerCancel ); m_sdbSizer->Realize(); - bButtonSizer->Add( m_sdbSizer, 0, wxEXPAND, 5 ); + bButtonSizer->Add( m_sdbSizer, 0, wxEXPAND|wxALL, 5 ); bSizerMain->Add( bButtonSizer, 0, wxEXPAND|wxLEFT, 5 ); diff --git a/pcbnew/dialogs/dialog_set_grid_base.fbp b/pcbnew/dialogs/dialog_set_grid_base.fbp index 8cbeecbf27..d7f9d3abac 100644 --- a/pcbnew/dialogs/dialog_set_grid_base.fbp +++ b/pcbnew/dialogs/dialog_set_grid_base.fbp @@ -104,7 +104,7 @@ none 5 - wxEXPAND|wxTOP|wxBOTTOM|wxRIGHT + wxEXPAND|wxALL 0 wxID_ANY @@ -1199,8 +1199,8 @@ - 5 - wxEXPAND|wxALL + 10 + wxEXPAND|wxRIGHT|wxLEFT 0 wxID_ANY @@ -1594,7 +1594,7 @@ none 5 - wxALL|wxEXPAND + wxEXPAND|wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT 0 1 @@ -1692,7 +1692,7 @@ 5 - wxEXPAND + wxEXPAND|wxALL 0 0