gnue/navigator/src GNParser.py UItext.py UIwxpy...

[James Thompson]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     James Thompson <address@hidden> 02/06/06 16:55:41

Modified files:
        navigator/src  : GNParser.py UItext.py UIwxpython.py UIwxweb.py 

Log message:
        panels size properly now
        replaced the help text widget with html widget
        replaced the description attribute with title in preperation for adding 
a
        <description> tag

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/navigator/src/GNParser.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/navigator/src/UItext.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/navigator/src/UIwxpython.py.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/navigator/src/UIwxweb.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text

Patches:
Index: gnue/navigator/src/GNParser.py
diff -c gnue/navigator/src/GNParser.py:1.3 gnue/navigator/src/GNParser.py:1.4
*** gnue/navigator/src/GNParser.py:1.3  Fri Mar 22 02:38:36 2002
--- gnue/navigator/src/GNParser.py      Thu Jun  6 16:55:40 2002
***************
*** 89,95 ****
  #               'Required': 1,
                 'Unique': 1,
                 'Typecast': GTypecast.name },
!             'description': {
                 'Typecast': GTypecast.text } },
           'ParentTags': ('processes','process') },
  
--- 89,95 ----
  #               'Required': 1,
                 'Unique': 1,
                 'Typecast': GTypecast.name },
!             'title': {
                 'Typecast': GTypecast.text } },
           'ParentTags': ('processes','process') },
  
***************
*** 109,115 ****
                 'Typecast': GTypecast.name },
              'location': {
                 'Typecast': GTypecast.text },
!             'description': {
                 'Typecast': GTypecast.text } },
           'ParentTags': ('process',) },
  
--- 109,115 ----
                 'Typecast': GTypecast.name },
              'location': {
                 'Typecast': GTypecast.text },
!             'title': {
                 'Typecast': GTypecast.text } },
           'ParentTags': ('process',) },
  
Index: gnue/navigator/src/UItext.py
diff -c gnue/navigator/src/UItext.py:1.2 gnue/navigator/src/UItext.py:1.3
*** gnue/navigator/src/UItext.py:1.2    Wed Feb 13 15:38:42 2002
--- gnue/navigator/src/UItext.py        Thu Jun  6 16:55:40 2002
***************
*** 50,56 ****
        print "\n"
  
        title = process._type == 'GNProcesses' and process.title or \
!                         process.description
  
        print "*" * len(title)
        print title
--- 50,56 ----
        print "\n"
  
        title = process._type == 'GNProcesses' and process.title or \
!                         process.title
  
        print "*" * len(title)
        print title
***************
*** 62,70 ****
          count += 1
  
          if child._type == 'GNProcess':
!           text = "%s >" % (child.description)
          elif child._type == 'GNStep':
!           text = child.description
          self.selections["%s" % count] = child
          print "%3d: %s" % (count, text)
  
--- 62,70 ----
          count += 1
  
          if child._type == 'GNProcess':
!           text = "%s >" % (child.title)
          elif child._type == 'GNStep':
!           text = child.title
          self.selections["%s" % count] = child
          print "%3d: %s" % (count, text)
  
***************
*** 78,84 ****
            top = top._parent
  
          if top != process._parent:
!           print '  P: Back to %s'% process._parent.description
            self.selections['P'] = process._parent
  
          print "  T: Back to Top"
--- 78,84 ----
            top = top._parent
  
          if top != process._parent:
!           print '  P: Back to %s'% process._parent.title
            self.selections['P'] = process._parent
  
          print "  T: Back to Top"
Index: gnue/navigator/src/UIwxpython.py
diff -c gnue/navigator/src/UIwxpython.py:1.11 
gnue/navigator/src/UIwxpython.py:1.12
*** gnue/navigator/src/UIwxpython.py:1.11       Thu Jun  6 15:48:17 2002
--- gnue/navigator/src/UIwxpython.py    Thu Jun  6 16:55:40 2002
***************
*** 30,35 ****
--- 30,36 ----
  
  
  from wxPython.wx import *
+ from wxPython.html import *
  from time import sleep
  import os, sys, string
  from gnue.common import GDataObjects, GConnections, dyn_import, openResource
***************
*** 67,74 ****
      # Panel 1 contents
      self.panel1.SetBackgroundColour(wxWHITE)
      self.tree = wxTreeCtrl(self.panel1,-1)
-     # Blech, but it works for now to setsize on the tree
-     self.tree.SetSize(wxSize(300,400))
      self.processes.setClientHandlers({'form':self.runForm})
  
      EVT_TREE_SEL_CHANGED(app, self.tree.GetId(), self.OnTreeItemSelected)
--- 68,73 ----
***************
*** 81,105 ****
  
      # Panel 2 contents
      self.panel2.SetBackgroundColour(wxWHITE)
!     self.helpText = wxTextCtrl(self.panel2, -1, "Welcome to GNUe Navigator", 
style=wxTE_MULTILINE|wxTE_READONLY|wxEXPAND)
!     # Blech, but it works for now to setsize on the text box
!     self.helpText.SetSize(wxSize(300,400))
  
  
      self.frame.Show(true)
  
      self.splitter.SetMinimumPaneSize(20)
      self.splitter.SplitVertically(self.panel1, self.panel2)
      self.splitter.SetSashPosition(100)
      app.MainLoop()
  
  
    def __buildTreeControl(self, object):
  
      if object._type == 'GNProcesses':
        node = self.tree.AddRoot(object.title)
      elif object._type in ('GNStep','GNProcess'):
!       node = self.tree.AppendItem(object._parent.__node, object.description)
      else:
        return
  
--- 80,111 ----
  
      # Panel 2 contents
      self.panel2.SetBackgroundColour(wxWHITE)
!     #self.helpText = wxTextCtrl(self.panel2, -1, "Welcome to GNUe Navigator", 
style=wxTE_MULTILINE|wxTE_READONLY|wxEXPAND)
!     self.helpText = wxHtmlWindow(self.panel2, -1)
  
+     EVT_SIZE(self.panel1,self.onResize)
+     EVT_SIZE(self.panel2,self.onResize)
  
      self.frame.Show(true)
  
      self.splitter.SetMinimumPaneSize(20)
      self.splitter.SplitVertically(self.panel1, self.panel2)
      self.splitter.SetSashPosition(100)
+ 
+ 
      app.MainLoop()
  
+   def onResize(self,evt):
+     self.tree.SetSize(self.panel1.GetSize())
+     self.helpText.SetSize(self.panel2.GetSize())
+ 
  
    def __buildTreeControl(self, object):
  
      if object._type == 'GNProcesses':
        node = self.tree.AddRoot(object.title)
      elif object._type in ('GNStep','GNProcess'):
!       node = self.tree.AppendItem(object._parent.__node, object.title)
      else:
        return
  
***************
*** 118,124 ****
  
    def OnTreeItemSelected(self, event):
      object = self.tree.GetPyData(event.GetItem())
!     self.helpText.SetValue(object.description)
  
  
    def OnTreeItemActivated(self, event):
--- 124,130 ----
  
    def OnTreeItemSelected(self, event):
      object = self.tree.GetPyData(event.GetItem())
!     self.helpText.SetPage(object.title)
  
  
    def OnTreeItemActivated(self, event):
Index: gnue/navigator/src/UIwxweb.py
diff -c gnue/navigator/src/UIwxweb.py:1.5 gnue/navigator/src/UIwxweb.py:1.6
*** gnue/navigator/src/UIwxweb.py:1.5   Tue Jun  4 17:03:53 2002
--- gnue/navigator/src/UIwxweb.py       Thu Jun  6 16:55:40 2002
***************
*** 62,78 ****
  
        if child._type == 'GNProcess':
          url = '%s' % id(child)
!         text = child.description
          html += self.getHtmlMenu(url, text)
  
        elif child._type == 'GNStep':
          url = '%s' % id(child)
!         html += self.getHtmlStep(url, child.description, child.type)
  
        self.selections['%s' % id(child)] = child
  
      self.frame.SetTitle(process._type == 'GNProcesses' and process.title or \
!                         process.description)
  
      html += self.getHtmlFooter()
  
--- 62,78 ----
  
        if child._type == 'GNProcess':
          url = '%s' % id(child)
!         text = child.title
          html += self.getHtmlMenu(url, text)
  
        elif child._type == 'GNStep':
          url = '%s' % id(child)
!         html += self.getHtmlStep(url, child.title, child.type)
  
        self.selections['%s' % id(child)] = child
  
      self.frame.SetTitle(process._type == 'GNProcesses' and process.title or \
!                         process.title)
  
      html += self.getHtmlFooter()