gnue/forms/src UIwxpython.py

[Jason Cater]

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

Modified files:
        forms/src      : UIwxpython.py 

Log message:
        Added 'style=label' to entry widgets

CVSWeb URLs:
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&tr2=1.122.2.1&r1=text&r2=text

Patches:
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)