gnue/forms/src GFForm.py UIwxpython.py GFObject...

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Branch:         gnuef-0-1-0-patches
Changes by:     Jason Cater <address@hidden>    01/12/20 18:18:15

Modified files:
        forms/src      : GFForm.py UIwxpython.py 
        forms/src/GFObjects: GFEntry.py 

Log message:
        misc changes for label-style entry widgets

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFForm.py.diff?only_with_tag=gnuef-0-1-0-patches&tr1=1.133&tr2=1.133.2.1&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/UIwxpython.py.diff?only_with_tag=gnuef-0-1-0-patches&tr1=1.122.2.1&tr2=1.122.2.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFObjects/GFEntry.py.diff?only_with_tag=gnuef-0-1-0-patches&tr1=1.26&tr2=1.26.2.1&r1=text&r2=text

Patches:
Index: gnue/forms/src/GFForm.py
diff -c gnue/forms/src/GFForm.py:1.132 gnue/forms/src/GFForm.py:1.133
*** gnue/forms/src/GFForm.py:1.132      Tue Nov 20 21:42:25 2001
--- gnue/forms/src/GFForm.py    Tue Nov 20 22:08:42 2001
***************
*** 1,12 ****
  #
  # This file is part of GNU Enterprise.
  #
! # 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 
  # useful, but WITHOUT ANY WARRANTY; without even the implied
  # warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
  # PURPOSE. See the GNU General Public License for more details.
--- 1,12 ----
  #
  # This file is part of GNU Enterprise.
  #
! # 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
  # useful, but WITHOUT ANY WARRANTY; without even the implied
  # warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
  # PURPOSE. See the GNU General Public License for more details.
***************
*** 43,50 ****
  import GFTrigger
  
  # Defines which objects are "Tab Stops"
! TabStops = ('GFEntry','GFButton')
! #TabStops = ('GFEntry',)
  
  class GFForm(GFObj, GFEventAware):
    def __init__(self, parent=None, app=None):
--- 43,50 ----
  import GFTrigger
  
  # Defines which objects are "Tab Stops"
! #TabStops = ('GFEntry','GFButton')
! TabStops = ('GFEntry',)
  
  class GFForm(GFObj, GFEventAware):
    def __init__(self, parent=None, app=None):
Index: gnue/forms/src/GFObjects/GFEntry.py
diff -c gnue/forms/src/GFObjects/GFEntry.py:1.26 
gnue/forms/src/GFObjects/GFEntry.py:1.27
*** gnue/forms/src/GFObjects/GFEntry.py:1.26    Fri Nov  2 15:39:48 2001
--- gnue/forms/src/GFObjects/GFEntry.py Mon Nov 26 18:26:43 2001
***************
*** 95,100 ****
--- 95,101 ----
    def initialize(self):
      if self.typecast == 'number':
        self._numeric = 1
+       self._allowFormulas = GConfig.get("AllowNumericFormulas",1)
      if self.case == 'upper':
        self._uppercase = 1
      elif self.case == 'lower':
Index: gnue/forms/src/UIwxpython.py
diff -c gnue/forms/src/UIwxpython.py:1.121 gnue/forms/src/UIwxpython.py:1.122
*** gnue/forms/src/UIwxpython.py:1.121  Sat Nov 17 18:15:25 2001
--- gnue/forms/src/UIwxpython.py        Tue Nov 20 21:42:25 2001
***************
*** 58,67 ****
  
  __wxApp = None
  
! def getWxApp(): 
    global __wxApp
  
!   if __wxApp == None: 
      __wxApp = GFwxApp(0)
  #    __wxApp.MainLoop()
      GDebug.printMesg(7,"WxApp initializing3")
--- 58,67 ----
  
  __wxApp = None
  
! def getWxApp():
    global __wxApp
  
!   if __wxApp == None:
      __wxApp = GFwxApp(0)
  #    __wxApp.MainLoop()
      GDebug.printMesg(7,"WxApp initializing3")
***************
*** 78,85 ****
      
widget.SetFont(wxFont(int(GConfig.get('pointSize')),wxMODERN,wxNORMAL,wxNORMAL))
  
  # Helps out with layout
! def getLargest(val1, val2): 
!   if val1 > val2: 
       return val1
    else:
       return val2
--- 78,85 ----
      
widget.SetFont(wxFont(int(GConfig.get('pointSize')),wxMODERN,wxNORMAL,wxNORMAL))
  
  # Helps out with layout
! def getLargest(val1, val2):
!   if val1 > val2:
       return val1
    else:
       return val2
***************
*** 87,105 ****
  
  # Used by the login handler
  # enables the user to press return and have it jump to the next box
! class LoginFieldHandler: 
!   def __init__(self, app, seq): 
!     self.app = app 
      self.seq = seq
  
    def loginFieldEventTrap(self, event):
      if event.KeyCode() in (WXK_RETURN, WXK_TAB):
        if self.seq < len(self.app.textctrlList) - 1:
          self.app.textctrlList[self.seq+1].SetFocus()
!       else: 
!         if event.KeyCode() == WXK_TAB: 
            self.app.loginButton.SetFocus()
!         else: 
            self.app.loginCompleted(1)
      else:
        event.Skip()
--- 87,105 ----
  
  # Used by the login handler
  # enables the user to press return and have it jump to the next box
! class LoginFieldHandler:
!   def __init__(self, app, seq):
!     self.app = app
      self.seq = seq
  
    def loginFieldEventTrap(self, event):
      if event.KeyCode() in (WXK_RETURN, WXK_TAB):
        if self.seq < len(self.app.textctrlList) - 1:
          self.app.textctrlList[self.seq+1].SetFocus()
!       else:
!         if event.KeyCode() == WXK_TAB:
            self.app.loginButton.SetFocus()
!         else:
            self.app.loginCompleted(1)
      else:
        event.Skip()
***************
*** 192,207 ****
        twidth,theight = self.splash.GetTextExtent(text)
        wxStaticText(parent=self.splash, id=-1, label=str(text),
                     size=wxSize(swidth,theight), 
pos=wxPoint(1,25),style=wxALIGN_CENTRE)
!     
!       text = "(c)2000 Free Software Foundation"
        twidth,theight = self.splash.GetTextExtent(text)
        wxStaticText(self.splash, -1, str(text),
                     wxPoint(1,50),wxSize(swidth,theight),wxALIGN_CENTRE)
  
!       text = "Protected by GNU General Public Licence 2.0 or greater"
        wxStaticText(self.splash, -1, str(text),
                     
wxPoint(1,sheight-(theight+10)),wxSize(swidth-5,theight),wxALIGN_RIGHT)
!         
        self.splash.CenterOnScreen()
        self.splash.Show(true)
  
--- 192,207 ----
        twidth,theight = self.splash.GetTextExtent(text)
        wxStaticText(parent=self.splash, id=-1, label=str(text),
                     size=wxSize(swidth,theight), 
pos=wxPoint(1,25),style=wxALIGN_CENTRE)
! 
!       text = "(c)2000-2001 Free Software Foundation"
        twidth,theight = self.splash.GetTextExtent(text)
        wxStaticText(self.splash, -1, str(text),
                     wxPoint(1,50),wxSize(swidth,theight),wxALIGN_CENTRE)
  
!       text = "Protected by GNU General Public Licence 2.0"
        wxStaticText(self.splash, -1, str(text),
                     
wxPoint(1,sheight-(theight+10)),wxSize(swidth-5,theight),wxALIGN_RIGHT)
! 
        self.splash.CenterOnScreen()
        self.splash.Show(true)