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

diff --combined listlex.py
index 9ddd16b,ef36372..f1f4f65
--- 1/listlex.py
--- 2/listlex.py
+++ b/listlex.py
@@@ -16,6 -16,7 +16,6 @@@ import o
  import sys
  import  wx
  import  wx.lib.mixins.listctrl  as  listmix
 -import cStringIO
  import tempfile
  from functions import exec_rcode, doconcorde
  from chemins import ffr
@@@ -73,8 -74,8 +73,8 @@@ class ListForSpec(wx.ListCtrl, listmix.
              
          self.SetColumnWidth(0, 180)
  
 -        for i in range(0,len(self.first)):
 -            self.SetColumnWidth(i + 1, self.checkcolumnwidth(len(self.first[i]) * 10))
 +        for i in range(0,len(self.etoiles)):
 +            self.SetColumnWidth(i + 1, self.checkcolumnwidth(len(self.etoiles[i]) * 10))
          
          self.itemDataMap = self.dlist
          self.itemIndexMap = self.dlist.keys()
@@@ -206,7 -207,8 +206,8 @@@
                  self.Bind(wx.EVT_MENU, self.onstcaract, id = nid)
              menu.AppendMenu(-1, u"Segments de texte caractéristiques", menu_stcaract)
              #menu.Append(self.popup_Tgen_glob, "Tgen global")
-             menu.Append(self.onmaketgen, "Make Tgen")
+             if not self.tgen :
+                 menu.Append(self.onmaketgen, "Make Tgen")
              self.PopupMenu(menu)
              menu.Destroy()