--- nfo/projects/netfraggle/bin/fraggleMain.py 2004/08/26 15:19:26 1.4 +++ nfo/projects/netfraggle/bin/fraggleMain.py 2004/09/05 10:09:26 1.8 @@ -1,16 +1,32 @@ #!/usr/bin/env python #Boa:App:BoaApp -# $Id: fraggleMain.py,v 1.4 2004/08/26 15:19:26 joko Exp $ +# $Id: fraggleMain.py,v 1.8 2004/09/05 10:09:26 xabbu Exp $ # $Log: fraggleMain.py,v $ +# Revision 1.8 2004/09/05 10:09:26 xabbu +# + Bug that menues where displayed incorrectly on nt like os resolved. +# + Removed OS dependend menu creation in faggleMain -> moved to fraggleViewPort +# + Modules configuration dialog can be displayed by selecting Files->Modules now +# +# Revision 1.7 2004/08/30 13:55:12 joko +# + caching phpsessionid here +# +# Revision 1.6 2004/08/30 13:01:47 joko +# U prepend "libs"-dir to path +# +# Revision 1.5 2004/08/27 03:22:30 joko +# start singleton instance of FraggleEngine here +# # Revision 1.4 2004/08/26 15:19:26 joko # get rid of urlOpener here # added key shortcuts to menu-items # -import os +import sys, os from wxPython.wx import * +from fraggleConstants import * +from fraggleEngine import * from fraggleViewport import * modules ={'fraggleDialogPrefs': [0, '', 'fraggleDialogPrefs.py'], @@ -28,27 +44,22 @@ class fraggleMainWin(fraggleViewport): def _init_coll_menu1_Items(self, parent): - if os.name == 'posix': + fraggleViewport._init_coll_menu1_Items(self, parent) - elif os.name == 'nt': - parent.Append(wxID_FRAGGLEVIEWPORTMENU1FPREFS, '&Configure Netfraggle', "", wxITEM_NORMAL) - parent.Append(wxID_FRAGGLEVIEWPORTMENU1ITEMS1, '&Exit Netfraggle', "", wxITEM_NORMAL) - - EVT_MENU(self, wxID_FRAGGLEVIEWPORTMENU1FPREFS, self.OnMenu1items0Menu) - EVT_MENU(self, wxID_FRAGGLEVIEWPORTMENU1ITEMS1, self.OnMenu1items1Menu) + def _init_coll_menu2_Items(self, parent): - if os.name == 'posix': + fraggleViewport._init_coll_menu2_Items(self, parent) - elif os.name == 'nt': - parent.Append(wxID_FRAGGLEVIEWPORTMENU2CONT, '&Contents', "", wxITEM_NORMAL) - parent.Append(wxID_FRAGGLEVIEWPORTMENU2ABOUT, '&About', "", wxITEM_NORMAL) - - EVT_MENU(self, wxID_FRAGGLEVIEWPORTMENU2CONT, self.OnMenu2items0Menu) - EVT_MENU(self, wxID_FRAGGLEVIEWPORTMENU2ABOUT, self.OnMenu2items1Menu) + def main(): + global engine, phpsessionid + sys.path.insert(0, os.path.join(APPLOCATION, '..', 'libs')) + engine = FraggleEngine() + # TODO: move elsewhere! + phpsessionid = "" application = BoaApp(0) application.MainLoop()