From: Pierre Ratinaud <ratinaud@univ-tlse2.fr>
Date: Wed, 17 Sep 2014 14:33:50 +0000 (+0200)
Subject: ...
X-Git-Url: http://iramuteq.org/git?a=commitdiff_plain;h=54d801be487adf479497f03b1ad4557863093f88;p=iramuteq

...
---

diff --git a/checkinstall.py b/checkinstall.py
index f12d5a3..34b3748 100644
--- a/checkinstall.py
+++ b/checkinstall.py
@@ -203,7 +203,7 @@ Sans ces bibliothèques, IRamuteq ne fonctionnera pas.
             dlg.Destroy()
         dial.Destroy()
     if nolib == [] : 
-        #self.pref.set('iramuteq', 'rlibs', True)
+        self.pref.set('iramuteq', 'rlibs', True)
         with open(self.ConfigPath['preferences'], 'w') as f :
             self.pref.write(f)
         return True
diff --git a/functions.py b/functions.py
index d697f16..7a24001 100644
--- a/functions.py
+++ b/functions.py
@@ -674,6 +674,11 @@ def progressbar(self, maxi) :
         parent = self.parent
     else :
         parent = self
+    try :
+        print '###horrible hack progressbar'
+        maxi = int(maxi)
+    except :
+        maxi = 1
     return wx.ProgressDialog("Traitements",
                              "Veuillez patienter...",
                              maximum=maxi,
diff --git a/guifunct.py b/guifunct.py
index f3e952b..15dc08d 100644
--- a/guifunct.py
+++ b/guifunct.py
@@ -1145,6 +1145,7 @@ class TGenFrame ( wx.Frame ):
             self.dial = CreateTgenDialog(self, dict([[i, [lem, self.corpus.lems[lem].freq]] for i, lem in enumerate(self.corpus.lems.keys())]), tgens = self.Tgen.tgen)
         else :
             self.dial = CreateTgenDialog(self, dict([[i, [lem, self.corpus.lems[lem].freq]] for i, lem in enumerate(self.corpus.lems.keys())]), tgen = tgen, tgens = self.Tgen.tgen)
+            self.dial.ip._source.selected = dict(zip(self.Tgen.tgen[tgen], self.Tgen.tgen[tgen]))
             self.activetgen = tgen
         self.dial.Show()
         self.dial.Bind(wx.EVT_CLOSE, self.OnDialClose)
diff --git a/iramuteq.py b/iramuteq.py
index 21453e9..1aee272 100644
--- a/iramuteq.py
+++ b/iramuteq.py
@@ -175,6 +175,9 @@ class IraFrame(wx.Frame):
         self.SimiFromCluster = SimiFromCluster
         #langues
         gettext.install('iramuteq',  os.path.join(AppliPath,'locale'), unicode=True)
+        #langues = ['fr_FR', 'en', 'pt_PT']
+        #for l in langues :
+        #    pass
         self.presLan_fr = gettext.translation("iramuteq", os.path.join(AppliPath,'locale'), languages=['fr_FR'])
         self.presLan_en = gettext.translation("iramuteq", os.path.join(AppliPath,'locale'), languages=['en'])
         self.setlangue()
@@ -513,6 +516,8 @@ vous devez signaler le chemin de l'éxecutable de R dans les préférences."""
             guilangue = self.pref.get('iramuteq', 'guilanguage')
             if guilangue == 'french' :
                 self.presLan_fr.install()
+            elif guilangue == 'portuguese' :
+                self.presLan_pt.install()
             else :
                 self.presLan_en.install()
             mylocale = wx.Locale(langues[guilangue])
diff --git a/tree.py b/tree.py
index 1a9b6fd..3e05977 100644
--- a/tree.py
+++ b/tree.py
@@ -903,6 +903,7 @@ class LeftTree(CT.CustomTreeCtrl):
         self.SetItemImage(item, img, CT.TreeItemIcon_Normal)
         self.SetItemImage(item, 13, CT.TreeItemIcon_Expanded)
         self.SetItemBold(item, bold)
+        self.SelectItem(item)
     
     def AddMatAnalyse(self, parametres, itemParent = None, bold = True) :
         uuid = parametres.get('matrix', None)
@@ -930,7 +931,8 @@ class LeftTree(CT.CustomTreeCtrl):
             img = 24
         self.SetItemImage(item, img, CT.TreeItemIcon_Normal)
         self.SetItemImage(item, 13, CT.TreeItemIcon_Expanded)
-        self.SetItemBold(item, bold)    
+        self.SetItemBold(item, bold)
+        self.SelectItem(item)  
         
     def OnItemAppend(self, item):
         if 'corpus_name' in item :
diff --git a/vitemspicker.py b/vitemspicker.py
index d385210..45a0746 100644
--- a/vitemspicker.py
+++ b/vitemspicker.py
@@ -180,6 +180,7 @@ The items are displayed in the selection part of the widget'''
             #          if i in selections]
             
             for item in selections :
+                print item
                 del self._source.selected[item]
             tokeep = [self._destData[i][0] for i in self._destData if self._destData[i][0] not in selections]
             self._destData = dict([[i, [word, '']] for i, word in enumerate(tokeep)])