From cea74fb26ab025f431da07791b9820028b76d0da Mon Sep 17 00:00:00 2001
From: NATHALIE GORE <ng13417n@dsp0897499.atlas.edf.fr>
Date: Tue, 27 Aug 2019 15:21:27 +0200
Subject: [PATCH] Some modifs to edit macro

---
 src/PythonAddons/addons_Features.py               |   3 ---
 src/PythonAddons/addons_Features.xml.in           |   1 -
 .../macros/compoundVertices/feature.py            |   2 +-
 .../macros/compoundVertices/icons/import.png      | Bin 0 -> 856 bytes
 .../macros/compoundVertices/widget.xml            |   2 +-
 .../macros/importParameters/icons/paper_roll.png  | Bin 0 -> 381 bytes
 .../macros/importParameters/widget.xml            |   2 +-
 7 files changed, 3 insertions(+), 7 deletions(-)
 create mode 100644 src/PythonAddons/macros/compoundVertices/icons/import.png
 create mode 100644 src/PythonAddons/macros/importParameters/icons/paper_roll.png

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 0000000000000000000000000000000000000000..b9c993cbf44fba1c9dfde6858f3237fa7edbff82
GIT binary patch
literal 856
zcmV-e1E>6nP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY4c7nw4c7reD4Tcy000McNliru;|LT95D@FDaX$b60_90W
zK~y-)eN$UV({UI*-*5l*pSRYmq0VWkWy@}8QN8p~rX{T&%INkGE#@dFh=O`5ioh3N
zj3At}6oROr8&*)$sGzdErbULbY)jExw`IHje_sz>z_8BqIUnEozH^9~@h?<W?KuZv
zEuh=ycDrv*#u5J#KWMP*WEKu)k)2@-p6S1Cn3P9<Z}9f^6i8N}Q5tT&Sgj3?7)9yg
zmt-^dqPcti(XPS5RTBDRb#-;E0H6SX)9K6*B)utW)UthLmMzsZ<HN`4``K1#CmRHG
z+Ghj<C($veR7*)9k_4dqj|FBfmn;^9B1!4J<2y$EGjAd^bt3@+O8h-cW3@2Fnvr4r
z^c?_8$#*AMID2y0tdVhRUtDjUvUKx7VrD$O>S4VcL*?=oO4E%%AdE;jj+#5W%^r{E
z!-N68CIb>W69Tzc)<o4J??C%w?(*IM04yu$DXS=M^;*|X{w)OnBqTH?15wrH1pv$J
z0vc-jriCLEc=D#G+j;cq1d+?-%3@|a5jBz1>8O}x9=$kkagH&m<P-rwQusMr{JTi6
z1ySAPNY*rMix8sw@Wu;WD#uWJZ>v8PPPPicoq|Aa-)N@s(UTaI#4rHB5N;>p2);)W
zVCEA<)F4Rfh{lYFDQ2V?Gz$RegwzYk)B*t6#=v-v&knW!I9l)b%8r426m4M`^wH#>
z*Ag_EdE&A^_Zmto=IY88b&@GLw4Rt54u>P>xc$6e(<`{zRu<|T%1#AX0%WOLeJ%Lz
zQ+`5cJH&?EG6Dee@DWV=auEggZ$ES3@p$|*H!<=z#Ni*CUh_MYR;x9bp87ShFmDJc
zmSO^ck%1m=yrgmCgK{4c5lvPmm&;{SRn-@bM$^*_q4p$IX0BP6vm%{(PTzf~EO{Ns
zQho(+4*kE4RZeDh13>A*Zd#t#g?66}Ew4)Y;+nptzP^61g8zVsnuuhlAlBV~S)8@)
iz_Z~z0F}Vp-<%)wK}NCsuv?4(0000<MNUMnLSTZ?xQFln

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..fc7a124c95c850132d2c628ed7dbe98cd61d3316
GIT binary patch
literal 381
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP*AeO
zHKHUqKdq!Zu_%?nF(p4KRlzeiF+DXXH8G{K@MNkD0|O(Mr;B4q#jT`2|Nq-J@5o-j
z#LRq{RpD8>0$&YFQuFlP*X<J;xeoAnG;Att<aY3tZxEAfSk)}ez^v#X(|o)kM!~K}
zry=ivl!6_Qclrg>l~TqF^|lVH+8bFKk{C?P%pL?(Gh{e2D(crTBq=IPYjwNIzG8=p
z05^kS8>3G~97E;>=11Qh&Tt-KbTFK-nvdzDaL&0TC-DZUM=Ve0u~czSNx0K+qfLW(
zL0f}RsJ*~u#zKL84o9*WE?m=52<1DH-q?1vF@}*hfz7Fr<B|-+l4VRElNHJux%3;@
z7BLxK+#z&|_2`l61rk2L6b<zlSQD)I-rF5WXYjbhAXRI@c)|4Z#7)LG92yvy8SZ}!
VaLS9`Gz}PZ44$rjF6*2UngC2OfbjqT

literal 0
HcmV?d00001

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>
-- 
2.30.2