From 42a0eadea64d278ba043680cfee74fa2f1c0f688 Mon Sep 17 00:00:00 2001 From: nds Date: Mon, 18 Apr 2016 11:28:21 +0300 Subject: [PATCH] Issue #1309 Management of icons - icons are moved into corresponded plugins. The installation path is the plugin XML directory with icons/ subfolders. --- src/ConnectorPlugin/CMakeLists.txt | 5 + .../icons/geom_export.png | Bin src/ConstructionPlugin/CMakeLists.txt | 10 ++ src/ConstructionPlugin/axis_widget.xml | 10 +- .../icons/axis.png | Bin .../icons/by_two_points_32x32.png | Bin .../icons/circle.png | Bin .../icons/cylindrical_face_32x32.png | Bin .../icons/plane.png | Bin .../icons/plane_32x32.png | Bin .../icons/point.png | Bin .../plugin-Construction.xml | 6 +- src/ExchangePlugin/CMakeLists.txt | 6 ++ .../icons/export.png | Bin .../icons/import.png | Bin src/ExchangePlugin/plugin-Exchange.xml | 4 +- src/FeaturesPlugin/CMakeLists.txt | 52 +++++++++ src/FeaturesPlugin/boolean_widget.xml | 2 +- src/FeaturesPlugin/extrusion_widget.xml | 18 ++-- src/FeaturesPlugin/extrusioncut_widget.xml | 22 ++-- src/FeaturesPlugin/extrusionfuse_widget.xml | 22 ++-- .../icons/angle.png | Bin .../icons/angle_down.png | Bin .../icons/angle_up.png | Bin .../icons/angle_up_down.png | Bin .../icons/angle_up_down_32x32.png | Bin src/FeaturesPlugin/icons/axis.png | Bin 0 -> 424 bytes .../icons/bool_common.png | Bin .../icons/bool_cut.png | Bin .../icons/bool_fuse.png | Bin .../icons/bool_smash.png | Bin .../icons/common.png | Bin src/{PartSet => FeaturesPlugin}/icons/cut.png | Bin .../icons/cut_shape.png | Bin .../icons/cut_tool.png | Bin .../icons/dimension_down.png | Bin .../icons/dimension_down_32x32.png | Bin .../icons/dimension_up.png | Bin .../icons/dimension_up_32x32.png | Bin .../icons/dimension_up_down.png | Bin .../icons/dimension_up_down_32x32.png | Bin .../icons/dimension_v.png | Bin .../icons/dimension_v_32x32.png | Bin .../icons/dimension_vert_32x32.png | Bin .../icons/extrusion.png | Bin .../icons/extrusion_cut.png | Bin .../icons/extrusion_fuse.png | Bin .../icons/extrusionsketch.png | Bin .../icons/feature_wire.png | Bin .../icons/fusion.png | Bin .../icons/intersection.png | Bin .../icons/movement.png | Bin .../icons/partition.png | Bin .../icons/pipe.png | Bin .../icons/pipe_binormal_32x32.png | Bin .../icons/pipe_locations_32x32.png | Bin .../icons/pipe_simple_32x32.png | Bin .../icons/placement.png | Bin .../icons/placement_from.png | Bin .../icons/placement_to.png | Bin src/FeaturesPlugin/icons/plane.png | Bin 0 -> 538 bytes .../icons/plane_inverted.png | Bin .../icons/plane_inverted_32x32.png | Bin .../icons/revol_cut.png | Bin .../icons/revol_fuse.png | Bin .../icons/revolsketch.png | Bin .../icons/rotation.png | Bin .../icons/shape_group.png | Bin .../icons/sketch.png | Bin src/FeaturesPlugin/intersection_widget.xml | 4 +- src/FeaturesPlugin/partition_widget.xml | 4 +- src/FeaturesPlugin/pipe_widget.xml | 6 +- src/FeaturesPlugin/placement_widget.xml | 6 +- src/FeaturesPlugin/plugin-Features.xml | 30 +++--- .../icons => FeaturesPlugin}/revol.png | Bin src/FeaturesPlugin/revolution_widget.xml | 18 ++-- src/FeaturesPlugin/revolutioncut_widget.xml | 22 ++-- src/FeaturesPlugin/revolutionfuse_widget.xml | 22 ++-- src/FeaturesPlugin/rotation_widget.xml | 6 +- src/FeaturesPlugin/translation_widget.xml | 6 +- src/ModuleBase/ModuleBase_ActionInfo.cpp | 3 +- src/PartSet/PartSet_icons.qrc | 102 ++---------------- src/PartSetPlugin/CMakeLists.txt | 6 ++ .../icons/duplicate.png | Bin .../icons/remove.png | Bin src/PartSetPlugin/plugin-PartSet.xml | 4 +- src/SketchPlugin/CMakeLists.txt | 39 ++++++- src/SketchPlugin/icons/angle.png | Bin 0 -> 499 bytes .../icons/angle_backward.png | Bin .../icons/angle_complementary.png | Bin .../icons/angle_constr.png | Bin .../icons/angle_direct.png | Bin .../icons/angle_up_32x32.png | Bin .../icons/angle_up_full_32x32.png | Bin src/{PartSet => SketchPlugin}/icons/arc.png | Bin .../icons/arc_3pt_32x32.png | Bin .../icons/arc_base_32x32.png | Bin .../icons/arc_tang_32x32.png | Bin src/SketchPlugin/icons/circle.png | Bin 0 -> 586 bytes .../icons/circle_3pt_32x32.png | Bin .../icons/circle_pt_rad_32x32.png | Bin .../icons/coincedence.png | Bin .../icons/collinear.png | Bin .../icons/distance.png | Bin src/{PartSet => SketchPlugin}/icons/equal.png | Bin .../icons/fillet.png | Bin src/{PartSet => SketchPlugin}/icons/fixed.png | Bin .../icons/horisontal.png | Bin .../icons/intersection_point.png | Bin .../icons/length.png | Bin src/{PartSet => SketchPlugin}/icons/line.png | Bin .../icons/middlepoint.png | Bin .../icons/mirror.png | Bin src/SketchPlugin/icons/parallel.png | Bin .../icons/perpendicular.png | Bin .../icons/plane_view.png | Bin src/SketchPlugin/icons/point.png | Bin 0 -> 486 bytes .../icons/radius.png | Bin .../icons/radius_constr.png | Bin .../icons/rotate.png | Bin src/SketchPlugin/icons/sketch.png | Bin 0 -> 643 bytes .../icons/tangent.png | Bin .../icons/translate.png | Bin .../icons/translate_32x32.png | Bin .../icons/translate_full_32x32.png | Bin .../icons/vertical.png | Bin src/SketchPlugin/plugin-Sketch.xml | 79 +++++++------- 127 files changed, 270 insertions(+), 244 deletions(-) rename src/{PartSet => ConnectorPlugin}/icons/geom_export.png (100%) rename src/{PartSet => ConstructionPlugin}/icons/axis.png (100%) mode change 100644 => 100755 rename src/{PartSet => ConstructionPlugin}/icons/by_two_points_32x32.png (100%) rename src/{PartSet => ConstructionPlugin}/icons/circle.png (100%) mode change 100644 => 100755 rename src/{PartSet => ConstructionPlugin}/icons/cylindrical_face_32x32.png (100%) rename src/{PartSet => ConstructionPlugin}/icons/plane.png (100%) mode change 100644 => 100755 rename src/{PartSet => ConstructionPlugin}/icons/plane_32x32.png (100%) rename src/{PartSet => ConstructionPlugin}/icons/point.png (100%) mode change 100644 => 100755 rename src/{PartSet => ExchangePlugin}/icons/export.png (100%) rename src/{PartSet => ExchangePlugin}/icons/import.png (100%) rename src/{PartSet => FeaturesPlugin}/icons/angle.png (100%) mode change 100644 => 100755 rename src/{PartSet => FeaturesPlugin}/icons/angle_down.png (100%) rename src/{PartSet => FeaturesPlugin}/icons/angle_up.png (100%) rename src/{PartSet => FeaturesPlugin}/icons/angle_up_down.png (100%) rename src/{PartSet => FeaturesPlugin}/icons/angle_up_down_32x32.png (100%) create mode 100644 src/FeaturesPlugin/icons/axis.png rename src/{PartSet => FeaturesPlugin}/icons/bool_common.png (100%) rename src/{PartSet => FeaturesPlugin}/icons/bool_cut.png (100%) rename src/{PartSet => FeaturesPlugin}/icons/bool_fuse.png (100%) rename src/{PartSet => FeaturesPlugin}/icons/bool_smash.png (100%) rename src/{PartSet => FeaturesPlugin}/icons/common.png (100%) rename src/{PartSet => FeaturesPlugin}/icons/cut.png (100%) rename src/{PartSet => FeaturesPlugin}/icons/cut_shape.png (100%) rename src/{PartSet => FeaturesPlugin}/icons/cut_tool.png (100%) rename src/{PartSet => FeaturesPlugin}/icons/dimension_down.png (100%) rename src/{PartSet => FeaturesPlugin}/icons/dimension_down_32x32.png (100%) rename src/{PartSet => FeaturesPlugin}/icons/dimension_up.png (100%) rename src/{PartSet => FeaturesPlugin}/icons/dimension_up_32x32.png (100%) rename src/{PartSet => FeaturesPlugin}/icons/dimension_up_down.png (100%) rename src/{PartSet => FeaturesPlugin}/icons/dimension_up_down_32x32.png (100%) rename src/{PartSet => FeaturesPlugin}/icons/dimension_v.png (100%) rename src/{PartSet => FeaturesPlugin}/icons/dimension_v_32x32.png (100%) rename src/{PartSet => FeaturesPlugin}/icons/dimension_vert_32x32.png (100%) rename src/{PartSet => FeaturesPlugin}/icons/extrusion.png (100%) rename src/{PartSet => FeaturesPlugin}/icons/extrusion_cut.png (100%) rename src/{PartSet => FeaturesPlugin}/icons/extrusion_fuse.png (100%) rename src/{PartSet => FeaturesPlugin}/icons/extrusionsketch.png (100%) rename src/{PartSet => FeaturesPlugin}/icons/feature_wire.png (100%) rename src/{PartSet => FeaturesPlugin}/icons/fusion.png (100%) rename src/{PartSet => FeaturesPlugin}/icons/intersection.png (100%) rename src/{PartSet => FeaturesPlugin}/icons/movement.png (100%) rename src/{PartSet => FeaturesPlugin}/icons/partition.png (100%) rename src/{PartSet => FeaturesPlugin}/icons/pipe.png (100%) rename src/{PartSet => FeaturesPlugin}/icons/pipe_binormal_32x32.png (100%) rename src/{PartSet => FeaturesPlugin}/icons/pipe_locations_32x32.png (100%) rename src/{PartSet => FeaturesPlugin}/icons/pipe_simple_32x32.png (100%) rename src/{PartSet => FeaturesPlugin}/icons/placement.png (100%) rename src/{PartSet => FeaturesPlugin}/icons/placement_from.png (100%) rename src/{PartSet => FeaturesPlugin}/icons/placement_to.png (100%) create mode 100644 src/FeaturesPlugin/icons/plane.png rename src/{PartSet => FeaturesPlugin}/icons/plane_inverted.png (100%) rename src/{PartSet => FeaturesPlugin}/icons/plane_inverted_32x32.png (100%) rename src/{PartSet => FeaturesPlugin}/icons/revol_cut.png (100%) rename src/{PartSet => FeaturesPlugin}/icons/revol_fuse.png (100%) rename src/{PartSet => FeaturesPlugin}/icons/revolsketch.png (100%) rename src/{PartSet => FeaturesPlugin}/icons/rotation.png (100%) rename src/{PartSet => FeaturesPlugin}/icons/shape_group.png (100%) rename src/{PartSet => FeaturesPlugin}/icons/sketch.png (100%) mode change 100644 => 100755 rename src/{PartSet/icons => FeaturesPlugin}/revol.png (100%) rename src/{PartSet => PartSetPlugin}/icons/duplicate.png (100%) rename src/{PartSet => PartSetPlugin}/icons/remove.png (100%) create mode 100644 src/SketchPlugin/icons/angle.png rename src/{PartSet => SketchPlugin}/icons/angle_backward.png (100%) rename src/{PartSet => SketchPlugin}/icons/angle_complementary.png (100%) rename src/{PartSet => SketchPlugin}/icons/angle_constr.png (100%) rename src/{PartSet => SketchPlugin}/icons/angle_direct.png (100%) rename src/{PartSet => SketchPlugin}/icons/angle_up_32x32.png (100%) rename src/{PartSet => SketchPlugin}/icons/angle_up_full_32x32.png (100%) rename src/{PartSet => SketchPlugin}/icons/arc.png (100%) rename src/{PartSet => SketchPlugin}/icons/arc_3pt_32x32.png (100%) rename src/{PartSet => SketchPlugin}/icons/arc_base_32x32.png (100%) rename src/{PartSet => SketchPlugin}/icons/arc_tang_32x32.png (100%) create mode 100644 src/SketchPlugin/icons/circle.png rename src/{PartSet => SketchPlugin}/icons/circle_3pt_32x32.png (100%) rename src/{PartSet => SketchPlugin}/icons/circle_pt_rad_32x32.png (100%) rename src/{PartSet => SketchPlugin}/icons/coincedence.png (100%) rename src/{PartSet => SketchPlugin}/icons/collinear.png (100%) rename src/{PartSet => SketchPlugin}/icons/distance.png (100%) rename src/{PartSet => SketchPlugin}/icons/equal.png (100%) rename src/{PartSet => SketchPlugin}/icons/fillet.png (100%) rename src/{PartSet => SketchPlugin}/icons/fixed.png (100%) rename src/{PartSet => SketchPlugin}/icons/horisontal.png (100%) rename src/{PartSet => SketchPlugin}/icons/intersection_point.png (100%) rename src/{PartSet => SketchPlugin}/icons/length.png (100%) rename src/{PartSet => SketchPlugin}/icons/line.png (100%) rename src/{PartSet => SketchPlugin}/icons/middlepoint.png (100%) rename src/{PartSet => SketchPlugin}/icons/mirror.png (100%) mode change 100644 => 100755 src/SketchPlugin/icons/parallel.png rename src/{PartSet => SketchPlugin}/icons/perpendicular.png (100%) rename src/{PartSet => SketchPlugin}/icons/plane_view.png (100%) create mode 100755 src/SketchPlugin/icons/point.png rename src/{PartSet => SketchPlugin}/icons/radius.png (100%) rename src/{PartSet => SketchPlugin}/icons/radius_constr.png (100%) rename src/{PartSet => SketchPlugin}/icons/rotate.png (100%) create mode 100644 src/SketchPlugin/icons/sketch.png rename src/{PartSet => SketchPlugin}/icons/tangent.png (100%) rename src/{PartSet => SketchPlugin}/icons/translate.png (100%) rename src/{PartSet => SketchPlugin}/icons/translate_32x32.png (100%) rename src/{PartSet => SketchPlugin}/icons/translate_full_32x32.png (100%) rename src/{PartSet => SketchPlugin}/icons/vertical.png (100%) diff --git a/src/ConnectorPlugin/CMakeLists.txt b/src/ConnectorPlugin/CMakeLists.txt index cc988831e..66d39800c 100644 --- a/src/ConnectorPlugin/CMakeLists.txt +++ b/src/ConnectorPlugin/CMakeLists.txt @@ -9,7 +9,12 @@ SET(XML_RESOURCES plugin-Connector.xml ) +SET(ICON_RESOURCES + icons/geom_export.png +) + ADD_CUSTOM_TARGET(ConnectorPlugin SOURCES ${PYTHON_FILES} ${XML_RESOURCES}) INSTALL(FILES ${PYTHON_FILES} DESTINATION ${SHAPER_INSTALL_PYTHON_FILES}) INSTALL(FILES ${XML_RESOURCES} DESTINATION ${SHAPER_INSTALL_XML_RESOURCES}) +INSTALL(FILES ${ICON_RESOURCES} DESTINATION ${SHAPER_INSTALL_XML_RESOURCES}/icons/Connector) diff --git a/src/PartSet/icons/geom_export.png b/src/ConnectorPlugin/icons/geom_export.png similarity index 100% rename from src/PartSet/icons/geom_export.png rename to src/ConnectorPlugin/icons/geom_export.png diff --git a/src/ConstructionPlugin/CMakeLists.txt b/src/ConstructionPlugin/CMakeLists.txt index 2d379a45d..2d926b9d5 100644 --- a/src/ConstructionPlugin/CMakeLists.txt +++ b/src/ConstructionPlugin/CMakeLists.txt @@ -32,12 +32,22 @@ SET(PROJECT_LIBRARIES GeomAlgoAPI ) +SET(ICON_RESOURCES + icons/axis.png + icons/by_two_points_32x32.png + icons/circle.png + icons/cylindrical_face_32x32.png + icons/plane.png + icons/point.png +) + ADD_DEFINITIONS(-DCONSTRUCTIONPLUGIN_EXPORTS) ADD_LIBRARY(ConstructionPlugin MODULE ${PROJECT_SOURCES} ${PROJECT_HEADERS} ${XML_RESOURCES}) TARGET_LINK_LIBRARIES(ConstructionPlugin ${PROJECT_LIBRARIES}) INSTALL(TARGETS ConstructionPlugin DESTINATION ${SHAPER_INSTALL_PLUGIN_FILES}) INSTALL(FILES ${XML_RESOURCES} DESTINATION ${SHAPER_INSTALL_XML_RESOURCES}) +INSTALL(FILES ${ICON_RESOURCES} DESTINATION ${SHAPER_INSTALL_XML_RESOURCES}/icons/Construction) INCLUDE_DIRECTORIES( ../Config diff --git a/src/ConstructionPlugin/axis_widget.xml b/src/ConstructionPlugin/axis_widget.xml index b683cceed..4f0711c14 100644 --- a/src/ConstructionPlugin/axis_widget.xml +++ b/src/ConstructionPlugin/axis_widget.xml @@ -2,10 +2,10 @@ - + @@ -13,7 +13,7 @@ @@ -21,10 +21,10 @@ - + diff --git a/src/PartSet/icons/axis.png b/src/ConstructionPlugin/icons/axis.png old mode 100644 new mode 100755 similarity index 100% rename from src/PartSet/icons/axis.png rename to src/ConstructionPlugin/icons/axis.png diff --git a/src/PartSet/icons/by_two_points_32x32.png b/src/ConstructionPlugin/icons/by_two_points_32x32.png similarity index 100% rename from src/PartSet/icons/by_two_points_32x32.png rename to src/ConstructionPlugin/icons/by_two_points_32x32.png diff --git a/src/PartSet/icons/circle.png b/src/ConstructionPlugin/icons/circle.png old mode 100644 new mode 100755 similarity index 100% rename from src/PartSet/icons/circle.png rename to src/ConstructionPlugin/icons/circle.png diff --git a/src/PartSet/icons/cylindrical_face_32x32.png b/src/ConstructionPlugin/icons/cylindrical_face_32x32.png similarity index 100% rename from src/PartSet/icons/cylindrical_face_32x32.png rename to src/ConstructionPlugin/icons/cylindrical_face_32x32.png diff --git a/src/PartSet/icons/plane.png b/src/ConstructionPlugin/icons/plane.png old mode 100644 new mode 100755 similarity index 100% rename from src/PartSet/icons/plane.png rename to src/ConstructionPlugin/icons/plane.png diff --git a/src/PartSet/icons/plane_32x32.png b/src/ConstructionPlugin/icons/plane_32x32.png similarity index 100% rename from src/PartSet/icons/plane_32x32.png rename to src/ConstructionPlugin/icons/plane_32x32.png diff --git a/src/PartSet/icons/point.png b/src/ConstructionPlugin/icons/point.png old mode 100644 new mode 100755 similarity index 100% rename from src/PartSet/icons/point.png rename to src/ConstructionPlugin/icons/point.png diff --git a/src/ConstructionPlugin/plugin-Construction.xml b/src/ConstructionPlugin/plugin-Construction.xml index aad7e762a..5ee7c849f 100644 --- a/src/ConstructionPlugin/plugin-Construction.xml +++ b/src/ConstructionPlugin/plugin-Construction.xml @@ -7,21 +7,21 @@ id="Point" title="Point" tooltip="Create point" - icon=":icons/point.png"> + icon="icons/Construction/point.png"> + icon="icons/Construction/axis.png"> + icon="icons/Construction/plane.png"> diff --git a/src/ExchangePlugin/CMakeLists.txt b/src/ExchangePlugin/CMakeLists.txt index 73d251f10..d170f309f 100644 --- a/src/ExchangePlugin/CMakeLists.txt +++ b/src/ExchangePlugin/CMakeLists.txt @@ -39,6 +39,11 @@ SET(PROJECT_LIBRARIES GeomAlgoAPI ) +SET(ICON_RESOURCES + icons/export.png + icons/import.png +) + ADD_DEFINITIONS(-DEXCHANGEPLUGIN_EXPORTS) ADD_LIBRARY(ExchangePlugin MODULE ${PROJECT_SOURCES} ${PROJECT_HEADERS} ${XML_RESOURCES}) @@ -46,6 +51,7 @@ TARGET_LINK_LIBRARIES(ExchangePlugin ${PROJECT_LIBRARIES}) INSTALL(TARGETS ExchangePlugin DESTINATION ${SHAPER_INSTALL_PLUGIN_FILES}) INSTALL(FILES ${XML_RESOURCES} DESTINATION ${SHAPER_INSTALL_XML_RESOURCES}) +INSTALL(FILES ${ICON_RESOURCES} DESTINATION ${SHAPER_INSTALL_XML_RESOURCES}/icons/Exchange) ADD_UNIT_TESTS(TestImport.py TestExport.py) diff --git a/src/PartSet/icons/export.png b/src/ExchangePlugin/icons/export.png similarity index 100% rename from src/PartSet/icons/export.png rename to src/ExchangePlugin/icons/export.png diff --git a/src/PartSet/icons/import.png b/src/ExchangePlugin/icons/import.png similarity index 100% rename from src/PartSet/icons/import.png rename to src/ExchangePlugin/icons/import.png diff --git a/src/ExchangePlugin/plugin-Exchange.xml b/src/ExchangePlugin/plugin-Exchange.xml index 1dfef175e..9555ff2ee 100644 --- a/src/ExchangePlugin/plugin-Exchange.xml +++ b/src/ExchangePlugin/plugin-Exchange.xml @@ -3,12 +3,12 @@ - + - + diff --git a/src/FeaturesPlugin/CMakeLists.txt b/src/FeaturesPlugin/CMakeLists.txt index 3e9bbfd27..3e8e87e19 100644 --- a/src/FeaturesPlugin/CMakeLists.txt +++ b/src/FeaturesPlugin/CMakeLists.txt @@ -89,12 +89,64 @@ SET(PROJECT_LIBRARIES GeomValidators ) +SET(ICON_RESOURCES + icons/angle.png + icons/angle_down.png + icons/angle_up.png + icons/angle_up_down.png + icons/angle_up_down_32x32.png + icons/axis.png + icons/bool_common.png + icons/bool_cut.png + icons/bool_fuse.png + icons/bool_smash.png + icons/common.png + icons/cut.png + icons/cut_shape.png + icons/cut_tool.png + icons/dimension_down.png + icons/dimension_down_32x32.png + icons/dimension_up.png + icons/dimension_up_32x32.png + icons/dimension_up_down.png + icons/dimension_up_down_32x32.png + icons/dimension_v.png + icons/dimension_v_32x32.png + icons/dimension_vert_32x32.png + icons/extrusion.png + icons/extrusion_cut.png + icons/extrusion_fuse.png + icons/extrusionsketch.png + icons/feature_wire.png + icons/fusion.png + icons/intersection.png + icons/movement.png + icons/partition.png + icons/pipe.png + icons/pipe_binormal_32x32.png + icons/pipe_locations_32x32.png + icons/pipe_simple_32x32.png + icons/placement.png + icons/placement_from.png + icons/placement_to.png + icons/plane.png + icons/plane_inverted.png + icons/plane_inverted_32x32.png + icons/revol_cut.png + icons/revol_fuse.png + icons/revolsketch.png + icons/rotation.png + icons/shape_group.png + icons/sketch.png +) + ADD_DEFINITIONS(-DFEATURESPLUGIN_EXPORTS) ADD_LIBRARY(FeaturesPlugin MODULE ${PROJECT_SOURCES} ${PROJECT_HEADERS} ${XML_RESOURCES}) TARGET_LINK_LIBRARIES(FeaturesPlugin ${PROJECT_LIBRARIES}) INSTALL(TARGETS FeaturesPlugin DESTINATION ${SHAPER_INSTALL_PLUGIN_FILES}) INSTALL(FILES ${XML_RESOURCES} DESTINATION ${SHAPER_INSTALL_XML_RESOURCES}) +INSTALL(FILES ${ICON_RESOURCES} DESTINATION ${SHAPER_INSTALL_XML_RESOURCES}/icons/Features) ADD_UNIT_TESTS(TestExtrusion.py TestExtrusionCut.py diff --git a/src/FeaturesPlugin/boolean_widget.xml b/src/FeaturesPlugin/boolean_widget.xml index 75be156a4..109fa58cb 100644 --- a/src/FeaturesPlugin/boolean_widget.xml +++ b/src/FeaturesPlugin/boolean_widget.xml @@ -8,7 +8,7 @@ tooltip="Type of boolean operation" string_list="Cut Fuse Common Smash" use_in_title="true" - icons_list=":icons/bool_cut.png :icons/bool_fuse.png :icons/bool_common.png :icons/bool_smash.png" + icons_list="icons/Features/bool_cut.png :icons/bool_fuse.png :icons/bool_common.png :icons/bool_smash.png" default="0" /> + icon="icons/Features/dimension_up_down_32x32.png"> @@ -41,16 +41,16 @@ label="Size" step="1.0" default="0" - icon=":icons/dimension_down.png" + icon="icons/Features/dimension_down.png" tooltip="From size"/> + icon="icons/Features/plane_inverted_32x32.png"> diff --git a/src/FeaturesPlugin/extrusioncut_widget.xml b/src/FeaturesPlugin/extrusioncut_widget.xml index 7f6bf48ff..833f390ef 100755 --- a/src/FeaturesPlugin/extrusioncut_widget.xml +++ b/src/FeaturesPlugin/extrusioncut_widget.xml @@ -13,13 +13,13 @@ - + @@ -44,15 +44,15 @@ label="Size" step="1.0" default="10" - icon=":icons/dimension_down.png" + icon="icons/Features/dimension_down.png" tooltip="From size"> - + @@ -85,7 +85,7 @@ diff --git a/src/FeaturesPlugin/extrusionfuse_widget.xml b/src/FeaturesPlugin/extrusionfuse_widget.xml index f6d9675c9..9dfda52f4 100644 --- a/src/FeaturesPlugin/extrusionfuse_widget.xml +++ b/src/FeaturesPlugin/extrusionfuse_widget.xml @@ -13,13 +13,13 @@ - + @@ -44,15 +44,15 @@ label="Size" step="1.0" default="0" - icon=":icons/dimension_down.png" + icon="icons/Features/dimension_down.png" tooltip="From size"> - + @@ -85,7 +85,7 @@ diff --git a/src/PartSet/icons/angle.png b/src/FeaturesPlugin/icons/angle.png old mode 100644 new mode 100755 similarity index 100% rename from src/PartSet/icons/angle.png rename to src/FeaturesPlugin/icons/angle.png diff --git a/src/PartSet/icons/angle_down.png b/src/FeaturesPlugin/icons/angle_down.png similarity index 100% rename from src/PartSet/icons/angle_down.png rename to src/FeaturesPlugin/icons/angle_down.png diff --git a/src/PartSet/icons/angle_up.png b/src/FeaturesPlugin/icons/angle_up.png similarity index 100% rename from src/PartSet/icons/angle_up.png rename to src/FeaturesPlugin/icons/angle_up.png diff --git a/src/PartSet/icons/angle_up_down.png b/src/FeaturesPlugin/icons/angle_up_down.png similarity index 100% rename from src/PartSet/icons/angle_up_down.png rename to src/FeaturesPlugin/icons/angle_up_down.png diff --git a/src/PartSet/icons/angle_up_down_32x32.png b/src/FeaturesPlugin/icons/angle_up_down_32x32.png similarity index 100% rename from src/PartSet/icons/angle_up_down_32x32.png rename to src/FeaturesPlugin/icons/angle_up_down_32x32.png diff --git a/src/FeaturesPlugin/icons/axis.png b/src/FeaturesPlugin/icons/axis.png new file mode 100644 index 0000000000000000000000000000000000000000..015d270bf903df722969fc04095d01e7464170f5 GIT binary patch literal 424 zcmV;Z0ayNsP)ZyQB{&gHt)}APb$D<$`;Bw z<=IGd6|@2}jR44nl_2W{>niLGG(>C0M$qk=5VZZb{NCl#O7PqW?}1Gq`l)LDrE&IZ zCCIwI1G24R)<7Qm+e;1LUqQwxxr!Vkru1|bo{U8@5A4772>YU#H)g!RL#YyJ(5as{ zhs})KAmjRZl%qI!q#(T*EP+%}DaOG=1!>POh~W^GV&~?x6$cLprrh$fs2m7p#RdkD zwBs)Ty8`11Il&a#*Ws-V43GkLfSIpfG?T#4KVjlm{*eU!7Hj~Iz#XuaRPYHVD`q^4 SbHEe;0000oRACgxf9H0m`$2>x%$HzU3!|boA`P^hA%e)6 zLU19tDgT0uR<&s{&|e^}+lkgf5@uIsSb>W`YN3eWnC19E1aDq_kBer;ggfH82VNd{ z_`T;m98{H7FPSesPv(mcj$%YriBqaj$^eVN25@1mGGXF4C-(PWJpz0n3k;?^`3wO&FwtiH`%dMEBZg4F92LqZ%OchFD z;0G^V_e2{YfMd)~mpJTtC%qLBq@GJ-c@#z4ZevmygfFgMzH;lv^_(Yl=Iw{~c%DbD zr}tcQqX;7Kd2UYM&CV>i0NI=O`rFU6_uU^H@)C(ev)=r-uY_U9rS6M|YOmL7OwZ2z zHpbkMWWLzx`~H_F4{s>s>PU5JY}5^d@Kt|b=~OnI z!CH#~YApa(6;zw9s=R(P`DeXWo32icjRMHo+XJ6=qUai+BBBDyf!hNYMX @@ -12,7 +12,7 @@ - - + + - + @@ -11,13 +11,13 @@ diff --git a/src/FeaturesPlugin/plugin-Features.xml b/src/FeaturesPlugin/plugin-Features.xml index 0ca6daa42..a6e7f8bd1 100644 --- a/src/FeaturesPlugin/plugin-Features.xml +++ b/src/FeaturesPlugin/plugin-Features.xml @@ -3,47 +3,47 @@ - + - + - + - + - + - + - + - + - - - + @@ -51,20 +51,20 @@ + icon="icons/Features/shape_group.png"> - + - + - + diff --git a/src/PartSet/icons/revol.png b/src/FeaturesPlugin/revol.png similarity index 100% rename from src/PartSet/icons/revol.png rename to src/FeaturesPlugin/revol.png diff --git a/src/FeaturesPlugin/revolution_widget.xml b/src/FeaturesPlugin/revolution_widget.xml index facc8895d..c0a535da7 100644 --- a/src/FeaturesPlugin/revolution_widget.xml +++ b/src/FeaturesPlugin/revolution_widget.xml @@ -17,7 +17,7 @@ + icon="icons/Features/angle_up_down_32x32.png"> @@ -41,16 +41,16 @@ label="Angle" step="1.0" default="0" - icon=":icons/angle_down.png" + icon="icons/Features/angle_down.png" tooltip="From angle"/> + icon="icons/Features/plane_inverted_32x32.png"> diff --git a/src/FeaturesPlugin/revolutioncut_widget.xml b/src/FeaturesPlugin/revolutioncut_widget.xml index 06730b5e1..25e82fe45 100644 --- a/src/FeaturesPlugin/revolutioncut_widget.xml +++ b/src/FeaturesPlugin/revolutioncut_widget.xml @@ -13,13 +13,13 @@ - + @@ -44,15 +44,15 @@ label="Angle" step="1.0" default="0" - icon=":icons/angle_down.png" + icon="icons/Features/angle_down.png" tooltip="From angle"> - + @@ -85,7 +85,7 @@ diff --git a/src/FeaturesPlugin/revolutionfuse_widget.xml b/src/FeaturesPlugin/revolutionfuse_widget.xml index e023b8ed4..633b1ca2a 100644 --- a/src/FeaturesPlugin/revolutionfuse_widget.xml +++ b/src/FeaturesPlugin/revolutionfuse_widget.xml @@ -13,13 +13,13 @@ - + @@ -44,15 +44,15 @@ label="Angle" step="1.0" default="10" - icon=":icons/angle_down.png" + icon="icons/Features/angle_down.png" tooltip="From angle"> - + @@ -85,7 +85,7 @@ diff --git a/src/FeaturesPlugin/rotation_widget.xml b/src/FeaturesPlugin/rotation_widget.xml index 002fbee48..9cb633f12 100755 --- a/src/FeaturesPlugin/rotation_widget.xml +++ b/src/FeaturesPlugin/rotation_widget.xml @@ -3,7 +3,7 @@ \ No newline at end of file diff --git a/src/FeaturesPlugin/translation_widget.xml b/src/FeaturesPlugin/translation_widget.xml index 2a1505aa0..29eb3a45d 100644 --- a/src/FeaturesPlugin/translation_widget.xml +++ b/src/FeaturesPlugin/translation_widget.xml @@ -3,14 +3,14 @@ \ No newline at end of file diff --git a/src/ModuleBase/ModuleBase_ActionInfo.cpp b/src/ModuleBase/ModuleBase_ActionInfo.cpp index cca4e569a..897805b73 100644 --- a/src/ModuleBase/ModuleBase_ActionInfo.cpp +++ b/src/ModuleBase/ModuleBase_ActionInfo.cpp @@ -7,6 +7,7 @@ */ #include +#include ModuleBase_ActionInfo::ModuleBase_ActionInfo() { @@ -54,7 +55,7 @@ void ModuleBase_ActionInfo::initFrom(std::shared_ptr theM id = QString::fromStdString(theMessage->id()); iconFile = QString::fromStdString(theMessage->icon()); if (!iconFile.isEmpty()) { - icon = QIcon(iconFile); + icon = ModuleBase_IconFactory::loadIcon(iconFile); } text = QString::fromStdString(theMessage->text()); toolTip = QString::fromStdString(theMessage->tooltip()); diff --git a/src/PartSet/PartSet_icons.qrc b/src/PartSet/PartSet_icons.qrc index 87a2d7dc9..4bf265160 100644 --- a/src/PartSet/PartSet_icons.qrc +++ b/src/PartSet/PartSet_icons.qrc @@ -1,105 +1,15 @@ - icons/angle.png + icons/activate.png icons/angle_32x32.png - icons/angle_backward.png - icons/angle_up.png - icons/angle_direct.png - icons/angle_down.png - icons/angle_complementary.png - icons/arc.png - icons/arc_base_32x32.png - icons/arc_3pt_32x32.png - icons/arc_tang_32x32.png - icons/circle.png - icons/circle_pt_rad_32x32.png - icons/circle_3pt_32x32.png icons/color.png - icons/point.png - icons/plane.png - icons/plane_inverted.png - icons/plane_inverted_32x32.png - icons/axis.png - icons/duplicate.png - icons/remove.png - icons/extrusion.png - icons/extrusionsketch.png - icons/cut.png - icons/cut_tool.png - icons/cut_shape.png - icons/fusion.png - icons/revol.png - icons/revolsketch.png - icons/revol_cut.png - icons/revol_fuse.png - icons/common.png - icons/import.png - icons/export.png - icons/line.png - icons/sketch.png - icons/sketch_shape.png - icons/hand_point.png - icons/dimension_up.png - icons/dimension_up_32x32.png - icons/dimension_down.png - icons/dimension_v.png - icons/radius.png - icons/perpendicular.png - icons/partition.png - icons/length.png - icons/distance.png - icons/radius_constr.png - icons/shape_group.png - icons/fixed.png - icons/placement.png - icons/placement_from.png - icons/placement_to.png - icons/geom_export.png - icons/horisontal.png - icons/vertical.png - icons/equal.png - icons/tangent.png - icons/fillet.png - icons/coincedence.png - icons/mirror.png - icons/translate.png - icons/translate_32x32.png - icons/translate_full_32x32.png - icons/rotate.png - icons/exec_state_failed.png - icons/exec_state_invalid_parameters.png - icons/activate.png icons/deactivate.png icons/edit.png - icons/rotation.png - icons/movement.png - icons/extrusion_cut.png - icons/extrusion_fuse.png - icons/angle_constr.png - icons/angle_up_32x32.png - icons/angle_up_down.png - icons/angle_up_down_32x32.png - icons/angle_up_full_32x32.png - icons/dimension_up_down.png - icons/dimension_up_down_32x32.png - icons/by_two_points_32x32.png - icons/cylindrical_face_32x32.png - icons/dimension_vert_32x32.png - icons/bool_cut.png - icons/bool_fuse.png - icons/bool_common.png - icons/bool_smash.png - icons/plane_view.png - icons/collinear.png - icons/middlepoint.png - icons/rectangle.png - icons/intersection_point.png - icons/intersection.png + icons/exec_state_failed.png + icons/exec_state_invalid_parameters.png + icons/hand_point.png icons/move_to_end.png - icons/pipe.png - icons/pipe_simple_32x32.png - icons/pipe_binormal_32x32.png - icons/pipe_locations_32x32.png - icons/feature_wire.png + icons/rectangle.png + icons/sketch_shape.png diff --git a/src/PartSetPlugin/CMakeLists.txt b/src/PartSetPlugin/CMakeLists.txt index c644b807b..5204a076c 100644 --- a/src/PartSetPlugin/CMakeLists.txt +++ b/src/PartSetPlugin/CMakeLists.txt @@ -31,5 +31,11 @@ INCLUDE_DIRECTORIES( ../GeomAPI ) +SET(ICON_RESOURCES + icons/duplicate.png + icons/remove.png +) + INSTALL(TARGETS PartSetPlugin DESTINATION ${SHAPER_INSTALL_PLUGIN_FILES}) INSTALL(FILES ${XML_RESOURCES} DESTINATION ${SHAPER_INSTALL_XML_RESOURCES}) +INSTALL(FILES ${ICON_RESOURCES} DESTINATION ${SHAPER_INSTALL_XML_RESOURCES}/icons/PartSet) diff --git a/src/PartSet/icons/duplicate.png b/src/PartSetPlugin/icons/duplicate.png similarity index 100% rename from src/PartSet/icons/duplicate.png rename to src/PartSetPlugin/icons/duplicate.png diff --git a/src/PartSet/icons/remove.png b/src/PartSetPlugin/icons/remove.png similarity index 100% rename from src/PartSet/icons/remove.png rename to src/PartSetPlugin/icons/remove.png diff --git a/src/PartSetPlugin/plugin-PartSet.xml b/src/PartSetPlugin/plugin-PartSet.xml index 47055abfa..3ec3f874c 100644 --- a/src/PartSetPlugin/plugin-PartSet.xml +++ b/src/PartSetPlugin/plugin-PartSet.xml @@ -8,12 +8,12 @@ icon=":pictures/part_ico.png"/> diff --git a/src/SketchPlugin/CMakeLists.txt b/src/SketchPlugin/CMakeLists.txt index 165ad0f42..8740502f4 100644 --- a/src/SketchPlugin/CMakeLists.txt +++ b/src/SketchPlugin/CMakeLists.txt @@ -102,12 +102,49 @@ INCLUDE_DIRECTORIES( ) SET(ICON_RESOURCES + icons/angle.png + icons/angle_backward.png + icons/angle_complementary.png + icons/angle_constr.png + icons/angle_direct.png + icons/angle_up_32x32.png + icons/angle_up_full_32x32.png + icons/arc.png + icons/arc_3pt_32x32.png + icons/arc_base_32x32.png + icons/arc_tang_32x32.png + icons/circle.png + icons/circle_3pt_32x32.png + icons/circle_pt_rad_32x32.png + icons/coincedence.png + icons/collinear.png + icons/distance.png + icons/equal.png + icons/fillet.png + icons/fixed.png + icons/horisontal.png + icons/intersection_point.png + icons/length.png + icons/line.png + icons/middlepoint.png + icons/mirror.png icons/parallel.png + icons/perpendicular.png + icons/point.png + icons/radius.png + icons/radius_constr.png + icons/rotate.png + icons/sketch.png + icons/tangent.png + icons/translate.png + icons/translate_32x32.png + icons/translate_full_32x32.png + icons/vertical.png ) INSTALL(TARGETS SketchPlugin DESTINATION ${SHAPER_INSTALL_PLUGIN_FILES}) INSTALL(FILES ${XML_RESOURCES} DESTINATION ${SHAPER_INSTALL_XML_RESOURCES}) -INSTALL(FILES ${ICON_RESOURCES} DESTINATION ${SHAPER_INSTALL_XML_RESOURCES}) +INSTALL(FILES ${ICON_RESOURCES} DESTINATION ${SHAPER_INSTALL_XML_RESOURCES}/icons/Sketch) ADD_UNIT_TESTS(TestSketchPointLine.py TestSketchArcCircle.py diff --git a/src/SketchPlugin/icons/angle.png b/src/SketchPlugin/icons/angle.png new file mode 100644 index 0000000000000000000000000000000000000000..e401acd67fd22b2edacd3b53e3dc9c6c8a0c1469 GIT binary patch literal 499 zcmV?ss z0*&cJ^g7Vh+a{iwSL01)cH)QpAsZ+KN)@dOh9Yx<=?4(k)c@5CAc4-ltK0<7K>0_- zb8k>J0_O@BS=U;5IEdXA0?bFIG7MaPqOCDiuLY3>5uR+zJ*sQ(8Tc6>dX&jNHj6M0 zJc^}mCbjK2$<2KyxiyP1VMQkb?cu5706i z+Fe-`@UDxEjhABg_sQ*RfnB@I4E+lDO|G&oBH@1n1aqe%)$iW+(;N&%mc=$TsMin- zMb?04UjU#9=s*m>AaLyW38TPkF86>DUx0KXdIc=z>}om@J@vgrUa= zg`4QdqD=+SCTtNwi@<1YL@P)r|oM}L_)mw{R1YGm^+A96WV99nutv- zVj-INF|ZiKU@_R5#v)C-86+kN|AOEdbV9YhW8gJaRg${NH=KL#Ip6)xmrF_LBtjjr z|3e_sDj9b(NstQ+>cTU_+`22|uA6(=?17V-UI9!`tk$>o5-Cqnx_y4*Rn+39gbTlz zJN!bBR6hwf?Z(~AYJlyr^l`%VHUb=X(+AGz!w)3Fk zSiPQ;@{#~Ras<$zlk&PhZeU(StdUTkfFuFQ7}`d%jbuZJ0*D2eAq_N7RTq#XfH6Ng zyziItGkz&QBj_C9Nq{S`3Lsuv3VfPy6hFIM`pJVRs_O=3uQB)S8x!N+mJG@d{nobq zSe>WQO_%9AeF~Seq;Bqt`Q5ex0N}XO69Q&Q)dYk<3I;p(rQCUQZ%cuCk)(dvwzdL) ciH?`)9SSJ2sp2ZYhyVZp07*qoM6N<$f=AuWpa1{> literal 0 HcmV?d00001 diff --git a/src/PartSet/icons/radius.png b/src/SketchPlugin/icons/radius.png similarity index 100% rename from src/PartSet/icons/radius.png rename to src/SketchPlugin/icons/radius.png diff --git a/src/PartSet/icons/radius_constr.png b/src/SketchPlugin/icons/radius_constr.png similarity index 100% rename from src/PartSet/icons/radius_constr.png rename to src/SketchPlugin/icons/radius_constr.png diff --git a/src/PartSet/icons/rotate.png b/src/SketchPlugin/icons/rotate.png similarity index 100% rename from src/PartSet/icons/rotate.png rename to src/SketchPlugin/icons/rotate.png diff --git a/src/SketchPlugin/icons/sketch.png b/src/SketchPlugin/icons/sketch.png new file mode 100644 index 0000000000000000000000000000000000000000..d55e89c1e93ec57e4cb496a367aead0b53629633 GIT binary patch literal 643 zcmV-}0(||6P)7b*dnbiaD z<@tXKLP;s&Ao~d21I$1 zKn_j~56_yoDX?{0M@PeEkebpWNiO9_avvf3M!@xgn+nZ!3#q*0o!q%maZ{V$Y`_$r z4t|L=vuaD*@+?~n)z*ywl~8;{b8&5Tg^(L4b3h?!Qn}x%mzo4svDSL3y7KInwniu8 zPsTM>#m)Ms-HiXi$@t~eMXhr3cCT@$#xxz*I2BJYI45E zs??3UnXcJV%ijC;_&Zl%Zs}fGNLH(pYnF;mIUe@W<4p;%t|J@ + icon="icons/Sketch/sketch.png"> - - + - + @@ -37,15 +36,15 @@ id="SketchCircle" title="Circle" tooltip="Create circle" - icon=":icons/circle.png"> + icon="icons/Sketch/circle.png"> - + - + - + @@ -59,36 +58,36 @@ id="SketchArc" title="Arc" tooltip="Create arc" - icon=":icons/arc.png"> + icon="icons/Sketch/arc.png"> - + - + - + - + - + - + @@ -151,7 +150,7 @@ - + - + - + - + @@ -262,7 +261,7 @@ id="SketchConstraintDistance" title="Distance" tooltip="Set fixed distance from a point to an object" - icon=":icons/distance.png"> + icon="icons/Sketch/distance.png">