From c59981eef315b10d7d85f818a65b574a2ba1c036 Mon Sep 17 00:00:00 2001 From: Rexbas Date: Sun, 28 Jan 2024 16:16:02 +0100 Subject: [PATCH 1/2] Tux: Remove duplicate icons --- src/Mod/Tux/NavigationIndicatorGui.py | 140 +++++++++--------- src/Mod/Tux/Resources/Tux.qrc | 103 +++++-------- .../Tux/Resources/icons/NavigationCAD_Pan.svg | 26 ---- .../Resources/icons/NavigationCAD_Select.svg | 28 ---- .../Resources/icons/NavigationCAD_Zoom.svg | 31 ---- .../icons/NavigationGesture_Select.svg | 28 ---- .../icons/NavigationGesture_Tilt.svg | 28 ---- .../icons/NavigationGesture_Zoom.svg | 31 ---- .../icons/NavigationMayaGesture_PanTouch.svg | 46 ------ .../NavigationMayaGesture_PanTouchAlt.svg | 59 -------- .../icons/NavigationMayaGesture_Rotate.svg | 39 ----- .../NavigationMayaGesture_RotateTouch.svg | 41 ----- .../icons/NavigationMayaGesture_Select.svg | 28 ---- .../NavigationMayaGesture_SelectTouch.svg | 26 ---- .../icons/NavigationMayaGesture_TiltTouch.svg | 62 -------- .../icons/NavigationMayaGesture_Zoom.svg | 31 ---- .../icons/NavigationMayaGesture_ZoomTouch.svg | 58 -------- .../icons/NavigationOpenCascade_PanAlt.svg | 26 ---- .../icons/NavigationOpenCascade_Select.svg | 28 ---- .../icons/NavigationOpenCascade_Zoom.svg | 31 ---- .../icons/NavigationOpenInventor_Pan.svg | 26 ---- .../icons/NavigationOpenInventor_Rotate.svg | 28 ---- .../icons/NavigationOpenInventor_Zoom.svg | 31 ---- .../icons/NavigationOpenInventor_ZoomAlt.svg | 34 ----- .../Resources/icons/NavigationRevit_Pan.svg | 26 ---- .../icons/NavigationRevit_Rotate.svg | 39 ----- .../icons/NavigationTouchpad_RotateAlt.svg | 41 ----- .../icons/NavigationTouchpad_Select.svg | 28 ---- .../icons/NavigationTouchpad_Zoom.svg | 31 ---- ...ch.svg => Navigation_Gesture_PanTouch.svg} | 0 ...svg => Navigation_Gesture_PanTouchAlt.svg} | 0 ...svg => Navigation_Gesture_RotateTouch.svg} | 0 ...svg => Navigation_Gesture_SelectTouch.svg} | 0 ...h.svg => Navigation_Gesture_TiltTouch.svg} | 0 ...h.svg => Navigation_Gesture_ZoomTouch.svg} | 0 ...teAlt.svg => Navigation_Mouse_AltLeft.svg} | 0 ....svg => Navigation_Mouse_AltLeftRight.svg} | 0 ...Pan.svg => Navigation_Mouse_AltMiddle.svg} | 0 ...otate.svg => Navigation_Mouse_AltMove.svg} | 0 ...mAlt.svg => Navigation_Mouse_AltRight.svg} | 0 ...mAlt.svg => Navigation_Mouse_CtrlLeft.svg} | 0 ...an.svg => Navigation_Mouse_CtrlMiddle.svg} | 0 ...ate.svg => Navigation_Mouse_CtrlRight.svg} | 0 ...r_Select.svg => Navigation_Mouse_Left.svg} | 0 ...tate.svg => Navigation_Mouse_LeftMove.svg} | 0 ...Alt.svg => Navigation_Mouse_LeftRight.svg} | 0 ...Rotate.svg => Navigation_Mouse_Middle.svg} | 0 ...te.svg => Navigation_Mouse_MiddleLeft.svg} | 0 ...t.svg => Navigation_Mouse_MiddleRight.svg} | 0 ...ure_Pan.svg => Navigation_Mouse_Right.svg} | 0 ...r_Zoom.svg => Navigation_Mouse_Scroll.svg} | 0 ...svg => Navigation_Mouse_ShiftCtrlMove.svg} | 0 ...ect.svg => Navigation_Mouse_ShiftLeft.svg} | 0 ...n.svg => Navigation_Mouse_ShiftMiddle.svg} | 0 ...Pan.svg => Navigation_Mouse_ShiftMove.svg} | 0 ...h.svg => Navigation_Touchpad_AltTouch.svg} | 0 ...Touch.svg => Navigation_Touchpad_Left.svg} | 0 ...=> Navigation_Touchpad_ShiftCtrlTouch.svg} | 0 ...=> Navigation_Touchpad_ShiftLeftTouch.svg} | 0 ...svg => Navigation_Touchpad_ShiftTouch.svg} | 0 60 files changed, 103 insertions(+), 1071 deletions(-) delete mode 100644 src/Mod/Tux/Resources/icons/NavigationCAD_Pan.svg delete mode 100644 src/Mod/Tux/Resources/icons/NavigationCAD_Select.svg delete mode 100644 src/Mod/Tux/Resources/icons/NavigationCAD_Zoom.svg delete mode 100644 src/Mod/Tux/Resources/icons/NavigationGesture_Select.svg delete mode 100644 src/Mod/Tux/Resources/icons/NavigationGesture_Tilt.svg delete mode 100644 src/Mod/Tux/Resources/icons/NavigationGesture_Zoom.svg delete mode 100644 src/Mod/Tux/Resources/icons/NavigationMayaGesture_PanTouch.svg delete mode 100644 src/Mod/Tux/Resources/icons/NavigationMayaGesture_PanTouchAlt.svg delete mode 100644 src/Mod/Tux/Resources/icons/NavigationMayaGesture_Rotate.svg delete mode 100644 src/Mod/Tux/Resources/icons/NavigationMayaGesture_RotateTouch.svg delete mode 100644 src/Mod/Tux/Resources/icons/NavigationMayaGesture_Select.svg delete mode 100644 src/Mod/Tux/Resources/icons/NavigationMayaGesture_SelectTouch.svg delete mode 100644 src/Mod/Tux/Resources/icons/NavigationMayaGesture_TiltTouch.svg delete mode 100644 src/Mod/Tux/Resources/icons/NavigationMayaGesture_Zoom.svg delete mode 100644 src/Mod/Tux/Resources/icons/NavigationMayaGesture_ZoomTouch.svg delete mode 100644 src/Mod/Tux/Resources/icons/NavigationOpenCascade_PanAlt.svg delete mode 100644 src/Mod/Tux/Resources/icons/NavigationOpenCascade_Select.svg delete mode 100644 src/Mod/Tux/Resources/icons/NavigationOpenCascade_Zoom.svg delete mode 100644 src/Mod/Tux/Resources/icons/NavigationOpenInventor_Pan.svg delete mode 100644 src/Mod/Tux/Resources/icons/NavigationOpenInventor_Rotate.svg delete mode 100644 src/Mod/Tux/Resources/icons/NavigationOpenInventor_Zoom.svg delete mode 100644 src/Mod/Tux/Resources/icons/NavigationOpenInventor_ZoomAlt.svg delete mode 100644 src/Mod/Tux/Resources/icons/NavigationRevit_Pan.svg delete mode 100644 src/Mod/Tux/Resources/icons/NavigationRevit_Rotate.svg delete mode 100644 src/Mod/Tux/Resources/icons/NavigationTouchpad_RotateAlt.svg delete mode 100644 src/Mod/Tux/Resources/icons/NavigationTouchpad_Select.svg delete mode 100644 src/Mod/Tux/Resources/icons/NavigationTouchpad_Zoom.svg rename src/Mod/Tux/Resources/icons/{NavigationGesture_PanTouch.svg => Navigation_Gesture_PanTouch.svg} (100%) rename src/Mod/Tux/Resources/icons/{NavigationGesture_PanTouchAlt.svg => Navigation_Gesture_PanTouchAlt.svg} (100%) rename src/Mod/Tux/Resources/icons/{NavigationGesture_RotateTouch.svg => Navigation_Gesture_RotateTouch.svg} (100%) rename src/Mod/Tux/Resources/icons/{NavigationGesture_SelectTouch.svg => Navigation_Gesture_SelectTouch.svg} (100%) rename src/Mod/Tux/Resources/icons/{NavigationGesture_TiltTouch.svg => Navigation_Gesture_TiltTouch.svg} (100%) rename src/Mod/Tux/Resources/icons/{NavigationGesture_ZoomTouch.svg => Navigation_Gesture_ZoomTouch.svg} (100%) rename src/Mod/Tux/Resources/icons/{NavigationGesture_RotateAlt.svg => Navigation_Mouse_AltLeft.svg} (100%) rename src/Mod/Tux/Resources/icons/{NavigationMayaGesture_Tilt.svg => Navigation_Mouse_AltLeftRight.svg} (100%) rename src/Mod/Tux/Resources/icons/{NavigationMayaGesture_Pan.svg => Navigation_Mouse_AltMiddle.svg} (100%) rename src/Mod/Tux/Resources/icons/{NavigationTouchpad_Rotate.svg => Navigation_Mouse_AltMove.svg} (100%) rename src/Mod/Tux/Resources/icons/{NavigationMayaGesture_ZoomAlt.svg => Navigation_Mouse_AltRight.svg} (100%) rename src/Mod/Tux/Resources/icons/{NavigationOpenCascade_ZoomAlt.svg => Navigation_Mouse_CtrlLeft.svg} (100%) rename src/Mod/Tux/Resources/icons/{NavigationOpenCascade_Pan.svg => Navigation_Mouse_CtrlMiddle.svg} (100%) rename src/Mod/Tux/Resources/icons/{NavigationOpenCascade_Rotate.svg => Navigation_Mouse_CtrlRight.svg} (100%) rename src/Mod/Tux/Resources/icons/{NavigationBlender_Select.svg => Navigation_Mouse_Left.svg} (100%) rename src/Mod/Tux/Resources/icons/{NavigationGesture_Rotate.svg => Navigation_Mouse_LeftMove.svg} (100%) rename src/Mod/Tux/Resources/icons/{NavigationBlender_PanAlt.svg => Navigation_Mouse_LeftRight.svg} (100%) rename src/Mod/Tux/Resources/icons/{NavigationBlender_Rotate.svg => Navigation_Mouse_Middle.svg} (100%) rename src/Mod/Tux/Resources/icons/{NavigationCAD_Rotate.svg => Navigation_Mouse_MiddleLeft.svg} (100%) rename src/Mod/Tux/Resources/icons/{NavigationCAD_RotateAlt.svg => Navigation_Mouse_MiddleRight.svg} (100%) rename src/Mod/Tux/Resources/icons/{NavigationGesture_Pan.svg => Navigation_Mouse_Right.svg} (100%) rename src/Mod/Tux/Resources/icons/{NavigationBlender_Zoom.svg => Navigation_Mouse_Scroll.svg} (100%) rename src/Mod/Tux/Resources/icons/{NavigationTouchpad_ZoomAlt.svg => Navigation_Mouse_ShiftCtrlMove.svg} (100%) rename src/Mod/Tux/Resources/icons/{NavigationOpenInventor_Select.svg => Navigation_Mouse_ShiftLeft.svg} (100%) rename src/Mod/Tux/Resources/icons/{NavigationBlender_Pan.svg => Navigation_Mouse_ShiftMiddle.svg} (100%) rename src/Mod/Tux/Resources/icons/{NavigationTouchpad_Pan.svg => Navigation_Mouse_ShiftMove.svg} (100%) rename src/Mod/Tux/Resources/icons/{NavigationTouchpad_RotateTouch.svg => Navigation_Touchpad_AltTouch.svg} (100%) rename src/Mod/Tux/Resources/icons/{NavigationTouchpad_SelectTouch.svg => Navigation_Touchpad_Left.svg} (100%) rename src/Mod/Tux/Resources/icons/{NavigationTouchpad_ZoomTouch.svg => Navigation_Touchpad_ShiftCtrlTouch.svg} (100%) rename src/Mod/Tux/Resources/icons/{NavigationTouchpad_RotateTouchAlt.svg => Navigation_Touchpad_ShiftLeftTouch.svg} (100%) rename src/Mod/Tux/Resources/icons/{NavigationTouchpad_PanTouch.svg => Navigation_Touchpad_ShiftTouch.svg} (100%) diff --git a/src/Mod/Tux/NavigationIndicatorGui.py b/src/Mod/Tux/NavigationIndicatorGui.py index c05feb1ba2..ee65d5d84b 100644 --- a/src/Mod/Tux/NavigationIndicatorGui.py +++ b/src/Mod/Tux/NavigationIndicatorGui.py @@ -127,11 +127,11 @@ def retranslateUi(): + """ - - - - - + + + + + """ @@ -165,11 +165,11 @@ def retranslateUi(): + """ - - - - - + + + + + """ @@ -206,12 +206,12 @@ def retranslateUi(): + """ - - - - - - + + + + + + """ @@ -234,12 +234,12 @@ def retranslateUi(): + """ - - - - - - + + + + + +

""" @@ -281,12 +281,12 @@ def retranslateUi(): + """ - - - - - - + + + + + + """ @@ -309,12 +309,12 @@ def retranslateUi(): + """ - - - - - - + + + + + +

""" @@ -356,12 +356,12 @@ def retranslateUi(): + """ - - - - - - + + + + + + """ ) @@ -390,11 +390,11 @@ def retranslateUi(): + """ - - - - - + + + + + """ @@ -428,11 +428,11 @@ def retranslateUi(): + """ - - - - - + + + + + """ ) @@ -461,11 +461,11 @@ def retranslateUi(): + """ - - - - - + + + + + """ @@ -496,10 +496,10 @@ def retranslateUi(): + """ - - - - + + + + """ ) @@ -531,12 +531,12 @@ def retranslateUi(): + """ - - - - - - + + + + + + """ @@ -556,11 +556,11 @@ def retranslateUi(): + """ - - - - - + + + + +

""" diff --git a/src/Mod/Tux/Resources/Tux.qrc b/src/Mod/Tux/Resources/Tux.qrc index 483eedd537..ef0f7fd64b 100644 --- a/src/Mod/Tux/Resources/Tux.qrc +++ b/src/Mod/Tux/Resources/Tux.qrc @@ -1,93 +1,56 @@ - icons/NavigationBlender_PanAlt.svg - icons/NavigationBlender_Pan.svg - icons/NavigationBlender_Rotate.svg - icons/NavigationBlender_Select.svg + icons/Navigation_Gesture_PanTouch.svg + icons/Navigation_Gesture_PanTouchAlt.svg + icons/Navigation_Gesture_RotateTouch.svg + icons/Navigation_Gesture_SelectTouch.svg + icons/Navigation_Gesture_TiltTouch.svg + icons/Navigation_Gesture_ZoomTouch.svg + icons/Navigation_Mouse_AltLeft.svg + icons/Navigation_Mouse_AltLeftRight.svg + icons/Navigation_Mouse_AltMiddle.svg + icons/Navigation_Mouse_AltMove.svg + icons/Navigation_Mouse_AltRight.svg + icons/Navigation_Mouse_CtrlLeft.svg + icons/Navigation_Mouse_CtrlMiddle.svg + icons/Navigation_Mouse_CtrlRight.svg + icons/Navigation_Mouse_Left.svg + icons/Navigation_Mouse_LeftMove.svg + icons/Navigation_Mouse_LeftRight.svg + icons/Navigation_Mouse_Middle.svg + icons/Navigation_Mouse_MiddleLeft.svg + icons/Navigation_Mouse_MiddleRight.svg + icons/Navigation_Mouse_Right.svg + icons/Navigation_Mouse_Scroll.svg + icons/Navigation_Mouse_ShiftCtrlMove.svg + icons/Navigation_Mouse_ShiftLeft.svg + icons/Navigation_Mouse_ShiftMiddle.svg + icons/Navigation_Mouse_ShiftMove.svg + icons/Navigation_Touchpad_AltTouch.svg + icons/Navigation_Touchpad_Left.svg + icons/Navigation_Touchpad_ShiftCtrlTouch.svg + icons/Navigation_Touchpad_ShiftLeftTouch.svg + icons/Navigation_Touchpad_ShiftTouch.svg icons/NavigationBlender_light.svg icons/NavigationBlender_dark.svg - icons/NavigationBlender_Zoom.svg - icons/NavigationCADAlt.svg - icons/NavigationCAD_Pan.svg - icons/NavigationCAD_RotateAlt.svg - icons/NavigationCAD_Rotate.svg - icons/NavigationCAD_Select.svg icons/NavigationCAD_light.svg icons/NavigationCAD_dark.svg - icons/NavigationCAD_Zoom.svg - icons/NavigationGesture_Pan.svg - icons/NavigationGesture_PanTouchAlt.svg - icons/NavigationGesture_PanTouch.svg - icons/NavigationGesture_RotateAlt.svg - icons/NavigationGesture_Rotate.svg - icons/NavigationGesture_RotateTouch.svg - icons/NavigationGesture_Select.svg - icons/NavigationGesture_SelectTouch.svg icons/NavigationGesture_light.svg icons/NavigationGesture_dark.svg - icons/NavigationGesture_Tilt.svg - icons/NavigationGesture_TiltTouch.svg - icons/NavigationGesture_Zoom.svg - icons/NavigationGesture_ZoomTouch.svg - icons/NavigationMayaGesture_Pan.svg - icons/NavigationMayaGesture_PanTouchAlt.svg - icons/NavigationMayaGesture_PanTouch.svg - icons/NavigationMayaGesture_Rotate.svg - icons/NavigationMayaGesture_RotateTouch.svg - icons/NavigationMayaGesture_Select.svg - icons/NavigationMayaGesture_SelectTouch.svg icons/NavigationMayaGesture_light.svg icons/NavigationMayaGesture_dark.svg - icons/NavigationMayaGesture_Tilt.svg - icons/NavigationMayaGesture_TiltTouch.svg - icons/NavigationMayaGesture_ZoomAlt.svg - icons/NavigationMayaGesture_Zoom.svg - icons/NavigationMayaGesture_ZoomTouch.svg - icons/NavigationOpenCascade_PanAlt.svg - icons/NavigationOpenCascade_Pan.svg - icons/NavigationOpenCascade_Rotate.svg - icons/NavigationOpenCascade_Select.svg icons/NavigationOpenCascade_light.svg icons/NavigationOpenCascade_dark.svg - icons/NavigationOpenCascade_ZoomAlt.svg - icons/NavigationOpenCascade_Zoom.svg - icons/NavigationOpenInventor_Pan.svg - icons/NavigationOpenInventor_Rotate.svg - icons/NavigationOpenInventor_Select.svg icons/NavigationOpenInventor_light.svg icons/NavigationOpenInventor_dark.svg - icons/NavigationOpenInventor_ZoomAlt.svg - icons/NavigationOpenInventor_Zoom.svg icons/NavigationOpenSCAD_light.svg icons/NavigationOpenSCAD_dark.svg - icons/NavigationOpenCascade_Select.svg - icons/NavigationOpenCascade_PanAlt.svg - icons/NavigationOpenCascade_PanAlt.svg - icons/NavigationOpenCascade_Select.svg - icons/NavigationGesture_Pan.svg - icons/NavigationTinkerCAD_light.svg - icons/NavigationTinkerCAD_dark.svg - icons/NavigationOpenCascade_Select.svg - icons/NavigationOpenCascade_Zoom.svg - icons/NavigationGesture_Pan.svg - icons/NavigationOpenCascade_PanAlt.svg - icons/NavigationRevit_Pan.svg - icons/NavigationRevit_Rotate.svg icons/NavigationRevit_light.svg icons/NavigationRevit_dark.svg - icons/NavigationTouchpad_Pan.svg - icons/NavigationTouchpad_PanTouch.svg - icons/NavigationTouchpad_RotateAlt.svg - icons/NavigationTouchpad_Rotate.svg - icons/NavigationTouchpad_RotateTouchAlt.svg - icons/NavigationTouchpad_RotateTouch.svg - icons/NavigationTouchpad_Select.svg - icons/NavigationTouchpad_SelectTouch.svg + icons/NavigationTinkerCAD_light.svg + icons/NavigationTinkerCAD_dark.svg icons/NavigationTouchpad_light.svg icons/NavigationTouchpad_dark.svg - icons/NavigationTouchpad_ZoomAlt.svg - icons/NavigationTouchpad_Zoom.svg - icons/NavigationTouchpad_ZoomTouch.svg icons/NavigationUndefined.svg translations/Tux_af.qm translations/Tux_zh-CN.qm diff --git a/src/Mod/Tux/Resources/icons/NavigationCAD_Pan.svg b/src/Mod/Tux/Resources/icons/NavigationCAD_Pan.svg deleted file mode 100644 index 130b13f3a7..0000000000 --- a/src/Mod/Tux/Resources/icons/NavigationCAD_Pan.svg +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - diff --git a/src/Mod/Tux/Resources/icons/NavigationCAD_Select.svg b/src/Mod/Tux/Resources/icons/NavigationCAD_Select.svg deleted file mode 100644 index 6a32671d65..0000000000 --- a/src/Mod/Tux/Resources/icons/NavigationCAD_Select.svg +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Mod/Tux/Resources/icons/NavigationCAD_Zoom.svg b/src/Mod/Tux/Resources/icons/NavigationCAD_Zoom.svg deleted file mode 100644 index dce1106185..0000000000 --- a/src/Mod/Tux/Resources/icons/NavigationCAD_Zoom.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Mod/Tux/Resources/icons/NavigationGesture_Select.svg b/src/Mod/Tux/Resources/icons/NavigationGesture_Select.svg deleted file mode 100644 index 6a32671d65..0000000000 --- a/src/Mod/Tux/Resources/icons/NavigationGesture_Select.svg +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Mod/Tux/Resources/icons/NavigationGesture_Tilt.svg b/src/Mod/Tux/Resources/icons/NavigationGesture_Tilt.svg deleted file mode 100644 index b4ee814eaa..0000000000 --- a/src/Mod/Tux/Resources/icons/NavigationGesture_Tilt.svg +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Mod/Tux/Resources/icons/NavigationGesture_Zoom.svg b/src/Mod/Tux/Resources/icons/NavigationGesture_Zoom.svg deleted file mode 100644 index dce1106185..0000000000 --- a/src/Mod/Tux/Resources/icons/NavigationGesture_Zoom.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Mod/Tux/Resources/icons/NavigationMayaGesture_PanTouch.svg b/src/Mod/Tux/Resources/icons/NavigationMayaGesture_PanTouch.svg deleted file mode 100644 index 3e35f4bae7..0000000000 --- a/src/Mod/Tux/Resources/icons/NavigationMayaGesture_PanTouch.svg +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Mod/Tux/Resources/icons/NavigationMayaGesture_PanTouchAlt.svg b/src/Mod/Tux/Resources/icons/NavigationMayaGesture_PanTouchAlt.svg deleted file mode 100644 index 0f8e0dbfef..0000000000 --- a/src/Mod/Tux/Resources/icons/NavigationMayaGesture_PanTouchAlt.svg +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Mod/Tux/Resources/icons/NavigationMayaGesture_Rotate.svg b/src/Mod/Tux/Resources/icons/NavigationMayaGesture_Rotate.svg deleted file mode 100644 index 00395106ef..0000000000 --- a/src/Mod/Tux/Resources/icons/NavigationMayaGesture_Rotate.svg +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Mod/Tux/Resources/icons/NavigationMayaGesture_RotateTouch.svg b/src/Mod/Tux/Resources/icons/NavigationMayaGesture_RotateTouch.svg deleted file mode 100644 index b5048a4d11..0000000000 --- a/src/Mod/Tux/Resources/icons/NavigationMayaGesture_RotateTouch.svg +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Mod/Tux/Resources/icons/NavigationMayaGesture_Select.svg b/src/Mod/Tux/Resources/icons/NavigationMayaGesture_Select.svg deleted file mode 100644 index 6a32671d65..0000000000 --- a/src/Mod/Tux/Resources/icons/NavigationMayaGesture_Select.svg +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Mod/Tux/Resources/icons/NavigationMayaGesture_SelectTouch.svg b/src/Mod/Tux/Resources/icons/NavigationMayaGesture_SelectTouch.svg deleted file mode 100644 index ede1fb9a79..0000000000 --- a/src/Mod/Tux/Resources/icons/NavigationMayaGesture_SelectTouch.svg +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - diff --git a/src/Mod/Tux/Resources/icons/NavigationMayaGesture_TiltTouch.svg b/src/Mod/Tux/Resources/icons/NavigationMayaGesture_TiltTouch.svg deleted file mode 100644 index a4f4eb1d8a..0000000000 --- a/src/Mod/Tux/Resources/icons/NavigationMayaGesture_TiltTouch.svg +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Mod/Tux/Resources/icons/NavigationMayaGesture_Zoom.svg b/src/Mod/Tux/Resources/icons/NavigationMayaGesture_Zoom.svg deleted file mode 100644 index dce1106185..0000000000 --- a/src/Mod/Tux/Resources/icons/NavigationMayaGesture_Zoom.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Mod/Tux/Resources/icons/NavigationMayaGesture_ZoomTouch.svg b/src/Mod/Tux/Resources/icons/NavigationMayaGesture_ZoomTouch.svg deleted file mode 100644 index dd8de80e4a..0000000000 --- a/src/Mod/Tux/Resources/icons/NavigationMayaGesture_ZoomTouch.svg +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Mod/Tux/Resources/icons/NavigationOpenCascade_PanAlt.svg b/src/Mod/Tux/Resources/icons/NavigationOpenCascade_PanAlt.svg deleted file mode 100644 index 130b13f3a7..0000000000 --- a/src/Mod/Tux/Resources/icons/NavigationOpenCascade_PanAlt.svg +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - diff --git a/src/Mod/Tux/Resources/icons/NavigationOpenCascade_Select.svg b/src/Mod/Tux/Resources/icons/NavigationOpenCascade_Select.svg deleted file mode 100644 index 6a32671d65..0000000000 --- a/src/Mod/Tux/Resources/icons/NavigationOpenCascade_Select.svg +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Mod/Tux/Resources/icons/NavigationOpenCascade_Zoom.svg b/src/Mod/Tux/Resources/icons/NavigationOpenCascade_Zoom.svg deleted file mode 100644 index dce1106185..0000000000 --- a/src/Mod/Tux/Resources/icons/NavigationOpenCascade_Zoom.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Mod/Tux/Resources/icons/NavigationOpenInventor_Pan.svg b/src/Mod/Tux/Resources/icons/NavigationOpenInventor_Pan.svg deleted file mode 100644 index 130b13f3a7..0000000000 --- a/src/Mod/Tux/Resources/icons/NavigationOpenInventor_Pan.svg +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - diff --git a/src/Mod/Tux/Resources/icons/NavigationOpenInventor_Rotate.svg b/src/Mod/Tux/Resources/icons/NavigationOpenInventor_Rotate.svg deleted file mode 100644 index 6a32671d65..0000000000 --- a/src/Mod/Tux/Resources/icons/NavigationOpenInventor_Rotate.svg +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Mod/Tux/Resources/icons/NavigationOpenInventor_Zoom.svg b/src/Mod/Tux/Resources/icons/NavigationOpenInventor_Zoom.svg deleted file mode 100644 index dce1106185..0000000000 --- a/src/Mod/Tux/Resources/icons/NavigationOpenInventor_Zoom.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Mod/Tux/Resources/icons/NavigationOpenInventor_ZoomAlt.svg b/src/Mod/Tux/Resources/icons/NavigationOpenInventor_ZoomAlt.svg deleted file mode 100644 index eafe26fb53..0000000000 --- a/src/Mod/Tux/Resources/icons/NavigationOpenInventor_ZoomAlt.svg +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Mod/Tux/Resources/icons/NavigationRevit_Pan.svg b/src/Mod/Tux/Resources/icons/NavigationRevit_Pan.svg deleted file mode 100644 index 130b13f3a7..0000000000 --- a/src/Mod/Tux/Resources/icons/NavigationRevit_Pan.svg +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - diff --git a/src/Mod/Tux/Resources/icons/NavigationRevit_Rotate.svg b/src/Mod/Tux/Resources/icons/NavigationRevit_Rotate.svg deleted file mode 100644 index 7aac19319c..0000000000 --- a/src/Mod/Tux/Resources/icons/NavigationRevit_Rotate.svg +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Mod/Tux/Resources/icons/NavigationTouchpad_RotateAlt.svg b/src/Mod/Tux/Resources/icons/NavigationTouchpad_RotateAlt.svg deleted file mode 100644 index d2e508350c..0000000000 --- a/src/Mod/Tux/Resources/icons/NavigationTouchpad_RotateAlt.svg +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Mod/Tux/Resources/icons/NavigationTouchpad_Select.svg b/src/Mod/Tux/Resources/icons/NavigationTouchpad_Select.svg deleted file mode 100644 index 6a32671d65..0000000000 --- a/src/Mod/Tux/Resources/icons/NavigationTouchpad_Select.svg +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Mod/Tux/Resources/icons/NavigationTouchpad_Zoom.svg b/src/Mod/Tux/Resources/icons/NavigationTouchpad_Zoom.svg deleted file mode 100644 index dce1106185..0000000000 --- a/src/Mod/Tux/Resources/icons/NavigationTouchpad_Zoom.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Mod/Tux/Resources/icons/NavigationGesture_PanTouch.svg b/src/Mod/Tux/Resources/icons/Navigation_Gesture_PanTouch.svg similarity index 100% rename from src/Mod/Tux/Resources/icons/NavigationGesture_PanTouch.svg rename to src/Mod/Tux/Resources/icons/Navigation_Gesture_PanTouch.svg diff --git a/src/Mod/Tux/Resources/icons/NavigationGesture_PanTouchAlt.svg b/src/Mod/Tux/Resources/icons/Navigation_Gesture_PanTouchAlt.svg similarity index 100% rename from src/Mod/Tux/Resources/icons/NavigationGesture_PanTouchAlt.svg rename to src/Mod/Tux/Resources/icons/Navigation_Gesture_PanTouchAlt.svg diff --git a/src/Mod/Tux/Resources/icons/NavigationGesture_RotateTouch.svg b/src/Mod/Tux/Resources/icons/Navigation_Gesture_RotateTouch.svg similarity index 100% rename from src/Mod/Tux/Resources/icons/NavigationGesture_RotateTouch.svg rename to src/Mod/Tux/Resources/icons/Navigation_Gesture_RotateTouch.svg diff --git a/src/Mod/Tux/Resources/icons/NavigationGesture_SelectTouch.svg b/src/Mod/Tux/Resources/icons/Navigation_Gesture_SelectTouch.svg similarity index 100% rename from src/Mod/Tux/Resources/icons/NavigationGesture_SelectTouch.svg rename to src/Mod/Tux/Resources/icons/Navigation_Gesture_SelectTouch.svg diff --git a/src/Mod/Tux/Resources/icons/NavigationGesture_TiltTouch.svg b/src/Mod/Tux/Resources/icons/Navigation_Gesture_TiltTouch.svg similarity index 100% rename from src/Mod/Tux/Resources/icons/NavigationGesture_TiltTouch.svg rename to src/Mod/Tux/Resources/icons/Navigation_Gesture_TiltTouch.svg diff --git a/src/Mod/Tux/Resources/icons/NavigationGesture_ZoomTouch.svg b/src/Mod/Tux/Resources/icons/Navigation_Gesture_ZoomTouch.svg similarity index 100% rename from src/Mod/Tux/Resources/icons/NavigationGesture_ZoomTouch.svg rename to src/Mod/Tux/Resources/icons/Navigation_Gesture_ZoomTouch.svg diff --git a/src/Mod/Tux/Resources/icons/NavigationGesture_RotateAlt.svg b/src/Mod/Tux/Resources/icons/Navigation_Mouse_AltLeft.svg similarity index 100% rename from src/Mod/Tux/Resources/icons/NavigationGesture_RotateAlt.svg rename to src/Mod/Tux/Resources/icons/Navigation_Mouse_AltLeft.svg diff --git a/src/Mod/Tux/Resources/icons/NavigationMayaGesture_Tilt.svg b/src/Mod/Tux/Resources/icons/Navigation_Mouse_AltLeftRight.svg similarity index 100% rename from src/Mod/Tux/Resources/icons/NavigationMayaGesture_Tilt.svg rename to src/Mod/Tux/Resources/icons/Navigation_Mouse_AltLeftRight.svg diff --git a/src/Mod/Tux/Resources/icons/NavigationMayaGesture_Pan.svg b/src/Mod/Tux/Resources/icons/Navigation_Mouse_AltMiddle.svg similarity index 100% rename from src/Mod/Tux/Resources/icons/NavigationMayaGesture_Pan.svg rename to src/Mod/Tux/Resources/icons/Navigation_Mouse_AltMiddle.svg diff --git a/src/Mod/Tux/Resources/icons/NavigationTouchpad_Rotate.svg b/src/Mod/Tux/Resources/icons/Navigation_Mouse_AltMove.svg similarity index 100% rename from src/Mod/Tux/Resources/icons/NavigationTouchpad_Rotate.svg rename to src/Mod/Tux/Resources/icons/Navigation_Mouse_AltMove.svg diff --git a/src/Mod/Tux/Resources/icons/NavigationMayaGesture_ZoomAlt.svg b/src/Mod/Tux/Resources/icons/Navigation_Mouse_AltRight.svg similarity index 100% rename from src/Mod/Tux/Resources/icons/NavigationMayaGesture_ZoomAlt.svg rename to src/Mod/Tux/Resources/icons/Navigation_Mouse_AltRight.svg diff --git a/src/Mod/Tux/Resources/icons/NavigationOpenCascade_ZoomAlt.svg b/src/Mod/Tux/Resources/icons/Navigation_Mouse_CtrlLeft.svg similarity index 100% rename from src/Mod/Tux/Resources/icons/NavigationOpenCascade_ZoomAlt.svg rename to src/Mod/Tux/Resources/icons/Navigation_Mouse_CtrlLeft.svg diff --git a/src/Mod/Tux/Resources/icons/NavigationOpenCascade_Pan.svg b/src/Mod/Tux/Resources/icons/Navigation_Mouse_CtrlMiddle.svg similarity index 100% rename from src/Mod/Tux/Resources/icons/NavigationOpenCascade_Pan.svg rename to src/Mod/Tux/Resources/icons/Navigation_Mouse_CtrlMiddle.svg diff --git a/src/Mod/Tux/Resources/icons/NavigationOpenCascade_Rotate.svg b/src/Mod/Tux/Resources/icons/Navigation_Mouse_CtrlRight.svg similarity index 100% rename from src/Mod/Tux/Resources/icons/NavigationOpenCascade_Rotate.svg rename to src/Mod/Tux/Resources/icons/Navigation_Mouse_CtrlRight.svg diff --git a/src/Mod/Tux/Resources/icons/NavigationBlender_Select.svg b/src/Mod/Tux/Resources/icons/Navigation_Mouse_Left.svg similarity index 100% rename from src/Mod/Tux/Resources/icons/NavigationBlender_Select.svg rename to src/Mod/Tux/Resources/icons/Navigation_Mouse_Left.svg diff --git a/src/Mod/Tux/Resources/icons/NavigationGesture_Rotate.svg b/src/Mod/Tux/Resources/icons/Navigation_Mouse_LeftMove.svg similarity index 100% rename from src/Mod/Tux/Resources/icons/NavigationGesture_Rotate.svg rename to src/Mod/Tux/Resources/icons/Navigation_Mouse_LeftMove.svg diff --git a/src/Mod/Tux/Resources/icons/NavigationBlender_PanAlt.svg b/src/Mod/Tux/Resources/icons/Navigation_Mouse_LeftRight.svg similarity index 100% rename from src/Mod/Tux/Resources/icons/NavigationBlender_PanAlt.svg rename to src/Mod/Tux/Resources/icons/Navigation_Mouse_LeftRight.svg diff --git a/src/Mod/Tux/Resources/icons/NavigationBlender_Rotate.svg b/src/Mod/Tux/Resources/icons/Navigation_Mouse_Middle.svg similarity index 100% rename from src/Mod/Tux/Resources/icons/NavigationBlender_Rotate.svg rename to src/Mod/Tux/Resources/icons/Navigation_Mouse_Middle.svg diff --git a/src/Mod/Tux/Resources/icons/NavigationCAD_Rotate.svg b/src/Mod/Tux/Resources/icons/Navigation_Mouse_MiddleLeft.svg similarity index 100% rename from src/Mod/Tux/Resources/icons/NavigationCAD_Rotate.svg rename to src/Mod/Tux/Resources/icons/Navigation_Mouse_MiddleLeft.svg diff --git a/src/Mod/Tux/Resources/icons/NavigationCAD_RotateAlt.svg b/src/Mod/Tux/Resources/icons/Navigation_Mouse_MiddleRight.svg similarity index 100% rename from src/Mod/Tux/Resources/icons/NavigationCAD_RotateAlt.svg rename to src/Mod/Tux/Resources/icons/Navigation_Mouse_MiddleRight.svg diff --git a/src/Mod/Tux/Resources/icons/NavigationGesture_Pan.svg b/src/Mod/Tux/Resources/icons/Navigation_Mouse_Right.svg similarity index 100% rename from src/Mod/Tux/Resources/icons/NavigationGesture_Pan.svg rename to src/Mod/Tux/Resources/icons/Navigation_Mouse_Right.svg diff --git a/src/Mod/Tux/Resources/icons/NavigationBlender_Zoom.svg b/src/Mod/Tux/Resources/icons/Navigation_Mouse_Scroll.svg similarity index 100% rename from src/Mod/Tux/Resources/icons/NavigationBlender_Zoom.svg rename to src/Mod/Tux/Resources/icons/Navigation_Mouse_Scroll.svg diff --git a/src/Mod/Tux/Resources/icons/NavigationTouchpad_ZoomAlt.svg b/src/Mod/Tux/Resources/icons/Navigation_Mouse_ShiftCtrlMove.svg similarity index 100% rename from src/Mod/Tux/Resources/icons/NavigationTouchpad_ZoomAlt.svg rename to src/Mod/Tux/Resources/icons/Navigation_Mouse_ShiftCtrlMove.svg diff --git a/src/Mod/Tux/Resources/icons/NavigationOpenInventor_Select.svg b/src/Mod/Tux/Resources/icons/Navigation_Mouse_ShiftLeft.svg similarity index 100% rename from src/Mod/Tux/Resources/icons/NavigationOpenInventor_Select.svg rename to src/Mod/Tux/Resources/icons/Navigation_Mouse_ShiftLeft.svg diff --git a/src/Mod/Tux/Resources/icons/NavigationBlender_Pan.svg b/src/Mod/Tux/Resources/icons/Navigation_Mouse_ShiftMiddle.svg similarity index 100% rename from src/Mod/Tux/Resources/icons/NavigationBlender_Pan.svg rename to src/Mod/Tux/Resources/icons/Navigation_Mouse_ShiftMiddle.svg diff --git a/src/Mod/Tux/Resources/icons/NavigationTouchpad_Pan.svg b/src/Mod/Tux/Resources/icons/Navigation_Mouse_ShiftMove.svg similarity index 100% rename from src/Mod/Tux/Resources/icons/NavigationTouchpad_Pan.svg rename to src/Mod/Tux/Resources/icons/Navigation_Mouse_ShiftMove.svg diff --git a/src/Mod/Tux/Resources/icons/NavigationTouchpad_RotateTouch.svg b/src/Mod/Tux/Resources/icons/Navigation_Touchpad_AltTouch.svg similarity index 100% rename from src/Mod/Tux/Resources/icons/NavigationTouchpad_RotateTouch.svg rename to src/Mod/Tux/Resources/icons/Navigation_Touchpad_AltTouch.svg diff --git a/src/Mod/Tux/Resources/icons/NavigationTouchpad_SelectTouch.svg b/src/Mod/Tux/Resources/icons/Navigation_Touchpad_Left.svg similarity index 100% rename from src/Mod/Tux/Resources/icons/NavigationTouchpad_SelectTouch.svg rename to src/Mod/Tux/Resources/icons/Navigation_Touchpad_Left.svg diff --git a/src/Mod/Tux/Resources/icons/NavigationTouchpad_ZoomTouch.svg b/src/Mod/Tux/Resources/icons/Navigation_Touchpad_ShiftCtrlTouch.svg similarity index 100% rename from src/Mod/Tux/Resources/icons/NavigationTouchpad_ZoomTouch.svg rename to src/Mod/Tux/Resources/icons/Navigation_Touchpad_ShiftCtrlTouch.svg diff --git a/src/Mod/Tux/Resources/icons/NavigationTouchpad_RotateTouchAlt.svg b/src/Mod/Tux/Resources/icons/Navigation_Touchpad_ShiftLeftTouch.svg similarity index 100% rename from src/Mod/Tux/Resources/icons/NavigationTouchpad_RotateTouchAlt.svg rename to src/Mod/Tux/Resources/icons/Navigation_Touchpad_ShiftLeftTouch.svg diff --git a/src/Mod/Tux/Resources/icons/NavigationTouchpad_PanTouch.svg b/src/Mod/Tux/Resources/icons/Navigation_Touchpad_ShiftTouch.svg similarity index 100% rename from src/Mod/Tux/Resources/icons/NavigationTouchpad_PanTouch.svg rename to src/Mod/Tux/Resources/icons/Navigation_Touchpad_ShiftTouch.svg From 3ef2e8b7006c2f879d7b76af8866adc6682efaed Mon Sep 17 00:00:00 2001 From: Rexbas Date: Sun, 28 Jan 2024 16:39:26 +0100 Subject: [PATCH 2/2] Tux: Add missing OpenSCAD rotate tooltip --- src/Mod/Tux/NavigationIndicatorGui.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Mod/Tux/NavigationIndicatorGui.py b/src/Mod/Tux/NavigationIndicatorGui.py index ee65d5d84b..f7c97ec5a8 100644 --- a/src/Mod/Tux/NavigationIndicatorGui.py +++ b/src/Mod/Tux/NavigationIndicatorGui.py @@ -423,15 +423,19 @@ def retranslateUi(): """ + text03 + """ + """ + + text03 + + """ """ + text04 + """ - + + """