[Pythoncard-cvs] PythonCard LICENSE.txt,1.3,1.4 dialog.py,1.35,1.36 flatfileDatabase.py,1.24,1.25

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

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

Modified Files:
	LICENSE.txt dialog.py flatfileDatabase.py 
Log Message:
reversed message and title args for multipleChoiceDialog,
  singleChoiceDialog, textEntryDialog
added singleChoiceDialog workaround for 2.5.2.7
added Alex to LICENSE.txt


Index: flatfileDatabase.py
===================================================================
RCS file: /cvsroot/pythoncard/PythonCard/flatfileDatabase.py,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** flatfileDatabase.py	12 Aug 2004 19:40:39 -0000	1.24
--- flatfileDatabase.py	15 Aug 2004 17:34:55 -0000	1.25
***************
*** 577,581 ****
  
      def sortRecords(self, name=None):
!         result = dialog.singleChoiceDialog(self.view, "Sort", "Sort cards by field:", self.sortableFields)
          if result.accepted:
              self.sortByFieldName(result.selection)
--- 577,581 ----
  
      def sortRecords(self, name=None):
!         result = dialog.singleChoiceDialog(self.view, "Sort cards by field:", "Sort", self.sortableFields)
          if result.accepted:
              self.sortByFieldName(result.selection)
***************
*** 805,809 ****
  
      def on_goToRecord_command(self, event):
!         result = dialog.textEntryDialog(self, 'Go to Card', 'Go to card number:', '')
          # this version doesn't alert the user if the line number is out-of-range
          # it just fails quietly
--- 805,809 ----
  
      def on_goToRecord_command(self, event):
!         result = dialog.textEntryDialog(self, 'Go to card number:', 'Go to Card', '')
          # this version doesn't alert the user if the line number is out-of-range
          # it just fails quietly

Index: LICENSE.txt
===================================================================
RCS file: /cvsroot/pythoncard/PythonCard/LICENSE.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** LICENSE.txt	12 May 2004 23:23:11 -0000	1.3
--- LICENSE.txt	15 Aug 2004 17:34:55 -0000	1.4
***************
*** 46,47 ****
--- 46,48 ----
      Stephen Waterbury   - twistedEchoClient sample
      Ward Cunningham     - lsystem sample
+     Alex Tweedly        - resourceEditor additions

Index: dialog.py
===================================================================
RCS file: /cvsroot/pythoncard/PythonCard/dialog.py,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** dialog.py	14 Aug 2004 15:37:10 -0000	1.35
--- dialog.py	15 Aug 2004 17:34:55 -0000	1.36
***************
*** 67,71 ****
  saveFileDialog = dialogs.saveFileDialog
  directoryDialog = dialogs.directoryDialog
! singleChoiceDialog = dialogs.singleChoiceDialog
  multipleChoiceDialog = dialogs.multipleChoiceDialog
  
--- 67,78 ----
  saveFileDialog = dialogs.saveFileDialog
  directoryDialog = dialogs.directoryDialog
! 
! #singleChoiceDialog = dialogs.singleChoiceDialog
! # KEA 2004-08-15
! # another workaround for 2.5.2.7
! def singleChoiceDialog(parent=None, message='', title='', lst=[], 
!                        style=wx.OK | wx.CANCEL | wx.CENTRE):
!     return dialogs.singleChoiceDialog(parent, message, title, lst, style | wx.DEFAULT_DIALOG_STYLE)
! 
  multipleChoiceDialog = dialogs.multipleChoiceDialog