Commit 2db1e221 authored by jean-pierre charras's avatar jean-pierre charras
Browse files

Eeschema: Fix icons in macro menu. 

Fix confusing labels in libedit (for pins and graphic items sharing)
parent 8a82c615

bitmaps_png/cpp_26/macros_record.cpp

0 → 100644
+74 −0
Original line number Diff line number Diff line 


/* Do not modify this file, it was automatically generated by the

 * PNG2cpp CMake script, using a *.png file as input.

 */



#include "bitmaps.h"



static const unsigned char png[] = {

 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,

 0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00, 0x1a, 0x08, 0x06, 0x00, 0x00, 0x00, 0xa9, 0x4a, 0x4c,

 0xce, 0x00, 0x00, 0x03, 0x90, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xed, 0x96, 0xcb, 0x8b, 0x1d,

 0x55, 0x10, 0xc6, 0x7f, 0x75, 0xce, 0xe9, 0xfb, 0xe8, 0x79, 0x65, 0x9e, 0x92, 0x31, 0x28, 0x46,

 0x27, 0x51, 0x51, 0x0c, 0xf1, 0x01, 0x21, 0x9a, 0xe8, 0x42, 0x31, 0xf9, 0x07, 0x34, 0x06, 0x22,

 0xba, 0x8a, 0xb8, 0x70, 0xe9, 0xda, 0x95, 0x10, 0xb2, 0x13, 0x71, 0x29, 0xba, 0x70, 0x21, 0x6e,

 0xdc, 0x29, 0xba, 0x31, 0x20, 0xf1, 0x31, 0xa0, 0x62, 0x40, 0x12, 0xc7, 0x99, 0x38, 0x01, 0x13,

 0x47, 0x31, 0xf3, 0xc8, 0xdc, 0xb9, 0x77, 0xba, 0x4f, 0x95, 0x8b, 0xee, 0xfb, 0x9a, 0xeb, 0x52,

 0x66, 0x95, 0xde, 0xf4, 0x57, 0xb7, 0xbb, 0xcf, 0x57, 0x5f, 0x55, 0x9d, 0xef, 0x5c, 0x31, 0x33,

 0x76, 0xe3, 0x72, 0xec, 0xd2, 0xb5, 0x6b, 0x44, 0xa1, 0x37, 0x10, 0x91, 0x39, 0x60, 0xf2, 0x7f,

 0x5a, 0x7b, 0xc5, 0xcc, 0x16, 0x07, 0x88, 0xc6, 0xc6, 0xc6, 0xce, 0x3c, 0x75, 0xfc, 0xd8, 0xbb,

 0x23, 0xa3, 0x23, 0x75, 0x11, 0x41, 0x04, 0x8a, 0xbb, 0x80, 0x19, 0xed, 0x56, 0x9a, 0x19, 0x6a,

 0x86, 0xa9, 0x62, 0x06, 0x66, 0x4a, 0xd4, 0x22, 0x56, 0x33, 0x34, 0x46, 0xd4, 0x8c, 0xf5, 0xb5,

 0xf5, 0xad, 0x10, 0xc2, 0x2b, 0x79, 0x9e, 0x7f, 0xd2, 0x47, 0x34, 0x3d, 0x33, 0xfd, 0xe6, 0xd4,

 0xcc, 0xf4, 0x70, 0x96, 0xe5, 0x48, 0x21, 0xaf, 0xad, 0x13, 0xb5, 0x88, 0xaa, 0x12, 0xa3, 0x12,

 0x63, 0x24, 0x6a, 0x24, 0x46, 0x45, 0x63, 0x2c, 0x63, 0x25, 0xe6, 0x91, 0x5c, 0x15, 0xcb, 0x23,

 0x79, 0x9e, 0x93, 0x54, 0x2a, 0xc3, 0x93, 0x93, 0x93, 0x6f, 0x01, 0xfd, 0x44, 0xa6, 0x96, 0xff,

 0xae, 0x0f, 0x23, 0xe9, 0x68, 0xa1, 0xa2, 0x43, 0x53, 0xa8, 0x80, 0xb6, 0x24, 0x30, 0x0c, 0xcc,

 0xca, 0x5c, 0xac, 0xf3, 0x28, 0x94, 0x61, 0x82, 0x91, 0x47, 0xc3, 0x6d, 0x7c, 0x5a, 0xfb, 0xcf,

 0x1e, 0x85, 0xe0, 0xa8, 0x8f, 0x4f, 0x23, 0x02, 0x4e, 0x40, 0x30, 0x90, 0x82, 0x4c, 0x80, 0x2c,

 0x8f, 0x45, 0x49, 0x3b, 0x3d, 0xb5, 0x0e, 0xf6, 0x4e, 0x78, 0xf4, 0xfe, 0x59, 0x82, 0x77, 0x6c,

 0x6c, 0x36, 0xb9, 0x76, 0x63, 0x95, 0x95, 0x4b, 0xce, 0x0d, 0x12, 0x8d, 0xee, 0x1f, 0x89, 0xe6,

 0x08, 0xce, 0x48, 0x7c, 0xd9, 0x1f, 0xa4, 0x93, 0xb5, 0x00, 0x52, 0xaa, 0x91, 0x32, 0xee, 0x26,

 0x61, 0x88, 0x08, 0xff, 0xac, 0x6d, 0xe0, 0x9d, 0x63, 0xfd, 0xd6, 0x16, 0x6a, 0x11, 0x9f, 0xce,

 0x0c, 0x2a, 0xaa, 0xdf, 0xf5, 0xe4, 0xde, 0xc9, 0x99, 0x59, 0x1a, 0x5b, 0x0d, 0x5a, 0x22, 0x85,

 0x9a, 0x9e, 0xf2, 0xb5, 0xe3, 0x7e, 0x45, 0x5d, 0x0c, 0xc6, 0xd2, 0xb5, 0x15, 0xbc, 0x77, 0x78,

 0x27, 0xd4, 0x2a, 0x9e, 0xf1, 0x7d, 0x0f, 0xed, 0x19, 0x20, 0x0a, 0x4e, 0x2d, 0x09, 0x86, 0x43,

 0x19, 0x4e, 0x2b, 0x25, 0xc1, 0xce, 0xcc, 0x0b, 0x59, 0x1d, 0xbc, 0xa3, 0x7c, 0x52, 0x96, 0x3b,

 0x78, 0x21, 0x04, 0x08, 0xae, 0x6b, 0x3b, 0xa1, 0x37, 0xeb, 0xc4, 0x81, 0x77, 0x10, 0x9c, 0x0e,

 0x2c, 0xd6, 0x51, 0xd6, 0x5b, 0xca, 0x1d, 0x71, 0x3b, 0xa1, 0xd1, 0x34, 0x60, 0x3d, 0xdf, 0xf5,

 0x13, 0x49, 0x41, 0xe0, 0x50, 0xb6, 0x9b, 0x59, 0x7f, 0xe6, 0xd2, 0x4d, 0x06, 0x29, 0xec, 0xc4,

 0x49, 0xd1, 0x17, 0xe7, 0xba, 0x84, 0x6d, 0x9c, 0xf8, 0xa2, 0xf4, 0xbe, 0x3b, 0x0b, 0x3d, 0xe3,

 0x2d, 0x6c, 0x27, 0xde, 0xea, 0x92, 0x6d, 0x90, 0x2d, 0x7d, 0x81, 0x19, 0x9c, 0x3f, 0x7f, 0x8e,

 0xf5, 0xb5, 0x0d, 0xea, 0xf5, 0x1a, 0xcd, 0xd6, 0x16, 0xcf, 0x3d, 0x7b, 0x82, 0x56, 0xb3, 0x45,

 0xa5, 0x36, 0xc4, 0x0b, 0x6f, 0x9c, 0xe3, 0xe9, 0xc7, 0xee, 0xe1, 0x99, 0xc7, 0x0f, 0x72, 0xe5,

 0xca, 0x65, 0x0e, 0xcc, 0x1d, 0xe4, 0xf2, 0xf2, 0x75, 0x3e, 0xfe, 0xec, 0x07, 0xaa, 0xc1, 0x50,

 0x35, 0xc4, 0x87, 0xed, 0x01, 0xaf, 0xab, 0x0d, 0x8d, 0x5f, 0x0d, 0x4e, 0xc9, 0xb6, 0x9b, 0x5c,

 0xfc, 0xfa, 0x1b, 0x0e, 0x1f, 0x3e, 0xc4, 0xec, 0xde, 0x3b, 0xf9, 0xf6, 0xbb, 0x8b, 0xcc, 0xcf,

 0x7f, 0xcf, 0x7d, 0xf7, 0x1e, 0xe0, 0xc4, 0xc9, 0xe7, 0x49, 0xd3, 0x3a, 0xdb, 0xcd, 0x4d, 0x88,

 0x4d, 0xe6, 0xee, 0x9e, 0x66, 0xf5, 0xe6, 0x2a, 0x17, 0x2e, 0x7c, 0xc5, 0xc2, 0xc2, 0xaf, 0xdc,

 0x31, 0x31, 0x4a, 0xc5, 0x1b, 0xc1, 0x29, 0x89, 0x28, 0x43, 0x63, 0x13, 0x57, 0x07, 0x14, 0x79,

 0xef, 0x48, 0x9c, 0xe2, 0xc5, 0x68, 0x34, 0x1a, 0x7c, 0xf0, 0xfe, 0x87, 0x9c, 0x3a, 0xf5, 0x22,

 0xa7, 0x4f, 0x9f, 0x21, 0x09, 0x9e, 0xdf, 0x16, 0x17, 0xb8, 0xfe, 0xc7, 0x75, 0x8e, 0x1c, 0x3d,

 0x42, 0xa6, 0x42, 0xbd, 0x9a, 0xb0, 0xb8, 0xfc, 0x27, 0x27, 0x8f, 0x3f, 0xc1, 0x6b, 0x67, 0x5f,

 0x27, 0x4d, 0x53, 0xe6, 0x7f, 0xfe, 0x05, 0x2f, 0x8a, 0xc7, 0x50, 0x51, 0x9c, 0xf8, 0xee, 0xe4,

 0xb6, 0xcf, 0xa3, 0x63, 0xaf, 0xbe, 0xf3, 0xe3, 0x03, 0xfb, 0xfc, 0x23, 0x37, 0xfe, 0x6e, 0x30,

 0x39, 0x5c, 0x10, 0x0f, 0xa5, 0x35, 0x26, 0xf6, 0x0c, 0x23, 0xc0, 0xfa, 0xad, 0x4d, 0x62, 0x16,

 0xf1, 0x4e, 0x70, 0xde, 0x11, 0x92, 0x0a, 0x02, 0x0c, 0x0f, 0x55, 0xa8, 0x56, 0x13, 0xf2, 0xed,

 0xc8, 0x66, 0xa3, 0x89, 0xa2, 0x24, 0xde, 0xd3, 0x6c, 0xb6, 0x98, 0xbf, 0x2a, 0x3f, 0x7d, 0xfe,

 0xde, 0xd9, 0x43, 0x7d, 0x8a, 0x1c, 0x84, 0xc4, 0x29, 0x69, 0xdd, 0x53, 0xab, 0x3a, 0x44, 0x20,

 0xcb, 0x32, 0x56, 0xfe, 0xba, 0xd9, 0xe7, 0x10, 0x31, 0x02, 0x39, 0x48, 0xab, 0x89, 0x00, 0x9b,

 0x9b, 0x83, 0xfb, 0xac, 0x5a, 0x49, 0x4a, 0x53, 0xf6, 0xa1, 0xaf, 0x47, 0x22, 0x32, 0xa5, 0xda,

 0x1c, 0x09, 0xce, 0x18, 0xaf, 0x0b, 0xc1, 0x59, 0xe1, 0x10, 0x4e, 0x09, 0x4e, 0x4b, 0x6c, 0x25,

 0xd6, 0xf2, 0x77, 0xeb, 0xc1, 0xda, 0xf7, 0xbe, 0x68, 0x86, 0x47, 0xd1, 0xbc, 0x35, 0x22, 0x22,

 0x53, 0xbd, 0x8a, 0x52, 0x4c, 0x92, 0xa1, 0xaa, 0xa7, 0x5e, 0x91, 0x01, 0x7b, 0x71, 0x3b, 0xe2,

 0x02, 0x4b, 0x77, 0x53, 0xf7, 0x8c, 0x7f, 0x7b, 0x03, 0x3b, 0xe7, 0x80, 0x98, 0x00, 0x69, 0xd7,

 0x70, 0xcd, 0x96, 0xf7, 0x1f, 0x7d, 0xf9, 0xed, 0x2f, 0xf3, 0x07, 0x5f, 0x12, 0xc3, 0x39, 0x29,

 0xa7, 0xd1, 0xb5, 0x17, 0x90, 0x8e, 0x7b, 0x4b, 0xc9, 0x28, 0x7d, 0x27, 0x66, 0xfb, 0x55, 0x29,

 0xcf, 0x2c, 0x31, 0x15, 0x89, 0x2b, 0x4b, 0x97, 0x3e, 0x32, 0xb3, 0xe5, 0xbe, 0x61, 0xb8, 0xfd,

 0xe7, 0xe4, 0x36, 0xd1, 0xbf, 0x70, 0x51, 0x80, 0xee, 0x5f, 0x46, 0xf4, 0x81, 0x00, 0x00, 0x00,

 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,

};



const BITMAP_OPAQUE macros_record_xpm[1] = {{ png, sizeof( png ), "macros_record_xpm" }};



//EOF

eeschema/dialogs/dialog_lib_edit_draw_item.fbp

+937 −442

File changed.

Preview size limit exceeded, changes collapsed.

eeschema/dialogs/dialog_lib_edit_draw_item_base.cpp

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

// C++ code generated with wxFormBuilder (version Apr 16 2008)

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

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

//

// PLEASE DO "NOT" EDIT THIS FILE!
@@ -47,14 +47,19 @@ DIALOG_LIB_EDIT_DRAW_ITEM_BASE::DIALOG_LIB_EDIT_DRAW_ITEM_BASE( wxWindow* parent 
	

	dlgBorderSizer->Add( bSizer3, 0, wxALL|wxEXPAND, 0 );

	

	m_staticTextSharing = new wxStaticText( this, ID_M_STATICTEXTSHARING, _("Sharing"), wxDefaultPosition, wxDefaultSize, 0 );

	m_staticTextSharing->Wrap( -1 );

	m_staticTextSharing->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );

	

	dlgBorderSizer->Add( m_staticTextSharing, 0, wxTOP|wxBOTTOM, 5 );

	

	wxBoxSizer* bSizer4;

	bSizer4 = new wxBoxSizer( wxHORIZONTAL );

	

	

	bSizer4->Add( 12, 0, 0, wxEXPAND, 3 );

	

	m_checkApplyToAllUnits = new wxCheckBox( this, wxID_ANY, _("Apply changes to all &parts in component"), wxDefaultPosition, wxDefaultSize, 0 );

	

	m_checkApplyToAllUnits = new wxCheckBox( this, wxID_ANY, _("Shared by all &parts in component"), wxDefaultPosition, wxDefaultSize, 0 );

	bSizer4->Add( m_checkApplyToAllUnits, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 );

	

	dlgBorderSizer->Add( bSizer4, 0, wxALL|wxEXPAND, 0 );
@@ -65,8 +70,7 @@ DIALOG_LIB_EDIT_DRAW_ITEM_BASE::DIALOG_LIB_EDIT_DRAW_ITEM_BASE( wxWindow* parent 
	

	bSizer5->Add( 12, 0, 0, wxEXPAND, 3 );

	

	m_checkApplyToAllConversions = new wxCheckBox( this, wxID_ANY, _("Apply changes to all body &styles (DeMorgan)"), wxDefaultPosition, wxDefaultSize, 0 );

	

	m_checkApplyToAllConversions = new wxCheckBox( this, wxID_ANY, _("Shared by all body &styles (DeMorgan)"), wxDefaultPosition, wxDefaultSize, 0 );

	bSizer5->Add( m_checkApplyToAllConversions, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 );

	

	dlgBorderSizer->Add( bSizer5, 0, wxEXPAND, 3 );

eeschema/dialogs/dialog_lib_edit_draw_item_base.h

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

// C++ code generated with wxFormBuilder (version Apr 16 2008)

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

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

//

// PLEASE DO "NOT" EDIT THIS FILE!

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



#ifndef __dialog_lib_edit_draw_item_base__

#define __dialog_lib_edit_draw_item_base__

#ifndef __DIALOG_LIB_EDIT_DRAW_ITEM_BASE_H__

#define __DIALOG_LIB_EDIT_DRAW_ITEM_BASE_H__



#include <wx/artprov.h>

#include <wx/xrc/xmlres.h>

#include <wx/intl.h>



#include <wx/string.h>

#include <wx/stattext.h>

#include <wx/gdicmn.h>
@@ -33,31 +34,31 @@ class DIALOG_LIB_EDIT_DRAW_ITEM_BASE : public wxDialog 
	private:

	

	protected:

		wxStaticText* m_staticText1;

		enum

		{

			ID_M_STATICTEXTSHARING = 1000,

		};

		

		wxStaticText* m_staticText1;

		wxStaticText* m_staticWidth;

		

		wxTextCtrl* m_textWidth;

		wxStaticText* m_staticWidthUnits;

		

		wxStaticText* m_staticTextSharing;

		wxCheckBox* m_checkApplyToAllUnits;

		

		wxCheckBox* m_checkApplyToAllConversions;

		

		wxStaticText* m_staticText4;

		

		wxRadioButton* m_radioFillNone;

		wxRadioButton* m_radioFillForeground;

		wxRadioButton* m_radioFillBackground;

		

		wxStdDialogButtonSizer* m_sdbSizer1;

		wxButton* m_sdbSizer1OK;

		wxButton* m_sdbSizer1Cancel;

	

	public:

		

		DIALOG_LIB_EDIT_DRAW_ITEM_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Drawing Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 

		~DIALOG_LIB_EDIT_DRAW_ITEM_BASE();

	

};



#endif //__dialog_lib_edit_draw_item_base__
 
#endif //__DIALOG_LIB_EDIT_DRAW_ITEM_BASE_H__

eeschema/dialogs/dialog_lib_edit_pin_base.cpp

+4 −5
Original line number Diff line number Diff line 
///////////////////////////////////////////////////////////////////////////

// C++ code generated with wxFormBuilder (version Nov 17 2010)

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

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

//

// PLEASE DO "NOT" EDIT THIS FILE!
@@ -75,13 +75,12 @@ DIALOG_LIB_EDIT_PIN_BASE::DIALOG_LIB_EDIT_PIN_BASE( wxWindow* parent, wxWindowID 
	boarderSizer = new wxBoxSizer( wxVERTICAL );

	

	wxStaticBoxSizer* sbSizerPinSharing;

	sbSizerPinSharing = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Pin Sharing") ), wxVERTICAL );

	sbSizerPinSharing = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Sharing") ), wxVERTICAL );

	

	m_checkApplyToAllParts = new wxCheckBox( this, wxID_ANY, _("Add to all &parts in package"), wxDefaultPosition, wxDefaultSize, 0 );

	m_checkApplyToAllParts = new wxCheckBox( this, wxID_ANY, _("Shared by all &parts in component"), wxDefaultPosition, wxDefaultSize, 0 );

	sbSizerPinSharing->Add( m_checkApplyToAllParts, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 );

	

	m_checkApplyToAllConversions = new wxCheckBox( this, wxID_ANY, _("Add to all alternate &body styles (DeMorgan)"), wxDefaultPosition, wxDefaultSize, 0 );

	m_checkApplyToAllConversions->SetValue(true); 

	m_checkApplyToAllConversions = new wxCheckBox( this, wxID_ANY, _("Shared by all body &styles (DeMorgan)"), wxDefaultPosition, wxDefaultSize, 0 );

	sbSizerPinSharing->Add( m_checkApplyToAllConversions, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 );

	

	boarderSizer->Add( sbSizerPinSharing, 0, wxEXPAND|wxALL, 5 );