Commit 98886a6d authored by jean-pierre charras's avatar jean-pierre charras
Browse files

Eeschema: Fix incorrect size of dialog Edit component in libedit: wrong size under wxWidgets 2.9.3 

Edit component in schematic: reduce length of some texts (when translated, give a too big dialog)
parent e26cdada

eeschema/dialogs/dialog_edit_component_in_lib.cpp

+5 −7
Original line number Diff line number Diff line
@@ -24,12 +24,10 @@ DIALOG_EDIT_COMPONENT_IN_LIBRARY::DIALOG_EDIT_COMPONENT_IN_LIBRARY( LIB_EDIT_FRA 
	m_Parent = aParent;

	m_RecreateToolbar = false;



	Init();

	initDlg();



    if( GetSizer() )

    {

    GetSizer()->SetSizeHints( this );

    }

    Center();

}
@@ -39,7 +37,7 @@ DIALOG_EDIT_COMPONENT_IN_LIBRARY::~DIALOG_EDIT_COMPONENT_IN_LIBRARY() 


/* Initialize state of check boxes and texts

*/

void DIALOG_EDIT_COMPONENT_IN_LIBRARY::Init()

void DIALOG_EDIT_COMPONENT_IN_LIBRARY::initDlg()

{

    SetFocus();

    m_AliasLocation = -1;
@@ -90,7 +88,7 @@ void DIALOG_EDIT_COMPONENT_IN_LIBRARY::Init() 
        m_ButtonDeleteOneFootprintFilter->Enable( false );

    }



    m_sdbSizer2OK->SetDefault();

    m_stdSizerButtonOK->SetDefault();

}

eeschema/dialogs/dialog_edit_component_in_lib.h

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ public: 
    ~DIALOG_EDIT_COMPONENT_IN_LIBRARY();



private:

    void Init();

    void initDlg();

    void InitPanelDoc();

    void InitBasicPanel();

	void OnCancelClick( wxCommandEvent& event );

eeschema/dialogs/dialog_edit_component_in_lib_base.cpp

+269 −264
Original line number Diff line number Diff line 
///////////////////////////////////////////////////////////////////////////

// C++ code generated with wxFormBuilder (version Sep  8 2010)

// C++ code generated with wxFormBuilder (version Jun 30 2011)

// http://www.wxformbuilder.org/

//

// PLEASE DO "NOT" EDIT THIS FILE!
@@ -16,6 +16,9 @@ DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE( wx 
	wxBoxSizer* bMainSizer;

	bMainSizer = new wxBoxSizer( wxVERTICAL );

	

	wxBoxSizer* bUpperSizer;

	bUpperSizer = new wxBoxSizer( wxVERTICAL );

	

	m_NoteBook = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );

	m_PanelBasic = new wxPanel( m_NoteBook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER|wxTAB_TRAVERSAL );

	wxBoxSizer* bSizerBasicPanel;
@@ -221,15 +224,17 @@ DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE( wx 
	bPanelFpFilterBoxSizer->Fit( m_PanelFootprintFilter );

	m_NoteBook->AddPage( m_PanelFootprintFilter, _("Footprint Filter"), false );

	

	bMainSizer->Add( m_NoteBook, 1, wxEXPAND | wxALL, 5 );

	bUpperSizer->Add( m_NoteBook, 1, wxEXPAND, 5 );

	

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

	

	m_sdbSizer2 = new wxStdDialogButtonSizer();

	m_sdbSizer2OK = new wxButton( this, wxID_OK );

	m_sdbSizer2->AddButton( m_sdbSizer2OK );

	m_sdbSizer2Cancel = new wxButton( this, wxID_CANCEL );

	m_sdbSizer2->AddButton( m_sdbSizer2Cancel );

	m_sdbSizer2->Realize();

	bMainSizer->Add( m_sdbSizer2, 0, wxEXPAND|wxALL, 5 );

	m_stdSizerButton = new wxStdDialogButtonSizer();

	m_stdSizerButtonOK = new wxButton( this, wxID_OK );

	m_stdSizerButton->AddButton( m_stdSizerButtonOK );

	m_stdSizerButtonCancel = new wxButton( this, wxID_CANCEL );

	m_stdSizerButton->AddButton( m_stdSizerButtonCancel );

	m_stdSizerButton->Realize();

	bMainSizer->Add( m_stdSizerButton, 0, wxEXPAND|wxALL, 5 );

	

	this->SetSizer( bMainSizer );

	this->Layout();
@@ -243,8 +248,8 @@ DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE( wx 
	m_buttonAddFpF->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::AddFootprintFilter ), NULL, this );

	m_ButtonDeleteOneFootprintFilter->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::DeleteOneFootprintFilter ), NULL, this );

	m_ButtonDeleteAllFootprintFilter->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::DeleteAllFootprintFilter ), NULL, this );

	m_sdbSizer2Cancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::OnCancelClick ), NULL, this );

	m_sdbSizer2OK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::OnOkClick ), NULL, this );

	m_stdSizerButtonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::OnCancelClick ), NULL, this );

	m_stdSizerButtonOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::OnOkClick ), NULL, this );

}



DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::~DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE()
@@ -258,7 +263,7 @@ DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::~DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE() 
	m_buttonAddFpF->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::AddFootprintFilter ), NULL, this );

	m_ButtonDeleteOneFootprintFilter->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::DeleteOneFootprintFilter ), NULL, this );

	m_ButtonDeleteAllFootprintFilter->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::DeleteAllFootprintFilter ), NULL, this );

	m_sdbSizer2Cancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::OnCancelClick ), NULL, this );

	m_sdbSizer2OK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::OnOkClick ), NULL, this );

	m_stdSizerButtonCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::OnCancelClick ), NULL, this );

	m_stdSizerButtonOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::OnOkClick ), NULL, this );

	

}

eeschema/dialogs/dialog_edit_component_in_lib_base.fbp

+2653 −1518

File changed.

Preview size limit exceeded, changes collapsed.

eeschema/dialogs/dialog_edit_component_in_lib_base.h

+114 −113
Original line number Diff line number Diff line 
///////////////////////////////////////////////////////////////////////////

// C++ code generated with wxFormBuilder (version Sep  8 2010)

// C++ code generated with wxFormBuilder (version Jun 30 2011)

// http://www.wxformbuilder.org/

//

// PLEASE DO "NOT" EDIT THIS FILE!

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



#ifndef __dialog_edit_component_in_lib_base__

#define __dialog_edit_component_in_lib_base__

#ifndef __DIALOG_EDIT_COMPONENT_IN_LIB_BASE_H__

#define __DIALOG_EDIT_COMPONENT_IN_LIB_BASE_H__



#include <wx/artprov.h>

#include <wx/xrc/xmlres.h>

#include <wx/intl.h>



#include <wx/string.h>

#include <wx/checkbox.h>

#include <wx/gdicmn.h>
@@ -86,9 +87,9 @@ class DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE : public wxDialog 
		wxButton* m_buttonAddFpF;

		wxButton* m_ButtonDeleteOneFootprintFilter;

		wxButton* m_ButtonDeleteAllFootprintFilter;

		wxStdDialogButtonSizer* m_sdbSizer2;

		wxButton* m_sdbSizer2OK;

		wxButton* m_sdbSizer2Cancel;

		wxStdDialogButtonSizer* m_stdSizerButton;

		wxButton* m_stdSizerButtonOK;

		wxButton* m_stdSizerButtonCancel;

		

		// Virtual event handlers, overide them in your derived class

		virtual void CopyDocToAlias( wxCommandEvent& event ) { event.Skip(); }
@@ -105,9 +106,9 @@ class DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE : public wxDialog 
	

	public:

		

		DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE( wxWindow* parent, wxWindowID id = ID_LIBEDIT_NOTEBOOK, const wxString& title = _("Lib Component Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 546,384 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );

		DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE( wxWindow* parent, wxWindowID id = ID_LIBEDIT_NOTEBOOK, const wxString& title = _("Lib Component Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 465,384 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 

		~DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE();

	

};



#endif //__dialog_edit_component_in_lib_base__
 
#endif //__DIALOG_EDIT_COMPONENT_IN_LIB_BASE_H__