gnue/forms/src/uidrivers curses/UIdriver.py cur...

[James Thompson]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     James Thompson <address@hidden> 03/03/06 22:25:42

Modified files:
        forms/src/uidrivers/curses: UIdriver.py 
        forms/src/uidrivers/curses/widgets: page.py 
        forms/src/uidrivers/wx/widgets/form: wrappers.py 
Added files:
        forms/src/uidrivers/curses/widgets/form: __init__.py widget.py 
                                                 wrappers.py 
Removed files:
        forms/src/uidrivers/curses/widgets: form.py 

Log message:
        more curses work

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/curses/UIdriver.py.diff?tr1=1.34&tr2=1.35&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/curses/widgets/page.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/__init__.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/curses/widgets/form/widget.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/curses/widgets/form/wrappers.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/wx/widgets/form/wrappers.py.diff?tr1=1.8&tr2=1.9&r1=text&r2=text

Patches:
Index: gnue/forms/src/uidrivers/curses/UIdriver.py
diff -c gnue/forms/src/uidrivers/curses/UIdriver.py:1.34 
gnue/forms/src/uidrivers/curses/UIdriver.py:1.35
*** gnue/forms/src/uidrivers/curses/UIdriver.py:1.34    Thu Mar  6 01:09:41 2003
--- gnue/forms/src/uidrivers/curses/UIdriver.py Thu Mar  6 22:25:41 2003
***************
*** 73,81 ****
      # Create the main window
      #
  
-     self._SIO = self._screen = GetSIO()
      GDebug.printMesg(1,'Initializing curses interface (TERM=%s)' % 
curses.termname())
!     mw = self.mainWindow = ScreenContainer(self._SIO)
      self._SIO.Cls()
  
      #
--- 73,80 ----
      # Create the main window
      #
  
      GDebug.printMesg(1,'Initializing curses interface (TERM=%s)' % 
curses.termname())
!     self._SIO = self._screen = GetSIO()
      self._SIO.Cls()
  
      #
***************
*** 93,104 ****
      self.widgetHeight = 1 # The pixel height of a 1 char widget (for things 
like buttons)
      self.textWidth = 1    # The pixel width of text inside a widget
      self.textHeight = 1   # The pixel height of text inside a widget
-                 
- 
- #    self.mainWindow.panel = MyDialog(self.mainWindow, 0, 0, 
self._screen.MAXROW, self._screen.MAXCOL )
- 
-     self.currentWidget = [self.mainWindow]
  
  
    
#############################################################################
    #
--- 92,99 ----
      self.widgetHeight = 1 # The pixel height of a 1 char widget (for things 
like buttons)
      self.textWidth = 1    # The pixel width of text inside a widget
      self.textHeight = 1   # The pixel height of text inside a widget
  
+     #self.mainWindow.panel = MyDialog(self.mainWindow, 0, 0, 
self._screen.MAXROW, self._screen.MAXCOL )
  
    
#############################################################################
    #
Index: gnue/forms/src/uidrivers/curses/widgets/page.py
diff -c gnue/forms/src/uidrivers/curses/widgets/page.py:1.1 
gnue/forms/src/uidrivers/curses/widgets/page.py:1.2
*** gnue/forms/src/uidrivers/curses/widgets/page.py:1.1 Thu Mar  6 00:00:01 2003
--- gnue/forms/src/uidrivers/curses/widgets/page.py     Thu Mar  6 22:25:41 2003
***************
*** 42,47 ****
--- 42,48 ----
    def _createWidget(self, event, spacer):
      object = event.object
  
+     print "PAGE OBJECT", object
      width = event.formWidth + 2
      height = event.formHeight + 2
      x = int(event.screenWidth/2 - width/2)
***************
*** 59,69 ****
        width = event.screenWidth
  
  
!     print "CONTAINER", event.container
!     newWidget = Frame(event.container, y, x,  y+height-1, x+width-1) #  , 
object._parent.title)
!     #newWidget = Frame(object, y, x,  y+height-1, x+width-1) #  , 
object._parent.title)
      ###newWidget.DeActivate(0)
!     event.interface._pageList.append(newWidget)
      event.interface._objectMapping[object] = newWidget
      event.interface._objectMapping[newWidget] = object
  
--- 60,69 ----
        width = event.screenWidth
  
  
!     newWidget = self._uiForm._wrapper.createPage(object)
! 
      ###newWidget.DeActivate(0)
!     ###event.interface._pageList.append(newWidget)
      event.interface._objectMapping[object] = newWidget
      event.interface._objectMapping[newWidget] = object
  
Index: gnue/forms/src/uidrivers/wx/widgets/form/wrappers.py
diff -c gnue/forms/src/uidrivers/wx/widgets/form/wrappers.py:1.8 
gnue/forms/src/uidrivers/wx/widgets/form/wrappers.py:1.9
*** gnue/forms/src/uidrivers/wx/widgets/form/wrappers.py:1.8    Thu Mar  6 
16:27:31 2003
--- gnue/forms/src/uidrivers/wx/widgets/form/wrappers.py        Thu Mar  6 
22:25:42 2003
***************
*** 69,75 ****
        self.SetVirtualSize(self.spacerpane.GetSize())
      except AttributeError:
        pass # Yes, it is more wx2.2 goodness!!
-     tempx,tempy =  self.spacerpane.GetSizeTuple()
      self.Show(1)
      self.fixScrollbars()
  
--- 69,74 ----