--- nfo/projects/netfraggle/bin/fraggleViewport.py	2004/09/01 21:43:30	1.17
+++ nfo/projects/netfraggle/bin/fraggleViewport.py	2004/09/05 10:09:26	1.20
@@ -1,7 +1,21 @@
 #Boa:MDIParent:fraggleViewport
 
-# $Id: fraggleViewport.py,v 1.17 2004/09/01 21:43:30 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.
+#
+# +Added modules directory
+#
 # Revision 1.17  2004/09/01 21:43:30  xabbu
 # +Moved funtion getDefaultDir from FraggleCtlPreferences to FraggleEngine for more convenience
 # +FraggleCtlModules class creation for handling content modules
@@ -41,6 +55,7 @@
 
 from fraggleConstants import *
 import fraggleDialogPrefs
+import FraggleDialogModules
 import FraggleAboutDialog
 import FraggleTopicFrame
 import FraggleXMLRPC
@@ -50,8 +65,9 @@
 
 [wxID_FRAGGLEVIEWPORT] = map(lambda _init_ctrls: wxNewId(), range(1))
 
-[wxID_FRAGGLEVIEWPORTMENU1FPREFS, wxID_FRAGGLEVIEWPORTMENU1ITEMS1, 
-] = map(lambda _init_coll_menu1_Items: wxNewId(), range(2))
+[wxID_FRAGGLEVIEWPORTMENU1FMODULES, wxID_FRAGGLEVIEWPORTMENU1FPREFS, 
+ wxID_FRAGGLEVIEWPORTMENU1ITEMS1, 
+] = map(lambda _init_coll_menu1_Items: wxNewId(), range(3))
 
 [wxID_FRAGGLEVIEWPORTMENU2ABOUT, wxID_FRAGGLEVIEWPORTMENU2CONT, 
 ] = map(lambda _init_coll_menu2_Items: wxNewId(), range(2))
@@ -89,12 +105,19 @@
     def _init_coll_menu1_Items(self, parent):
         # generated method, don't edit
 
+        parent.Append(helpString='Configure Modules',
+              id=wxID_FRAGGLEVIEWPORTMENU1FMODULES, item='Modules',
+              kind=wxITEM_NORMAL)
         parent.Append(helpString='Configure Netfraggle',
               id=wxID_FRAGGLEVIEWPORTMENU1FPREFS, item='Preferences',
               kind=wxITEM_NORMAL)
         parent.Append(helpString='Exit Netfraggle',
               id=wxID_FRAGGLEVIEWPORTMENU1ITEMS1, item='Exit',
               kind=wxITEM_NORMAL)
+        EVT_MENU(self, wxID_FRAGGLEVIEWPORTMENU1FMODULES,
+              self.OnMenu1FmodulesMenu)
+        EVT_MENU(self, wxID_FRAGGLEVIEWPORTMENU1FPREFS, self.OnMenu1FprefsMenu)
+        EVT_MENU(self, wxID_FRAGGLEVIEWPORTMENU1ITEMS1, self.OnMenu1Items1Menu)
 
     def _init_coll_menuBar1_Menus(self, parent):
         # generated method, don't edit
@@ -105,28 +128,28 @@
     def _init_utils(self):
         # generated method, don't edit
         self.menuBar1 = wxMenuBar()
-        self.menuBar1.SetAutoLayout(1)
+        self.menuBar1.SetAutoLayout(0)
 
         self.menu1 = wxMenu(title='')
-        self._init_coll_menu1_Items(self.menu1)
 
         self.menu2 = wxMenu(title='')
-        self._init_coll_menu2_Items(self.menu2)
 
         self.FraggleTaskBarMenu = wxMenu(title=u'NetFraggle')
-        self._init_coll_FraggleTaskBarMenu_Items(self.FraggleTaskBarMenu)
 
         self._init_coll_menuBar1_Menus(self.menuBar1)
+        self._init_coll_menu1_Items(self.menu1)
+        self._init_coll_menu2_Items(self.menu2)
+        self._init_coll_FraggleTaskBarMenu_Items(self.FraggleTaskBarMenu)
 
     def _init_ctrls(self, prnt):
         # generated method, don't edit
         wxMDIParentFrame.__init__(self, id=wxID_FRAGGLEVIEWPORT,
               name='fraggleViewport', parent=prnt, pos=wxPoint(335, 382),
-              size=wxSize(427, 269),
+              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):
@@ -167,6 +190,7 @@
         import __main__
         self.engine = __main__.engine
         self._init_ctrls(parent)
+        self.__init_modules__()
         self.__init_preferences__()
         self.__init_taskbar_icon__()
         self.__init_xmlrpc__()
@@ -183,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"""
@@ -216,4 +240,19 @@
         #event.Skip()
         #self.Destroy()
         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()