Merge remote branch 'origin/V7_4_BR'

diff --git a/resources/ATOMGEN_en.xml b/resources/ATOMGEN_en.xml
index dd058b88ef1ec4f88c0d85c190f6751dbae0b667..c082e5835951a69a06b5e2ecb23f711a71810cce 100644 (file)
--- a/resources/ATOMGEN_en.xml
+++ b/resources/ATOMGEN_en.xml
@@ -33,7 +33,7 @@
 </menubar>
 
 <!-- ### TOOLBARS ###  -->
-<toolbar label-id="ATOMGEN">
+<toolbar label-id="ATOMGEN" name-id="ATOMGEN">
  <toolbutton-item item-id="4002" label-id="Run" icon-id="atomgen_run.png" tooltip-id="Runs calculations" accel-id="" toggle-id="" execute-action=""/>
 </toolbar>
 

diff --git a/resources/SalomeApp.xml.in b/resources/SalomeApp.xml.in
index 4ece67006e97bdf0f14af2e8abc54629b8447ea6..41d638df1639ce08ac84476a0a119b68fb90867a 100644 (file)
--- a/resources/SalomeApp.xml.in
+++ b/resources/SalomeApp.xml.in
@@ -32,4 +32,10 @@
  <section name="resources" >
   <parameter name="ATOMGEN" value="%ATOMGEN_ROOT_DIR%/share/salome/resources/atomgen" />
  </section>
+ <section name="windows_geometry">
+  <parameter name="ATOMGEN" value="#00 #00 #00 #FF #00 #00 #00 #00 #FD #00 #00 #00 #02 #00 #00 #00 #00 #00 #00 #01 #00 #00 #00 #02 #6B #FC #02 #00 #00 #00 #01 #FB #00 #00 #00 #22 #00 #6F #00 #62 #00 #6A #00 #65 #00 #63 #00 #74 #00 #42 #00 #72 #00 #6F #00 #77 #00 #73 #00 #65 #00 #72 #00 #44 #00 #6F #00 #63 #00 #6B #01 #00 #00 #00 #59 #00 #00 #02 #6B #00 #00 #00 #53 #00 #FF #FF #FF #00 #00 #00 #03 #00 #00 #05 #40 #00 #00 #00 #53 #FC #01 #00 #00 #00 #01 #FB #00 #00 #00 #22 #00 #70 #00 #79 #00 #74 #00 #68 #00 #6F #00 #6E #00 #43 #00 #6F #00 #6E #00 #73 #00 #6F #00 #6C #00 #65 #00 #44 #00 #6F #00 #63 #00 #6B #01 #00 #00 #00 #00 #00 #00 #05 #40 #00 #00 #00 #46 #00 #FF #FF #FF #00 #00 #04 #38 #00 #00 #02 #6B #00 #00 #00 #04 #00 #00 #00 #04 #00 #00 #00 #08 #00 #00 #00 #08 #FC #00 #00 #00 #02 #00 #00 #00 #02 #00 #00 #00 #02 #00 #00 #00 #1C #00 #53 #00 #61 #00 #6C #00 #6F #00 #6D #00 #65 #00 #53 #00 #74 #00 #61 #00 #6E #00 #64 #00 #61 #00 #72 #00 #64 #01 #00 #00 #00 #00 #FF #FF #FF #FF #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #1A #00 #53 #00 #61 #00 #6C #00 #6F #00 #6D #00 #65 #00 #4D #00 #6F #00 #64 #00 #75 #00 #6C #00 #65 #00 #73 #01 #00 #00 #00 #CE #FF #FF #FF #FF #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #02 #00 #00 #00 #01 #00 #00 #00 #0E #00 #41 #00 #54 #00 #4F #00 #4D #00 #47 #00 #45 #00 #4E #01 #00 #00 #00 #00 #FF #FF #FF #FF #00 #00 #00 #00 #00 #00 #00 #00"/>
+ </section>
+ <section name="windows_visibility">
+  <parameter name="ATOMGEN" value="#00 #00 #00 #00 #03 #00 #00 #00 #0E #00 #41 #00 #54 #00 #4F #00 #4D #00 #47 #00 #45 #00 #4E #01 #00 #00 #00 #1A #00 #53 #00 #61 #00 #6C #00 #6F #00 #6D #00 #65 #00 #4D #00 #6F #00 #64 #00 #75 #00 #6C #00 #65 #00 #73 #01 #00 #00 #00 #1C #00 #53 #00 #61 #00 #6C #00 #6F #00 #6D #00 #65 #00 #53 #00 #74 #00 #61 #00 #6E #00 #64 #00 #61 #00 #72 #00 #64 #01 #01 #00 #00 #00 #02 #00 #00 #00 #22 #00 #6F #00 #62 #00 #6A #00 #65 #00 #63 #00 #74 #00 #42 #00 #72 #00 #6F #00 #77 #00 #73 #00 #65 #00 #72 #00 #44 #00 #6F #00 #63 #00 #6B #01 #00 #00 #00 #22 #00 #70 #00 #79 #00 #74 #00 #68 #00 #6F #00 #6E #00 #43 #00 #6F #00 #6E #00 #73 #00 #6F #00 #6C #00 #65 #00 #44 #00 #6F #00 #63 #00 #6B #01"/>
+ </section>
 </document>