# HG changeset patch
# User Edouard Tisserant
# Date 1333593721 -7200
# Node ID f8ee6fd01f7cd546410fc83614aed2a539855644
# Parent  37dc330e96a29e4c52b4ac5b0c34deaa6aeb00e4# Parent  5a036ae4d6aa848e1062c07235528191f107f4c6
branch merge

diff -r 5a036ae4d6aa -r f8ee6fd01f7c Beremiz.py
--- a/Beremiz.py	Mon Apr 02 17:36:47 2012 +0200
+++ b/Beremiz.py	Thu Apr 05 04:42:01 2012 +0200
@@ -586,7 +586,7 @@
             self.SetTitle(name)
 
     def StartLocalRuntime(self, taskbaricon = True):
-        if self.local_runtime is None or self.local_runtime.finished:
+        if (self.local_runtime is None) or (self.local_runtime.exitcode is not None):
             # create temporary directory for runtime working directory
             self.local_runtime_tmpdir = tempfile.mkdtemp()
             # choose an arbitrary random port for runtime
@@ -1871,6 +1871,6 @@
     
     frame = Beremiz(None, projectOpen, buildpath)
     splash.Close()
-    wx.Yield()
+    #wx.Yield()
     frame.Show()
     app.MainLoop()
diff -r 5a036ae4d6aa -r f8ee6fd01f7c images/icons.svg
--- a/images/icons.svg	Mon Apr 02 17:36:47 2012 +0200
+++ b/images/icons.svg	Thu Apr 05 04:42:01 2012 +0200
@@ -31,8 +31,8 @@
     </rdf:RDF>
   </metadata>
   <sodipodi:namedview
-     inkscape:window-height="1056"
-     inkscape:window-width="1920"
+     inkscape:window-height="1000"
+     inkscape:window-width="1280"
      inkscape:pageshadow="2"
      inkscape:pageopacity="0.0"
      guidetolerance="10.0"
@@ -46,7 +46,7 @@
      inkscape:zoom="0.90509668"
      inkscape:cx="574.84342"
      inkscape:cy="238.35742"
-     inkscape:window-x="0"
+     inkscape:window-x="1920"
      inkscape:window-y="24"
      inkscape:current-layer="svg2"
      showguides="true"
@@ -86415,7 +86415,7 @@
          style="font-size:35.50580597px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;stroke:none;font-family:Purisa;-inkscape-font-specification:Purisa Light"
          x="-793.12799"
          y="1077.5087"
-         id="tspan16413">January 2012</tspan></text>
+         id="tspan16413">April 2012</tspan></text>
     <text
        sodipodi:linespacing="125%"
        style="font-size:21.80060768px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;fill-opacity:1;stroke:none;font-family:Purisa;-inkscape-font-specification:Purisa Light"
@@ -86426,7 +86426,7 @@
          id="tspan17033"
          y="1111.0403"
          x="-793.12335"
-         style="font-size:21.80060768px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;stroke:none;font-family:Purisa;-inkscape-font-specification:Purisa Light">1.03 bugfix release</tspan></text>
+         style="font-size:21.80060768px;font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;text-align:center;line-height:125%;writing-mode:lr-tb;text-anchor:middle;stroke:none;font-family:Purisa;-inkscape-font-specification:Purisa Light">1.04 bugfix release</tspan></text>
   </g>
   <text
      style="font-size:51.04000092px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
diff -r 5a036ae4d6aa -r f8ee6fd01f7c images/splash.png
Binary file images/splash.png has changed