From 35feaa5dc8cbd055e732567e012780d88b92ffe5 Mon Sep 17 00:00:00 2001 From: Pierre Ratinaud Date: Wed, 10 Dec 2014 23:54:21 +0100 Subject: [PATCH] ... --- analysetxt.py | 37 ------------------------------------- functions.py | 5 ++--- iramuteq.py | 2 +- 3 files changed, 3 insertions(+), 41 deletions(-) diff --git a/analysetxt.py b/analysetxt.py index cf2b231..201e177 100644 --- a/analysetxt.py +++ b/analysetxt.py @@ -140,40 +140,3 @@ class AnalyseText : else : sleep(0.2) return check_Rresult(self.ira, pid) - - - - - - -# keys = {'art_def' : 2, -# 'pre' : 2, -# 'adj_dem' : 2, -# 'ono' : 2, -# 'pro_per' : 2, -# 'ver_sup' : 2, -# 'adv' : 1, -# 'ver' : 1, -# 'adj_ind' : 2, -# 'adj_pos' : 2, -# 'aux' : 2, -# 'adj_int' : 2, -# 'pro_ind' : 2, -# 'adj' : 1, -# 'pro_dem' : 2, -# 'nom' : 1, -# 'art_ind' : 2, -# 'pro_pos' : 2, -# 'nom_sup' : 2, -# 'adv_sup' : 2, -# 'adj_sup' : 2, -# 'adj_num' : 2, -# 'pro_rel' : 2, -# 'con' : 2, -# 'num' : 2, -# 'nr' : 1, -# 'sw' : 2, -# } -# -# gramact = [k for k in keys if keys[k] == 1] -# gramsup = [k for k in keys if keys[k] == 2] diff --git a/functions.py b/functions.py index f38a5c5..8cd7352 100644 --- a/functions.py +++ b/functions.py @@ -306,7 +306,7 @@ def write_tab(tab, fileout) : class BugDialog(wx.Dialog): def __init__(self, *args, **kwds): # begin wxGlade: MyDialog.__init__ - kwds["style"] = wx.DEFAULT_DIALOG_STYLE + kwds["style"] = wx.DEFAULT_DIALOG_STYLE | wx.STAY_ON_TOP kwds["size"] = wx.Size(500, 200) wx.Dialog.__init__(self, *args, **kwds) self.SetTitle(kwds['title']) @@ -707,11 +707,10 @@ def progressbar(self, maxi) : parent=parent, style=wx.PD_APP_MODAL | wx.PD_AUTO_HIDE | wx.PD_ELAPSED_TIME | wx.PD_CAN_ABORT ) - prog.SetIcon(ira._icon) prog.SetSize((400,150)) + prog.SetIcon(ira._icon) return prog - def treat_var_mod(variables) : var_mod = {} variables = list(set(variables)) diff --git a/iramuteq.py b/iramuteq.py index c762bf8..fdf2ba0 100644 --- a/iramuteq.py +++ b/iramuteq.py @@ -647,7 +647,7 @@ vous devez signaler le chemin de l'éxecutable de R dans les préférences.""" def OnVerif(self, evt) : pack = CheckRPackages(self) if pack : - dlg = wx.MessageDialog(self, u"Installation OK", u"Installation", wx.OK | wx.ICON_INFORMATION) + dlg = wx.MessageDialog(self, _(u"Installation OK").decode('utf8'), _(u"Installation").decode('utf8'), wx.OK | wx.ICON_INFORMATION | wx.STAY_ON_TOP) dlg.CenterOnParent() if dlg.ShowModal() in [wx.ID_NO, wx.ID_CANCEL]: evt.Veto() -- 2.7.4