From 299d3d120625f2b562616c6dd89f794466f7be26 Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Mon, 28 Nov 2016 01:17:45 +0100 Subject: [PATCH] FEM: icons, rename some icons to better fit in FEM name scheme --- src/Mod/Fem/Gui/Command.cpp | 4 ++-- src/Mod/Fem/Gui/Resources/Fem.qrc | 8 ++++---- ...-poly.svg => fem-femmesh-create-node-by-poly.svg} | 2 +- ...esh-from-shape.svg => fem-femmesh-from-shape.svg} | 2 +- ...rom-shape.svg => fem-femmesh-gmsh-from-shape.svg} | 2 +- ...m-shape.svg => fem-femmesh-netgen-from-shape.svg} | 2 +- src/Mod/Fem/Gui/TaskAnalysisInfo.cpp | 2 +- src/Mod/Fem/Gui/TaskCreateNodeSet.cpp | 2 +- src/Mod/Fem/Gui/TaskDriver.cpp | 2 +- src/Mod/Fem/Gui/TaskObjectName.cpp | 2 +- src/Mod/Fem/Gui/TaskPostBoxes.cpp | 12 ++++++------ src/Mod/Fem/Gui/TaskTetParameter.cpp | 2 +- src/Mod/Fem/Gui/ViewProviderFemMesh.cpp | 2 +- src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp | 2 +- src/Mod/Fem/_CommandMeshGmshFromShape.py | 2 +- src/Mod/Fem/_CommandMeshNetgenFromShape.py | 2 +- src/Mod/Fem/_ViewProviderFemMeshGmsh.py | 2 +- 17 files changed, 26 insertions(+), 26 deletions(-) rename src/Mod/Fem/Gui/Resources/icons/{fem-fem-mesh-create-node-by-poly.svg => fem-femmesh-create-node-by-poly.svg} (99%) rename src/Mod/Fem/Gui/Resources/icons/{fem-fem-mesh-from-shape.svg => fem-femmesh-from-shape.svg} (99%) rename src/Mod/Fem/Gui/Resources/icons/{fem-fem-mesh-gmsh-from-shape.svg => fem-femmesh-gmsh-from-shape.svg} (99%) rename src/Mod/Fem/Gui/Resources/icons/{fem-fem-mesh-netgen-from-shape.svg => fem-femmesh-netgen-from-shape.svg} (99%) diff --git a/src/Mod/Fem/Gui/Command.cpp b/src/Mod/Fem/Gui/Command.cpp index 4ca785c73..b5480e208 100644 --- a/src/Mod/Fem/Gui/Command.cpp +++ b/src/Mod/Fem/Gui/Command.cpp @@ -975,7 +975,7 @@ CmdFemDefineNodesSet::CmdFemDefineNodesSet() sToolTipText = QT_TR_NOOP("Create node set by Poly"); sWhatsThis = "Create node set by Poly"; sStatusTip = QT_TR_NOOP("Create node set by Poly"); - sPixmap = "fem-fem-mesh-create-node-by-poly"; + sPixmap = "fem-femmesh-create-node-by-poly"; } void CmdFemDefineNodesSet::activated(int) @@ -1032,7 +1032,7 @@ CmdFemCreateNodesSet::CmdFemCreateNodesSet() sToolTipText = QT_TR_NOOP("Creates a FEM mesh nodes set"); sWhatsThis = "Fem_CreateNodesSet"; sStatusTip = sToolTipText; - sPixmap = "fem-fem-mesh-create-node-by-poly"; + sPixmap = "fem-femmesh-create-node-by-poly"; } void CmdFemCreateNodesSet::activated(int) diff --git a/src/Mod/Fem/Gui/Resources/Fem.qrc b/src/Mod/Fem/Gui/Resources/Fem.qrc index 1f914c089..79eec3a0b 100755 --- a/src/Mod/Fem/Gui/Resources/Fem.qrc +++ b/src/Mod/Fem/Gui/Resources/Fem.qrc @@ -25,10 +25,10 @@ icons/fem-control-solver.svg icons/fem-cylinder.svg icons/fem-data.png - icons/fem-fem-mesh-create-node-by-poly.svg - icons/fem-fem-mesh-from-shape.svg - icons/fem-fem-mesh-gmsh-from-shape.svg - icons/fem-fem-mesh-netgen-from-shape.svg + icons/fem-femmesh-create-node-by-poly.svg + icons/fem-femmesh-from-shape.svg + icons/fem-femmesh-gmsh-from-shape.svg + icons/fem-femmesh-netgen-from-shape.svg icons/fem-femmesh-to-mesh.svg icons/fem-frequency-analysis.svg icons/fem-inp-editor.svg diff --git a/src/Mod/Fem/Gui/Resources/icons/fem-fem-mesh-create-node-by-poly.svg b/src/Mod/Fem/Gui/Resources/icons/fem-femmesh-create-node-by-poly.svg similarity index 99% rename from src/Mod/Fem/Gui/Resources/icons/fem-fem-mesh-create-node-by-poly.svg rename to src/Mod/Fem/Gui/Resources/icons/fem-femmesh-create-node-by-poly.svg index 044191fe4..1d56b643c 100644 --- a/src/Mod/Fem/Gui/Resources/icons/fem-fem-mesh-create-node-by-poly.svg +++ b/src/Mod/Fem/Gui/Resources/icons/fem-femmesh-create-node-by-poly.svg @@ -15,7 +15,7 @@ id="svg2860" sodipodi:version="0.32" inkscape:version="0.48.3.1 r9886" - sodipodi:docname="fem-fem-mesh-create-node-by-poly.svg" + sodipodi:docname="fem-femmesh-create-node-by-poly.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" version="1.1"> diff --git a/src/Mod/Fem/Gui/Resources/icons/fem-fem-mesh-gmsh-from-shape.svg b/src/Mod/Fem/Gui/Resources/icons/fem-femmesh-gmsh-from-shape.svg similarity index 99% rename from src/Mod/Fem/Gui/Resources/icons/fem-fem-mesh-gmsh-from-shape.svg rename to src/Mod/Fem/Gui/Resources/icons/fem-femmesh-gmsh-from-shape.svg index d9fd5d8cf..b869f01ca 100644 --- a/src/Mod/Fem/Gui/Resources/icons/fem-fem-mesh-gmsh-from-shape.svg +++ b/src/Mod/Fem/Gui/Resources/icons/fem-femmesh-gmsh-from-shape.svg @@ -15,7 +15,7 @@ id="svg2860" sodipodi:version="0.32" inkscape:version="0.48.5 r10040" - sodipodi:docname="fem-fem-mesh-gmsh-from-shape.svg" + sodipodi:docname="fem-femmesh-gmsh-from-shape.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" version="1.1"> isDerivedFrom(ViewProviderFemPostFunction::getClassTypeId())); @@ -244,7 +244,7 @@ void TaskPostFunction::applyPythonCode() { //############################################################################################ TaskPostClip::TaskPostClip(ViewProviderDocumentObject* view, App::PropertyLink* function, QWidget* parent) - : TaskPostBox(view,Gui::BitmapFactory().pixmap("fem-fem-mesh-create-node-by-poly"), tr("Choose implicit function"), parent) { + : TaskPostBox(view,Gui::BitmapFactory().pixmap("fem-femmesh-create-node-by-poly"), tr("Choose implicit function"), parent) { assert(view->isDerivedFrom(ViewProviderFemPostClip::getClassTypeId())); assert(function); @@ -363,7 +363,7 @@ void TaskPostClip::on_InsideOut_toggled(bool val) { //############################################################################################ TaskPostScalarClip::TaskPostScalarClip(ViewProviderDocumentObject* view, QWidget* parent) : - TaskPostBox(view, Gui::BitmapFactory().pixmap("fem-fem-mesh-create-node-by-poly"), tr("Clip options"), parent) { + TaskPostBox(view, Gui::BitmapFactory().pixmap("fem-femmesh-create-node-by-poly"), tr("Clip options"), parent) { assert(view->isDerivedFrom(ViewProviderFemPostScalarClip::getClassTypeId())); @@ -455,7 +455,7 @@ void TaskPostScalarClip::on_InsideOut_toggled(bool val) { //############################################################################################ TaskPostWarpVector::TaskPostWarpVector(ViewProviderDocumentObject* view, QWidget* parent) : - TaskPostBox(view, Gui::BitmapFactory().pixmap("fem-fem-mesh-create-node-by-poly"), tr("Clip options"), parent) { + TaskPostBox(view, Gui::BitmapFactory().pixmap("fem-femmesh-create-node-by-poly"), tr("Clip options"), parent) { assert(view->isDerivedFrom(ViewProviderFemPostWarpVector::getClassTypeId())); @@ -540,7 +540,7 @@ void TaskPostWarpVector::on_Min_valueChanged(double v) { //############################################################################################ TaskPostCut::TaskPostCut(ViewProviderDocumentObject* view, App::PropertyLink* function, QWidget* parent) - : TaskPostBox(view,Gui::BitmapFactory().pixmap("fem-fem-mesh-create-node-by-poly"), tr("Choose implicit function"), parent) { + : TaskPostBox(view,Gui::BitmapFactory().pixmap("fem-femmesh-create-node-by-poly"), tr("Choose implicit function"), parent) { assert(view->isDerivedFrom(ViewProviderFemPostCut::getClassTypeId())); assert(function); diff --git a/src/Mod/Fem/Gui/TaskTetParameter.cpp b/src/Mod/Fem/Gui/TaskTetParameter.cpp index 2707b9e94..2ac5298a8 100644 --- a/src/Mod/Fem/Gui/TaskTetParameter.cpp +++ b/src/Mod/Fem/Gui/TaskTetParameter.cpp @@ -48,7 +48,7 @@ using namespace Gui; TaskTetParameter::TaskTetParameter(Fem::FemMeshShapeNetgenObject *pcObject,QWidget *parent) - : TaskBox(Gui::BitmapFactory().pixmap("fem-fem-mesh-create-node-by-poly"), + : TaskBox(Gui::BitmapFactory().pixmap("fem-femmesh-create-node-by-poly"), tr("Tet Parameter"), true, parent), diff --git a/src/Mod/Fem/Gui/ViewProviderFemMesh.cpp b/src/Mod/Fem/Gui/ViewProviderFemMesh.cpp index 689a96ece..14b238ca5 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemMesh.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemMesh.cpp @@ -183,7 +183,7 @@ App::PropertyFloatConstraint::Constraints ViewProviderFemMesh::floatRange = {1.0 ViewProviderFemMesh::ViewProviderFemMesh() { - sPixmap = "fem-fem-mesh-from-shape"; + sPixmap = "fem-femmesh-from-shape"; ADD_PROPERTY(PointColor,(App::Color(0.7f,0.7f,0.7f))); ADD_PROPERTY(PointSize,(5.0f)); diff --git a/src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp b/src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp index 9c73dacfc..fa8fedf2b 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp @@ -66,7 +66,7 @@ ViewProviderFemPostObject::ViewProviderFemPostObject() : m_blockPropertyChanges( ADD_PROPERTY_TYPE(VectorMode,((long)0), "Coloring", App::Prop_None, "Select what to show for a vector field"); ADD_PROPERTY(Transperency, (0)); - sPixmap = "fem-fem-mesh-from-shape"; + sPixmap = "fem-femmesh-from-shape"; //create the subnodes which do the visualization work m_shapeHints = new SoShapeHints(); diff --git a/src/Mod/Fem/_CommandMeshGmshFromShape.py b/src/Mod/Fem/_CommandMeshGmshFromShape.py index 5044fff6f..a11ce896a 100644 --- a/src/Mod/Fem/_CommandMeshGmshFromShape.py +++ b/src/Mod/Fem/_CommandMeshGmshFromShape.py @@ -38,7 +38,7 @@ class _CommandMeshGmshFromShape(FemCommands): # the Fem_MeshGmshFromShape command definition def __init__(self): super(_CommandMeshGmshFromShape, self).__init__() - self.resources = {'Pixmap': 'fem-fem-mesh-gmsh-from-shape', + self.resources = {'Pixmap': 'fem-femmesh-gmsh-from-shape', 'MenuText': QtCore.QT_TRANSLATE_NOOP("Fem_MeshGmshFromShape", "FEM mesh from shape by GMSH"), 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Fem_MeshGmshFromShape", "Create a FEM mesh from a shape by GMSH mesher")} self.is_active = 'with_part_feature' diff --git a/src/Mod/Fem/_CommandMeshNetgenFromShape.py b/src/Mod/Fem/_CommandMeshNetgenFromShape.py index 877687a5b..f497fcb34 100644 --- a/src/Mod/Fem/_CommandMeshNetgenFromShape.py +++ b/src/Mod/Fem/_CommandMeshNetgenFromShape.py @@ -37,7 +37,7 @@ class _CommandMeshNetgenFromShape(FemCommands): # the Fem_MeshNetgenFromShape command definition def __init__(self): super(_CommandMeshNetgenFromShape, self).__init__() - self.resources = {'Pixmap': 'fem-fem-mesh-netgen-from-shape', + self.resources = {'Pixmap': 'fem-femmesh-netgen-from-shape', 'MenuText': QtCore.QT_TRANSLATE_NOOP("Fem_MeshFromShape", "FEM mesh from shape by Netgen"), 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Fem_MeshFromShape", "Create a FEM volume mesh from a solid or face shape by Netgen internal mesher")} self.is_active = 'with_part_feature' diff --git a/src/Mod/Fem/_ViewProviderFemMeshGmsh.py b/src/Mod/Fem/_ViewProviderFemMeshGmsh.py index 981bfeed6..34d4239aa 100644 --- a/src/Mod/Fem/_ViewProviderFemMeshGmsh.py +++ b/src/Mod/Fem/_ViewProviderFemMeshGmsh.py @@ -38,7 +38,7 @@ class _ViewProviderFemMeshGmsh: vobj.Proxy = self def getIcon(self): - return ":/icons/fem-fem-mesh-from-shape.svg" + return ":/icons/fem-femmesh-from-shape.svg" def attach(self, vobj): self.ViewObject = vobj