commit-gnue
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: Jason Cater
Subject: gnue/forms/src/uidrivers _base/widgets/_base.py...
Date: Mon, 17 Mar 2003 21:18:32 -0500

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    03/03/17 21:18:31

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

Log message:
        more work on curses

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/_base/widgets/_base.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/curses/UIdriver.py.diff?tr1=1.37&tr2=1.38&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/curses/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/entry.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/page.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/curses/widgets/form/widget.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/form/wrappers.py.diff?tr1=1.2&tr2=1.3&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.4 
gnue/forms/src/uidrivers/_base/widgets/_base.py:1.5
*** gnue/forms/src/uidrivers/_base/widgets/_base.py:1.4 Mon Mar 17 10:04:34 2003
--- gnue/forms/src/uidrivers/_base/widgets/_base.py     Mon Mar 17 21:18:31 2003
***************
*** 34,39 ****
--- 34,40 ----
  
  import string
  from gnue.common.definitions.GObjects import GObj
+ from gnue.common.apps import GDebug
  
  class UIWidget(GObj):
    def __init__(self, event):
***************
*** 42,48 ****
      # set the default _type based upon the UIclass it is
      #
      self._type = string.split("%s" % self.__class__,'.')[-1]
!     
      self._inits=[self.primaryInit]
  
      #TODO: Patented MemorySucka 2000 technology
--- 43,49 ----
      # set the default _type based upon the UIclass it is
      #
      self._type = string.split("%s" % self.__class__,'.')[-1]
! 
      self._inits=[self.primaryInit]
  
      #TODO: Patented MemorySucka 2000 technology
***************
*** 51,57 ****
      self._containerToolkitWidget = None  # If this widget can contain other
                                           # widgets then this the the toolkit
                                           # specific container children should 
use
!     
      self._gfObject = event.object
  
      self.widgets = []
--- 52,58 ----
      self._containerToolkitWidget = None  # If this widget can contain other
                                           # widgets then this the the toolkit
                                           # specific container children should 
use
! 
      self._gfObject = event.object
  
      self.widgets = []
***************
*** 83,92 ****
    def primaryInit(self):
      self._uiDriver = self.findParentOfType('UIDriver')
      self._uiForm = self.findParentOfType('UIForm')
!     
      try:
        self._creationEvent.container = self._parent._containerToolkitWidget
      except AttributeError:
        if not hasattr(self._creationEvent, 'container'):
          self._creationEvent.container = None
  
--- 84,95 ----
    def primaryInit(self):
      self._uiDriver = self.findParentOfType('UIDriver')
      self._uiForm = self.findParentOfType('UIForm')
! 
      try:
        self._creationEvent.container = self._parent._containerToolkitWidget
      except AttributeError:
+ 
+ 
        if not hasattr(self._creationEvent, 'container'):
          self._creationEvent.container = None
  
Index: gnue/forms/src/uidrivers/curses/UIdriver.py
diff -c gnue/forms/src/uidrivers/curses/UIdriver.py:1.37 
gnue/forms/src/uidrivers/curses/UIdriver.py:1.38
*** gnue/forms/src/uidrivers/curses/UIdriver.py:1.37    Thu Mar 13 20:32:11 2003
--- gnue/forms/src/uidrivers/curses/UIdriver.py Mon Mar 17 21:18:31 2003
***************
*** 70,76 ****
    # initialize
    #
    def initialize(self):
!     
      #
      # Create the main window
      #
--- 70,76 ----
    # initialize
    #
    def initialize(self):
! 
      #
      # Create the main window
      #
***************
*** 90,96 ****
             + 'Protected by GNU General Public Licence 2.0\n'
  
      #MsgBoxOK(self.mainWindow, text).Show()
!     
      self.widgetWidth = 1  # The width of a 1 char widget (for things like 
buttons)
      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
--- 90,96 ----
             + 'Protected by GNU General Public Licence 2.0\n'
  
      #MsgBoxOK(self.mainWindow, text).Show()
! 
      self.widgetWidth = 1  # The width of a 1 char widget (for things like 
buttons)
      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
***************
*** 145,165 ****
    #
    def mainLoop(self):
      self.mainWindow.Run()
- 
-   def _setStatusBar(self,tip, statusValue, insertValue, currentRecord, 
maxRecord, currentPage, maxPage):
-     if tip != None: self.statusBar.SetText(0,str(tip))
- 
-     if statusValue:
-       self.statusBar.SetText(1,statusValue)
- 
-     if insertValue:
-       self.statusBar.SetText(2,insertValue)
- 
-     if currentRecord and  maxRecord:
-       self.statusBar.SetText(3,string.strip("%s/%s" % 
(currentRecord,maxRecord)))
- 
-     if currentPage and  maxPage:
-       self.statusBar.SetText(4,string.strip("%s/%s" % (currentPage,maxPage)))
  
  
    #
--- 145,150 ----
Index: gnue/forms/src/uidrivers/curses/widgets/_base.py
diff -c gnue/forms/src/uidrivers/curses/widgets/_base.py:1.3 
gnue/forms/src/uidrivers/curses/widgets/_base.py:1.4
*** gnue/forms/src/uidrivers/curses/widgets/_base.py:1.3        Mon Mar 17 
10:04:34 2003
--- gnue/forms/src/uidrivers/curses/widgets/_base.py    Mon Mar 17 21:18:31 2003
***************
*** 23,29 ****
  #
  # DESCRIPTION:
  # Provides UIHelper, a UI widget set of std functions to reduce the
! # number of functions require in each individual UIclass 
  #
  # NOTES:
  #
--- 23,29 ----
  #
  # DESCRIPTION:
  # Provides UIHelper, a UI widget set of std functions to reduce the
! # number of functions require in each individual UIclass
  #
  # NOTES:
  #
***************
*** 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
--- 69,73 ----
Index: gnue/forms/src/uidrivers/curses/widgets/entry.py
diff -c gnue/forms/src/uidrivers/curses/widgets/entry.py:1.2 
gnue/forms/src/uidrivers/curses/widgets/entry.py:1.3
*** gnue/forms/src/uidrivers/curses/widgets/entry.py:1.2        Mon Mar 17 
10:04:34 2003
--- gnue/forms/src/uidrivers/curses/widgets/entry.py    Mon Mar 17 21:18:31 2003
***************
*** 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)
--- 50,55 ----
Index: gnue/forms/src/uidrivers/curses/widgets/form/widget.py
diff -c gnue/forms/src/uidrivers/curses/widgets/form/widget.py:1.2 
gnue/forms/src/uidrivers/curses/widgets/form/widget.py:1.3
*** gnue/forms/src/uidrivers/curses/widgets/form/widget.py:1.2  Mon Mar 17 
10:04:35 2003
--- gnue/forms/src/uidrivers/curses/widgets/form/widget.py      Mon Mar 17 
21:18:31 2003
***************
*** 33,38 ****
--- 33,39 ----
  from gnue.forms.uidrivers.curses.GFsio import *
  
  import wrappers
+ import string
  
  #
  # UIForm
***************
*** 68,74 ****
  
  
      self._containerToolkitWidget = newWidget
!                             
  
      # Add the menu
      menu = {'file':[ {'id'   :100,
--- 69,75 ----
  
  
      self._containerToolkitWidget = newWidget
! 
  
      # Add the menu
      menu = {'file':[ {'id'   :100,
***************
*** 137,143 ****
                        'tip'  :"gConfigForms('msg_query')",
                        'event':'requestEXECQUERY'},
                                            ],
!             
              'help':[ {'id'   :301,
                        'text' :'About...',
                        'tip'  :"gConfigForms('msg_help')",
--- 138,144 ----
                        'tip'  :"gConfigForms('msg_query')",
                        'event':'requestEXECQUERY'},
                                            ],
! 
              'help':[ {'id'   :301,
                        'text' :'About...',
                        'tip'  :"gConfigForms('msg_help')",
***************
*** 146,152 ****
                          }
  
      menuBar = MenuBar(self.mainWindow,0,0, self._uiDriver._screen.MAXCOL)
!     
      for _menu in ['file','edit','data','help']:
        newMenu=menuBar.NewMenu(_menu,_menu.capitalize())
        for menuitem in menu[_menu]:
--- 147,153 ----
                          }
  
      menuBar = MenuBar(self.mainWindow,0,0, self._uiDriver._screen.MAXCOL)
! 
      for _menu in ['file','edit','data','help']:
        newMenu=menuBar.NewMenu(_menu,_menu.capitalize())
        for menuitem in menu[_menu]:
***************
*** 155,182 ****
          else:
            newMenu.InsertSeperator()
        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 )
  
  ##    return newWidget
  
  #
  # Configuration data
--- 156,199 ----
          else:
            newMenu.InsertSeperator()
        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 )
  
  ##    return newWidget
+ 
+   def _setStatusBar(self,tip, statusValue, insertValue, currentRecord, 
maxRecord, currentPage, maxPage):
+     if tip != None: self.statusBar.SetText(0,str(tip))
+ 
+     if statusValue:
+       self.statusBar.SetText(1,statusValue)
+ 
+     if insertValue:
+       self.statusBar.SetText(2,insertValue)
+ 
+     if currentRecord and  maxRecord:
+       self.statusBar.SetText(3,string.strip("%s/%s" % 
(currentRecord,maxRecord)))
+ 
+     if currentPage and  maxPage:
+       self.statusBar.SetText(4,string.strip("%s/%s" % (currentPage,maxPage)))
+ 
  
  #
  # Configuration data
Index: gnue/forms/src/uidrivers/curses/widgets/form/wrappers.py
diff -c gnue/forms/src/uidrivers/curses/widgets/form/wrappers.py:1.2 
gnue/forms/src/uidrivers/curses/widgets/form/wrappers.py:1.3
*** gnue/forms/src/uidrivers/curses/widgets/form/wrappers.py:1.2        Mon Mar 
17 10:04:35 2003
--- gnue/forms/src/uidrivers/curses/widgets/form/wrappers.py    Mon Mar 17 
21:18:31 2003
***************
*** 115,121 ****
  
    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)
--- 115,123 ----
  
    def createPage(self, object):
      x = y = 4
!     newWidget = Frame(self.pane,y, x,
!                self._formHeight, self._formWidth,
!                object.findParentOfType('GFForm').title)
  
  ##     sizer = wxBoxSizer(wxVERTICAL)
  ##     newWidget = wxPanel(self.pane, -1, size=self.layoutSize)
Index: gnue/forms/src/uidrivers/curses/widgets/page.py
diff -c gnue/forms/src/uidrivers/curses/widgets/page.py:1.4 
gnue/forms/src/uidrivers/curses/widgets/page.py:1.5
*** gnue/forms/src/uidrivers/curses/widgets/page.py:1.4 Mon Mar 17 10:04:34 2003
--- gnue/forms/src/uidrivers/curses/widgets/page.py     Mon Mar 17 21:18:31 2003
***************
*** 73,80 ****
      ####
      global _EVENTPROCESSOR
      newWidget.KeystrokeHook = 
keyboardEvtHandler(_EVENTPROCESSOR)._processEvent
  
-     GDebug.printMesg(0, "PAGE %s" % newWidget)
      return newWidget
  
  configuration = {
--- 73,80 ----
      ####
      global _EVENTPROCESSOR
      newWidget.KeystrokeHook = 
keyboardEvtHandler(_EVENTPROCESSOR)._processEvent
+     self._containerToolkitWidget = newWidget
  
      return newWidget
  
  configuration = {




reply via email to

[Prev in Thread] Current Thread [Next in Thread]