+ fixes #1309: Revise Mouse Dialog Edit->Preferences->Display->CAD Na…

…vigation->[Mouse]
FreeCAD · Mar 9, 2014 · 7430d7d · 7430d7d
1 parent 064b5f8
commit 7430d7d
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 1 deletion.
diff --git 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
@@ -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("<p>"));
     ui.selectionLabel->setText(QString::fromAscii("<b>%1</b>").arg(descr));
     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));
     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));
     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));
     dlg.exec();
 }

diff --git a/src/Gui/MouseButtons.ui b/src/Gui/MouseButtons.ui
@@ -27,55 +27,79 @@
           <property name="text">
            <string>Selection:</string>
           </property>
+          <property name="alignment">
+           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+          </property>
          </widget>
         </item>
         <item row="0" column="1">
          <widget class="QLabel" name="selectionLabel">
           <property name="text">
            <string/>
           </property>
+          <property name="alignment">
+           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+          </property>
          </widget>
         </item>
         <item row="1" column="0">
          <widget class="QLabel" name="label_3">
           <property name="text">
            <string>Panning</string>
           </property>
+          <property name="alignment">
+           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+          </property>
          </widget>
         </item>
         <item row="1" column="1">
          <widget class="QLabel" name="panningLabel">
           <property name="text">
            <string/>
           </property>
+          <property name="alignment">
+           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+          </property>
          </widget>
         </item>
         <item row="2" column="0">
          <widget class="QLabel" name="label_4">
           <property name="text">
            <string>Rotation:</string>
           </property>
+          <property name="alignment">
+           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+          </property>
          </widget>
         </item>
         <item row="2" column="1">
          <widget class="QLabel" name="rotationLabel">
           <property name="text">
            <string/>
           </property>
+          <property name="alignment">
+           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+          </property>
          </widget>
         </item>
         <item row="3" column="0">
          <widget class="QLabel" name="label_5">
           <property name="text">
            <string>Zooming:</string>
           </property>
+          <property name="alignment">
+           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+          </property>
          </widget>
         </item>
         <item row="3" column="1">
          <widget class="QLabel" name="zoomingLabel">
           <property name="text">
            <string/>
           </property>
+          <property name="alignment">
+           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+          </property>
          </widget>
         </item>
        </layout>