Commit 0e03fbff authored by jean-pierre charras's avatar jean-pierre charras
Browse files

Make hotkey string info translatable in dialogs. These strings are now... 

Make hotkey string info translatable in dialogs. These strings are now prefixed by _HKI , which can be used by translation tools to extract them.
parent 03502904

common/dialogs/dialog_hotkeys_editor.cpp

+3 −2
Original line number Original line Diff line number Diff line
@@ -129,7 +129,7 @@ wxString HOTKEY_LIST_CTRL::OnGetItemText( long aRow, long aColumn ) const 




    if( aColumn == 0 )

    if( aColumn == 0 )

    {

    {

        return hotkey_descr->m_InfoMsg;

        return wxGetTranslation( hotkey_descr->m_InfoMsg );

    }

    }

    else

    else

    {

    {
@@ -370,10 +370,11 @@ bool HOTKEYS_EDITOR_DIALOG::CanSetKey( long aKey, const wxString* sectionTag ) 




    if( conflictingKey != NULL )

    if( conflictingKey != NULL )

    {

    {

        wxString info = wxGetTranslation( conflictingKey->m_InfoMsg );

        wxString msg = wxString::Format(

        wxString msg = wxString::Format(

            _( "<%s> is already assigned to \"%s\" in section \"%s\". Are you sure you want "

            _( "<%s> is already assigned to \"%s\" in section \"%s\". Are you sure you want "

               "to change its assignment?" ),

               "to change its assignment?" ),

            KeyNameFromKeyCode( aKey ), conflictingKey->m_InfoMsg,

            KeyNameFromKeyCode( aKey ), GetChars( info ),

            *(conflictingSection->GetHotkeySection()->m_Title) );

            *(conflictingSection->GetHotkeySection()->m_Title) );





        wxMessageDialog dlg( this, msg, _( "Confirm change" ), wxYES_NO | wxNO_DEFAULT );

        wxMessageDialog dlg( this, msg, _( "Confirm change" ), wxYES_NO | wxNO_DEFAULT );

common/hotkeys_basic.cpp

+4 −2
Original line number Original line Diff line number Diff line
@@ -424,6 +424,7 @@ int KeyCodeFromKeyName( const wxString& keyname ) 
void DisplayHotkeyList( EDA_BASE_FRAME* aFrame, struct EDA_HOTKEY_CONFIG* aDescList )

void DisplayHotkeyList( EDA_BASE_FRAME* aFrame, struct EDA_HOTKEY_CONFIG* aDescList )

{

{

    wxString     keyname;

    wxString     keyname;

    wxString     keymessage;

    EDA_HOTKEY** list;

    EDA_HOTKEY** list;





    wxString     msg = wxT( "<html><body bgcolor=\"#E2E2E2\">" );

    wxString     msg = wxT( "<html><body bgcolor=\"#E2E2E2\">" );
@@ -443,12 +444,13 @@ void DisplayHotkeyList( EDA_BASE_FRAME* aFrame, struct EDA_HOTKEY_CONFIG* aDescL 
            if( !hk_decr->m_InfoMsg.Contains( wxT( "Macros" ) ) )

            if( !hk_decr->m_InfoMsg.Contains( wxT( "Macros" ) ) )

            {

            {

                keyname = KeyNameFromKeyCode( hk_decr->m_KeyCode );

                keyname = KeyNameFromKeyCode( hk_decr->m_KeyCode );

                keymessage = wxGetTranslation( hk_decr->m_InfoMsg );





                // Some chars should be modified, using html encoding, to be

                // Some chars are modified, using html encoding, to be

                // displayed by DisplayHtmlInfoMessage()

                // displayed by DisplayHtmlInfoMessage()

                keyname.Replace( wxT( "<" ), wxT( "&lt;" ) );

                keyname.Replace( wxT( "<" ), wxT( "&lt;" ) );

                keyname.Replace( wxT( ">" ), wxT( "&gt;" ) );

                keyname.Replace( wxT( ">" ), wxT( "&gt;" ) );

                msg    += wxT( "<tr><td>" ) + hk_decr->m_InfoMsg + wxT( "</td>" );

                msg    += wxT( "<tr><td>" ) + keymessage + wxT( "</td>" );

                msg    += wxT( "<td><b>&nbsp;&nbsp;" ) + keyname + wxT( "</b></td></tr>" );

                msg    += wxT( "<td><b>&nbsp;&nbsp;" ) + keyname + wxT( "</b></td></tr>" );

            }

            }

        }

        }

eeschema/hotkeys.cpp

+65 −65
Original line number Original line Diff line number Diff line
@@ -44,14 +44,19 @@ 




#include <dialogs/dialog_schematic_find.h>

#include <dialogs/dialog_schematic_find.h>





// Remark: the hotkey message info is used as keyword in hotkey config files and

// as comments in help windows, therefore translated only when displayed

// they are marked _HKI to be extracted by translation tools

// See hotkeys_basic.h for more info







/* How to add a new hotkey:

/* How to add a new hotkey:

 * add a new id in the enum hotkey_id_command like MY_NEW_ID_FUNCTION (see

 * add a new id in the enum hotkey_id_command like MY_NEW_ID_FUNCTION (see

 * hotkeys.h).

 * hotkeys.h).

 * add a new EDA_HOTKEY entry like:

 * add a new EDA_HOTKEY entry like:

 *  static EDA_HOTKEY HkMyNewEntry(wxT("Command Label"), MY_NEW_ID_FUNCTION,

 *  static EDA_HOTKEY HkMyNewEntry(_HKI("Command Label"), MY_NEW_ID_FUNCTION,

 *                                    default key value);

 *                                    default key value);

 * wxT("Command Label") is the name used in hotkey list display, and the

 * _HKI("Command Label") is the name used in hotkey list display, and the

 * identifier in the hotkey list file

 * identifier in the hotkey list file

 * MY_NEW_ID_FUNCTION is an equivalent id function used in the switch in

 * MY_NEW_ID_FUNCTION is an equivalent id function used in the switch in

 * OnHotKey() function.

 * OnHotKey() function.
@@ -75,146 +80,141 @@ 
 */

 */









// local variables

// Common commands

// Hotkey list:



/**

 * Common commands

 */





// Fit on Screen

// Fit on Screen

#if !defined( __WXMAC__ )

#if !defined( __WXMAC__ )

static EDA_HOTKEY HkZoomAuto( wxT( "Fit on Screen" ), HK_ZOOM_AUTO, WXK_HOME, ID_ZOOM_PAGE );

static EDA_HOTKEY HkZoomAuto( _HKI( "Fit on Screen" ), HK_ZOOM_AUTO, WXK_HOME, ID_ZOOM_PAGE );

#else

#else

static EDA_HOTKEY HkZoomAuto( wxT( "Zoom Auto" ), HK_ZOOM_AUTO, GR_KB_CTRL + '0',

static EDA_HOTKEY HkZoomAuto( _HKI( "Zoom Auto" ), HK_ZOOM_AUTO, GR_KB_CTRL + '0',

                              ID_ZOOM_PAGE );

                              ID_ZOOM_PAGE );

#endif

#endif





static EDA_HOTKEY HkZoomCenter( wxT( "Zoom Center" ), HK_ZOOM_CENTER, WXK_F4,

static EDA_HOTKEY HkZoomCenter( _HKI( "Zoom Center" ), HK_ZOOM_CENTER, WXK_F4,

                                ID_POPUP_ZOOM_CENTER );

                                ID_POPUP_ZOOM_CENTER );





// Refresh Screen

// Refresh Screen

#if !defined( __WXMAC__ )

#if !defined( __WXMAC__ )

static EDA_HOTKEY HkZoomRedraw( wxT( "Zoom Redraw" ), HK_ZOOM_REDRAW, WXK_F3, ID_ZOOM_REDRAW );

static EDA_HOTKEY HkZoomRedraw( _HKI( "Zoom Redraw" ), HK_ZOOM_REDRAW, WXK_F3, ID_ZOOM_REDRAW );

#else

#else

static EDA_HOTKEY HkZoomRedraw( wxT( "Zoom Redraw" ), HK_ZOOM_REDRAW, GR_KB_CTRL + 'R',

static EDA_HOTKEY HkZoomRedraw( _HKI( "Zoom Redraw" ), HK_ZOOM_REDRAW, GR_KB_CTRL + 'R',

                                ID_ZOOM_REDRAW );

                                ID_ZOOM_REDRAW );

#endif

#endif





// Zoom In

// Zoom In

#if !defined( __WXMAC__ )

#if !defined( __WXMAC__ )

static EDA_HOTKEY HkZoomIn( wxT( "Zoom In" ), HK_ZOOM_IN, WXK_F1, ID_POPUP_ZOOM_IN );

static EDA_HOTKEY HkZoomIn( _HKI( "Zoom In" ), HK_ZOOM_IN, WXK_F1, ID_POPUP_ZOOM_IN );

#else

#else

static EDA_HOTKEY HkZoomIn( wxT( "Zoom In" ), HK_ZOOM_IN, GR_KB_CTRL + '+', ID_POPUP_ZOOM_IN );

static EDA_HOTKEY HkZoomIn( _HKI( "Zoom In" ), HK_ZOOM_IN, GR_KB_CTRL + '+', ID_POPUP_ZOOM_IN );

#endif

#endif





// Zoom Out

// Zoom Out

#if !defined( __WXMAC__ )

#if !defined( __WXMAC__ )

static EDA_HOTKEY HkZoomOut( wxT( "Zoom Out" ), HK_ZOOM_OUT, WXK_F2, ID_POPUP_ZOOM_OUT );

static EDA_HOTKEY HkZoomOut( _HKI( "Zoom Out" ), HK_ZOOM_OUT, WXK_F2, ID_POPUP_ZOOM_OUT );

#else

#else

static EDA_HOTKEY HkZoomOut( wxT( "Zoom Out" ), HK_ZOOM_OUT, GR_KB_CTRL + '-', ID_POPUP_ZOOM_OUT );

static EDA_HOTKEY HkZoomOut( _HKI( "Zoom Out" ), HK_ZOOM_OUT, GR_KB_CTRL + '-', ID_POPUP_ZOOM_OUT );

#endif

#endif





static EDA_HOTKEY HkHelp( wxT( "Help (this window)" ), HK_HELP, '?' );

static EDA_HOTKEY HkHelp( _HKI( "Help (this window)" ), HK_HELP, '?' );

static EDA_HOTKEY HkResetLocalCoord( wxT( "Reset Local Coordinates" ), HK_RESET_LOCAL_COORD, ' ' );

static EDA_HOTKEY HkResetLocalCoord( _HKI( "Reset Local Coordinates" ), HK_RESET_LOCAL_COORD, ' ' );









// Undo

// Undo

static EDA_HOTKEY HkUndo( wxT( "Undo" ), HK_UNDO, GR_KB_CTRL + 'Z', (int) wxID_UNDO );

static EDA_HOTKEY HkUndo( _HKI( "Undo" ), HK_UNDO, GR_KB_CTRL + 'Z', (int) wxID_UNDO );





// Redo

// Redo

#if !defined( __WXMAC__ )

#if !defined( __WXMAC__ )

static EDA_HOTKEY HkRedo( wxT( "Redo" ), HK_REDO, GR_KB_CTRL + 'Y', (int) wxID_REDO );

static EDA_HOTKEY HkRedo( _HKI( "Redo" ), HK_REDO, GR_KB_CTRL + 'Y', (int) wxID_REDO );

#else

#else

static EDA_HOTKEY HkRedo( wxT( "Redo" ), HK_REDO, GR_KB_SHIFT + GR_KB_CTRL + 'Z',

static EDA_HOTKEY HkRedo( _HKI( "Redo" ), HK_REDO, GR_KB_SHIFT + GR_KB_CTRL + 'Z',

                          (int) wxID_REDO );

                          (int) wxID_REDO );

#endif

#endif





// mouse click command:

// mouse click command:

static EDA_HOTKEY HkMouseLeftClick( wxT( "Mouse Left Click" ), HK_LEFT_CLICK, WXK_RETURN, 0 );

static EDA_HOTKEY HkMouseLeftClick( _HKI( "Mouse Left Click" ), HK_LEFT_CLICK, WXK_RETURN, 0 );

static EDA_HOTKEY HkMouseLeftDClick( wxT( "Mouse Left Double Click" ), HK_LEFT_DCLICK, WXK_END, 0 );

static EDA_HOTKEY HkMouseLeftDClick( _HKI( "Mouse Left Double Click" ), HK_LEFT_DCLICK, WXK_END, 0 );





// Schematic editor

// Schematic editor

static EDA_HOTKEY HkBeginWire( wxT( "Begin Wire" ), HK_BEGIN_WIRE, 'W', ID_WIRE_BUTT );

static EDA_HOTKEY HkBeginWire( _HKI( "Begin Wire" ), HK_BEGIN_WIRE, 'W', ID_WIRE_BUTT );

static EDA_HOTKEY HkBeginBus( wxT( "Begin Bus" ), HK_BEGIN_BUS, 'B', ID_BUS_BUTT );

static EDA_HOTKEY HkBeginBus( _HKI( "Begin Bus" ), HK_BEGIN_BUS, 'B', ID_BUS_BUTT );

static EDA_HOTKEY HkEndLineWireBus( wxT( "End Line Wire Bus" ), HK_END_CURR_LINEWIREBUS, 'K',

static EDA_HOTKEY HkEndLineWireBus( _HKI( "End Line Wire Bus" ), HK_END_CURR_LINEWIREBUS, 'K',

                                  ID_POPUP_END_LINE );

                                  ID_POPUP_END_LINE );





static EDA_HOTKEY HkAddLabel( wxT( "Add Label" ), HK_ADD_LABEL, 'L', ID_LABEL_BUTT );

static EDA_HOTKEY HkAddLabel( _HKI( "Add Label" ), HK_ADD_LABEL, 'L', ID_LABEL_BUTT );

static EDA_HOTKEY HkAddHierarchicalLabel( wxT( "Add Hierarchical Label" ), HK_ADD_HLABEL, 'H',

static EDA_HOTKEY HkAddHierarchicalLabel( _HKI( "Add Hierarchical Label" ), HK_ADD_HLABEL, 'H',

                                          ID_HIERLABEL_BUTT );

                                          ID_HIERLABEL_BUTT );

static EDA_HOTKEY HkAddGlobalLabel( wxT( "Add Global Label" ), HK_ADD_GLABEL, GR_KB_CTRL + 'L',

static EDA_HOTKEY HkAddGlobalLabel( _HKI( "Add Global Label" ), HK_ADD_GLABEL, GR_KB_CTRL + 'L',

                                    ID_GLABEL_BUTT );

                                    ID_GLABEL_BUTT );

static EDA_HOTKEY HkAddJunction( wxT( "Add Junction" ), HK_ADD_JUNCTION, 'J', ID_JUNCTION_BUTT );

static EDA_HOTKEY HkAddJunction( _HKI( "Add Junction" ), HK_ADD_JUNCTION, 'J', ID_JUNCTION_BUTT );

static EDA_HOTKEY HkAddComponent( wxT( "Add Component" ), HK_ADD_NEW_COMPONENT, 'A',

static EDA_HOTKEY HkAddComponent( _HKI( "Add Component" ), HK_ADD_NEW_COMPONENT, 'A',

                                  ID_SCH_PLACE_COMPONENT );

                                  ID_SCH_PLACE_COMPONENT );

static EDA_HOTKEY HkAddPower( wxT( "Add Power" ), HK_ADD_NEW_POWER, 'P',

static EDA_HOTKEY HkAddPower( _HKI( "Add Power" ), HK_ADD_NEW_POWER, 'P',

                              ID_PLACE_POWER_BUTT );

                              ID_PLACE_POWER_BUTT );

static EDA_HOTKEY HkAddNoConn( wxT( "Add No Connect Flag" ), HK_ADD_NOCONN_FLAG, 'Q',

static EDA_HOTKEY HkAddNoConn( _HKI( "Add No Connect Flag" ), HK_ADD_NOCONN_FLAG, 'Q',

                               ID_NOCONN_BUTT );

                               ID_NOCONN_BUTT );

static EDA_HOTKEY HkAddHierSheet( wxT( "Add Sheet" ), HK_ADD_HIER_SHEET, 'S',

static EDA_HOTKEY HkAddHierSheet( _HKI( "Add Sheet" ), HK_ADD_HIER_SHEET, 'S',

                                  ID_SHEET_SYMBOL_BUTT );

                                  ID_SHEET_SYMBOL_BUTT );

static EDA_HOTKEY HkAddBusEntry( wxT( "Add Bus Entry" ), HK_ADD_BUS_ENTRY, '/',

static EDA_HOTKEY HkAddBusEntry( _HKI( "Add Bus Entry" ), HK_ADD_BUS_ENTRY, '/',

                                 ID_BUSTOBUS_ENTRY_BUTT );

                                 ID_BUSTOBUS_ENTRY_BUTT );

static EDA_HOTKEY HkAddWireEntry( wxT( "Add Wire Entry" ), HK_ADD_WIRE_ENTRY, 'Z',

static EDA_HOTKEY HkAddWireEntry( _HKI( "Add Wire Entry" ), HK_ADD_WIRE_ENTRY, 'Z',

                                  ID_WIRETOBUS_ENTRY_BUTT );

                                  ID_WIRETOBUS_ENTRY_BUTT );

static EDA_HOTKEY HkAddGraphicPolyLine( wxT( "Add Graphic PolyLine" ), HK_ADD_GRAPHIC_POLYLINE,

static EDA_HOTKEY HkAddGraphicPolyLine( _HKI( "Add Graphic PolyLine" ), HK_ADD_GRAPHIC_POLYLINE,

                                        'I', ID_LINE_COMMENT_BUTT );

                                        'I', ID_LINE_COMMENT_BUTT );

static EDA_HOTKEY HkAddGraphicText( wxT( "Add Graphic Text" ), HK_ADD_GRAPHIC_TEXT, 'T',

static EDA_HOTKEY HkAddGraphicText( _HKI( "Add Graphic Text" ), HK_ADD_GRAPHIC_TEXT, 'T',

                                    ID_TEXT_COMMENT_BUTT );

                                    ID_TEXT_COMMENT_BUTT );

static EDA_HOTKEY HkMirrorY( wxT( "Mirror Y Component" ), HK_MIRROR_Y_COMPONENT, 'Y',

static EDA_HOTKEY HkMirrorY( _HKI( "Mirror Y Component" ), HK_MIRROR_Y_COMPONENT, 'Y',

                             ID_SCH_MIRROR_Y );

                             ID_SCH_MIRROR_Y );

static EDA_HOTKEY HkMirrorX( wxT( "Mirror X Component" ), HK_MIRROR_X_COMPONENT, 'X',

static EDA_HOTKEY HkMirrorX( _HKI( "Mirror X Component" ), HK_MIRROR_X_COMPONENT, 'X',

                             ID_SCH_MIRROR_X );

                             ID_SCH_MIRROR_X );

static EDA_HOTKEY HkOrientNormalComponent( wxT( "Orient Normal Component" ),

static EDA_HOTKEY HkOrientNormalComponent( _HKI( "Orient Normal Component" ),

                                           HK_ORIENT_NORMAL_COMPONENT, 'N', ID_SCH_ORIENT_NORMAL );

                                           HK_ORIENT_NORMAL_COMPONENT, 'N', ID_SCH_ORIENT_NORMAL );

static EDA_HOTKEY HkRotate( wxT( "Rotate Item" ), HK_ROTATE, 'R', ID_SCH_ROTATE_CLOCKWISE );

static EDA_HOTKEY HkRotate( _HKI( "Rotate Item" ), HK_ROTATE, 'R', ID_SCH_ROTATE_CLOCKWISE );

static EDA_HOTKEY HkEdit( wxT( "Edit Item" ), HK_EDIT, 'E', ID_SCH_EDIT_ITEM );

static EDA_HOTKEY HkEdit( _HKI( "Edit Item" ), HK_EDIT, 'E', ID_SCH_EDIT_ITEM );

static EDA_HOTKEY HkEditComponentValue( wxT( "Edit Component Value" ),

static EDA_HOTKEY HkEditComponentValue( _HKI( "Edit Component Value" ),

                                        HK_EDIT_COMPONENT_VALUE, 'V',

                                        HK_EDIT_COMPONENT_VALUE, 'V',

                                        ID_SCH_EDIT_COMPONENT_VALUE );

                                        ID_SCH_EDIT_COMPONENT_VALUE );

static EDA_HOTKEY HkEditComponentReference( wxT( "Edit Component Reference" ),

static EDA_HOTKEY HkEditComponentReference( _HKI( "Edit Component Reference" ),

                                        HK_EDIT_COMPONENT_REFERENCE, 'U',

                                        HK_EDIT_COMPONENT_REFERENCE, 'U',

                                        ID_SCH_EDIT_COMPONENT_REFERENCE );

                                        ID_SCH_EDIT_COMPONENT_REFERENCE );

static EDA_HOTKEY HkEditComponentFootprint( wxT( "Edit Component Footprint" ),

static EDA_HOTKEY HkEditComponentFootprint( _HKI( "Edit Component Footprint" ),

                                            HK_EDIT_COMPONENT_FOOTPRINT, 'F',

                                            HK_EDIT_COMPONENT_FOOTPRINT, 'F',

                                            ID_SCH_EDIT_COMPONENT_FOOTPRINT );

                                            ID_SCH_EDIT_COMPONENT_FOOTPRINT );

static EDA_HOTKEY HkEditComponentWithLibedit( wxT( "Edit with Component Editor" ),

static EDA_HOTKEY HkEditComponentWithLibedit( _HKI( "Edit with Component Editor" ),

                                              HK_EDIT_COMPONENT_WITH_LIBEDIT,

                                              HK_EDIT_COMPONENT_WITH_LIBEDIT,

                                              'E' + GR_KB_CTRL,

                                              'E' + GR_KB_CTRL,

                                              ID_POPUP_SCH_CALL_LIBEDIT_AND_LOAD_CMP );

                                              ID_POPUP_SCH_CALL_LIBEDIT_AND_LOAD_CMP );

static EDA_HOTKEY HkMove( wxT( "Move Schematic Item" ),

static EDA_HOTKEY HkMove( _HKI( "Move Schematic Item" ),

                          HK_MOVE_COMPONENT_OR_ITEM, 'M',

                          HK_MOVE_COMPONENT_OR_ITEM, 'M',

                          ID_SCH_MOVE_ITEM );

                          ID_SCH_MOVE_ITEM );





static EDA_HOTKEY HkCopyComponentOrText( wxT( "Copy Component or Label" ),

static EDA_HOTKEY HkCopyComponentOrText( _HKI( "Copy Component or Label" ),

                                         HK_COPY_COMPONENT_OR_LABEL, 'C',

                                         HK_COPY_COMPONENT_OR_LABEL, 'C',

                                         ID_POPUP_SCH_COPY_ITEM );

                                         ID_POPUP_SCH_COPY_ITEM );





static EDA_HOTKEY HkDrag( wxT( "Drag Item" ), HK_DRAG, 'G', ID_SCH_DRAG_ITEM );

static EDA_HOTKEY HkDrag( _HKI( "Drag Item" ), HK_DRAG, 'G', ID_SCH_DRAG_ITEM );

static EDA_HOTKEY HkSaveBlock( wxT( "Save Block" ), HK_SAVE_BLOCK, 'C' + GR_KB_CTRL, wxID_COPY );

static EDA_HOTKEY HkSaveBlock( _HKI( "Save Block" ), HK_SAVE_BLOCK, 'C' + GR_KB_CTRL, wxID_COPY );

static EDA_HOTKEY HkMove2Drag( wxT( "Move Block -> Drag Block" ),

static EDA_HOTKEY HkMove2Drag( _HKI( "Move Block -> Drag Block" ),

                               HK_MOVEBLOCK_TO_DRAGBLOCK, '\t', ID_POPUP_DRAG_BLOCK );

                               HK_MOVEBLOCK_TO_DRAGBLOCK, '\t', ID_POPUP_DRAG_BLOCK );

static EDA_HOTKEY HkInsert( wxT( "Repeat Last Item" ), HK_REPEAT_LAST, WXK_INSERT );

static EDA_HOTKEY HkInsert( _HKI( "Repeat Last Item" ), HK_REPEAT_LAST, WXK_INSERT );

static EDA_HOTKEY HkDelete( wxT( "Delete Item" ), HK_DELETE, WXK_DELETE );

static EDA_HOTKEY HkDelete( _HKI( "Delete Item" ), HK_DELETE, WXK_DELETE );





static EDA_HOTKEY HkFindItem( wxT( "Find Item" ), HK_FIND_ITEM, 'F' + GR_KB_CTRL, ID_FIND_ITEMS );

static EDA_HOTKEY HkFindItem( _HKI( "Find Item" ), HK_FIND_ITEM, 'F' + GR_KB_CTRL, ID_FIND_ITEMS );

static EDA_HOTKEY HkFindNextItem( wxT( "Find Next Item" ), HK_FIND_NEXT_ITEM, WXK_F5,

static EDA_HOTKEY HkFindNextItem( _HKI( "Find Next Item" ), HK_FIND_NEXT_ITEM, WXK_F5,

                                  wxEVT_COMMAND_FIND );

                                  wxEVT_COMMAND_FIND );

static EDA_HOTKEY HkFindReplace( wxT( "Find and Replace" ), HK_FIND_REPLACE,

static EDA_HOTKEY HkFindReplace( _HKI( "Find and Replace" ), HK_FIND_REPLACE,

                                 'F' + GR_KB_CTRL + GR_KB_ALT, wxID_REPLACE );

                                 'F' + GR_KB_CTRL + GR_KB_ALT, wxID_REPLACE );

static EDA_HOTKEY HkFindNextDrcMarker( wxT( "Find Next DRC Marker" ), HK_FIND_NEXT_DRC_MARKER,

static EDA_HOTKEY HkFindNextDrcMarker( _HKI( "Find Next DRC Marker" ), HK_FIND_NEXT_DRC_MARKER,

                                       WXK_F5 + GR_KB_SHIFT, EVT_COMMAND_FIND_DRC_MARKER );

                                       WXK_F5 + GR_KB_SHIFT, EVT_COMMAND_FIND_DRC_MARKER );





// Special keys for library editor:

// Special keys for library editor:

static EDA_HOTKEY HkCreatePin( wxT( "Create Pin" ), HK_LIBEDIT_CREATE_PIN, 'P' );

static EDA_HOTKEY HkCreatePin( _HKI( "Create Pin" ), HK_LIBEDIT_CREATE_PIN, 'P' );

static EDA_HOTKEY HkInsertPin( wxT( "Repeat Pin" ), HK_REPEAT_LAST, WXK_INSERT );

static EDA_HOTKEY HkInsertPin( _HKI( "Repeat Pin" ), HK_REPEAT_LAST, WXK_INSERT );

static EDA_HOTKEY HkMoveLibItem( wxT( "Move Library Item" ), HK_LIBEDIT_MOVE_GRAPHIC_ITEM, 'M' );

static EDA_HOTKEY HkMoveLibItem( _HKI( "Move Library Item" ), HK_LIBEDIT_MOVE_GRAPHIC_ITEM, 'M' );





// Load/save files

// Load/save files

static EDA_HOTKEY HkSaveLib( wxT( "Save Library" ), HK_SAVE_LIB, 'S' + GR_KB_CTRL );

static EDA_HOTKEY HkSaveLib( _HKI( "Save Library" ), HK_SAVE_LIB, 'S' + GR_KB_CTRL );

static EDA_HOTKEY HkSaveSchematic( wxT( "Save Schematic" ), HK_SAVE_SCH, 'S' + GR_KB_CTRL );

static EDA_HOTKEY HkSaveSchematic( _HKI( "Save Schematic" ), HK_SAVE_SCH, 'S' + GR_KB_CTRL );

static EDA_HOTKEY HkLoadSchematic( wxT( "Load Schematic" ), HK_LOAD_SCH, 'L' + GR_KB_CTRL );

static EDA_HOTKEY HkLoadSchematic( _HKI( "Load Schematic" ), HK_LOAD_SCH, 'L' + GR_KB_CTRL );





// List of common hotkey descriptors

// List of common hotkey descriptors

static EDA_HOTKEY* common_Hotkey_List[] =

static EDA_HOTKEY* common_Hotkey_List[] =

include/hotkeys_basic.h

+7 −0
Original line number Original line Diff line number Diff line
@@ -31,6 +31,13 @@ 




#define DEFAULT_HOTKEY_FILENAME_EXT wxT( "hotkeys" )

#define DEFAULT_HOTKEY_FILENAME_EXT wxT( "hotkeys" )





// A define to allow translation of Hot Key message Info in hotkey help menu

// We do not want to use the _( x ) usual macro from wxWidgets, which calls wxGetTranslation(),

// because the English string is used in key file configuration

// The translated string is used only when displaying the help window.

// Therefore translation tools have to use the "_" and the "_HKI" prefix to extract

// strings to translate

#define _HKI( x ) wxT( x )





class EDA_BASE_FRAME;

class EDA_BASE_FRAME;

kicad/menubar.cpp

+19 −13
Original line number Original line Diff line number Diff line
@@ -129,22 +129,28 @@ enum hotkey_id_commnand 
};

};





/////////////  Hotkeys management   ///////////////////////////////////////

/////////////  Hotkeys management   ///////////////////////////////////////



// Remark: the hotkey message info is used as keyword in hotkey config files and

// as comments in help windows, therefore translated only when displayed

// they are marked _HKI to be extracted by translation tools

// See hotkeys_basic.h for more info



// hotkeys command:

// hotkeys command:

static EDA_HOTKEY HkHelp( wxT( "Help (this window)" ), HK_HELP, '?' );

static EDA_HOTKEY HkHelp( _HKI( "Help (this window)" ), HK_HELP, '?' );

static EDA_HOTKEY HkLoadPrj( wxT( "Load project" ), HK_LOAD_PROJECT, 'O' + GR_KB_CTRL );

static EDA_HOTKEY HkLoadPrj( _HKI( "Load project" ), HK_LOAD_PROJECT, 'O' + GR_KB_CTRL );

static EDA_HOTKEY HkSavePrj( wxT( "Save project" ), HK_SAVE_PROJECT, 'S' + GR_KB_CTRL );

static EDA_HOTKEY HkSavePrj( _HKI( "Save project" ), HK_SAVE_PROJECT, 'S' + GR_KB_CTRL );

static EDA_HOTKEY HkNewProject( wxT( "New Project" ), HK_NEW_PRJ, 'N' + GR_KB_CTRL );

static EDA_HOTKEY HkNewProject( _HKI( "New Project" ), HK_NEW_PRJ, 'N' + GR_KB_CTRL );

static EDA_HOTKEY HkNewPrjFromTemplate( wxT( "New Prj From Template" ),

static EDA_HOTKEY HkNewPrjFromTemplate( _HKI( "New Prj From Template" ),

                                        HK_NEW_PRJ_TEMPLATE, 'T' + GR_KB_CTRL );

                                        HK_NEW_PRJ_TEMPLATE, 'T' + GR_KB_CTRL );





static EDA_HOTKEY HkRunEeschema( wxT( "Run Eeschema" ), HK_RUN_EESCHEMA, 'E', 0 );

static EDA_HOTKEY HkRunEeschema( _HKI( "Run Eeschema" ), HK_RUN_EESCHEMA, 'E', 0 );

static EDA_HOTKEY HkRunLibedit( wxT( "Run LibEdit" ), HK_RUN_LIBEDIT, 'L', 0 );

static EDA_HOTKEY HkRunLibedit( _HKI( "Run LibEdit" ), HK_RUN_LIBEDIT, 'L', 0 );

static EDA_HOTKEY HkRunPcbnew( wxT( "Run Pcbnew" ), HK_RUN_PCBNEW, 'P', 0 );

static EDA_HOTKEY HkRunPcbnew( _HKI( "Run Pcbnew" ), HK_RUN_PCBNEW, 'P', 0 );

static EDA_HOTKEY HkRunModedit( wxT( "Run FpEditor" ), HK_RUN_FPEDITOR, 'F', 0 );

static EDA_HOTKEY HkRunModedit( _HKI( "Run FpEditor" ), HK_RUN_FPEDITOR, 'F', 0 );

static EDA_HOTKEY HkRunGerbview( wxT( "Run Gerbview" ), HK_RUN_GERBVIEW, 'G', 0 );

static EDA_HOTKEY HkRunGerbview( _HKI( "Run Gerbview" ), HK_RUN_GERBVIEW, 'G', 0 );

static EDA_HOTKEY HkRunBm2Cmp( wxT( "Run Bitmap2Component" ), HK_RUN_BM2COMPONENT, 'B', 0 );

static EDA_HOTKEY HkRunBm2Cmp( _HKI( "Run Bitmap2Component" ), HK_RUN_BM2COMPONENT, 'B', 0 );

static EDA_HOTKEY HkRunPcbCalc( wxT( "Run PcbCalculator" ), HK_RUN_PCBCALCULATOR, 'C', 0 );

static EDA_HOTKEY HkRunPcbCalc( _HKI( "Run PcbCalculator" ), HK_RUN_PCBCALCULATOR, 'C', 0 );

static EDA_HOTKEY HkRunPleditor( wxT( "Run PlEditor" ), HK_RUN_PLEDITOR, 'Y', 0 );

static EDA_HOTKEY HkRunPleditor( _HKI( "Run PlEditor" ), HK_RUN_PLEDITOR, 'Y', 0 );





// List of hotkey descriptors

// List of hotkey descriptors

EDA_HOTKEY* common_Hotkey_List[] =

EDA_HOTKEY* common_Hotkey_List[] =