From 8a66c8a5200c07091bfd4f369a5e2278878f6090 Mon Sep 17 00:00:00 2001 From: wmayer Date: Mon, 24 Apr 2023 13:44:47 +0200 Subject: [PATCH] PD: fix translation of context-menu item of dress-up features --- src/Mod/PartDesign/Gui/ViewProviderChamfer.cpp | 5 +++++ src/Mod/PartDesign/Gui/ViewProviderChamfer.h | 1 + src/Mod/PartDesign/Gui/ViewProviderDraft.cpp | 5 +++++ src/Mod/PartDesign/Gui/ViewProviderDraft.h | 1 + src/Mod/PartDesign/Gui/ViewProviderDressUp.cpp | 6 ++---- src/Mod/PartDesign/Gui/ViewProviderFillet.cpp | 5 +++++ src/Mod/PartDesign/Gui/ViewProviderFillet.h | 1 + src/Mod/PartDesign/Gui/ViewProviderThickness.cpp | 5 +++++ src/Mod/PartDesign/Gui/ViewProviderThickness.h | 1 + 9 files changed, 26 insertions(+), 4 deletions(-) diff --git a/src/Mod/PartDesign/Gui/ViewProviderChamfer.cpp b/src/Mod/PartDesign/Gui/ViewProviderChamfer.cpp index 249447392e..72c9beb997 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderChamfer.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderChamfer.cpp @@ -36,6 +36,11 @@ const std::string & ViewProviderChamfer::featureName() const { return name; } +void ViewProviderChamfer::setupContextMenu(QMenu* menu, QObject* receiver, const char* member) +{ + addDefaultAction(menu, QObject::tr("Edit chamfer")); + PartDesignGui::ViewProvider::setupContextMenu(menu, receiver, member); +} TaskDlgFeatureParameters *ViewProviderChamfer::getEditDialog() { return new TaskDlgChamferParameters (this); diff --git a/src/Mod/PartDesign/Gui/ViewProviderChamfer.h b/src/Mod/PartDesign/Gui/ViewProviderChamfer.h index 6abcd4cc9c..490c12f3e4 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderChamfer.h +++ b/src/Mod/PartDesign/Gui/ViewProviderChamfer.h @@ -42,6 +42,7 @@ public: /// return "Chamfer" 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/ViewProviderDraft.cpp b/src/Mod/PartDesign/Gui/ViewProviderDraft.cpp index c9b0f3923b..2a9df97c34 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderDraft.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderDraft.cpp @@ -37,6 +37,11 @@ const std::string & ViewProviderDraft::featureName() const { return name; } +void ViewProviderDraft::setupContextMenu(QMenu* menu, QObject* receiver, const char* member) +{ + addDefaultAction(menu, QObject::tr("Edit draft")); + PartDesignGui::ViewProvider::setupContextMenu(menu, receiver, member); +} TaskDlgFeatureParameters *ViewProviderDraft::getEditDialog() { return new TaskDlgDraftParameters (this); diff --git a/src/Mod/PartDesign/Gui/ViewProviderDraft.h b/src/Mod/PartDesign/Gui/ViewProviderDraft.h index eacf1a4a07..c1ae569e67 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderDraft.h +++ b/src/Mod/PartDesign/Gui/ViewProviderDraft.h @@ -43,6 +43,7 @@ public: /// return "Draft" 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/ViewProviderDressUp.cpp b/src/Mod/PartDesign/Gui/ViewProviderDressUp.cpp index 1ffff9fc5c..548b376e4c 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderDressUp.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderDressUp.cpp @@ -46,13 +46,11 @@ PROPERTY_SOURCE(PartDesignGui::ViewProviderDressUp,PartDesignGui::ViewProvider) void ViewProviderDressUp::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); } - const std::string & ViewProviderDressUp::featureName() const { static const std::string name = "Undefined"; return name; diff --git a/src/Mod/PartDesign/Gui/ViewProviderFillet.cpp b/src/Mod/PartDesign/Gui/ViewProviderFillet.cpp index 57e5fc0035..98eb04ae46 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderFillet.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderFillet.cpp @@ -36,6 +36,11 @@ const std::string & ViewProviderFillet::featureName() const { return name; } +void ViewProviderFillet::setupContextMenu(QMenu* menu, QObject* receiver, const char* member) +{ + addDefaultAction(menu, QObject::tr("Edit fillet")); + PartDesignGui::ViewProvider::setupContextMenu(menu, receiver, member); +} TaskDlgFeatureParameters *ViewProviderFillet::getEditDialog() { return new TaskDlgFilletParameters (this); diff --git a/src/Mod/PartDesign/Gui/ViewProviderFillet.h b/src/Mod/PartDesign/Gui/ViewProviderFillet.h index 1a8940ad6c..c8fabd8ace 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderFillet.h +++ b/src/Mod/PartDesign/Gui/ViewProviderFillet.h @@ -42,6 +42,7 @@ public: /// return "Fillet" 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/ViewProviderThickness.cpp b/src/Mod/PartDesign/Gui/ViewProviderThickness.cpp index c1cd1a91d0..5866a58f08 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderThickness.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderThickness.cpp @@ -36,6 +36,11 @@ const std::string & ViewProviderThickness::featureName() const { return name; } +void ViewProviderThickness::setupContextMenu(QMenu* menu, QObject* receiver, const char* member) +{ + addDefaultAction(menu, QObject::tr("Edit thickness")); + PartDesignGui::ViewProvider::setupContextMenu(menu, receiver, member); +} TaskDlgFeatureParameters *ViewProviderThickness::getEditDialog() { return new TaskDlgThicknessParameters (this); diff --git a/src/Mod/PartDesign/Gui/ViewProviderThickness.h b/src/Mod/PartDesign/Gui/ViewProviderThickness.h index 339f10c793..177e7edeb5 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderThickness.h +++ b/src/Mod/PartDesign/Gui/ViewProviderThickness.h @@ -42,6 +42,7 @@ public: /// return "Thickness" 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