From 7305343e10bf44f850351f0000975fd99ade7773 Mon Sep 17 00:00:00 2001 From: vocx-fc Date: Wed, 2 Oct 2019 02:30:57 -0500 Subject: [PATCH] Part: deactivate and remove the remaining XPM icons, and use SVG icons instead --- src/Mod/Part/Gui/AppPartGui.cpp | 10 +- src/Mod/Part/Gui/Resources/Part.qrc | 3 +- .../Part/Gui/Resources/icons/Part_Feature.svg | 334 ++++++++++++++- .../Part/Gui/Resources/icons/Part_Feature.xpm | 40 -- .../Resources/icons/Part_FeatureImport.svg | 382 ++++++++++++++++++ .../Resources/icons/Part_FeatureImport.xpm | 49 --- 6 files changed, 707 insertions(+), 111 deletions(-) delete mode 100644 src/Mod/Part/Gui/Resources/icons/Part_Feature.xpm create mode 100644 src/Mod/Part/Gui/Resources/icons/Part_FeatureImport.svg delete mode 100644 src/Mod/Part/Gui/Resources/icons/Part_FeatureImport.xpm diff --git a/src/Mod/Part/Gui/AppPartGui.cpp b/src/Mod/Part/Gui/AppPartGui.cpp index 73a87d3261..d5ee08c437 100644 --- a/src/Mod/Part/Gui/AppPartGui.cpp +++ b/src/Mod/Part/Gui/AppPartGui.cpp @@ -69,8 +69,8 @@ #include -#include "Resources/icons/Part_Feature.xpm" -#include "Resources/icons/Part_FeatureImport.xpm" +// #include "Resources/icons/Part_Feature.xpm" +// #include "Resources/icons/Part_FeatureImport.xpm" // use a different name to CreateCommand() void CreatePartCommands(void); @@ -224,9 +224,9 @@ PyMOD_INIT_FUNC(PartGui) loadPartResource(); // register bitmaps - Gui::BitmapFactoryInst& rclBmpFactory = Gui::BitmapFactory(); - rclBmpFactory.addXPM("Part_Feature",(const char**) PartFeature_xpm); - rclBmpFactory.addXPM("Part_FeatureImport",(const char**) PartFeatureImport_xpm); + // Gui::BitmapFactoryInst& rclBmpFactory = Gui::BitmapFactory(); + // 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 f1112d9ef3..4456ac1f82 100644 --- a/src/Mod/Part/Gui/Resources/Part.qrc +++ b/src/Mod/Part/Gui/Resources/Part.qrc @@ -23,8 +23,7 @@ icons/Part_Export.svg icons/Part_Extrude.svg icons/Part_Feature.svg - icons/Part_Feature.xpm - icons/Part_FeatureImport.xpm + icons/Part_FeatureImport.svg icons/Part_Fillet.svg icons/Part_Fuse.svg icons/Part_Helix_Parametric.svg diff --git a/src/Mod/Part/Gui/Resources/icons/Part_Feature.svg b/src/Mod/Part/Gui/Resources/icons/Part_Feature.svg index 7e6ee103b0..15ce49e6ee 100644 --- a/src/Mod/Part/Gui/Resources/icons/Part_Feature.svg +++ b/src/Mod/Part/Gui/Resources/icons/Part_Feature.svg @@ -1,21 +1,289 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + image/svg+xml - + + [wmayer] - PartFeature + Tree_Part 2011-10-10 http://www.freecadweb.org/wiki/index.php?title=Artwork @@ -23,7 +291,7 @@ FreeCAD - FreeCAD/src/Mod/Part/Gui/Resources/icons/Part + FreeCAD/src/Mod/Part/Gui/Resources/icons/Tree_Part.svg FreeCAD LGPL2+ @@ -38,11 +306,47 @@ - - - - - - + + + + + + + + diff --git a/src/Mod/Part/Gui/Resources/icons/Part_Feature.xpm b/src/Mod/Part/Gui/Resources/icons/Part_Feature.xpm deleted file mode 100644 index 36c52498fa..0000000000 --- a/src/Mod/Part/Gui/Resources/icons/Part_Feature.xpm +++ /dev/null @@ -1,40 +0,0 @@ -/* XPM */ -static char * PartFeature_xpm[] = { -"16 16 21 1", -" c None", -". c #192D05", -"+ c #172A04", -"@ c #233C09", -"# c #558D1E", -"$ c #89E134", -"% c #8AE234", -"& c #172A03", -"* c #7DCE2E", -"= c #31530F", -"- c #396012", -"; c #82D731", -"> c #172904", -", c #172B04", -"' c #88DF33", -") c #4C7F1A", -"! c #28450B", -"~ c #75C12C", -"{ c #172A05", -"] c #61A022", -"^ c #182C04", -" ", -" .++++++++ ", -" +@#$%%%%+&& ", -" +*=-;%%%+ >, ", -" +%')!~%%+ >{ ", -" +%%%]^++++++++ ", -" +%%%%+%%%%%%%+ ", -" +%%%%+%%%%%%%+ ", -" +%%%%+%%%%%%%+ ", -" +%%%%+%%%%%%%+ ", -" ++++++%%%%%%%+ ", -" && +%%%%%%%+ ", -" >, +%%%%%%%+ ", -" >{+%%%%%%%+ ", -" ++++++++. ", -" "}; diff --git a/src/Mod/Part/Gui/Resources/icons/Part_FeatureImport.svg b/src/Mod/Part/Gui/Resources/icons/Part_FeatureImport.svg new file mode 100644 index 0000000000..7d097e52cd --- /dev/null +++ b/src/Mod/Part/Gui/Resources/icons/Part_FeatureImport.svg @@ -0,0 +1,382 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + [wmayer] + + + Tree_Part + 2011-10-10 + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + FreeCAD + + + FreeCAD/src/Mod/Part/Gui/Resources/icons/Tree_Part.svg + + + FreeCAD LGPL2+ + + + https://www.gnu.org/copyleft/lesser.html + + + [agryson] Alexander Gryson + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/Part/Gui/Resources/icons/Part_FeatureImport.xpm b/src/Mod/Part/Gui/Resources/icons/Part_FeatureImport.xpm deleted file mode 100644 index 9ccc82704b..0000000000 --- a/src/Mod/Part/Gui/Resources/icons/Part_FeatureImport.xpm +++ /dev/null @@ -1,49 +0,0 @@ -/* XPM */ -static char * PartFeatureImport_xpm[] = { -"16 16 30 1", -" c None", -". c #141010", -"+ c #729FCF", -"@ c #192D05", -"# c #172A04", -"$ c #FCE94F", -"% c #233C09", -"& c #558D1E", -"* c #7DCE2E", -"= c #31530F", -"- c #010200", -"; c #020300", -"> c #8AE234", -", c #1C2E0A", -"' c #88E033", -") c #89E133", -"! c #000000", -"~ c #020400", -"{ c #100C0C", -"] c #88E134", -"^ c #89E134", -"/ c #080A03", -"( c #88DF33", -"_ c #162903", -": c #87E035", -"< c #172B04", -"[ c #88E035", -"} c #172A03", -"| c #172904", -"1 c #172A05", -" ........", -" ......++..+..", -"@##.$$$$.++..++.", -"#%&.$$$$.++..++.", -"#*=.$$-;.++++++.", -"#>..$$,'.++..++.", -"#)!$$$$~{++..++.", -"#)].$$,'.++++++.", -"#^>>/!^^........", -"#^^)(_'>)(>>># ", -"#^:'><:[^>>>># ", -"######>>>>>>># ", -" }} #>>>>>>># ", -" |< #>>>>>>># ", -" |1#>>>>>>># ", -" ########@ "};