From 488d931a69c038640956b87413f5e44c65cdc808 Mon Sep 17 00:00:00 2001 From: Roy-043 Date: Fri, 24 Jan 2025 13:35:06 +0100 Subject: [PATCH] Material: rename Materials_Edit command For consistency it should be Material_Edit. --- src/Mod/Material/Gui/CMakeLists.txt | 2 +- src/Mod/Material/Gui/Command.cpp | 26 +++++++++---------- src/Mod/Material/Gui/MaterialTreeWidget.cpp | 2 +- src/Mod/Material/Gui/Resources/Material.qrc | 2 +- .../{Materials_Edit.svg => Material_Edit.svg} | 0 src/Mod/Material/Gui/Workbench.cpp | 8 +++--- src/Mod/Material/MaterialEditor.py | 2 +- 7 files changed, 21 insertions(+), 21 deletions(-) rename src/Mod/Material/Gui/Resources/icons/{Materials_Edit.svg => Material_Edit.svg} (100%) diff --git a/src/Mod/Material/Gui/CMakeLists.txt b/src/Mod/Material/Gui/CMakeLists.txt index 43af6edaa4..0214613322 100644 --- a/src/Mod/Material/Gui/CMakeLists.txt +++ b/src/Mod/Material/Gui/CMakeLists.txt @@ -141,7 +141,7 @@ endif(FREECAD_USE_PCH) SET(MatGuiIcon_SVG Resources/icons/list.svg - Resources/icons/Materials_Edit.svg + Resources/icons/Material_Edit.svg Resources/icons/MaterialWorkbench.svg Resources/icons/multiline.svg Resources/icons/preferences-material.svg diff --git a/src/Mod/Material/Gui/Command.cpp b/src/Mod/Material/Gui/Command.cpp index cc4e399bd8..fe36ed5102 100644 --- a/src/Mod/Material/Gui/Command.cpp +++ b/src/Mod/Material/Gui/Command.cpp @@ -41,27 +41,27 @@ //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ //=========================================================================== -// Materials_Edit +// Material_Edit //=========================================================================== -DEF_STD_CMD_A(CmdMaterialsEdit) +DEF_STD_CMD_A(CmdMaterialEdit) -CmdMaterialsEdit::CmdMaterialsEdit() - : Command("Materials_Edit") +CmdMaterialEdit::CmdMaterialEdit() + : Command("Material_Edit") { sAppModule = "Material"; sGroup = QT_TR_NOOP("Material"); sMenuText = QT_TR_NOOP("Edit..."); sToolTipText = QT_TR_NOOP("Edit material properties"); - sWhatsThis = "Materials_Edit"; + sWhatsThis = "Material_Edit"; sStatusTip = sToolTipText; - sPixmap = "Materials_Edit"; + sPixmap = "Material_Edit"; } -void CmdMaterialsEdit::activated(int iMsg) +void CmdMaterialEdit::activated(int iMsg) { Q_UNUSED(iMsg); - Base::Console().Log("Materials_Edit\n"); + Base::Console().Log("Material_Edit\n"); static QPointer dlg = nullptr; if (!dlg) { @@ -71,7 +71,7 @@ void CmdMaterialsEdit::activated(int iMsg) dlg->show(); } -bool CmdMaterialsEdit::isActive() +bool CmdMaterialEdit::isActive() { // return (hasActiveDocument() && !Gui::Control().activeDialog()); return true; @@ -119,7 +119,7 @@ StdCmdSetMaterial::StdCmdSetMaterial() sToolTipText = QT_TR_NOOP("Sets the material of the selected object"); sWhatsThis = "Std_SetMaterial"; sStatusTip = QT_TR_NOOP("Sets the material of the selected object"); - sPixmap = "Materials_Edit"; + sPixmap = "Material_Edit"; // sAccel = "Ctrl+D"; // eType = Alter3DView; } @@ -148,7 +148,7 @@ CmdInspectAppearance::CmdInspectAppearance() sToolTipText = QT_TR_NOOP("Inspect the appearance properties of the selected object"); sWhatsThis = "Materials_InspectAppearance"; sStatusTip = QT_TR_NOOP("Inspect the appearance properties of the selected object"); - // sPixmap = "Materials_Edit"; + // sPixmap = "Material_Edit"; } void CmdInspectAppearance::activated(int iMsg) @@ -175,7 +175,7 @@ CmdInspectMaterial::CmdInspectMaterial() sToolTipText = QT_TR_NOOP("Inspect the material properties of the selected object"); sWhatsThis = "Materials_InspectMaterial"; sStatusTip = QT_TR_NOOP("Inspect the material properties of the selected object"); - // sPixmap = "Materials_Edit"; + // sPixmap = "Material_Edit"; } void CmdInspectMaterial::activated(int iMsg) @@ -195,7 +195,7 @@ void CreateMaterialCommands() { Gui::CommandManager& rcCmdMgr = Gui::Application::Instance->commandManager(); - rcCmdMgr.addCommand(new CmdMaterialsEdit()); + rcCmdMgr.addCommand(new CmdMaterialEdit()); rcCmdMgr.addCommand(new StdCmdSetAppearance()); rcCmdMgr.addCommand(new StdCmdSetMaterial()); rcCmdMgr.addCommand(new CmdInspectAppearance()); diff --git a/src/Mod/Material/Gui/MaterialTreeWidget.cpp b/src/Mod/Material/Gui/MaterialTreeWidget.cpp index 4a37d36617..823d424318 100644 --- a/src/Mod/Material/Gui/MaterialTreeWidget.cpp +++ b/src/Mod/Material/Gui/MaterialTreeWidget.cpp @@ -255,7 +255,7 @@ void MaterialTreeWidget::editorClicked(bool checked) setMaterial(material->getUUID()); } - // Gui::Application::Instance->commandManager().runCommandByName("Materials_Edit"); + // Gui::Application::Instance->commandManager().runCommandByName("Material_Edit"); // Toggle the open state // setExpanded(!m_expanded); } diff --git a/src/Mod/Material/Gui/Resources/Material.qrc b/src/Mod/Material/Gui/Resources/Material.qrc index 3e9650798d..0ba4ea086e 100644 --- a/src/Mod/Material/Gui/Resources/Material.qrc +++ b/src/Mod/Material/Gui/Resources/Material.qrc @@ -2,7 +2,7 @@ icons/list.svg icons/MaterialWorkbench.svg - icons/Materials_Edit.svg + icons/Material_Edit.svg icons/multiline.svg icons/preferences-material.svg icons/preview-rendered.svg diff --git a/src/Mod/Material/Gui/Resources/icons/Materials_Edit.svg b/src/Mod/Material/Gui/Resources/icons/Material_Edit.svg similarity index 100% rename from src/Mod/Material/Gui/Resources/icons/Materials_Edit.svg rename to src/Mod/Material/Gui/Resources/icons/Material_Edit.svg diff --git a/src/Mod/Material/Gui/Workbench.cpp b/src/Mod/Material/Gui/Workbench.cpp index b988ef4791..ac79812837 100644 --- a/src/Mod/Material/Gui/Workbench.cpp +++ b/src/Mod/Material/Gui/Workbench.cpp @@ -49,8 +49,8 @@ Gui::MenuItem* Workbench::setupMenuBar() const Gui::MenuItem* material = new Gui::MenuItem; root->insertItem(item, material); - material->setCommand("&Materials"); - *material << "Materials_Edit"; + material->setCommand("&Material"); + *material << "Material_Edit"; return root; } @@ -60,8 +60,8 @@ Gui::ToolBarItem* Workbench::setupToolBars() const Gui::ToolBarItem* root = StdWorkbench::setupToolBars(); Gui::ToolBarItem* material = new Gui::ToolBarItem(root); - material->setCommand("Materials"); - *material << "Materials_Edit"; + material->setCommand("Material"); + *material << "Material_Edit"; return root; } diff --git a/src/Mod/Material/MaterialEditor.py b/src/Mod/Material/MaterialEditor.py index 2b060b8bd6..1c2e3e3882 100644 --- a/src/Mod/Material/MaterialEditor.py +++ b/src/Mod/Material/MaterialEditor.py @@ -950,7 +950,7 @@ def openEditor(obj=None, prop=None): # editor = MaterialEditor(obj, prop) # editor.exec_() # else: - FreeCADGui.runCommand('Materials_Edit',0) + FreeCADGui.runCommand('Material_Edit',0) def editMaterial(material=None, card_path=None, category="Solid"):