From 9ab0b75a6d3ae9dca5bfa9d1450fc6ff67fbe94b Mon Sep 17 00:00:00 2001 From: Max Wilfinger Date: Fri, 6 Jun 2025 10:04:29 +0200 Subject: [PATCH] Added UI for Siemens NX navigation style. Ordered navigation styles alphabetically. --- src/Gui/SoFCDB.cpp | 14 ++-- src/Mod/Tux/NavigationIndicatorGui.py | 82 +++++++++++++++---- src/Mod/Tux/Resources/Tux.qrc | 2 + .../icons/NavigationSiemensNX_dark.svg | 50 +++++++++++ .../icons/NavigationSiemensNX_light.svg | 50 +++++++++++ 5 files changed, 175 insertions(+), 23 deletions(-) create mode 100644 src/Mod/Tux/Resources/icons/NavigationSiemensNX_dark.svg create mode 100644 src/Mod/Tux/Resources/icons/NavigationSiemensNX_light.svg diff --git a/src/Gui/SoFCDB.cpp b/src/Gui/SoFCDB.cpp index ab6f365df4..7a0dc4718c 100644 --- a/src/Gui/SoFCDB.cpp +++ b/src/Gui/SoFCDB.cpp @@ -190,18 +190,18 @@ void Gui::SoFCDB::init() NavigationStyle ::init(); UserNavigationStyle ::init(); NavigationStateChart ::init(); - InventorNavigationStyle ::init(); - CADNavigationStyle ::init(); - RevitNavigationStyle ::init(); BlenderNavigationStyle ::init(); - SolidWorksNavigationStyle ::init(); - MayaGestureNavigationStyle ::init(); - TouchpadNavigationStyle ::init(); + CADNavigationStyle ::init(); GestureNavigationStyle ::init(); + MayaGestureNavigationStyle ::init(); OpenCascadeNavigationStyle ::init(); + InventorNavigationStyle ::init(); OpenSCADNavigationStyle ::init(); - TinkerCADNavigationStyle ::init(); + RevitNavigationStyle ::init(); SiemensNXStyle ::init(); + SolidWorksNavigationStyle ::init(); + TinkerCADNavigationStyle ::init(); + TouchpadNavigationStyle ::init(); GLGraphicsItem ::init(); GLFlagWindow ::init(); diff --git a/src/Mod/Tux/NavigationIndicatorGui.py b/src/Mod/Tux/NavigationIndicatorGui.py index 84b7f3db7b..3e68c64a90 100644 --- a/src/Mod/Tux/NavigationIndicatorGui.py +++ b/src/Mod/Tux/NavigationIndicatorGui.py @@ -74,9 +74,10 @@ def RePopulateIcons(): a6.setIcon(QtGui.QIcon(":/icons/NavigationOpenInventor_" + StyleSheetType + ".svg")) a7.setIcon(QtGui.QIcon(":/icons/NavigationOpenSCAD_" + StyleSheetType + ".svg")) a8.setIcon(QtGui.QIcon(":/icons/NavigationRevit_" + StyleSheetType + ".svg")) - a9.setIcon(QtGui.QIcon(":/icons/NavigationSolidWorks_" + StyleSheetType + ".svg")) - a10.setIcon(QtGui.QIcon(":/icons/NavigationTinkerCAD_" + StyleSheetType + ".svg")) - a11.setIcon(QtGui.QIcon(":/icons/NavigationTouchpad_" + StyleSheetType + ".svg")) + a9.setIcon(QtGui.QIcon(":/icons/NavigationSiemensNX_" + StyleSheetType + ".svg")) + a10.setIcon(QtGui.QIcon(":/icons/NavigationSolidWorks_" + StyleSheetType + ".svg")) + a11.setIcon(QtGui.QIcon(":/icons/NavigationTinkerCAD_" + StyleSheetType + ".svg")) + a12.setIcon(QtGui.QIcon(":/icons/NavigationTouchpad_" + StyleSheetType + ".svg")) def retranslateUi(): @@ -474,6 +475,48 @@ def retranslateUi(): global t9 t9 = ( + "

Siemens NX " + + text06 + + """

+ + + + + + + + + + + + + + + + + +
""" + + text01 + + """""" + + text02 + + """""" + + text02 + + """""" + + text03 + + """""" + + text04 + + """""" + + text04 + + """
+ """ + + text08 + + ": " + + text10 + + "

" + ) + + global t10 + t10 = ( "

SolidWorks " + text06 + """

@@ -510,8 +553,8 @@ def retranslateUi(): + "

" ) - global t10 - t10 = ( + global t11 + t11 = ( "

TinkerCAD " + text06 + """

@@ -539,8 +582,8 @@ def retranslateUi(): """ ) - global t11 - t11 = ( + global t12 + t12 = ( "

Touchpad " + text06 + """

@@ -716,19 +759,24 @@ a8.setData("Gui::RevitNavigationStyle") a8.setObjectName("Indicator_NavigationRevit") a9 = QtGui.QAction(gStyle) -a9.setText("SolidWorks ") -a9.setData("Gui::SolidWorksNavigationStyle") -a9.setObjectName("Indicator_NavigationSolidWorks") +a9.setText("Siemens NX ") +a9.setData("Gui::SiemensNXStyle") +a9.setObjectName("Indicator_NavigationSiemensNX") a10 = QtGui.QAction(gStyle) -a10.setText("TinkerCAD ") -a10.setData("Gui::TinkerCADNavigationStyle") -a10.setObjectName("Indicator_NavigationTinkerCAD") +a10.setText("SolidWorks ") +a10.setData("Gui::SolidWorksNavigationStyle") +a10.setObjectName("Indicator_NavigationSolidWorks") a11 = QtGui.QAction(gStyle) -a11.setText("Touchpad ") -a11.setData("Gui::TouchpadNavigationStyle") -a11.setObjectName("Indicator_NavigationTouchpad") +a11.setText("TinkerCAD ") +a11.setData("Gui::TinkerCADNavigationStyle") +a11.setObjectName("Indicator_NavigationTinkerCAD") + +a12 = QtGui.QAction(gStyle) +a12.setText("Touchpad ") +a12.setData("Gui::TouchpadNavigationStyle") +a12.setObjectName("Indicator_NavigationTouchpad") RePopulateIcons() @@ -746,6 +794,7 @@ menu.addAction(a8) menu.addAction(a9) menu.addAction(a10) menu.addAction(a11) +menu.addAction(a12) pView.Attach(indicator) @@ -787,6 +836,7 @@ def onTooltip(): a9.setToolTip(t9) a10.setToolTip(t10) a11.setToolTip(t11) + a12.setToolTip(t12) p.SetBool("Tooltip", 1) else: for i in gStyle.actions(): diff --git a/src/Mod/Tux/Resources/Tux.qrc b/src/Mod/Tux/Resources/Tux.qrc index 6ec43834ca..413d549458 100644 --- a/src/Mod/Tux/Resources/Tux.qrc +++ b/src/Mod/Tux/Resources/Tux.qrc @@ -47,6 +47,8 @@ icons/NavigationOpenSCAD_dark.svg icons/NavigationRevit_light.svg icons/NavigationRevit_dark.svg + icons/NavigationSiemensNX_light.svg + icons/NavigationSiemensNX_dark.svg icons/NavigationSolidWorks_light.svg icons/NavigationSolidWorks_dark.svg icons/NavigationTinkerCAD_light.svg diff --git a/src/Mod/Tux/Resources/icons/NavigationSiemensNX_dark.svg b/src/Mod/Tux/Resources/icons/NavigationSiemensNX_dark.svg new file mode 100644 index 0000000000..38ab2c06cc --- /dev/null +++ b/src/Mod/Tux/Resources/icons/NavigationSiemensNX_dark.svg @@ -0,0 +1,50 @@ + + + + + + + + + image/svg+xml + + + + + + + + + NX + diff --git a/src/Mod/Tux/Resources/icons/NavigationSiemensNX_light.svg b/src/Mod/Tux/Resources/icons/NavigationSiemensNX_light.svg new file mode 100644 index 0000000000..0064477a86 --- /dev/null +++ b/src/Mod/Tux/Resources/icons/NavigationSiemensNX_light.svg @@ -0,0 +1,50 @@ + + + + + + + + + image/svg+xml + + + + + + + + + NX +