/[cvs]/nfo/projects/netfraggle/bin/fraggleViewport.py
ViewVC logotype

Diff of /nfo/projects/netfraggle/bin/fraggleViewport.py

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.16 by joko, Mon Aug 30 13:06:40 2004 UTC revision 1.20 by xabbu, Sun Sep 5 10:09:26 2004 UTC
# Line 2  Line 2 
2    
3  # $Id$  # $Id$
4  # $Log$  # $Log$
5    # Revision 1.20  2004/09/05 10:09:26  xabbu
6    # + Bug that menues where displayed incorrectly on nt like os resolved.
7    # + Removed OS dependend menu creation in faggleMain -> moved to fraggleViewPort
8    # + Modules configuration dialog can be displayed by selecting Files->Modules now
9    #
10    # Revision 1.19  2004/09/05 00:21:10  xabbu
11    # +Fixed File Menu Modules item on Posix system. Gotta do testing on Windows with it.
12    #
13    # Revision 1.18  2004/09/04 20:26:01  xabbu
14    # +Added a button to the Preferences tab for showing the Modules Dialog.
15    #  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.
16    #
17    # +Added modules directory
18    #
19    # Revision 1.17  2004/09/01 21:43:30  xabbu
20    # +Moved funtion getDefaultDir from FraggleCtlPreferences to FraggleEngine for more convenience
21    # +FraggleCtlModules class creation for handling content modules
22    #
23  # Revision 1.16  2004/08/30 13:06:40  joko  # Revision 1.16  2004/08/30 13:06:40  joko
24  # U now gets preferences via self.engine  # U now gets preferences via self.engine
25  #  #
# Line 37  from wxPython.stc import * Line 55  from wxPython.stc import *
55    
56  from fraggleConstants import *  from fraggleConstants import *
57  import fraggleDialogPrefs  import fraggleDialogPrefs
58    import FraggleDialogModules
59  import FraggleAboutDialog  import FraggleAboutDialog
60  import FraggleTopicFrame  import FraggleTopicFrame
61  import FraggleXMLRPC  import FraggleXMLRPC
# Line 46  def create(parent): Line 65  def create(parent):
65    
66  [wxID_FRAGGLEVIEWPORT] = map(lambda _init_ctrls: wxNewId(), range(1))  [wxID_FRAGGLEVIEWPORT] = map(lambda _init_ctrls: wxNewId(), range(1))
67    
68  [wxID_FRAGGLEVIEWPORTMENU1FPREFS, wxID_FRAGGLEVIEWPORTMENU1ITEMS1,  [wxID_FRAGGLEVIEWPORTMENU1FMODULES, wxID_FRAGGLEVIEWPORTMENU1FPREFS,
69  ] = map(lambda _init_coll_menu1_Items: wxNewId(), range(2))   wxID_FRAGGLEVIEWPORTMENU1ITEMS1,
70    ] = map(lambda _init_coll_menu1_Items: wxNewId(), range(3))
71    
72  [wxID_FRAGGLEVIEWPORTMENU2ABOUT, wxID_FRAGGLEVIEWPORTMENU2CONT,  [wxID_FRAGGLEVIEWPORTMENU2ABOUT, wxID_FRAGGLEVIEWPORTMENU2CONT,
73  ] = map(lambda _init_coll_menu2_Items: wxNewId(), range(2))  ] = map(lambda _init_coll_menu2_Items: wxNewId(), range(2))
# Line 85  class fraggleViewport(wxMDIParentFrame): Line 105  class fraggleViewport(wxMDIParentFrame):
105      def _init_coll_menu1_Items(self, parent):      def _init_coll_menu1_Items(self, parent):
106          # generated method, don't edit          # generated method, don't edit
107    
108            parent.Append(helpString='Configure Modules',
109                  id=wxID_FRAGGLEVIEWPORTMENU1FMODULES, item='Modules',
110                  kind=wxITEM_NORMAL)
111          parent.Append(helpString='Configure Netfraggle',          parent.Append(helpString='Configure Netfraggle',
112                id=wxID_FRAGGLEVIEWPORTMENU1FPREFS, item='Preferences',                id=wxID_FRAGGLEVIEWPORTMENU1FPREFS, item='Preferences',
113                kind=wxITEM_NORMAL)                kind=wxITEM_NORMAL)
114          parent.Append(helpString='Exit Netfraggle',          parent.Append(helpString='Exit Netfraggle',
115                id=wxID_FRAGGLEVIEWPORTMENU1ITEMS1, item='Exit',                id=wxID_FRAGGLEVIEWPORTMENU1ITEMS1, item='Exit',
116                kind=wxITEM_NORMAL)                kind=wxITEM_NORMAL)
117            EVT_MENU(self, wxID_FRAGGLEVIEWPORTMENU1FMODULES,
118                  self.OnMenu1FmodulesMenu)
119            EVT_MENU(self, wxID_FRAGGLEVIEWPORTMENU1FPREFS, self.OnMenu1FprefsMenu)
120            EVT_MENU(self, wxID_FRAGGLEVIEWPORTMENU1ITEMS1, self.OnMenu1Items1Menu)
121    
122      def _init_coll_menuBar1_Menus(self, parent):      def _init_coll_menuBar1_Menus(self, parent):
123          # generated method, don't edit          # generated method, don't edit
# Line 101  class fraggleViewport(wxMDIParentFrame): Line 128  class fraggleViewport(wxMDIParentFrame):
128      def _init_utils(self):      def _init_utils(self):
129          # generated method, don't edit          # generated method, don't edit
130          self.menuBar1 = wxMenuBar()          self.menuBar1 = wxMenuBar()
131          self.menuBar1.SetAutoLayout(1)          self.menuBar1.SetAutoLayout(0)
132    
133          self.menu1 = wxMenu(title='')          self.menu1 = wxMenu(title='')
         self._init_coll_menu1_Items(self.menu1)  
134    
135          self.menu2 = wxMenu(title='')          self.menu2 = wxMenu(title='')
         self._init_coll_menu2_Items(self.menu2)  
136    
137          self.FraggleTaskBarMenu = wxMenu(title=u'NetFraggle')          self.FraggleTaskBarMenu = wxMenu(title=u'NetFraggle')
         self._init_coll_FraggleTaskBarMenu_Items(self.FraggleTaskBarMenu)  
138    
139          self._init_coll_menuBar1_Menus(self.menuBar1)          self._init_coll_menuBar1_Menus(self.menuBar1)
140            self._init_coll_menu1_Items(self.menu1)
141            self._init_coll_menu2_Items(self.menu2)
142            self._init_coll_FraggleTaskBarMenu_Items(self.FraggleTaskBarMenu)
143    
144      def _init_ctrls(self, prnt):      def _init_ctrls(self, prnt):
145          # generated method, don't edit          # generated method, don't edit
146          wxMDIParentFrame.__init__(self, id=wxID_FRAGGLEVIEWPORT,          wxMDIParentFrame.__init__(self, id=wxID_FRAGGLEVIEWPORT,
147                name='fraggleViewport', parent=prnt, pos=wxPoint(335, 382),                name='fraggleViewport', parent=prnt, pos=wxPoint(335, 382),
148                size=wxSize(427, 269),                size=wxSize(435, 250),
149                style=wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,                style=wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
150                title='NetFraggle 0.0.1')                title='NetFraggle 0.0.1')
151          self._init_utils()          self._init_utils()
152          self.SetClientSize(wxSize(427, 246))          self.SetClientSize(wxSize(427, 223))
153          self.SetMenuBar(self.menuBar1)          self.SetMenuBar(self.menuBar1)
154    
155        def __init_modules__(self):
156            self.modulesCtl = self.engine.modules
157            self.dialogModules = FraggleDialogModules.create(self)
158            
159      def __init_preferences__(self):      def __init_preferences__(self):
160          self.preferencesCtl = self.engine.preferences          self.preferencesCtl = self.engine.preferences
161          self.dialogPrefs = fraggleDialogPrefs.create(self)          self.dialogPrefs = fraggleDialogPrefs.create(self)
# Line 159  class fraggleViewport(wxMDIParentFrame): Line 190  class fraggleViewport(wxMDIParentFrame):
190          import __main__          import __main__
191          self.engine = __main__.engine          self.engine = __main__.engine
192          self._init_ctrls(parent)          self._init_ctrls(parent)
193            self.__init_modules__()
194          self.__init_preferences__()          self.__init_preferences__()
195          self.__init_taskbar_icon__()          self.__init_taskbar_icon__()
196          self.__init_xmlrpc__()          self.__init_xmlrpc__()
# Line 175  class fraggleViewport(wxMDIParentFrame): Line 207  class fraggleViewport(wxMDIParentFrame):
207          event.Skip()          event.Skip()
208    
209    
210      def OnMenu2items0Menu(self, event):      #def OnMenu2items0Menu(self, event):
211          try:       #   try:
212              self.dialogPrefs.ShowModal()        #      self.dialogPrefs.ShowModal()
213          finally:       #   finally:
214              pass        #      pass
215          event.Skip()        #  event.Skip()
216    
217      def OnMenu2items1Menu(self, event):      def OnMenu2items1Menu(self, event):
218          """Show about screen"""          """Show about screen"""
# Line 208  class fraggleViewport(wxMDIParentFrame): Line 240  class fraggleViewport(wxMDIParentFrame):
240          #event.Skip()          #event.Skip()
241          #self.Destroy()          #self.Destroy()
242          self.Close(True)          self.Close(True)
243    
244        def OnMenu1FmodulesMenu(self, event):
245            self.dialogModules.Show()
246            event.Skip()
247    
248        def OnMenu1FprefsMenu(self, event):
249            try:
250             self.dialogPrefs.ShowModal()
251            finally:
252              pass
253            event.Skip()
254    
255        def OnMenu1Items1Menu(self, event):
256            self.Destroy()
257            event.Skip()
258                    
Legend:
Removed from v.1.16  
changed lines
  Added in v.1.20
MailToCvsAdmin">MailToCvsAdmin
 ViewVC Help
Powered by ViewVC 1.1.26 RSS 2.0 feed