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

fix inconsistency between context-menu and default edit mode PD primitives

Browse Source
This commit is contained in:
wmayer
2017-09-12 19:49:07 +02:00
parent eaf04d5bfd
commit dc13d85d37
4 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Mod/PartDesign/Gui/ViewProviderDressUp.cpp
View File

@@ -46,8 +46,7 @@ PROPERTY_SOURCE(PartDesignGui::ViewProviderDressUp,PartDesignGui::ViewProvider)
void ViewProviderDressUp::setupContextMenu(QMenu* menu, QObject* receiver, const char* member)
{
QAction* act;
// TODO check if this gets a sane translation (2015-07-26, Fat-Zer)
act = menu->addAction(QObject::tr((std::string("Edit ") + featureName() + " feature").c_str()), receiver, member);
act = menu->addAction(QObject::tr("Edit %1").arg(QString::fromStdString(featureName())), receiver, member);
act->setData(QVariant((int)ViewProvider::Default));
}

9
src/Mod/PartDesign/Gui/ViewProviderPrimitive.cpp
View File

@@ -24,6 +24,8 @@
#include "PreCompiled.h"
#ifndef _PreComp_
# include <QAction>
# include <QMenu>
# include <QMessageBox>
#endif
@@ -68,6 +70,13 @@ void ViewProviderPrimitive::attach(App::DocumentObject* obj) {
ViewProviderAddSub::attach(obj);
}
void ViewProviderPrimitive::setupContextMenu(QMenu* menu, QObject* receiver, const char* member)
{
QAction* act;
act = menu->addAction(QObject::tr("Edit primitive"), receiver, member);
act->setData(QVariant((int)ViewProvider::Default));
}
bool ViewProviderPrimitive::setEdit(int ModNum)
{
if (ModNum == ViewProvider::Default ) {

1
src/Mod/PartDesign/Gui/ViewProviderPrimitive.h
View File

@@ -45,6 +45,7 @@ public:
protected:
virtual QIcon getIcon(void) const;
virtual void setupContextMenu(QMenu* menu, QObject* receiver, const char* member);
virtual bool setEdit(int ModNum);
virtual void unsetEdit(int ModNum);

2
src/Mod/PartDesign/Gui/ViewProviderTransformed.cpp
View File

@@ -65,7 +65,7 @@ PROPERTY_SOURCE(PartDesignGui::ViewProviderTransformed,PartDesignGui::ViewProvid
void ViewProviderTransformed::setupContextMenu(QMenu* menu, QObject* receiver, const char* member)
{
QAction* act;
act = menu->addAction(QObject::tr((std::string("Edit ") + featureName + " feature").c_str()), receiver, member);
act = menu->addAction(QObject::tr("Edit %1").arg(QString::fromStdString(featureName)), receiver, member);
act->setData(QVariant((int)ViewProvider::Default));
}