Libview and Modview: fix issues relative to hotkeys (hardcoded keys instead of... (d82f403f) · Commits · Elphel / kicad-source-mirror

common/draw_frame.cpp

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -70,10 +70,11 @@ BEGIN_EVENT_TABLE( EDA_DRAW_FRAME, KIWAY_PLAYER )
	EVT_MOUSEWHEEL( EDA_DRAW_FRAME::OnMouseEvent )		EVT_MOUSEWHEEL( EDA_DRAW_FRAME::OnMouseEvent )
	EVT_MENU_OPEN( EDA_DRAW_FRAME::OnMenuOpen )		EVT_MENU_OPEN( EDA_DRAW_FRAME::OnMenuOpen )
	EVT_ACTIVATE( EDA_DRAW_FRAME::OnActivate )		EVT_ACTIVATE( EDA_DRAW_FRAME::OnActivate )
	EVT_MENU_RANGE( ID_ZOOM_IN, ID_ZOOM_REDRAW, EDA_DRAW_FRAME::OnZoom )		EVT_MENU_RANGE( ID_ZOOM_BEGIN, ID_ZOOM_END, EDA_DRAW_FRAME::OnZoom )
	EVT_MENU_RANGE( ID_OFFCENTER_ZOOM_IN, ID_OFFCENTER_ZOOM_OUT, EDA_DRAW_FRAME::OnZoom )
	EVT_MENU_RANGE( ID_POPUP_ZOOM_START_RANGE, ID_POPUP_ZOOM_END_RANGE,		EVT_MENU_RANGE( ID_POPUP_ZOOM_START_RANGE, ID_POPUP_ZOOM_END_RANGE,
	EDA_DRAW_FRAME::OnZoom )		EDA_DRAW_FRAME::OnZoom )

	EVT_MENU_RANGE( ID_POPUP_GRID_LEVEL_1000, ID_POPUP_GRID_USER,		EVT_MENU_RANGE( ID_POPUP_GRID_LEVEL_1000, ID_POPUP_GRID_USER,
	EDA_DRAW_FRAME::OnSelectGrid )		EDA_DRAW_FRAME::OnSelectGrid )

common/zoom.cpp

+8 −2

Original line number	Original line	Diff line number	Diff line
	@@ -138,6 +138,7 @@ void EDA_DRAW_FRAME::OnZoom( wxCommandEvent& event )
	center = GetCrossHairPosition();		center = GetCrossHairPosition();

	// fall thru		// fall thru
			case ID_VIEWER_ZOOM_IN:
	case ID_ZOOM_IN:		case ID_ZOOM_IN:
	if( screen->SetPreviousZoom() )		if( screen->SetPreviousZoom() )
	RedrawScreen( center, zoom_at_cursor );		RedrawScreen( center, zoom_at_cursor );
	@@ -154,11 +155,14 @@ void EDA_DRAW_FRAME::OnZoom( wxCommandEvent& event )
	center = GetCrossHairPosition();		center = GetCrossHairPosition();

	// fall thru		// fall thru
			case ID_VIEWER_ZOOM_OUT:
	case ID_ZOOM_OUT:		case ID_ZOOM_OUT:
	if( screen->SetNextZoom() )		if( screen->SetNextZoom() )
	RedrawScreen( center, zoom_at_cursor );		RedrawScreen( center, zoom_at_cursor );
	break;		break;

			case ID_VIEWER_ZOOM_REDRAW:
			case ID_POPUP_ZOOM_REDRAW:
	case ID_ZOOM_REDRAW:		case ID_ZOOM_REDRAW:
	m_canvas->Refresh();		m_canvas->Refresh();
	break;		break;
	@@ -168,6 +172,8 @@ void EDA_DRAW_FRAME::OnZoom( wxCommandEvent& event )
	RedrawScreen( center, true );		RedrawScreen( center, true );
	break;		break;

			case ID_POPUP_ZOOM_PAGE:
			case ID_VIEWER_ZOOM_PAGE:
	case ID_ZOOM_PAGE:		case ID_ZOOM_PAGE:
	Zoom_Automatique( false );		Zoom_Automatique( false );
	break;		break;
	@@ -227,9 +233,9 @@ void EDA_DRAW_FRAME::AddMenuZoomAndGrid( wxMenu* MasterMenu )
	msg = AddHotkeyName( _( "Zoom out" ), m_HotkeysZoomAndGridList, HK_ZOOM_OUT );		msg = AddHotkeyName( _( "Zoom out" ), m_HotkeysZoomAndGridList, HK_ZOOM_OUT );
	AddMenuItem( MasterMenu, ID_POPUP_ZOOM_OUT, msg, KiBitmap( zoom_out_xpm ) );		AddMenuItem( MasterMenu, ID_POPUP_ZOOM_OUT, msg, KiBitmap( zoom_out_xpm ) );
	msg = AddHotkeyName( _( "Redraw view" ), m_HotkeysZoomAndGridList, HK_ZOOM_REDRAW );		msg = AddHotkeyName( _( "Redraw view" ), m_HotkeysZoomAndGridList, HK_ZOOM_REDRAW );
	AddMenuItem( MasterMenu, ID_ZOOM_REDRAW, msg, KiBitmap( zoom_redraw_xpm ) );		AddMenuItem( MasterMenu, ID_POPUP_ZOOM_REDRAW, msg, KiBitmap( zoom_redraw_xpm ) );
	msg = AddHotkeyName( _( "Zoom auto" ), m_HotkeysZoomAndGridList, HK_ZOOM_AUTO );		msg = AddHotkeyName( _( "Zoom auto" ), m_HotkeysZoomAndGridList, HK_ZOOM_AUTO );
	AddMenuItem( MasterMenu, ID_ZOOM_PAGE, msg, KiBitmap( zoom_fit_in_page_xpm ) );		AddMenuItem( MasterMenu, ID_POPUP_ZOOM_PAGE, msg, KiBitmap( zoom_fit_in_page_xpm ) );


	wxMenu* zoom_choice = new wxMenu;		wxMenu* zoom_choice = new wxMenu;

eeschema/eeschema.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -229,7 +229,7 @@ bool IFACE::OnKifaceStart( PGM_BASE* aProgram, int aCtlBits )

	// Must be called before creating the main frame in order to		// Must be called before creating the main frame in order to
	// display the real hotkeys in menus or tool tips		// display the real hotkeys in menus or tool tips
	ReadHotkeyConfig( wxT("SchematicFrame"), s_Eeschema_Hokeys_Descr );		ReadHotkeyConfig( wxT("SchematicFrame"), g_Eeschema_Hokeys_Descr );

	wxConfigLoadSetups( KifaceSettings(), cfg_params() );		wxConfigLoadSetups( KifaceSettings(), cfg_params() );

eeschema/eeschema_config.cpp

+8 −8

Original line number	Original line	Diff line number	Diff line
	@@ -172,20 +172,20 @@ void LIB_EDIT_FRAME::Process_Config( wxCommandEvent& event )
	{		{
	// Hotkey IDs		// Hotkey IDs
	case ID_PREFERENCES_HOTKEY_SHOW_EDITOR:		case ID_PREFERENCES_HOTKEY_SHOW_EDITOR:
	InstallHotkeyFrame( this, s_Eeschema_Hokeys_Descr );		InstallHotkeyFrame( this, g_Eeschema_Hokeys_Descr );
	break;		break;

	case ID_PREFERENCES_HOTKEY_EXPORT_CONFIG:		case ID_PREFERENCES_HOTKEY_EXPORT_CONFIG:
	ExportHotkeyConfigToFile( s_Eeschema_Hokeys_Descr );		ExportHotkeyConfigToFile( g_Eeschema_Hokeys_Descr );
	break;		break;

	case ID_PREFERENCES_HOTKEY_IMPORT_CONFIG:		case ID_PREFERENCES_HOTKEY_IMPORT_CONFIG:
	ImportHotkeyConfigFromFile( s_Eeschema_Hokeys_Descr );		ImportHotkeyConfigFromFile( g_Eeschema_Hokeys_Descr );
	break;		break;

	case ID_PREFERENCES_HOTKEY_SHOW_CURRENT_LIST:		case ID_PREFERENCES_HOTKEY_SHOW_CURRENT_LIST:
	// Display current hotkey list for LibEdit.		// Display current hotkey list for LibEdit.
	DisplayHotkeyList( this, s_Libedit_Hokeys_Descr );		DisplayHotkeyList( this, g_Libedit_Hokeys_Descr );
	break;		break;

	default:		default:
	@@ -281,20 +281,20 @@ void SCH_EDIT_FRAME::Process_Config( wxCommandEvent& event )

	// Hotkey IDs		// Hotkey IDs
	case ID_PREFERENCES_HOTKEY_EXPORT_CONFIG:		case ID_PREFERENCES_HOTKEY_EXPORT_CONFIG:
	ExportHotkeyConfigToFile( s_Eeschema_Hokeys_Descr );		ExportHotkeyConfigToFile( g_Eeschema_Hokeys_Descr );
	break;		break;

	case ID_PREFERENCES_HOTKEY_IMPORT_CONFIG:		case ID_PREFERENCES_HOTKEY_IMPORT_CONFIG:
	ImportHotkeyConfigFromFile( s_Eeschema_Hokeys_Descr );		ImportHotkeyConfigFromFile( g_Eeschema_Hokeys_Descr );
	break;		break;

	case ID_PREFERENCES_HOTKEY_SHOW_EDITOR:		case ID_PREFERENCES_HOTKEY_SHOW_EDITOR:
	InstallHotkeyFrame( this, s_Eeschema_Hokeys_Descr );		InstallHotkeyFrame( this, g_Eeschema_Hokeys_Descr );
	break;		break;

	case ID_PREFERENCES_HOTKEY_SHOW_CURRENT_LIST:		case ID_PREFERENCES_HOTKEY_SHOW_CURRENT_LIST:
	// Display current hotkey list for eeschema.		// Display current hotkey list for eeschema.
	DisplayHotkeyList( this, s_Schematic_Hokeys_Descr );		DisplayHotkeyList( this, g_Schematic_Hokeys_Descr );
	break;		break;

	default:		default:

eeschema/hotkeys.cpp

+121 −25

Original line number	Original line	Diff line number	Diff line
	/*		/*
	* This program source code file is part of KiCad, a free EDA CAD application.		* This program source code file is part of KiCad, a free EDA CAD application.
	*		*
	* Copyright (C) 2012 Jean-Pierre Charras, jp.charras at wanadoo.fr		* Copyright (C) 2014 Jean-Pierre Charras, jp.charras at wanadoo.fr
	* Copyright (C) 2008-2011 Wayne Stambaugh <stambaughw@verizon.net>		* Copyright (C) 2008-2011 Wayne Stambaugh <stambaughw@verizon.net>
	* Copyright (C) 2004-2012 KiCad Developers, see change_log.txt for contributors.		* Copyright (C) 2004-2012 KiCad Developers, see change_log.txt for contributors.
	*		*
	@@ -34,6 +34,7 @@

	#include <general.h>		#include <general.h>
	#include <libeditframe.h>		#include <libeditframe.h>
			#include <viewlib_frame.h>
	#include <class_libentry.h>		#include <class_libentry.h>
	#include <sch_junction.h>		#include <sch_junction.h>
	#include <sch_line.h>		#include <sch_line.h>
	@@ -55,8 +56,8 @@
	* OnHotKey() function.		* OnHotKey() function.
	* default key value is the default hotkey for this command. Can be overridden		* default key value is the default hotkey for this command. Can be overridden
	* by the user hotkey list file		* by the user hotkey list file
	* add the HkMyNewEntry pointer in the s_Schematic_Hotkey_List list or the		* add the HkMyNewEntry pointer in the schematic_Hotkey_List list or the
	* s_LibEdit_Hotkey_List list or s_Common_Hotkey_List if the same command is		* libEdit_Hotkey_List list or common_Hotkey_List if the same command is
	* added both in Eeschema and libedit)		* added both in Eeschema and libedit)
	* Add the new code in the switch in OnHotKey() function.		* Add the new code in the switch in OnHotKey() function.
	* when the variable itemInEdit is true, an item is currently edited.		* when the variable itemInEdit is true, an item is currently edited.
	@@ -211,7 +212,7 @@ static EDA_HOTKEY HkSaveSchematic( wxT( "Save Schematic" ), HK_SAVE_SCH, 'S' + G
	static EDA_HOTKEY HkLoadSchematic( wxT( "Load Schematic" ), HK_LOAD_SCH, 'L' + GR_KB_CTRL );		static EDA_HOTKEY HkLoadSchematic( wxT( "Load Schematic" ), HK_LOAD_SCH, 'L' + GR_KB_CTRL );

	// List of common hotkey descriptors		// List of common hotkey descriptors
	EDA_HOTKEY* s_Common_Hotkey_List[] =		static EDA_HOTKEY* common_Hotkey_List[] =
	{		{
	&HkHelp,		&HkHelp,
	&HkZoomIn,		&HkZoomIn,
	@@ -231,8 +232,23 @@ EDA_HOTKEY* s_Common_Hotkey_List[] =
	NULL		NULL
	};		};

			// List of common hotkey descriptors, for the library vierwer
			static EDA_HOTKEY* common_basic_Hotkey_List[] =
			{
			&HkHelp,
			&HkZoomIn,
			&HkZoomOut,
			&HkZoomRedraw,
			&HkZoomCenter,
			&HkZoomAuto,
			&HkResetLocalCoord,
			&HkMouseLeftClick,
			&HkMouseLeftDClick,
			NULL
			};

	// List of hotkey descriptors for schematic		// List of hotkey descriptors for schematic
	EDA_HOTKEY* s_Schematic_Hotkey_List[] =		static EDA_HOTKEY* schematic_Hotkey_List[] =
	{		{
	&HkSaveSchematic,		&HkSaveSchematic,
	&HkLoadSchematic,		&HkLoadSchematic,
	@@ -270,7 +286,7 @@ EDA_HOTKEY* s_Schematic_Hotkey_List[] =
	};		};

	// List of hotkey descriptors for library editor		// List of hotkey descriptors for library editor
	EDA_HOTKEY* s_LibEdit_Hotkey_List[] =		static EDA_HOTKEY* libEdit_Hotkey_List[] =
	{		{
	&HkSaveLib,		&HkSaveLib,
	&HkCreatePin,		&HkCreatePin,
	@@ -279,39 +295,45 @@ EDA_HOTKEY* s_LibEdit_Hotkey_List[] =
	NULL		NULL
	};		};

			// List of hotkey descriptors for library viewer (currently empty
			static EDA_HOTKEY* viewlib_Hotkey_List[] =
			{
			NULL
			};

	// list of sections and corresponding hotkey list for Eeschema (used to create		// list of sections and corresponding hotkey list for Eeschema (used to create
	// an hotkey config file)		// an hotkey config file)
	struct EDA_HOTKEY_CONFIG s_Eeschema_Hokeys_Descr[] =		struct EDA_HOTKEY_CONFIG g_Eeschema_Hokeys_Descr[] =
	{		{
	{ &g_CommonSectionTag, s_Common_Hotkey_List, L"Common keys" },		{ &g_CommonSectionTag, common_Hotkey_List, L"Common keys" },
	{ &g_SchematicSectionTag, s_Schematic_Hotkey_List, L"Schematic editor keys" },		{ &g_SchematicSectionTag, schematic_Hotkey_List, L"Schematic editor keys" },
	{ &g_LibEditSectionTag, s_LibEdit_Hotkey_List, L"library editor keys" },		{ &g_LibEditSectionTag, libEdit_Hotkey_List, L"library editor keys" },
	{ NULL, NULL, NULL }		{ NULL, NULL, NULL }
	};		};

	// list of sections and corresponding hotkey list for the schematic editor		// list of sections and corresponding hotkey list for the schematic editor
	// (used to list current hotkeys)		// (used to list current hotkeys)
	struct EDA_HOTKEY_CONFIG s_Schematic_Hokeys_Descr[] =		struct EDA_HOTKEY_CONFIG g_Schematic_Hokeys_Descr[] =
	{		{
	{ &g_CommonSectionTag, s_Common_Hotkey_List, NULL },		{ &g_CommonSectionTag, common_Hotkey_List, NULL },
	{ &g_SchematicSectionTag, s_Schematic_Hotkey_List, NULL },		{ &g_SchematicSectionTag, schematic_Hotkey_List, NULL },
	{ NULL, NULL, NULL }		{ NULL, NULL, NULL }
	};		};

	// list of sections and corresponding hotkey list for the component editor		// list of sections and corresponding hotkey list for the component editor
	// (used to list current hotkeys)		// (used to list current hotkeys)
	struct EDA_HOTKEY_CONFIG s_Libedit_Hokeys_Descr[] =		struct EDA_HOTKEY_CONFIG g_Libedit_Hokeys_Descr[] =
	{		{
	{ &g_CommonSectionTag, s_Common_Hotkey_List, NULL },		{ &g_CommonSectionTag, common_Hotkey_List, NULL },
	{ &g_LibEditSectionTag, s_LibEdit_Hotkey_List, NULL },		{ &g_LibEditSectionTag, libEdit_Hotkey_List, NULL },
	{ NULL, NULL, NULL }		{ NULL, NULL, NULL }
	};		};

	// list of sections and corresponding hotkey list for the component browser		// list of sections and corresponding hotkey list for the component browser
	// (used to list current hotkeys)		// (used to list current hotkeys)
	struct EDA_HOTKEY_CONFIG s_Viewlib_Hokeys_Descr[] =		struct EDA_HOTKEY_CONFIG g_Viewlib_Hokeys_Descr[] =
	{		{
	{ &g_CommonSectionTag, s_Common_Hotkey_List, NULL },		{ &g_CommonSectionTag, common_basic_Hotkey_List, NULL },
	{ NULL, NULL, NULL }		{ NULL, NULL, NULL }
	};		};

	@@ -348,10 +370,10 @@ bool SCH_EDIT_FRAME::OnHotKey( wxDC* aDC, int aHotKey, const wxPoint& aPosition,
	aHotKey += 'A' - 'a';		aHotKey += 'A' - 'a';

	// Search command from key :		// Search command from key :
	EDA_HOTKEY* hotKey = GetDescriptorFromHotkey( aHotKey, s_Common_Hotkey_List );		EDA_HOTKEY* hotKey = GetDescriptorFromHotkey( aHotKey, common_Hotkey_List );

	if( hotKey == NULL )		if( hotKey == NULL )
	hotKey = GetDescriptorFromHotkey( aHotKey, s_Schematic_Hotkey_List );		hotKey = GetDescriptorFromHotkey( aHotKey, schematic_Hotkey_List );

	if( hotKey == NULL )		if( hotKey == NULL )
	return false;		return false;
	@@ -363,7 +385,7 @@ bool SCH_EDIT_FRAME::OnHotKey( wxDC* aDC, int aHotKey, const wxPoint& aPosition,
	return false;		return false;

	case HK_HELP: // Display Current hotkey list		case HK_HELP: // Display Current hotkey list
	DisplayHotkeyList( this, s_Schematic_Hokeys_Descr );		DisplayHotkeyList( this, g_Schematic_Hokeys_Descr );
	break;		break;

	case HK_RESET_LOCAL_COORD: // Reset the relative coord		case HK_RESET_LOCAL_COORD: // Reset the relative coord
	@@ -553,10 +575,10 @@ bool LIB_EDIT_FRAME::OnHotKey( wxDC* aDC, int aHotKey, const wxPoint& aPosition,
	if( (aHotKey >= 'a') && (aHotKey <= 'z') )		if( (aHotKey >= 'a') && (aHotKey <= 'z') )
	aHotKey += 'A' - 'a';		aHotKey += 'A' - 'a';

	EDA_HOTKEY* hotKey = GetDescriptorFromHotkey( aHotKey, s_Common_Hotkey_List );		EDA_HOTKEY* hotKey = GetDescriptorFromHotkey( aHotKey, common_Hotkey_List );

	if( hotKey == NULL )		if( hotKey == NULL )
	hotKey = GetDescriptorFromHotkey( aHotKey, s_LibEdit_Hotkey_List );		hotKey = GetDescriptorFromHotkey( aHotKey, libEdit_Hotkey_List );

	if( hotKey == NULL )		if( hotKey == NULL )
	return false;		return false;
	@@ -568,7 +590,7 @@ bool LIB_EDIT_FRAME::OnHotKey( wxDC* aDC, int aHotKey, const wxPoint& aPosition,
	return false;		return false;

	case HK_HELP: // Display Current hotkey list		case HK_HELP: // Display Current hotkey list
	DisplayHotkeyList( this, s_Libedit_Hokeys_Descr );		DisplayHotkeyList( this, g_Libedit_Hokeys_Descr );
	break;		break;

	case HK_RESET_LOCAL_COORD: // Reset the relative coord		case HK_RESET_LOCAL_COORD: // Reset the relative coord
	@@ -704,3 +726,77 @@ bool LIB_EDIT_FRAME::OnHotKey( wxDC* aDC, int aHotKey, const wxPoint& aPosition,
	// Hot key handled.		// Hot key handled.
	return true;		return true;
	}		}

			bool LIB_VIEW_FRAME::OnHotKey( wxDC* aDC, int aHotKey, const wxPoint& aPosition,
			EDA_ITEM* aItem )
			{
			if( aHotKey == 0 )
			return false;

			wxCommandEvent cmd( wxEVT_COMMAND_MENU_SELECTED );
			cmd.SetEventObject( this );

			/* Convert lower to upper case (the usual toupper function has problem with non ascii
			* codes like function keys */
			if( (aHotKey >= 'a') && (aHotKey <= 'z') )
			aHotKey += 'A' - 'a';

			EDA_HOTKEY* HK_Descr = GetDescriptorFromHotkey( aHotKey, common_basic_Hotkey_List );

			if( HK_Descr == NULL )
			HK_Descr = GetDescriptorFromHotkey( aHotKey, viewlib_Hotkey_List );

			if( HK_Descr == NULL )
			return false;

			switch( HK_Descr->m_Idcommand )
			{
			default:
			case HK_NOT_FOUND:
			return false;

			case HK_HELP: // Display Current hotkey list
			DisplayHotkeyList( this, g_Viewlib_Hokeys_Descr );
			break;

			case HK_RESET_LOCAL_COORD: // set local (relative) coordinate origin
			GetScreen()->m_O_Curseur = GetCrossHairPosition();
			break;

			case HK_LEFT_CLICK:
			OnLeftClick( aDC, aPosition );
			break;

			case HK_LEFT_DCLICK: // Simulate a double left click: generate 2 events
			OnLeftClick( aDC, aPosition );
			OnLeftDClick( aDC, aPosition );
			break;

			case HK_ZOOM_IN:
			cmd.SetId( ID_POPUP_ZOOM_IN );
			GetEventHandler()->ProcessEvent( cmd );
			break;

			case HK_ZOOM_OUT:
			cmd.SetId( ID_POPUP_ZOOM_OUT );
			GetEventHandler()->ProcessEvent( cmd );
			break;

			case HK_ZOOM_REDRAW:
			cmd.SetId( ID_ZOOM_REDRAW );
			GetEventHandler()->ProcessEvent( cmd );
			break;

			case HK_ZOOM_CENTER:
			cmd.SetId( ID_POPUP_ZOOM_CENTER );
			GetEventHandler()->ProcessEvent( cmd );
			break;

			case HK_ZOOM_AUTO:
			cmd.SetId( ID_ZOOM_PAGE );
			GetEventHandler()->ProcessEvent( cmd );
			break;
			}

			return true;
			}