...

[iramuteq] / tree.py

diff --git a/tree.py b/tree.py
index f053fc1..83f7d6e 100644 (file)
--- a/tree.py
+++ b/tree.py
@@ -393,11 +393,11 @@ class LeftTree(CT.CustomTreeCtrl):
         if not item in [self.textroot, self.matroot] :
             menu = wx.Menu()
             info = wx.MenuItem(menu, wx.ID_ANY, _(u"Informations").decode('utf8'))
-            info.SetBitmap(wx.ArtProvider_GetBitmap(wx.ART_INFORMATION))
+            info.SetBitmap(wx.ArtProvider_GetBitmap(wx.ART_INFORMATION, size = (16,16)))
             menu.AppendItem(info)
             
             rename = wx.MenuItem(menu, wx.ID_ANY, _(u"Rename").decode('utf8'))
-            rename.SetBitmap(wx.ArtProvider_GetBitmap(wx.ART_TIP))
+            rename.SetBitmap(wx.ArtProvider_GetBitmap(wx.ART_TIP, size = (16,16)))
             menu.AppendItem(rename)
             menu.AppendSeparator()
     
@@ -457,7 +457,7 @@ class LeftTree(CT.CustomTreeCtrl):
                 self.Bind(wx.EVT_MENU, self.OnRapport, rapport)
     
             itemdelete = wx.MenuItem(menu, wx.ID_ANY, _(u"Delete from history").decode('utf8'))
-            itemdelete.SetBitmap(wx.ArtProvider_GetBitmap(wx.ART_DELETE))
+            itemdelete.SetBitmap(wx.ArtProvider_GetBitmap(wx.ART_DELETE, size = (16,16)))
             menu.AppendItem(itemdelete)
             #item11 = menu.Append(wx.ID_ANY, "Prepend An Item")
             #item12 = menu.Append(wx.ID_ANY, "Append An Item")
@@ -686,7 +686,7 @@ class LeftTree(CT.CustomTreeCtrl):
         corpus = self.page.corpus
         tgenpath = os.path.join(self.page.parametres['pathout'], 'tgen.csv')        
         if not os.path.exists(tgenpath) :
-            message = wx.MessageDialog(self.parent, _(u"No TGen yet !"), style = wx.ICON_EXCLAMATION | wx.OK) 
+            message = wx.MessageDialog(self.parent, _(u"No TGen yet !").decode('utf8'), style = wx.ICON_EXCLAMATION | wx.OK) 
             message.ShowModal()
             message.Destroy()
         else :
@@ -726,7 +726,7 @@ class LeftTree(CT.CustomTreeCtrl):
         else :
             name = 'name'
         oldname = pydata[name]
-        dlg = wx.TextEntryDialog(self, "Please Enter The New Item Name", 'Item Naming', oldname)
+        dlg = wx.TextEntryDialog(self, _("New Name").decode('utf8'), _(u'Rename').decode('utf8'), oldname)
         if dlg.ShowModal() == wx.ID_OK:
             newname = dlg.GetValue()
             dlg.Destroy()
@@ -1093,11 +1093,15 @@ class LeftTree(CT.CustomTreeCtrl):
 
         if pydata is not None :
             if 'corpus_name' in pydata or 'corpus' in pydata :
-                self.ira.ShowMenu('text', True)
                 self.ira.ShowMenu('matrix', False)
+                self.ira.ShowMenu('text', True)
             if 'matrix_name' in pydata or 'matrix' in pydata:
                 self.ira.ShowMenu('text', False)
-                self.ira.ShowMenu('matrix', True)                
+                self.ira.ShowMenu('matrix', True)
+            if 'uuid' in pydata :
+                if pydata['uuid'] in ['textroot', 'matroot'] :
+                    self.ira.ShowMenu('text', False)
+                    self.ira.ShowMenu('matrix', False)             
             self.pydata = pydata
             if pydata['uuid'] in self.parent.history.opened :
                 for i in range(self.parent.nb.GetPageCount()) :