From 4be60f06fa0318bd935b50d4efa3681c5ee3654d Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Fri, 6 Mar 2020 08:38:55 +0100 Subject: [PATCH] FEM: rename icon, Constraint Contact --- src/Mod/Fem/Gui/Command.cpp | 2 +- src/Mod/Fem/Gui/Resources/Fem.qrc | 2 +- .../{fem-constraint-contact.svg => FEM_ConstraintContact.svg} | 0 src/Mod/Fem/Gui/TaskFemConstraintContact.cpp | 2 +- src/Mod/Fem/Gui/ViewProviderFemConstraintContact.cpp | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename src/Mod/Fem/Gui/Resources/icons/{fem-constraint-contact.svg => FEM_ConstraintContact.svg} (100%) diff --git a/src/Mod/Fem/Gui/Command.cpp b/src/Mod/Fem/Gui/Command.cpp index e4009243cd..b4a00111d1 100644 --- a/src/Mod/Fem/Gui/Command.cpp +++ b/src/Mod/Fem/Gui/Command.cpp @@ -338,7 +338,7 @@ CmdFemConstraintContact::CmdFemConstraintContact() sToolTipText = QT_TR_NOOP("Creates a FEM constraint for contact between faces"); sWhatsThis = "FEM_ConstraintContact"; sStatusTip = sToolTipText; - sPixmap = "fem-constraint-contact"; + sPixmap = "FEM_ConstraintContact"; } void CmdFemConstraintContact::activated(int) diff --git a/src/Mod/Fem/Gui/Resources/Fem.qrc b/src/Mod/Fem/Gui/Resources/Fem.qrc index adf7b30a40..eb3c05bbe8 100755 --- a/src/Mod/Fem/Gui/Resources/Fem.qrc +++ b/src/Mod/Fem/Gui/Resources/Fem.qrc @@ -9,7 +9,7 @@ icons/fem-clipping-plane-add.svg icons/fem-clipping-plane-remove-all.svg icons/FEM_ConstraintBearing.svg - icons/fem-constraint-contact.svg + icons/FEM_ConstraintContact.svg icons/fem-constraint-displacement.svg icons/fem-constraint-electrostatic-potential.svg icons/fem-constraint-fixed.svg diff --git a/src/Mod/Fem/Gui/Resources/icons/fem-constraint-contact.svg b/src/Mod/Fem/Gui/Resources/icons/FEM_ConstraintContact.svg similarity index 100% rename from src/Mod/Fem/Gui/Resources/icons/fem-constraint-contact.svg rename to src/Mod/Fem/Gui/Resources/icons/FEM_ConstraintContact.svg diff --git a/src/Mod/Fem/Gui/TaskFemConstraintContact.cpp b/src/Mod/Fem/Gui/TaskFemConstraintContact.cpp index 522f2e27ba..00b95526a4 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintContact.cpp +++ b/src/Mod/Fem/Gui/TaskFemConstraintContact.cpp @@ -59,7 +59,7 @@ using namespace Gui; /* TRANSLATOR FemGui::TaskFemConstraintContact */ TaskFemConstraintContact::TaskFemConstraintContact(ViewProviderFemConstraintContact *ConstraintView,QWidget *parent) - : TaskFemConstraint(ConstraintView, parent, "fem-constraint-contact") + : TaskFemConstraint(ConstraintView, parent, "FEM_ConstraintContact") { proxy = new QWidget(this); ui = new Ui_TaskFemConstraintContact(); diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintContact.cpp b/src/Mod/Fem/Gui/ViewProviderFemConstraintContact.cpp index 25faff7f44..e18800257b 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemConstraintContact.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintContact.cpp @@ -54,7 +54,7 @@ PROPERTY_SOURCE(FemGui::ViewProviderFemConstraintContact, FemGui::ViewProviderFe ViewProviderFemConstraintContact::ViewProviderFemConstraintContact() { - sPixmap = "fem-constraint-contact"; + sPixmap = "FEM_ConstraintContact"; //Note change "Contact" in line above to new constraint name, make sure it is the same as in taskFem* cpp file ADD_PROPERTY(FaceColor,(0.2f,0.3f,0.2f)); }