mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-17 14:16:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Use new file dialogs.

Browse source
This commit is contained in:
Jack Jansen 2003-01-26 21:40:00 +00:00
parent d9db3a6713
commit b340acf9fd
16 changed files with 72 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Mac/Demo/imgbrowse/imgbrowse.py
View file

@ -1,4 +1,4 @@
GetPortBounds()"""imgbrowse - Display pictures using img""" """imgbrowse - Display pictures using img"""
import FrameWork import FrameWork
import EasyDialogs import EasyDialogs
@ -11,7 +11,6 @@ import sys
import struct import struct
import img import img
import imgformat import imgformat
import macfs
import struct import struct
import mac_image import mac_image
@ -47,11 +46,10 @@ class imgbrowse(FrameWork.Application):
self._quit() self._quit()
def opendoc(self, *args): def opendoc(self, *args):
fss, ok = macfs.StandardGetFile() # Any file type pathname = EasyDialogs.AskFileForOpen() # Any file type
if not ok: if not pathname:
return return
bar = EasyDialogs.ProgressBar('Reading and converting...') bar = EasyDialogs.ProgressBar('Reading and converting...')
pathname = fss.as_pathname()
try: try:
rdr = img.reader(imgformat.macrgb16, pathname) rdr = img.reader(imgformat.macrgb16, pathname)
except img.error, arg: except img.error, arg:

12
Mac/Demo/mlte/mlted.py
View file

@ -11,7 +11,6 @@ from Carbon import Qd
from Carbon import Res from Carbon import Res
from Carbon import Scrap from Carbon import Scrap
import os import os
import macfs
from Carbon import MacTextEditor from Carbon import MacTextEditor
from Carbon import Mlte from Carbon import Mlte
@ -92,9 +91,9 @@ class MlteWindow(Window):
self.changed = 0 self.changed = 0
def menu_save_as(self): def menu_save_as(self):
fss, ok = macfs.StandardPutFile('Save as:') path = EasyDialogs.AskFileForSave(message='Save as:')
if not ok: return if not path: return
self.path = fss.as_pathname() self.path = path
self.name = os.path.split(self.path)[-1] self.name = os.path.split(self.path)[-1]
self.wid.SetWTitle(self.name) self.wid.SetWTitle(self.name)
self.menu_save() self.menu_save()
@ -268,10 +267,9 @@ class Mlted(Application):
def _open(self, askfile): def _open(self, askfile):
if askfile: if askfile:
fss, ok = macfs.StandardGetFile('TEXT') path = EasyDialogs.AskFileForOpen(typeList=('TEXT',))
if not ok: if not path:
return return
path = fss.as_pathname()
name = os.path.split(path)[-1] name = os.path.split(path)[-1]
try: try:
fp = open(path, 'rb') # NOTE binary, we need cr as end-of-line fp = open(path, 'rb') # NOTE binary, we need cr as end-of-line

7
Mac/Demo/quicktime/MovieInWindow.py
View file

@ -11,7 +11,8 @@ from Carbon import Evt
from Carbon import Events from Carbon import Events
from Carbon import Win from Carbon import Win
from Carbon import Windows from Carbon import Windows
import macfs from Carbon import File
import EasyDialogs
import sys import sys
@ -21,8 +22,8 @@ def main():
Qt.EnterMovies() Qt.EnterMovies()
# Get the movie file # Get the movie file
fss, ok = macfs.StandardGetFile() # Was: QuickTime.MovieFileType fss = EasyDialogs.AskFileForOpen(wanted=File.FSSpec) # Was: QuickTime.MovieFileType
if not ok: if not fss:
sys.exit(0) sys.exit(0)
# Open the window # Open the window

7
Mac/Demo/quicktime/VerySimplePlayer.py
View file

@ -11,7 +11,8 @@ from Carbon import Evt
from Carbon import Events from Carbon import Events
from Carbon import Win from Carbon import Win
from Carbon import Windows from Carbon import Windows
import macfs from Carbon import File
import EasyDialogs
import sys import sys
# XXXX maxbounds = (40, 40, 1000, 1000) # XXXX maxbounds = (40, 40, 1000, 1000)
@ -23,8 +24,8 @@ def main():
Qt.EnterMovies() Qt.EnterMovies()
# Get the movie file # Get the movie file
fss, ok = macfs.StandardGetFile(QuickTime.MovieFileType) fss = EasyDialogs.AskFileForOpen(wanted=File.FSSpec) # Was: QuickTime.MovieFileType
if not ok: if not fss:
sys.exit(0) sys.exit(0)
# Open the window # Open the window

11
Mac/Demo/textedit/ped.py
View file

@ -131,9 +131,9 @@ class TEWindow(ScrolledWindow):
self.changed = 0 self.changed = 0
def menu_save_as(self): def menu_save_as(self):
fss, ok = macfs.StandardPutFile('Save as:') path = EasyDialogs.AskFileForSave(message='Save as:')
if not ok: return if not path: return
self.path = fss.as_pathname() self.path = path
self.name = os.path.split(self.path)[-1] self.name = os.path.split(self.path)[-1]
self.wid.SetWTitle(self.name) self.wid.SetWTitle(self.name)
self.menu_save() self.menu_save()
@ -265,10 +265,9 @@ class Ped(Application):
def _open(self, askfile): def _open(self, askfile):
if askfile: if askfile:
fss, ok = macfs.StandardGetFile('TEXT') path = EasyDialogs.AskFileForOpen(typeList=('TEXT',))
if not ok: if not path:
return return
path = fss.as_pathname()
name = os.path.split(path)[-1] name = os.path.split(path)[-1]
try: try:
fp = open(path, 'rb') # NOTE binary, we need cr as end-of-line fp = open(path, 'rb') # NOTE binary, we need cr as end-of-line

25
Mac/Demo/waste/htmled.py
View file

@ -13,8 +13,8 @@ import waste
import WASTEconst import WASTEconst
from Carbon import Scrap from Carbon import Scrap
import os import os
import EasyDialogs
import macfs import macfs
import MACFS
import string import string
import htmllib import htmllib
@ -243,7 +243,7 @@ class WasteWindow(ScrolledWindow):
try: try:
rf = Res.FSpOpenResFile(self.path, 3) rf = Res.FSpOpenResFile(self.path, 3)
except Res.Error: except Res.Error:
Res.FSpCreateResFile(self.path, '????', 'TEXT', MACFS.smAllScripts) Res.FSpCreateResFile(self.path, '????', 'TEXT', macfs.smAllScripts)
rf = Res.FSpOpenResFile(self.path, 3) rf = Res.FSpOpenResFile(self.path, 3)
styles = Res.Resource('') styles = Res.Resource('')
soup = Res.Resource('') soup = Res.Resource('')
@ -256,9 +256,9 @@ class WasteWindow(ScrolledWindow):
self.ted.WEResetModCount() self.ted.WEResetModCount()
def menu_save_as(self): def menu_save_as(self):
fss, ok = macfs.StandardPutFile('Save as:') path = EasyDialogs.AskFileForSave(message='Save as:')
if not ok: return if not path: return
self.path = fss.as_pathname() self.path = path
self.name = os.path.split(self.path)[-1] self.name = os.path.split(self.path)[-1]
self.wid.SetWTitle(self.name) self.wid.SetWTitle(self.name)
self.menu_save() self.menu_save()
@ -661,10 +661,9 @@ class Wed(Application):
def _open(self, askfile): def _open(self, askfile):
if askfile: if askfile:
fss, ok = macfs.StandardGetFile('TEXT') path = EasyDialogs.AskFileForOpen(typeList=('TEXT',))
if not ok: if not path:
return return
path = fss.as_pathname()
name = os.path.split(path)[-1] name = os.path.split(path)[-1]
try: try:
fp = open(path, 'rb') # NOTE binary, we need cr as end-of-line fp = open(path, 'rb') # NOTE binary, we need cr as end-of-line
@ -683,10 +682,9 @@ class Wed(Application):
def insertfile(self, *args): def insertfile(self, *args):
if self.active: if self.active:
fss, ok = macfs.StandardGetFile('TEXT') path = EasyDialogs.AskFileForOpen(typeList=('TEXT',))
if not ok: if not path:
return return
path = fss.as_pathname()
try: try:
fp = open(path, 'rb') # NOTE binary, we need cr as end-of-line fp = open(path, 'rb') # NOTE binary, we need cr as end-of-line
except IOError, arg: except IOError, arg:
@ -698,10 +696,9 @@ class Wed(Application):
def inserthtml(self, *args): def inserthtml(self, *args):
if self.active: if self.active:
fss, ok = macfs.StandardGetFile('TEXT') path = EasyDialogs.AskFileForOpen(typeList=('TEXT',))
if not ok: if not path:
return return
path = fss.as_pathname()
try: try:
fp = open(path, 'r') fp = open(path, 'r')
except IOError, arg: except IOError, arg:

14
Mac/Demo/waste/swed.py
View file

@ -14,7 +14,6 @@ import WASTEconst
from Carbon import Scrap from Carbon import Scrap
import os import os
import macfs import macfs
import MACFS
UNDOLABELS = [ # Indexed by WEGetUndoInfo() value UNDOLABELS = [ # Indexed by WEGetUndoInfo() value
None, "", "typing", "Cut", "Paste", "Clear", "Drag", "Style"] None, "", "typing", "Cut", "Paste", "Clear", "Drag", "Style"]
@ -213,7 +212,7 @@ class WasteWindow(ScrolledWindow):
try: try:
rf = Res.FSpOpenResFile(self.path, 3) rf = Res.FSpOpenResFile(self.path, 3)
except Res.Error: except Res.Error:
Res.FSpCreateResFile(self.path, '????', 'TEXT', MACFS.smAllScripts) Res.FSpCreateResFile(self.path, '????', 'TEXT', macfs.smAllScripts)
rf = Res.FSpOpenResFile(self.path, 3) rf = Res.FSpOpenResFile(self.path, 3)
styles = Res.Resource('') styles = Res.Resource('')
soup = Res.Resource('') soup = Res.Resource('')
@ -226,9 +225,9 @@ class WasteWindow(ScrolledWindow):
self.ted.WEResetModCount() self.ted.WEResetModCount()
def menu_save_as(self): def menu_save_as(self):
fss, ok = macfs.StandardPutFile('Save as:') path = EasyDialogs.AskFileForSave(message='Save as:')
if not ok: return if not path: return
self.path = fss.as_pathname() self.path = path
self.name = os.path.split(self.path)[-1] self.name = os.path.split(self.path)[-1]
self.wid.SetWTitle(self.name) self.wid.SetWTitle(self.name)
self.menu_save() self.menu_save()
@ -521,10 +520,9 @@ class Wed(Application):
def _open(self, askfile): def _open(self, askfile):
if askfile: if askfile:
fss, ok = macfs.StandardGetFile('TEXT') path = EasyDialogs.AskFileForOpen(typeList=('TEXT',))
if not ok: if not path:
return return
path = fss.as_pathname()
name = os.path.split(path)[-1] name = os.path.split(path)[-1]
try: try:
fp = open(path, 'rb') # NOTE binary, we need cr as end-of-line fp = open(path, 'rb') # NOTE binary, we need cr as end-of-line

13
Mac/Demo/waste/wed.py
View file

@ -12,7 +12,7 @@ import waste
import WASTEconst import WASTEconst
from Carbon import Scrap from Carbon import Scrap
import os import os
import macfs import EasyDialogs
UNDOLABELS = [ # Indexed by WEGetUndoInfo() value UNDOLABELS = [ # Indexed by WEGetUndoInfo() value
None, "", "typing", "Cut", "Paste", "Clear", "Drag", "Style"] None, "", "typing", "Cut", "Paste", "Clear", "Drag", "Style"]
@ -181,9 +181,9 @@ class WasteWindow(ScrolledWindow):
self.changed = 0 self.changed = 0
def menu_save_as(self): def menu_save_as(self):
fss, ok = macfs.StandardPutFile('Save as:') path = EasyDialogs.AskFileForSave(message='Save as:')
if not ok: return if not path: return
self.path = fss.as_pathname() self.path = path
self.name = os.path.split(self.path)[-1] self.name = os.path.split(self.path)[-1]
self.wid.SetWTitle(self.name) self.wid.SetWTitle(self.name)
self.menu_save() self.menu_save()
@ -329,10 +329,9 @@ class Wed(Application):
def _open(self, askfile): def _open(self, askfile):
if askfile: if askfile:
fss, ok = macfs.StandardGetFile('TEXT') path = EasyDialogs.AskFileForOpen(typeList=('TEXT',))
if not ok: if not path:
return return
path = fss.as_pathname()
name = os.path.split(path)[-1] name = os.path.split(path)[-1]
try: try:
fp = open(path, 'rb') # NOTE binary, we need cr as end-of-line fp = open(path, 'rb') # NOTE binary, we need cr as end-of-line

6
Mac/Tools/macfreeze/macgen_bin.py
View file

@ -205,10 +205,10 @@ def findpythoncore():
raise "Unknown MacOS.runtimemodel", MacOS.runtimemodel raise "Unknown MacOS.runtimemodel", MacOS.runtimemodel
corepath = os.path.join(extpath, corename) corepath = os.path.join(extpath, corename)
if not os.path.exists(corepath): if not os.path.exists(corepath):
fss, ok = macfs.PromptGetFile("Please locate PythonCore:", "shlb") corepath = EasyDialogs.AskFileForOpen(message="Please locate PythonCore:",
if not ok: typeList=("shlb",))
if not corepath:
raise KeyboardInterrupt, "cancelled" raise KeyboardInterrupt, "cancelled"
corepath = fss.as_pathname()
return resolvealiasfile(corepath) return resolvealiasfile(corepath)
def resolvealiasfile(path): def resolvealiasfile(path):

3
Mac/scripts/EditPythonPrefs.py
View file

@ -159,7 +159,8 @@ def interact(options, title):
## if n == REVERT_ITEM: ## if n == REVERT_ITEM:
## return [], pythondir ## return [], pythondir
if n == DIR_ITEM: if n == DIR_ITEM:
fss, ok = macfs.GetDirectory('Select python home folder:') fss = EasyDialogs.AskFolder(message='Select python home folder:',
wanted=macfs.FSSpec)
if ok: if ok:
options['dir'] = fss options['dir'] = fss
elif n == HELP_ITEM and Help: elif n == HELP_ITEM and Help:

7
Mac/scripts/findgremlins.py
View file

@ -4,6 +4,7 @@ the filename and a bit of context.
By Just, with a little glue by Jack""" By Just, with a little glue by Jack"""
import EasyDialogs
import macfs import macfs
import re import re
import os import os
@ -43,9 +44,9 @@ def walk(top, recurse=1):
pos = j pos = j
def main(): def main():
fss, ok = macfs.GetDirectory() pathname = EasyDialogs.AskFolder()
if ok: if pathname:
walk(fss.as_pathname()) walk(pathname)
if __name__ == '__main__': if __name__ == '__main__':
main() main()

7
Mac/scripts/fixfiletypes.py
View file

@ -9,6 +9,7 @@
# #
import os import os
import macfs import macfs
import EasyDialogs
import sys import sys
import macostools import macostools
@ -45,10 +46,10 @@ def walktree(name, change):
walktree(os.path.join(name, f), change) walktree(os.path.join(name, f), change)
def run(change): def run(change):
fss, ok = macfs.GetDirectory('Folder to search:') pathname = EasyDialogs.AskFolder(message='Folder to search:')
if not ok: if not pathname:
sys.exit(0) sys.exit(0)
walktree(fss.as_pathname(), change) walktree(pathname, change)
if __name__ == '__main__': if __name__ == '__main__':
run(1) run(1)

5
Mac/scripts/fullbuild.py
View file

@ -410,10 +410,9 @@ def incbuildno(filename):
def main(): def main():
macresource.need('DLOG', DIALOG_ID, 'fullbuild.rsrc') macresource.need('DLOG', DIALOG_ID, 'fullbuild.rsrc')
dir, ok = macfs.GetDirectory('Python source folder:') dir = EasyDialogs.AskFolder(message='Python source folder:')
if not ok: if not dir:
sys.exit(0) sys.exit(0)
dir = dir.as_pathname()
# Set genpluginprojects to use this folder (slight hack) # Set genpluginprojects to use this folder (slight hack)
genpluginprojects.PYTHONDIR = dir genpluginprojects.PYTHONDIR = dir

7
Mac/scripts/makeclean.py
View file

@ -12,6 +12,7 @@
""" """
import macfs import macfs
import EasyDialogs
import os import os
import sys import sys
import re import re
@ -53,7 +54,7 @@ def walk(top):
remove(top) remove(top)
fss, ok = macfs.GetDirectory("Please locate the Python home directory") pathname = EasyDialogs.AskFolder(message="Please locate the Python home directory")
if ok: if pathname:
walk(fss.as_pathname()) walk(pathname)
sys.exit(1) # so we see the results sys.exit(1) # so we see the results

12
Mac/scripts/unshar.py
View file

@ -6,6 +6,7 @@
# >>> unshar.unshar(f) # >>> unshar.unshar(f)
import string import string
import EasyDialogs
def unshar(fp, verbose=0, overwrite=0): def unshar(fp, verbose=0, overwrite=0):
ofp = None ofp = None
@ -82,15 +83,14 @@ def main():
unshar(fp) unshar(fp)
else: else:
import macfs import macfs
fss, ok = macfs.StandardGetFile('TEXT') fname = EasyDialogs.AskFileForOpen()
if not ok: if not fname:
sys.exit(0) sys.exit(0)
fname = fss.as_pathname()
fp = open(fname, 'r') fp = open(fname, 'r')
fss, ok = macfs.GetDirectory('Folder to save files in:') dirname = EasyDialogs.AskFolder(message='Folder to save files in:')
if not ok: if not dirname:
sys.exit(0) sys.exit(0)
os.chdir(fss.as_pathname()) os.chdir(dirname)
unshar(fp) unshar(fp)
if __name__ == '__main__': if __name__ == '__main__':

6
Mac/scripts/zappycfiles.py
View file

@ -2,6 +2,7 @@
"""Recursively zap all .pyc and .pyo files""" """Recursively zap all .pyc and .pyo files"""
import os import os
import sys import sys
import EasyDialogs
# set doit true to actually delete files # set doit true to actually delete files
# set doit false to just print what would be deleted # set doit false to just print what would be deleted
@ -11,10 +12,9 @@ def main():
if not sys.argv[1:]: if not sys.argv[1:]:
if os.name == 'mac': if os.name == 'mac':
import macfs import macfs
fss, ok = macfs.GetDirectory('Directory to zap pyc files in') dir = EasyDialogs.AskFolder(message='Directory to zap pyc files in')
if not ok: if not dir:
sys.exit(0) sys.exit(0)
dir = fss.as_pathname()
zappyc(dir) zappyc(dir)
else: else:
print 'Usage: zappyc dir ...' print 'Usage: zappyc dir ...'