From: pierre Date: Thu, 3 Jan 2013 22:01:29 +0000 (+0100) Subject: mac OS X X-Git-Url: http://iramuteq.org/git?p=iramuteq;a=commitdiff_plain;h=25061ca972d5be7a8ef3aa42276accc3761a3364 mac OS X --- diff --git a/OptionAlceste.py b/OptionAlceste.py index ea3ba80..f515d7a 100755 --- a/OptionAlceste.py +++ b/OptionAlceste.py @@ -76,7 +76,7 @@ analysée (2 = automatique)""" def __do_layout(self): sizer_1 = wx.BoxSizer(wx.VERTICAL) sizer_2 = wx.BoxSizer(wx.VERTICAL) - grid_sizer2 = wx.FlexGridSizer(15, 2, 0, 0) + grid_sizer2 = wx.FlexGridSizer(0, 2, 0, 0) grid_button = wx.FlexGridSizer(1, 3, 0, 0) #grid_sizer2.Add(self.label_dict, 0, wx.ALIGN_LEFT | wx.ALIGN_CENTER_VERTICAL, 0) diff --git a/ProfList.py b/ProfList.py index cca1423..9097897 100644 --- a/ProfList.py +++ b/ProfList.py @@ -20,7 +20,7 @@ import wx.lib.mixins.listctrl as listmix from tabsimi import DoSimi from listlex import ListForSpec from chemins import ConstructPathOut, ffr -from dialog import PrefExport, PrefUCECarac, SearchDial +from dialog import PrefExport, PrefUCECarac, SearchDial, message from tableau import Tableau from search_tools import SearchFrame import webbrowser @@ -1593,53 +1593,55 @@ class ProfListctrlPanel(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.Col # def OnCloseWindow(self, event): # self.Destroy() # -class message(wx.Dialog): - def __init__(self, parent, title, size): - wx.Dialog.__init__ ( self, parent, id = wx.ID_ANY, title = title, pos = wx.DefaultPosition, size = size, style = wx.DEFAULT_DIALOG_STYLE ) - - self.SetSizeHintsSz( wx.DefaultSize, wx.DefaultSize ) - - self.html = "" - self.HtmlPage=wx.html.HtmlWindow(self, -1) - self.HtmlPage.SetMinSize( size ) - if "gtk2" in wx.PlatformInfo: - self.HtmlPage.SetStandardFonts() - self.HtmlPage.SetFonts('Courier','Courier') - - self.button_1 = wx.Button(self, wx.ID_CANCEL) - self.button_2 = wx.Button(self, wx.ID_SAVE) - - self.Bind(wx.EVT_BUTTON, self.OnSavePage, self.button_2) - self.Bind(wx.EVT_BUTTON, self.OnCloseMe, self.button_1) - self.Bind(wx.EVT_CLOSE, self.OnCloseWindow) - self.__do_layout() - - def __do_layout(self): - sizer_2 = wx.BoxSizer(wx.VERTICAL) - sizer_2.Add(self.HtmlPage, 0, wx.EXPAND|wx.ADJUST_MINSIZE, 0) - m_sdbSizer1 = wx.StdDialogButtonSizer() - m_sdbSizer1.AddButton( self.button_1 ) - m_sdbSizer1.AddButton( self.button_2 ) - m_sdbSizer1.Realize() - sizer_2.Add(m_sdbSizer1, 1, wx.EXPAND, 5) - self.SetSizer(sizer_2) - self.Layout() - sizer_2.Fit( self ) - - def OnSavePage(self, evt) : - dlg = wx.FileDialog( - self, message="Enregistrer sous...", defaultDir=os.getcwd(), - defaultFile="concordancier.html", wildcard="html|*.html", style=wx.SAVE | wx.OVERWRITE_PROMPT - ) - dlg.SetFilterIndex(2) - dlg.CenterOnParent() - if dlg.ShowModal() == wx.ID_OK: - path = dlg.GetPath() - with open(path, 'w') as f : - f.write(self.html) - - def OnCloseMe(self, event): - self.Close(True) - - def OnCloseWindow(self, event): - self.Destroy() +#class message(wx.Dialog): +# def __init__(self, parent, title, size, save = True): +# wx.Dialog.__init__ ( self, parent, id = wx.ID_ANY, title = title, pos = wx.DefaultPosition, size = size, style = wx.DEFAULT_DIALOG_STYLE ) +# self.save = save +# self.SetSizeHintsSz( wx.DefaultSize, wx.DefaultSize ) +# +# self.html = "" +# self.HtmlPage=wx.html.HtmlWindow(self, -1) +# self.HtmlPage.SetMinSize( size ) +# if "gtk2" in wx.PlatformInfo: +# self.HtmlPage.SetStandardFonts() +# self.HtmlPage.SetFonts('Courier','Courier') +# +# self.button_1 = wx.Button(self, wx.ID_CANCEL) +# +# self.Bind(wx.EVT_BUTTON, self.OnCloseMe, self.button_1) +# if self.save : +# self.button_2 = wx.Button(self, wx.ID_SAVE) +# self.Bind(wx.EVT_BUTTON, self.OnSavePage, self.button_2) +# self.Bind(wx.EVT_CLOSE, self.OnCloseWindow) +# self.__do_layout() +# +# def __do_layout(self): +# sizer_2 = wx.BoxSizer(wx.VERTICAL) +# sizer_2.Add(self.HtmlPage, 0, wx.EXPAND|wx.ADJUST_MINSIZE, 0) +# m_sdbSizer1 = wx.StdDialogButtonSizer() +# m_sdbSizer1.AddButton( self.button_1 ) +# if self.save : +# m_sdbSizer1.AddButton( self.button_2 ) +# m_sdbSizer1.Realize() +# sizer_2.Add(m_sdbSizer1, 1, wx.EXPAND, 5) +# self.SetSizer(sizer_2) +# self.Layout() +# sizer_2.Fit( self ) +# +# def OnSavePage(self, evt) : +# dlg = wx.FileDialog( +# self, message="Enregistrer sous...", defaultDir=os.getcwd(), +# defaultFile="concordancier.html", wildcard="html|*.html", style=wx.SAVE | wx.OVERWRITE_PROMPT +# ) +# dlg.SetFilterIndex(2) +# dlg.CenterOnParent() +# if dlg.ShowModal() == wx.ID_OK: +# path = dlg.GetPath() +# with open(path, 'w') as f : +# f.write(self.html) +# +# def OnCloseMe(self, event): +# self.Close(True) +# +# def OnCloseWindow(self, event): +# self.Destroy() diff --git a/dialog.py b/dialog.py index 691a291..da4eed7 100755 --- a/dialog.py +++ b/dialog.py @@ -35,7 +35,7 @@ class FileOptionDialog(wx.Dialog): self.PostCreate(pre) sizer = wx.BoxSizer(wx.VERTICAL) - grid_sizer = wx.FlexGridSizer(5, 2, 2, 2) + grid_sizer = wx.FlexGridSizer(0, 2, 2, 2) ############################## label = wx.StaticText(self, -1, u"La première ligne contient les noms de colonne") @@ -379,7 +379,7 @@ class PrefDialog ( wx.Dialog ): bSizer1 = wx.BoxSizer( wx.VERTICAL ) - fgSizer1 = wx.FlexGridSizer( 4, 3, 0, 0 ) + fgSizer1 = wx.FlexGridSizer( 0, 3, 0, 0 ) fgSizer1.SetFlexibleDirection( wx.BOTH ) fgSizer1.SetNonFlexibleGrowMode( wx.FLEX_GROWMODE_SPECIFIED ) @@ -706,13 +706,13 @@ au chi2 d'association de la forme""" def __do_layout(self): sizer_2 = wx.BoxSizer(wx.VERTICAL) - fsizer = wx.FlexGridSizer(12,2,0,5) - grid_min = wx.FlexGridSizer(1, 2, 0, 0) - grid_max = wx.FlexGridSizer(1, 2, 0, 0) - grid_minmax = wx.FlexGridSizer(1, 2, 0, 0) - grid_min_tchi = wx.FlexGridSizer(1, 2, 0, 0) - grid_max_tchi = wx.FlexGridSizer(1, 2, 0, 0) - grid_minmax_tchi = wx.FlexGridSizer(1, 2, 0, 0) + fsizer = wx.FlexGridSizer(0,2,0,5) + grid_min = wx.FlexGridSizer(0, 2, 0, 0) + grid_max = wx.FlexGridSizer(0, 2, 0, 0) + grid_minmax = wx.FlexGridSizer(0, 2, 0, 0) + grid_min_tchi = wx.FlexGridSizer(0, 2, 0, 0) + grid_max_tchi = wx.FlexGridSizer(0, 2, 0, 0) + grid_minmax_tchi = wx.FlexGridSizer(0, 2, 0, 0) sizer_3 = wx.BoxSizer(wx.VERTICAL) @@ -778,7 +778,7 @@ au chi2 d'association de la forme""" sizer_2.Add(fsizer, 0, wx.EXPAND, 0) - bsizer_1 = wx.FlexGridSizer(3,3,0,0) + bsizer_1 = wx.FlexGridSizer(0,3,0,0) bsizer_1.Add(self.label_7, 0, wx.ALL | wx.ALIGN_LEFT | wx.ALIGN_CENTER_VERTICAL, 5) bsizer_1.Add(self.check4, 0, wx.ALL | wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL|wx.EXPAND, 5) grid_min.Add(self.label_min, 0,wx.ALL | wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL, 5) @@ -821,7 +821,7 @@ au chi2 d'association de la forme""" sizer_2.Add(wx.StaticLine(self, -1), 0, wx.EXPAND, 5) - fsizer2 = wx.FlexGridSizer(2,2,0,0) + fsizer2 = wx.FlexGridSizer(0,2,0,0) fsizer2.Add(self.label_sphere, 0, wx.ALL | wx.ALIGN_LEFT | wx.ALIGN_CENTER_VERTICAL, 5) fsizer2.Add(self.slider_sphere, 0, wx.ALL | wx.ALIGN_LEFT | wx.ALIGN_CENTER_VERTICAL, 5) fsizer2.Add(wx.StaticLine(self, -1), 0, wx.EXPAND, 0) @@ -1097,7 +1097,7 @@ class StatDialog(wx.Dialog): def __do_layout(self) : first = wx.BoxSizer(wx.VERTICAL) - sizer = wx.FlexGridSizer(4,2,0,0) + sizer = wx.FlexGridSizer(0,2,0,0) sizer.Add(self.label_lem, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_LEFT, 5) sizer.Add(self.radio_lem, 0, wx.ALIGN_LEFT, 5) sizer.Add(wx.StaticLine(self),0, wx.ALIGN_LEFT, 5) @@ -1168,7 +1168,7 @@ class LexDialog( wx.Dialog ): bSizer2 = wx.BoxSizer( wx.VERTICAL ) - fgSizer2 = wx.FlexGridSizer( 2, 2, 0, 0 ) + fgSizer2 = wx.FlexGridSizer( 0, 2, 0, 0 ) fgSizer2.SetFlexibleDirection( wx.BOTH ) fgSizer2.SetNonFlexibleGrowMode( wx.FLEX_GROWMODE_SPECIFIED ) @@ -1212,7 +1212,7 @@ class PrefUCECarac(wx.Dialog): wx.Dialog.__init__(self, *args, **kwds) self.parent = parent first = wx.BoxSizer(wx.VERTICAL) - sizer = wx.FlexGridSizer(2,2,0,0) + sizer = wx.FlexGridSizer(0,2,0,0) self.label_type = wx.StaticText(self, -1, u"Score de classement") sizer.Add(self.label_type, 0, wx.ALIGN_CENTER_VERTICAL|wx.ALIGN_LEFT, 5) self.radio_type = wx.RadioBox(self, -1, u"", choices=[u'absolu (somme des chi2 des formes marquées de l\'UCE)', u'relatif (moyenne des chi2 des formes marquées de l\'UCE)'], majorDimension=0, style=wx.RA_SPECIFY_ROWS) @@ -1243,7 +1243,7 @@ class PrefSegProf(wx.Dialog) : self.label = wx.StaticText( self, wx.ID_ANY, txt, wx.DefaultPosition, wx.DefaultSize, 0 ) bSizer1.Add( self.label, 0, wx.ALL | wx.ALIGN_CENTER_VERTICAL, 5 ) - fgSizer1 = wx.FlexGridSizer( 2, 2, 0, 0 ) + fgSizer1 = wx.FlexGridSizer( 0, 2, 0, 0 ) fgSizer1.SetFlexibleDirection( wx.BOTH ) fgSizer1.SetNonFlexibleGrowMode( wx.FLEX_GROWMODE_SPECIFIED ) @@ -1314,7 +1314,7 @@ class PrefQuestAlc ( wx.Dialog ): #--------------------------------------------------------------- bSizer2 = wx.BoxSizer( wx.VERTICAL ) - fgSizer1 = wx.FlexGridSizer( 2, 2, 0, 0 ) + fgSizer1 = wx.FlexGridSizer( 0, 2, 0, 0 ) fgSizer1.SetFlexibleDirection( wx.BOTH ) fgSizer1.SetNonFlexibleGrowMode( wx.FLEX_GROWMODE_SPECIFIED ) @@ -1738,7 +1738,7 @@ class OptLexi(wx.Dialog): def __do_layout(self): # begin wxGlade: MyDialog.__do_layout sizer_1 = wx.BoxSizer(wx.VERTICAL) - sizer_2 = wx.FlexGridSizer(2,2,0,0) + sizer_2 = wx.FlexGridSizer(0,2,0,0) sizer_3 = wx.BoxSizer(wx.HORIZONTAL) #sizer_2.Add(self.labellem, 0, wx.ALIGN_CENTER_VERTICAL, 3) #sizer_2.Add(self.checklem, 0, wx.ALIGN_CENTER_VERTICAL, 3) @@ -2445,3 +2445,56 @@ class CorpusPref ( wx.Dialog ): else : parametres[val] = 0 return parametres + +class message(wx.Dialog): + def __init__(self, parent, title, size, save = True): + wx.Dialog.__init__ ( self, parent, id = wx.ID_ANY, title = title, pos = wx.DefaultPosition, size = size, style = wx.DEFAULT_DIALOG_STYLE ) + self.save = save + self.SetSizeHintsSz( wx.DefaultSize, wx.DefaultSize ) + + self.html = "" + self.HtmlPage=wx.html.HtmlWindow(self, -1) + self.HtmlPage.SetMinSize( size ) + if "gtk2" in wx.PlatformInfo: + self.HtmlPage.SetStandardFonts() + self.HtmlPage.SetFonts('Courier','Courier') + + self.button_1 = wx.Button(self, wx.ID_CANCEL) + + self.Bind(wx.EVT_BUTTON, self.OnCloseMe, self.button_1) + if self.save : + self.button_2 = wx.Button(self, wx.ID_SAVE) + self.Bind(wx.EVT_BUTTON, self.OnSavePage, self.button_2) + self.Bind(wx.EVT_CLOSE, self.OnCloseWindow) + self.__do_layout() + + def __do_layout(self): + sizer_2 = wx.BoxSizer(wx.VERTICAL) + sizer_2.Add(self.HtmlPage, 0, wx.EXPAND|wx.ADJUST_MINSIZE, 0) + m_sdbSizer1 = wx.StdDialogButtonSizer() + m_sdbSizer1.AddButton( self.button_1 ) + if self.save : + m_sdbSizer1.AddButton( self.button_2 ) + m_sdbSizer1.Realize() + sizer_2.Add(m_sdbSizer1, 1, wx.EXPAND, 5) + self.SetSizer(sizer_2) + self.Layout() + sizer_2.Fit( self ) + + def OnSavePage(self, evt) : + dlg = wx.FileDialog( + self, message="Enregistrer sous...", defaultDir=os.getcwd(), + defaultFile="concordancier.html", wildcard="html|*.html", style=wx.SAVE | wx.OVERWRITE_PROMPT + ) + dlg.SetFilterIndex(2) + dlg.CenterOnParent() + if dlg.ShowModal() == wx.ID_OK: + path = dlg.GetPath() + with open(path, 'w') as f : + f.write(self.html) + + def OnCloseMe(self, event): + self.Close(True) + + def OnCloseWindow(self, event): + self.Destroy() diff --git a/images/iraicone.icns b/images/iraicone.icns new file mode 100644 index 0000000..9b910f7 Binary files /dev/null and b/images/iraicone.icns differ diff --git a/layout.py b/layout.py index b84541c..384e000 100644 --- a/layout.py +++ b/layout.py @@ -127,12 +127,19 @@ class GraphPanelAfc(wx.Panel): oldimg.Destroy() oldlab = self.labels.pop(image_id) oldlab.Destroy() - No = [but.Destroy() for but in self.buts] - self.buts = [wx.Button(self.panel_1, wx.ID_DELETE, name = `i`) for i, img in enumerate(self.listimg)] + oldbut = self.buts.pop(image_id) + oldbut.Show(False) + #No = [but.Destroy() for but in self.buts] + #self.buts = [wx.Button(self.panel_1, wx.ID_DELETE, name = `i`) for i, img in enumerate(self.listimg)] + for i, but in enumerate(self.buts) : + but.SetName(`i`) todel = self.list_graph.pop(image_id) os.remove(os.path.join(self.dirout, todel[0])) print_liste(self.Dict[self.itempath], self.list_graph) - self.__do_layout() + #self.sizer_1.Destroy() + #self.sizer_2.Destroy() + #self.sizer_3.Destroy() + #self.__do_layout() self.sizer_3.Fit(self.panel_1) self.Layout() else : diff --git a/listlex.py b/listlex.py index cdae6e9..2237fcc 100644 --- a/listlex.py +++ b/listlex.py @@ -169,7 +169,7 @@ class ListForSpec(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.ColumnSor menu.Destroy() def getselectedwords(self) : - words = [self.getColumnText(self.GetFirstSelected(), 6)] + words = [self.getColumnText(self.GetFirstSelected(), 0)] last = self.GetFirstSelected() while self.GetNextSelected(last) != -1: last = self.GetNextSelected(last) diff --git a/search_list.py b/search_list.py index 65b83c4..dab8f83 100644 --- a/search_list.py +++ b/search_list.py @@ -19,6 +19,7 @@ import wx.lib.mixins.listctrl as listmix import cStringIO import tempfile from functions import exec_rcode, MessageImage +from dialog import message from chemins import ffr from PrintRScript import barplot, dendroandbarplot #--------------------------------------------------------------------------- @@ -80,7 +81,6 @@ class SearchList(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.ColumnSort self.SetItemCount(len(dlist)) listmix.ColumnSorterMixin.__init__(self, len(first)+2) - self.SortListItems(0, True) #----------------------------------------------------------------------------------------- @@ -92,6 +92,8 @@ class SearchList(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.ColumnSort for i in range(1,len(first)-1): self.SetColumnWidth(i, 130) + self.SortListItems(0, True) + # Used by the ColumnSorterMixin, see wx/lib/mixins/listctrl.py def GetListCtrl(self): return self @@ -202,7 +204,7 @@ class SearchList(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.ColumnSort rep = [] for forme in lems[word] : rep.append([forme, corpus.formes[forme][0]]) - win = message(self, -1, u"Formes associées", size=(300, 200), style=wx.DEFAULT_FRAME_STYLE) + win = message(self, u"Formes associées", size=(300, 200)) win.html = '\n' + '
'.join([' : '.join([str(val) for val in forme]) for forme in rep]) + '\n' win.HtmlPage.SetPage(win.html) win.Show(True) @@ -212,7 +214,7 @@ class SearchList(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.ColumnSort page = self.parent.nb.GetPage(activenotebook) item=self.getColumnText(self.GetFirstSelected(), 0) corpus = page.corpus - win = message(self, -1, u"Concordancier", size=(600, 200),style = wx.DEFAULT_FRAME_STYLE) + win = message(self, u"Concordancier", size=(600, 200)) avap=60 listmot = corpus.lems[item] uce_ok = [corpus.formes[forme][1] for forme in listmot] @@ -275,7 +277,7 @@ class SearchList(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.ColumnSort with open(tmpscript,'w') as f : f.write(txt) exec_rcode(self.parent.parent.RPath, tmpscript, wait = True) - win = MessageImage(self, -1, u"Graphique", size=(700, 500),style = wx.DEFAULT_FRAME_STYLE) + win = MessageImage(self, u"Graphique", size=(700, 500)) win.addsaveimage(tmpgraph) txt = "" % tmpgraph win.HtmlPage.SetPage(txt) @@ -298,77 +300,77 @@ class SearchList(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.ColumnSort with open(tmpscript,'w') as f : f.write(txt) exec_rcode(self.parent.parent.RPath, tmpscript, wait = True) - win = MessageImage(self, -1, u"Graphique", size=(700, 500),style = wx.DEFAULT_FRAME_STYLE) + win = MessageImage(self, u"Graphique", size=(700, 500)) win.addsaveimage(tmpgraph) txt = "" % tmpgraph win.HtmlPage.SetPage(txt) win.Show(True) -class message(wx.Frame): - def __init__(self, *args, **kwds): - # begin wxGlade: MyFrame.__init__ - kwds["style"] = wx.DEFAULT_FRAME_STYLE - wx.Frame.__init__(self, *args, **kwds) - self.HtmlPage=wx.html.HtmlWindow(self, -1) - if "gtk2" in wx.PlatformInfo: - self.HtmlPage.SetStandardFonts() - self.HtmlPage.SetFonts('Courier','Courier') - - - self.button_1 = wx.Button(self, -1, "Fermer") - self.Bind(wx.EVT_BUTTON, self.OnCloseMe, self.button_1) - self.Bind(wx.EVT_CLOSE, self.OnCloseWindow) - self.__do_layout() - # end wxGlade - - def __do_layout(self): - # begin wxGlade: MyFrame.__do_layout - sizer_1 = wx.BoxSizer(wx.VERTICAL) - sizer_2 = wx.BoxSizer(wx.VERTICAL) - sizer_2.Add(self.HtmlPage, 1, wx.EXPAND|wx.ADJUST_MINSIZE, 0) - sizer_2.Add(self.button_1, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ADJUST_MINSIZE, 0) - sizer_1.Add(sizer_2, 1, wx.EXPAND, 0) - self.SetAutoLayout(True) - self.SetSizer(sizer_1) - self.Layout() - # end wxGlade - - def OnCloseMe(self, event): - self.Close(True) - - def OnCloseWindow(self, event): - self.Destroy() - - -def getSmallUpArrowData(): - return \ -'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x10\x00\x00\x00\x10\x08\x06\ -\x00\x00\x00\x1f\xf3\xffa\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\ -\x00\x00C\xb0\x89\ -\xd3.\x10\xd1m\xc3\xe5*\xbc.\x80i\xc2\x17.\x8c\xa3y\x81\x01\x00\xa1\x0e\x04e\ -?\x84B\xef\x00\x00\x00\x00IEND\xaeB`\x82" - -def getSmallDnArrowBitmap(): - return wx.BitmapFromImage(getSmallDnArrowImage()) - -def getSmallDnArrowImage(): - stream = cStringIO.StringIO(getSmallDnArrowData()) - return wx.ImageFromStream(stream) +#class message(wx.Dialog): +# def __init__(self, *args, **kwds): +# # begin wxGlade: MyFrame.__init__ +# kwds["style"] = wx.DEFAULT_FRAME_STYLE +# wx.Frame.__init__(self, *args, **kwds) +# self.HtmlPage=wx.html.HtmlWindow(self, -1) +# if "gtk2" in wx.PlatformInfo: +# self.HtmlPage.SetStandardFonts() +# self.HtmlPage.SetFonts('Courier','Courier') +# +# +# self.button_1 = wx.Button(self, -1, "Fermer") +# self.Bind(wx.EVT_BUTTON, self.OnCloseMe, self.button_1) +# self.Bind(wx.EVT_CLOSE, self.OnCloseWindow) +# self.__do_layout() +# # end wxGlade +# +# def __do_layout(self): +# # begin wxGlade: MyFrame.__do_layout +# sizer_1 = wx.BoxSizer(wx.VERTICAL) +# sizer_2 = wx.BoxSizer(wx.VERTICAL) +# sizer_2.Add(self.HtmlPage, 1, wx.EXPAND|wx.ADJUST_MINSIZE, 0) +# sizer_2.Add(self.button_1, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ADJUST_MINSIZE, 0) +# sizer_1.Add(sizer_2, 1, wx.EXPAND, 0) +# self.SetAutoLayout(True) +# self.SetSizer(sizer_1) +# self.Layout() +# # end wxGlade +# +# def OnCloseMe(self, event): +# self.Close(True) +# +# def OnCloseWindow(self, event): +# self.Destroy() +# +# +#def getSmallUpArrowData(): +# return \ +#'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x10\x00\x00\x00\x10\x08\x06\ +#\x00\x00\x00\x1f\xf3\xffa\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\ +#\x00\x00C\xb0\x89\ +#\xd3.\x10\xd1m\xc3\xe5*\xbc.\x80i\xc2\x17.\x8c\xa3y\x81\x01\x00\xa1\x0e\x04e\ +#?\x84B\xef\x00\x00\x00\x00IEND\xaeB`\x82" +# +#def getSmallDnArrowBitmap(): +# return wx.BitmapFromImage(getSmallDnArrowImage()) +# +#def getSmallDnArrowImage(): +# stream = cStringIO.StringIO(getSmallDnArrowData()) +# return wx.ImageFromStream(stream) diff --git a/setup.py b/setup.py index 8a96984..077ebd0 100644 --- a/setup.py +++ b/setup.py @@ -7,13 +7,8 @@ Usage: from setuptools import setup import os -DATA_FILES=['configuration','Rscripts','images','dictionnaires','locale','son_fin.wav'] -#DATA_FILES=[] -#for rep in replist : -# DATA_FILES+=os.listdir(rep) -print DATA_FILES +DATA_FILES=['configuration','Rscripts','images','dictionnaires','locale', 'Rlib','son_fin.wav'] APP = ['iramuteq.py'] -#DATA_FILES = ['-r', 'configuration*,Rscripts/*'] OPTIONS = {'argv_emulation': True, 'iconfile':('images/iraicone.icns')} @@ -22,4 +17,4 @@ setup( data_files=DATA_FILES, options={'py2app': OPTIONS}, setup_requires=['py2app'], -) \ No newline at end of file +)