X-Git-Url: http://iramuteq.org/git?a=blobdiff_plain;ds=sidebyside;f=dialog.py;h=54751ad400b54543a348e193eec0451217589b69;hb=refs%2Fheads%2F3.0;hp=d0a59c970776ad20e0ba6f67742e936b6f18d8cf;hpb=eaa044d1147e26b82942ce56d5965c83fdddf069;p=iramuteq diff --git a/dialog.py b/dialog.py index d0a59c9..8da2f3c 100755 --- a/dialog.py +++ b/dialog.py @@ -127,6 +127,8 @@ encodages = [['cp1252','Western Europe'], ['utf_7', 'all languages'], ['utf_8_sig', 'all languages']] +langues_n = ['french', 'english', 'german', 'italian', 'swedish', 'portuguese', 'spanish', 'greek', 'galician', 'dutch', 'norwegian', 'autre...'] +langues = ['french', 'english', 'german', 'italian', 'swedish', 'portuguese', 'spanish', 'greek', 'galician', 'dutch', 'norwegian', 'other'] class FileOptionDialog(wx.Dialog): @@ -190,9 +192,9 @@ class FileOptionDialog(wx.Dialog): grid_sizer.Add(label, 0, wx.ALIGN_LEFT | wx.ALIGN_CENTER_VERTICAL, 5) self.spin1 = wx.SpinCtrl(self, -1, '',size = wx.DefaultSize, min=1, max=500) grid_sizer.Add(self.spin1, 1, wx.ALIGN_LEFT | wx.ALIGN_CENTER_VERTICAL, 5) - sizer.Add(grid_sizer, 0, wx.GROW | wx.ALIGN_CENTER_VERTICAL | wx.ALL, 5) + sizer.Add(grid_sizer, 0, wx.GROW | wx.ALL, 5) line = wx.StaticLine(self, -1, size=(20, -1), style=wx.LI_HORIZONTAL) - sizer.Add(line, 0, wx.GROW | wx.ALIGN_CENTER_VERTICAL | wx.RIGHT | wx.TOP, 5) + sizer.Add(line, 0, wx.GROW | wx.RIGHT | wx.TOP, 5) btnsizer = wx.StdDialogButtonSizer() if wx.Platform != "__WXMSW__": btn = wx.ContextHelpButton(self) @@ -203,7 +205,7 @@ class FileOptionDialog(wx.Dialog): btn = wx.Button(self, wx.ID_CANCEL) btnsizer.AddButton(btn) btnsizer.Realize() - sizer.Add(btnsizer, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_CENTER_HORIZONTAL, 5) + sizer.Add(btnsizer, 0, wx.ALIGN_CENTER_HORIZONTAL, 5) self.SetSizer(sizer) sizer.Fit(self) @@ -430,6 +432,18 @@ releases at startup""") self.langues = wx.Choice( self, wx.ID_ANY, (200, -1), choices = self.listlangues) #self.langues.SetSelection( 0 ) fgSizer1.Add( self.langues, 0, wx.ALIGN_RIGHT|wx.ALL, 5 ) + + msg = _("Default language for text") + self.m_staticText55 = wx.StaticText( self, wx.ID_ANY, msg, wx.DefaultPosition, wx.DefaultSize, 0 ) + self.m_staticText55.Wrap( -1 ) + fgSizer1.Add( self.m_staticText55, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) + self.m_staticText56 = wx.StaticText( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 ) + self.m_staticText56.Wrap( -1 ) + fgSizer1.Add( self.m_staticText56, 0, wx.ALL, 5 ) + self.txtlangues = wx.Choice( self, wx.ID_ANY, (200, -1), choices = langues_n) + #self.langues.SetSelection( 0 ) + fgSizer1.Add( self.txtlangues, 0, wx.ALIGN_RIGHT|wx.ALL, 5 ) + msg = _("""Check installation of R packages""") self.m_staticText5 = wx.StaticText( self, wx.ID_ANY, msg, wx.DefaultPosition, wx.DefaultSize, 0 ) @@ -441,47 +455,56 @@ of R packages""") self.m_button1 = wx.Button( self, wx.ID_ANY, _("Check"), wx.DefaultPosition, wx.DefaultSize, 0 ) fgSizer1.Add( self.m_button1, 0, wx.ALIGN_RIGHT|wx.ALL, 5 ) bSizer1.Add( fgSizer1, 1, wx.EXPAND, 5 ) - if sys.platform == 'win32' : - bSizer2 = wx.BoxSizer( wx.HORIZONTAL ) - msg = _("""Maximum -memory for R""") - self.m_staticText7 = wx.StaticText( self, wx.ID_ANY, msg, wx.DefaultPosition, wx.DefaultSize, 0 ) - self.m_staticText7.Wrap( -1 ) - bSizer2.Add( self.m_staticText7, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) - self.m_checkBox1 = wx.CheckBox( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 ) - bSizer2.Add( self.m_checkBox1, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) - self.m_spinCtrl1 = wx.SpinCtrl( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, wx.SP_ARROW_KEYS, 32, 16000, 1535 ) - bSizer2.Add( self.m_spinCtrl1, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) - self.m_staticline7 = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL ) - bSizer2.Add( self.m_staticline7, 0, wx.EXPAND |wx.ALL, 5 ) - bSizer1.Add( bSizer2, 0, wx.EXPAND, 5 ) - self.m_checkBox1.Bind( wx.EVT_CHECKBOX, self.oncheckmem ) + #if sys.platform == 'win32' : + # bSizer2 = wx.BoxSizer( wx.HORIZONTAL ) + # msg = _("""Maximum +#memory for R""") + # self.m_staticText7 = wx.StaticText( self, wx.ID_ANY, msg, wx.DefaultPosition, wx.DefaultSize, 0 ) + # self.m_staticText7.Wrap( -1 ) + # bSizer2.Add( self.m_staticText7, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) + # self.m_checkBox1 = wx.CheckBox( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 ) + # bSizer2.Add( self.m_checkBox1, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) + # self.m_spinCtrl1 = wx.SpinCtrl( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, wx.SP_ARROW_KEYS, 32, 16000, 1535 ) + # bSizer2.Add( self.m_spinCtrl1, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) + # self.m_staticline7 = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL ) + # bSizer2.Add( self.m_staticline7, 0, wx.EXPAND |wx.ALL, 5 ) + # bSizer1.Add( bSizer2, 0, wx.EXPAND, 5 ) + # self.m_checkBox1.Bind( wx.EVT_CHECKBOX, self.oncheckmem ) bSizer3 = wx.BoxSizer( wx.HORIZONTAL ) bSizer4 = wx.BoxSizer( wx.HORIZONTAL ) - self.text8 = wx.StaticText( self, wx.ID_ANY, _("Use svdlibc"), wx.DefaultPosition, wx.DefaultSize, 0 ) - self.text8.Wrap( -1 ) - fgSizer1.Add( self.text8, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) - self.check_svdc = wx.CheckBox( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 ) - bSizer4.Add( self.check_svdc, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) - bSizer3.Add( bSizer4, 0, wx.EXPAND, 5 ) - self.fbb = filebrowse.FileBrowseButton(self, -1, size=(250, -1), fileMode = 2, fileMask = '*') - bSizer3.Add( self.fbb, 0, wx.EXPAND, 5 ) - self.fbb.SetLabel(_("Path : ")) - fgSizer1.Add( wx.StaticText(self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 ), wx.ID_ANY, wx.ALL, 5) - fgSizer1.Add( bSizer3, 0, wx.ALIGN_RIGHT|wx.ALL, 5 ) + #self.text8 = wx.StaticText( self, wx.ID_ANY, _("Use svdlibc"), wx.DefaultPosition, wx.DefaultSize, 0 ) + #self.text8.Wrap( -1 ) + #fgSizer1.Add( self.text8, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) + #self.check_svdc = wx.CheckBox( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 ) + #bSizer4.Add( self.check_svdc, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) + #bSizer3.Add( bSizer4, 0, wx.EXPAND, 5 ) + #self.fbb = filebrowse.FileBrowseButton(self, -1, size=(250, -1), fileMode = 2, fileMask = '*') + #bSizer3.Add( self.fbb, 0, wx.EXPAND, 5 ) + #self.fbb.SetLabel(_("Path : ")) + #fgSizer1.Add( wx.StaticText(self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 ), wx.ID_ANY, wx.ALL, 5) + #fgSizer1.Add( bSizer3, 0, wx.ALIGN_RIGHT|wx.ALL, 5 ) Rpath_text = wx.StaticText( self, wx.ID_ANY, _("R path"), wx.DefaultPosition, wx.DefaultSize, 0 ) Rpath_text.Wrap( -1 ) fgSizer1.Add( Rpath_text, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) fgSizer1.Add( wx.StaticText(self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 ), wx.ID_ANY, wx.ALL, 5) - self.Rpath_value = filebrowse.FileBrowseButton(self, -1, size=(350, -1), fileMode = 2, fileMask = '*') + self.Rpath_value = filebrowse.FileBrowseButton(self, -1, size=(350, 50), fileMode = 2, fileMask = '*') + self.Rpath_value.SetSize(wx.Size(400,50)) self.Rpath_value.SetLabel(_("Path : ")) fgSizer1.Add( self.Rpath_value, 0, wx.ALIGN_RIGHT|wx.ALL, 5 ) mirror_text = wx.StaticText( self, wx.ID_ANY, _("Default R mirror"), wx.DefaultPosition, wx.DefaultSize, 0 ) mirror_text.Wrap( -1 ) fgSizer1.Add( mirror_text, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) fgSizer1.Add( wx.StaticText(self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 ), wx.ID_ANY, wx.ALL, 5) - self.mirror_value = wx.TextCtrl( self, wx.ID_ANY, 'http://cran.univ-lyon1.fr', wx.DefaultPosition, wx.Size( 300,30 ), 0 ) + self.mirror_value = wx.TextCtrl( self, wx.ID_ANY, 'http://cran.univ-lyon1.fr', wx.DefaultPosition, wx.Size( 300,50 ), 0 ) fgSizer1.Add( self.mirror_value, 0, wx.ALIGN_RIGHT|wx.ALL, 5 ) + + font_text = wx.StaticText( self, wx.ID_ANY, _("Font size"), wx.DefaultPosition, wx.DefaultSize, 0 ) + font_text.Wrap( -1 ) + fgSizer1.Add( font_text, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) + fgSizer1.Add( wx.StaticText(self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 ), wx.ID_ANY, wx.ALL, 5) + self.font_value = wx.TextCtrl( self, wx.ID_ANY, '', wx.DefaultPosition, wx.Size( 80,50 ), 0 ) + fgSizer1.Add( self.font_value, 0, wx.ALIGN_RIGHT|wx.ALL, 5 ) + m_sdbSizer1 = wx.StdDialogButtonSizer() self.m_sdbSizer1OK = wx.Button( self, wx.ID_OK ) m_sdbSizer1.AddButton( self.m_sdbSizer1OK ) @@ -496,7 +519,7 @@ memory for R""") # Connect Events self.m_sdbSizer1OK.Bind( wx.EVT_BUTTON, self.OnValid ) self.m_button1.Bind( wx.EVT_BUTTON, parent.OnVerif ) - self.check_svdc.Bind( wx.EVT_CHECKBOX, self.OnSVDC ) + #self.check_svdc.Bind( wx.EVT_CHECKBOX, self.OnSVDC ) self.__set_properties() def __set_properties(self): @@ -508,23 +531,25 @@ memory for R""") else : val2 = 1 self.m_radioBox2.SetSelection(val2) self.langues.SetSelection(self.listlangues.index(self.parent.pref.get('iramuteq', 'guilanguage'))) - if sys.platform == 'win32' : - if self.parent.pref.getboolean('iramuteq', 'R_mem') : - self.m_checkBox1.SetValue(True) - self.m_spinCtrl1.Enable(True) - self.m_spinCtrl1.SetValue(self.parent.pref.getint('iramuteq', 'R_max_mem')) - else : - self.m_checkBox1.SetValue(False) - self.m_spinCtrl1.Enable(False) - if self.parent.pref.getboolean('iramuteq', 'libsvdc') : - self.check_svdc.SetValue(True) - self.fbb.SetValue(self.parent.pref.get('iramuteq', 'libsvdc_path')) - else : - self.check_svdc.SetValue(False) - self.fbb.SetValue(self.parent.pref.get('iramuteq', 'libsvdc_path')) - self.fbb.Enable(False) + self.txtlangues.SetSelection(langues.index(self.parent.pref.get('iramuteq','language'))) + #if sys.platform == 'win32' : + # if self.parent.pref.getboolean('iramuteq', 'R_mem') : + # self.m_checkBox1.SetValue(True) + # self.m_spinCtrl1.Enable(True) + # self.m_spinCtrl1.SetValue(self.parent.pref.getint('iramuteq', 'R_max_mem')) + # else : + # self.m_checkBox1.SetValue(False) + # self.m_spinCtrl1.Enable(False) + # if self.parent.pref.getboolean('iramuteq', 'libsvdc') : + # self.check_svdc.SetValue(True) + # self.fbb.SetValue(self.parent.pref.get('iramuteq', 'libsvdc_path')) + # else : + # self.check_svdc.SetValue(False) + # self.fbb.SetValue(self.parent.pref.get('iramuteq', 'libsvdc_path')) + # self.fbb.Enable(False) self.Rpath_value.SetValue(self.parent.PathPath.get('PATHS', 'rpath')) self.mirror_value.SetValue(self.parent.pref.get('iramuteq', 'rmirror')) + self.font_value.SetValue(self.parent.pref.get('iramuteq', 'fontsize')) def oncheckmem(self, evt): if self.m_checkBox1.GetValue() : @@ -532,13 +557,18 @@ memory for R""") else : self.m_spinCtrl1.Enable(False) - def OnSVDC(self, evt): - if self.check_svdc.GetValue() : - self.fbb.Enable(True) - else : - self.fbb.Enable(False) + # def OnSVDC(self, evt): + # if self.check_svdc.GetValue() : + # self.fbb.Enable(True) + # else : + # self.fbb.Enable(False) def OnValid(self, event): + try : + int(self.font_value.GetValue()) + except : + wx.MessageBox(_("Font size should be an integer!"), _("Warning"), wx.OK | wx.ICON_WARNING) + return parent = self.parent if self.m_radioBox1.GetSelection() == 0 : valsound = 'true' else : valsound = 'false' @@ -547,23 +577,25 @@ memory for R""") else : valcheck = 'false' parent.pref.set('iramuteq', 'checkupdate', valcheck) parent.pref.set('iramuteq', 'guilanguage', self.listlangues[self.langues.GetSelection()]) - if sys.platform == 'win32' : - if self.m_checkBox1.GetValue() : - parent.pref.set('iramuteq', 'R_mem', 'true') - parent.pref.set('iramuteq', 'R_max_mem', str(self.m_spinCtrl1.GetValue())) - else : - parent.pref.set('iramuteq', 'R_mem', 'false') - if self.check_svdc.GetValue() : - parent.pref.set('iramuteq', 'libsvdc', 'true') - else : - parent.pref.set('iramuteq', 'libsvdc', 'false') - parent.pref.set('iramuteq', 'libsvdc_path', self.fbb.GetValue()) + parent.pref.set('iramuteq', 'language', langues[self.txtlangues.GetSelection()]) + #if sys.platform == 'win32' : + # if self.m_checkBox1.GetValue() : + # parent.pref.set('iramuteq', 'R_mem', 'true') + # parent.pref.set('iramuteq', 'R_max_mem', str(self.m_spinCtrl1.GetValue())) + # else : + # parent.pref.set('iramuteq', 'R_mem', 'false') + #if self.check_svdc.GetValue() : + # parent.pref.set('iramuteq', 'libsvdc', 'true') + #else : + # parent.pref.set('iramuteq', 'libsvdc', 'false') + #parent.pref.set('iramuteq', 'libsvdc_path', self.fbb.GetValue()) self.parent.pref.set('iramuteq', 'rmirror', self.mirror_value.GetValue()) - file = open(parent.ConfigPath['preferences'], 'w') + self.parent.pref.set('iramuteq', 'fontsize', self.font_value.GetValue()) + file = open(parent.ConfigPath['preferences'], 'w', encoding='utf8') parent.pref.write(file) file.close() self.parent.PathPath.set('PATHS', 'rpath', self.Rpath_value.GetValue()) - with open(self.parent.ConfigPath['path'], 'w') as f: + with open(self.parent.ConfigPath['path'], 'w', encoding='utf8') as f: self.parent.PathPath.write(f) self.Close() @@ -577,9 +609,9 @@ class PrefGraph(wx.Dialog): self.paramgraph=paramgraph self.labeltype = wx.StaticText(self, -1, _("Graphic type")) if self.paramgraph['clnb'] <= 3 : - choix = ['2D', 'web 2D'] + choix = ['2D']#, 'web 2D'] else : - choix=['2D' ,'3D', 'web 2D', 'web 3D', 'Blender'] + choix=['2D' ,'3D']#, 'web 2D', 'web 3D', 'Blender'] self.choicetype = wx.Choice(self, -1, (100,50), choices=choix) self.label_format = wx.StaticText(self, -1, _("Picture format")) self.choix_format = wx.Choice(self, -1, (100,50), choices = ['png', 'svg']) @@ -590,7 +622,11 @@ class PrefGraph(wx.Dialog): self.label_what = wx.StaticText(self, -1, _("Representation")) self.choice1 = wx.Choice(self, -1, (100,50), choices=[_("coordinates"),_("correlations")]) self.label_qui = wx.StaticText(self, -1, 'Variables') - self.choice2 = wx.Choice(self, -1, (100,50), choices=[_("actives") ,_("supplementaries"), _("stars"), _("clusters")]) + if self.paramgraph.get('islex', False) : + choix = [_("Rows"), _("Columns")] + else : + choix = [_("actives") ,_("supplementaries"), _("stars"), _("clusters")] + self.choice2 = wx.Choice(self, -1, (100,50), choices=choix) self.label_3 = wx.StaticText(self, -1, _("Text size")) self.spin3 = wx.SpinCtrl(self, -1, '', size = wx.DefaultSize, min=1, max=20) txt = _("Take the x first points") @@ -743,22 +779,22 @@ class PrefGraph(wx.Dialog): fsizer.Add(wx.StaticLine(self, -1), 0, wx.EXPAND, 0) fsizer.Add(self.label_4, 0, wx.ALL | wx.ALIGN_LEFT | wx.ALIGN_CENTER_VERTICAL, 5) sizer_nb = wx.BoxSizer(wx.HORIZONTAL) - sizer_nb.Add(self.check1, 0, wx.ALL | wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL, 5) - sizer_nb.Add(self.spin_nb, 0, wx.ALL | wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL, 5) + sizer_nb.Add(self.check1, 0, wx.ALL | wx.ALIGN_CENTER_VERTICAL, 5) + sizer_nb.Add(self.spin_nb, 0, wx.ALL | wx.ALIGN_CENTER_VERTICAL, 5) fsizer.Add(sizer_nb, 0, wx.ALL | wx.ALIGN_LEFT | wx.ALIGN_CENTER_VERTICAL, 5) fsizer.Add(wx.StaticLine(self, -1), 0, wx.EXPAND, 0) fsizer.Add(wx.StaticLine(self, -1), 0, wx.EXPAND, 0) fsizer.Add(self.label_chic, 0, wx.ALL | wx.ALIGN_LEFT | wx.ALIGN_CENTER_VERTICAL, 5) sizer_nbchic = wx.BoxSizer(wx.HORIZONTAL) - sizer_nbchic.Add(self.check_chic, 0, wx.ALL | wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL, 5) - sizer_nbchic.Add(self.spin_nbchic, 0, wx.ALL | wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL, 5) + sizer_nbchic.Add(self.check_chic, 0, wx.ALL | wx.ALIGN_CENTER_VERTICAL, 5) + sizer_nbchic.Add(self.spin_nbchic, 0, wx.ALL | wx.ALIGN_CENTER_VERTICAL, 5) fsizer.Add(sizer_nbchic, 0, wx.ALL | wx.ALIGN_LEFT | wx.ALIGN_CENTER_VERTICAL, 5) fsizer.Add(wx.StaticLine(self, -1), 0, wx.EXPAND, 0) fsizer.Add(wx.StaticLine(self, -1), 0, wx.EXPAND, 0) fsizer.Add(self.label_5, 0, wx.ALL | wx.ALIGN_LEFT | wx.ALIGN_CENTER_VERTICAL, 5) sizer_chi = wx.BoxSizer(wx.HORIZONTAL) - sizer_chi.Add(self.check2, 0, wx.ALL | wx.ALIGN_LEFT | wx.ALIGN_CENTER_VERTICAL, 5) - sizer_chi.Add(self.spin_chi, 0, wx.ALL | wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL, 5) + sizer_chi.Add(self.check2, 0, wx.ALL | wx.ALIGN_CENTER_VERTICAL, 5) + sizer_chi.Add(self.spin_chi, 0, wx.ALL | wx.ALIGN_CENTER_VERTICAL, 5) fsizer.Add(sizer_chi, 0, wx.ALL | wx.ALIGN_LEFT | wx.ALIGN_CENTER_VERTICAL, 5) fsizer.Add(wx.StaticLine(self, -1), 0, wx.EXPAND, 0) fsizer.Add(wx.StaticLine(self, -1), 0, wx.EXPAND, 0) @@ -769,7 +805,7 @@ class PrefGraph(wx.Dialog): sizer_2.Add(fsizer, 0, wx.EXPAND, 0) bsizer_1 = wx.FlexGridSizer(0,3,0,0) bsizer_1.Add(self.label_7, 0, wx.ALL | wx.ALIGN_LEFT | wx.ALIGN_CENTER_VERTICAL, 5) - bsizer_1.Add(self.check4, 0, wx.ALL | wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL|wx.EXPAND, 5) + bsizer_1.Add(self.check4, 0, wx.ALL | wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL, 5) grid_min.Add(self.label_min, 0,wx.ALL | wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL, 5) grid_min.Add(self.spin_min, 0, wx.ALL | wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL, 5) grid_max.Add(self.label_max, 0, wx.ALL | wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL, 5) @@ -781,7 +817,7 @@ class PrefGraph(wx.Dialog): bsizer_1.Add(wx.StaticLine(self, -1), 0, wx.EXPAND, 0) bsizer_1.Add(wx.StaticLine(self, -1), 0, wx.EXPAND, 0) bsizer_1.Add(self.label_tchi, 0, wx.ALL | wx.ALIGN_LEFT | wx.ALIGN_CENTER_VERTICAL, 5) - bsizer_1.Add(self.check_tchi, 0, wx.ALL | wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL|wx.EXPAND, 5) + bsizer_1.Add(self.check_tchi, 0, wx.ALL | wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL, 5) grid_min_tchi.Add(self.label_min_tchi, 0, wx.ALL | wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL, 5) grid_min_tchi.Add(self.spin_min_tchi, 0, wx.ALL | wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL, 5) grid_max_tchi.Add(self.label_max_tchi, 0, wx.ALL | wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL, 5) @@ -792,12 +828,12 @@ class PrefGraph(wx.Dialog): sizer_2.Add(bsizer_1, 0, wx.EXPAND, 5) sizer_2.Add(wx.StaticLine(self, -1), 0, wx.EXPAND, 0) sizer_f = wx.BoxSizer(wx.HORIZONTAL) - sizer_f.Add(self.label_8, 0, wx.ALL | wx.ALIGN_LEFT | wx.ALIGN_CENTER_VERTICAL, 5) - sizer_f.Add(self.spin_f1, 0, wx.ALL | wx.ALIGN_LEFT | wx.ALIGN_CENTER_VERTICAL, 5) - sizer_f.Add(self.label_9, 0, wx.ALL | wx.ALIGN_LEFT | wx.ALIGN_CENTER_VERTICAL, 5) - sizer_f.Add(self.spin_f2, 0, wx.ALL | wx.ALIGN_LEFT | wx.ALIGN_CENTER_VERTICAL, 5) - sizer_f.Add(self.label_f3, 0, wx.ALL | wx.ALIGN_LEFT | wx.ALIGN_CENTER_VERTICAL, 5) - sizer_f.Add(self.spin_f3, 0, wx.ALL | wx.ALIGN_LEFT | wx.ALIGN_CENTER_VERTICAL, 5) + sizer_f.Add(self.label_8, 0, wx.ALL | wx.ALIGN_CENTER_VERTICAL, 5) + sizer_f.Add(self.spin_f1, 0, wx.ALL | wx.ALIGN_CENTER_VERTICAL, 5) + sizer_f.Add(self.label_9, 0, wx.ALL | wx.ALIGN_CENTER_VERTICAL, 5) + sizer_f.Add(self.spin_f2, 0, wx.ALL | wx.ALIGN_CENTER_VERTICAL, 5) + sizer_f.Add(self.label_f3, 0, wx.ALL | wx.ALIGN_CENTER_VERTICAL, 5) + sizer_f.Add(self.spin_f3, 0, wx.ALL | wx.ALIGN_CENTER_VERTICAL, 5) sizer_2.Add(sizer_f, 0, wx.EXPAND, 5) sizer_2.Add(wx.StaticLine(self, -1), 0, wx.EXPAND, 5) fsizer2 = wx.FlexGridSizer(0,2,0,0) @@ -919,7 +955,7 @@ class PrefExport(wx.Dialog): self.label_lem = wx.StaticText(self, -1, _("Lemmatised corpus")) box3.Add(self.label_lem, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_LEFT, 5) self.radio_lem = wx.RadioBox(self, -1, "", choices= [ _("yes"), _("no") ], majorDimension=0, style=wx.RA_SPECIFY_ROWS) - box3.Add(self.radio_lem, 0, wx.ALIGN_RIGHT, 5) + box3.Add(self.radio_lem, 0, wx.EXPAND, 5) sizer.Add(box3, 0, wx.GROW|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5) self.label_txt = wx.StaticText(self, -1, _("Export for ...")) box.Add(self.label_txt, 0, wx.ALIGN_CENTRE|wx.ALL, 5) @@ -971,14 +1007,14 @@ class PrefProfTypes(wx.Dialog): box.Add(self.label_txt, 0, wx.ALIGN_CENTRE|wx.ALL, 5) self.radio_type = wx.RadioBox(self, -1, "", choices=[_("Like ALCESTE"), _("Like Lexico")], majorDimension=0, style=wx.RA_SPECIFY_ROWS) box.Add(self.radio_type, 0, wx.ALIGN_CENTRE|wx.ALL, 5) - sizer.Add(box, 0, wx.GROW|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5) + sizer.Add(box, 0, wx.GROW|wx.ALL, 5) box2 = wx.BoxSizer(wx.HORIZONTAL) self.txt2 = wx.StaticText(self, -1, _("Output file")) box2.Add(self.txt2, 0, wx.ALIGN_CENTRE|wx.ALL, 5) self.fbb = filebrowse.FileBrowseButton(self, -1, size=(450, -1), fileMode = 2) box2.Add(self.fbb, 0, wx.ALIGN_CENTRE|wx.ALL, 5) self.fbb.SetLabel("") - sizer.Add(box2, 0, wx.GROW|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5) + sizer.Add(box2, 0, wx.GROW|wx.ALL, 5) btnsizer = wx.StdDialogButtonSizer() btn = wx.Button(self, wx.ID_CANCEL) btnsizer.AddButton(btn) @@ -986,7 +1022,7 @@ class PrefProfTypes(wx.Dialog): btn_ok.SetDefault() btnsizer.AddButton(btn_ok) btnsizer.Realize() - sizer.Add(btnsizer, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL|wx.ALIGN_RIGHT, 5) + sizer.Add(btnsizer, 0, wx.ALL|wx.ALIGN_RIGHT, 5) #self.Bind(wx.EVT_BUTTON, self.check_file, btn_ok) self.SetSizer(sizer) sizer.Fit(self) @@ -1009,7 +1045,7 @@ class PrefSimpleFile(wx.Dialog): self.fbb = filebrowse.FileBrowseButton(self, -1, size=(450, -1), fileMode = 2, fileMask = self.mask) box2.Add(self.fbb, 0, wx.ALIGN_CENTRE|wx.ALL, 5) self.fbb.SetLabel("") - sizer.Add(box2, 0, wx.GROW|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5) + sizer.Add(box2, 0, wx.GROW|wx.ALL, 5) btnsizer = wx.StdDialogButtonSizer() btn = wx.Button(self, wx.ID_CANCEL) btnsizer.AddButton(btn) @@ -1017,7 +1053,7 @@ class PrefSimpleFile(wx.Dialog): btn_ok.SetDefault() btnsizer.AddButton(btn_ok) btnsizer.Realize() - sizer.Add(btnsizer, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL|wx.ALIGN_RIGHT, 5) + sizer.Add(btnsizer, 0, wx.ALL|wx.ALIGN_RIGHT, 5) self.Bind(wx.EVT_BUTTON, self.check_file, btn_ok) self.SetSizer(sizer) sizer.Fit(self) @@ -1064,8 +1100,8 @@ class StatDialog ( wx.Dialog ): self.radio_dictchoice.SetSelection( 0 ) gSizer1.Add( self.radio_dictchoice, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_LEFT, 1 ) bSizer1.Add( gSizer1, 1, wx.EXPAND, 1 ) - self.dictpath = filebrowse.FileBrowseButton(self, -1, size=(350, -1), labelText = _("Path"), fileMode = 2, fileMask = '*') - bSizer1.Add( self.dictpath, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL, 1 ) + self.dictpath = filebrowse.FileBrowseButton(self, -1, labelText = _("Path"), fileMode = 2, fileMask = '*') + bSizer1.Add( self.dictpath, 0, wx.EXPAND, 1 ) self.dictpath.Enable(False) m_sdbSizer1 = wx.StdDialogButtonSizer() self.m_sdbSizer1OK = wx.Button( self, wx.ID_OK ) @@ -1218,7 +1254,7 @@ class PrefUCECarac(wx.Dialog): btn_ok.SetDefault() btnsizer.AddButton(btn_ok) btnsizer.Realize() - first.Add(btnsizer, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_RIGHT, 5) + first.Add(btnsizer, 0, wx.ALIGN_RIGHT, 5) self.SetSizer(first) first.Fit(self) @@ -1231,7 +1267,7 @@ class PrefSegProf(wx.Dialog) : bSizer1 = wx.BoxSizer( wx.VERTICAL ) txt = _("Be carefull : computation of repeated segments profiles can be very long on large corpus") self.label = wx.StaticText( self, wx.ID_ANY, txt, wx.DefaultPosition, wx.DefaultSize, 0 ) - bSizer1.Add( self.label, 0, wx.ALL | wx.ALIGN_CENTER_VERTICAL, 5 ) + bSizer1.Add( self.label, 0, wx.ALL, 5 ) fgSizer1 = wx.FlexGridSizer( 0, 2, 0, 0 ) fgSizer1.SetFlexibleDirection( wx.BOTH ) fgSizer1.SetNonFlexibleGrowMode( wx.FLEX_GROWMODE_SPECIFIED ) @@ -1269,7 +1305,7 @@ class PrefSegProf(wx.Dialog) : btn_ok.SetDefault() btnsizer.AddButton(btn_ok) btnsizer.Realize() - bSizer1.Add(btnsizer, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_RIGHT, 5) + bSizer1.Add(btnsizer, 0, wx.ALIGN_RIGHT, 5) self.SetSizer( bSizer1 ) self.Layout() bSizer1.Fit( self ) @@ -1309,14 +1345,14 @@ class PrefQuestAlc ( wx.Dialog ): fgSizer1.Add( self.m_staticText2, 0, wx.ALL, 5 ) self.ListActive = wx.ListBox( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, labels, wx.LB_EXTENDED ) self.ListActive.SetMinSize( wx.Size( 300,250 ) ) - fgSizer1.Add( self.ListActive, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL|wx.EXPAND, 5 ) + fgSizer1.Add( self.ListActive, 0, wx.EXPAND, 5 ) self.ListSup = wx.ListBox( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, labels, wx.LB_EXTENDED ) self.ListSup.SetMinSize( wx.Size( 300,250 ) ) - fgSizer1.Add( self.ListSup, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL|wx.EXPAND, 5 ) + fgSizer1.Add( self.ListSup, 0, wx.EXPAND, 5 ) self.but_suiv = wx.Button( self, wx.ID_ANY, _("Next"), wx.DefaultPosition, wx.DefaultSize, 0 ) - fgSizer1.Add( self.but_suiv, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) + fgSizer1.Add( self.but_suiv, 0, wx.EXPAND, 5 ) self.but_prec = wx.Button( self, wx.ID_ANY, _("Previous"), wx.DefaultPosition, wx.DefaultSize, 0 ) - fgSizer1.Add( self.but_prec, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) + fgSizer1.Add( self.but_prec, 0, wx.EXPAND, 5 ) if not sim : self.lab_nbcl = wx.StaticText( self, wx.ID_ANY, _("Number of terminal clusters on phase 1"), wx.DefaultPosition, wx.DefaultSize, 0 ) self.lab_nbcl.Wrap( -1 ) @@ -1324,7 +1360,7 @@ class PrefQuestAlc ( wx.Dialog ): self.spin_nbcl = wx.SpinCtrl( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, wx.SP_ARROW_KEYS, 2, 100, 10 ) self.spin_nbcl.SetValue(10) self.spin_nbcl.SetMinSize( wx.Size( 100,30 ) ) - fgSizer1.Add( self.spin_nbcl, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) + fgSizer1.Add( self.spin_nbcl, 0, wx.EXPAND, 5 ) self.lab_mincl = wx.StaticText( self, wx.ID_ANY, _("Minimum text segments frenquency in clusters (2= automatic)"), wx.DefaultPosition, wx.DefaultSize, 0 ) self.lab_mincl.Wrap( -1 ) fgSizer1.Add( self.lab_mincl, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_LEFT|wx.ALL, 5 ) @@ -1339,7 +1375,7 @@ class PrefQuestAlc ( wx.Dialog ): self.m_sdbSizer2Cancel = wx.Button( self, wx.ID_CANCEL ) m_sdbSizer2.AddButton( self.m_sdbSizer2Cancel ) m_sdbSizer2.Realize(); - bSizer2.Add( m_sdbSizer2, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_RIGHT|wx.ALL, 5 ) + bSizer2.Add( m_sdbSizer2, 0, wx.ALIGN_RIGHT|wx.ALL, 5 ) self.SetSizer( bSizer2 ) self.Layout() bSizer2.Fit( self ) @@ -1769,7 +1805,7 @@ class OptLexi(wx.Dialog): sizer_2.Add(self.label, 0, wx.ALIGN_CENTER_HORIZONTAL | wx.ALIGN_CENTER_VERTICAL, 3) sizer_2.Add(self.spin, 0, wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL, 3) sizer_1.Add(sizer_2, 0, wx.ALIGN_CENTER_HORIZONTAL, 3) - sizer_1.Add(sizer_3, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_RIGHT, 3) + sizer_1.Add(sizer_3, 0, wx.ALIGN_RIGHT, 3) self.SetSizer(sizer_1) sizer_1.Fit(self) self.Layout() @@ -2001,16 +2037,16 @@ class PrefWordCloud ( wx.Dialog ): bSizer5.Add( self.m_staticText7, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) self.spin_mincex = wx.SpinCtrl( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, wx.SP_ARROW_KEYS, 0, 1000, 5 ) self.spin_mincex.SetValue( 5 ) - bSizer5.Add( self.spin_mincex, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_RIGHT|wx.ALL, 5 ) - bSizer4.Add( bSizer5, 1, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.EXPAND, 5 ) + bSizer5.Add( self.spin_mincex, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) + bSizer4.Add( bSizer5, 1, wx.EXPAND, 5 ) bSizer6 = wx.BoxSizer( wx.HORIZONTAL ) self.m_staticText8 = wx.StaticText( self, wx.ID_ANY, "Max", wx.DefaultPosition, wx.DefaultSize, 0 ) self.m_staticText8.Wrap( -1 ) - bSizer6.Add( self.m_staticText8, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) + bSizer6.Add( self.m_staticText8, 0,wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) self.spin_maxcex = wx.SpinCtrl( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, wx.SP_ARROW_KEYS, 0, 1000, 50 ) self.spin_maxcex.SetValue( 50 ) bSizer6.Add( self.spin_maxcex, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_LEFT|wx.ALL, 5 ) - bSizer4.Add( bSizer6, 1, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.EXPAND, 5 ) + bSizer4.Add( bSizer6, 1, wx.EXPAND, 5 ) fgSizer1.Add( bSizer4, 1, wx.EXPAND, 5 ) self.m_staticline7 = wx.StaticLine( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL ) fgSizer1.Add( self.m_staticline7, 0, wx.EXPAND |wx.ALL, 5 ) @@ -2026,7 +2062,7 @@ class PrefWordCloud ( wx.Dialog ): bSizer7 = wx.BoxSizer( wx.HORIZONTAL ) self.m_staticText9 = wx.StaticText( self, wx.ID_ANY, _("Background color"), wx.DefaultPosition, wx.DefaultSize, 0 ) self.m_staticText9.Wrap( -1 ) - bSizer7.Add( self.m_staticText9, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_LEFT|wx.ALL, 5 ) + bSizer7.Add( self.m_staticText9, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) self.color_bg = wx.ColourPickerCtrl( self, wx.ID_ANY, (255,255,255), wx.DefaultPosition, wx.DefaultSize, wx.CLRP_DEFAULT_STYLE ) bSizer7.Add( self.color_bg, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) fgSizer1.Add( bSizer7, 1, wx.EXPAND, 5 ) @@ -2146,12 +2182,12 @@ class ChiDialog(wx.Dialog): sizer_3 = wx.BoxSizer(wx.HORIZONTAL) sizer_4 = wx.BoxSizer(wx.HORIZONTAL) sizer_3.Add(self.list_box_1, 0, wx.EXPAND, 0) - sizer_3.Add(self.list_box_2, 0, wx.EXPAND|wx.ALIGN_CENTER_HORIZONTAL, 0) + sizer_3.Add(self.list_box_2, 0, wx.EXPAND, 0) sizer_2.Add(sizer_3, 1, wx.EXPAND, 0) - sizer_4.Add(self.button_cancel, 0, wx.ALL|wx.ALIGN_CENTER_HORIZONTAL, 0) - sizer_4.Add(self.button_pref, 0, wx.ALL|wx.ALIGN_CENTER_HORIZONTAL, 0) - sizer_4.Add(self.button_1, 0, wx.ALL|wx.ALIGN_CENTER_HORIZONTAL, 0) - sizer_2.Add(sizer_4, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL, 0) + sizer_4.Add(self.button_cancel, 0, wx.ALL, 0) + sizer_4.Add(self.button_pref, 0, wx.ALL, 0) + sizer_4.Add(self.button_1, 0, wx.ALL, 0) + sizer_2.Add(sizer_4, 0, wx.ALIGN_CENTER_HORIZONTAL, 0) sizer_1.Add(sizer_2, 1, wx.EXPAND, 0) self.SetSizer(sizer_1) sizer_1.Fit(self) @@ -2175,8 +2211,7 @@ class CorpusPref ( wx.Dialog ): def __init__( self, parent, parametres ): wx.Dialog.__init__ ( self, parent, id = wx.ID_ANY, title = _("Settings"), pos = wx.DefaultPosition, size = wx.DefaultSize, style = wx.DEFAULT_DIALOG_STYLE | wx.STAY_ON_TOP ) self.parent = parent - langues_n = ['français', 'english', 'german (expérimentale)', 'italian', 'swedish (expérimentale)', 'portuguese', 'spanish', 'greek (expériementale)', 'galician (expérimentale)', 'autre...'] - self.langues = ['french', 'english', 'german', 'italian', 'swedish', 'portuguese', 'spanish', 'greek', 'galician', 'other'] + self.langues = langues self.encodages = [enc[0].lower() for enc in encodages] ucimark = ['****', '0000'] ucemethod = [_("characters"), _("occurrences"), _("paragraphs")] @@ -2366,7 +2401,7 @@ class CorpusPref ( wx.Dialog ): except ValueError : enc = self.encodages.index('utf-8') self.encodage_choices.SetSelection(enc) - self.lang_choices.SetSelection(0) + self.lang_choices.SetSelection(self.langues.index(parametres['lang'])) self.repout_choices.SetValue(parametres['pathout']) self.corpusname.SetValue(parametres['corpus_name']) self.ucimark_choices.SetSelection(parametres['ucimark']) @@ -2434,6 +2469,7 @@ class ConcordList(wx.html.HtmlListBox): self.concord = concord #self.script_status = dict() wx.html.HtmlListBox.__init__(self, parent, -1, size = (900, 600)) + #self.SetFont(wx.Font(30,wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL)) self.SetItemCount(len(concord)) #self.Bind(wx.EVT_LISTBOX, self.RefreshMe) #self.Bind(wx.EVT_LISTBOX_DCLICK, self.Download) @@ -2455,6 +2491,7 @@ class message(wx.Frame): #self.HtmlPage=wx.html.HtmlWindow(self, -1) self.panel = wx.Panel(self, wx.ID_ANY) self.HtmlPage = ConcordList(self.panel, items) + #self.HtmlPage.SetFonts("","",self.ira.fontsize) #self.HtmlPage.SetMinSize( size ) #if "gtk2" in wx.PlatformInfo: # self.HtmlPage.SetStandardFonts() @@ -2477,11 +2514,11 @@ class message(wx.Frame): sizer_2.Add(self.HtmlPage, 1, wx.EXPAND|wx.ADJUST_MINSIZE, 0) #m_sdbSizer1 = wx.StdDialogButtonSizer() m_sdbSizer1 = wx.BoxSizer(wx.HORIZONTAL) - m_sdbSizer1.Add( self.button_1 , 0, wx.ALIGN_RIGHT | wx.EXPAND) + m_sdbSizer1.Add( self.button_1 , 0, wx.EXPAND) if self.save : - m_sdbSizer1.Add( self.button_2 , 0, wx.ALIGN_RIGHT | wx.EXPAND) + m_sdbSizer1.Add( self.button_2 , 0, wx.EXPAND) if self.uceids is not None : - m_sdbSizer1.Add( self.butsub , 0, wx.ALIGN_RIGHT | wx.EXPAND) + m_sdbSizer1.Add( self.butsub , 0, wx.EXPAND) #m_sdbSizer1.Realize() #self.panel.SetSizer( m_sdbSizer1 ) sizer_2.Add( m_sdbSizer1, 0, wx.ALIGN_RIGHT, 5) @@ -2492,14 +2529,14 @@ class message(wx.Frame): def OnSavePage(self, evt) : dlg = wx.FileDialog( self, message=_("Save as ..."), defaultDir=os.getcwd(), - defaultFile="concordancier.html", wildcard="html|*.html", style=wx.SAVE | wx.OVERWRITE_PROMPT + defaultFile="concordancier.html", wildcard="html|*.html", style=wx.FD_SAVE | wx.FD_OVERWRITE_PROMPT ) #dlg.SetFilterIndex(2) dlg.CenterOnParent() self.html = '
'.join([self.items[i] for i in range(0,len(self.items))]) if dlg.ShowModal() == wx.ID_OK: path = dlg.GetPath() - with open(path, 'w') as f : + with open(path, 'w', encoding='utf8') as f : f.write(self.html) def OnLink(self, evt): @@ -2687,11 +2724,11 @@ class ProtoDial ( wx.Dialog ): variablesChoices = headers self.variables = wx.ListBox( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, variablesChoices, wx.LB_HSCROLL|wx.LB_MULTIPLE ) self.variables.SetMinSize( wx.Size( 350,-1 ) ) - fgSizer1.Add( self.variables, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL|wx.EXPAND, 5 ) + fgSizer1.Add( self.variables, 0, wx.EXPAND, 5 ) rangsChoices = headers self.rangs = wx.ListBox( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, rangsChoices, wx.LB_HSCROLL|wx.LB_MULTIPLE ) self.rangs.SetMinSize( wx.Size( 350,-1 ) ) - fgSizer1.Add( self.rangs, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL|wx.EXPAND, 5 ) + fgSizer1.Add( self.rangs, 0, wx.EXPAND, 5 ) bSizer1.Add( fgSizer1, 1, wx.ALIGN_CENTER_HORIZONTAL, 5 ) fgSizer3 = wx.FlexGridSizer( 0, 2, 0, 0 ) fgSizer3.SetFlexibleDirection( wx.BOTH ) @@ -2977,7 +3014,7 @@ class ImageViewer ( wx.Frame ): def OnSaveImage(self, event) : dlg = wx.FileDialog( self, message=_("Save as..."), defaultDir=self.parametres.get('pathout',os.getcwd()), - defaultFile= self.imagename, wildcard=self.parametres['wildcard'], style=wx.SAVE | wx.OVERWRITE_PROMPT + defaultFile= self.imagename, wildcard=self.parametres['wildcard'], style=wx.FD_SAVE | wx.FD_OVERWRITE_PROMPT ) dlg.SetFilterIndex(0) dlg.CenterOnParent() @@ -2994,6 +3031,8 @@ class BarFrame : height = len(rownames) * 15 if height < 400 : height = 400 + if width < 500 : + width = 500 else : width = 500 height = (35 * len(colnames)) + (15 * len(rownames)) @@ -3024,7 +3063,7 @@ class BarFrame : parametres['tree'] = tree txt = barplot(table, parametres) tmpscript = tempfile.mktemp(dir=ira.TEMPDIR) - with open(tmpscript,'w') as f : + with open(tmpscript,'w', encoding='utf8') as f : f.write(txt) exec_rcode(ira.RPath, tmpscript, wait = True) win = ImageViewer(ira, parametres, _("Graphic"), size=(700, 500)) @@ -3235,11 +3274,11 @@ class MergeClusterFrame ( wx.Dialog ): bSizer1.Add( self.m_panel1, 4, wx.EXPAND |wx.ALL, 5 ) self.m_panel4 = wx.Panel( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.TAB_TRAVERSAL ) bSizer5 = wx.BoxSizer( wx.HORIZONTAL ) - self.m_staticText13 = wx.StaticText( self.m_panel4, wx.ID_ANY, "MyLabel", wx.DefaultPosition, wx.DefaultSize, 0 ) + self.m_staticText13 = wx.StaticText( self.m_panel4, wx.ID_ANY, "Metadata", wx.DefaultPosition, wx.DefaultSize, 0 ) self.m_staticText13.Wrap( -1 ) bSizer5.Add( self.m_staticText13, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) self.m_textCtrl5 = wx.TextCtrl( self.m_panel4, wx.ID_ANY, "cl_", wx.DefaultPosition, wx.DefaultSize, 0 ) - self.m_textCtrl5.SetMinSize( wx.Size( 400,-1 ) ) + self.m_textCtrl5.SetMinSize( wx.Size( 400, 50 ) ) bSizer5.Add( self.m_textCtrl5, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) self.m_staticText15 = wx.StaticText( self.m_panel4, wx.ID_ANY, "+cluster number", wx.DefaultPosition, wx.DefaultSize, 0 ) self.m_staticText15.Wrap( -1 ) @@ -3253,8 +3292,8 @@ class MergeClusterFrame ( wx.Dialog ): self.m_staticText12 = wx.StaticText( self.m_panel3, wx.ID_ANY, "Corpus name", wx.DefaultPosition, wx.DefaultSize, 0 ) self.m_staticText12.Wrap( -1 ) bSizer4.Add( self.m_staticText12, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) - self.m_textCtrl4 = wx.TextCtrl( self.m_panel3, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 ) - self.m_textCtrl4.SetMinSize( wx.Size( 400,-1 ) ) + self.m_textCtrl4 = wx.TextCtrl( self.m_panel3, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 5 ) + self.m_textCtrl4.SetMinSize( wx.Size( 400, 50 ) ) bSizer4.Add( self.m_textCtrl4, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) self.m_panel3.SetSizer( bSizer4 ) self.m_panel3.Layout() @@ -3311,12 +3350,12 @@ class MergeClusterFrame ( wx.Dialog ): for analyse in corpus['analyses'] : if analyse['type'] == 'alceste' : if corpus['uuid'] not in self.intree : - child = self.tree.Append(self.tree.root, corpus['corpus_name']) + child = self.tree.AppendItem(self.tree.root, corpus['corpus_name']) self.tree.SetItemImage(child, self.ild['corpus'], wx.TreeItemIcon_Normal) self.tree.SetItemImage(child, self.ild['corpus'], wx.TreeItemIcon_Expanded) self.tree.SetPyData(child, corpus) self.intree[corpus['uuid']] = corpus - last = self.tree.Append(child, analyse['name']) + last = self.tree.AppendItem(child, analyse['name']) self.tree.SetItemImage(last, self.ild['reinert'], wx.TreeItemIcon_Normal) self.tree.SetItemImage(last, self.ild['reinert'], wx.TreeItemIcon_Expanded) @@ -3325,7 +3364,7 @@ class MergeClusterFrame ( wx.Dialog ): parametres = DoConf(analyse['ira']).getoptions() clnb = int(parametres['clnb']) for i in range(clnb) : - cl = self.tree.Append(last, 'classe %i' % (i+1)) + cl = self.tree.AppendItem(last, 'classe %i' % (i+1)) self.tree.SetItemImage(cl, self.ild['wordcloud'], wx.TreeItemIcon_Normal) self.tree.SetItemImage(cl, self.ild['wordcloud'], wx.TreeItemIcon_Expanded) self.tree.SetPyData(cl, {'type' : 'cluster', 'analyse': analyse['uuid'], 'number': i+1, 'corpus': analyse['corpus'], 'ira':analyse['ira']}) @@ -3385,7 +3424,7 @@ class MergeClusterFrame ( wx.Dialog ): class FullText ( wx.Frame ): def __init__( self, parent ): - wx.Frame.__init__ ( self, parent, id = wx.ID_ANY, title = wx.EmptyString, pos = wx.DefaultPosition, size = wx.Size( 500,600 ), style = wx.DEFAULT_FRAME_STYLE|wx.TAB_TRAVERSAL ) + wx.Frame.__init__ ( self, parent, id = wx.ID_ANY, title = _("Full Text"), pos = wx.DefaultPosition, size = wx.Size( 500,600 ), style = wx.DEFAULT_FRAME_STYLE|wx.FRAME_FLOAT_ON_PARENT|wx.TAB_TRAVERSAL ) self.SetSizeHints( -1, -1 ) bSizer1 = wx.BoxSizer( wx.VERTICAL ) self.m_panel1 = wx.Panel( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.TAB_TRAVERSAL ) @@ -3396,9 +3435,10 @@ class FullText ( wx.Frame ): #bSizer2.Add( self.m_richText1, 9, wx.EXPAND |wx.ALL, 5 ) m_sdbSizer1 = wx.StdDialogButtonSizer() self.m_sdbSizer1OK = wx.Button( self.m_panel1, wx.ID_OK ) + self.m_sdbSizer1OK.Bind( wx.EVT_BUTTON, self.OnOk ) m_sdbSizer1.AddButton( self.m_sdbSizer1OK ) - self.m_sdbSizer1Cancel = wx.Button( self.m_panel1, wx.ID_CANCEL ) - m_sdbSizer1.AddButton( self.m_sdbSizer1Cancel ) + #self.m_sdbSizer1Cancel = wx.Button( self.m_panel1, wx.ID_CANCEL ) + #m_sdbSizer1.AddButton( self.m_sdbSizer1Cancel ) m_sdbSizer1.Realize(); bSizer2.Add( m_sdbSizer1, 0, wx.EXPAND, 5 ) self.m_panel1.SetSizer( bSizer2 ) @@ -3412,3 +3452,6 @@ class FullText ( wx.Frame ): def __del__( self ): pass + def OnOk( self, evt ): + self.Destroy() +