From 3d36e7d5e1180569e046f7439afb194786e4d75d Mon Sep 17 00:00:00 2001 From: vocx-fc Date: Wed, 2 Oct 2019 01:48:32 -0500 Subject: [PATCH] Part: rename the icons to start with Part_ --- src/Mod/Part/Gui/AppPartGui.cpp | 8 ++++---- src/Mod/Part/Gui/Resources/Part.qrc | 6 +++--- .../Resources/icons/{PartFeature.svg => Part_Feature.svg} | 0 .../Resources/icons/{PartFeature.xpm => Part_Feature.xpm} | 0 .../{PartFeatureImport.xpm => Part_FeatureImport.xpm} | 0 src/Mod/Part/Gui/ViewProviderImport.cpp | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) rename src/Mod/Part/Gui/Resources/icons/{PartFeature.svg => Part_Feature.svg} (100%) rename src/Mod/Part/Gui/Resources/icons/{PartFeature.xpm => Part_Feature.xpm} (100%) rename src/Mod/Part/Gui/Resources/icons/{PartFeatureImport.xpm => Part_FeatureImport.xpm} (100%) diff --git a/src/Mod/Part/Gui/AppPartGui.cpp b/src/Mod/Part/Gui/AppPartGui.cpp index 291c64f67e..73a87d3261 100644 --- a/src/Mod/Part/Gui/AppPartGui.cpp +++ b/src/Mod/Part/Gui/AppPartGui.cpp @@ -69,8 +69,8 @@ #include -#include "Resources/icons/PartFeature.xpm" -#include "Resources/icons/PartFeatureImport.xpm" +#include "Resources/icons/Part_Feature.xpm" +#include "Resources/icons/Part_FeatureImport.xpm" // use a different name to CreateCommand() void CreatePartCommands(void); @@ -225,8 +225,8 @@ PyMOD_INIT_FUNC(PartGui) // register bitmaps Gui::BitmapFactoryInst& rclBmpFactory = Gui::BitmapFactory(); - rclBmpFactory.addXPM("PartFeature",(const char**) PartFeature_xpm); - rclBmpFactory.addXPM("PartFeatureImport",(const char**) PartFeatureImport_xpm); + rclBmpFactory.addXPM("Part_Feature",(const char**) PartFeature_xpm); + rclBmpFactory.addXPM("Part_FeatureImport",(const char**) PartFeatureImport_xpm); PyMOD_Return(partGuiModule); } diff --git a/src/Mod/Part/Gui/Resources/Part.qrc b/src/Mod/Part/Gui/Resources/Part.qrc index df656824f6..f1112d9ef3 100644 --- a/src/Mod/Part/Gui/Resources/Part.qrc +++ b/src/Mod/Part/Gui/Resources/Part.qrc @@ -22,9 +22,9 @@ icons/Part_ExplodeCompound.svg icons/Part_Export.svg icons/Part_Extrude.svg - icons/PartFeature.svg - icons/PartFeature.xpm - icons/PartFeatureImport.xpm + icons/Part_Feature.svg + icons/Part_Feature.xpm + icons/Part_FeatureImport.xpm icons/Part_Fillet.svg icons/Part_Fuse.svg icons/Part_Helix_Parametric.svg diff --git a/src/Mod/Part/Gui/Resources/icons/PartFeature.svg b/src/Mod/Part/Gui/Resources/icons/Part_Feature.svg similarity index 100% rename from src/Mod/Part/Gui/Resources/icons/PartFeature.svg rename to src/Mod/Part/Gui/Resources/icons/Part_Feature.svg diff --git a/src/Mod/Part/Gui/Resources/icons/PartFeature.xpm b/src/Mod/Part/Gui/Resources/icons/Part_Feature.xpm similarity index 100% rename from src/Mod/Part/Gui/Resources/icons/PartFeature.xpm rename to src/Mod/Part/Gui/Resources/icons/Part_Feature.xpm diff --git a/src/Mod/Part/Gui/Resources/icons/PartFeatureImport.xpm b/src/Mod/Part/Gui/Resources/icons/Part_FeatureImport.xpm similarity index 100% rename from src/Mod/Part/Gui/Resources/icons/PartFeatureImport.xpm rename to src/Mod/Part/Gui/Resources/icons/Part_FeatureImport.xpm diff --git a/src/Mod/Part/Gui/ViewProviderImport.cpp b/src/Mod/Part/Gui/ViewProviderImport.cpp index 26345c2315..6b0239cc91 100644 --- a/src/Mod/Part/Gui/ViewProviderImport.cpp +++ b/src/Mod/Part/Gui/ViewProviderImport.cpp @@ -48,7 +48,7 @@ PROPERTY_SOURCE(PartGui::ViewProviderImport,PartGui::ViewProviderPart) ViewProviderImport::ViewProviderImport() { - sPixmap = "PartFeatureImport"; + sPixmap = "Part_FeatureImport"; } ViewProviderImport::~ViewProviderImport()