[Pythoncard-cvs] PythonCard/tools/resourceEditor/modules backgroundInfoDialog.py,1.14,1.15 propertyEditor.py,1.50,1.51

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

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

Modified Files:
	backgroundInfoDialog.py propertyEditor.py 
Log Message:
pass in current color to colorDialog


Index: backgroundInfoDialog.py
===================================================================
RCS file: /cvsroot/pythoncard/PythonCard/tools/resourceEditor/modules/backgroundInfoDialog.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** backgroundInfoDialog.py	22 Aug 2004 18:44:54 -0000	1.14
--- backgroundInfoDialog.py	24 Aug 2004 07:17:40 -0000	1.15
***************
*** 36,45 ****
  
      def on_btnForegroundColor_mouseClick(self, event):
!         result = dialog.colorDialog(self)
          if result.accepted:
              self.components.fldForegroundColor.text = str(result.color)
  
      def on_btnBackgroundColor_mouseClick(self, event):
!         result = dialog.colorDialog(self)
          if result.accepted:
              self.components.fldBackgroundColor.text = str(result.color)
--- 36,45 ----
  
      def on_btnForegroundColor_mouseClick(self, event):
!         result = dialog.colorDialog(self, color=util.colorFromString(self.components.fldForegroundColor.text))
          if result.accepted:
              self.components.fldForegroundColor.text = str(result.color)
  
      def on_btnBackgroundColor_mouseClick(self, event):
!         result = dialog.colorDialog(self, color=util.colorFromString(self.components.fldBackgroundColor.text))
          if result.accepted:
              self.components.fldBackgroundColor.text = str(result.color)

Index: propertyEditor.py
===================================================================
RCS file: /cvsroot/pythoncard/PythonCard/tools/resourceEditor/modules/propertyEditor.py,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** propertyEditor.py	23 Aug 2004 15:06:50 -0000	1.50
--- propertyEditor.py	24 Aug 2004 07:17:40 -0000	1.51
***************
*** 6,10 ****
  """
  
! from PythonCard import dialog, font, model, registry
  from PythonCard.event import ChangeListener
  import resourceOutput
--- 6,10 ----
  """
  
! from PythonCard import dialog, font, model, registry, util
  from PythonCard.event import ChangeListener
  import resourceOutput
***************
*** 66,70 ****
  
      def on_wColor_mouseClick(self, event):
!         result = dialog.colorDialog(self)
          if result.accepted:
              self.components.wField.text = str(result.color)
--- 66,70 ----
  
      def on_wColor_mouseClick(self, event):
!         result = dialog.colorDialog(self, color=util.colorFromString(self.components.wField.text))
          if result.accepted:
              self.components.wField.text = str(result.color)