--- nfo/projects/netfraggle/bin/fraggleViewport.py 2004/08/27 21:14:02 1.15 +++ nfo/projects/netfraggle/bin/fraggleViewport.py 2004/08/30 13:06:40 1.16 @@ -1,7 +1,10 @@ #Boa:MDIParent:fraggleViewport -# $Id: fraggleViewport.py,v 1.15 2004/08/27 21:14:02 xabbu Exp $ +# $Id: fraggleViewport.py,v 1.16 2004/08/30 13:06:40 joko Exp $ # $Log: fraggleViewport.py,v $ +# Revision 1.16 2004/08/30 13:06:40 joko +# U now gets preferences via self.engine +# # Revision 1.15 2004/08/27 21:14:02 xabbu # TopicDetails can now be closed. # GUI change on Preferences Dialog in order to prepare multiple server profiles. @@ -34,7 +37,6 @@ from fraggleConstants import * import fraggleDialogPrefs -import fraggleCtlPreferences import FraggleAboutDialog import FraggleTopicFrame import FraggleXMLRPC @@ -124,14 +126,14 @@ self.SetMenuBar(self.menuBar1) def __init_preferences__(self): - self.preferencesCtl = fraggleCtlPreferences.create(self) + self.preferencesCtl = self.engine.preferences self.dialogPrefs = fraggleDialogPrefs.create(self) self.dialogPrefs.loadConfig() self.dialogPrefs.updateConfig() # new as of 2004-08-26: TopicFrame # new as of 2004-08-27: pass configList to TopicFrame - self.topicFrame = FraggleTopicFrame.create(self, self.preferencesCtl.configList) + self.topicFrame = FraggleTopicFrame.create(self) self.topicFrame.Move(wxPoint(5, 5)) #frame.Show() @@ -154,6 +156,8 @@ EVT_MENU(self.tbicon, wxID_FRAGGLEVIEWPORTFRAGGLETASKBARMENUITEMSEXIT, self.OnTaskBarAppExit) def __init__(self, parent): + import __main__ + self.engine = __main__.engine self._init_ctrls(parent) self.__init_preferences__() self.__init_taskbar_icon__()