suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

+ fixes #0001309: Revise Mouse Dialog Edit->Preferences->Display->CAD Navigation->[Mouse]

Browse Source
This commit is contained in:
wmayer 2014-03-09 15:36:33 +01:00
parent 064b5f851c
commit 7430d7d11b
3 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Gui/CADNavigationStyle.cpp
View File

@ -71,7 +71,8 @@ const char* CADNavigationStyle::mouseButtons(ViewerMode mode)
case NavigationStyle::DRAGGING: case NavigationStyle::DRAGGING:
return QT_TR_NOOP("Press middle and left or right mouse button"); return QT_TR_NOOP("Press middle and left or right mouse button");
case NavigationStyle::ZOOMING: 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: default:
return "No description"; return "No description";
} }

4
src/Gui/DlgSettings3DViewImp.cpp
View File

@ -126,12 +126,16 @@ void DlgSettings3DViewImp::on_mouseButton_clicked()
ui.groupBox->setTitle(ui.groupBox->title()+QString::fromAscii(" ")+comboNavigationStyle->currentText()); ui.groupBox->setTitle(ui.groupBox->title()+QString::fromAscii(" ")+comboNavigationStyle->currentText());
QString descr; QString descr;
descr = qApp->translate((const char*)data.toByteArray(),ns->mouseButtons(NavigationStyle::SELECTION)); descr = qApp->translate((const char*)data.toByteArray(),ns->mouseButtons(NavigationStyle::SELECTION));
descr.replace(QLatin1String("\n"), QLatin1String("<p>"));
ui.selectionLabel->setText(QString::fromAscii("<b>%1</b>").arg(descr)); ui.selectionLabel->setText(QString::fromAscii("<b>%1</b>").arg(descr));
descr = qApp->translate((const char*)data.toByteArray(),ns->mouseButtons(NavigationStyle::PANNING)); descr = qApp->translate((const char*)data.toByteArray(),ns->mouseButtons(NavigationStyle::PANNING));
descr.replace(QLatin1String("\n"), QLatin1String("<p>"));
ui.panningLabel->setText(QString::fromAscii("<b>%1</b>").arg(descr)); ui.panningLabel->setText(QString::fromAscii("<b>%1</b>").arg(descr));
descr = qApp->translate((const char*)data.toByteArray(),ns->mouseButtons(NavigationStyle::DRAGGING)); descr = qApp->translate((const char*)data.toByteArray(),ns->mouseButtons(NavigationStyle::DRAGGING));
descr.replace(QLatin1String("\n"), QLatin1String("<p>"));
ui.rotationLabel->setText(QString::fromAscii("<b>%1</b>").arg(descr)); ui.rotationLabel->setText(QString::fromAscii("<b>%1</b>").arg(descr));
descr = qApp->translate((const char*)data.toByteArray(),ns->mouseButtons(NavigationStyle::ZOOMING)); descr = qApp->translate((const char*)data.toByteArray(),ns->mouseButtons(NavigationStyle::ZOOMING));
descr.replace(QLatin1String("\n"), QLatin1String("<p>"));
ui.zoomingLabel->setText(QString::fromAscii("<b>%1</b>").arg(descr)); ui.zoomingLabel->setText(QString::fromAscii("<b>%1</b>").arg(descr));
dlg.exec(); dlg.exec();
} }

24
src/Gui/MouseButtons.ui
View File

@ -27,6 +27,9 @@
<property name="text"> <property name="text">
<string>Selection:</string> <string>Selection:</string>
</property> </property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
@ -34,6 +37,9 @@
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
@ -41,6 +47,9 @@
<property name="text"> <property name="text">
<string>Panning</string> <string>Panning</string>
</property> </property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="1" column="1">
@ -48,6 +57,9 @@
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="2" column="0">
@ -55,6 +67,9 @@
<property name="text"> <property name="text">
<string>Rotation:</string> <string>Rotation:</string>
</property> </property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
</widget> </widget>
</item> </item>
<item row="2" column="1"> <item row="2" column="1">
@ -62,6 +77,9 @@
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
</widget> </widget>
</item> </item>
<item row="3" column="0"> <item row="3" column="0">
@ -69,6 +87,9 @@
<property name="text"> <property name="text">
<string>Zooming:</string> <string>Zooming:</string>
</property> </property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
</widget> </widget>
</item> </item>
<item row="3" column="1"> <item row="3" column="1">
@ -76,6 +97,9 @@
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
</widget> </widget>
</item> </item>
</layout> </layout>