Dialog enum pads: fix incorrect use of sizers. (698bd331) · Commits · Elphel / kicad-source-mirror

pcbnew/dialogs/dialog_enum_pads.cpp

+4 −0

Original line number	Diff line number	Diff line
		@@ -27,6 +27,10 @@
		DIALOG_ENUM_PADS::DIALOG_ENUM_PADS( wxWindow* aParent ) :
		DIALOG_ENUM_PADS_BASE( aParent )
		{
		// Calling SetSizeHints after all widgets are built is mandatory
		// to set the correct size of the dialog
		GetSizer()->SetSizeHints( this );
		Center();
		}

pcbnew/dialogs/dialog_enum_pads_base.cpp

+22 −19

Original line number	Diff line number	Diff line
		///////////////////////////////////////////////////////////////////////////
		// C++ code generated with wxFormBuilder (version Apr 30 2013)
		// C++ code generated with wxFormBuilder (version Jun 5 2014)
		// http://www.wxformbuilder.org/
		//
		// PLEASE DO "NOT" EDIT THIS FILE!
		@@ -9,43 +9,46 @@

		///////////////////////////////////////////////////////////////////////////

		DIALOG_ENUM_PADS_BASE::DIALOG_ENUM_PADS_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
		DIALOG_ENUM_PADS_BASE::DIALOG_ENUM_PADS_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style )
		{
		this->SetSizeHints( wxDefaultSize, wxDefaultSize );

		wxBoxSizer* bMainSizer;
		bMainSizer = new wxBoxSizer( wxVERTICAL );

		wxBoxSizer* bPrefixSizer;
		bPrefixSizer = new wxBoxSizer( wxHORIZONTAL );
		m_lblInfo = new wxStaticText( this, wxID_ANY, _("Pad names are restricted to 4 characters (including number)."), wxDefaultPosition, wxDefaultSize, 0 );
		m_lblInfo->Wrap( -1 );
		bMainSizer->Add( m_lblInfo, 0, wxALL\|wxALIGN_CENTER_HORIZONTAL, 5 );


		bMainSizer->Add( 0, 0, 0, wxTOP\|wxBOTTOM, 5 );

		wxFlexGridSizer* fgSizer;
		fgSizer = new wxFlexGridSizer( 0, 2, 0, 0 );
		fgSizer->AddGrowableCol( 1 );
		fgSizer->SetFlexibleDirection( wxBOTH );
		fgSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );

		m_lblPadPrefix = new wxStaticText( this, wxID_ANY, _("Pad name prefix:"), wxDefaultPosition, wxDefaultSize, 0 );
		m_lblPadPrefix->Wrap( -1 );
		bPrefixSizer->Add( m_lblPadPrefix, 1, wxALL, 5 );
		fgSizer->Add( m_lblPadPrefix, 0, wxALL\|wxALIGN_CENTER_VERTICAL, 5 );

		m_padPrefix = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
		m_padPrefix->SetMaxLength( 4 );
		bPrefixSizer->Add( m_padPrefix, 0, wxALL, 5 );


		bMainSizer->Add( bPrefixSizer, 1, wxEXPAND, 5 );

		wxBoxSizer* bPadNumSizer;
		bPadNumSizer = new wxBoxSizer( wxHORIZONTAL );
		fgSizer->Add( m_padPrefix, 0, wxALL\|wxEXPAND\|wxALIGN_CENTER_VERTICAL, 5 );

		m_lblPadStartNum = new wxStaticText( this, wxID_ANY, _("First pad number:"), wxDefaultPosition, wxDefaultSize, 0 );
		m_lblPadStartNum->Wrap( -1 );
		bPadNumSizer->Add( m_lblPadStartNum, 1, wxALL, 5 );
		fgSizer->Add( m_lblPadStartNum, 0, wxALL\|wxALIGN_CENTER_VERTICAL, 5 );

		m_padStartNum = new wxSpinCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 999, 1 );
		bPadNumSizer->Add( m_padStartNum, 0, wxALL, 5 );
		fgSizer->Add( m_padStartNum, 0, wxALL\|wxEXPAND, 5 );


		bMainSizer->Add( bPadNumSizer, 1, wxEXPAND, 5 );
		bMainSizer->Add( fgSizer, 1, wxEXPAND\|wxALL, 5 );

		m_lblInfo = new wxStaticText( this, wxID_ANY, _("Pad names are restricted to 4 characters (including number)."), wxDefaultPosition, wxDefaultSize, 0 );
		m_lblInfo->Wrap( 320 );
		bMainSizer->Add( m_lblInfo, 0, wxALL, 5 );
		m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
		bMainSizer->Add( m_staticline1, 0, wxEXPAND \| wxALL, 5 );

		m_stdButtons = new wxStdDialogButtonSizer();
		m_stdButtonsOK = new wxButton( this, wxID_OK );
		@@ -54,7 +57,7 @@ DIALOG_ENUM_PADS_BASE::DIALOG_ENUM_PADS_BASE( wxWindow* parent, wxWindowID id, c
		m_stdButtons->AddButton( m_stdButtonsCancel );
		m_stdButtons->Realize();

		bMainSizer->Add( m_stdButtons, 2, wxEXPAND, 5 );
		bMainSizer->Add( m_stdButtons, 0, wxEXPAND\|wxALL, 5 );


		this->SetSizer( bMainSizer );

pcbnew/dialogs/dialog_enum_pads_base.fbp

+123 −33

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
		<wxFormBuilder_Project>
		<FileVersion major="1" minor="11" />
		<FileVersion major="1" minor="13" />
		<object class="Project" expanded="1">
		<property name="class_decoration"></property>
		<property name="code_generation">C++</property>
		@@ -20,8 +20,10 @@
		<property name="path">.</property>
		<property name="precompiled_header"></property>
		<property name="relative_path">1</property>
		<property name="skip_lua_events">1</property>
		<property name="skip_php_events">1</property>
		<property name="skip_python_events">1</property>
		<property name="ui_table">UI</property>
		<property name="use_enum">0</property>
		<property name="use_microsoft_bom">0</property>
		<object class="Dialog" expanded="1">
		@@ -42,9 +44,9 @@
		<property name="minimum_size"></property>
		<property name="name">DIALOG_ENUM_PADS_BASE</property>
		<property name="pos"></property>
		<property name="size">340,240</property>
		<property name="style">wxDEFAULT_DIALOG_STYLE</property>
		<property name="subclass"></property>
		<property name="size">340,187</property>
		<property name="style">wxDEFAULT_DIALOG_STYLE\|wxRESIZE_BORDER</property>
		<property name="subclass">DIALOG_SHIM; dialog_shim.h</property>
		<property name="title">Pad enumeration settings</property>
		<property name="tooltip"></property>
		<property name="window_extra_style"></property>
		@@ -93,17 +95,117 @@
		<property name="permission">none</property>
		<object class="sizeritem" expanded="1">
		<property name="border">5</property>
		<property name="flag">wxEXPAND</property>
		<property name="flag">wxALL\|wxALIGN_CENTER_HORIZONTAL</property>
		<property name="proportion">0</property>
		<object class="wxStaticText" expanded="1">
		<property name="BottomDockable">1</property>
		<property name="LeftDockable">1</property>
		<property name="RightDockable">1</property>
		<property name="TopDockable">1</property>
		<property name="aui_layer"></property>
		<property name="aui_name"></property>
		<property name="aui_position"></property>
		<property name="aui_row"></property>
		<property name="best_size"></property>
		<property name="bg"></property>
		<property name="caption"></property>
		<property name="caption_visible">1</property>
		<property name="center_pane">0</property>
		<property name="close_button">1</property>
		<property name="context_help"></property>
		<property name="context_menu">1</property>
		<property name="default_pane">0</property>
		<property name="dock">Dock</property>
		<property name="dock_fixed">0</property>
		<property name="docking">Left</property>
		<property name="enabled">1</property>
		<property name="fg"></property>
		<property name="floatable">1</property>
		<property name="font"></property>
		<property name="gripper">0</property>
		<property name="hidden">0</property>
		<property name="id">wxID_ANY</property>
		<property name="label">Pad names are restricted to 4 characters (including number).</property>
		<property name="max_size"></property>
		<property name="maximize_button">0</property>
		<property name="maximum_size"></property>
		<property name="min_size"></property>
		<property name="minimize_button">0</property>
		<property name="minimum_size"></property>
		<property name="moveable">1</property>
		<property name="name">m_lblInfo</property>
		<property name="pane_border">1</property>
		<property name="pane_position"></property>
		<property name="pane_size"></property>
		<property name="permission">protected</property>
		<property name="pin_button">1</property>
		<property name="pos"></property>
		<property name="resize">Resizable</property>
		<property name="show">1</property>
		<property name="size"></property>
		<property name="style"></property>
		<property name="subclass"></property>
		<property name="toolbar_pane">0</property>
		<property name="tooltip"></property>
		<property name="window_extra_style"></property>
		<property name="window_name"></property>
		<property name="window_style"></property>
		<property name="wrap">-1</property>
		<event name="OnChar"></event>
		<event name="OnEnterWindow"></event>
		<event name="OnEraseBackground"></event>
		<event name="OnKeyDown"></event>
		<event name="OnKeyUp"></event>
		<event name="OnKillFocus"></event>
		<event name="OnLeaveWindow"></event>
		<event name="OnLeftDClick"></event>
		<event name="OnLeftDown"></event>
		<event name="OnLeftUp"></event>
		<event name="OnMiddleDClick"></event>
		<event name="OnMiddleDown"></event>
		<event name="OnMiddleUp"></event>
		<event name="OnMotion"></event>
		<event name="OnMouseEvents"></event>
		<event name="OnMouseWheel"></event>
		<event name="OnPaint"></event>
		<event name="OnRightDClick"></event>
		<event name="OnRightDown"></event>
		<event name="OnRightUp"></event>
		<event name="OnSetFocus"></event>
		<event name="OnSize"></event>
		<event name="OnUpdateUI"></event>
		</object>
		</object>
		<object class="sizeritem" expanded="1">
		<property name="border">5</property>
		<property name="flag">wxTOP\|wxBOTTOM</property>
		<property name="proportion">0</property>
		<object class="spacer" expanded="1">
		<property name="height">0</property>
		<property name="permission">protected</property>
		<property name="width">0</property>
		</object>
		</object>
		<object class="sizeritem" expanded="1">
		<property name="border">5</property>
		<property name="flag">wxEXPAND\|wxALL</property>
		<property name="proportion">1</property>
		<object class="wxBoxSizer" expanded="0">
		<object class="wxFlexGridSizer" expanded="1">
		<property name="cols">2</property>
		<property name="flexible_direction">wxBOTH</property>
		<property name="growablecols">1</property>
		<property name="growablerows"></property>
		<property name="hgap">0</property>
		<property name="minimum_size"></property>
		<property name="name">bPrefixSizer</property>
		<property name="orient">wxHORIZONTAL</property>
		<property name="name">fgSizer</property>
		<property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
		<property name="permission">none</property>
		<property name="rows">0</property>
		<property name="vgap">0</property>
		<object class="sizeritem" expanded="0">
		<property name="border">5</property>
		<property name="flag">wxALL</property>
		<property name="proportion">1</property>
		<property name="flag">wxALL\|wxALIGN_CENTER_VERTICAL</property>
		<property name="proportion">0</property>
		<object class="wxStaticText" expanded="0">
		<property name="BottomDockable">1</property>
		<property name="LeftDockable">1</property>
		@@ -185,7 +287,7 @@
		</object>
		<object class="sizeritem" expanded="0">
		<property name="border">5</property>
		<property name="flag">wxALL</property>
		<property name="flag">wxALL\|wxEXPAND\|wxALIGN_CENTER_VERTICAL</property>
		<property name="proportion">0</property>
		<object class="wxTextCtrl" expanded="0">
		<property name="BottomDockable">1</property>
		@@ -274,21 +376,10 @@
		<event name="OnUpdateUI"></event>
		</object>
		</object>
		</object>
		</object>
		<object class="sizeritem" expanded="1">
		<property name="border">5</property>
		<property name="flag">wxEXPAND</property>
		<property name="proportion">1</property>
		<object class="wxBoxSizer" expanded="1">
		<property name="minimum_size"></property>
		<property name="name">bPadNumSizer</property>
		<property name="orient">wxHORIZONTAL</property>
		<property name="permission">none</property>
		<object class="sizeritem" expanded="1">
		<property name="border">5</property>
		<property name="flag">wxALL</property>
		<property name="proportion">1</property>
		<property name="flag">wxALL\|wxALIGN_CENTER_VERTICAL</property>
		<property name="proportion">0</property>
		<object class="wxStaticText" expanded="1">
		<property name="BottomDockable">1</property>
		<property name="LeftDockable">1</property>
		@@ -370,7 +461,7 @@
		</object>
		<object class="sizeritem" expanded="1">
		<property name="border">5</property>
		<property name="flag">wxALL</property>
		<property name="flag">wxALL\|wxEXPAND</property>
		<property name="proportion">0</property>
		<object class="wxSpinCtrl" expanded="1">
		<property name="BottomDockable">1</property>
		@@ -452,6 +543,7 @@
		<event name="OnSize"></event>
		<event name="OnSpinCtrl"></event>
		<event name="OnSpinCtrlText"></event>
		<event name="OnTextEnter"></event>
		<event name="OnUpdateUI"></event>
		</object>
		</object>
		@@ -459,9 +551,9 @@
		</object>
		<object class="sizeritem" expanded="1">
		<property name="border">5</property>
		<property name="flag">wxALL</property>
		<property name="flag">wxEXPAND \| wxALL</property>
		<property name="proportion">0</property>
		<object class="wxStaticText" expanded="1">
		<object class="wxStaticLine" expanded="1">
		<property name="BottomDockable">1</property>
		<property name="LeftDockable">1</property>
		<property name="RightDockable">1</property>
		@@ -489,7 +581,6 @@
		<property name="gripper">0</property>
		<property name="hidden">0</property>
		<property name="id">wxID_ANY</property>
		<property name="label">Pad names are restricted to 4 characters (including number).</property>
		<property name="max_size"></property>
		<property name="maximize_button">0</property>
		<property name="maximum_size"></property>
		@@ -497,7 +588,7 @@
		<property name="minimize_button">0</property>
		<property name="minimum_size"></property>
		<property name="moveable">1</property>
		<property name="name">m_lblInfo</property>
		<property name="name">m_staticline1</property>
		<property name="pane_border">1</property>
		<property name="pane_position"></property>
		<property name="pane_size"></property>
		@@ -507,14 +598,13 @@
		<property name="resize">Resizable</property>
		<property name="show">1</property>
		<property name="size"></property>
		<property name="style"></property>
		<property name="style">wxLI_HORIZONTAL</property>
		<property name="subclass"></property>
		<property name="toolbar_pane">0</property>
		<property name="tooltip"></property>
		<property name="window_extra_style"></property>
		<property name="window_name"></property>
		<property name="window_style"></property>
		<property name="wrap">320</property>
		<event name="OnChar"></event>
		<event name="OnEnterWindow"></event>
		<event name="OnEraseBackground"></event>
		@@ -542,8 +632,8 @@
		</object>
		<object class="sizeritem" expanded="1">
		<property name="border">5</property>
		<property name="flag">wxEXPAND</property>
		<property name="proportion">2</property>
		<property name="flag">wxEXPAND\|wxALL</property>
		<property name="proportion">0</property>
		<object class="wxStdDialogButtonSizer" expanded="1">
		<property name="Apply">0</property>
		<property name="Cancel">1</property>

pcbnew/dialogs/dialog_enum_pads_base.h

+10 −5

Original line number	Diff line number	Diff line
		///////////////////////////////////////////////////////////////////////////
		// C++ code generated with wxFormBuilder (version Apr 30 2013)
		// C++ code generated with wxFormBuilder (version Jun 5 2014)
		// http://www.wxformbuilder.org/
		//
		// PLEASE DO "NOT" EDIT THIS FILE!
		@@ -11,6 +11,9 @@
		#include <wx/artprov.h>
		#include <wx/xrc/xmlres.h>
		#include <wx/intl.h>
		class DIALOG_SHIM;

		#include "dialog_shim.h"
		#include <wx/string.h>
		#include <wx/stattext.h>
		#include <wx/gdicmn.h>
		@@ -18,8 +21,9 @@
		#include <wx/colour.h>
		#include <wx/settings.h>
		#include <wx/textctrl.h>
		#include <wx/sizer.h>
		#include <wx/spinctrl.h>
		#include <wx/sizer.h>
		#include <wx/statline.h>
		#include <wx/button.h>
		#include <wx/dialog.h>

		@@ -29,23 +33,24 @@
		///////////////////////////////////////////////////////////////////////////////
		/// Class DIALOG_ENUM_PADS_BASE
		///////////////////////////////////////////////////////////////////////////////
		class DIALOG_ENUM_PADS_BASE : public wxDialog
		class DIALOG_ENUM_PADS_BASE : public DIALOG_SHIM
		{
		private:

		protected:
		wxStaticText* m_lblInfo;
		wxStaticText* m_lblPadPrefix;
		wxTextCtrl* m_padPrefix;
		wxStaticText* m_lblPadStartNum;
		wxSpinCtrl* m_padStartNum;
		wxStaticText* m_lblInfo;
		wxStaticLine* m_staticline1;
		wxStdDialogButtonSizer* m_stdButtons;
		wxButton* m_stdButtonsOK;
		wxButton* m_stdButtonsCancel;

		public:

		DIALOG_ENUM_PADS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Pad enumeration settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 340,240 ), long style = wxDEFAULT_DIALOG_STYLE );
		DIALOG_ENUM_PADS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Pad enumeration settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 340,187 ), long style = wxDEFAULT_DIALOG_STYLE\|wxRESIZE_BORDER );
		~DIALOG_ENUM_PADS_BASE();

		};

pcbnew/modedit.cpp

+3 −5

Original line number	Diff line number	Diff line
		@@ -315,9 +315,7 @@ void FOOTPRINT_EDIT_FRAME::Process_Special_Functions( wxCommandEvent& event )
		Zoom_Automatique( false );
		}

		if( IsGalCanvasActive() )
		updateView();

		m_canvas->Refresh();

		GetScreen()->ClrModify();
		@@ -562,10 +560,10 @@ void FOOTPRINT_EDIT_FRAME::Process_Special_Functions( wxCommandEvent& event )
		if( m_Draw3DFrame )
		m_Draw3DFrame->NewDisplay();

		m_canvas->Refresh();

		GetScreen()->ClrModify();

		updateView();
		m_canvas->Refresh();

		break;

Admin message