gnue/forms/src/uidrivers _base/widgets/_base.py...

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    03/03/17 10:04:35

Modified files:
        forms/src/uidrivers/_base/widgets: _base.py 
        forms/src/uidrivers/curses/widgets: _base.py entry.py page.py 
        forms/src/uidrivers/curses/widgets/form: widget.py wrappers.py 

Log message:
        work on curses

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/_base/widgets/_base.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/curses/widgets/_base.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/curses/widgets/entry.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/curses/widgets/page.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/curses/widgets/form/widget.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/curses/widgets/form/wrappers.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: gnue/forms/src/uidrivers/_base/widgets/_base.py
diff -c gnue/forms/src/uidrivers/_base/widgets/_base.py:1.3 
gnue/forms/src/uidrivers/_base/widgets/_base.py:1.4
*** gnue/forms/src/uidrivers/_base/widgets/_base.py:1.3 Sun Mar  2 14:58:28 2003
--- gnue/forms/src/uidrivers/_base/widgets/_base.py     Mon Mar 17 10:04:34 2003
***************
*** 3,9 ****
  #
  # GNU Enterprise is free software; you can redistribute it
  # and/or modify it under the terms of the GNU General Public
! # License as published by the Free Software Foundation; either
  # version 2, or (at your option) any later version.
  #
  # GNU Enterprise is distributed in the hope that it will be
--- 3,9 ----
  #
  # GNU Enterprise is free software; you can redistribute it
  # and/or modify it under the terms of the GNU General Public
! # License as published by the Free Software Founda      tion; either
  # version 2, or (at your option) any later version.
  #
  # GNU Enterprise is distributed in the hope that it will be
***************
*** 87,93 ****
      try:
        self._creationEvent.container = self._parent._containerToolkitWidget
      except AttributeError:
!       if not hasattr(self._creationEvent, 'container'): 
          self._creationEvent.container = None
  
      #print "The container will be ",self._creationEvent.container
--- 87,93 ----
      try:
        self._creationEvent.container = self._parent._containerToolkitWidget
      except AttributeError:
!       if not hasattr(self._creationEvent, 'container'):
          self._creationEvent.container = None
  
      #print "The container will be ",self._creationEvent.container
Index: gnue/forms/src/uidrivers/curses/widgets/_base.py
diff -c gnue/forms/src/uidrivers/curses/widgets/_base.py:1.2 
gnue/forms/src/uidrivers/curses/widgets/_base.py:1.3
*** gnue/forms/src/uidrivers/curses/widgets/_base.py:1.2        Thu Mar 13 
20:32:18 2003
--- gnue/forms/src/uidrivers/curses/widgets/_base.py    Mon Mar 17 10:04:34 2003
***************
*** 46,53 ****
      pass # self.Destroy()
  
    def indexedFocus(self, index):
!     print "Widget list",self.widgets
!     print "Index", index
      widget = self.widgets[index]
      widget.PARENT.SetFocus(widget,run=0)
  
--- 46,53 ----
      pass # self.Destroy()
  
    def indexedFocus(self, index):
!     GDebug.printMesg(0, "Widget list %s" % self.widgets)
!     GDebug.printMesg(0, "Index %s" % index)
      widget = self.widgets[index]
      widget.PARENT.SetFocus(widget,run=0)
  
***************
*** 69,74 ****
  
    def createWidget(self, event, spacer):
      newWidget = self._createWidget(event, spacer)
!     print "NEW WIDGET", newWidget
      self._addToCrossRef(newWidget,event.object,self)
      return newWidget
--- 69,74 ----
  
    def createWidget(self, event, spacer):
      newWidget = self._createWidget(event, spacer)
!     GDebug.printMesg(0, "NEW WIDGET %s" %newWidget)
      self._addToCrossRef(newWidget,event.object,self)
      return newWidget
Index: gnue/forms/src/uidrivers/curses/widgets/entry.py
diff -c gnue/forms/src/uidrivers/curses/widgets/entry.py:1.1 
gnue/forms/src/uidrivers/curses/widgets/entry.py:1.2
*** gnue/forms/src/uidrivers/curses/widgets/entry.py:1.1        Thu Mar  6 
00:00:01 2003
--- gnue/forms/src/uidrivers/curses/widgets/entry.py    Mon Mar 17 10:04:34 2003
***************
*** 50,55 ****
--- 50,56 ----
        for index in range(len(choices)):
          newWidget.AddItem(index,choices[index])
      elif style == 'label':
+       GDebug.printMesg(0, "parent=%s" % event.container)
        newWidget = TextBox(event.container, 'name', object.Char__y+spacer, 
object.Char__x, object.Char__width)
      elif style == 'checkbox':
        newWidget = CheckBox(event.container, 
'name',object.Char__y+spacer,object.Char__x,'',0)
Index: gnue/forms/src/uidrivers/curses/widgets/form/widget.py
diff -c gnue/forms/src/uidrivers/curses/widgets/form/widget.py:1.1 
gnue/forms/src/uidrivers/curses/widgets/form/widget.py:1.2
*** gnue/forms/src/uidrivers/curses/widgets/form/widget.py:1.1  Thu Mar  6 
22:25:42 2003
--- gnue/forms/src/uidrivers/curses/widgets/form/widget.py      Mon Mar 17 
10:04:35 2003
***************
*** 60,69 ****
      # The window in which pages will be rendered
      if object._layout.tabbed:
        self._wrapper = wrappers.TabbedWrapper(self)
      else:
!       self._wrapper = wrappers.PlainWrapper(self)
!       
      newWidget = self._wrapper.pane
      self._containerToolkitWidget = newWidget
                              
  
--- 60,72 ----
      # The window in which pages will be rendered
      if object._layout.tabbed:
        self._wrapper = wrappers.TabbedWrapper(self)
+   
      else:
!       self._wrapper = wrappers.PlainWrapper(self)    
!     
      newWidget = self._wrapper.pane
+ 
+ 
      self._containerToolkitWidget = newWidget
                              
  
***************
*** 154,174 ****
        newMenu.Finalize()
            
  
!       # The status bar
!       self.statusBar = StatusBar(self.mainWindow, "StatusBar",
                                   self._uiDriver._screen.MAXROW, 
0,self._uiDriver._screen.MAXCOL, (-1,4,3,9,5))
            
!       self.statusBar.SetText(0,'Welcome to GNUe Forms')
!       self.statusBar.SetText(1,'OK')
!       self.statusBar.SetText(2,'INS')
!       self.statusBar.SetText(3,'0/0')
!       self.statusBar.SetText(4,'1/1')
        
!       #    self.mainWindow.AddControl(menuBar)
!       self.mainWindow.AddControl(self.statusBar)
!       self.mainWindow.Paint()
      
!       return newWidget
                                                                                
                
  
  ##    newWidget = Dialog(event.container, 0, 0, 
event.interface._screen.MAXROW, event.interface._screen.MAXCOL )
--- 157,177 ----
        newMenu.Finalize()
            
  
!     # The status bar
!     self.statusBar = StatusBar(self.mainWindow, "StatusBar",
                                   self._uiDriver._screen.MAXROW, 
0,self._uiDriver._screen.MAXCOL, (-1,4,3,9,5))
            
!     self.statusBar.SetText(0,'Welcome to GNUe Forms')
!     self.statusBar.SetText(1,'OK')
!     self.statusBar.SetText(2,'INS')
!     self.statusBar.SetText(3,'0/0')
!     self.statusBar.SetText(4,'1/1')
        
!     #    self.mainWindow.AddControl(menuBar)
!     self.mainWindow.AddControl(self.statusBar)
!     self.mainWindow.Paint()
      
!     return newWidget
                                                                                
                
  
  ##    newWidget = Dialog(event.container, 0, 0, 
event.interface._screen.MAXROW, event.interface._screen.MAXCOL )
Index: gnue/forms/src/uidrivers/curses/widgets/form/wrappers.py
diff -c gnue/forms/src/uidrivers/curses/widgets/form/wrappers.py:1.1 
gnue/forms/src/uidrivers/curses/widgets/form/wrappers.py:1.2
*** gnue/forms/src/uidrivers/curses/widgets/form/wrappers.py:1.1        Thu Mar 
 6 22:25:42 2003
--- gnue/forms/src/uidrivers/curses/widgets/form/wrappers.py    Mon Mar 17 
10:04:35 2003
***************
*** 97,103 ****
      ScrollableWrapper.__init__(self, *args, **parms)
      tabstyle  = _tabStyles[self.form._layout.tabbed]
      x = y = 0
!     self.page = notebook = Frame(self.spacerpane,y, x, self._formHeight, 
self._formWidth)
           
  ##     self.pane = notebook = wxNotebook(self.spacerpane,-1, #wxPoint(6,6),
  ##                                       style=tabstyle)
--- 97,104 ----
      ScrollableWrapper.__init__(self, *args, **parms)
      tabstyle  = _tabStyles[self.form._layout.tabbed]
      x = y = 0
! ##    self.pane = notebook = Frame(self.spacerpane,y, x, self._formHeight, 
self._formWidth)
!     self.pane = self.frame
           
  ##     self.pane = notebook = wxNotebook(self.spacerpane,-1, #wxPoint(6,6),
  ##                                       style=tabstyle)
***************
*** 113,120 ****
  ##     EVT_NOTEBOOK_PAGE_CHANGING(notebook, notebook.GetId(), 
self.notebookTabHandler)
  
    def createPage(self, object):
!     x = y = 0
!     newWidget = Frame(self.pane,y, x, self._formHeight, self._formWidth)
  
  ##     sizer = wxBoxSizer(wxVERTICAL)
  ##     newWidget = wxPanel(self.pane, -1, size=self.layoutSize)
--- 114,121 ----
  ##     EVT_NOTEBOOK_PAGE_CHANGING(notebook, notebook.GetId(), 
self.notebookTabHandler)
  
    def createPage(self, object):
!     x = y = 4
!     newWidget = Frame(self.pane,y, x, self._formHeight, self._formWidth, 
object._parent.title)
  
  ##     sizer = wxBoxSizer(wxVERTICAL)
  ##     newWidget = wxPanel(self.pane, -1, size=self.layoutSize)
***************
*** 125,131 ****
  ##     self._pageList.append(newWidget)
  ##     self.pane.AddPage(newWidget,hasattr(object,'caption') and 
object.caption or object.name)
  ##     self.pane.SetClientSize(self.layoutSize)
!     self.fit()
      return newWidget
  
    def fit(self):
--- 126,132 ----
  ##     self._pageList.append(newWidget)
  ##     self.pane.AddPage(newWidget,hasattr(object,'caption') and 
object.caption or object.name)
  ##     self.pane.SetClientSize(self.layoutSize)
! ##    self.fit()
      return newWidget
  
    def fit(self):
Index: gnue/forms/src/uidrivers/curses/widgets/page.py
diff -c gnue/forms/src/uidrivers/curses/widgets/page.py:1.3 
gnue/forms/src/uidrivers/curses/widgets/page.py:1.4
*** gnue/forms/src/uidrivers/curses/widgets/page.py:1.3 Thu Mar 13 20:32:18 2003
--- gnue/forms/src/uidrivers/curses/widgets/page.py     Mon Mar 17 10:04:34 2003
***************
*** 27,32 ****
--- 27,33 ----
  # NOTES:
  #
  
+ from gnue.common.apps import GDebug
  from gnue.common.cursing import *
  from gnue.forms.uidrivers.curses.widgets._base import UIHelper
  from gnue.forms.uidrivers.curses.common import keyboardEvtHandler
***************
*** 43,60 ****
    def _createWidget(self, event, spacer):
      object = event.object
  
!     print "PAGE OBJECT", object
!     print "PAGE OBJECT", object
!     print "PAGE OBJECT", object
!     print "PAGE OBJECT", object
!     print "PAGE OBJECT", object
!     print "PAGE OBJECT", object
!     print "PAGE OBJECT", object
!     print "PAGE OBJECT", object
!     print "PAGE OBJECT", object
!     print "PAGE OBJECT", object
!     print "PAGE OBJECT", object
!     print "PAGE OBJECT", object
      
      width = event.formWidth + 2
      height = event.formHeight + 2
--- 44,50 ----
    def _createWidget(self, event, spacer):
      object = event.object
  
!     GDebug.printMesg(0, "PAGE OBJECT %s" % object)
      
      width = event.formWidth + 2
      height = event.formHeight + 2
***************
*** 84,89 ****
--- 74,80 ----
      global _EVENTPROCESSOR
      newWidget.KeystrokeHook = 
keyboardEvtHandler(_EVENTPROCESSOR)._processEvent
  
+     GDebug.printMesg(0, "PAGE %s" % newWidget)
      return newWidget
  
  configuration = {