X-Git-Url: http://iramuteq.org/git?p=iramuteq;a=blobdiff_plain;f=dialog.py;h=66a427aeb7740af1257b906ac4dbb67c848ec1b5;hp=2ab63d4d4a519b70de82979d5524d5209890f968;hb=f12da65c1895ecdd1b48109d7b1334181487a25f;hpb=3679aeef83bdbe6c0fadaf9d2d7127d4cd52e4d2 diff --git a/dialog.py b/dialog.py index 2ab63d4..66a427a 100755 --- a/dialog.py +++ b/dialog.py @@ -543,9 +543,9 @@ class PrefGraph(wx.Dialog): self.paramgraph=paramgraph self.labeltype = wx.StaticText(self, -1, _(u"Graphic type").decode('utf8')) if self.paramgraph['clnb'] <= 3 : - choix = [u'2D', 'web 2D'] + choix = [u'2D']#, 'web 2D'] else : - choix=[u'2D' ,u'3D', 'web 2D', 'web 3D'] + choix=[u'2D' ,u'3D']#, 'web 2D', 'web 3D'] self.choicetype = wx.Choice(self, -1, (100,50), choices=choix) self.label_format = wx.StaticText(self, -1, _(u"Picture format").decode('utf8')) self.choix_format = wx.Choice(self, -1, (100,50), choices = ['png', 'svg']) @@ -1038,7 +1038,7 @@ class PrefSimpleFile(wx.Dialog): class StatDialog ( wx.Dialog ): def __init__( self, parent, keys ): - wx.Dialog.__init__ ( self, parent, id = wx.ID_ANY, title = u"Settings", pos = wx.DefaultPosition, size = wx.Size( -1,-1 ), style = wx.DEFAULT_DIALOG_STYLE ) + wx.Dialog.__init__ ( self, parent, id = wx.ID_ANY, title = _(u"Settings").decode('utf8'), pos = wx.DefaultPosition, size = wx.Size( -1,-1 ), style = wx.DEFAULT_DIALOG_STYLE ) self.fileout = "" self.parent = parent @@ -1049,27 +1049,27 @@ class StatDialog ( wx.Dialog ): gSizer1 = wx.GridSizer( 0, 2, 0, 0 ) - self.m_staticText1 = wx.StaticText( self, wx.ID_ANY, u"Lemmatization", wx.DefaultPosition, wx.DefaultSize, 0 ) + self.m_staticText1 = wx.StaticText( self, wx.ID_ANY, _(u"Lemmatization").decode('utf8'), wx.DefaultPosition, wx.DefaultSize, 0 ) self.m_staticText1.Wrap( -1 ) gSizer1.Add( self.m_staticText1, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) - radio_lemChoices = [ u"yes", u"no" ] + radio_lemChoices = [ _(u"yes").decode('utf8'), _(u"no").decode('utf8') ] self.radio_lem = wx.RadioBox( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, radio_lemChoices, 1, wx.RA_SPECIFY_COLS ) self.radio_lem.SetSelection( 0 ) gSizer1.Add( self.radio_lem, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_LEFT|wx.ALL, 5 ) - self.m_staticText2 = wx.StaticText( self, wx.ID_ANY, u"Keys properties", wx.DefaultPosition, wx.DefaultSize, 0 ) + self.m_staticText2 = wx.StaticText( self, wx.ID_ANY, _(u"Keys properties").decode('utf8'), wx.DefaultPosition, wx.DefaultSize, 0 ) self.m_staticText2.Wrap( -1 ) gSizer1.Add( self.m_staticText2, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) - self.button_5 = wx.Button( self, wx.ID_PREFERENCES, u"properties", wx.DefaultPosition, wx.DefaultSize, 0 ) + self.button_5 = wx.Button( self, wx.ID_PREFERENCES, _(u"properties").decode('utf8'), wx.DefaultPosition, wx.DefaultSize, 0 ) gSizer1.Add( self.button_5, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_LEFT|wx.ALL, 5 ) - self.m_staticText3 = wx.StaticText( self, wx.ID_ANY, u"Dictionary", wx.DefaultPosition, wx.DefaultSize, 0 ) + self.m_staticText3 = wx.StaticText( self, wx.ID_ANY, _(u"Dictionary").decode('utf8'), wx.DefaultPosition, wx.DefaultSize, 0 ) self.m_staticText3.Wrap( -1 ) gSizer1.Add( self.m_staticText3, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) - radio_dictchoiceChoices = [ u"indexation", u"other" ] + radio_dictchoiceChoices = [ _(u"indexation").decode('utf8'), _(u"other").decode('utf8') ] self.radio_dictchoice = wx.RadioBox( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, radio_dictchoiceChoices, 1, wx.RA_SPECIFY_COLS ) self.radio_dictchoice.SetSelection( 0 ) gSizer1.Add( self.radio_dictchoice, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_LEFT|wx.ALL, 5 ) @@ -1564,7 +1564,7 @@ class FindInCluster(wx.Frame): class SearchDial ( wx.Frame ): def __init__( self, parent, listctrl, col, shown): - wx.Frame.__init__ ( self, parent, id = wx.ID_ANY, title = wx.EmptyString, pos = wx.DefaultPosition, size = wx.DefaultSize, style = wx.DEFAULT_FRAME_STYLE ) + wx.Frame.__init__ ( self, parent, id = wx.ID_ANY, title = wx.EmptyString, pos = wx.DefaultPosition, size = wx.DefaultSize, style = wx.DEFAULT_FRAME_STYLE | wx.STAY_ON_TOP ) self.parent = parent self.listctrl = listctrl self.col = col @@ -1739,6 +1739,7 @@ class OptLexi(wx.Dialog): self.label = wx.StaticText(self, -1, _(u"Minimum frequency").decode('utf8')) self.spin = wx.SpinCtrl(self, -1, min = 1, max = 10000, initial = 10) self.Bind(wx.EVT_CHOICE, self.onselect, self.choice) + self.Bind(wx.EVT_LISTBOX, self.onchoose, self.list_box_1) self.__set_properties() self.__do_layout() # end wxGlade @@ -1750,6 +1751,7 @@ class OptLexi(wx.Dialog): self.spin.SetValue(10) self.choice.SetSelection(0) self.choice_indice.SetSelection(0) + self.button_1.Enable(False) #self.SetMinSize(wx.Size(300, 400)) # end wxGlade @@ -1789,7 +1791,18 @@ class OptLexi(wx.Dialog): else : for et in self.listet : self.list_box_1.Append(et) - + + def onchoose(self, evt): + if self.choice.GetSelection()== 0 : + if len(self.list_box_1.GetSelections()) > 0 : + self.button_1.Enable(True) + else : + self.button_1.Enable(False) + elif self.choice.GetSelection() == 1 : + if len(self.list_box_1.GetSelections()) > 1 : + self.button_1.Enable(True) + else : + self.button_1.Enable(False) class PrefDendro ( wx.Dialog ): @@ -2263,9 +2276,9 @@ class ChiDialog(wx.Dialog): class CorpusPref ( wx.Dialog ): def __init__( self, parent, parametres ): - wx.Dialog.__init__ ( self, parent, id = wx.ID_ANY, title = _(u"Settings").decode('utf8'), pos = wx.DefaultPosition, size = wx.DefaultSize, style = wx.DEFAULT_DIALOG_STYLE ) + wx.Dialog.__init__ ( self, parent, id = wx.ID_ANY, title = _(u"Settings").decode('utf8'), pos = wx.DefaultPosition, size = wx.DefaultSize, style = wx.DEFAULT_DIALOG_STYLE | wx.STAY_ON_TOP ) 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'spanish (expérimentale)', u'greek (expériementale)', u'galician (expérimentale)', u'autre...'] + langues_n = [u'français', u'english', u'german (expérimentale)', u'italian', u'swedish (expérimentale)', u'portuguese', u'spanish (expérimentale)', u'greek (expériementale)', u'galician (expérimentale)', u'autre...'] self.langues = [u'french', u'english', u'german', u'italian', u'swedish', u'portuguese', u'spanish', u'greek', u'galician', u'other'] self.encodages = [enc[0].lower() for enc in encodages] @@ -2337,7 +2350,9 @@ class CorpusPref ( wx.Dialog ): fgSizer5.Add( self.radio_other_dict, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) self.otherdictpath = wx.FilePickerCtrl( self.m_panel1, wx.ID_ANY, wx.EmptyString, _(u"Select a file").decode('utf8'), u"*.*", wx.DefaultPosition, wx.Size( 300,-1 ), wx.FLP_DEFAULT_STYLE ) + self.otherdictpath.SetMinSize(wx.Size(300, -1)) fgSizer5.Add( self.otherdictpath, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) + self.otherdictpath.Enable( False ) bSizer2.Add( fgSizer5, 1, wx.EXPAND, 5 ) @@ -2493,7 +2508,9 @@ class CorpusPref ( wx.Dialog ): # Connect Events self.Bind(wx.EVT_BUTTON, self.OnChangeDir, self.m_button1) self.lang_choices.Bind( wx.EVT_CHOICE, self.OnChangeLangage ) - self.radio_other_dict.Bind( wx.EVT_RADIOBUTTON, self.changedictchoice ) + self.radio_other_dict.Bind( wx.EVT_RADIOBUTTON, self.changedictchoice ) + self.radio_default_dict.Bind( wx.EVT_RADIOBUTTON, self.changedictchoice ) + self.otherdictpath.Bind( wx.EVT_FILEPICKER_CHANGED, self.selectdict) self.setparametres(parametres) self.SetSizer( bSizer1 ) @@ -2534,6 +2551,7 @@ class CorpusPref ( wx.Dialog ): self.check_tirets.SetValue(parametres['tiret']) self.check_tolist.SetValue(parametres['tolist']) self.check_ponct.SetValue(parametres['keep_ponct']) + self.defaultdictpath.SetValue(self.langues[0]) def doparametres(self) : parametres = {} @@ -2553,6 +2571,8 @@ class CorpusPref ( wx.Dialog ): parametres['tiret'] = self.check_tirets.GetValue() parametres['tolist'] = self.check_tolist.GetValue() parametres['keep_ponct'] = self.check_ponct.GetValue() + if self.radio_other_dict.GetValue() : + parametres['dictionary'] = self.otherdictpath.GetPath() for val in parametres : if isinstance(parametres[val], bool) : if parametres[val] : @@ -2562,10 +2582,21 @@ class CorpusPref ( wx.Dialog ): return parametres def OnChangeLangage(self, evt): - pass + self.defaultdictpath.SetValue(self.langues[self.lang_choices.GetSelection()]) def changedictchoice(self, evt): - pass + if self.radio_default_dict.GetValue() : + self.otherdictpath.Enable( False ) + self.m_sdbSizer1OK.Enable( True ) + else : + self.otherdictpath.Enable( True ) + if self.otherdictpath.GetPath() == '' : + self.m_sdbSizer1OK.Enable( False ) + + def selectdict(self, evt): + if self.otherdictpath.GetPath() != '' : + self.m_sdbSizer1OK.Enable( True ) + class ConcordList(wx.HtmlListBox): @@ -2582,10 +2613,11 @@ class ConcordList(wx.HtmlListBox): class message(wx.Frame): def __init__(self, parent, items, title, size, save = True, uceids = None): - wx.Frame.__init__ ( self, parent, id = wx.ID_ANY, title = title, pos = wx.DefaultPosition, size = size, style = wx.DEFAULT_FRAME_STYLE ) + wx.Frame.__init__ ( self, parent, id = wx.ID_ANY, title = title, pos = wx.DefaultPosition, size = size, style = wx.CLOSE_BOX|wx.DEFAULT_FRAME_STYLE|wx.FRAME_FLOAT_ON_PARENT|wx.TAB_TRAVERSAL ) self.save = save self.uceids = uceids - self.ira = wx.GetApp().GetTopWindow() + self.ira = wx.GetApp().GetTopWindow() + self.SetIcon(self.ira._icon) self.SetSizeHintsSz( wx.DefaultSize, wx.DefaultSize ) self.items = items self.html = "" @@ -2644,9 +2676,8 @@ class message(wx.Frame): self.Destroy() def OnSub(self ,evt): - parametres = {'fromuceids' : True, 'uceids' : self.uceids} - self.ira.OnSubText(None, parametres) - + parametres = {'fromuceids' : True, 'uceids' : self.uceids, 'isempty' : True} + self.ira.OnSubText(wx.MenuEvent(), None, parametres) class ExtractDialog ( wx.Dialog ): @@ -2775,44 +2806,6 @@ class ExtractDialog ( wx.Dialog ): def __del__( self ): pass -# class FreqDialog(wx.Dialog): -# def __init__(self, parent, ID, listcol, title, size) : -# wx.Dialog.__init__(self, parent, ID, title, size=size, pos=wx.DefaultPosition,style=wx.DEFAULT_DIALOG_STYLE | wx.CANCEL | wx.OK ) -# pre = wx.PreDialog() -# pre.SetExtraStyle(wx.DIALOG_EX_CONTEXTHELP) -# pre.Create(parent, ID, title, wx.DefaultPosition, size, wx.DEFAULT_DIALOG_STYLE | wx.CANCEL | wx.OK) -# self.PostCreate(pre) -# self.parent = parent -# sizer = wx.BoxSizer(wx.VERTICAL) -# #self.content = parent.content -# self.header = listcol -# #LABELLIST = [] -# #for i in self.header: -# # forme = i -# # if len(forme) > 60 : -# # LABELLIST.append(i[0:60]) -# # else: -# # LABELLIST.append(i) -# self.list_box_1 = wx.ListBox(self, -1, choices=self.header, style=wx.LB_EXTENDED | wx.LB_HSCROLL) -# sizer.Add(self.list_box_1, 0, 5) -# -# btnsizer = wx.BoxSizer(wx.HORIZONTAL) -# -# btn = wx.Button(self, wx.ID_CANCEL) -# btnsizer.Add(btn) -# -# btn = wx.Button(self, wx.ID_OK) -# btn.SetDefault() -# btnsizer.Add(btn) -# -# sizer.Add(btnsizer, 0, wx.ALIGN_CENTER_VERTICAL | wx.ALIGN_CENTER_HORIZONTAL, 5) -# self.SetSizer(sizer) -# sizer.Fit(self) -# self.SetTitle(_(u"Selection").decode('utf8')) -# - # end wxGlade - - class FreqDialog ( wx.Dialog ): def __init__( self, parent, listcol, title, size = wx.Size( -1,-1 ), showNA = True): @@ -3035,7 +3028,7 @@ class SimpleDialog ( wx.Dialog ): class SubTextFromMetaDial ( wx.Dialog ): def __init__( self, parent, parametres ): - wx.Dialog.__init__ ( self, parent, id = wx.ID_ANY, title = u"Subcorpus from metadata", pos = wx.DefaultPosition, size = wx.DefaultSize, style = wx.DEFAULT_DIALOG_STYLE ) + wx.Dialog.__init__ ( self, parent, id = wx.ID_ANY, title = _(u"Subcorpus").decode('utf8'), pos = wx.DefaultPosition, size = wx.DefaultSize, style = wx.DEFAULT_DIALOG_STYLE ) self.SetSizeHintsSz( wx.DefaultSize, wx.DefaultSize ) @@ -3045,14 +3038,14 @@ class SubTextFromMetaDial ( wx.Dialog ): fgSizer1.SetFlexibleDirection( wx.BOTH ) fgSizer1.SetNonFlexibleGrowMode( wx.FLEX_GROWMODE_SPECIFIED ) - self.m_staticText1 = wx.StaticText( self, wx.ID_ANY, u"SubCorpus Name", wx.DefaultPosition, wx.DefaultSize, 0 ) + self.m_staticText1 = wx.StaticText( self, wx.ID_ANY, _(u"Name").decode('utf8'), wx.DefaultPosition, wx.DefaultSize, 0 ) self.m_staticText1.Wrap( -1 ) fgSizer1.Add( self.m_staticText1, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) self.subcorpusname = wx.TextCtrl( self, wx.ID_ANY, parametres['corpus_name'], wx.DefaultPosition, wx.Size( 300,-1 ), 0 ) fgSizer1.Add( self.subcorpusname, 0, wx.ALL, 5 ) - self.m_staticText2 = wx.StaticText( self, wx.ID_ANY, u"Select one or more metadata", wx.DefaultPosition, wx.DefaultSize, 0 ) + self.m_staticText2 = wx.StaticText( self, wx.ID_ANY, _(u"Select one or more metadata").decode('utf8'), wx.DefaultPosition, wx.DefaultSize, 0 ) self.m_staticText2.Wrap( -1 ) fgSizer1.Add( self.m_staticText2, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) @@ -3081,14 +3074,23 @@ class SubTextFromMetaDial ( wx.Dialog ): bSizer1.Fit( self ) self.Centre( wx.BOTH ) + self.Bind(wx.EVT_LISTBOX, self.onchoose, self.m_listBox1) + if not parametres.get('isempty', False) : + self.m_sdbSizer1OK.Enable(False) def __del__( self ): pass + + def onchoose(self, evt): + if len(self.m_listBox1.GetSelections()) > 0 : + self.m_sdbSizer1OK.Enable(True) + else : + self.m_sdbSizer1OK.Enable(False) class BarGraphDialog ( wx.Dialog ): def __init__( self, parent, width, height ): - wx.Dialog.__init__ ( self, parent, id = wx.ID_ANY, title = u"Preferences", pos = wx.DefaultPosition, size = wx.DefaultSize, style = wx.DEFAULT_DIALOG_STYLE ) + wx.Dialog.__init__ ( self, parent, id = wx.ID_ANY, title = _(u"Preferences").decode('utf8'), pos = wx.DefaultPosition, size = wx.DefaultSize, style = wx.DEFAULT_DIALOG_STYLE ) self.SetSizeHintsSz( wx.DefaultSize, wx.DefaultSize ) @@ -3096,11 +3098,11 @@ class BarGraphDialog ( wx.Dialog ): bSizer2 = wx.BoxSizer( wx.HORIZONTAL ) - self.m_staticText1 = wx.StaticText( self, wx.ID_ANY, u"Size", wx.DefaultPosition, wx.DefaultSize, 0 ) + self.m_staticText1 = wx.StaticText( self, wx.ID_ANY, _(u"Size").decode('utf8'), wx.DefaultPosition, wx.DefaultSize, 0 ) self.m_staticText1.Wrap( -1 ) bSizer2.Add( self.m_staticText1, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) - sizeradioChoices = [ u"automatic", u"manual" ] + sizeradioChoices = [ _(u"automatic").decode('utf8'), _(u"manual").decode('utf8') ] self.sizeradio = wx.RadioBox( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, sizeradioChoices, 1, wx.RA_SPECIFY_COLS ) self.sizeradio.SetSelection( 0 ) bSizer2.Add( self.sizeradio, 0, wx.ALIGN_TOP|wx.ALL, 5 ) @@ -3109,14 +3111,14 @@ class BarGraphDialog ( wx.Dialog ): fgSizer1.SetFlexibleDirection( wx.BOTH ) fgSizer1.SetNonFlexibleGrowMode( wx.FLEX_GROWMODE_SPECIFIED ) - self.m_staticText2 = wx.StaticText( self, wx.ID_ANY, u"width", wx.DefaultPosition, wx.DefaultSize, 0 ) + self.m_staticText2 = wx.StaticText( self, wx.ID_ANY, _(u"width").decode('utf8'), wx.DefaultPosition, wx.DefaultSize, 0 ) self.m_staticText2.Wrap( -1 ) fgSizer1.Add( self.m_staticText2, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) self.widthsp = wx.SpinCtrl( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, wx.SP_ARROW_KEYS, 0, 1000000, 600 ) fgSizer1.Add( self.widthsp, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) - self.m_staticText3 = wx.StaticText( self, wx.ID_ANY, u"height", wx.DefaultPosition, wx.DefaultSize, 0 ) + self.m_staticText3 = wx.StaticText( self, wx.ID_ANY, _(u"height").decode('utf8'), wx.DefaultPosition, wx.DefaultSize, 0 ) self.m_staticText3.Wrap( -1 ) fgSizer1.Add( self.m_staticText3, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) @@ -3131,7 +3133,7 @@ class BarGraphDialog ( wx.Dialog ): bSizer3 = wx.BoxSizer( wx.HORIZONTAL ) - self.m_staticText4 = wx.StaticText( self, wx.ID_ANY, u"Image format", wx.DefaultPosition, wx.DefaultSize, 0 ) + self.m_staticText4 = wx.StaticText( self, wx.ID_ANY, _(u"Image format").decode('utf8'), wx.DefaultPosition, wx.DefaultSize, 0 ) self.m_staticText4.Wrap( -1 ) bSizer3.Add( self.m_staticText4, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALL, 5 ) @@ -3184,14 +3186,16 @@ class BarGraphDialog ( wx.Dialog ): class MessageImage(wx.Frame): def __init__(self, parent, parametres, title, size): - wx.Frame.__init__ ( self, parent, id = wx.ID_ANY, title = title, pos = wx.DefaultPosition, size = size, style = wx.DEFAULT_FRAME_STYLE ) + wx.Frame.__init__ ( self, parent, id = wx.ID_ANY, title = title, pos = wx.DefaultPosition, size = size, style = wx.CLOSE_BOX|wx.DEFAULT_FRAME_STYLE|wx.FRAME_FLOAT_ON_PARENT|wx.TAB_TRAVERSAL ) + self.ira = wx.GetApp().GetTopWindow() + self.SetIcon(self.ira._icon) self.SetSizeHintsSz( wx.DefaultSize, wx.DefaultSize ) self.parametres = parametres self.imageFile = self.parametres['tmpgraph'] if parametres['svg'] == 'TRUE' : self.imagename = u"image.svg" else : - self.imagename = u"iamge.png" + self.imagename = u"image.png" self.HtmlPage = wx.html.HtmlWindow(self, -1) self.HtmlPage.SetMinSize(size) if "gtk2" in wx.PlatformInfo: @@ -3223,7 +3227,7 @@ class MessageImage(wx.Frame): def OnSaveImage(self, event) : dlg = wx.FileDialog( - self, message="Enregistrer sous...", defaultDir=os.getcwd(), + self, message=_(u"Save as...").decode('utf8'), defaultDir=os.getcwd(), defaultFile= self.imagename, wildcard=self.parametres['wildcard'], style=wx.SAVE | wx.OVERWRITE_PROMPT ) dlg.SetFilterIndex(2) @@ -3267,7 +3271,7 @@ class BarFrame : with open(tmpscript,'w') as f : f.write(txt) exec_rcode(ira.RPath, tmpscript, wait = True) - win = MessageImage(ira, parametres, u"Graphique", size=(700, 500)) + win = MessageImage(ira, parametres, _(u"Graphic").decode('utf8'), size=(700, 500)) if svg == 'FALSE' : txt = "" % tmpgraph else :