From 1efe80f8a582944736cd06628d2ffd4ebe4233b3 Mon Sep 17 00:00:00 2001 From: Maxime Gimeno Date: Thu, 22 Oct 2020 13:53:40 +0200 Subject: [PATCH 1/2] Fixes some mouse bindings description --- Polyhedron/demo/Polyhedron/Viewer.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Polyhedron/demo/Polyhedron/Viewer.cpp b/Polyhedron/demo/Polyhedron/Viewer.cpp index f79777b319d..8b4900f36de 100644 --- a/Polyhedron/demo/Polyhedron/Viewer.cpp +++ b/Polyhedron/demo/Polyhedron/Viewer.cpp @@ -318,15 +318,14 @@ void Viewer::doBindings() //modify mouse bindings that have been updated setMouseBinding(Qt::Key(0), Qt::NoModifier, Qt::LeftButton, CGAL::qglviewer::RAP_FROM_PIXEL, true, Qt::RightButton); + setMouseBinding(Qt::ShiftModifier, Qt::RightButton, CGAL::qglviewer::NO_CLICK_ACTION, false, Qt::NoButton); setMouseBindingDescription(Qt::ShiftModifier, Qt::RightButton, tr("Select and pop context menu")); setMouseBinding(Qt::Key_R, Qt::NoModifier, Qt::LeftButton, CGAL::qglviewer::RAP_FROM_PIXEL); + //use the new API for these setMouseBinding(Qt::ShiftModifier, Qt::LeftButton, CGAL::qglviewer::SELECT); - setMouseBindingDescription(Qt::Key(0), Qt::ShiftModifier, Qt::LeftButton, - tr("Selects and display context " - "menu of the selected item")); setMouseBindingDescription(Qt::Key_I, Qt::NoModifier, Qt::LeftButton, tr("Show/hide the primitive ID of the types selected in the context menu of the picked item.")); setMouseBindingDescription(Qt::Key_D, Qt::NoModifier, Qt::LeftButton, From 08469076fc53496cca4e434d636b754ab5b2c977 Mon Sep 17 00:00:00 2001 From: Maxime Gimeno Date: Thu, 22 Oct 2020 14:06:09 +0200 Subject: [PATCH 2/2] Remove false key binding --- GraphicsView/include/CGAL/Qt/qglviewer_impl.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/GraphicsView/include/CGAL/Qt/qglviewer_impl.h b/GraphicsView/include/CGAL/Qt/qglviewer_impl.h index ee33a8e0ed1..a4f378e84da 100644 --- a/GraphicsView/include/CGAL/Qt/qglviewer_impl.h +++ b/GraphicsView/include/CGAL/Qt/qglviewer_impl.h @@ -679,7 +679,6 @@ void CGAL::QGLViewer::setDefaultShortcuts() { setShortcut(qglviewer::FULL_SCREEN, ::Qt::ALT + ::Qt::Key_Return); setShortcut(qglviewer::ANIMATION, ::Qt::Key_Return); setShortcut(qglviewer::HELP, ::Qt::Key_H); - setShortcut(qglviewer::EDIT_CAMERA, ::Qt::Key_C); setShortcut(qglviewer::MOVE_CAMERA_LEFT, ::Qt::Key_Left); setShortcut(qglviewer::MOVE_CAMERA_RIGHT, ::Qt::Key_Right); setShortcut(qglviewer::MOVE_CAMERA_UP, ::Qt::Key_Up); @@ -701,9 +700,6 @@ void CGAL::QGLViewer::setDefaultShortcuts() { tr("Opens this help window", "HELP action description"); keyboardActionDescription_[qglviewer::ANIMATION] = tr("Starts/stops the animation", "ANIMATION action description"); - keyboardActionDescription_[qglviewer::EDIT_CAMERA] = - tr("Toggles camera paths display", - "EDIT_CAMERA action description"); // TODO change keyboardActionDescription_[qglviewer::ENABLE_TEXT] = tr("Toggles the display of the text", "ENABLE_TEXT action description"); keyboardActionDescription_[qglviewer::EXIT_VIEWER] =