mirror of
https://github.com/python/cpython.git
synced 2025-07-24 03:35:53 +00:00
Use new file dialogs.
This commit is contained in:
parent
d9db3a6713
commit
b340acf9fd
16 changed files with 72 additions and 78 deletions
|
@ -1,4 +1,4 @@
|
|||
GetPortBounds()"""imgbrowse - Display pictures using img"""
|
||||
"""imgbrowse - Display pictures using img"""
|
||||
|
||||
import FrameWork
|
||||
import EasyDialogs
|
||||
|
@ -11,7 +11,6 @@ import sys
|
|||
import struct
|
||||
import img
|
||||
import imgformat
|
||||
import macfs
|
||||
import struct
|
||||
import mac_image
|
||||
|
||||
|
@ -47,11 +46,10 @@ class imgbrowse(FrameWork.Application):
|
|||
self._quit()
|
||||
|
||||
def opendoc(self, *args):
|
||||
fss, ok = macfs.StandardGetFile() # Any file type
|
||||
if not ok:
|
||||
pathname = EasyDialogs.AskFileForOpen() # Any file type
|
||||
if not pathname:
|
||||
return
|
||||
bar = EasyDialogs.ProgressBar('Reading and converting...')
|
||||
pathname = fss.as_pathname()
|
||||
try:
|
||||
rdr = img.reader(imgformat.macrgb16, pathname)
|
||||
except img.error, arg:
|
||||
|
|
|
@ -11,7 +11,6 @@ from Carbon import Qd
|
|||
from Carbon import Res
|
||||
from Carbon import Scrap
|
||||
import os
|
||||
import macfs
|
||||
from Carbon import MacTextEditor
|
||||
from Carbon import Mlte
|
||||
|
||||
|
@ -92,9 +91,9 @@ class MlteWindow(Window):
|
|||
self.changed = 0
|
||||
|
||||
def menu_save_as(self):
|
||||
fss, ok = macfs.StandardPutFile('Save as:')
|
||||
if not ok: return
|
||||
self.path = fss.as_pathname()
|
||||
path = EasyDialogs.AskFileForSave(message='Save as:')
|
||||
if not path: return
|
||||
self.path = path
|
||||
self.name = os.path.split(self.path)[-1]
|
||||
self.wid.SetWTitle(self.name)
|
||||
self.menu_save()
|
||||
|
@ -268,10 +267,9 @@ class Mlted(Application):
|
|||
|
||||
def _open(self, askfile):
|
||||
if askfile:
|
||||
fss, ok = macfs.StandardGetFile('TEXT')
|
||||
if not ok:
|
||||
path = EasyDialogs.AskFileForOpen(typeList=('TEXT',))
|
||||
if not path:
|
||||
return
|
||||
path = fss.as_pathname()
|
||||
name = os.path.split(path)[-1]
|
||||
try:
|
||||
fp = open(path, 'rb') # NOTE binary, we need cr as end-of-line
|
||||
|
|
|
@ -11,7 +11,8 @@ from Carbon import Evt
|
|||
from Carbon import Events
|
||||
from Carbon import Win
|
||||
from Carbon import Windows
|
||||
import macfs
|
||||
from Carbon import File
|
||||
import EasyDialogs
|
||||
import sys
|
||||
|
||||
|
||||
|
@ -21,8 +22,8 @@ def main():
|
|||
Qt.EnterMovies()
|
||||
|
||||
# Get the movie file
|
||||
fss, ok = macfs.StandardGetFile() # Was: QuickTime.MovieFileType
|
||||
if not ok:
|
||||
fss = EasyDialogs.AskFileForOpen(wanted=File.FSSpec) # Was: QuickTime.MovieFileType
|
||||
if not fss:
|
||||
sys.exit(0)
|
||||
|
||||
# Open the window
|
||||
|
|
|
@ -11,7 +11,8 @@ from Carbon import Evt
|
|||
from Carbon import Events
|
||||
from Carbon import Win
|
||||
from Carbon import Windows
|
||||
import macfs
|
||||
from Carbon import File
|
||||
import EasyDialogs
|
||||
import sys
|
||||
|
||||
# XXXX maxbounds = (40, 40, 1000, 1000)
|
||||
|
@ -23,8 +24,8 @@ def main():
|
|||
Qt.EnterMovies()
|
||||
|
||||
# Get the movie file
|
||||
fss, ok = macfs.StandardGetFile(QuickTime.MovieFileType)
|
||||
if not ok:
|
||||
fss = EasyDialogs.AskFileForOpen(wanted=File.FSSpec) # Was: QuickTime.MovieFileType
|
||||
if not fss:
|
||||
sys.exit(0)
|
||||
|
||||
# Open the window
|
||||
|
|
|
@ -131,9 +131,9 @@ class TEWindow(ScrolledWindow):
|
|||
self.changed = 0
|
||||
|
||||
def menu_save_as(self):
|
||||
fss, ok = macfs.StandardPutFile('Save as:')
|
||||
if not ok: return
|
||||
self.path = fss.as_pathname()
|
||||
path = EasyDialogs.AskFileForSave(message='Save as:')
|
||||
if not path: return
|
||||
self.path = path
|
||||
self.name = os.path.split(self.path)[-1]
|
||||
self.wid.SetWTitle(self.name)
|
||||
self.menu_save()
|
||||
|
@ -265,10 +265,9 @@ class Ped(Application):
|
|||
|
||||
def _open(self, askfile):
|
||||
if askfile:
|
||||
fss, ok = macfs.StandardGetFile('TEXT')
|
||||
if not ok:
|
||||
path = EasyDialogs.AskFileForOpen(typeList=('TEXT',))
|
||||
if not path:
|
||||
return
|
||||
path = fss.as_pathname()
|
||||
name = os.path.split(path)[-1]
|
||||
try:
|
||||
fp = open(path, 'rb') # NOTE binary, we need cr as end-of-line
|
||||
|
|
|
@ -13,8 +13,8 @@ import waste
|
|||
import WASTEconst
|
||||
from Carbon import Scrap
|
||||
import os
|
||||
import EasyDialogs
|
||||
import macfs
|
||||
import MACFS
|
||||
import string
|
||||
import htmllib
|
||||
|
||||
|
@ -243,7 +243,7 @@ class WasteWindow(ScrolledWindow):
|
|||
try:
|
||||
rf = Res.FSpOpenResFile(self.path, 3)
|
||||
except Res.Error:
|
||||
Res.FSpCreateResFile(self.path, '????', 'TEXT', MACFS.smAllScripts)
|
||||
Res.FSpCreateResFile(self.path, '????', 'TEXT', macfs.smAllScripts)
|
||||
rf = Res.FSpOpenResFile(self.path, 3)
|
||||
styles = Res.Resource('')
|
||||
soup = Res.Resource('')
|
||||
|
@ -256,9 +256,9 @@ class WasteWindow(ScrolledWindow):
|
|||
self.ted.WEResetModCount()
|
||||
|
||||
def menu_save_as(self):
|
||||
fss, ok = macfs.StandardPutFile('Save as:')
|
||||
if not ok: return
|
||||
self.path = fss.as_pathname()
|
||||
path = EasyDialogs.AskFileForSave(message='Save as:')
|
||||
if not path: return
|
||||
self.path = path
|
||||
self.name = os.path.split(self.path)[-1]
|
||||
self.wid.SetWTitle(self.name)
|
||||
self.menu_save()
|
||||
|
@ -661,10 +661,9 @@ class Wed(Application):
|
|||
|
||||
def _open(self, askfile):
|
||||
if askfile:
|
||||
fss, ok = macfs.StandardGetFile('TEXT')
|
||||
if not ok:
|
||||
path = EasyDialogs.AskFileForOpen(typeList=('TEXT',))
|
||||
if not path:
|
||||
return
|
||||
path = fss.as_pathname()
|
||||
name = os.path.split(path)[-1]
|
||||
try:
|
||||
fp = open(path, 'rb') # NOTE binary, we need cr as end-of-line
|
||||
|
@ -683,10 +682,9 @@ class Wed(Application):
|
|||
|
||||
def insertfile(self, *args):
|
||||
if self.active:
|
||||
fss, ok = macfs.StandardGetFile('TEXT')
|
||||
if not ok:
|
||||
path = EasyDialogs.AskFileForOpen(typeList=('TEXT',))
|
||||
if not path:
|
||||
return
|
||||
path = fss.as_pathname()
|
||||
try:
|
||||
fp = open(path, 'rb') # NOTE binary, we need cr as end-of-line
|
||||
except IOError, arg:
|
||||
|
@ -698,10 +696,9 @@ class Wed(Application):
|
|||
|
||||
def inserthtml(self, *args):
|
||||
if self.active:
|
||||
fss, ok = macfs.StandardGetFile('TEXT')
|
||||
if not ok:
|
||||
path = EasyDialogs.AskFileForOpen(typeList=('TEXT',))
|
||||
if not path:
|
||||
return
|
||||
path = fss.as_pathname()
|
||||
try:
|
||||
fp = open(path, 'r')
|
||||
except IOError, arg:
|
||||
|
|
|
@ -14,7 +14,6 @@ import WASTEconst
|
|||
from Carbon import Scrap
|
||||
import os
|
||||
import macfs
|
||||
import MACFS
|
||||
|
||||
UNDOLABELS = [ # Indexed by WEGetUndoInfo() value
|
||||
None, "", "typing", "Cut", "Paste", "Clear", "Drag", "Style"]
|
||||
|
@ -213,7 +212,7 @@ class WasteWindow(ScrolledWindow):
|
|||
try:
|
||||
rf = Res.FSpOpenResFile(self.path, 3)
|
||||
except Res.Error:
|
||||
Res.FSpCreateResFile(self.path, '????', 'TEXT', MACFS.smAllScripts)
|
||||
Res.FSpCreateResFile(self.path, '????', 'TEXT', macfs.smAllScripts)
|
||||
rf = Res.FSpOpenResFile(self.path, 3)
|
||||
styles = Res.Resource('')
|
||||
soup = Res.Resource('')
|
||||
|
@ -226,9 +225,9 @@ class WasteWindow(ScrolledWindow):
|
|||
self.ted.WEResetModCount()
|
||||
|
||||
def menu_save_as(self):
|
||||
fss, ok = macfs.StandardPutFile('Save as:')
|
||||
if not ok: return
|
||||
self.path = fss.as_pathname()
|
||||
path = EasyDialogs.AskFileForSave(message='Save as:')
|
||||
if not path: return
|
||||
self.path = path
|
||||
self.name = os.path.split(self.path)[-1]
|
||||
self.wid.SetWTitle(self.name)
|
||||
self.menu_save()
|
||||
|
@ -521,10 +520,9 @@ class Wed(Application):
|
|||
|
||||
def _open(self, askfile):
|
||||
if askfile:
|
||||
fss, ok = macfs.StandardGetFile('TEXT')
|
||||
if not ok:
|
||||
path = EasyDialogs.AskFileForOpen(typeList=('TEXT',))
|
||||
if not path:
|
||||
return
|
||||
path = fss.as_pathname()
|
||||
name = os.path.split(path)[-1]
|
||||
try:
|
||||
fp = open(path, 'rb') # NOTE binary, we need cr as end-of-line
|
||||
|
|
|
@ -12,7 +12,7 @@ import waste
|
|||
import WASTEconst
|
||||
from Carbon import Scrap
|
||||
import os
|
||||
import macfs
|
||||
import EasyDialogs
|
||||
|
||||
UNDOLABELS = [ # Indexed by WEGetUndoInfo() value
|
||||
None, "", "typing", "Cut", "Paste", "Clear", "Drag", "Style"]
|
||||
|
@ -181,9 +181,9 @@ class WasteWindow(ScrolledWindow):
|
|||
self.changed = 0
|
||||
|
||||
def menu_save_as(self):
|
||||
fss, ok = macfs.StandardPutFile('Save as:')
|
||||
if not ok: return
|
||||
self.path = fss.as_pathname()
|
||||
path = EasyDialogs.AskFileForSave(message='Save as:')
|
||||
if not path: return
|
||||
self.path = path
|
||||
self.name = os.path.split(self.path)[-1]
|
||||
self.wid.SetWTitle(self.name)
|
||||
self.menu_save()
|
||||
|
@ -329,10 +329,9 @@ class Wed(Application):
|
|||
|
||||
def _open(self, askfile):
|
||||
if askfile:
|
||||
fss, ok = macfs.StandardGetFile('TEXT')
|
||||
if not ok:
|
||||
path = EasyDialogs.AskFileForOpen(typeList=('TEXT',))
|
||||
if not path:
|
||||
return
|
||||
path = fss.as_pathname()
|
||||
name = os.path.split(path)[-1]
|
||||
try:
|
||||
fp = open(path, 'rb') # NOTE binary, we need cr as end-of-line
|
||||
|
|
|
@ -205,10 +205,10 @@ def findpythoncore():
|
|||
raise "Unknown MacOS.runtimemodel", MacOS.runtimemodel
|
||||
corepath = os.path.join(extpath, corename)
|
||||
if not os.path.exists(corepath):
|
||||
fss, ok = macfs.PromptGetFile("Please locate PythonCore:", "shlb")
|
||||
if not ok:
|
||||
corepath = EasyDialogs.AskFileForOpen(message="Please locate PythonCore:",
|
||||
typeList=("shlb",))
|
||||
if not corepath:
|
||||
raise KeyboardInterrupt, "cancelled"
|
||||
corepath = fss.as_pathname()
|
||||
return resolvealiasfile(corepath)
|
||||
|
||||
def resolvealiasfile(path):
|
||||
|
|
|
@ -159,7 +159,8 @@ def interact(options, title):
|
|||
## if n == REVERT_ITEM:
|
||||
## return [], pythondir
|
||||
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:
|
||||
options['dir'] = fss
|
||||
elif n == HELP_ITEM and Help:
|
||||
|
|
|
@ -4,6 +4,7 @@ the filename and a bit of context.
|
|||
|
||||
By Just, with a little glue by Jack"""
|
||||
|
||||
import EasyDialogs
|
||||
import macfs
|
||||
import re
|
||||
import os
|
||||
|
@ -43,9 +44,9 @@ def walk(top, recurse=1):
|
|||
pos = j
|
||||
|
||||
def main():
|
||||
fss, ok = macfs.GetDirectory()
|
||||
if ok:
|
||||
walk(fss.as_pathname())
|
||||
pathname = EasyDialogs.AskFolder()
|
||||
if pathname:
|
||||
walk(pathname)
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
|
|
|
@ -9,6 +9,7 @@
|
|||
#
|
||||
import os
|
||||
import macfs
|
||||
import EasyDialogs
|
||||
import sys
|
||||
import macostools
|
||||
|
||||
|
@ -45,10 +46,10 @@ def walktree(name, change):
|
|||
walktree(os.path.join(name, f), change)
|
||||
|
||||
def run(change):
|
||||
fss, ok = macfs.GetDirectory('Folder to search:')
|
||||
if not ok:
|
||||
pathname = EasyDialogs.AskFolder(message='Folder to search:')
|
||||
if not pathname:
|
||||
sys.exit(0)
|
||||
walktree(fss.as_pathname(), change)
|
||||
walktree(pathname, change)
|
||||
|
||||
if __name__ == '__main__':
|
||||
run(1)
|
||||
|
|
|
@ -410,10 +410,9 @@ def incbuildno(filename):
|
|||
|
||||
def main():
|
||||
macresource.need('DLOG', DIALOG_ID, 'fullbuild.rsrc')
|
||||
dir, ok = macfs.GetDirectory('Python source folder:')
|
||||
if not ok:
|
||||
dir = EasyDialogs.AskFolder(message='Python source folder:')
|
||||
if not dir:
|
||||
sys.exit(0)
|
||||
dir = dir.as_pathname()
|
||||
# Set genpluginprojects to use this folder (slight hack)
|
||||
genpluginprojects.PYTHONDIR = dir
|
||||
|
||||
|
|
|
@ -12,6 +12,7 @@
|
|||
"""
|
||||
|
||||
import macfs
|
||||
import EasyDialogs
|
||||
import os
|
||||
import sys
|
||||
import re
|
||||
|
@ -53,7 +54,7 @@ def walk(top):
|
|||
remove(top)
|
||||
|
||||
|
||||
fss, ok = macfs.GetDirectory("Please locate the Python home directory")
|
||||
if ok:
|
||||
walk(fss.as_pathname())
|
||||
pathname = EasyDialogs.AskFolder(message="Please locate the Python home directory")
|
||||
if pathname:
|
||||
walk(pathname)
|
||||
sys.exit(1) # so we see the results
|
||||
|
|
|
@ -6,6 +6,7 @@
|
|||
# >>> unshar.unshar(f)
|
||||
|
||||
import string
|
||||
import EasyDialogs
|
||||
|
||||
def unshar(fp, verbose=0, overwrite=0):
|
||||
ofp = None
|
||||
|
@ -82,15 +83,14 @@ def main():
|
|||
unshar(fp)
|
||||
else:
|
||||
import macfs
|
||||
fss, ok = macfs.StandardGetFile('TEXT')
|
||||
if not ok:
|
||||
fname = EasyDialogs.AskFileForOpen()
|
||||
if not fname:
|
||||
sys.exit(0)
|
||||
fname = fss.as_pathname()
|
||||
fp = open(fname, 'r')
|
||||
fss, ok = macfs.GetDirectory('Folder to save files in:')
|
||||
if not ok:
|
||||
dirname = EasyDialogs.AskFolder(message='Folder to save files in:')
|
||||
if not dirname:
|
||||
sys.exit(0)
|
||||
os.chdir(fss.as_pathname())
|
||||
os.chdir(dirname)
|
||||
unshar(fp)
|
||||
|
||||
if __name__ == '__main__':
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
"""Recursively zap all .pyc and .pyo files"""
|
||||
import os
|
||||
import sys
|
||||
import EasyDialogs
|
||||
|
||||
# set doit true to actually delete files
|
||||
# set doit false to just print what would be deleted
|
||||
|
@ -11,10 +12,9 @@ def main():
|
|||
if not sys.argv[1:]:
|
||||
if os.name == 'mac':
|
||||
import macfs
|
||||
fss, ok = macfs.GetDirectory('Directory to zap pyc files in')
|
||||
if not ok:
|
||||
dir = EasyDialogs.AskFolder(message='Directory to zap pyc files in')
|
||||
if not dir:
|
||||
sys.exit(0)
|
||||
dir = fss.as_pathname()
|
||||
zappyc(dir)
|
||||
else:
|
||||
print 'Usage: zappyc dir ...'
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue