diff --git a/collects/framework/private/frame.ss b/collects/framework/private/frame.ss index ab3a66d590..b9b1134e43 100644 --- a/collects/framework/private/frame.ss +++ b/collects/framework/private/frame.ss @@ -287,12 +287,18 @@ (send dc set-pen (send the-pen-list find-or-create-pen line-color 1 line-style)) (send dc set-brush (send the-brush-list find-or-create-brush bg-color bg-style)) (send dc draw-rectangle 0 0 w h) - (send dc draw-text str1 - (- (/ w 2) (/ tw1 2)) - (- (* h 1/2) th1)) - (send dc draw-text str2 - (- (/ w 2) (/ tw2 2)) - (* h 1/2))))]) + (cond + [(string=? str2 "") + (send dc draw-text str1 + (- (/ w 2) (/ tw1 2)) + (- (* h 1/2) (/ th1 2)))] + [else + (send dc draw-text str1 + (- (/ w 2) (/ tw1 2)) + (- (* h 1/2) th1)) + (send dc draw-text str2 + (- (/ w 2) (/ tw2 2)) + (* h 1/2))])))]) (if locked? (draw locked-message-line1 locked-message-line2 "yellow" 'solid "black" 'solid) @@ -310,8 +316,8 @@ [(wu2 hu2 _7 _8) (send dc get-text-extent unlocked-message-line2)]) (stretchable-width #f) (stretchable-height #t) - (min-width (inexact->exact (floor (max wl1 wl2 wu1 wu2)))) - (min-height (inexact->exact (floor (+ hu1 hu2)))))))) + (min-width (inexact->exact (floor (+ 2 (max (+ wl1 2) (+ wl2 2) wu1 wu2))))) + (min-height (inexact->exact (floor (+ 2 hu1 hu2)))))))) (define status-line<%> (interface (basic<%>) diff --git a/collects/string-constants/danish-string-constants.ss b/collects/string-constants/danish-string-constants.ss index 394b41e5e7..264ea4fd3d 100644 --- a/collects/string-constants/danish-string-constants.ss +++ b/collects/string-constants/danish-string-constants.ss @@ -196,8 +196,10 @@ please adhere to these guidelines: ;;; info bar at botttom of drscheme frame (collect-button-label "GC") - (read-only "Skrivebeskyttet") - (read/write "Læs/Skriv") + (read-only-line1 "Skrivebeskyttet") + (read-only-line2 "") + (read/write-line1 "Læs/") + (read/write-line2 "Skriv") (auto-extend-selection "Auto-udvid") (overwrite "Overskriv") (running "kører") diff --git a/collects/string-constants/dutch-string-constants.ss b/collects/string-constants/dutch-string-constants.ss index 95d6523a6f..4c489f3482 100644 --- a/collects/string-constants/dutch-string-constants.ss +++ b/collects/string-constants/dutch-string-constants.ss @@ -81,8 +81,10 @@ ;;; info bar at botttom of drscheme frame (collect-button-label "GC") - (read-only "Alleen lezen") - (read/write "Lezen/Schrijven") + (read-only-line1 "Alleen") + (read-only-line2 "lezen") + (read/write-line1 "Lezen/") + (read/write-line2 "Schrijven") (auto-extend-selection "Auto-extend") ; <**> -- when does this appear? (overwrite "Vervang") (running "Bezig") diff --git a/collects/string-constants/french-string-constants.ss b/collects/string-constants/french-string-constants.ss index 793cd6c93d..599031c37e 100644 --- a/collects/string-constants/french-string-constants.ss +++ b/collects/string-constants/french-string-constants.ss @@ -196,8 +196,10 @@ ;;; info bar at botttom of drscheme frame (collect-button-label "Ramassage") ; de miettes - (read-only "Lecture seulement") - (read/write "Lecture/écriture") + (read-only-line1 "Lecture") + (read-only-line2 "seulement") + (read/write-line1 "Lecture/") + (read/write-line2 "écriture") (auto-extend-selection "Autosélection") ; "Sélection auto-étendable" ? (overwrite "Correction") ; vs Insertion ? surimpression ? (running "en cours") diff --git a/collects/string-constants/german-string-constants.ss b/collects/string-constants/german-string-constants.ss index d18f96ec44..fcf7715c42 100644 --- a/collects/string-constants/german-string-constants.ss +++ b/collects/string-constants/german-string-constants.ss @@ -98,8 +98,10 @@ ;;; info bar at botttom of drscheme frame (collect-button-label "GC") - (read-only "Schreibgeschützt") - (read/write "Lesen/Schreiben") + (read-only-line1 "Schreibgeschützt") + (read-only-line2 "") + (read/write-line1 "Lesen/") + (read/write-line2 "Schreiben") (auto-extend-selection "Automatisch erweitern") (overwrite "Überschreiben") (running "Programm läuft") diff --git a/collects/string-constants/portuguese-string-constants.ss b/collects/string-constants/portuguese-string-constants.ss index 27b274964e..8b0734e83f 100644 --- a/collects/string-constants/portuguese-string-constants.ss +++ b/collects/string-constants/portuguese-string-constants.ss @@ -196,8 +196,10 @@ please adhere to these guidelines: ;;; info bar at botttom of drscheme frame (collect-button-label "GC") - (read-only "Apenas Leitura") - (read/write "Leitura/Escrita") + (read-only-line1 "Apenas") + (read-only-line2 "Leitura") + (read/write-line1 "Leitura/") + (read/write-line2 "Escrita") (auto-extend-selection "Auto-Extensível") (overwrite "Reescrever") (running "a executar") diff --git a/collects/string-constants/spanish-string-constants.ss b/collects/string-constants/spanish-string-constants.ss index 0d86028c1b..c1fb74b6bc 100644 --- a/collects/string-constants/spanish-string-constants.ss +++ b/collects/string-constants/spanish-string-constants.ss @@ -104,8 +104,10 @@ ;;; info bar at botttom of drscheme frame (collect-button-label "Recolectar") - (read-only "Sólo lectura") - (read/write "Lectura/Escritura") + (read-only-line1 "Sólo") + (read-only-line2 "lectura") + (read/write-line1 "Lectura/") + (read/write-line2 "Escritura") (auto-extend-selection "Selección Auto-Extendida") (overwrite "Sobreescribir") (running "ejecutando")