From 9f156aa115cd477b4bd5979748048ae8581545e4 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Tue, 24 Sep 2019 09:41:05 +0200 Subject: [PATCH] 3D viewer: do not translate Ctrl and Shift hotkey modifiers: Translations do not always work --- 3d-viewer/3d_viewer/3d_menubar.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/3d-viewer/3d_viewer/3d_menubar.cpp b/3d-viewer/3d_viewer/3d_menubar.cpp index 4ad159e22c..0054a58ab1 100644 --- a/3d-viewer/3d_viewer/3d_menubar.cpp +++ b/3d-viewer/3d_viewer/3d_menubar.cpp @@ -59,7 +59,8 @@ void EDA_3D_VIEWER::CreateMenuBar() fileMenu->Resolve(); //-- Edit menu ------------------------------------------------------- - // + // Avoid to translate hotkey modifiers like Ctrl and Shift. + // The translated modifiers do not always work CONDITIONAL_MENU* editMenu = new CONDITIONAL_MENU( false, tool ); editMenu->AddItem( ID_TOOL_SCREENCOPY_TOCLIBBOARD, _( "Copy 3D Image" ), "", @@ -84,24 +85,24 @@ void EDA_3D_VIEWER::CreateMenuBar() zoom_redraw_xpm, SELECTION_CONDITIONS::ShowAlways ); viewMenu->AddSeparator(); - viewMenu->AddItem( ID_ROTATE3D_X_NEG, _( "Rotate X Clockwise\tCtrl+Shift+X" ), "", + viewMenu->AddItem( ID_ROTATE3D_X_NEG, _( "Rotate X Clockwise" ) + "\tCtrl+Shift+X", "", rotate_neg_x_xpm, SELECTION_CONDITIONS::ShowAlways ); - viewMenu->AddItem( ID_ROTATE3D_X_POS, _( "Rotate X Counterclockwise\tCtrl+X" ), "", + viewMenu->AddItem( ID_ROTATE3D_X_POS, _( "Rotate X Counterclockwise" ) + "\tCtrl+X", "", rotate_pos_x_xpm, SELECTION_CONDITIONS::ShowAlways ); viewMenu->AddSeparator(); - viewMenu->AddItem( ID_ROTATE3D_Y_NEG, _( "Rotate Y Clockwise\tCtrl+Shift+Y" ), "", + viewMenu->AddItem( ID_ROTATE3D_Y_NEG, _( "Rotate Y Clockwise" ) + "\tCtrl+Shift+Y", "", rotate_neg_y_xpm, SELECTION_CONDITIONS::ShowAlways ); - viewMenu->AddItem( ID_ROTATE3D_Y_POS, _( "Rotate Y Counterclockwise\tCtrl+Y" ), "", + viewMenu->AddItem( ID_ROTATE3D_Y_POS, _( "Rotate Y Counterclockwise" ) + "\tCtrl+Y", "", rotate_pos_y_xpm, SELECTION_CONDITIONS::ShowAlways ); viewMenu->AddSeparator(); - viewMenu->AddItem( ID_ROTATE3D_Z_NEG, _( "Rotate Z Clockwise\tCtrl+Shift+Z" ), "", + viewMenu->AddItem( ID_ROTATE3D_Z_NEG, _( "Rotate Z Clockwise" ) + "\tCtrl+Shift+Z", "", rotate_neg_z_xpm, SELECTION_CONDITIONS::ShowAlways );; - viewMenu->AddItem( ID_ROTATE3D_Z_POS, _( "Rotate Z Counterclockwise\tCtrl+Z" ), "", + viewMenu->AddItem( ID_ROTATE3D_Z_POS, _( "Rotate Z Counterclockwise" ) + "\tCtrl+Z", "", rotate_pos_z_xpm, SELECTION_CONDITIONS::ShowAlways ); viewMenu->AddSeparator();