From f3d385eceda49f02ae4eb760148c2a48dc6e17f3 Mon Sep 17 00:00:00 2001 From: wmayer Date: Mon, 24 Apr 2023 14:04:04 +0200 Subject: [PATCH] PD: fix translation of context-menu item of transform features --- src/Mod/PartDesign/Gui/ViewProviderLinearPattern.cpp | 6 ++++++ src/Mod/PartDesign/Gui/ViewProviderLinearPattern.h | 1 + src/Mod/PartDesign/Gui/ViewProviderMirrored.cpp | 6 ++++++ src/Mod/PartDesign/Gui/ViewProviderMirrored.h | 1 + src/Mod/PartDesign/Gui/ViewProviderMultiTransform.cpp | 2 +- src/Mod/PartDesign/Gui/ViewProviderPolarPattern.cpp | 6 ++++++ src/Mod/PartDesign/Gui/ViewProviderPolarPattern.h | 1 + src/Mod/PartDesign/Gui/ViewProviderScaled.cpp | 6 ++++++ src/Mod/PartDesign/Gui/ViewProviderScaled.h | 1 + src/Mod/PartDesign/Gui/ViewProviderTransformed.cpp | 5 ++--- 10 files changed, 31 insertions(+), 4 deletions(-) diff --git a/src/Mod/PartDesign/Gui/ViewProviderLinearPattern.cpp b/src/Mod/PartDesign/Gui/ViewProviderLinearPattern.cpp index 88a24dbef4..541eeda74c 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderLinearPattern.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderLinearPattern.cpp @@ -34,6 +34,12 @@ TaskDlgFeatureParameters *ViewProviderLinearPattern::getEditDialog() { return new TaskDlgLinearPatternParameters (this); } +void ViewProviderLinearPattern::setupContextMenu(QMenu* menu, QObject* receiver, const char* member) +{ + addDefaultAction(menu, QObject::tr("Edit linear pattern")); + PartDesignGui::ViewProvider::setupContextMenu(menu, receiver, member); +} + const std::string & ViewProviderLinearPattern::featureName() const { static const std::string name = "LinearPattern"; diff --git a/src/Mod/PartDesign/Gui/ViewProviderLinearPattern.h b/src/Mod/PartDesign/Gui/ViewProviderLinearPattern.h index e18b4298b1..96ad862036 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderLinearPattern.h +++ b/src/Mod/PartDesign/Gui/ViewProviderLinearPattern.h @@ -38,6 +38,7 @@ public: sPixmap = "PartDesign_LinearPattern.svg"; } const std::string & featureName() const override; + void setupContextMenu(QMenu*, QObject*, const char*) override; protected: /// Returns a newly create dialog for the part to be placed in the task view diff --git a/src/Mod/PartDesign/Gui/ViewProviderMirrored.cpp b/src/Mod/PartDesign/Gui/ViewProviderMirrored.cpp index 64a53b98a0..26b2858bb8 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderMirrored.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderMirrored.cpp @@ -34,6 +34,12 @@ TaskDlgFeatureParameters *ViewProviderMirrored::getEditDialog() { return new TaskDlgMirroredParameters (this); } +void ViewProviderMirrored::setupContextMenu(QMenu* menu, QObject* receiver, const char* member) +{ + addDefaultAction(menu, QObject::tr("Edit mirrored")); + PartDesignGui::ViewProvider::setupContextMenu(menu, receiver, member); +} + const std::string & ViewProviderMirrored::featureName() const { static const std::string name = "Mirrored"; diff --git a/src/Mod/PartDesign/Gui/ViewProviderMirrored.h b/src/Mod/PartDesign/Gui/ViewProviderMirrored.h index cccd45e370..cb6dd6a075 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderMirrored.h +++ b/src/Mod/PartDesign/Gui/ViewProviderMirrored.h @@ -39,6 +39,7 @@ public: } const std::string & featureName() const override; + void setupContextMenu(QMenu*, QObject*, const char*) override; protected: /// Returns a newly create dialog for the part to be placed in the task view diff --git a/src/Mod/PartDesign/Gui/ViewProviderMultiTransform.cpp b/src/Mod/PartDesign/Gui/ViewProviderMultiTransform.cpp index 6a9ffaa559..fd0fe67370 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderMultiTransform.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderMultiTransform.cpp @@ -45,7 +45,7 @@ const std::string & ViewProviderMultiTransform::featureName() const void ViewProviderMultiTransform::setupContextMenu(QMenu* menu, QObject* receiver, const char* member) { - this->addDefaultAction(menu, QObject::tr("Edit %1").arg(QString::fromStdString(featureName()))); + addDefaultAction(menu, QObject::tr("Edit multi-transform")); PartDesignGui::ViewProvider::setupContextMenu(menu, receiver, member); // clazy:exclude=skipped-base-method } diff --git a/src/Mod/PartDesign/Gui/ViewProviderPolarPattern.cpp b/src/Mod/PartDesign/Gui/ViewProviderPolarPattern.cpp index d1f8b19aa5..0cc0c85658 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderPolarPattern.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderPolarPattern.cpp @@ -33,6 +33,12 @@ TaskDlgFeatureParameters *ViewProviderPolarPattern::getEditDialog() { return new TaskDlgPolarPatternParameters (this); } +void ViewProviderPolarPattern::setupContextMenu(QMenu* menu, QObject* receiver, const char* member) +{ + addDefaultAction(menu, QObject::tr("Edit polar pattern")); + PartDesignGui::ViewProvider::setupContextMenu(menu, receiver, member); +} + const std::string & ViewProviderPolarPattern::featureName() const { static const std::string name = "PolarPattern"; diff --git a/src/Mod/PartDesign/Gui/ViewProviderPolarPattern.h b/src/Mod/PartDesign/Gui/ViewProviderPolarPattern.h index 311743a0aa..5d8a96769b 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderPolarPattern.h +++ b/src/Mod/PartDesign/Gui/ViewProviderPolarPattern.h @@ -39,6 +39,7 @@ public: } const std::string & featureName() const override; + void setupContextMenu(QMenu*, QObject*, const char*) override; protected: /// Returns a newly create dialog for the part to be placed in the task view diff --git a/src/Mod/PartDesign/Gui/ViewProviderScaled.cpp b/src/Mod/PartDesign/Gui/ViewProviderScaled.cpp index 712c8f5f39..63b0158c8d 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderScaled.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderScaled.cpp @@ -34,6 +34,12 @@ TaskDlgFeatureParameters *ViewProviderScaled::getEditDialog() { return new TaskDlgScaledParameters (this); } +void ViewProviderScaled::setupContextMenu(QMenu* menu, QObject* receiver, const char* member) +{ + addDefaultAction(menu, QObject::tr("Edit scaled")); + PartDesignGui::ViewProvider::setupContextMenu(menu, receiver, member); +} + const std::string & ViewProviderScaled::featureName() const { static const std::string name = "Scaled"; diff --git a/src/Mod/PartDesign/Gui/ViewProviderScaled.h b/src/Mod/PartDesign/Gui/ViewProviderScaled.h index 9e9cd8e264..fe2628e81a 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderScaled.h +++ b/src/Mod/PartDesign/Gui/ViewProviderScaled.h @@ -39,6 +39,7 @@ public: } const std::string & featureName() const override; + void setupContextMenu(QMenu*, QObject*, const char*) override; protected: /// Returns a newly create dialog for the part to be placed in the task view diff --git a/src/Mod/PartDesign/Gui/ViewProviderTransformed.cpp b/src/Mod/PartDesign/Gui/ViewProviderTransformed.cpp index c85f225ff1..d69041721f 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderTransformed.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderTransformed.cpp @@ -72,9 +72,8 @@ std::string ViewProviderTransformed::featureIcon() const void ViewProviderTransformed::setupContextMenu(QMenu* menu, QObject* receiver, const char* member) { - QAction* act; - act = menu->addAction(QObject::tr("Edit %1").arg(QString::fromStdString(featureName())), receiver, member); - act->setData(QVariant((int)ViewProvider::Default)); + QString text = QString::fromStdString(getObject()->Label.getStrValue()); + addDefaultAction(menu, QObject::tr("Edit %1").arg(text)); PartDesignGui::ViewProvider::setupContextMenu(menu, receiver, member); }