[Pythoncard-cvs] PythonCard/tools/resourceEditor/modules newComponentDialog.py,1.2,1.3 newComponentDialog.rsrc.py,1.2,1.3

[Kevin A. <ka...@us...>]

Update of /cvsroot/pythoncard/PythonCard/tools/resourceEditor/modules
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12337/tools/resourceEditor/modules

Modified Files:
	newComponentDialog.py newComponentDialog.rsrc.py 
Log Message:
minor layout tweaks & code cleanup because I can't leave well enough alone


Index: newComponentDialog.py
===================================================================
RCS file: /cvsroot/pythoncard/PythonCard/tools/resourceEditor/modules/newComponentDialog.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** newComponentDialog.py	16 Aug 2004 13:17:27 -0000	1.2
--- newComponentDialog.py	16 Aug 2004 16:39:34 -0000	1.3
***************
*** 18,38 ****
          else:
              add = "Copy"
!         self.components.fldName.text = original['name']+add
          if "label" in attributes:
!             self.components.lblLabelOrText.text = "Label"
!             self.components.lblLabelOrText.visible = True
              if "label" in original.keys():
!                 self.components.fldLabelOrText.text = original['label']+add
              else:
!                 self.components.fldLabelOrText.text = original['name']+add
!             self.components.fldLabelOrText.visible = True
          elif "text" in attributes:
!             self.components.lblLabelOrText.text = "Text"
!             self.components.lblLabelOrText.visible = True
              if "text" in original.keys():
!                 self.components.fldLabelOrText.text = original['text']+add
              else:
!                 self.components.fldLabelOrText.text = original['name']+add
!             self.components.fldLabelOrText.visible = True
          else:
              self.components.lblLabelOrText.visible = False
--- 18,34 ----
          else:
              add = "Copy"
!         self.components.fldName.text = original['name'] + add
          if "label" in attributes:
!             self.components.lblLabelOrText.text = "Label:"
              if "label" in original.keys():
!                 self.components.fldLabelOrText.text = original['label'] + add
              else:
!                 self.components.fldLabelOrText.text = original['name'] + add
          elif "text" in attributes:
!             self.components.lblLabelOrText.text = "Text:"
              if "text" in original.keys():
!                 self.components.fldLabelOrText.text = original['text'] + add
              else:
!                 self.components.fldLabelOrText.text = original['name'] + add
          else:
              self.components.lblLabelOrText.visible = False
***************
*** 40,49 ****
              self.components.fldLabelOrText.enabled = False
              
!         if offsets:
!             self.components.chkHorizontal.visible = True
!             self.components.chkVertical.visible = True
!         else:
!             self.components.chkHorizontal.visible = False
!             self.components.chkVertical.visible = False
      
  def newComponentDialog(aBg, original, attributes, offsets, title):
--- 36,41 ----
              self.components.fldLabelOrText.enabled = False
              
!         self.components.chkHorizontal.visible = offsets
!         self.components.chkVertical.visible = offsets
      
  def newComponentDialog(aBg, original, attributes, offsets, title):

Index: newComponentDialog.rsrc.py
===================================================================
RCS file: /cvsroot/pythoncard/PythonCard/tools/resourceEditor/modules/newComponentDialog.rsrc.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** newComponentDialog.rsrc.py	14 Aug 2004 07:46:20 -0000	1.2
--- newComponentDialog.rsrc.py	16 Aug 2004 16:39:34 -0000	1.3
***************
*** 7,18 ****
  {'type':'TextField', 
      'name':'fldName', 
!     'position':(49, 9), 
!     'size':(180, -1), 
      },
  
  {'type':'TextField', 
      'name':'fldLabelOrText', 
!     'position':(50, 40), 
!     'size':(180, -1), 
      },
  
--- 7,18 ----
  {'type':'TextField', 
      'name':'fldName', 
!     'position':(60, 9), 
!     'size':(230, -1), 
      },
  
  {'type':'TextField', 
      'name':'fldLabelOrText', 
!     'position':(60, 40), 
!     'size':(230, -1), 
      },
  
***************
*** 20,24 ****
      'name':'chkHorizontal', 
      'position':(10, 80), 
-     'size':(114, -1), 
      'label':'Offest Horizontally', 
      },
--- 20,23 ----
***************
*** 26,31 ****
  {'type':'CheckBox', 
      'name':'chkVertical', 
!     'position':(150, 80), 
!     'size':(94, -1), 
      'label':'Offest Vertically', 
      },
--- 25,29 ----
  {'type':'CheckBox', 
      'name':'chkVertical', 
!     'position':(170, 80), 
      'label':'Offest Vertically', 
      },
***************
*** 48,63 ****
  {'type':'StaticText', 
      'name':'lblLabelOrText', 
!     'position':(10, 40), 
!     'size':(25, -1), 
      'alignment':'right', 
!     'text':'Label', 
      },
  
  {'type':'StaticText', 
      'name':'lblName', 
!     'position':(10, 10), 
!     'size':(35, -1), 
      'alignment':'right', 
!     'text':'Name ', 
      },
  
--- 46,61 ----
  {'type':'StaticText', 
      'name':'lblLabelOrText', 
!     'position':(5, 40), 
!     'size':(50, -1),
      'alignment':'right', 
!     'text':'Label:', 
      },
  
  {'type':'StaticText', 
      'name':'lblName', 
!     'position':(5, 10), 
!     'size':(50, -1),
      'alignment':'right', 
!     'text':'Name:', 
      },