X-Git-Url: http://iramuteq.org/git?p=iramuteq;a=blobdiff_plain;f=iramuteq.py;h=f2a22b91d9adc516aaac98f8c33801d0bef8353d;hp=157c0d6bec32ceb70fb3087e8e52550c20a62b0f;hb=490afb117b3fc95c67f883044489bf60d40e3f41;hpb=46fe1c98d3c43f5bce9d8acb6d0ee24b5299fd85 diff --git a/iramuteq.py b/iramuteq.py index 157c0d6..f2a22b9 100644 --- a/iramuteq.py +++ b/iramuteq.py @@ -83,7 +83,6 @@ ID_SaveTab = wx.NewId() ID_CreateText = wx.NewId() ID_ACCEUIL = wx.NewId() ID_RESULT = wx.NewId() -ID_VIEWDATA = wx.NewId() ID_HTMLcontent = wx.NewId() ID_SimiTxt = wx.NewId() ID_proto = wx.NewId() @@ -94,6 +93,9 @@ ID_Subtxtfrommeta = wx.NewId() ID_Subtxtfromthem = wx.NewId() ID_WC = wx.NewId() ID_ImportEuro = wx.NewId() +ID_Fact_xml = wx.NewId() +ID_Fact_mail = wx.NewId() +ID_Fact_copy = wx.NewId() ########################################################## #elements de configuration ########################################################## @@ -184,6 +186,13 @@ images_analyses = { 'proto' : 'proto.png', 'TXM' : 'TXM.png', 'europress' : 'europress.png', + 'factiva_xml' : 'factiva_xml.png', + 'factiva_copy' : 'factiva_copy.png', + 'factiva_mail': 'factiva_mail.png', + 'iramuteq' : 'iraicone.png', + 'subcorpusmeta' : 'subcorpusmeta.png', + 'subcorpusthema' : 'subcorpusthema.png', + 'preferences' : 'preferences.png' } ##################################################################### @@ -242,19 +251,9 @@ class IraFrame(wx.Frame): file_menu.AppendItem(item) item = wx.MenuItem(file_menu, ID_OnOpenAnalyse, _(u"Open an analysis").decode('utf8'), _(u"Open an analysis").decode('utf8')) - item.SetBitmap(wx.ArtProvider_GetBitmap(wx.ART_FILE_OPEN)) + item.SetBitmap(self.images_analyses['iramuteq']) file_menu.AppendItem(item) - - menuFactiva = wx.Menu() - fact_from_xml = wx.MenuItem(menuFactiva, wx.ID_ANY, _(u"from xml").decode('utf8')) - fact_from_mail = wx.MenuItem(menuFactiva, wx.ID_ANY, _(u"from mail").decode('utf8')) - fact_from_txt = wx.MenuItem(menuFactiva, wx.ID_ANY, _(u"from copy/paste").decode('utf8')) - menuFactiva.AppendItem(fact_from_xml) - menuFactiva.AppendItem(fact_from_mail) - menuFactiva.AppendItem(fact_from_txt) - file_menu.AppendMenu(-1, _(u"Import from factiva").decode('utf8'), menuFactiva) - item = wx.MenuItem(file_menu, ID_ImportTXM, _(u"Import from TXM").decode('utf8'), _(u"Import from TXM").decode('utf8')) item.SetBitmap(self.images_analyses['TXM']) file_menu.AppendItem(item) @@ -262,6 +261,18 @@ class IraFrame(wx.Frame): item = wx.MenuItem(file_menu, ID_ImportEuro, _(u"Import from Europress").decode('utf8'), _(u"Import from Europress").decode('utf8')) item.SetBitmap(self.images_analyses['europress']) file_menu.AppendItem(item) + + menuFactiva = wx.Menu() + fact_from_xml = wx.MenuItem(menuFactiva, ID_Fact_xml, _(u"from xml").decode('utf8')) + fact_from_xml.SetBitmap(self.images_analyses['factiva_xml']) + fact_from_mail = wx.MenuItem(menuFactiva, ID_Fact_mail, _(u"from mail").decode('utf8')) + fact_from_mail.SetBitmap(self.images_analyses['factiva_mail']) + fact_from_txt = wx.MenuItem(menuFactiva, ID_Fact_copy, _(u"from copy/paste").decode('utf8')) + fact_from_txt.SetBitmap(self.images_analyses['factiva_copy']) + menuFactiva.AppendItem(fact_from_xml) + menuFactiva.AppendItem(fact_from_mail) + menuFactiva.AppendItem(fact_from_txt) + file_menu.AppendMenu(-1, _(u"Import from factiva").decode('utf8'), menuFactiva) menuTools = wx.Menu() splitvar = wx.MenuItem(menuTools, wx.ID_ANY, _(u"Split from variable").decode('utf8')) @@ -283,12 +294,20 @@ class IraFrame(wx.Frame): file_menu.Append(wx.ID_EXIT, _(u"Exit").decode('utf8')) edit_menu = wx.Menu() - edit_menu.Append(wx.ID_PREFERENCES, _(u'Preferences').decode('utf8')) + pref = wx.MenuItem(edit_menu, wx.ID_PREFERENCES, _(u'Preferences').decode('utf8')) + pref.SetBitmap(self.images_analyses['preferences']) + edit_menu.AppendItem(pref) + #edit_menu.Append(wx.ID_PREFERENCES, _(u'Preferences').decode('utf8')) view_menu = wx.Menu() - view_menu.Append(ID_ACCEUIL, _(u"Home page").decode('utf8')) - view_menu.Append(ID_VIEWDATA, _(u"Show data").decode('utf8')) - view_menu.Append(ID_RESULT, _(u'Show results').decode('utf8')) + home = wx.MenuItem(view_menu, ID_ACCEUIL, _(u"Home page").decode('utf8')) + home.SetBitmap(wx.ArtProvider_GetBitmap(wx.ART_GO_HOME, size = (16,16))) + view_menu.AppendItem(home) + #view_menu.Append(ID_ACCEUIL, _(u"Home page").decode('utf8')) + results = wx.MenuItem(view_menu, ID_RESULT, _(u'Show results').decode('utf8')) + results.SetBitmap(wx.ArtProvider_GetBitmap(wx.ART_LIST_VIEW, size = (16,16))) + view_menu.AppendItem(results) + #view_menu.Append(ID_RESULT, _(u'Show results').decode('utf8')) #view_menu.AppendSeparator() matrix_menu = wx.Menu() matanalyses = [[ID_Freq, _(u"Frequencies").decode('utf8'), 'freq'], @@ -298,7 +317,7 @@ class IraFrame(wx.Frame): 'content' : [[ID_CHDReinert, _(u"Reinert's Method").decode('utf8'), 'reinertmatrix']]}, [ID_SIMI, _(u"Similarities Analysis").decode('utf8'), 'simimatrix'], [ID_proto, _(u"Prototypical Analysis").decode('utf8'), 'proto'], - [ID_Splitfromvar, _(u"Split from variable").decode('utf8'), '']] + [ID_Splitfromvar, _(u"Split from variable").decode('utf8'), 'subcorpusmeta']] for analyse in matanalyses : if not isinstance(analyse, dict) : @@ -346,8 +365,8 @@ class IraFrame(wx.Frame): [ID_SimiTxt, _(u"Similarities Analysis").decode('utf8'), 'simitxt'], [ID_WC, _(u"WordCloud").decode('utf8'), 'wordcloud'], {'name' : _(u"Sub corpus").decode('utf8'), - 'content' : [[ID_Subtxtfrommeta, _(u'Sub corpus from metadata').decode('utf8'), None], - [ID_Subtxtfromthem, _(u'Sub corpus from thematic').decode('utf8'), None]]}, + 'content' : [[ID_Subtxtfrommeta, _(u'Sub corpus from metadata').decode('utf8'), 'subcorpusmeta'], + [ID_Subtxtfromthem, _(u'Sub corpus from thematic').decode('utf8'), 'subcorpusthema']]}, ] for analyse in analyses_text : @@ -376,8 +395,14 @@ class IraFrame(wx.Frame): self.text_menu = text_menu help_menu = wx.Menu() - help_menu.Append(wx.ID_ABOUT, _(u"About...").decode('utf8')) - help_menu.Append(wx.ID_HELP, _(u"Online help...").decode('utf8')) + about = wx.MenuItem(help_menu, wx.ID_ABOUT, _(u"About...").decode('utf8')) + about.SetBitmap(wx.ArtProvider_GetBitmap(wx.ART_INFORMATION, size = (16,16))) + help_menu.AppendItem(about) + #help_menu.Append(wx.ID_ABOUT, _(u"About...").decode('utf8')) + help = wx.MenuItem(help_menu, wx.ID_HELP, _(u"Online help...").decode('utf8')) + help.SetBitmap(wx.ArtProvider_GetBitmap(wx.ART_HELP, size = (16,16))) + help_menu.AppendItem(help) + #help_menu.Append(wx.ID_HELP, _(u"Online help...").decode('utf8')) self.mb.Append(file_menu, _(u"File").decode('utf8')) self.mb.Append(edit_menu, _(u"Edition").decode('utf8')) @@ -405,7 +430,21 @@ class IraFrame(wx.Frame): tb1.AddLabelTool(ID_OpenData, "OpenData", self.images_analyses['matroot'], shortHelp=_(u"Matrix").decode('utf8'), longHelp=_(u"Open a matrix").decode('utf8')) tb1.AddSeparator() tb1.AddLabelTool(ID_OpenText, "OpenText", self.images_analyses['textroot'], shortHelp=_(u"Text").decode('utf8'), longHelp=_(u"Open a text corpus").decode('utf8')) - + tb1.AddSeparator() + tb1.AddLabelTool(ID_OnOpenAnalyse, "OpenAnalyse", self.images_analyses['iramuteq'], shortHelp= _(u"Open an analysis").decode('utf8'), longHelp=_(u"Open an analysis").decode('utf8')) + tb1.AddSeparator() + tb1.AddLabelTool(ID_ImportTXM, "ImportTXM", self.images_analyses['TXM'], shortHelp= _(u"Import from TXM").decode('utf8'), longHelp=_(u"Import from TXM").decode('utf8')) + tb1.AddSeparator() + tb1.AddLabelTool(ID_ImportEuro, "ImportEuro", self.images_analyses['europress'], shortHelp= _(u"Import from Europress").decode('utf8'), longHelp=_(u"Import from Europress").decode('utf8')) + tb1.AddSeparator() + tb1.AddLabelTool(ID_Fact_xml, "ImportFactxml", self.images_analyses['factiva_xml'], shortHelp= _(u"Factiva from xml").decode('utf8'), longHelp=_(u"Factiva from xml").decode('utf8')) + tb1.AddLabelTool(ID_Fact_mail, "ImportFactmail", self.images_analyses['factiva_mail'], shortHelp= _(u"Factiva from mail").decode('utf8'), longHelp=_(u"Factiva from mail").decode('utf8')) + tb1.AddLabelTool(ID_Fact_copy, "ImportFactcopy", self.images_analyses['factiva_copy'], shortHelp= _(u"Factiva from copy/paste").decode('utf8'), longHelp=_(u"Factiva from copy/paste").decode('utf8')) + tb1.AddSeparator() + tb1.AddLabelTool(wx.ID_PREFERENCES, "Preferences", self.images_analyses['preferences'], shortHelp= _(u"Preferences").decode('utf8'), longHelp=_(u"Preferences").decode('utf8')) + tb1.AddSeparator() + tb1.AddLabelTool(ID_ACCEUIL, "Home", wx.ArtProvider_GetBitmap(wx.ART_GO_HOME, size = (16,16)), shortHelp= _(u"Home page").decode('utf8'), longHelp=_(u"Home page").decode('utf8')) + tb1.AddLabelTool(ID_RESULT, "Results", wx.ArtProvider_GetBitmap(wx.ART_LIST_VIEW, size = (16,16)), shortHelp= _(u'Show results').decode('utf8'), longHelp=_(u'Show results').decode('utf8')) tb1.Realize() tb_text = wx.ToolBar(self, -1, wx.DefaultPosition, wx.DefaultSize, @@ -427,6 +466,12 @@ class IraFrame(wx.Frame): for subana in analyse['content'] : tb_mat.AddLabelTool(subana[0], subana[1], self.images_analyses.get(subana[2], wx.EmptyBitmap(16,16)), shortHelp = subana[1], longHelp = subana[1]) tb_mat.Realize() + + tb_help = wx.ToolBar(self, -1, wx.DefaultPosition, wx.DefaultSize, + wx.TB_FLAT | wx.TB_NODIVIDER) + tb_help.AddLabelTool(wx.ID_ABOUT, "About", wx.ArtProvider_GetBitmap(wx.ART_INFORMATION, size=(16,16)), shortHelp=_(u"About...").decode('utf8'), longHelp=_(u"About...").decode('utf8')) + tb_help.AddLabelTool(wx.ID_HELP, "Help", wx.ArtProvider_GetBitmap(wx.ART_HELP, size=(16,16)), shortHelp=_(u"Online help...").decode('utf8'), longHelp=_(u"Online help...").decode('utf8')) + tb_help.Realize() #------------------------------------------------------------------------------------------------ self.text_ctrl_txt = wx.TextCtrl(self, -1, "", wx.Point(0, 0), wx.Size(200, 200), wx.NO_BORDER | wx.TE_MULTILINE | wx.TE_RICH2 | wx.TE_READONLY) @@ -486,8 +531,13 @@ class IraFrame(wx.Frame): self._mgr.AddPane(tb_mat, aui.AuiPaneInfo(). Name("tb_mat").Caption("analyse_matrix"). ToolbarPane().Top(). - LeftDockable(True).RightDockable(False)) - + LeftDockable(True).RightDockable(False)) + + self._mgr.AddPane(tb_help, aui.AuiPaneInfo(). + Name("tb_help").Caption("help"). + ToolbarPane().Top(). + LeftDockable(True).RightDockable(False)) + self._mgr.GetPane('tb_text').Hide() self._mgr.GetPane('tb_mat').Hide() @@ -500,7 +550,6 @@ class IraFrame(wx.Frame): # Show How To Use The Closing Panes Event ################################################################## self.Bind(wx.EVT_MENU, self.OnAcceuil, id=ID_ACCEUIL) - self.Bind(wx.EVT_MENU, self.OnViewData, id=ID_VIEWDATA) self.Bind(wx.EVT_MENU, self.ShowTab, id=ID_RESULT) self.Bind(wx.EVT_MENU, self.OnOpenData, id=ID_OpenData) self.Bind(wx.EVT_MENU, self.OnOpenText, id=ID_OpenText) @@ -578,8 +627,7 @@ class IraFrame(wx.Frame): self.type = '' ##############################################################@ - self.DisEnSaveTabAs(False) - self.ShowMenu('view', False) + self.ShowMenu('view', True) self.ShowMenu('matrix', False) self.ShowMenu('text', False) @@ -656,14 +704,6 @@ class IraFrame(wx.Frame): if dlg.ShowModal() in [wx.ID_NO, wx.ID_CANCEL]: evt.Veto() - def DisEnSaveTabAs(self, DISEN): - #Disable SaveTabAs - file_menu = self.mb.GetMenu(0) - items = file_menu.GetMenuItems() - for item in items : - if item.GetId() == ID_SaveTab : - item.Enable(DISEN) - def ShowMenu(self, menu, Show=True): if menu == 'text' : menu_pos = 4 @@ -728,23 +768,6 @@ class IraFrame(wx.Frame): if inputname: self.OpenText() - def OnViewData(self, event): - if self.type == "Data": - if not self.DataPop : - self.Sheet.Populate(self.content) - self.DataPop = True - self.DataTxt = False - self.ShowAPane(u"Data") - elif self.type == "Texte" or self.type == 'Analyse' : - if not self.DataTxt : - self.text_ctrl_txt.Clear() - self.text_ctrl_txt.write(self.content) - self.text_ctrl_txt.ShowPosition(0) - self.DataTxt = True - self.DataPop = False - self.ShowAPane(u"Text") - self._mgr.Update() - def OnSubText(self, evt, corpus = None, parametres = None): if corpus is None : corpus = self.tree.getcorpus() @@ -792,7 +815,6 @@ class IraFrame(wx.Frame): count += 1 keepGoing = dlg.Update(count, u"Chargement du dictionnaire") dlg.Destroy() - #self.OnViewData(wx.EVT_BUTTON) def OnExit(self, event): self.Close() @@ -871,7 +893,6 @@ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, États-Unis.""" def LastTabClose(self) : if self.nb.GetPageCount() == 1 : - #self.DisEnSaveTabAs(False) if self.DataTxt : self.ShowAPane("Text") elif self.DataPop :