kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

[Gui] add context menu icon for Std_TransformManip

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

- also sort the includes
This commit is contained in:
Uwe
2022-02-17 03:49:02 +01:00
parent c31cd6abb2
commit 732d8c3a21
2 changed files with 31 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/Gui/ViewProviderDragger.cpp
View File

@@ -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);
}

30
src/Gui/ViewProviderLink.cpp
View File

@@ -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));
}