From af61ca6698adeeb58e9aef81487d0639f79da33c Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Tue, 7 Aug 2018 08:36:54 +0200 Subject: [PATCH] FEM: icons, rename show result icon --- src/Mod/Fem/Gui/Resources/Fem.qrc | 2 +- .../icons/{fem-result.svg => fem-post-result-show.svg} | 0 src/Mod/Fem/Gui/TaskPostBoxes.cpp | 2 +- src/Mod/Fem/Gui/ViewProviderResult.cpp | 2 +- src/Mod/Fem/femcommands/commands.py | 2 +- src/Mod/Fem/femguiobjects/_ViewProviderFemResultMechanical.py | 2 +- 6 files changed, 5 insertions(+), 5 deletions(-) rename src/Mod/Fem/Gui/Resources/icons/{fem-result.svg => fem-post-result-show.svg} (100%) diff --git a/src/Mod/Fem/Gui/Resources/Fem.qrc b/src/Mod/Fem/Gui/Resources/Fem.qrc index 98dadc7701..259e84c367 100755 --- a/src/Mod/Fem/Gui/Resources/Fem.qrc +++ b/src/Mod/Fem/Gui/Resources/Fem.qrc @@ -68,8 +68,8 @@ icons/fem-post-geo-isosurface.svg icons/fem-post-geo-plane.svg icons/fem-post-geo-sphere.svg + icons/fem-post-result-show.svg icons/fem-purge-results.svg - icons/fem-result.svg icons/fem-run-solver.svg icons/fem-shell-thickness.svg icons/fem-solver.svg diff --git a/src/Mod/Fem/Gui/Resources/icons/fem-result.svg b/src/Mod/Fem/Gui/Resources/icons/fem-post-result-show.svg similarity index 100% rename from src/Mod/Fem/Gui/Resources/icons/fem-result.svg rename to src/Mod/Fem/Gui/Resources/icons/fem-post-result-show.svg diff --git a/src/Mod/Fem/Gui/TaskPostBoxes.cpp b/src/Mod/Fem/Gui/TaskPostBoxes.cpp index b094b3c2a3..5bb6489e4d 100644 --- a/src/Mod/Fem/Gui/TaskPostBoxes.cpp +++ b/src/Mod/Fem/Gui/TaskPostBoxes.cpp @@ -338,7 +338,7 @@ void TaskPostBox::updateEnumerationList(App::PropertyEnumeration& prop, QComboBo //########################################################################################################### // post pipeline results TaskPostDisplay::TaskPostDisplay(Gui::ViewProviderDocumentObject* view, QWidget *parent) - : TaskPostBox(view, Gui::BitmapFactory().pixmap("fem-result"), tr("Result display options"), parent) + : TaskPostBox(view, Gui::BitmapFactory().pixmap("fem-post-result-show"), tr("Result display options"), parent) { //we need a separate container widget to add all controls to proxy = new QWidget(this); diff --git a/src/Mod/Fem/Gui/ViewProviderResult.cpp b/src/Mod/Fem/Gui/ViewProviderResult.cpp index 3a8674dd51..d0159eac93 100644 --- a/src/Mod/Fem/Gui/ViewProviderResult.cpp +++ b/src/Mod/Fem/Gui/ViewProviderResult.cpp @@ -37,7 +37,7 @@ PROPERTY_SOURCE(FemGui::ViewProviderResult, Gui::ViewProviderDocumentObject) ViewProviderResult::ViewProviderResult() { - sPixmap = "fem-result"; + sPixmap = "fem-post-result-show"; } ViewProviderResult::~ViewProviderResult() diff --git a/src/Mod/Fem/femcommands/commands.py b/src/Mod/Fem/femcommands/commands.py index ead15be7e5..f0d3a2245b 100644 --- a/src/Mod/Fem/femcommands/commands.py +++ b/src/Mod/Fem/femcommands/commands.py @@ -645,7 +645,7 @@ class _CommandFemResultShow(CommandManager): "The FEM_ResultShow command definition" def __init__(self): super(_CommandFemResultShow, self).__init__() - self.resources = {'Pixmap': 'fem-result', + self.resources = {'Pixmap': 'fem-post-result-show', 'MenuText': QtCore.QT_TRANSLATE_NOOP("FEM_ResultShow", "Show result"), 'Accel': "S, R", 'ToolTip': QtCore.QT_TRANSLATE_NOOP("FEM_ResultShow", "Shows and visualizes selected result data")} diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemResultMechanical.py b/src/Mod/Fem/femguiobjects/_ViewProviderFemResultMechanical.py index d2dda5b85f..82037613b6 100644 --- a/src/Mod/Fem/femguiobjects/_ViewProviderFemResultMechanical.py +++ b/src/Mod/Fem/femguiobjects/_ViewProviderFemResultMechanical.py @@ -51,7 +51,7 @@ class _ViewProviderFemResultMechanical: def getIcon(self): """after load from FCStd file, self.icon does not exist, return constant path instead""" - return ":/icons/fem-result.svg" + return ":/icons/fem-post-result-show.svg" def attach(self, vobj): self.ViewObject = vobj