Merge branch 'master' of http://www.iramuteq.org/git/iramuteq

Conflicts:
	layout.py

diff --git a/INSTALL_WINDOWS b/INSTALL_WINDOWS
index e33ddce..b95c9c5 100644 (file)
--- a/INSTALL_WINDOWS
+++ b/INSTALL_WINDOWS
@@ -21,3 +21,8 @@ gee
 ape
 igraph
 proxy
+textometry
+
+
+pour gui2exe :
+mettre le manifeste directement dans Constants.py

diff --git a/layout.py b/layout.py
index 01b51d9..7014f3a 100644 (file)
--- a/layout.py
+++ b/layout.py
@@ -1203,8 +1203,7 @@ class FreqLayout(DefaultMatLayout) :
         self.tab = wx.html.HtmlWindow(self.ira.nb, -1)
         if "gtk2" in wx.PlatformInfo:
             self.tab.SetStandardFonts()
-        print self.pathout['resultats.html']
-        self.tab.LoadPage(self.pathout['resultats.html'])
+        self.tab.LoadPage(self.pathout['resultats.html'].replace('\\\\','/'))
         self.tab.parametres = self.parametres
         self.ira.nb.AddPage(self.tab, u"Fréquences")