Salome HOME
projects
/
modules
/
shaper.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix for the problem if disappeared sketch elements (on Apply) inside of sketch in...
[modules/shaper.git]
/
src
/
FeaturesPlugin
/
boolean_widget.xml
diff --git
a/src/FeaturesPlugin/boolean_widget.xml
b/src/FeaturesPlugin/boolean_widget.xml
index cdf755b6c21010fecaf50b1413579a93c2ceea84..53a10a97bb7b7239dff50bda2c9afe6c1a179b55 100644
(file)
--- a/
src/FeaturesPlugin/boolean_widget.xml
+++ b/
src/FeaturesPlugin/boolean_widget.xml
@@
-1,32
+1,37
@@
<!-- Copyright (C) 2014-20xx CEA/DEN, EDF R&D -->
<source>
<!-- Copyright (C) 2014-20xx CEA/DEN, EDF R&D -->
<source>
- <choice id="bool_type"
+ <
module_
choice id="bool_type"
widget_type="radiobuttons"
buttons_dir="horizontal"
label="Operation type"
tooltip="Type of boolean operation"
widget_type="radiobuttons"
buttons_dir="horizontal"
label="Operation type"
tooltip="Type of boolean operation"
- string_list="Cut Fuse Common"
- icons_list=":icons/bool_cut.png :icons/bool_fuse.png :icons/bool_common.png"
+ string_list="Cut Fuse Common Smash"
+ use_in_title="true"
+ icons_list="icons/Features/bool_cut.png icons/Features/bool_fuse.png icons/Features/bool_common.png icons/Features/bool_smash.png"
default="0"
/>
<multi_selector id="main_objects"
label="Main objects"
icon=""
default="0"
/>
<multi_selector id="main_objects"
label="Main objects"
icon=""
- tooltip="Select a solid objects"
- type_choice="Solids"
+ tooltip="Select solid objects"
+ type_choice="Solids Objects"
+ use_choice="false"
concealment="true">
<validator id="PartSet_DifferentObjects"/>
concealment="true">
<validator id="PartSet_DifferentObjects"/>
- <validator id="GeomValidators_ShapeType" parameters="empty,solid"/>
+ <!--<validator id="GeomValidators_ShapeType" parameters="empty,edge,face,solid"/>-->
+ <validator id="GeomValidators_BooleanSelection"/>
</multi_selector>
</multi_selector>
- <multi_selector id="tool_objects"
- label="Tool object
"
- icon=""
+ <multi_selector id="tool_objects"
+ label="Tool object
s"
+ icon=""
tooltip="Select a tool solid"
tooltip="Select a tool solid"
- type_choice="Solids"
+ type_choice="Solids Objects"
+ use_choice="false"
concealment="true" >
<validator id="PartSet_DifferentObjects"/>
concealment="true" >
<validator id="PartSet_DifferentObjects"/>
- <validator id="GeomValidators_ShapeType" parameters="empty,solid"/>
+ <!--<validator id="GeomValidators_ShapeType" parameters="empty,edge,face,solid"/>-->
+ <validator id="GeomValidators_BooleanSelection"/>
</multi_selector>
<validator id="GeomValidators_BooleanArguments" parameters="main_objects,tool_objects,bool_type"/>
</source>
</multi_selector>
<validator id="GeomValidators_BooleanArguments" parameters="main_objects,tool_objects,bool_type"/>
</source>