merge

[iramuteq] / dialog.py

diff --git a/dialog.py b/dialog.py
index 43aa2c2..61e393a 100755 (executable)
--- a/dialog.py
+++ b/dialog.py
@@ -1205,18 +1205,19 @@ class LexDialog( wx.Dialog ):
 class PrefUCECarac(wx.Dialog):
     def __init__(self, parent, *args, **kwds):
         kwds['style'] = wx.DEFAULT_DIALOG_STYLE 
-        kwds['title'] = u"UCE caractéristiques"
+        kwds['title'] = u"Segments de texte caractéristiques"
         wx.Dialog.__init__(self, *args, **kwds)
         self.parent = parent
         first = wx.BoxSizer(wx.VERTICAL)
         sizer = wx.FlexGridSizer(0,2,0,0)
         self.label_type = wx.StaticText(self, -1, u"Score de classement")
         sizer.Add(self.label_type, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_LEFT, 5)
-        self.radio_type = wx.RadioBox(self, -1, u"", choices=[u'absolu (somme des chi2 des formes marquées de l\'UCE)', u'relatif (moyenne des chi2 des formes marquées de l\'UCE)'], majorDimension=0, style=wx.RA_SPECIFY_ROWS)
+        self.radio_type = wx.RadioBox(self, -1, u"", choices=[u'absolu (somme des chi2 des formes marquées du segment)', u'relatif (moyenne des chi2 des formes marquées du segment)'], majorDimension=0, style=wx.RA_SPECIFY_ROWS)
         sizer.Add(self.radio_type, 0, wx.ALIGN_RIGHT, 5)
-        self.txt_eff = wx.StaticText(self, -1, u"Nombre d\'UCE maximum")
+        self.txt_eff = wx.StaticText(self, -1, u"Nombre maximum de segments de texte")
         sizer.Add(self.txt_eff, 0, wx.ALIGN_CENTRE, 5)
         self.spin_eff = wx.SpinCtrl(self, -1, '', size = (100, 30), min = 1, max = 100000, initial = 50)
+        self.spin_eff.SetValue(50)
         sizer.Add(self.spin_eff, 0, wx.ALIGN_CENTRE|wx.ALL, 5)
         first.Add(sizer, 0, wx.ALL, 5)
         btnsizer = wx.StdDialogButtonSizer()
@@ -1467,7 +1468,7 @@ class FindInCluster(wx.Frame):
         # begin wxGlade: MyFrame.__init__
         wx.Frame.__init__(self, parent, id)
         self.spanel =  wx.ScrolledWindow(self, -1, style=wx.TAB_TRAVERSAL)
-        self.sizer1 = wx.FlexGridSizer(len(result)+1,4,0,0)
+        self.sizer1 = wx.FlexGridSizer(0,4,0,0)
         self.parent = parent
         self.formes = {}
         txt =  [u'forme',u'classe',u'chi2',u'voir']
@@ -1553,10 +1554,10 @@ class FindInCluster(wx.Frame):
     def OnCloseWindow(self, evt):
         self.Destroy()
 
-class SearchDial ( wx.Dialog ):
+class SearchDial ( wx.Frame ):
     
     def __init__( self, parent, listctrl, col, shown):
-        wx.Dialog.__init__ ( self, parent, id = wx.ID_ANY, title = wx.EmptyString, pos = wx.DefaultPosition, size = wx.DefaultSize, style = wx.DEFAULT_DIALOG_STYLE )
+        wx.Frame.__init__ ( self, parent, id = wx.ID_ANY, title = wx.EmptyString, pos = wx.DefaultPosition, size = wx.DefaultSize, style = wx.DEFAULT_FRAME_STYLE )
         self.parent = parent
         self.listctrl = listctrl
         self.col = col
@@ -2221,8 +2222,8 @@ class CorpusPref ( wx.Dialog ):
     def __init__( self, parent, parametres ):
         wx.Dialog.__init__ ( self, parent, id = wx.ID_ANY, title = u"Préférences", pos = wx.DefaultPosition, size = wx.DefaultSize, style = wx.DEFAULT_DIALOG_STYLE )
         self.parent = parent 
-        langues_n = [u'français', u'english', u'german (expérimentale)', u'italian', u'swedish (expérimentale)', u'portuguese (expérimentale)', u'greek (expériementale)', u'autre...']
-        self.langues = [u'french', u'english', u'german', 'italian', 'swedish', u'portuguese', 'greek', 'other']
+        langues_n = [u'français', u'english', u'german (expérimentale)', u'italian', u'swedish (expérimentale)', u'portuguese (expérimentale)', u'spanish (expérimentale)', u'greek (expériementale)', u'autre...']
+        self.langues = [u'french', u'english', u'german', u'italian', u'swedish', u'portuguese', u'spanish', u'greek', u'other']
         self.encodages = [enc[0].lower() for enc in encodages]
 
         ucimark = [u'****', u'0000']