[Pythoncard-cvs] PythonCard/tools/resourceEditor resourceEditor.py,1.208,1.209

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

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

Modified Files:
	resourceEditor.py 
Log Message:
added colorFromString to util.py
added backgroundInfoDialog function wrapper


Index: resourceEditor.py
===================================================================
RCS file: /cvsroot/pythoncard/PythonCard/tools/resourceEditor/resourceEditor.py,v
retrieving revision 1.208
retrieving revision 1.209
diff -C2 -d -r1.208 -r1.209
*** resourceEditor.py	16 Aug 2004 20:26:12 -0000	1.208
--- resourceEditor.py	22 Aug 2004 18:44:53 -0000	1.209
***************
*** 18,22 ****
  from PythonCard.templates.dialogs import runOptionsDialog
  
! from modules.backgroundInfoDialog import BackgroundInfoDialog
  from modules import stackInfoDialog
  from modules import menuDialog
--- 18,22 ----
  from PythonCard.templates.dialogs import runOptionsDialog
  
! from modules import backgroundInfoDialog
  from modules import stackInfoDialog
  from modules import menuDialog
***************
*** 1287,1332 ****
          background.position = self.GetPositionTuple()
          background.size = self.GetSizeTuple()
!         dlg = BackgroundInfoDialog(self, background)
!         result = dlg.showModal()
          if result.accepted:
!             background.name = dlg.components.fldName.text
!             background.title = dlg.components.fldTitle.text
!             background.position = eval(dlg.components.fldPosition.text)
!             background.size = eval(dlg.components.fldSize.text)
!             background.statusBar = dlg.components.chkStatusBar.checked
!             # use same color/eval algorithm as onSelectUpdate of PropertyEditor in debug.py
!             if dlg.components.fldForegroundColor.text != '':
!                 value = dlg.components.fldForegroundColor.text
!                 try:
!                     background.foregroundColor = eval(value)
!                 except:
!                     background.foregroundColor = value
!             else:
!                 background.foregroundColor = None
!             if dlg.components.fldBackgroundColor.text != '':
!                 value = dlg.components.fldBackgroundColor.text
!                 try:
!                     background.backgroundColor = eval(value)
!                 except:
!                     background.backgroundColor = value
!             else:
!                 background.backgroundColor = None
!             if dlg.components.fldImage.text != '':
!                 background.image = dlg.components.fldImage.text
!             else:
!                 background.image = None
!             background.tiled = dlg.components.chkTiled.checked
!             background.visible = dlg.components.chkVisible.checked
!             if dlg.components.chkResizeable.checked:
!                 background.style = ['resizeable']
!             else:
!                 background.style = []
!             if dlg.components.fldIcon.text != '':
!                 background.icon = dlg.components.fldIcon.text
!             else:
!                 background.icon = None
              self.updatePanel(self.rsrc)
              self.documentChanged = True
-         dlg.destroy()
  
      # need to change the logic so that self.rsrc
--- 1287,1306 ----
          background.position = self.GetPositionTuple()
          background.size = self.GetSizeTuple()
!         result = backgroundInfoDialog.backgroundInfoDialog(self, background)
          if result.accepted:
!             background.name = result.name
!             background.title = result.title
!             background.position = result.position
!             background.size = result.size
!             background.statusBar = result.statusBar
!             background.foregroundColor = result.foregroundColor
!             background.backgroundColor = result.backgroundColor
!             background.image = result.image
!             background.tiled = result.tiled
!             background.visible = result.visible
!             background.style = result.style
!             background.icon = result.icon
              self.updatePanel(self.rsrc)
              self.documentChanged = True
  
      # need to change the logic so that self.rsrc