fixed a problem John talked about and made the find dialog be non-sheet

svn: r2362
This commit is contained in:
Robby Findler 2006-03-03 22:23:48 +00:00
parent a4034de29c
commit cd039c0240
4 changed files with 19 additions and 12 deletions

View File

@ -843,7 +843,7 @@
"Adds a filename to the list of recently opened files.") "Adds a filename to the list of recently opened files.")
(handler:set-recent-position (handler:set-recent-position
(string? number? number? . -> . void?) (path? number? number? . -> . void?)
(filename start end) (filename start end)
"Sets the selection of the recently opened file to" "Sets the selection of the recently opened file to"
"\\var{start} and \\var{end}.") "\\var{start} and \\var{end}.")

View File

@ -1220,7 +1220,10 @@
(define/private (cancel-due-to-unsaved-changes editor) (define/private (cancel-due-to-unsaved-changes editor)
(and (send editor is-modified?) (and (send editor is-modified?)
(let ([save (gui-utils:unsaved-warning (let ([save (gui-utils:unsaved-warning
(or (send editor get-filename) (get-label)) (let ([fn (send editor get-filename)])
(if fn
(path->string fn)
(get-label)))
(string-constant clear-anyway) (string-constant clear-anyway)
#t #t
this)]) this)])
@ -1283,8 +1286,11 @@
(define/private (user-okays-switch? ed) (define/private (user-okays-switch? ed)
(or (not (send ed is-modified?)) (or (not (send ed is-modified?))
(let ([answer (let ([answer
(gui-utils:unsaved-warning (gui-utils:unsaved-warning
(or (send ed get-filename) (get-label)) (let ([fn (send ed get-filename)])
(if fn
(path->string fn)
(get-label)))
(string-constant switch-anyway) (string-constant switch-anyway)
#t)]) #t)])
(case answer (case answer
@ -1569,11 +1575,12 @@
[allow-replace? (not (send to-be-searched-text is-locked?))] [allow-replace? (not (send to-be-searched-text is-locked?))]
[dialog (make-object dialog% [dialog (new dialog%
(if allow-replace? (label (if allow-replace?
(string-constant find-and-replace) (string-constant find-and-replace)
(string-constant find)) (string-constant find)))
frame)] (parent frame)
(style '(no-sheet)))]
[copy-text [copy-text
(λ (from to) (λ (from to)

View File

@ -288,7 +288,7 @@
(send t begin-edit-sequence) (send t begin-edit-sequence)
(send t erase) (send t erase)
(when full-name (when full-name
(send t insert full-name)) (send t insert (path->string full-name)))
(send t end-edit-sequence))] (send t end-edit-sequence))]
[(list-box-dclick) [(list-box-dclick)
(set! cancelled? #f) (set! cancelled? #f)
@ -307,7 +307,7 @@
(let ([fr (car sorted-frames)]) (let ([fr (car sorted-frames)])
(when (and (is-a? fr frame:basic<%>) (when (and (is-a? fr frame:basic<%>)
(send fr get-filename)) (send fr get-filename))
(send t insert (send (car sorted-frames) get-filename))) (send t insert (path->string (send (car sorted-frames) get-filename))))
(send lb set-selection 0)) (send lb set-selection 0))
(send d show #t) (send d show #t)
(unless cancelled? (unless cancelled?

View File

@ -198,7 +198,7 @@
(size-down (preferences:get 'framework:recently-opened-files/pos) (size-down (preferences:get 'framework:recently-opened-files/pos)
n))) n)))
;; set-recent-position : string number number -> void ;; set-recent-position : path number number -> void
;; updates the recent menu preferences ;; updates the recent menu preferences
;; with the positions `start' and `end' ;; with the positions `start' and `end'
(define (set-recent-position filename start end) (define (set-recent-position filename start end)