Some modifs to edit macro

diff --git a/src/PythonAddons/addons_Features.py b/src/PythonAddons/addons_Features.py
index 3da8b8f1efd9d9f6e7adf275c64e258bc1e16076..bdafa15175d1ee117315bd3e8a4c34e96da22fd6 100644 (file)
--- a/src/PythonAddons/addons_Features.py
+++ b/src/PythonAddons/addons_Features.py
@@ -24,7 +24,6 @@ import ModelAPI
 from macros.rectangle.feature import SketchPlugin_Rectangle
 from macros.compoundVertices.feature import compoundVertices
 from macros.importParameters.feature import importParameters
-from macros.box.feature import BoxFeature
 
 
 class PythonFeaturesPlugin(ModelAPI.ModelAPI_Plugin):
@@ -50,8 +49,6 @@ class PythonFeaturesPlugin(ModelAPI.ModelAPI_Plugin):
             aFeature = compoundVertices().__disown__()
         elif theFeatureID == importParameters.ID():
             aFeature = importParameters().__disown__()
-        elif theFeatureID == BoxFeature.ID():
-            aFeature = BoxFeature().__disown__()
         else:
             raise Exception("No such feature %s" % theFeatureID)
 

diff --git a/src/PythonAddons/addons_Features.xml.in b/src/PythonAddons/addons_Features.xml.in
index 1bbec06757d9953e28fd5f24a29ce7a10e1e9822..3f3b7666d7f1b41f33820f09202eaf5ddc8597c1 100644 (file)
--- a/src/PythonAddons/addons_Features.xml.in
+++ b/src/PythonAddons/addons_Features.xml.in
@@ -2,5 +2,4 @@
   <source path="@ADDONS_FOLDER_PATH@/macros/rectangle/widget.xml"/>
   <source path="@ADDONS_FOLDER_PATH@/macros/compoundVertices/widget.xml"/>
   <source path="@ADDONS_FOLDER_PATH@/macros/importParameters/widget.xml"/>
-  <source path="@ADDONS_FOLDER_PATH@/macros/box/widget.xml"/>
 </plugin>

diff --git a/src/PythonAddons/macros/compoundVertices/feature.py b/src/PythonAddons/macros/compoundVertices/feature.py
index 224a21313e08fda23a1a246923c2b4c85e8a9034..9b33c7fb50b852189f2117cecb26208043fdec95 100644 (file)
--- a/src/PythonAddons/macros/compoundVertices/feature.py
+++ b/src/PythonAddons/macros/compoundVertices/feature.py
@@ -98,4 +98,4 @@ class compoundVertices(model.Feature):
         compoundVertices feature is macro: removes itself on the creation transaction
         finish.
         """
-        return True
+        return False

diff --git a/src/PythonAddons/macros/compoundVertices/icons/import.png b/src/PythonAddons/macros/compoundVertices/icons/import.png
new file mode 100644 (file)
index 0000000..b9c993c
Binary files /dev/null and b/src/PythonAddons/macros/compoundVertices/icons/import.png differ

diff --git a/src/PythonAddons/macros/compoundVertices/widget.xml b/src/PythonAddons/macros/compoundVertices/widget.xml
index 2fa559776a9c4f4f2126f1d35e07e485aa122e84..b79e4131c4afa6259d76214e25de3159bad89e56 100644 (file)
--- a/src/PythonAddons/macros/compoundVertices/widget.xml
+++ b/src/PythonAddons/macros/compoundVertices/widget.xml
@@ -2,7 +2,7 @@
   <workbench id="Macros" document="Part">\r
     <group id="Samples">\r
 \r
-      <feature id="compoundVertices" title="Points set" tooltip="Import a set of construction points" icon="icons/import.png">\r
+      <feature id="compoundVertices" title="Points set" icon=":icons/import.png">\r
         <file_selector id="file_path" title="Import file" path="">\r
         </file_selector>\r
         <stringvalue id="separator"  label="Separator (optional): ">\r

diff --git a/src/PythonAddons/macros/importParameters/icons/paper_roll.png b/src/PythonAddons/macros/importParameters/icons/paper_roll.png
new file mode 100644 (file)
index 0000000..fc7a124
Binary files /dev/null and b/src/PythonAddons/macros/importParameters/icons/paper_roll.png differ

diff --git a/src/PythonAddons/macros/importParameters/widget.xml b/src/PythonAddons/macros/importParameters/widget.xml
index e43b86afe415a38073ac934506846214ec6258f9..537dc2326591f26da4d41a4c617470e736b9203d 100644 (file)
--- a/src/PythonAddons/macros/importParameters/widget.xml
+++ b/src/PythonAddons/macros/importParameters/widget.xml
@@ -2,7 +2,7 @@
   <workbench id="Macros" document="Part">\r
     <group id="Samples">\r
 \r
-      <feature id="importParameters" title="List of Parameters" tooltip="Import a set of parameters" icon="icons/import.png">\r
+      <feature id="importParameters" title="List of Parameters" icon=":icons/paper_roll.png">\r
         <file_selector id="file_path" title="Import file" path="">\r
         </file_selector>\r
       </feature>\r