Updated boost to version 1.34 (90621bef) · Commits · Elphel / kicad-source-mirror

bitmap2component/bitmap2cmp_gui_base.cpp

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -88,12 +88,12 @@ BM2CMP_FRAME_BASE::BM2CMP_FRAME_BASE( wxWindow* parent, wxWindowID id, const wxS
	brightSizer->Add( m_buttonLoad, 0, wxALL\|wxEXPAND\|wxALIGN_CENTER_HORIZONTAL, 5 );		brightSizer->Add( m_buttonLoad, 0, wxALL\|wxEXPAND\|wxALIGN_CENTER_HORIZONTAL, 5 );

	m_buttonExportEeschema = new wxButton( this, wxID_ANY, _("Export to eeschema"), wxDefaultPosition, wxDefaultSize, 0 );		m_buttonExportEeschema = new wxButton( this, wxID_ANY, _("Export to eeschema"), wxDefaultPosition, wxDefaultSize, 0 );
	m_buttonExportEeschema->SetToolTip( _("Create a lib file for Eeschema") );		m_buttonExportEeschema->SetToolTip( _("Create a library file for Eeschema\nThis library contains only one component: logo") );

	brightSizer->Add( m_buttonExportEeschema, 0, wxALL\|wxEXPAND\|wxALIGN_CENTER_HORIZONTAL, 5 );		brightSizer->Add( m_buttonExportEeschema, 0, wxALL\|wxEXPAND\|wxALIGN_CENTER_HORIZONTAL, 5 );

	m_buttonExportPcbnew = new wxButton( this, wxID_ANY, _("Export to Pcbnew"), wxDefaultPosition, wxDefaultSize, 0 );		m_buttonExportPcbnew = new wxButton( this, wxID_ANY, _("Export to Pcbnew"), wxDefaultPosition, wxDefaultSize, 0 );
	m_buttonExportPcbnew->SetToolTip( _("Create a footprint file for PcbNew") );		m_buttonExportPcbnew->SetToolTip( _("Create a footprint file for PcbNew\nThis footprint contains only one footprint: logo") );

	brightSizer->Add( m_buttonExportPcbnew, 0, wxALL\|wxEXPAND\|wxALIGN_CENTER_HORIZONTAL, 5 );		brightSizer->Add( m_buttonExportPcbnew, 0, wxALL\|wxEXPAND\|wxALIGN_CENTER_HORIZONTAL, 5 );

	@@ -108,6 +108,8 @@ BM2CMP_FRAME_BASE::BM2CMP_FRAME_BASE( wxWindow* parent, wxWindowID id, const wxS
	brightSizer->Add( m_ThresholdText, 0, wxTOP\|wxRIGHT\|wxLEFT, 5 );		brightSizer->Add( m_ThresholdText, 0, wxTOP\|wxRIGHT\|wxLEFT, 5 );

	m_sliderThreshold = new wxSlider( this, wxID_ANY, 25, 0, 50, wxDefaultPosition, wxDefaultSize, wxSL_AUTOTICKS\|wxSL_HORIZONTAL\|wxSL_TOP );		m_sliderThreshold = new wxSlider( this, wxID_ANY, 25, 0, 50, wxDefaultPosition, wxDefaultSize, wxSL_AUTOTICKS\|wxSL_HORIZONTAL\|wxSL_TOP );
			m_sliderThreshold->SetToolTip( _("Adjust the level to convert the greysvale picture to the binary picture.") );

	brightSizer->Add( m_sliderThreshold, 0, wxEXPAND\|wxALIGN_CENTER_HORIZONTAL\|wxBOTTOM\|wxRIGHT\|wxLEFT, 5 );		brightSizer->Add( m_sliderThreshold, 0, wxEXPAND\|wxALIGN_CENTER_HORIZONTAL\|wxBOTTOM\|wxRIGHT\|wxLEFT, 5 );

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

bitmap2component/bitmap2cmp_gui_base.fbp

+3 −3

demos/interf_u/interf_u.pro

+1 −1

Original line number	Original line	Diff line number	Diff line
	update=05/07/2010 19:03:21		update=22/07/2010 13:46:39
	version=1		version=1
	last_client=pcbnew		last_client=pcbnew
	[common]		[common]

eeschema/hotkeys.cpp

+31 −8

Original line number	Original line	Diff line number	Diff line
	@@ -106,6 +106,8 @@ static Ki_HotkeyInfo HkAddLabel( wxT( "add Label" ), HK_ADD_LABEL, 'L' );
	static Ki_HotkeyInfo HkBeginWire( wxT( "begin Wire" ), HK_BEGIN_WIRE, 'W' );		static Ki_HotkeyInfo HkBeginWire( wxT( "begin Wire" ), HK_BEGIN_WIRE, 'W' );
	static Ki_HotkeyInfo HkAddComponent( wxT( "Add Component" ),		static Ki_HotkeyInfo HkAddComponent( wxT( "Add Component" ),
	HK_ADD_NEW_COMPONENT, 'A' );		HK_ADD_NEW_COMPONENT, 'A' );
			static Ki_HotkeyInfo HkAddNoConn( wxT( "Add NoConnected Flag" ),
			HK_ADD_NOCONN_FLAG, 'Q' );
	static Ki_HotkeyInfo HkMirrorYComponent( wxT( "Mirror Y Component" ),		static Ki_HotkeyInfo HkMirrorYComponent( wxT( "Mirror Y Component" ),
	HK_MIRROR_Y_COMPONENT, 'Y' );		HK_MIRROR_Y_COMPONENT, 'Y' );
	static Ki_HotkeyInfo HkMirrorXComponent( wxT( "Mirror X Component" ),		static Ki_HotkeyInfo HkMirrorXComponent( wxT( "Mirror X Component" ),
	@@ -146,11 +148,11 @@ static Ki_HotkeyInfo HkFindNextDrcMarker( wxT( "Find next DRC marker" ), HK_FIND
	WXK_F5 + GR_KB_SHIFT );		WXK_F5 + GR_KB_SHIFT );

	// Special keys for library editor:		// Special keys for library editor:
			static Ki_HotkeyInfo HkCreatePin( wxT( "Create Pin" ),
			HK_LIBEDIT_CREATE_PIN, 'P' );
	static Ki_HotkeyInfo HkInsertPin( wxT( "Repeat Pin" ), HK_REPEAT_LAST,		static Ki_HotkeyInfo HkInsertPin( wxT( "Repeat Pin" ), HK_REPEAT_LAST,
	WXK_INSERT );		WXK_INSERT );
	static Ki_HotkeyInfo HkMovePin( wxT( "Move Pin" ), HK_LIBEDIT_MOVE_GRAPHIC_ITEM, 'M' );		static Ki_HotkeyInfo HkMovePin( wxT( "Move Pin" ), HK_LIBEDIT_MOVE_GRAPHIC_ITEM, 'M' );
	static Ki_HotkeyInfo HkDeletePin( wxT( "Delete Pin" ), HK_DELETE_PIN,
	WXK_DELETE );


	// List of common hotkey descriptors		// List of common hotkey descriptors
	@@ -190,16 +192,18 @@ Ki_HotkeyInfo* s_Schematic_Hotkey_List[] =
	&HkEditComponentFootprint,		&HkEditComponentFootprint,
	&HkBeginWire,		&HkBeginWire,
	&HkAddLabel,		&HkAddLabel,
			&HkAddNoConn,
	NULL		NULL
	};		};

	// List of hotkey descriptors for library editor		// List of hotkey descriptors for library editor
	Ki_HotkeyInfo* s_LibEdit_Hotkey_List[] =		Ki_HotkeyInfo* s_LibEdit_Hotkey_List[] =
	{		{
			&HkCreatePin,
	&HkInsertPin,		&HkInsertPin,
	&HkEdit,		&HkEdit,
	&HkMovePin,		&HkMovePin,
	&HkDeletePin,		&HkDelete,
	&HkRotate,		&HkRotate,
	&HkDrag,		&HkDrag,
	NULL		NULL
	@@ -396,6 +400,7 @@ void WinEDA_SchematicFrame::OnHotKey( wxDC* DC, int hotkey,
	break;		break;

	case HK_BEGIN_WIRE:		case HK_BEGIN_WIRE:

	/* An item is selected. If edited and not a wire, a new command is not		/* An item is selected. If edited and not a wire, a new command is not
	* possible */		* possible */
	if( !ItemInEdit && screen->m_BlockLocate.m_State == STATE_NO_BLOCK )		if( !ItemInEdit && screen->m_BlockLocate.m_State == STATE_NO_BLOCK )
	@@ -419,6 +424,16 @@ void WinEDA_SchematicFrame::OnHotKey( wxDC* DC, int hotkey,
	}		}
	break;		break;

			case HK_ADD_NOCONN_FLAG: // Add a no connected flag
			if( !ItemInEdit )
			{
			if( m_ID_current_state != ID_NOCONN_BUTT )
			SetToolID( ID_NOCONN_BUTT, wxCURSOR_PENCIL,
			_( "Add a no connected flag" ) );
			OnLeftClick( DC, MousePos );
			}
			break;

	case HK_ROTATE: // Component or other schematic item rotation		case HK_ROTATE: // Component or other schematic item rotation

	if( DrawStruct == NULL )		if( DrawStruct == NULL )
	@@ -831,8 +846,16 @@ void WinEDA_LibeditFrame::OnHotKey( wxDC* DC, int hotkey,
	}		}
	break;		break;

			case HK_LIBEDIT_CREATE_PIN:
			{
			wxCommandEvent evt;
			evt.SetId( ID_LIBEDIT_PIN_BUTT );
			Process_Special_Functions( evt );
			break;
			}


	case HK_DELETE_PIN:		case HK_DELETE:
	m_drawItem = LocateItemUsingCursor();		m_drawItem = LocateItemUsingCursor();

	if( m_drawItem )		if( m_drawItem )

eeschema/hotkeys.h

+12 −9

Original line number	Original line	Diff line number	Diff line
	@@ -15,11 +15,10 @@ enum hotkey_id_commnand {
	HK_FIND_ITEM,		HK_FIND_ITEM,
	HK_DELETE,		HK_DELETE,
	HK_REPEAT_LAST,		HK_REPEAT_LAST,
	HK_EDIT_PIN,
	HK_LIBEDIT_MOVE_GRAPHIC_ITEM,		HK_LIBEDIT_MOVE_GRAPHIC_ITEM,
	HK_LIBEDIT_ROTATE_PIN,
	HK_DELETE_PIN,
	HK_MOVEBLOCK_TO_DRAGBLOCK,		HK_MOVEBLOCK_TO_DRAGBLOCK,
			HK_LIBEDIT_CREATE_PIN,
			HK_DELETE_PIN,
	HK_ROTATE,		HK_ROTATE,
	HK_EDIT,		HK_EDIT,
	HK_EDIT_COMPONENT_VALUE,		HK_EDIT_COMPONENT_VALUE,
	@@ -32,15 +31,19 @@ enum hotkey_id_commnand {
	HK_DRAG,		HK_DRAG,
	HK_ADD_NEW_COMPONENT,		HK_ADD_NEW_COMPONENT,
	HK_BEGIN_WIRE,		HK_BEGIN_WIRE,
	HK_ADD_LABEL		HK_ADD_LABEL,
			HK_ADD_NOCONN_FLAG
	};		};

	// List of hotkey descriptors for eeschema		// List of hotkey descriptors for eeschema
	extern struct Ki_HotkeyInfoSectionDescriptor s_Eeschema_Hokeys_Descr[];		extern struct Ki_HotkeyInfoSectionDescriptor s_Eeschema_Hokeys_Descr[];

	// List of hotkey descriptors for the schematic editor only		// List of hotkey descriptors for the schematic editor only
	extern struct Ki_HotkeyInfoSectionDescriptor s_Schematic_Hokeys_Descr[];		extern struct Ki_HotkeyInfoSectionDescriptor s_Schematic_Hokeys_Descr[];

	// List of hotkey descriptors for the lib editor only		// List of hotkey descriptors for the lib editor only
	extern struct Ki_HotkeyInfoSectionDescriptor s_Libedit_Hokeys_Descr[];		extern struct Ki_HotkeyInfoSectionDescriptor s_Libedit_Hokeys_Descr[];

	// List of hotkey descriptors for the lib browser only		// List of hotkey descriptors for the lib browser only
	extern struct Ki_HotkeyInfoSectionDescriptor s_Viewlib_Hokeys_Descr[];		extern struct Ki_HotkeyInfoSectionDescriptor s_Viewlib_Hokeys_Descr[];

Original line number	Original line	Diff line number	Diff line
	@@ -851,7 +851,7 @@
	<property name="size"></property>		<property name="size"></property>
	<property name="style"></property>		<property name="style"></property>
	<property name="subclass"></property>		<property name="subclass"></property>
	<property name="tooltip">Create a lib file for Eeschema</property>		<property name="tooltip">Create a library file for Eeschema This library contains only one component: logo</property>
	<property name="window_extra_style"></property>		<property name="window_extra_style"></property>
	<property name="window_name"></property>		<property name="window_name"></property>
	<property name="window_style"></property>		<property name="window_style"></property>
	@@ -903,7 +903,7 @@
	<property name="size"></property>		<property name="size"></property>
	<property name="style"></property>		<property name="style"></property>
	<property name="subclass"></property>		<property name="subclass"></property>
	<property name="tooltip">Create a footprint file for PcbNew</property>		<property name="tooltip">Create a footprint file for PcbNew This footprint contains only one footprint: logo</property>
	<property name="window_extra_style"></property>		<property name="window_extra_style"></property>
	<property name="window_name"></property>		<property name="window_name"></property>
	<property name="window_style"></property>		<property name="window_style"></property>
	@@ -1060,7 +1060,7 @@
	<property name="size"></property>		<property name="size"></property>
	<property name="style">wxSL_AUTOTICKS\|wxSL_HORIZONTAL\|wxSL_TOP</property>		<property name="style">wxSL_AUTOTICKS\|wxSL_HORIZONTAL\|wxSL_TOP</property>
	<property name="subclass"></property>		<property name="subclass"></property>
	<property name="tooltip"></property>		<property name="tooltip">Adjust the level to convert the greysvale picture to the binary picture.</property>
	<property name="value">25</property>		<property name="value">25</property>
	<property name="window_extra_style"></property>		<property name="window_extra_style"></property>
	<property name="window_name"></property>		<property name="window_name"></property>