...

diff --git a/ProfList.py b/ProfList.py
index 9412232..c9b1ce1 100644 (file)
--- a/ProfList.py
+++ b/ProfList.py
@@ -20,14 +20,14 @@ import  wx.lib.mixins.listctrl  as  listmix
 #from tabsimi import DoSimi
 from listlex import ListForSpec
 from chemins import ConstructPathOut, ffr
 #from tabsimi import DoSimi
 from listlex import ListForSpec
 from chemins import ConstructPathOut, ffr

-from dialog import PrefExport, PrefUCECarac, SearchDial, message, MessageImage, BarFrame
-from tableau import Tableau, copymatrix
+from dialog import PrefUCECarac, SearchDial, message, BarFrame
+from tableau import copymatrix

 from search_tools import SearchFrame
 import webbrowser
 #import cStringIO
 import tempfile
 import codecs
 from search_tools import SearchFrame
 import webbrowser
 #import cStringIO
 import tempfile
 import codecs

-from functions import exec_rcode, progressbar, treat_var_mod, doconcorde
+from functions import progressbar, treat_var_mod, doconcorde

 from PrintRScript import barplot
 from textclassechd import ClasseCHD
 from shutil import copyfile
 from PrintRScript import barplot
 from textclassechd import ClasseCHD
 from shutil import copyfile

diff --git a/dialog.py b/dialog.py
index ced134b..111e0c0 100755 (executable)
--- a/dialog.py
+++ b/dialog.py
@@ -2794,44 +2794,6 @@ class ExtractDialog ( wx.Dialog ):
     def __del__( self ):
         pass
 
     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):
 class FreqDialog ( wx.Dialog ):
     
     def __init__( self, parent, listcol, title, size =  wx.Size( -1,-1 ), showNA = True):


@@ -3203,7 +3165,9 @@ class BarGraphDialog ( wx.Dialog ):
 
 class MessageImage(wx.Frame):
     def __init__(self, parent, parametres, title, size):
 
 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']
         self.SetSizeHintsSz( wx.DefaultSize, wx.DefaultSize )
         self.parametres = parametres
         self.imageFile = self.parametres['tmpgraph']

diff --git a/search_tools.py b/search_tools.py
index 53206e6..5a0984d 100644 (file)
--- a/search_tools.py
+++ b/search_tools.py
@@ -10,11 +10,13 @@ import codecs
 
 
 class SearchFrame(wx.Frame):
 
 
 class SearchFrame(wx.Frame):

-    def __init__(self, parent, id, title, corpus, size=(800, 500)):
+    def __init__(self, parent, id, title, corpus, size=(800, 900)):

         # begin wxGlade: MyFrame.__init__
         #kwds["style"] = wx.DEFAULT_FRAME_STYLE
         # begin wxGlade: MyFrame.__init__
         #kwds["style"] = wx.DEFAULT_FRAME_STYLE

-        wx.Frame.__init__(self, parent, id)
+        wx.Frame.__init__(self, parent, id, size = size, style = wx.CLOSE_BOX|wx.DEFAULT_FRAME_STYLE|wx.TAB_TRAVERSAL)

         self.parent = parent
         self.parent = parent

+        self.ira = wx.GetApp().GetTopWindow()
+        self.SetIcon(self.ira._icon)

         search_id = wx.NewId()
         self.Bind(wx.EVT_MENU, self.onsearch, id = search_id)
         self.accel_tbl = wx.AcceleratorTable([(wx.ACCEL_CTRL, ord('F'), search_id)])
         search_id = wx.NewId()
         self.Bind(wx.EVT_MENU, self.onsearch, id = search_id)
         self.accel_tbl = wx.AcceleratorTable([(wx.ACCEL_CTRL, ord('F'), search_id)])


@@ -51,7 +53,7 @@ class SearchFrame(wx.Frame):
         self.Bind(wx.EVT_BUTTON, self.OnCloseMe, self.button_1)
         self.Bind(wx.EVT_CLOSE, self.OnCloseWindow)
         self.SetTitle(u'Navigation')
         self.Bind(wx.EVT_BUTTON, self.OnCloseMe, self.button_1)
         self.Bind(wx.EVT_CLOSE, self.OnCloseWindow)
         self.SetTitle(u'Navigation')

-        self.SetSize(wx.Size(400,700))
+        self.SetSize(wx.Size(900,700))

         self.__do_layout()
         # end wxGlade
 
         self.__do_layout()
         # end wxGlade