From 990ba344a3fe83e7634eaa404e112cdb88dcf1c5 Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Fri, 6 Mar 2020 08:39:13 +0100 Subject: [PATCH] FEM: rename icon, Constraint Heatflux --- src/Mod/Fem/Gui/Command.cpp | 2 +- src/Mod/Fem/Gui/Resources/Fem.qrc | 2 +- .../{fem-constraint-heatflux.svg => FEM_ConstraintHeatflux.svg} | 0 src/Mod/Fem/Gui/TaskFemConstraintHeatflux.cpp | 2 +- src/Mod/Fem/Gui/ViewProviderFemConstraintHeatflux.cpp | 2 +- src/Mod/Fem/femcommands/commands.py | 2 +- .../femguiobjects/_ViewProviderFemConstraintBodyHeatSource.py | 2 +- 7 files changed, 6 insertions(+), 6 deletions(-) rename src/Mod/Fem/Gui/Resources/icons/{fem-constraint-heatflux.svg => FEM_ConstraintHeatflux.svg} (100%) diff --git a/src/Mod/Fem/Gui/Command.cpp b/src/Mod/Fem/Gui/Command.cpp index a7c102cbf5..9011c99046 100644 --- a/src/Mod/Fem/Gui/Command.cpp +++ b/src/Mod/Fem/Gui/Command.cpp @@ -596,7 +596,7 @@ CmdFemConstraintHeatflux::CmdFemConstraintHeatflux() sToolTipText = QT_TR_NOOP("Creates a FEM constraint for a heatflux acting on a face"); sWhatsThis = "FEM_ConstraintHeatflux"; sStatusTip = sToolTipText; - sPixmap = "fem-constraint-heatflux"; + sPixmap = "FEM_ConstraintHeatflux"; } void CmdFemConstraintHeatflux::activated(int) diff --git a/src/Mod/Fem/Gui/Resources/Fem.qrc b/src/Mod/Fem/Gui/Resources/Fem.qrc index 73f356f285..264de6019d 100755 --- a/src/Mod/Fem/Gui/Resources/Fem.qrc +++ b/src/Mod/Fem/Gui/Resources/Fem.qrc @@ -17,7 +17,7 @@ icons/FEM_ConstraintFluidBoundary.svg icons/FEM_ConstraintForce.svg icons/FEM_ConstraintGear.svg - icons/fem-constraint-heatflux.svg + icons/FEM_ConstraintHeatflux.svg icons/fem-constraint-initial-flow-velocity.svg icons/fem-constraint-initial-temperature.svg icons/fem-constraint-planerotation.svg diff --git a/src/Mod/Fem/Gui/Resources/icons/fem-constraint-heatflux.svg b/src/Mod/Fem/Gui/Resources/icons/FEM_ConstraintHeatflux.svg similarity index 100% rename from src/Mod/Fem/Gui/Resources/icons/fem-constraint-heatflux.svg rename to src/Mod/Fem/Gui/Resources/icons/FEM_ConstraintHeatflux.svg diff --git a/src/Mod/Fem/Gui/TaskFemConstraintHeatflux.cpp b/src/Mod/Fem/Gui/TaskFemConstraintHeatflux.cpp index 1d1d0f25e3..7a3b44525c 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintHeatflux.cpp +++ b/src/Mod/Fem/Gui/TaskFemConstraintHeatflux.cpp @@ -59,7 +59,7 @@ using namespace Gui; /* TRANSLATOR FemGui::TaskFemConstraintHeatflux */ TaskFemConstraintHeatflux::TaskFemConstraintHeatflux(ViewProviderFemConstraintHeatflux *ConstraintView,QWidget *parent) - : TaskFemConstraint(ConstraintView, parent, "fem-constraint-heatflux") + : TaskFemConstraint(ConstraintView, parent, "FEM_ConstraintHeatflux") { proxy = new QWidget(this); ui = new Ui_TaskFemConstraintHeatflux(); diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraintHeatflux.cpp b/src/Mod/Fem/Gui/ViewProviderFemConstraintHeatflux.cpp index 59a4af00de..104053078f 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemConstraintHeatflux.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemConstraintHeatflux.cpp @@ -54,7 +54,7 @@ PROPERTY_SOURCE(FemGui::ViewProviderFemConstraintHeatflux, FemGui::ViewProviderF ViewProviderFemConstraintHeatflux::ViewProviderFemConstraintHeatflux() { - sPixmap = "fem-constraint-heatflux"; + sPixmap = "FEM_ConstraintHeatflux"; ADD_PROPERTY(FaceColor,(0.2f,0.3f,0.2f)); } diff --git a/src/Mod/Fem/femcommands/commands.py b/src/Mod/Fem/femcommands/commands.py index 5efac12f88..538e432dcf 100644 --- a/src/Mod/Fem/femcommands/commands.py +++ b/src/Mod/Fem/femcommands/commands.py @@ -156,7 +156,7 @@ class _ConstraintBodyHeatSource(CommandManager): def __init__(self): super(_ConstraintBodyHeatSource, self).__init__() self.resources = { - "Pixmap": "fem-constraint-heatflux", # the heatflux icon is used + "Pixmap": "FEM_ConstraintHeatflux", # the heatflux icon is used "MenuText": QtCore.QT_TRANSLATE_NOOP( "FEM_ConstraintBodyHeatSource", "Constraint body heat source" diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintBodyHeatSource.py b/src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintBodyHeatSource.py index ce4458ee21..589535acc2 100644 --- a/src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintBodyHeatSource.py +++ b/src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintBodyHeatSource.py @@ -34,6 +34,6 @@ from . import ViewProviderFemConstraint class ViewProxy(ViewProviderFemConstraint.ViewProxy): def getIcon(self): - return ":/icons/fem-constraint-heatflux.svg" + return ":/icons/FEM_ConstraintHeatflux.svg" ## @}