Fix very minor bugs. Boost update. Pcbnew: files housekeeping and code cleanup. (6963001a) · Commits · Elphel / kicad-source-mirror

eeschema/dialogs/dialog_sch_edit_sheet_pin.fbp→eeschema/dialogs/dialog_sch_edit_sheet_pin_base.fbp

+0 −0

File moved.

eeschema/dialogs/dialog_sch_sheet_props.fbp

+69 −10

eeschema/dialogs/dialog_sch_sheet_props_base.cpp

+12 −11

eeschema/dialogs/dialog_sch_sheet_props_base.h

+3 −2

Original line number	Original line	Diff line number	Diff line
	///////////////////////////////////////////////////////////////////////////		///////////////////////////////////////////////////////////////////////////
	// C++ code generated with wxFormBuilder (version Apr 16 2008)		// C++ code generated with wxFormBuilder (version Sep 8 2010)
	// http://www.wxformbuilder.org/		// http://www.wxformbuilder.org/
	//		//
	// PLEASE DO "NOT" EDIT THIS FILE!		// PLEASE DO "NOT" EDIT THIS FILE!
	@@ -49,7 +49,8 @@ class DIALOG_SCH_SHEET_PROPS_BASE : public wxDialog
	wxButton* m_sdbSizer1Cancel;		wxButton* m_sdbSizer1Cancel;

	public:		public:
	DIALOG_SCH_SHEET_PROPS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Schematic Sheet Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE\|wxRESIZE_BORDER );
			DIALOG_SCH_SHEET_PROPS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Schematic Sheet Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 453,170 ), long style = wxDEFAULT_DIALOG_STYLE\|wxRESIZE_BORDER );
	~DIALOG_SCH_SHEET_PROPS_BASE();		~DIALOG_SCH_SHEET_PROPS_BASE();

	};		};

eeschema/edit_label.cpp

+9 −12

Original line number	Original line	Diff line number	Diff line
	@@ -261,10 +261,8 @@ static void ExitMoveTexte( WinEDA_DrawPanel* Panel, wxDC* DC )
	}		}


	/* Routine to change a text type to an other one (GraphicText, label or		/* Routine to change a text type to an other one (GraphicText, label or Glabel).
	* Glabel).		* A new test, label or hierarchical or global label is created from the old text.
	* A new test, label or hierarchical or global label is created from the old
	* text.
	* the old text is deleted		* the old text is deleted
	*/		*/
	void WinEDA_SchematicFrame::ConvertTextType( SCH_TEXT* Text, wxDC* DC, int newtype )		void WinEDA_SchematicFrame::ConvertTextType( SCH_TEXT* Text, wxDC* DC, int newtype )
	@@ -323,14 +321,14 @@ void WinEDA_SchematicFrame::ConvertTextType( SCH_TEXT* Text, wxDC* DC, int newty
	}		}

	/* now delete the old text		/* now delete the old text
	* If it is a text flagged IS_NEW it will be deleted by		* If it is a text flagged IS_NEW it will be deleted by ForceCloseManageCurseur()
	* ForceCloseManageCurseur()
	* If not, we must delete it.		* If not, we must delete it.
	*/		*/
	if( DrawPanel->ManageCurseur && DrawPanel->ForceCloseManageCurseur )		if( DrawPanel->ManageCurseur && DrawPanel->ForceCloseManageCurseur )
	{		{
	DrawPanel->ForceCloseManageCurseur( DrawPanel, DC );		DrawPanel->ForceCloseManageCurseur( DrawPanel, DC );
	}		}

	if( (flags & IS_NEW) == 0 ) // Remove old text from current list and		if( (flags & IS_NEW) == 0 ) // Remove old text from current list and
	// save it in undo list		// save it in undo list
	{		{
	@@ -343,16 +341,15 @@ void WinEDA_SchematicFrame::ConvertTextType( SCH_TEXT* Text, wxDC* DC, int newty

	GetScreen()->SetCurItem( NULL );		GetScreen()->SetCurItem( NULL );

	SAFE_DELETE( g_ItemToUndoCopy );		delete g_ItemToUndoCopy;
			g_ItemToUndoCopy = NULL;

	DrawPanel->CursorOff( DC ); // Erase schematic cursor		DrawPanel->CursorOff( DC ); // Erase schematic cursor

	/* Save the new text in undo list if the old text was not itself a "new		/* Save the new text in undo list if the old text was not itself a "new created text"
	* created text"		* In this case, the old text is already in undo list as a deleted item.
	* In this case, the old text is already in undo list as a deleted item
	* Of course if the old text was a "new created text" the new text will be		* Of course if the old text was a "new created text" the new text will be
	* put in undo list		* put in undo list later, at the end of the current command (if not aborted)
	* later, at the end of the current command (if not aborted)
	*/		*/
	if( (flags & IS_NEW) == 0 )		if( (flags & IS_NEW) == 0 )
	{		{

Original line number	Original line	Diff line number	Diff line
	<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>		<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
	<wxFormBuilder_Project>		<wxFormBuilder_Project>
	<FileVersion major="1" minor="9" />		<FileVersion major="1" minor="10" />
	<object class="Project" expanded="1">		<object class="Project" expanded="1">
	<property name="class_decoration"></property>		<property name="class_decoration"></property>
	<property name="code_generation">C++</property>		<property name="code_generation">C++</property>
	<property name="disconnect_events">1</property>		<property name="disconnect_events">1</property>
			<property name="disconnect_mode">source_name</property>
			<property name="disconnect_python_events">0</property>
	<property name="encoding">UTF-8</property>		<property name="encoding">UTF-8</property>
	<property name="event_generation">table</property>		<property name="event_generation">table</property>
	<property name="file">dialog_sch_sheet_props_base</property>		<property name="file">dialog_sch_sheet_props_base</property>
	@@ -16,13 +18,16 @@
	<property name="path">.</property>		<property name="path">.</property>
	<property name="precompiled_header"></property>		<property name="precompiled_header"></property>
	<property name="relative_path">1</property>		<property name="relative_path">1</property>
			<property name="skip_python_events">1</property>
	<property name="use_enum">1</property>		<property name="use_enum">1</property>
	<property name="use_microsoft_bom">0</property>		<property name="use_microsoft_bom">0</property>
	<object class="Dialog" expanded="1">		<object class="Dialog" expanded="1">
	<property name="bg"></property>		<property name="bg"></property>
	<property name="center">wxBOTH</property>		<property name="center">wxBOTH</property>
	<property name="context_help"></property>		<property name="context_help"></property>
			<property name="context_menu">1</property>
	<property name="enabled">1</property>		<property name="enabled">1</property>
			<property name="event_handler">impl_virtual</property>
	<property name="extra_style"></property>		<property name="extra_style"></property>
	<property name="fg"></property>		<property name="fg"></property>
	<property name="font"></property>		<property name="font"></property>
	@@ -32,11 +37,15 @@
	<property name="minimum_size"></property>		<property name="minimum_size"></property>
	<property name="name">DIALOG_SCH_SHEET_PROPS_BASE</property>		<property name="name">DIALOG_SCH_SHEET_PROPS_BASE</property>
	<property name="pos"></property>		<property name="pos"></property>
	<property name="size"></property>		<property name="size">453,170</property>
	<property name="style">wxDEFAULT_DIALOG_STYLE\|wxRESIZE_BORDER</property>		<property name="style">wxDEFAULT_DIALOG_STYLE\|wxRESIZE_BORDER</property>
	<property name="subclass"></property>		<property name="subclass"></property>
	<property name="title">Schematic Sheet Properties</property>		<property name="title">Schematic Sheet Properties</property>
	<property name="tooltip"></property>		<property name="tooltip"></property>
			<property name="validator_data_type"></property>
			<property name="validator_style">wxFILTER_NONE</property>

Original line number	Original line	Diff line number	Diff line
	///////////////////////////////////////////////////////////////////////////		///////////////////////////////////////////////////////////////////////////
	// C++ code generated with wxFormBuilder (version Apr 16 2008)		// C++ code generated with wxFormBuilder (version Sep 8 2010)
	// http://www.wxformbuilder.org/		// http://www.wxformbuilder.org/
	//		//
	// PLEASE DO "NOT" EDIT THIS FILE!		// PLEASE DO "NOT" EDIT THIS FILE!
	@@ -27,17 +27,19 @@ DIALOG_SCH_SHEET_PROPS_BASE::DIALOG_SCH_SHEET_PROPS_BASE( wxWindow* parent, wxWi
	fgSizer1->Add( m_staticText1, 0, wxALIGN_CENTER_VERTICAL\|wxALL, 3 );		fgSizer1->Add( m_staticText1, 0, wxALIGN_CENTER_VERTICAL\|wxALL, 3 );

	m_textFileName = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );		m_textFileName = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
	fgSizer1->Add( m_textFileName, 5, wxALIGN_CENTER_VERTICAL\|wxALL\|wxEXPAND, 3 );		m_textFileName->SetMinSize( wxSize( 200,-1 ) );

			fgSizer1->Add( m_textFileName, 5, wxALIGN_CENTER_VERTICAL\|wxEXPAND\|wxTOP\|wxBOTTOM, 3 );

	fgSizer1->Add( 0, 0, 1, wxALIGN_CENTER_HORIZONTAL\|wxALL\|wxEXPAND, 3 );

	m_staticText2 = new wxStaticText( this, wxID_ANY, _("Te&xt size:"), wxDefaultPosition, wxDefaultSize, 0 );		fgSizer1->Add( 0, 0, 1, wxALIGN_CENTER_HORIZONTAL\|wxALL, 3 );

			m_staticText2 = new wxStaticText( this, wxID_ANY, _("Si&ze:"), wxDefaultPosition, wxDefaultSize, 0 );
	m_staticText2->Wrap( -1 );		m_staticText2->Wrap( -1 );
	fgSizer1->Add( m_staticText2, 0, wxALIGN_CENTER_VERTICAL\|wxALL, 3 );		fgSizer1->Add( m_staticText2, 0, wxALIGN_CENTER_VERTICAL\|wxALL, 3 );

	m_textFileNameSize = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );		m_textFileNameSize = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
	fgSizer1->Add( m_textFileNameSize, 0, wxALIGN_CENTER_VERTICAL\|wxALL, 3 );		fgSizer1->Add( m_textFileNameSize, 0, wxALIGN_CENTER_VERTICAL\|wxTOP\|wxBOTTOM, 3 );

	m_staticFileNameSizeUnits = new wxStaticText( this, wxID_ANY, _("units"), wxDefaultPosition, wxDefaultSize, 0 );		m_staticFileNameSizeUnits = new wxStaticText( this, wxID_ANY, _("units"), wxDefaultPosition, wxDefaultSize, 0 );
	m_staticFileNameSizeUnits->Wrap( -1 );		m_staticFileNameSizeUnits->Wrap( -1 );
	@@ -48,17 +50,17 @@ DIALOG_SCH_SHEET_PROPS_BASE::DIALOG_SCH_SHEET_PROPS_BASE( wxWindow* parent, wxWi
	fgSizer1->Add( m_staticText4, 0, wxALIGN_CENTER_VERTICAL\|wxALL, 3 );		fgSizer1->Add( m_staticText4, 0, wxALIGN_CENTER_VERTICAL\|wxALL, 3 );

	m_textSheetName = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );		m_textSheetName = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
	fgSizer1->Add( m_textSheetName, 5, wxALIGN_CENTER_VERTICAL\|wxALL\|wxEXPAND, 3 );		fgSizer1->Add( m_textSheetName, 5, wxALIGN_CENTER_VERTICAL\|wxEXPAND\|wxTOP\|wxBOTTOM, 3 );


	fgSizer1->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL\|wxALL\|wxEXPAND, 3 );		fgSizer1->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL\|wxALL, 3 );

	m_staticText5 = new wxStaticText( this, wxID_ANY, _("&Text size:"), wxDefaultPosition, wxDefaultSize, 0 );		m_staticText5 = new wxStaticText( this, wxID_ANY, _("&Size:"), wxDefaultPosition, wxDefaultSize, 0 );
	m_staticText5->Wrap( -1 );		m_staticText5->Wrap( -1 );
	fgSizer1->Add( m_staticText5, 0, wxALIGN_CENTER_VERTICAL\|wxALL, 3 );		fgSizer1->Add( m_staticText5, 0, wxALIGN_CENTER_VERTICAL\|wxALL, 3 );

	m_textSheetNameSize = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );		m_textSheetNameSize = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );

Admin message