Eeschema: Add hotkey 'U' to edit reference. Better filtering for hotheys V,... (ba055196) · Commits · Elphel / kicad-source-mirror

eeschema/hotkeys.cpp

+5 −0

Original line number	Diff line number	Diff line
		@@ -168,6 +168,9 @@ static EDA_HOTKEY HkEdit( wxT( "Edit Schematic Item" ), HK_EDIT, 'E', ID_SCH_EDI
		static EDA_HOTKEY HkEditComponentValue( wxT( "Edit Component Value" ),
		HK_EDIT_COMPONENT_VALUE, 'V',
		ID_SCH_EDIT_COMPONENT_VALUE );
		static EDA_HOTKEY HkEditComponentReference( wxT( "Edit Component Reference" ),
		HK_EDIT_COMPONENT_REFERENCE, 'U',
		ID_SCH_EDIT_COMPONENT_REFERENCE );
		static EDA_HOTKEY HkEditComponentFootprint( wxT( "Edit Component Footprint" ),
		HK_EDIT_COMPONENT_FOOTPRINT, 'F',
		ID_SCH_EDIT_COMPONENT_FOOTPRINT );
		@@ -240,6 +243,7 @@ EDA_HOTKEY* s_Schematic_Hotkey_List[] =
		&HkOrientNormalComponent,
		&HkEdit,
		&HkEditComponentValue,
		&HkEditComponentReference,
		&HkEditComponentFootprint,
		&HkBeginWire,
		&HkBeginBus,
		@@ -490,6 +494,7 @@ void SCH_EDIT_FRAME::OnHotKey( wxDC* aDC, int aHotKey, const wxPoint& aPosition,
		case HK_MOVE_COMPONENT_OR_ITEM: // Start move schematic item.
		case HK_EDIT: // Edit schematic item.
		case HK_EDIT_COMPONENT_VALUE: // Edit component value field.
		case HK_EDIT_COMPONENT_REFERENCE: // Edit component value reference.
		case HK_EDIT_COMPONENT_FOOTPRINT: // Edit component footprint field.
		{
		// force a new item search on hot keys at current position,

eeschema/hotkeys.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ enum hotkey_id_commnand {
		HK_ROTATE,
		HK_EDIT,
		HK_EDIT_COMPONENT_VALUE,
		HK_EDIT_COMPONENT_REFERENCE,
		HK_EDIT_COMPONENT_FOOTPRINT,
		HK_MIRROR_X_COMPONENT,
		HK_MIRROR_Y_COMPONENT,

eeschema/onrightclick.cpp

+31 −8

Original line number	Diff line number	Diff line
		@@ -249,18 +249,37 @@ bool SCH_EDIT_FRAME::OnRightClick( const wxPoint& aPosition, wxMenu* PopMenu )

		void AddMenusForComponentField( wxMenu* PopMenu, SCH_FIELD* Field )
		{
		wxString msg;
		wxString msg, name;

		switch( Field->GetId() )
		{
		case REFERENCE: name = _( "Reference" ); break;
		case VALUE: name = _( "Value" ); break;
		case FOOTPRINT: name = _( "Footprint Field" ); break;
		default: name = _( "Field" ); break;
		}

		if( !Field->GetFlags() )
		{
		msg = AddHotkeyName( _( "Move Field" ), s_Schematic_Hokeys_Descr,
		msg = AddHotkeyName( _( "Move" ) + wxT(" ") + name, s_Schematic_Hokeys_Descr,
		HK_MOVE_COMPONENT_OR_ITEM );
		AddMenuItem( PopMenu, ID_SCH_MOVE_ITEM, msg, KiBitmap( move_text_xpm ) );
		}

		msg = AddHotkeyName( _( "Rotate Field" ), s_Schematic_Hokeys_Descr, HK_ROTATE );
		msg = AddHotkeyName( _( "Rotate" ) + wxT(" ") + name, s_Schematic_Hokeys_Descr,
		HK_ROTATE );
		AddMenuItem( PopMenu, ID_SCH_ROTATE_CLOCKWISE, msg, KiBitmap( rotate_field_xpm ) );
		msg = AddHotkeyName( _( "Edit Field" ), s_Schematic_Hokeys_Descr, HK_EDIT );

		// Ref, value and footprint have specific hotkeys. Show the specific hotkey:
		hotkey_id_commnand id;
		switch( Field->GetId() )
		{
		case REFERENCE: id = HK_EDIT_COMPONENT_REFERENCE; break;
		case VALUE: id = HK_EDIT_COMPONENT_VALUE; break;
		case FOOTPRINT: id = HK_EDIT_COMPONENT_FOOTPRINT; break;
		default: id = HK_EDIT; break;
		}
		msg = AddHotkeyName( _( "Edit" ) + wxT(" ") + name, s_Schematic_Hokeys_Descr, id );
		AddMenuItem( PopMenu, ID_SCH_EDIT_ITEM, msg, KiBitmap( edit_text_xpm ) );
		}

		@@ -313,10 +332,14 @@ void AddMenusForComponent( wxMenu* PopMenu, SCH_COMPONENT* Component )

		if( libComponent && libComponent->IsNormal() )
		{
		msg = AddHotkeyName( _( "Value " ), s_Schematic_Hokeys_Descr, HK_EDIT_COMPONENT_VALUE );
		AddMenuItem( editmenu, ID_SCH_EDIT_COMPONENT_VALUE, msg, KiBitmap( edit_comp_value_xpm ) );
		msg = AddHotkeyName( _( "Value" ), s_Schematic_Hokeys_Descr,
		HK_EDIT_COMPONENT_VALUE );
		AddMenuItem( editmenu, ID_SCH_EDIT_COMPONENT_VALUE, msg,
		KiBitmap( edit_comp_value_xpm ) );

		AddMenuItem( editmenu, ID_SCH_EDIT_COMPONENT_REFERENCE, _( "Reference" ),
		msg = AddHotkeyName( _( "Reference" ), s_Schematic_Hokeys_Descr,
		HK_EDIT_COMPONENT_REFERENCE );
		AddMenuItem( editmenu, ID_SCH_EDIT_COMPONENT_REFERENCE, msg,
		KiBitmap( edit_comp_ref_xpm ) );

		msg = AddHotkeyName( _( "Footprint" ), s_Schematic_Hokeys_Descr,

eeschema/sch_collectors.cpp

+15 −0

Original line number	Diff line number	Diff line
		@@ -89,6 +89,21 @@ const KICAD_T SCH_COLLECTOR::EditableItems[] = {
		EOT
		};

		const KICAD_T SCH_COLLECTOR::CmpFieldValueOnly[] = {
		SCH_FIELD_LOCATE_VALUE_T,
		EOT
		};

		const KICAD_T SCH_COLLECTOR::CmpFieldReferenceOnly[] = {
		SCH_FIELD_LOCATE_REFERENCE_T,
		EOT
		};

		const KICAD_T SCH_COLLECTOR::CmpFieldFootprintOnly[] = {
		SCH_FIELD_LOCATE_FOOTPRINT_T,
		EOT
		};


		const KICAD_T SCH_COLLECTOR::MovableItems[] = {
		SCH_MARKER_T,

eeschema/sch_collectors.h

+15 −0

Original line number	Diff line number	Diff line
		@@ -52,6 +52,21 @@ public:
		*/
		static const KICAD_T EditableItems[];

		/**
		* A scan list for a specific editable field: Value.
		*/
		static const KICAD_T CmpFieldValueOnly[];

		/**
		* A scan list for a specific editable field: Reference.
		*/
		static const KICAD_T CmpFieldReferenceOnly[];

		/**
		* A scan list for a specific editable field: Footprint.
		*/
		static const KICAD_T CmpFieldFootprintOnly[];

		/**
		* A scan list for all movable schematic items.
		*/

Admin message