Merge pull request #1292 from triplus/NavigationRevit

Navigation indicator Revit style

src/Mod/Tux/NavigationIndicatorGui.py

@@ -114,7 +114,27 @@ def retranslateUi():
     <b>""" + text08 + ":</b> " + text10 + "</small></p>"
 
     global t3
-    t3 = "<p align='center'><b>Blender</b> " + text06 + """</p>
+    t3 = "<p align='center'><b>Revit</b> " + text06 + """</p>
+    <table>
+     <tr>
+      <th><small>""" + text01 + """</small></th>
+      <th><small>""" + text02 + """</small></th>
+      <th><small>""" + text03 + """</small></th>
+      <th><small>""" + text04 + """</small></th>
+      <th><small>""" + text04 + """</small></th>
+     </tr>
+     <tr>
+      <td align='center'><img src=':/icons/NavigationBlender_Select.svg'></td>
+      <td align='center'><img src=':/icons/NavigationBlender_Zoom.svg'></td>
+      <td align='center'><img src=':/icons/NavigationRevit_Rotate.svg'></td>
+      <td align='center'><img src=':/icons/NavigationRevit_Pan.svg'></td>
+      <td align='center'><img src=':/icons/NavigationBlender_PanAlt.svg'></td>
+     </tr>
+    </table>
+    <b>""" + text08 + ":</b> " + text10 + "</small></p>"
+
+    global t4
+    t4 = "<p align='center'><b>Blender</b> " + text06 + """</p>
     <table>
      <tr>
       <th><small>""" + text01 + """</small></th>
@@ -133,8 +153,8 @@ def retranslateUi():
     </table>
     <b>""" + text08 + ":</b> " + text10 + "</small></p>"
 
-    global t4
-    t4 = "<p align='center'><b>MayaGesture</b> " + text06 + """</p>
+    global t5
+    t5 = "<p align='center'><b>MayaGesture</b> " + text06 + """</p>
     <table>
      <tr>
       <th><small>""" + text01 + """</small></th>
@@ -172,8 +192,8 @@ def retranslateUi():
     <p><small><b>""" + text02 + ":</b> " + text07 + """<br>
     <b>""" + text08 + ":</b> " + text09 + "</small></p>"
 
-    global t5
-    t5 = "<p align='center'><b>Touchpad</b> " + text06 + """</p>
+    global t6
+    t6 = "<p align='center'><b>Touchpad</b> " + text06 + """</p>
     <table>
      <tr>
       <th><small>""" + text01 + """</small></th>
@@ -208,8 +228,8 @@ def retranslateUi():
     </table>
     <p><small><b>""" + text02 + ":</b> " + text07 + "</p>"
 
-    global t6
-    t6 = "<p align='center'><b>Gesture</b> " + text06 + """</p>
+    global t7
+    t7 = "<p align='center'><b>Gesture</b> " + text06 + """</p>
     <table>
      <tr>
       <th><small>""" + text01 + """</small></th>
@@ -247,8 +267,8 @@ def retranslateUi():
     <p><small><b>""" + text02 + ":</b> " + text07 + """<br>
     <b>""" + text08 + ":</b> " + text09 + "</small></p>"
 
-    global t7
-    t7 = "<p align='center'><b>OpenCascade</b> " + text06 + """</p>
+    global t8
+    t8 = "<p align='center'><b>OpenCascade</b> " + text06 + """</p>
     <table>
      <tr>
       <th><small>""" + text01 + """</small></th>
@@ -329,34 +349,40 @@ a2.setData("Gui::CADNavigationStyle")
 a2.setObjectName("Indicator_NavigationCAD")
 
 a3 = QtGui.QAction(gStyle)
-a3.setIcon(QtGui.QIcon(":/icons/NavigationBlender.svg"))
-a3.setText("Blender")
-a3.setData("Gui::BlenderNavigationStyle")
-a3.setObjectName("Indicator_NavigationBlender")
+a3.setIcon(QtGui.QIcon(":/icons/NavigationRevit.svg"))
+a3.setText("Revit")
+a3.setData("Gui::RevitNavigationStyle")
+a3.setObjectName("Indicator_NavigationRevit")
 
 a4 = QtGui.QAction(gStyle)
-a4.setIcon(QtGui.QIcon(":/icons/NavigationMayaGesture.svg"))
-a4.setText("MayaGesture")
-a4.setData("Gui::MayaGestureNavigationStyle")
-a4.setObjectName("Indicator_NavigationMayaGesture")
+a4.setIcon(QtGui.QIcon(":/icons/NavigationBlender.svg"))
+a4.setText("Blender")
+a4.setData("Gui::BlenderNavigationStyle")
+a4.setObjectName("Indicator_NavigationBlender")
 
 a5 = QtGui.QAction(gStyle)
-a5.setIcon(QtGui.QIcon(":/icons/NavigationTouchpad.svg"))
-a5.setText("Touchpad")
-a5.setData("Gui::TouchpadNavigationStyle")
-a5.setObjectName("Indicator_NavigationTouchpad")
+a5.setIcon(QtGui.QIcon(":/icons/NavigationMayaGesture.svg"))
+a5.setText("MayaGesture")
+a5.setData("Gui::MayaGestureNavigationStyle")
+a5.setObjectName("Indicator_NavigationMayaGesture")
 
 a6 = QtGui.QAction(gStyle)
-a6.setIcon(QtGui.QIcon(":/icons/NavigationGesture.svg"))
-a6.setText("Gesture")
-a6.setData("Gui::GestureNavigationStyle")
-a6.setObjectName("Indicator_NavigationGesture")
+a6.setIcon(QtGui.QIcon(":/icons/NavigationTouchpad.svg"))
+a6.setText("Touchpad")
+a6.setData("Gui::TouchpadNavigationStyle")
+a6.setObjectName("Indicator_NavigationTouchpad")
 
 a7 = QtGui.QAction(gStyle)
-a7.setIcon(QtGui.QIcon(":/icons/NavigationOpenCascade.svg"))
-a7.setText("OpenCascade")
-a7.setData("Gui::OpenCascadeNavigationStyle")
-a7.setObjectName("Indicator_NavigationOpenCascade")
+a7.setIcon(QtGui.QIcon(":/icons/NavigationGesture.svg"))
+a7.setText("Gesture")
+a7.setData("Gui::GestureNavigationStyle")
+a7.setObjectName("Indicator_NavigationGesture")
+
+a8 = QtGui.QAction(gStyle)
+a8.setIcon(QtGui.QIcon(":/icons/NavigationOpenCascade.svg"))
+a8.setText("OpenCascade")
+a8.setData("Gui::OpenCascadeNavigationStyle")
+a8.setObjectName("Indicator_NavigationOpenCascade")
 
 menu.addMenu(menuSettings)
 menu.addSeparator()
@@ -368,6 +394,7 @@ menu.addAction(a4)
 menu.addAction(a5)
 menu.addAction(a6)
 menu.addAction(a7)
+menu.addAction(a8)
 
 
 def onCompact():
@@ -402,6 +429,7 @@ def onTooltip():
         a5.setToolTip(t5)
         a6.setToolTip(t6)
         a7.setToolTip(t7)
+        a8.setToolTip(t8)
         p.SetBool("Tooltip", 1)
     else:
         for i in gStyle.actions():

src/Mod/Tux/Resources/Tux.qrc

@@ -52,6 +52,9 @@
         <file>icons/NavigationOpenInventor.svg</file>
         <file>icons/NavigationOpenInventor_ZoomAlt.svg</file>
         <file>icons/NavigationOpenInventor_Zoom.svg</file>
+        <file>icons/NavigationRevit_Pan.svg</file>
+        <file>icons/NavigationRevit_Rotate.svg</file>
+        <file>icons/NavigationRevit.svg</file>
         <file>icons/NavigationTouchpad_Pan.svg</file>
         <file>icons/NavigationTouchpad_PanTouch.svg</file>
         <file>icons/NavigationTouchpad_RotateAlt.svg</file>

src/Mod/Tux/Resources/icons/NavigationRevit.svg

@@ -0,0 +1,11 @@
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="64" viewBox="0 0 63.999999 63.999999" width="64" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g stroke="#2e3436" stroke-width="6" fill="none" transform="translate(0 -988.86)">
+  <path d="m16 1028.4v-20c0-8 4-12 16-12s16 4 16 12v20c0 8-4 17-16 17s-16-9-16-17z"/>
+  <path d="m32 1004.4v12"/>
+ </g>
+ <g stroke-linejoin="round" transform="matrix(1.0445 0 0 -1.0419 33.453 32.04)" stroke="#2e3436" stroke-linecap="round" stroke-width="5.7517">
+  <g stroke-linejoin="round" transform="scale(1,-1)" stroke="#2e3436" stroke-linecap="round" stroke-width="5.7517" fill="none">
+   <path stroke-linejoin="round" d="m13.917 7.4999c-0.454-2.6666-1.713-5.2777-3.917-7.4999 2.2038-2.2224 3.4631-4.8335 3.9168-7.5001" stroke="#2e3436" stroke-linecap="round" stroke-width="5.7517"/>
+  </g>
+ </g>
+</svg>

src/Mod/Tux/Resources/icons/NavigationRevit_Pan.svg

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg id="svg4199" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="64" width="64" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 64.000001 64.000001">
+ <metadata id="metadata4204">
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <g id="layer1" transform="translate(0 -988.36)">
+  <rect id="rect4140" style="color:#000000" fill-rule="evenodd" ry="10" height="56" width="56" y="992.36" x="4" fill="#eeeeec"/>
+  <g fill-rule="evenodd" stroke="#2e3436" fill="#fff">
+   <path id="path4144" d="m16 1027.9v-20c0-8 4-12.5 16-12.5s16 4.5 16 12.5v20c0 8-4 17.5-16 17.5s-16-9.5-16-17.5z" stroke-width="2"/>
+   <path id="path4195" d="m17 1010.9c-0.13863-10 1.4688-14.5 15-14.5v14.5z" stroke-width=".5"/>
+   <path id="path4197" d="m47 1010.9c0.13863-10-1.4688-14.5-15-14.5v14.5z" stroke-width=".5"/>
+  </g>
+  <g stroke="#2e3436">
+   <path id="path4169" d="m32 1011.9v-16.5" stroke-width="2" fill="none"/>
+   <path id="path4167" d="m16 1011.9h32" stroke-width="2" fill="none"/>
+   <rect id="rect4139" height="18" stroke-linecap="round" stroke-width="1.6" fill="#729fcf" style="color:#000000" fill-rule="evenodd" ry="3.5" width="8" y="1002.9" x="28"/>
+  </g>
+ </g>
+</svg>