Commit 8e096794 authored by jean-pierre charras's avatar jean-pierre charras
Browse files

Minor cosmetic fixes (mainly on Linux) in dialogs.

parent 29bf40dc

eeschema/dialogs/dialog_eeschema_config_fbp.cpp

+46 −15
Original line number Original line Diff line number Diff line 
///////////////////////////////////////////////////////////////////////////

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

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

// C++ code generated with wxFormBuilder (version Oct  8 2012)

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

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

//

//

// PLEASE DO "NOT" EDIT THIS FILE!

// PLEASE DO "NOT" EDIT THIS FILE!
@@ -16,14 +16,21 @@ DIALOG_EESCHEMA_CONFIG_FBP::DIALOG_EESCHEMA_CONFIG_FBP( wxWindow* parent, wxWind 
	wxBoxSizer* bMainSizer;

	wxBoxSizer* bMainSizer;

	bMainSizer = new wxBoxSizer( wxVERTICAL );

	bMainSizer = new wxBoxSizer( wxVERTICAL );

	

	

	wxStaticBoxSizer* sbLibsChoiceSizer;

	wxBoxSizer* bSizerUpper;

	sbLibsChoiceSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Component library files") ), wxHORIZONTAL );

	bSizerUpper = new wxBoxSizer( wxVERTICAL );

	

	m_staticTextLibsList = new wxStaticText( this, wxID_ANY, _("Component library files"), wxDefaultPosition, wxDefaultSize, 0 );

	m_staticTextLibsList->Wrap( -1 );

	bSizerUpper->Add( m_staticTextLibsList, 0, wxTOP|wxRIGHT|wxLEFT, 5 );

	

	wxBoxSizer* bSizerLibsChoice;

	bSizerLibsChoice = new wxBoxSizer( wxHORIZONTAL );

	

	

	m_ListLibr = new wxListBox( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_EXTENDED|wxLB_HSCROLL|wxLB_NEEDED_SB|wxLB_SINGLE ); 

	m_ListLibr = new wxListBox( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_EXTENDED|wxLB_HSCROLL|wxLB_NEEDED_SB|wxLB_SINGLE ); 

	m_ListLibr->SetToolTip( _("List of active library files.\nOnly library files in this list are loaded by Eeschema.\nThe order of this list is important:\nEeschema searchs for a given component using this list order priority.") );

	m_ListLibr->SetToolTip( _("List of active library files.\nOnly library files in this list are loaded by Eeschema.\nThe order of this list is important:\nEeschema searchs for a given component using this list order priority.") );

	m_ListLibr->SetMinSize( wxSize( 400,250 ) );

	m_ListLibr->SetMinSize( wxSize( 400,250 ) );

	

	

	sbLibsChoiceSizer->Add( m_ListLibr, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );

	bSizerLibsChoice->Add( m_ListLibr, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );

	

	

	wxBoxSizer* bRightSizer;

	wxBoxSizer* bRightSizer;

	bRightSizer = new wxBoxSizer( wxVERTICAL );

	bRightSizer = new wxBoxSizer( wxVERTICAL );
@@ -49,18 +56,30 @@ DIALOG_EESCHEMA_CONFIG_FBP::DIALOG_EESCHEMA_CONFIG_FBP( wxWindow* parent, wxWind 
	m_buttonDown = new wxButton( this, wxID_ANY, _("Down"), wxDefaultPosition, wxDefaultSize, 0 );

	m_buttonDown = new wxButton( this, wxID_ANY, _("Down"), wxDefaultPosition, wxDefaultSize, 0 );

	bRightSizer->Add( m_buttonDown, 0, wxALL|wxEXPAND, 5 );

	bRightSizer->Add( m_buttonDown, 0, wxALL|wxEXPAND, 5 );

	

	

	sbLibsChoiceSizer->Add( bRightSizer, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );

	

	

	bMainSizer->Add( sbLibsChoiceSizer, 2, wxALL|wxEXPAND, 5 );

	bSizerLibsChoice->Add( bRightSizer, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );

	

	

	bSizerUpper->Add( bSizerLibsChoice, 1, wxEXPAND, 5 );

	

	

	bMainSizer->Add( bSizerUpper, 2, wxEXPAND, 5 );

	

	wxBoxSizer* bSizerMiddle;

	bSizerMiddle = new wxBoxSizer( wxVERTICAL );

	

	m_staticTextPaths = new wxStaticText( this, wxID_ANY, _("User defined search path"), wxDefaultPosition, wxDefaultSize, 0 );

	m_staticTextPaths->Wrap( -1 );

	bSizerMiddle->Add( m_staticTextPaths, 0, wxTOP|wxRIGHT|wxLEFT, 5 );

	

	

	wxStaticBoxSizer* sbSizer4;

	wxBoxSizer* bSizerPathsChoice;

	sbSizer4 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("User defined search path") ), wxHORIZONTAL );

	bSizerPathsChoice = new wxBoxSizer( wxHORIZONTAL );

	

	

	m_listUserPaths = new wxListBox( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_HSCROLL|wxLB_NEEDED_SB|wxLB_SINGLE ); 

	m_listUserPaths = new wxListBox( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_HSCROLL|wxLB_NEEDED_SB|wxLB_SINGLE ); 

	m_listUserPaths->SetToolTip( _("Additional paths used in this project. The priority is higher than default KiCad paths.") );

	m_listUserPaths->SetToolTip( _("Additional paths used in this project. The priority is higher than default KiCad paths.") );

	m_listUserPaths->SetMinSize( wxSize( 400,90 ) );

	m_listUserPaths->SetMinSize( wxSize( 400,90 ) );

	

	

	sbSizer4->Add( m_listUserPaths, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );

	bSizerPathsChoice->Add( m_listUserPaths, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );

	

	

	wxBoxSizer* bUserPathsButtonsSizer;

	wxBoxSizer* bUserPathsButtonsSizer;

	bUserPathsButtonsSizer = new wxBoxSizer( wxVERTICAL );

	bUserPathsButtonsSizer = new wxBoxSizer( wxVERTICAL );
@@ -74,19 +93,29 @@ DIALOG_EESCHEMA_CONFIG_FBP::DIALOG_EESCHEMA_CONFIG_FBP( wxWindow* parent, wxWind 
	m_buttonRemovePath = new wxButton( this, wxID_REMOVE_PATH, _("Remove"), wxDefaultPosition, wxDefaultSize, 0 );

	m_buttonRemovePath = new wxButton( this, wxID_REMOVE_PATH, _("Remove"), wxDefaultPosition, wxDefaultSize, 0 );

	bUserPathsButtonsSizer->Add( m_buttonRemovePath, 0, wxALL|wxEXPAND, 5 );

	bUserPathsButtonsSizer->Add( m_buttonRemovePath, 0, wxALL|wxEXPAND, 5 );

	

	

	sbSizer4->Add( bUserPathsButtonsSizer, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );

	

	

	bMainSizer->Add( sbSizer4, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );

	bSizerPathsChoice->Add( bUserPathsButtonsSizer, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );

	

	

	wxStaticBoxSizer* sbLibPathSizer;

	

	sbLibPathSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Current search path list") ), wxVERTICAL );

	bSizerMiddle->Add( bSizerPathsChoice, 1, wxEXPAND, 5 );

	

	

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

	

	wxBoxSizer* bSizerLower;

	bSizerLower = new wxBoxSizer( wxVERTICAL );

	

	m_staticTextPathlist = new wxStaticText( this, wxID_ANY, _("Current search path list"), wxDefaultPosition, wxDefaultSize, 0 );

	m_staticTextPathlist->Wrap( -1 );

	bSizerLower->Add( m_staticTextPathlist, 0, wxTOP|wxRIGHT|wxLEFT, 5 );

	

	

	m_DefaultLibraryPathslistBox = new wxListBox( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_NEEDED_SB ); 

	m_DefaultLibraryPathslistBox = new wxListBox( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_NEEDED_SB ); 

	m_DefaultLibraryPathslistBox->SetToolTip( _("System and user paths used to search and load library files and component doc files.\nSorted by decreasing priority order.") );

	m_DefaultLibraryPathslistBox->SetToolTip( _("System and user paths used to search and load library files and component doc files.\nSorted by decreasing priority order.") );

	

	

	sbLibPathSizer->Add( m_DefaultLibraryPathslistBox, 1, wxALL|wxEXPAND, 5 );

	bSizerLower->Add( m_DefaultLibraryPathslistBox, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );

	

	

	

	bMainSizer->Add( sbLibPathSizer, 1, wxALL|wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );

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

	

	

	m_staticline3 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );

	m_staticline3 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );

	bMainSizer->Add( m_staticline3, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );

	bMainSizer->Add( m_staticline3, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
@@ -97,8 +126,10 @@ DIALOG_EESCHEMA_CONFIG_FBP::DIALOG_EESCHEMA_CONFIG_FBP( wxWindow* parent, wxWind 
	m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL );

	m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL );

	m_sdbSizer1->AddButton( m_sdbSizer1Cancel );

	m_sdbSizer1->AddButton( m_sdbSizer1Cancel );

	m_sdbSizer1->Realize();

	m_sdbSizer1->Realize();

	

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

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

	

	

	

	this->SetSizer( bMainSizer );

	this->SetSizer( bMainSizer );

	this->Layout();

	this->Layout();

	bMainSizer->Fit( this );

	bMainSizer->Fit( this );

eeschema/dialogs/dialog_eeschema_config_fbp.fbp

+1329 −692

File changed.

Preview size limit exceeded, changes collapsed.

eeschema/dialogs/dialog_eeschema_config_fbp.h

+13 −9
Original line number Original line Diff line number Diff line 
///////////////////////////////////////////////////////////////////////////

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

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

// C++ code generated with wxFormBuilder (version Oct  8 2012)

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

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

//

//

// PLEASE DO "NOT" EDIT THIS FILE!

// PLEASE DO "NOT" EDIT THIS FILE!

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

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





#ifndef __dialog_eeschema_config_fbp__

#ifndef __DIALOG_EESCHEMA_CONFIG_FBP_H__

#define __dialog_eeschema_config_fbp__

#define __DIALOG_EESCHEMA_CONFIG_FBP_H__





#include <wx/artprov.h>

#include <wx/xrc/xmlres.h>

#include <wx/intl.h>

#include <wx/intl.h>



#include <wx/string.h>

#include <wx/string.h>

#include <wx/listbox.h>

#include <wx/stattext.h>

#include <wx/gdicmn.h>

#include <wx/gdicmn.h>

#include <wx/font.h>

#include <wx/font.h>

#include <wx/colour.h>

#include <wx/colour.h>

#include <wx/settings.h>

#include <wx/settings.h>

#include <wx/listbox.h>

#include <wx/button.h>

#include <wx/button.h>

#include <wx/sizer.h>

#include <wx/sizer.h>

#include <wx/statbox.h>

#include <wx/statline.h>

#include <wx/statline.h>

#include <wx/dialog.h>

#include <wx/dialog.h>
@@ -38,19 +39,22 @@ class DIALOG_EESCHEMA_CONFIG_FBP : public wxDialog 
			ID_REMOVE_LIB,

			ID_REMOVE_LIB,

			ID_LIB_PATH_SEL,

			ID_LIB_PATH_SEL,

			wxID_INSERT_PATH,

			wxID_INSERT_PATH,

			wxID_REMOVE_PATH,

			wxID_REMOVE_PATH

		};

		};

		

		

		wxStaticText* m_staticTextLibsList;

		wxListBox* m_ListLibr;

		wxListBox* m_ListLibr;

		wxButton* m_buttonAddLib;

		wxButton* m_buttonAddLib;

		wxButton* m_buttonIns;

		wxButton* m_buttonIns;

		wxButton* m_buttonRemoveLib;

		wxButton* m_buttonRemoveLib;

		wxButton* m_buttonUp;

		wxButton* m_buttonUp;

		wxButton* m_buttonDown;

		wxButton* m_buttonDown;

		wxStaticText* m_staticTextPaths;

		wxListBox* m_listUserPaths;

		wxListBox* m_listUserPaths;

		wxButton* m_buttonAddPath;

		wxButton* m_buttonAddPath;

		wxButton* m_buttonInsPath;

		wxButton* m_buttonInsPath;

		wxButton* m_buttonRemovePath;

		wxButton* m_buttonRemovePath;

		wxStaticText* m_staticTextPathlist;

		wxListBox* m_DefaultLibraryPathslistBox;

		wxListBox* m_DefaultLibraryPathslistBox;

		wxStaticLine* m_staticline3;

		wxStaticLine* m_staticline3;
@@ -77,4 +81,4 @@ class DIALOG_EESCHEMA_CONFIG_FBP : public wxDialog 
	

	

};

};





#endif //__dialog_eeschema_config_fbp__
 
#endif //__DIALOG_EESCHEMA_CONFIG_FBP_H__

pcbnew/dialogs/dialog_pcbnew_config_libs_and_paths_fbp.cpp

+5 −5
Original line number Original line Diff line number Diff line
@@ -63,7 +63,7 @@ DIALOG_PCBNEW_CONFIG_LIBS_FBP::DIALOG_PCBNEW_CONFIG_LIBS_FBP( wxWindow* parent, 
	bLibsChoiceSizer->Add( bLibsChoiceListSizer, 1, wxEXPAND, 5 );

	bLibsChoiceSizer->Add( bLibsChoiceListSizer, 1, wxEXPAND, 5 );

	

	

	

	

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

	bMainSizer->Add( bLibsChoiceSizer, 2, wxEXPAND, 5 );

	

	

	wxBoxSizer* bModulesDocSizer;

	wxBoxSizer* bModulesDocSizer;

	bModulesDocSizer = new wxBoxSizer( wxVERTICAL );

	bModulesDocSizer = new wxBoxSizer( wxVERTICAL );
@@ -119,10 +119,10 @@ DIALOG_PCBNEW_CONFIG_LIBS_FBP::DIALOG_PCBNEW_CONFIG_LIBS_FBP( wxWindow* parent, 
	bSizerPathsChoice->Add( bUserPathsButtonsSizer, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 );

	bSizerPathsChoice->Add( bUserPathsButtonsSizer, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 );

	

	

	

	

	bSizerPaths->Add( bSizerPathsChoice, 0, wxEXPAND, 5 );

	bSizerPaths->Add( bSizerPathsChoice, 1, wxEXPAND, 5 );

	

	

	

	

	bMainSizer->Add( bSizerPaths, 0, wxEXPAND, 5 );

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

	

	

	wxBoxSizer* bLibPathSizer;

	wxBoxSizer* bLibPathSizer;

	bLibPathSizer = new wxBoxSizer( wxVERTICAL );

	bLibPathSizer = new wxBoxSizer( wxVERTICAL );
@@ -135,10 +135,10 @@ DIALOG_PCBNEW_CONFIG_LIBS_FBP::DIALOG_PCBNEW_CONFIG_LIBS_FBP( wxWindow* parent, 
	m_DefaultLibraryPathslistBox->SetToolTip( _("System and user paths used to search and load library files and component doc files.\nSorted by decreasing priority order.") );

	m_DefaultLibraryPathslistBox->SetToolTip( _("System and user paths used to search and load library files and component doc files.\nSorted by decreasing priority order.") );

	m_DefaultLibraryPathslistBox->SetMinSize( wxSize( -1,70 ) );

	m_DefaultLibraryPathslistBox->SetMinSize( wxSize( -1,70 ) );

	

	

	bLibPathSizer->Add( m_DefaultLibraryPathslistBox, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );

	bLibPathSizer->Add( m_DefaultLibraryPathslistBox, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );

	

	

	

	

	bMainSizer->Add( bLibPathSizer, 0, wxEXPAND, 5 );

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

	

	

	m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );

	m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );

	bMainSizer->Add( m_staticline1, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );

	bMainSizer->Add( m_staticline1, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );

pcbnew/dialogs/dialog_pcbnew_config_libs_and_paths_fbp.fbp

+5 −5
Original line number Original line Diff line number Diff line
@@ -94,7 +94,7 @@ 
                <object class="sizeritem" expanded="1">

                <object class="sizeritem" expanded="1">

                    <property name="border">5</property>

                    <property name="border">5</property>

                    <property name="flag">wxEXPAND</property>

                    <property name="flag">wxEXPAND</property>

                    <property name="proportion">1</property>

                    <property name="proportion">2</property>

                    <object class="wxBoxSizer" expanded="1">

                    <object class="wxBoxSizer" expanded="1">

                        <property name="minimum_size"></property>

                        <property name="minimum_size"></property>

                        <property name="name">bLibsChoiceSizer</property>

                        <property name="name">bLibsChoiceSizer</property>
@@ -1022,7 +1022,7 @@ 
                <object class="sizeritem" expanded="1">

                <object class="sizeritem" expanded="1">

                    <property name="border">5</property>

                    <property name="border">5</property>

                    <property name="flag">wxEXPAND</property>

                    <property name="flag">wxEXPAND</property>

                    <property name="proportion">0</property>

                    <property name="proportion">1</property>

                    <object class="wxBoxSizer" expanded="1">

                    <object class="wxBoxSizer" expanded="1">

                        <property name="minimum_size"></property>

                        <property name="minimum_size"></property>

                        <property name="name">bSizerPaths</property>

                        <property name="name">bSizerPaths</property>
@@ -1114,7 +1114,7 @@ 
                        <object class="sizeritem" expanded="1">

                        <object class="sizeritem" expanded="1">

                            <property name="border">5</property>

                            <property name="border">5</property>

                            <property name="flag">wxEXPAND</property>

                            <property name="flag">wxEXPAND</property>

                            <property name="proportion">0</property>

                            <property name="proportion">1</property>

                            <object class="wxBoxSizer" expanded="1">

                            <object class="wxBoxSizer" expanded="1">

                                <property name="minimum_size"></property>

                                <property name="minimum_size"></property>

                                <property name="name">bSizerPathsChoice</property>

                                <property name="name">bSizerPathsChoice</property>
@@ -1490,7 +1490,7 @@ 
                <object class="sizeritem" expanded="1">

                <object class="sizeritem" expanded="1">

                    <property name="border">5</property>

                    <property name="border">5</property>

                    <property name="flag">wxEXPAND</property>

                    <property name="flag">wxEXPAND</property>

                    <property name="proportion">0</property>

                    <property name="proportion">1</property>

                    <object class="wxBoxSizer" expanded="1">

                    <object class="wxBoxSizer" expanded="1">

                        <property name="minimum_size"></property>

                        <property name="minimum_size"></property>

                        <property name="name">bLibPathSizer</property>

                        <property name="name">bLibPathSizer</property>
@@ -1582,7 +1582,7 @@ 
                        <object class="sizeritem" expanded="1">

                        <object class="sizeritem" expanded="1">

                            <property name="border">5</property>

                            <property name="border">5</property>

                            <property name="flag">wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT</property>

                            <property name="flag">wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT</property>

                            <property name="proportion">0</property>

                            <property name="proportion">1</property>

                            <object class="wxListBox" expanded="1">

                            <object class="wxListBox" expanded="1">

                                <property name="BottomDockable">1</property>

                                <property name="BottomDockable">1</property>

                                <property name="LeftDockable">1</property>

                                <property name="LeftDockable">1</property>