--- nfo/projects/netfraggle/bin/fraggleViewport.py 2004/09/04 20:26:01 1.18 +++ nfo/projects/netfraggle/bin/fraggleViewport.py 2004/09/05 10:09:26 1.20 @@ -1,7 +1,15 @@ #Boa:MDIParent:fraggleViewport -# $Id: fraggleViewport.py,v 1.18 2004/09/04 20:26:01 xabbu Exp $ +# $Id: fraggleViewport.py,v 1.20 2004/09/05 10:09:26 xabbu Exp $ # $Log: fraggleViewport.py,v $ +# Revision 1.20 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.19 2004/09/05 00:21:10 xabbu +# +Fixed File Menu Modules item on Posix system. Gotta do testing on Windows with it. +# # Revision 1.18 2004/09/04 20:26:01 xabbu # +Added a button to the Preferences tab for showing the Modules Dialog. # Todo: When the module dialog is shown, it is still being blocked by the preferences dialog. I am not sure why but will have to look into it further. @@ -120,7 +128,7 @@ def _init_utils(self): # generated method, don't edit self.menuBar1 = wxMenuBar() - self.menuBar1.SetAutoLayout(1) + self.menuBar1.SetAutoLayout(0) self.menu1 = wxMenu(title='') @@ -137,11 +145,11 @@ # generated method, don't edit wxMDIParentFrame.__init__(self, id=wxID_FRAGGLEVIEWPORT, name='fraggleViewport', parent=prnt, pos=wxPoint(335, 382), - size=wxSize(435, 273), + size=wxSize(435, 250), style=wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL, title='NetFraggle 0.0.1') self._init_utils() - self.SetClientSize(wxSize(427, 246)) + self.SetClientSize(wxSize(427, 223)) self.SetMenuBar(self.menuBar1) def __init_modules__(self): @@ -199,12 +207,12 @@ event.Skip() - def OnMenu2items0Menu(self, event): - try: - self.dialogPrefs.ShowModal() - finally: - pass - event.Skip() + #def OnMenu2items0Menu(self, event): + # try: + # self.dialogPrefs.ShowModal() + # finally: + # pass + # event.Skip() def OnMenu2items1Menu(self, event): """Show about screen""" @@ -234,11 +242,17 @@ self.Close(True) def OnMenu1FmodulesMenu(self, event): + self.dialogModules.Show() event.Skip() def OnMenu1FprefsMenu(self, event): + try: + self.dialogPrefs.ShowModal() + finally: + pass event.Skip() def OnMenu1Items1Menu(self, event): + self.Destroy() event.Skip()