[Python-checkins] python/dist/src/Lib/plat-mac EasyDialogs.py,1.3,1.4

jackjansen@users.sourceforge.net jackjansen@users.sourceforge.net
Tue, 21 Jan 2003 05:56:36 -0800


Update of /cvsroot/python/python/dist/src/Lib/plat-mac
In directory sc8-pr-cvs1:/tmp/cvs-serv10986

Modified Files:
	EasyDialogs.py 
Log Message:
Use new file dialogs in GetArgv()


Index: EasyDialogs.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-mac/EasyDialogs.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** EasyDialogs.py	17 Jan 2003 23:13:02 -0000	1.3
--- EasyDialogs.py	21 Jan 2003 13:56:34 -0000	1.4
***************
*** 29,33 ****
  from Carbon.ControlAccessor import *	# Also import Controls constants
  import Carbon.File
- import macfs
  import macresource
  import os
--- 29,32 ----
***************
*** 495,509 ****
  					MacOS.SysBeep()
  			elif n == ARGV_ADD_OLDFILE:
! 				fss, ok = macfs.StandardGetFile()
! 				if ok:
! 					stringstoadd = [fss.as_pathname()]
  			elif n == ARGV_ADD_NEWFILE:
! 				fss, ok = macfs.StandardPutFile('')
! 				if ok:
! 					stringstoadd = [fss.as_pathname()]
  			elif n == ARGV_ADD_FOLDER:
! 				fss, ok = macfs.GetDirectory()
! 				if ok:
! 					stringstoadd = [fss.as_pathname()]
  			elif n == ARGV_CMDLINE_DATA:
  				pass # Nothing to do
--- 494,508 ----
  					MacOS.SysBeep()
  			elif n == ARGV_ADD_OLDFILE:
! 				pathname = AskFileForOpen()
! 				if pathname:
! 					stringstoadd = [pathname]
  			elif n == ARGV_ADD_NEWFILE:
! 				pathname = AskFileForSave()
! 				if pathname:
! 					stringstoadd = [pathname]
  			elif n == ARGV_ADD_FOLDER:
! 				pathname = AskFolder()
! 				if pathname:
! 					stringstoadd = [pathname]
  			elif n == ARGV_CMDLINE_DATA:
  				pass # Nothing to do
***************
*** 695,699 ****
  
  def test():
! 	import time, sys
  
  	Message("Testing EasyDialogs.")
--- 694,698 ----
  
  def test():
! 	import time, sys, macfs
  
  	Message("Testing EasyDialogs.")