...

diff --git a/iramuteq.py b/iramuteq.py
index d180525..8629d6c 100644 (file)
--- a/iramuteq.py
+++ b/iramuteq.py
@@ -459,9 +459,9 @@ class IraFrame(wx.Frame):
 
 ##############################################################@
         self.DisEnSaveTabAs(False)
 
 ##############################################################@
         self.DisEnSaveTabAs(False)

-        self.ShowMenu(_("View").decode('utf8'), False)
-        self.ShowMenu(_("Matrix analysis").decode('utf8'), False)
-        self.ShowMenu(_("Text analysis").decode('utf8'), False)
+        self.ShowMenu('view', False)
+        self.ShowMenu('matrix', False)
+        self.ShowMenu('text', False)

    
         self._mgr.Update()
 
    
         self._mgr.Update()
 


@@ -523,7 +523,6 @@ vous devez signaler le chemin de l'éxecutable de R dans les préférences."""
                 pass
             dlg.Destroy()
 
                 pass
             dlg.Destroy()
 

-

     def setlangue(self) :
         self.pref.read(self.ConfigPath['preferences'])
         guilangue = self.pref.get('iramuteq', 'guilanguage')
     def setlangue(self) :
         self.pref.read(self.ConfigPath['preferences'])
         guilangue = self.pref.get('iramuteq', 'guilanguage')


@@ -546,9 +545,19 @@ vous devez signaler le chemin de l'éxecutable de R dans les préférences."""
                 item.Enable(DISEN)
     
     def ShowMenu(self, menu, Show=True):
                 item.Enable(DISEN)
     
     def ShowMenu(self, menu, Show=True):

-        menu_pos = self.mb.FindMenu(menu)
-        self.mb.EnableTop(menu_pos, Show)
-        self.mb.UpdateMenus()
+        if menu == 'text' :
+            menu_pos = 4
+        elif menu == 'matrix' :
+            menu_pos = 3
+        elif menu == 'view' :
+            menu_pos = 2
+        else :
+            menu_pos = None
+            
+        #menu_pos = self.mb.FindMenu(menu)
+        if not menu_pos is None :
+            self.mb.EnableTop(menu_pos, Show)
+            self.mb.UpdateMenus()

 
 
 #--------------------------------------------------------------------
 
 
 #--------------------------------------------------------------------


@@ -575,7 +584,7 @@ vous devez signaler le chemin de l'éxecutable de R dans les préférences."""
     def OnOpenAnalyse(self, event):
         self.AnalysePath = OnOpen(self, "Analyse")
         OpenAnalyse(self, self.AnalysePath[1][0], True)
     def OnOpenAnalyse(self, event):
         self.AnalysePath = OnOpen(self, "Analyse")
         OpenAnalyse(self, self.AnalysePath[1][0], True)

-        self.ShowMenu(_("View"))
+        self.ShowMenu('view')

 
     def OnOpenText(self, event):
         inputname, self.input_path = OnOpen(self, "Texte")
 
     def OnOpenText(self, event):
         inputname, self.input_path = OnOpen(self, "Texte")


@@ -635,9 +644,9 @@ vous devez signaler le chemin de l'éxecutable de R dans les préférences."""
             else :
                 count = 1
                 keepGoing = dlg.Update(count, u"Lecture du fichier")
             else :
                 count = 1
                 keepGoing = dlg.Update(count, u"Lecture du fichier")

-                self.ShowMenu(_(u"View").decode('utf8'))
-                self.ShowMenu(_(u"Text analysis").decode('utf8'))
-                self.ShowMenu(_(u"Matrix analysis").decode('utf8'), False)
+                self.ShowMenu('view')
+                self.ShowMenu('text')
+                self.ShowMenu('matrix', False)

                 self.type = "Texte"
                 self.DataTxt = False
                 self.Text = ''
                 self.type = "Texte"
                 self.DataTxt = False
                 self.Text = ''


@@ -698,11 +707,11 @@ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, États-Unis."""
             if 'parametres' in dir(npage) :
                 self.tree.GiveFocus(uuid=npage.parametres['uuid'])
                 if npage.parametres.get('matrix', False) :
             if 'parametres' in dir(npage) :
                 self.tree.GiveFocus(uuid=npage.parametres['uuid'])
                 if npage.parametres.get('matrix', False) :

-                    self.ShowMenu(_(u"Text analysis").decode('utf8'), False)
-                    self.ShowMenu(_(u"Matrix analysis").decode('utf8'), True)
+                    self.ShowMenu('text', False)
+                    self.ShowMenu('matrix', True)

                 elif npage.parametres.get('corpus', False) :
                 elif npage.parametres.get('corpus', False) :

-                    self.ShowMenu(_(u"Text analysis").decode('utf8'))
-                    self.ShowMenu(_(u"Matrix analysis").decode('utf8'), False)
+                    self.ShowMenu('text')
+                    self.ShowMenu('matrix', False)

 
     def OnCloseTab(self, evt):
         #log.info('Closing tab %s' % str(evt.GetEventObject()))
 
     def OnCloseTab(self, evt):
         #log.info('Closing tab %s' % str(evt.GetEventObject()))

diff --git a/tree.py b/tree.py
index 91f663c..d8008b1 100644 (file)
--- a/tree.py
+++ b/tree.py
@@ -104,6 +104,7 @@ class LeftTree(CT.CustomTreeCtrl):
             elif data.startswith("EVT_"):
                 events.append(data)
         self.parent = parent
             elif data.startswith("EVT_"):
                 events.append(data)
         self.parent = parent

+        self.ira = parent

         self.events = events
         self.styles = treestyles
         self.item = None
         self.events = events
         self.styles = treestyles
         self.item = None


@@ -1084,7 +1085,14 @@ class LeftTree(CT.CustomTreeCtrl):
         if event is not None :
             item = event.GetItem()
             pydata = self.GetPyData(item)
         if event is not None :
             item = event.GetItem()
             pydata = self.GetPyData(item)

+

         if pydata is not None :
         if pydata is not None :

+            if 'corpus_name' in pydata :
+                self.ira.ShowMenu('text', True)
+                self.ira.ShowMenu('matrix', False)
+            if 'matrix_name' in pydata :
+                self.ira.ShowMenu('text', False)
+                self.ira.ShowMenu('matrix', True)                

             self.pydata = pydata
             if pydata['uuid'] in self.parent.history.opened :
                 for i in range(self.parent.nb.GetPageCount()) :
             self.pydata = pydata
             if pydata['uuid'] in self.parent.history.opened :
                 for i in range(self.parent.nb.GetPageCount()) :