# HG changeset patch # User greg # Date 1205400298 -3600 # Node ID 517db40c30b749e977b8bd4cd0e9b67fea3b638f # Parent d85b937cdac3ac1c67740ecbb42860505c65bb30 docutils is now used for displaying pdf and html diff -r d85b937cdac3 -r 517db40c30b7 Beremiz.py --- a/Beremiz.py Wed Mar 12 14:51:52 2008 +0100 +++ b/Beremiz.py Thu Mar 13 10:24:58 2008 +0100 @@ -60,16 +60,15 @@ splash=wx.SplashScreen(bmp,wx.SPLASH_CENTRE_ON_SCREEN, 1000, None) wx.Yield() -import wx.lib.buttons, wx.lib.statbmp , wx.html +import wx.lib.buttons, wx.lib.statbmp import types, time, re, platform, time, traceback, commands from plugger import PluginsRoot base_folder = os.path.split(sys.path[0])[0] -CanFestivalPath = os.path.join(base_folder, "CanFestival-3") -sys.path.append(os.path.join(CanFestivalPath, "objdictgen")) sys.path.append(os.path.join(base_folder, "docutils")) -from objdictedit import * + from docpdf import * +from dochtml import * SCROLLBAR_UNIT = 10 WINDOW_COLOUR = wx.Colour(240,240,240) @@ -1188,8 +1187,7 @@ event.Skip() def OnAboutMenu(self, event): - about_html = objdictedit(self) - about_html.OpenHtmlFrame("About Beremiz", os.path.join(CWD, "doc","about.html"), wx.Size(550, 500)) + OpenHtmlFrame(self,"About Beremiz", os.path.join(CWD, "doc","about.html"), wx.Size(550, 500)) event.Skip() def OnAddButton(self, event):