dialog information hiding, initial Fit() (34e6314a) · Commits · Elphel / kicad-source-mirror

common/base_units.cpp

+6 −4

Original line number	Diff line number	Diff line
		@@ -226,7 +226,6 @@ double From_User_Unit( EDA_UNITS_T aUnit, double aValue )

		default:
		case UNSCALED_UNITS:

		value = aValue;
		}

		@@ -243,6 +242,7 @@ int ReturnValueFromString( EDA_UNITS_T aUnits, const wxString& aTextValue )

		// Acquire the 'right' decimal point separator
		const struct lconv* lc = localeconv();

		wxChar decimal_point = lc->decimal_point[0];
		wxString buf( aTextValue.Strip( wxString::both ) );

		@@ -270,7 +270,9 @@ int ReturnValueFromString( EDA_UNITS_T aUnits, const wxString& aTextValue )
		}

		// Extract the numeric part
		buf.Left( brk_point ).ToDouble( &dtmp );
		buf.Left( brk_point );

		buf.ToDouble( &dtmp );

		// Check the optional unit designator (2 ch significant)
		wxString unit( buf.Mid( brk_point ).Strip( wxString::leading ).Left( 2 ).Lower() );

include/wxBasePcbFrame.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -632,8 +632,6 @@ public:
		void SelectLayerPair();
		virtual void SwitchLayer( wxDC* DC, LAYER_NUM layer );

		void InstallGridFrame( const wxPoint& pos );

		/**
		* Load applications settings common to PCB draw frame objects.
		*
		@@ -646,6 +644,8 @@ public:
		*/
		virtual void LoadSettings();

		bool InvokeDialogGrid();

		/**
		* Save applications settings common to PCB draw frame objects.
		*

pcbnew/dialogs/dialog_pad_properties_base.cpp

+8 −7

Original line number	Diff line number	Diff line
		///////////////////////////////////////////////////////////////////////////
		// C++ code generated with wxFormBuilder (version Oct 8 2012)
		// C++ code generated with wxFormBuilder (version Apr 30 2013)
		// http://www.wxformbuilder.org/
		//
		// PLEASE DO "NOT" EDIT THIS FILE!
		@@ -253,7 +253,7 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind
		m_LeftBoxSizer->Add( sbSizeModuleInfo, 0, wxBOTTOM\|wxRIGHT\|wxLEFT\|wxEXPAND, 5 );


		bGeneralSizer->Add( m_LeftBoxSizer, 1, wxALL\|wxEXPAND, 5 );
		bGeneralSizer->Add( m_LeftBoxSizer, 3, wxALL\|wxEXPAND, 5 );

		wxBoxSizer* bSizer10;
		bSizer10 = new wxBoxSizer( wxVERTICAL );
		@@ -287,7 +287,7 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind

		m_PadDrill_X_Ctrl = new wxTextCtrl( m_panelGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
		m_PadDrill_X_Ctrl->SetMaxLength( 0 );
		fgSizerGeometry->Add( m_PadDrill_X_Ctrl, 0, wxALIGN_CENTER_VERTICAL\|wxLEFT\|wxTOP, 5 );
		fgSizerGeometry->Add( m_PadDrill_X_Ctrl, 0, wxALIGN_CENTER_VERTICAL\|wxEXPAND\|wxLEFT\|wxTOP, 5 );

		m_PadDrill_X_Unit = new wxStaticText( m_panelGeneral, wxID_ANY, _("Inch"), wxDefaultPosition, wxDefaultSize, 0 );
		m_PadDrill_X_Unit->Wrap( -1 );
		@@ -299,7 +299,7 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind

		m_PadDrill_Y_Ctrl = new wxTextCtrl( m_panelGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
		m_PadDrill_Y_Ctrl->SetMaxLength( 0 );
		fgSizerGeometry->Add( m_PadDrill_Y_Ctrl, 0, wxALIGN_CENTER_VERTICAL\|wxBOTTOM\|wxLEFT\|wxTOP, 5 );
		fgSizerGeometry->Add( m_PadDrill_Y_Ctrl, 0, wxALIGN_CENTER_VERTICAL\|wxBOTTOM\|wxEXPAND\|wxLEFT\|wxTOP, 5 );

		m_PadDrill_Y_Unit = new wxStaticText( m_panelGeneral, wxID_ANY, _("Inch"), wxDefaultPosition, wxDefaultSize, 0 );
		m_PadDrill_Y_Unit->Wrap( -1 );
		@@ -325,7 +325,7 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind
		int m_rbCopperLayersSelNChoices = sizeof( m_rbCopperLayersSelChoices ) / sizeof( wxString );
		m_rbCopperLayersSel = new wxChoice( m_panelGeneral, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_rbCopperLayersSelNChoices, m_rbCopperLayersSelChoices, 0 );
		m_rbCopperLayersSel->SetSelection( 0 );
		bSizer11->Add( m_rbCopperLayersSel, 1, wxALL, 5 );
		bSizer11->Add( m_rbCopperLayersSel, 1, wxALL\|wxEXPAND, 5 );


		m_LayersSizer->Add( bSizer11, 0, wxEXPAND, 5 );
		@@ -373,7 +373,7 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind
		bSizer10->Add( m_LayersSizer, 0, wxALL\|wxEXPAND, 5 );


		bGeneralSizer->Add( bSizer10, 0, wxALL\|wxEXPAND, 5 );
		bGeneralSizer->Add( bSizer10, 2, wxALL\|wxEXPAND, 5 );


		m_panelGeneral->SetSizer( bGeneralSizer );
		@@ -534,7 +534,7 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind
		m_panelShowPad = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxSize( 200,200 ), wxFULL_REPAINT_ON_RESIZE\|wxSIMPLE_BORDER );
		m_panelShowPad->SetBackgroundColour( wxColour( 0, 0, 0 ) );

		bSizerDisplayPad->Add( m_panelShowPad, 1, wxRIGHT\|wxTOP\|wxEXPAND, 5 );
		bSizerDisplayPad->Add( m_panelShowPad, 4, wxRIGHT\|wxTOP\|wxEXPAND, 5 );


		bSizerUpper->Add( bSizerDisplayPad, 1, wxEXPAND\|wxTOP\|wxBOTTOM, 5 );
		@@ -560,6 +560,7 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind

		this->SetSizer( m_MainSizer );
		this->Layout();
		m_MainSizer->Fit( this );

		this->Centre( wxBOTH );

pcbnew/dialogs/dialog_pad_properties_base.fbp

+19 −19

Original line number	Diff line number	Diff line
		@@ -42,7 +42,7 @@
		<property name="minimum_size">-1,-1</property>
		<property name="name">DIALOG_PAD_PROPERTIES_BASE</property>
		<property name="pos"></property>
		<property name="size">745,725</property>
		<property name="size">-1,-1</property>
		<property name="style">wxDEFAULT_DIALOG_STYLE\|wxRESIZE_BORDER</property>
		<property name="subclass">DIALOG_SHIM; dialog_shim.h</property>
		<property name="title">Pad Properties</property>
		@@ -268,8 +268,8 @@
		<object class="sizeritem" expanded="1">
		<property name="border">5</property>
		<property name="flag">wxALL\|wxEXPAND</property>
		<property name="proportion">1</property>
		<object class="wxBoxSizer" expanded="1">
		<property name="proportion">3</property>
		<object class="wxBoxSizer" expanded="0">
		<property name="minimum_size"></property>
		<property name="name">m_LeftBoxSizer</property>
		<property name="orient">wxVERTICAL</property>
		@@ -3821,11 +3821,11 @@
		</object>
		</object>
		</object>
		<object class="sizeritem" expanded="1">
		<object class="sizeritem" expanded="0">
		<property name="border">5</property>
		<property name="flag">wxBOTTOM\|wxRIGHT\|wxLEFT\|wxEXPAND</property>
		<property name="proportion">0</property>
		<object class="wxStaticBoxSizer" expanded="1">
		<object class="wxStaticBoxSizer" expanded="0">
		<property name="id">wxID_ANY</property>
		<property name="label">Parent footprint orientation</property>
		<property name="minimum_size"></property>
		@@ -3833,11 +3833,11 @@
		<property name="orient">wxVERTICAL</property>
		<property name="permission">none</property>
		<event name="OnUpdateUI"></event>
		<object class="sizeritem" expanded="1">
		<object class="sizeritem" expanded="0">
		<property name="border">5</property>
		<property name="flag"></property>
		<property name="proportion">0</property>
		<object class="wxFlexGridSizer" expanded="1">
		<object class="wxFlexGridSizer" expanded="0">
		<property name="cols">2</property>
		<property name="flexible_direction">wxBOTH</property>
		<property name="growablecols">1</property>
		@@ -4190,17 +4190,17 @@
		<object class="sizeritem" expanded="1">
		<property name="border">5</property>
		<property name="flag">wxALL\|wxEXPAND</property>
		<property name="proportion">0</property>
		<object class="wxBoxSizer" expanded="1">
		<property name="proportion">2</property>
		<object class="wxBoxSizer" expanded="0">
		<property name="minimum_size"></property>
		<property name="name">bSizer10</property>
		<property name="orient">wxVERTICAL</property>
		<property name="permission">none</property>
		<object class="sizeritem" expanded="1">
		<object class="sizeritem" expanded="0">
		<property name="border">5</property>
		<property name="flag">wxALL\|wxEXPAND</property>
		<property name="proportion">0</property>
		<object class="wxStaticBoxSizer" expanded="1">
		<object class="wxStaticBoxSizer" expanded="0">
		<property name="id">wxID_ANY</property>
		<property name="label">Drill</property>
		<property name="minimum_size"></property>
		@@ -4208,11 +4208,11 @@
		<property name="orient">wxVERTICAL</property>
		<property name="permission">none</property>
		<event name="OnUpdateUI"></event>
		<object class="sizeritem" expanded="1">
		<object class="sizeritem" expanded="0">
		<property name="border">5</property>
		<property name="flag">wxEXPAND</property>
		<property name="proportion">0</property>
		<object class="wxFlexGridSizer" expanded="1">
		<object class="wxFlexGridSizer" expanded="0">
		<property name="cols">3</property>
		<property name="flexible_direction">wxBOTH</property>
		<property name="growablecols">1</property>
		@@ -4563,7 +4563,7 @@
		</object>
		<object class="sizeritem" expanded="0">
		<property name="border">5</property>
		<property name="flag">wxALIGN_CENTER_VERTICAL\|wxLEFT\|wxTOP</property>
		<property name="flag">wxALIGN_CENTER_VERTICAL\|wxEXPAND\|wxLEFT\|wxTOP</property>
		<property name="proportion">0</property>
		<object class="wxTextCtrl" expanded="0">
		<property name="BottomDockable">1</property>
		@@ -4820,7 +4820,7 @@
		</object>
		<object class="sizeritem" expanded="0">
		<property name="border">5</property>
		<property name="flag">wxALIGN_CENTER_VERTICAL\|wxBOTTOM\|wxLEFT\|wxTOP</property>
		<property name="flag">wxALIGN_CENTER_VERTICAL\|wxBOTTOM\|wxEXPAND\|wxLEFT\|wxTOP</property>
		<property name="proportion">0</property>
		<object class="wxTextCtrl" expanded="0">
		<property name="BottomDockable">1</property>
		@@ -4996,11 +4996,11 @@
		</object>
		</object>
		</object>
		<object class="sizeritem" expanded="1">
		<object class="sizeritem" expanded="0">
		<property name="border">5</property>
		<property name="flag">wxALL\|wxEXPAND</property>
		<property name="proportion">0</property>
		<object class="wxStaticBoxSizer" expanded="1">
		<object class="wxStaticBoxSizer" expanded="0">
		<property name="id">wxID_ANY</property>
		<property name="label">Layers</property>
		<property name="minimum_size"></property>
		@@ -5102,7 +5102,7 @@
		</object>
		<object class="sizeritem" expanded="0">
		<property name="border">5</property>
		<property name="flag">wxALL</property>
		<property name="flag">wxALL\|wxEXPAND</property>
		<property name="proportion">1</property>
		<object class="wxChoice" expanded="0">
		<property name="BottomDockable">1</property>
		@@ -8233,7 +8233,7 @@
		<object class="sizeritem" expanded="0">
		<property name="border">5</property>
		<property name="flag">wxRIGHT\|wxTOP\|wxEXPAND</property>
		<property name="proportion">1</property>
		<property name="proportion">4</property>
		<object class="wxPanel" expanded="0">
		<property name="BottomDockable">1</property>
		<property name="LeftDockable">1</property>

pcbnew/dialogs/dialog_pad_properties_base.h

+2 −2

Original line number	Diff line number	Diff line
		///////////////////////////////////////////////////////////////////////////
		// C++ code generated with wxFormBuilder (version Oct 8 2012)
		// C++ code generated with wxFormBuilder (version Apr 30 2013)
		// http://www.wxformbuilder.org/
		//
		// PLEASE DO "NOT" EDIT THIS FILE!
		@@ -162,7 +162,7 @@ class DIALOG_PAD_PROPERTIES_BASE : public DIALOG_SHIM

		public:

		DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWindowID id = wxID_DIALOG_EDIT_PAD, const wxString& title = _("Pad Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 745,725 ), long style = wxDEFAULT_DIALOG_STYLE\|wxRESIZE_BORDER\|wxSUNKEN_BORDER );
		DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWindowID id = wxID_DIALOG_EDIT_PAD, const wxString& title = _("Pad Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE\|wxRESIZE_BORDER\|wxSUNKEN_BORDER );
		~DIALOG_PAD_PROPERTIES_BASE();

		};