From 619a4e70e3558ac1189895d69f0ba8f464fcde6b Mon Sep 17 00:00:00 2001 From: Robby Findler Date: Mon, 15 Feb 1999 22:18:00 +0000 Subject: [PATCH] ... original commit: ad1b5fd375b0df06d58375f26b44b1eb0b755dac --- collects/framework/finder.ss | 5 ++--- collects/framework/frame.ss | 4 +++- collects/framework/handler.ss | 2 +- collects/tests/framework/frame.ss | 27 ++++++++++++++++++--------- collects/tests/framework/main.ss | 1 - 5 files changed, 24 insertions(+), 15 deletions(-) diff --git a/collects/framework/finder.ss b/collects/framework/finder.ss index 9a509017..016bc366 100644 --- a/collects/framework/finder.ss +++ b/collects/framework/finder.ss @@ -450,13 +450,12 @@ [bottom-panel (make-object horizontal-panel% main-panel)] - [directory-field (make-object text-field% "Full pathname" directory-panel - (lambda (evt txt) - (when (eq? (send evt get-type) 'text-enter) + (lambda (txt evt) + (when (eq? (send evt get-event-type) 'text-field-enter) (do-ok))))] [result-list diff --git a/collects/framework/frame.ss b/collects/framework/frame.ss index 7ca34e4a..081b6548 100644 --- a/collects/framework/frame.ss +++ b/collects/framework/frame.ss @@ -105,7 +105,9 @@ (send (get-editor) on-close))] [get-area-container% (lambda () panel:vertical-editor%)]) (private - [label file-name] + [label (let-values ([(base name dir?) (split-path file-name)]) + (or name + file-name))] [label-prefix (application:current-app-name)] [do-label (lambda () diff --git a/collects/framework/handler.ss b/collects/framework/handler.ss index c375ddf4..563a748a 100644 --- a/collects/framework/handler.ss +++ b/collects/framework/handler.ss @@ -87,7 +87,7 @@ (opt-lambda (filename [make-default (lambda () - (make-object frame:text-info-file% filename))]) + (send (make-object frame:text-info-file% filename) show #t))]) (gui-utils:show-busy-cursor (lambda () (if filename diff --git a/collects/tests/framework/frame.ss b/collects/tests/framework/frame.ss index 8baaf10a..175cf7d4 100644 --- a/collects/tests/framework/frame.ss +++ b/collects/tests/framework/frame.ss @@ -89,11 +89,9 @@ tmp-file-name)]) (test name - (lambda (x) (delete-file tmp-file) (equal? x test-file-contents)) - (lambda () (send-sexp-to-mred `(begin @@ -103,20 +101,31 @@ (send-sexp-to-mred `(test:menu-select "File" "Open...")) (wait-for-frame "Get file") - (call-with-output-file tmp-file-name + (call-with-output-file tmp-file (lambda (port) (display test-file-contents port)) 'truncate) (send-sexp-to-mred `(begin (send (find-labelled-window "Full pathname") focus) + ,(case (system-type) + [(macos unix) `(test:keystroke #\a '(meta))] + [(windows) `(test:keystroke #\a '(control))] + [else (error "unknown system type")]) (for-each test:keystroke (string->list ,tmp-file)) (test:keystroke #\return))) - (wait-for-frame (format "framework - ~a" tmp-file-name)) - (send-sexp-to-mred - `(let* ([w (get-top-level-focus-window)] - [t (send (send w get-editor) get-text)]) - (test:close-window w) - t)))))) + (wait-for-frame tmp-file-name) + (begin0 + (send-sexp-to-mred + `(let* ([w (get-top-level-focus-window)] + [t (send (send w get-editor) get-text)]) + (test:close-top-level-window w) + t)) + (wait-for-frame "test open") + (send-sexp-to-mred + `(test:close-top-level-window (get-top-level-focus-window)))))))) (test-open "frame:editor open" 'frame:text%) +(test-open "frame:editor open" 'frame:searchable%) +(test-open "frame:editor open" 'frame:text-info%) +(test-open "frame:editor open" 'frame:text-info-file%) diff --git a/collects/tests/framework/main.ss b/collects/tests/framework/main.ss index 2753c485..36b3f45a 100644 --- a/collects/tests/framework/main.ss +++ b/collects/tests/framework/main.ss @@ -207,7 +207,6 @@ (define (wait-for-frame name) (wait-for `(let ([win (get-top-level-focus-window)]) - (printf "name: ~a~n" (and win (box (send win get-label)))) (and win (string=? (send win get-label) ,name))))))) (define Engine