gnue common/src/cursing/Frame.py common/src/cur...

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    02/10/17 19:35:01

Modified files:
        common/src/cursing: Frame.py Menu.py MenuBar.py MenuItem.py 
        forms/doc      : Developers-Guide.sxw 
        forms/src/uidrivers/nstti: UIdriver.py 

Log message:
        playing w/docs

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/cursing/Frame.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/cursing/Menu.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/cursing/MenuBar.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/cursing/MenuItem.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/doc/Developers-Guide.sxw.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/nstti/UIdriver.py.diff?tr1=1.11&tr2=1.12&r1=text&r2=text

Patches:
Index: gnue/common/src/cursing/Frame.py
diff -c gnue/common/src/cursing/Frame.py:1.5 
gnue/common/src/cursing/Frame.py:1.6
*** gnue/common/src/cursing/Frame.py:1.5        Fri Oct 11 19:44:12 2002
--- gnue/common/src/cursing/Frame.py    Thu Oct 17 19:35:01 2002
***************
*** 35,41 ****
  class Frame(ScreenContainer):
    """
      like a full screen container, but only a smaller portion of it.
!     the user defines a screen region which makes up the dialog...
      they may only put controls within this region.
    """
    def __init__(self, ParentContainer, r1=0, c1=0, r2=0, c2=0, caption="",
--- 35,41 ----
  class Frame(ScreenContainer):
    """
      like a full screen container, but only a smaller portion of it.
!     the user defines a screen region which makes up the frame...
      they may only put controls within this region.
    """
    def __init__(self, ParentContainer, r1=0, c1=0, r2=0, c2=0, caption="",
***************
*** 87,93 ****
      cCol = cCol + self.C1 + self.BORDER
      TheControl.Y = cRow
      TheControl.X = cCol
!     ScreenContainer.AddControl(self,TheControl)
      return TheControl
  
    def AddControl(self,control):
--- 87,93 ----
      cCol = cCol + self.C1 + self.BORDER
      TheControl.Y = cRow
      TheControl.X = cCol
!     self.PARENT.AddControl(TheControl)
      return TheControl
  
    def AddControl(self,control):
***************
*** 116,132 ****
  
      self.SCREEN.SetColor(color)
  
!   def RunDialog(self):
!     self._PaintBorder()
!     self._PaintDropShadow()
!     t = self.Run()
!     self.Screen().RestoreScreen(self._Y,self._X,
!              self.R2 + self.DROPSHADOW + self.BORDER*2,
!              self.C2 + self.DROPSHADOW + self.BORDER*2,
!              self.buffer)
!     self.SCREEN.Refresh()
!     self.PARENT.Paint()
!     return t
  
    def Height(self):
      return self.R2- self._Y
--- 116,132 ----
  
      self.SCREEN.SetColor(color)
  
! ##  def RunDialog(self):
! ##    self._PaintBorder()
! ##    self._PaintDropShadow()
! ##    t = self.Run()
! ##    self.Screen().RestoreScreen(self._Y,self._X,
! ##             self.R2 + self.DROPSHADOW + self.BORDER*2,
! ##             self.C2 + self.DROPSHADOW + self.BORDER*2,
! ##             self.buffer)
! ##    self.SCREEN.Refresh()
! ##    self.PARENT.Paint()
! ##    return t
  
    def Height(self):
      return self.R2- self._Y
Index: gnue/common/src/cursing/Menu.py
diff -c gnue/common/src/cursing/Menu.py:1.4 gnue/common/src/cursing/Menu.py:1.5
*** gnue/common/src/cursing/Menu.py:1.4 Sun Oct 13 23:59:23 2002
--- gnue/common/src/cursing/Menu.py     Thu Oct 17 19:35:01 2002
***************
*** 35,45 ****
  import sio
  
  class Menu(FocusedLabel):
!   def __init__(self,Parent,MenuName,Y,X,DisplayName = "", **properties):
      self.maxLengthFixed = 0
      DisplayName = self.__FixDisplay(DisplayName)
      apply(FocusedLabel.__init__, (self,Parent,MenuName,Y,X,DisplayName), 
properties)
      self.PARENT = Parent
      self.SetMethod("CLICK",self.ShowOff)
      self.items = []
      self.maxLength = 0
--- 35,47 ----
  import sio
  
  class Menu(FocusedLabel):
!   def __init__(self,Parent,MenuName,Y,X,DisplayName = "", 
!                statusbarlink=None, **properties):
      self.maxLengthFixed = 0
      DisplayName = self.__FixDisplay(DisplayName)
      apply(FocusedLabel.__init__, (self,Parent,MenuName,Y,X,DisplayName), 
properties)
      self.PARENT = Parent
+     self.STATUSBARLINK = statusbarlink
      self.SetMethod("CLICK",self.ShowOff)
      self.items = []
      self.maxLength = 0
***************
*** 95,107 ****
          newTitle = self.items[i][1]
          text = self.__FixDisplay(newTitle)
        item = MenuItem(MenuWin,str(self.items[i][0]),count,2,text,
!           self.items[i][2], (self.PARENT.STATUSBAR, 
!                              self.PARENT.STATUSBAR_INDEX))
        item.ITEMID = self.items[i][0]
        count += 1
        item.SetMethod("CLICK",self.ItemSelected)
        MenuWin.AddDialogControl(item)
!       item.DeActivate(self.items[i][3])
      MenuWin.SetColor(sio.C_MENUBAR)
      MenuWin.INSET = 1
      MenuWin.RunDialog()
--- 97,108 ----
          newTitle = self.items[i][1]
          text = self.__FixDisplay(newTitle)
        item = MenuItem(MenuWin,str(self.items[i][0]),count,2,text,
!           self.items[i][2], self.STATUSBARLINK)
        item.ITEMID = self.items[i][0]
        count += 1
        item.SetMethod("CLICK",self.ItemSelected)
        MenuWin.AddDialogControl(item)
!       item.DeActivate(self.items[i][2])
      MenuWin.SetColor(sio.C_MENUBAR)
      MenuWin.INSET = 1
      MenuWin.RunDialog()
***************
*** 139,145 ****
    def DeActivateItem(self,itemId,state):
      for i in range(0,len(self.items)):
        if self.items[i][0] == itemId:
!         self.items[i][3] = state
          return
  
    def AddItem(self, itemId, itemCaption, itemDescription = "", initialState = 
1):
--- 140,146 ----
    def DeActivateItem(self,itemId,state):
      for i in range(0,len(self.items)):
        if self.items[i][0] == itemId:
!         self.items[i][2] = state
          return
  
    def AddItem(self, itemId, itemCaption, itemDescription = "", initialState = 
1):
Index: gnue/common/src/cursing/MenuBar.py
diff -c gnue/common/src/cursing/MenuBar.py:1.4 
gnue/common/src/cursing/MenuBar.py:1.5
*** gnue/common/src/cursing/MenuBar.py:1.4      Sun Oct 13 23:59:23 2002
--- gnue/common/src/cursing/MenuBar.py  Thu Oct 17 19:35:01 2002
***************
*** 42,51 ****
      self.X = X
      self.H = 2
      self.W = 0
      self.menus = []
  
    def NewMenu(self,Name,Caption):
!     newEntry = Menu(self.rootwin, Name, 0,0, Caption)
      self._AddMenu(newEntry)
      return newEntry
  
--- 42,53 ----
      self.X = X
      self.H = 2
      self.W = 0
+     self.STATUSBAR = None
+     self.STATUSBAR_INDEX = 0
      self.menus = []
  
    def NewMenu(self,Name,Caption):
!     newEntry = Menu(self.rootwin, Name, 0,0, Caption, self)
      self._AddMenu(newEntry)
      return newEntry
  
***************
*** 54,60 ****
        self.X,
        (self.W+2)*chr(tiHLINE))
  
!   def SetStatusBar(self, statusbar, index=0): 
      self.STATUSBAR = statusbar
      self.STATUSBAR_INDEX = index
  
--- 56,62 ----
        self.X,
        (self.W+2)*chr(tiHLINE))
  
!   def SetStatusBar(self, statusbar, index=0):
      self.STATUSBAR = statusbar
      self.STATUSBAR_INDEX = index
  
Index: gnue/common/src/cursing/MenuItem.py
diff -c gnue/common/src/cursing/MenuItem.py:1.3 
gnue/common/src/cursing/MenuItem.py:1.4
*** gnue/common/src/cursing/MenuItem.py:1.3     Sun Oct 13 23:59:23 2002
--- gnue/common/src/cursing/MenuItem.py Thu Oct 17 19:35:01 2002
***************
*** 32,42 ****
  
  class MenuItem(FocusedLabel):
    def __init__(self,Parent,MenuName,Y,X,DisplayName = "", itemDescription="",
!          statusbar_info=(None, None), **properties):
      apply(FocusedLabel.__init__, (self,Parent,MenuName,Y,X,DisplayName), 
properties)
      self.TITLE = DisplayName
      self.DESCRIPTION = itemDescription
!     (self.STATUSBAR, self.STATUSBAR_INDEX) = statusbar_info
  
    def Run(self,v1,v2,v3):
      Container = self.PARENT.Screen()
--- 32,42 ----
  
  class MenuItem(FocusedLabel):
    def __init__(self,Parent,MenuName,Y,X,DisplayName = "", itemDescription="",
!          statusbarlink=None, **properties):
      apply(FocusedLabel.__init__, (self,Parent,MenuName,Y,X,DisplayName), 
properties)
      self.TITLE = DisplayName
      self.DESCRIPTION = itemDescription
!     self.STATUSBARLINK = statusbarlink
  
    def Run(self,v1,v2,v3):
      Container = self.PARENT.Screen()
***************
*** 72,79 ****
      if self.active:
        if HasFocus :
          self.SetColor(2)
!         if self.STATUSBAR:
!           self.STATUSBAR.SetText(self.STATUSBAR_INDEX, self.DESCRIPTION)
        else:
          self.SetColor(1)
      else:
--- 72,79 ----
      if self.active:
        if HasFocus :
          self.SetColor(2)
!         if self.STATUSBARLINK and self.STATUSBARLINK.STATUSBAR:
!           
self.STATUSBARLINK.STATUSBAR.SetText(self.STATUSBARLINK.STATUSBAR_INDEX, 
self.DESCRIPTION)
        else:
          self.SetColor(1)
      else:
Index: gnue/forms/doc/Developers-Guide.sxw
Index: gnue/forms/src/uidrivers/nstti/UIdriver.py
diff -c gnue/forms/src/uidrivers/nstti/UIdriver.py:1.11 
gnue/forms/src/uidrivers/nstti/UIdriver.py:1.12
*** gnue/forms/src/uidrivers/nstti/UIdriver.py:1.11     Sun Oct 13 23:59:23 2002
--- gnue/forms/src/uidrivers/nstti/UIdriver.py  Thu Oct 17 19:35:01 2002
***************
*** 310,319 ****
    # fully activated
    #
    def mainLoop(self):
! #    print "mainWindow.run()"
! #    self.mainWindow.Run()
!     self.mainWindow.panel.RunDialog()
! #    self.mainWindow.Run()
  
    def _setStatusBar(self,tip, statusValue, insertValue, currentRecord, 
maxRecord, currentPage, maxPage):
      if tip: self.statusBar.SetText(0,str(tip))
--- 310,316 ----
    # fully activated
    #
    def mainLoop(self):
!     self.mainWindow.Run()
  
    def _setStatusBar(self,tip, statusValue, insertValue, currentRecord, 
maxRecord, currentPage, maxPage):
      if tip: self.statusBar.SetText(0,str(tip))
***************
*** 749,754 ****
--- 746,752 ----
      uiBaseEvtHandler.__init__(self, [], eventProcessor)
  
    def _processEvent(self, keystroke):
+     return keystroke
      action = None
  
      ##object = _eventObjTowxWindow(event)