From: NATHALIE GORE <ng13417n@dsp0897499.atlas.edf.fr>
Date: Tue, 27 Aug 2019 13:21:27 +0000 (+0200)
Subject: Some modifs to edit macro
X-Git-Tag: V9_4_0a2~7^2~3
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=df98a4752151156c4735421881b7cdf4478ed5b0;p=modules%2Fshaper.git

Some modifs to edit macro
---

diff --git a/src/PythonAddons/addons_Features.py b/src/PythonAddons/addons_Features.py
index 3da8b8f1e..bdafa1517 100644
--- 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 1bbec0675..3f3b7666d 100644
--- 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 224a21313..9b33c7fb5 100644
--- 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
index 000000000..b9c993cbf
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 2fa559776..b79e4131c 100644
--- a/src/PythonAddons/macros/compoundVertices/widget.xml
+++ b/src/PythonAddons/macros/compoundVertices/widget.xml
@@ -2,7 +2,7 @@
   <workbench id="Macros" document="Part">
     <group id="Samples">
 
-      <feature id="compoundVertices" title="Points set" tooltip="Import a set of construction points" icon="icons/import.png">
+      <feature id="compoundVertices" title="Points set" icon=":icons/import.png">
         <file_selector id="file_path" title="Import file" path="">
         </file_selector>
         <stringvalue id="separator"  label="Separator (optional): ">
diff --git a/src/PythonAddons/macros/importParameters/icons/paper_roll.png b/src/PythonAddons/macros/importParameters/icons/paper_roll.png
new file mode 100644
index 000000000..fc7a124c9
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 e43b86afe..537dc2326 100644
--- a/src/PythonAddons/macros/importParameters/widget.xml
+++ b/src/PythonAddons/macros/importParameters/widget.xml
@@ -2,7 +2,7 @@
   <workbench id="Macros" document="Part">
     <group id="Samples">
 
-      <feature id="importParameters" title="List of Parameters" tooltip="Import a set of parameters" icon="icons/import.png">
+      <feature id="importParameters" title="List of Parameters" icon=":icons/paper_roll.png">
         <file_selector id="file_path" title="Import file" path="">
         </file_selector>
       </feature>