diff --git a/src/Gui/CADNavigationStyle.cpp b/src/Gui/CADNavigationStyle.cpp index 598b69b9c..cf45e85d2 100644 --- a/src/Gui/CADNavigationStyle.cpp +++ b/src/Gui/CADNavigationStyle.cpp @@ -71,7 +71,8 @@ const char* CADNavigationStyle::mouseButtons(ViewerMode mode) case NavigationStyle::DRAGGING: return QT_TR_NOOP("Press middle and left or right mouse button"); case NavigationStyle::ZOOMING: - return QT_TR_NOOP("Scroll middle mouse button or middle and left click"); + return QT_TR_NOOP("Scroll middle mouse button or keep middle button pressed\n" + "while doing a left or right click and move the mouse up or down"); default: return "No description"; } diff --git a/src/Gui/DlgSettings3DViewImp.cpp b/src/Gui/DlgSettings3DViewImp.cpp index a6b5bd9bb..8a2309fd4 100644 --- a/src/Gui/DlgSettings3DViewImp.cpp +++ b/src/Gui/DlgSettings3DViewImp.cpp @@ -126,12 +126,16 @@ void DlgSettings3DViewImp::on_mouseButton_clicked() ui.groupBox->setTitle(ui.groupBox->title()+QString::fromAscii(" ")+comboNavigationStyle->currentText()); QString descr; descr = qApp->translate((const char*)data.toByteArray(),ns->mouseButtons(NavigationStyle::SELECTION)); + descr.replace(QLatin1String("\n"), QLatin1String("

")); ui.selectionLabel->setText(QString::fromAscii("%1").arg(descr)); descr = qApp->translate((const char*)data.toByteArray(),ns->mouseButtons(NavigationStyle::PANNING)); + descr.replace(QLatin1String("\n"), QLatin1String("

")); ui.panningLabel->setText(QString::fromAscii("%1").arg(descr)); descr = qApp->translate((const char*)data.toByteArray(),ns->mouseButtons(NavigationStyle::DRAGGING)); + descr.replace(QLatin1String("\n"), QLatin1String("

")); ui.rotationLabel->setText(QString::fromAscii("%1").arg(descr)); descr = qApp->translate((const char*)data.toByteArray(),ns->mouseButtons(NavigationStyle::ZOOMING)); + descr.replace(QLatin1String("\n"), QLatin1String("

")); ui.zoomingLabel->setText(QString::fromAscii("%1").arg(descr)); dlg.exec(); } diff --git a/src/Gui/MouseButtons.ui b/src/Gui/MouseButtons.ui index 19cbc1ec0..15d8f7a4b 100644 --- a/src/Gui/MouseButtons.ui +++ b/src/Gui/MouseButtons.ui @@ -27,6 +27,9 @@ Selection: + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + @@ -34,6 +37,9 @@ + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + @@ -41,6 +47,9 @@ Panning + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + @@ -48,6 +57,9 @@ + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + @@ -55,6 +67,9 @@ Rotation: + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + @@ -62,6 +77,9 @@ + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + @@ -69,6 +87,9 @@ Zooming: + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + @@ -76,6 +97,9 @@ + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop +