From 732d8c3a21e7af9d32b06f7f2e7e558dcbd7fb28 Mon Sep 17 00:00:00 2001
From: Uwe <donovaly@users.noreply.github.com>
Date: Thu, 17 Feb 2022 03:49:02 +0100
Subject: [PATCH] [Gui] add context menu icon for Std_TransformManip

- the other context menu entries have icons and we use this icon already in the Edit menu

- also sort the includes
---
 src/Gui/ViewProviderDragger.cpp | 28 ++++++++++++++--------------
 src/Gui/ViewProviderLink.cpp    | 30 +++++++++++++++++-------------
 2 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/src/Gui/ViewProviderDragger.cpp b/src/Gui/ViewProviderDragger.cpp
index 8c5229a2c2..ae97552ffa 100644
--- a/src/Gui/ViewProviderDragger.cpp
+++ b/src/Gui/ViewProviderDragger.cpp
@@ -44,27 +44,26 @@
 # include <Inventor/actions/SoRayPickAction.h>
 #endif
 
-/// Here the FreeCAD includes sorted by Base,App,Gui......
-#include "ViewProviderDragger.h"
-#include "View3DInventorViewer.h"
-#include "Application.h"
-#include "Document.h"
-#include "Window.h"
-
-#include <Base/Console.h>
-#include <Base/Placement.h>
 #include <App/PropertyGeo.h>
 #include <App/GeoFeature.h>
+#include <Base/Console.h>
+#include <Base/Placement.h>
+#include <boost/math/special_functions/fpclassify.hpp>
+#include <Gui/BitmapFactory.h>
 #include <Inventor/draggers/SoCenterballDragger.h>
-#include <Inventor/nodes/SoResetTransform.h>
 #if (COIN_MAJOR_VERSION > 2)
 #include <Inventor/nodes/SoDepthBuffer.h>
 #endif
-#include "SoFCUnifiedSelection.h"
-#include "SoFCCSysDragger.h"
+#include <Inventor/nodes/SoResetTransform.h>
+#include "Application.h"
 #include "Control.h"
+#include "Document.h"
+#include "SoFCCSysDragger.h"
+#include "SoFCUnifiedSelection.h"
 #include "TaskCSysDragger.h"
-#include <boost/math/special_functions/fpclassify.hpp>
+#include "View3DInventorViewer.h"
+#include "ViewProviderDragger.h"
+#include "Window.h"
 
 using namespace Gui;
 
@@ -105,7 +104,8 @@ bool ViewProviderDragger::doubleClicked(void)
 
 void ViewProviderDragger::setupContextMenu(QMenu* menu, QObject* receiver, const char* member)
 {
-    QAction* act = menu->addAction(QObject::tr("Transform"), receiver, member);
+    QIcon iconObject = mergeGreyableOverlayIcons(Gui::BitmapFactory().pixmap("Std_TransformManip.svg"));
+    QAction* act = menu->addAction(iconObject, QObject::tr("Transform"), receiver, member);
     act->setData(QVariant((int)ViewProvider::Transform));
     ViewProviderDocumentObject::setupContextMenu(menu, receiver, member);
 }
diff --git a/src/Gui/ViewProviderLink.cpp b/src/Gui/ViewProviderLink.cpp
index 4a2701c538..94752980db 100644
--- a/src/Gui/ViewProviderLink.cpp
+++ b/src/Gui/ViewProviderLink.cpp
@@ -48,30 +48,33 @@
 #include <QMenu>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost_bind_bind.hpp>
+#include <Base/BoundBoxPy.h>
 #include <Base/Console.h>
 #include <Base/PlacementPy.h>
 #include <Base/MatrixPy.h>
-#include <Base/BoundBoxPy.h>
 #include <Base/Tools.h>
 #include <App/ComplexGeoData.h>
 #include <App/GeoFeature.h>
+#include <Gui/BitmapFactory.h>
+
+#include "ViewProviderLink.h"
 #include "Application.h"
 #include "BitmapFactory.h"
-#include "Document.h"
-#include "Selection.h"
-#include "MainWindow.h"
-#include "ViewProviderLink.h"
-#include "ViewProviderLinkPy.h"
-#include "LinkViewPy.h"
-#include "ViewProviderGeometryObject.h"
-#include "ViewProviderGroupExtension.h"
-#include "View3DInventor.h"
-#include "SoFCUnifiedSelection.h"
-#include "SoFCCSysDragger.h"
 #include "Control.h"
+#include "Document.h"
+#include "LinkViewPy.h"
+#include "MainWindow.h"
+#include "Selection.h"
+#include "SoFCCSysDragger.h"
+#include "SoFCUnifiedSelection.h"
 #include "TaskCSysDragger.h"
 #include "TaskElementColors.h"
+#include "View3DInventor.h"
 #include "ViewParams.h"
+#include "ViewProviderLinkPy.h"
+#include "ViewProviderGeometryObject.h"
+#include "ViewProviderGroupExtension.h"
+
 
 FC_LOG_LEVEL_INIT("App::Link",true,true)
 
@@ -2342,7 +2345,8 @@ void ViewProviderLink::setupContextMenu(QMenu* menu, QObject* receiver, const ch
     if(linkEdit(ext)) {
         linkView->getLinkedView()->setupContextMenu(menu,receiver,member);
     } else if(ext->getPlacementProperty() || ext->getLinkPlacementProperty()) {
-        QAction* act = menu->addAction(QObject::tr("Transform"), receiver, member);
+        QIcon iconObject = mergeGreyableOverlayIcons(Gui::BitmapFactory().pixmap("Std_TransformManip.svg"));
+        QAction* act = menu->addAction(iconObject, QObject::tr("Transform"), receiver, member);
         act->setData(QVariant((int)ViewProvider::Transform));
     }