Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit fd0b00e

Browse files
jackjansenjackjansen
committed
Use new file dialogs.
1 parent 2373ff4 commit fd0b00e

5 files changed

Lines changed: 30 additions & 29 deletions

File tree

‎Mac/Tools/IDE/ProfileBrowser.py‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import W
22
from Carbon import Evt
3+
import EasyDialogs
34

45
import sys
56
import StringIO
@@ -83,9 +84,9 @@ def main():
8384
browser = ProfileBrowser(stats)
8485
else:
8586
import macfs
86-
fss, ok = macfs.PromptGetFile('Profiler data')
87-
if not ok: sys.exit(0)
88-
stats = pstats.Stats(fss.as_pathname())
87+
filename = EasyDialogs.AskFileForOpen(message='Profiler data')
88+
if not filename: sys.exit(0)
89+
stats = pstats.Stats(filename)
8990
browser = ProfileBrowser(stats)
9091

9192
if __name__ == '__main__':

‎Mac/Tools/IDE/PyConsole.py‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import MacOS
1111
import MacPrefs
1212
from Carbon import Qd
13+
import EasyDialogs
1314
import PyInteractive
1415

1516
if not hasattr(sys, 'ps1'):
@@ -85,10 +86,11 @@ def key(self, char, event):
8586

8687
def domenu_save_as(self, *args):
8788
import macfs
88-
fss, ok = macfs.StandardPutFile('Save console text as:', 'console.txt')
89-
if not ok:
89+
filename = EasyDialogs.AskFileForSave(message='Save console text as:',
90+
savedFileName='console.txt')
91+
if not filename:
9092
return
91-
f = open(fss.as_pathname(), 'wb')
93+
f = open(filename, 'wb')
9294
f.write(self.get())
9395
f.close()
9496
fss.SetCreatorType(W._signature, 'TEXT')
@@ -241,10 +243,11 @@ class OutputTextWidget(W.EditText):
241243
def domenu_save_as(self, *args):
242244
title = self._parentwindow.gettitle()
243245
import macfs
244-
fss, ok = macfs.StandardPutFile('Save %s text as:' % title, title + '.txt')
245-
if not ok:
246+
filename = EasyDialogs.AskFileForSave(message='Save %s text as:' % title,
247+
savedFileName=title + '.txt')
248+
if not filename:
246249
return
247-
f = open(fss.as_pathname(), 'wb')
250+
f = open(filename, 'wb')
248251
f.write(self.get())
249252
f.close()
250253
fss.SetCreatorType(W._signature, 'TEXT')

‎Mac/Tools/IDE/PyDocSearch.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import MacOS
77
import string
88
import webbrowser
9+
import EasyDialogs
910

1011

1112
app = W.getapplication()
@@ -223,9 +224,8 @@ def search(self):
223224
MacOS.SysBeep(0)
224225

225226
def setdocpath(self):
226-
fss, ok = macfs.GetDirectory()
227-
if ok:
228-
docpath = fss.as_pathname()
227+
docpath = EasyDialogs.AskFolder()
228+
if docpath:
229229
if not verifydocpath(docpath):
230230
W.Message("This does not seem to be a Python documentation folder...")
231231
else:

‎Mac/Tools/IDE/PyEdit.py‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import macfs
88
import MACFS
99
import MacOS
10+
import EasyDialogs
1011
from Carbon import Win
1112
from Carbon import Res
1213
from Carbon import Evt
@@ -67,7 +68,6 @@ def __init__(self, path = "", title = ""):
6768
self.path = path
6869

6970
if '\n' in text:
70-
import EasyDialogs
7171
if string.find(text, '\r\n') >= 0:
7272
self._eoln = '\r\n'
7373
else:
@@ -365,7 +365,6 @@ def setinfotext(self):
365365

366366
def close(self):
367367
if self.editgroup.editor.changed:
368-
import EasyDialogs
369368
Qd.InitCursor()
370369
save = EasyDialogs.AskYesNoCancel('Save window "%s" before closing?' % self.title,
371370
default=1, no="Don\xd5t save")
@@ -406,11 +405,11 @@ def can_save(self, menuitem):
406405
return self.editgroup.editor.changed or self.editgroup.editor.selchanged
407406

408407
def domenu_save_as(self, *args):
409-
fss, ok = macfs.StandardPutFile('Save as:', self.title)
410-
if not ok:
408+
path = EasyDialogs.AskFileForSave(message='Save as:', savedFileName=self.title)
409+
if not path:
411410
return 1
412411
self.showbreakpoints(0)
413-
self.path = fss.as_pathname()
412+
self.path = path
414413
self.setinfotext()
415414
self.title = os.path.split(self.path)[-1]
416415
self.wid.SetWTitle(self.title)
@@ -434,11 +433,11 @@ def domenu_save_as_applet(self, *args):
434433
destname = self.title[:-3]
435434
else:
436435
destname = self.title + ".applet"
437-
fss, ok = macfs.StandardPutFile('Save as Applet:', destname)
438-
if not ok:
436+
destname = EasyDialogs.AskFileForSave(message='Save as Applet:',
437+
savedFileName=destname)
438+
if not destname:
439439
return 1
440440
W.SetCursor("watch")
441-
destname = fss.as_pathname()
442441
if self.path:
443442
filename = self.path
444443
if filename[-3:] == ".py":
@@ -508,7 +507,6 @@ def run(self):
508507
def _run(self):
509508
if self.run_with_interpreter:
510509
if self.editgroup.editor.changed:
511-
import EasyDialogs
512510
Qd.InitCursor()
513511
save = EasyDialogs.AskYesNoCancel('Save "%s" before running?' % self.title, 1)
514512
if save > 0:
@@ -521,7 +519,6 @@ def _run(self):
521519
self._run_with_interpreter()
522520
elif self.run_with_cl_interpreter:
523521
if self.editgroup.editor.changed:
524-
import EasyDialogs
525522
Qd.InitCursor()
526523
save = EasyDialogs.AskYesNoCancel('Save "%s" before running?' % self.title, 1)
527524
if save > 0:
@@ -1025,7 +1022,6 @@ def replaceall(self):
10251022
W.SetCursor("arrow")
10261023
if counter:
10271024
self.hide()
1028-
import EasyDialogs
10291025
from Carbon import Res
10301026
editor.textchanged()
10311027
editor.selectionchanged()

‎Mac/Tools/IDE/PythonIDEMain.py‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import sys
1010
import macfs
1111
import MacOS
12+
import EasyDialogs
1213

1314
if MacOS.runtimemodel == 'macho':
1415
ELIPSES = '...'
@@ -189,8 +190,9 @@ def do_about(self, id, item, window, event):
189190
Splash.about()
190191

191192
def do_setscriptsfolder(self, *args):
192-
fss, ok = macfs.GetDirectory("Select Scripts Folder")
193-
if ok:
193+
fss = EasyDialogs.AskFolder(message="Select Scripts Folder",
194+
wanted=macfs.FSSpec)
195+
if fss:
194196
prefs = self.getprefs()
195197
alis = fss.NewAlias()
196198
prefs.scriptsfolder = alis.data
@@ -204,9 +206,9 @@ def domenu_modulebrowser(self, *args):
204206
ModuleBrowser.ModuleBrowser()
205207

206208
def domenu_open(self, *args):
207-
fss, ok = macfs.StandardGetFile("TEXT")
208-
if ok:
209-
self.openscript(fss.as_pathname())
209+
filename = EasyDialogs.AskFileForOpen(typeList=("TEXT",))
210+
if filename:
211+
self.openscript(filename)
210212

211213
def domenu_new(self, *args):
212214
W.SetCursor('watch')
@@ -344,7 +346,6 @@ def _getsearchstring(self):
344346
# This is a cop-out. We should have disabled the menus
345347
# if there is no selection, but the can_ methods only seem
346348
# to work for Windows. Or not for the Help menu, maybe?
347-
import EasyDialogs
348349
text = EasyDialogs.AskString("Search documentation for", ok="Search")
349350
return text
350351

0 commit comments

Comments
 (0)