From 769bb523051347c890ec45ab0e7cad024e27c040 Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Fri, 6 Mar 2020 08:40:26 +0100 Subject: [PATCH] FEM: rename icon, solver standard --- src/Mod/Fem/Gui/Command.cpp | 2 +- src/Mod/Fem/Gui/Resources/Fem.qrc | 2 +- .../{fem-solver-standard.svg => FEM_SolverStandard.svg} | 0 src/Mod/Fem/Gui/ViewProviderSolver.cpp | 2 +- src/Mod/Fem/femcommands/commands.py | 6 +++--- src/Mod/Fem/femguiobjects/_ViewProviderFemSolverCalculix.py | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) rename src/Mod/Fem/Gui/Resources/icons/{fem-solver-standard.svg => FEM_SolverStandard.svg} (100%) diff --git a/src/Mod/Fem/Gui/Command.cpp b/src/Mod/Fem/Gui/Command.cpp index 7aaf54c1a5b5..54a9a70aa0d4 100644 --- a/src/Mod/Fem/Gui/Command.cpp +++ b/src/Mod/Fem/Gui/Command.cpp @@ -249,7 +249,7 @@ CmdFemCreateSolver::CmdFemCreateSolver() sToolTipText = QT_TR_NOOP("Add a solver to the Analysis"); sWhatsThis = "FEM_CreateSolver"; sStatusTip = sToolTipText; - sPixmap = "fem-solver-standard"; + sPixmap = "FEM_SolverStandard"; } void CmdFemCreateSolver::activated(int) diff --git a/src/Mod/Fem/Gui/Resources/Fem.qrc b/src/Mod/Fem/Gui/Resources/Fem.qrc index f5fa7f069b69..cdd95d501312 100755 --- a/src/Mod/Fem/Gui/Resources/Fem.qrc +++ b/src/Mod/Fem/Gui/Resources/Fem.qrc @@ -72,7 +72,7 @@ icons/FEM_SolverElmer.svg icons/fem-solver-inp-editor.svg icons/FEM_SolverRun.svg - icons/fem-solver-standard.svg + icons/FEM_SolverStandard.svg icons/preferences-fem.svg translations/Fem_af.qm translations/Fem_ar.qm diff --git a/src/Mod/Fem/Gui/Resources/icons/fem-solver-standard.svg b/src/Mod/Fem/Gui/Resources/icons/FEM_SolverStandard.svg similarity index 100% rename from src/Mod/Fem/Gui/Resources/icons/fem-solver-standard.svg rename to src/Mod/Fem/Gui/Resources/icons/FEM_SolverStandard.svg diff --git a/src/Mod/Fem/Gui/ViewProviderSolver.cpp b/src/Mod/Fem/Gui/ViewProviderSolver.cpp index 99cca1a4354e..7648cc796709 100644 --- a/src/Mod/Fem/Gui/ViewProviderSolver.cpp +++ b/src/Mod/Fem/Gui/ViewProviderSolver.cpp @@ -46,7 +46,7 @@ PROPERTY_SOURCE(FemGui::ViewProviderSolver, Gui::ViewProviderDocumentObject) ViewProviderSolver::ViewProviderSolver() { - sPixmap = "fem-solver-standard"; + sPixmap = "FEM_SolverStandard"; } ViewProviderSolver::~ViewProviderSolver() diff --git a/src/Mod/Fem/femcommands/commands.py b/src/Mod/Fem/femcommands/commands.py index e5cfd83554a3..520da5c38270 100644 --- a/src/Mod/Fem/femcommands/commands.py +++ b/src/Mod/Fem/femcommands/commands.py @@ -946,7 +946,7 @@ class _SolverCxxtools(CommandManager): def __init__(self): super(_SolverCxxtools, self).__init__() self.resources = { - "Pixmap": "fem-solver-standard", + "Pixmap": "FEM_SolverStandard", "MenuText": QtCore.QT_TRANSLATE_NOOP( "FEM_SolverCalculix", "Solver CalculiX Standard" @@ -989,7 +989,7 @@ class _SolverCalculix(CommandManager): def __init__(self): super(_SolverCalculix, self).__init__() self.resources = { - "Pixmap": "fem-solver-standard", + "Pixmap": "FEM_SolverStandard", "MenuText": QtCore.QT_TRANSLATE_NOOP( "FEM_SolverCalculiX", "Solver CalculiX (experimental)" ), @@ -1079,7 +1079,7 @@ class _SolverZ88(CommandManager): def __init__(self): super(_SolverZ88, self).__init__() self.resources = { - "Pixmap": "fem-solver-standard", + "Pixmap": "FEM_SolverStandard", "MenuText": QtCore.QT_TRANSLATE_NOOP( "FEM_SolverZ88", "Solver Z88" diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemSolverCalculix.py b/src/Mod/Fem/femguiobjects/_ViewProviderFemSolverCalculix.py index 9b15903dc0c1..8d5ea1cad596 100644 --- a/src/Mod/Fem/femguiobjects/_ViewProviderFemSolverCalculix.py +++ b/src/Mod/Fem/femguiobjects/_ViewProviderFemSolverCalculix.py @@ -55,7 +55,7 @@ class _ViewProviderFemSolverCalculix(ViewProviderFemConstraint.ViewProxy): """ def getIcon(self): - return ":/icons/fem-solver-standard.svg" + return ":/icons/FEM_SolverStandard.svg" def setEdit(self, vobj, mode=0): ViewProviderFemConstraint.ViewProxy.setEdit(