[Pymerase-cvs-commit] pymerase/output/PyTkWidgets HelperUtil.py,1.4,1.5

[<ki...@us...>]

Update of /cvsroot/pymerase/pymerase/output/PyTkWidgets
In directory sc8-pr-cvs1:/tmp/cvs-serv17066/PyTkWidgets

Modified Files:
	HelperUtil.py 
Log Message:
Now text labels are red and have asteriks if required


Index: HelperUtil.py
===================================================================
RCS file: /cvsroot/pymerase/pymerase/output/PyTkWidgets/HelperUtil.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** HelperUtil.py	20 Dec 2002 03:57:31 -0000	1.4
--- HelperUtil.py	23 Dec 2002 19:19:10 -0000	1.5
***************
*** 52,56 ****
  
  
!   def getPrimaryKeyLabel(self, name, value):
      code = []
      
--- 52,56 ----
  
  
!   def getPrimaryKeyLabel(self, name, value, isRequired=0):
      code = []
      
***************
*** 64,68 ****
  
  
!   def makeLabelEntry(self, name, labelText):
      """
      Creates the code for generating a Label & Entry pair and returns the code
--- 64,68 ----
  
  
!   def makeLabelEntry(self, name, labelText, isRequired=0):
      """
      Creates the code for generating a Label & Entry pair and returns the code
***************
*** 72,77 ****
  
      code = []
!     code.append("    self.%sLabel = Tkinter.Label(self.parent, text=\"%s:\")" % \
!                 (name, labelText))
      code.append("    self.%sLabel.grid(row=%s, column=0, sticky=Tkinter.E)" % (name, counter))
      code.append("    self.%sEntry = Tkinter.Entry(self.parent)" % (name))
--- 72,82 ----
  
      code = []
!     if isRequired:
!       labelText += "*"
!       code.append("    self.%sLabel = Tkinter.Label(self.parent, text=\"%s:\", fg=\"red\")" %\
!                   (name, labelText))
!     else:
!       code.append("    self.%sLabel = Tkinter.Label(self.parent, text=\"%s:\")" % \
!                   (name, labelText))
      code.append("    self.%sLabel.grid(row=%s, column=0, sticky=Tkinter.E)" % (name, counter))
      code.append("    self.%sEntry = Tkinter.Entry(self.parent)" % (name))
***************
*** 82,86 ****
      return string.join(code, '\n')
  
!   def makeLabelIntegerEntry(self, name, labelText):
      """
      Creates the code for generating a Label & Entry pair and returns the code
--- 87,91 ----
      return string.join(code, '\n')
  
!   def makeLabelIntegerEntry(self, name, labelText, isRequired=0):
      """
      Creates the code for generating a Label & Entry pair and returns the code
***************
*** 90,95 ****
  
      code = []
!     code.append("    self.%sLabel = Tkinter.Label(self.parent, text=\"%s:\")" % \
!                 (name, labelText))
      code.append("    self.%sLabel.grid(row=%s, column=0, sticky=Tkinter.E)" % (name, counter))
      code.append("    self.%sEntry = ValidatingEntry.IntegerEntry(self.parent)" % (name))
--- 95,105 ----
  
      code = []
!     if isRequired:
!       labelText += "*"
!       code.append("    self.%sLabel = Tkinter.Label(self.parent, text=\"%s:\", fg=\"red\")" % \
!                   (name, labelText))
!     else:
!       code.append("    self.%sLabel = Tkinter.Label(self.parent, text=\"%s:\")" % \
!                   (name, labelText))
      code.append("    self.%sLabel.grid(row=%s, column=0, sticky=Tkinter.E)" % (name, counter))
      code.append("    self.%sEntry = ValidatingEntry.IntegerEntry(self.parent)" % (name))
***************
*** 100,104 ****
      return string.join(code, '\n')
  
!   def makeLabelFloatEntry(self, name, labelText):
      """
      Creates the code for generating a Label & Entry pair and returns the code
--- 110,114 ----
      return string.join(code, '\n')
  
!   def makeLabelFloatEntry(self, name, labelText, isRequired=0):
      """
      Creates the code for generating a Label & Entry pair and returns the code
***************
*** 108,113 ****
  
      code = []
!     code.append("    self.%sLabel = Tkinter.Label(self.parent, text=\"%s:\")" % \
!                 (name, labelText))
      code.append("    self.%sLabel.grid(row=%s, column=0, sticky=Tkinter.E)" % (name, counter))
      code.append("    self.%sEntry = ValidatingEntry.FloatEntry(self.parent)" % (name))
--- 118,128 ----
  
      code = []
!     if isRequired:
!       labelText += "*"
!       code.append("    self.%sLabel = Tkinter.Label(self.parent, text=\"%s:\", fg=\"red\")" % \
!                   (name, labelText))
!     else:
!       code.append("    self.%sLabel = Tkinter.Label(self.parent, text=\"%s:\")" % \
!                   (name, labelText))
      code.append("    self.%sLabel.grid(row=%s, column=0, sticky=Tkinter.E)" % (name, counter))
      code.append("    self.%sEntry = ValidatingEntry.FloatEntry(self.parent)" % (name))
***************
*** 118,122 ****
      return string.join(code, '\n')
  
!   def makeLabelMaxLengthEntry(self, name, labelText, max=None):
      """
      Creates the code for generating a Label & Entry pair and returns the code
--- 133,137 ----
      return string.join(code, '\n')
  
!   def makeLabelMaxLengthEntry(self, name, labelText, max=None, isRequired=0):
      """
      Creates the code for generating a Label & Entry pair and returns the code
***************
*** 126,131 ****
  
      code = []
!     code.append("    self.%sLabel = Tkinter.Label(self.parent, text=\"%s:\")" % \
!                 (name, labelText))
      code.append("    self.%sLabel.grid(row=%s, column=0, sticky=Tkinter.E)" % (name, counter))
      code.append("    self.%sEntry = ValidatingEntry.MaxLengthEntry(self.parent,"\
--- 141,151 ----
  
      code = []
!     if isRequired:
!       labelText += "*"
!       code.append("    self.%sLabel = Tkinter.Label(self.parent, text=\"%s:\", fg=\"red\")" % \
!                   (name, labelText))
!     else:
!       code.append("    self.%sLabel = Tkinter.Label(self.parent, text=\"%s:\")" % \
!                   (name, labelText))
      code.append("    self.%sLabel.grid(row=%s, column=0, sticky=Tkinter.E)" % (name, counter))
      code.append("    self.%sEntry = ValidatingEntry.MaxLengthEntry(self.parent,"\
***************
*** 165,169 ****
  
  
!   def makeLabelText(self, name, labelText):
      """
      Creates the code for generating a Label & Text pair and returns the code
--- 185,189 ----
  
  
!   def makeLabelText(self, name, labelText, isRequired=0):
      """
      Creates the code for generating a Label & Text pair and returns the code
***************
*** 172,177 ****
      
      code = []
!     code.append("    self.%sLabel = Tkinter.Label(self.parent, text=\"%s:\")" % \
!                 (name, labelText))
      code.append("    self.%sLabel.grid(row=%s, column=0, sticky=Tkinter.E)" % (name, counter))
      code.append("    self.%sText = Tkinter.Text(self.parent, width=40, height=5)" % (name))
--- 192,202 ----
      
      code = []
!     if isRequired:
!       labelText += "*"
!       code.append("    self.%sLabel = Tkinter.Label(self.parent, text=\"%s:\", fg=\"red\")" % \
!                   (name, labelText))
!     else:
!       code.append("    self.%sLabel = Tkinter.Label(self.parent, text=\"%s:\")" % \
!                   (name, labelText))
      code.append("    self.%sLabel.grid(row=%s, column=0, sticky=Tkinter.E)" % (name, counter))
      code.append("    self.%sText = Tkinter.Text(self.parent, width=40, height=5)" % (name))
***************
*** 206,210 ****
      
  
!   def makeRadioBoolean(self, name, labelText):
      """
      Creates the code for generating a True/False Radiobutton pair and returns the code
--- 231,235 ----
      
  
!   def makeRadioBoolean(self, name, labelText, isRequired=0):
      """
      Creates the code for generating a True/False Radiobutton pair and returns the code
***************
*** 215,220 ****
      code = []
      code.append("    self.%sFrame = Tkinter.Frame(self.parent)" % (name))
!     code.append("    self.%sLabel = Tkinter.Label(self.parent, text=\"%s:\")" % \
!                 (name, labelText))
      code.append("    self.%sBooleanVar = Tkinter.IntVar()" % (name))
  
--- 240,250 ----
      code = []
      code.append("    self.%sFrame = Tkinter.Frame(self.parent)" % (name))
!     if isRequired:
!       labelText += "*"
!       code.append("    self.%sLabel = Tkinter.Label(self.parent, text=\"%s:\", fg=\"red\")" % \
!                   (name, labelText))
!     else:
!       code.append("    self.%sLabel = Tkinter.Label(self.parent, text=\"%s:\")" % \
!                   (name, labelText))
      code.append("    self.%sBooleanVar = Tkinter.IntVar()" % (name))