removed order-manuals method and the optional argument to language-dialog that shows help-desk manual ordering
svn: r10106
This commit is contained in:
Robby Findler
parent
24d6e488ce
commit
8f10fbe17d
|
|
@ -78,10 +78,6 @@
|
|||
(define/public (get-language-position)
|
||||
(list (string-constant experimental-languages)
|
||||
"Algol 60"))
|
||||
(define/public (order-manuals x)
|
||||
(values
|
||||
(list #"drscheme" #"tour" #"help")
|
||||
#t))
|
||||
(define/public (get-language-name) "Algol 60")
|
||||
(define/public (get-language-url) #f)
|
||||
(define/public (get-language-numbers) (list 1000 10))
|
||||
|
|
|
|||
|
|
@ -133,7 +133,7 @@
|
|||
;; as the defaults in the dialog and the output language setting is the user's choice
|
||||
;; todo: when button is clicked, ensure language is selected
|
||||
(define language-dialog
|
||||
(opt-lambda (show-welcome? language-settings-to-show [parent #f] [manuals? #f])
|
||||
(opt-lambda (show-welcome? language-settings-to-show [parent #f])
|
||||
(define ret-dialog%
|
||||
(class dialog%
|
||||
(define/override (on-subwindow-char receiver evt)
|
||||
|
|
@ -212,7 +212,6 @@
|
|||
button-panel
|
||||
language-settings-to-show
|
||||
#f
|
||||
manuals?
|
||||
ok-handler))
|
||||
|
||||
;; create ok/cancel buttons
|
||||
|
|
@ -247,7 +246,7 @@
|
|||
;; if re-center is a dialog, when the show details button is clicked, the dialog is recenterd.
|
||||
(define fill-language-dialog
|
||||
(opt-lambda (parent show-details-parent language-settings-to-show
|
||||
[re-center #f] [manuals? #f]
|
||||
[re-center #f]
|
||||
[ok-handler void]) ; en/disable button, execute it
|
||||
|
||||
(define-values (language-to-show settings-to-show)
|
||||
|
|
@ -365,14 +364,6 @@
|
|||
(define details-outer-panel (make-object vertical-pane% outermost-panel))
|
||||
(define details/manual-parent-panel (make-object vertical-panel% details-outer-panel))
|
||||
(define details-panel (make-object panel:single% details/manual-parent-panel))
|
||||
(define manual-ordering-panel (new vertical-panel% (parent details/manual-parent-panel)))
|
||||
|
||||
(define manual-ordering-text (new panel-background-text%))
|
||||
(define manual-ordering-canvas (new panel-background-editor-canvas%
|
||||
(parent manual-ordering-panel)
|
||||
(editor manual-ordering-text)
|
||||
(style '(no-hscroll))
|
||||
(min-width 300)))
|
||||
|
||||
(define one-line-summary-message (instantiate message% ()
|
||||
(parent parent)
|
||||
|
|
@ -411,7 +402,6 @@
|
|||
(send details-panel active-child ldp)))
|
||||
(send one-line-summary-message set-label (send language get-one-line-summary))
|
||||
(send revert-to-defaults-button enable #t)
|
||||
(update-manual-ordering-text language)
|
||||
(set! get/set-selected-language-settings get/set-settings)
|
||||
(set! selected-language language))
|
||||
(apply super-make-object args))))
|
||||
|
|
@ -434,63 +424,6 @@
|
|||
(send details-button enable #t)
|
||||
(send item selected))
|
||||
|
||||
;; update-manual-ordering-text : -> void
|
||||
;; updates the manual ordering text with the order the manuals are searched for this language
|
||||
(define (update-manual-ordering-text language)
|
||||
(send manual-ordering-text begin-edit-sequence)
|
||||
(send manual-ordering-text lock #f)
|
||||
(send manual-ordering-text erase)
|
||||
(send manual-ordering-text insert (string-constant plt:hd:manual-search-ordering))
|
||||
(send manual-ordering-text insert "\n\n")
|
||||
(send manual-ordering-text change-style
|
||||
(make-object style-delta% 'change-bold)
|
||||
0
|
||||
(- (send manual-ordering-text last-position) 2))
|
||||
(let ([docs (drscheme:help-desk:get-docs)]
|
||||
[manual-name-style-delta
|
||||
(make-object style-delta%)])
|
||||
(let-values ([(ordered-bytes doc.txt?)
|
||||
(send language order-manuals (map path->bytes (map car docs)))])
|
||||
(let loop ([ordered (map bytes->path ordered-bytes)]
|
||||
[n 1])
|
||||
(cond
|
||||
[(null? ordered)
|
||||
(when doc.txt?
|
||||
(insert-single "doc.txt files" n))]
|
||||
[else
|
||||
(let* ([ent (car ordered)]
|
||||
[full-name (assoc ent docs)])
|
||||
(cond
|
||||
[full-name
|
||||
(insert-single (cdr full-name) n)
|
||||
(loop (cdr ordered) (+ n 1))]
|
||||
[else
|
||||
(loop (cdr ordered) n)]))]))))
|
||||
(send manual-ordering-text change-style
|
||||
(make-object style-delta% 'change-family 'system)
|
||||
0
|
||||
(send manual-ordering-text last-position))
|
||||
(send manual-ordering-text set-position 0)
|
||||
(send manual-ordering-text lock #t)
|
||||
(send manual-ordering-text end-edit-sequence))
|
||||
|
||||
(define manual-number-style-delta (make-object style-delta%))
|
||||
(define stupid-internal-define-syntax1
|
||||
(send manual-number-style-delta set-delta-foreground "darkblue"))
|
||||
|
||||
(define (insert-single name n)
|
||||
(let ([n-sp (send manual-ordering-text last-position)])
|
||||
(send manual-ordering-text insert (number->string n))
|
||||
(let ([n-ep (send manual-ordering-text last-position)])
|
||||
(send manual-ordering-text insert ") ")
|
||||
(send manual-ordering-text insert name)
|
||||
(send manual-ordering-text insert "\n")
|
||||
|
||||
(send manual-ordering-text change-style
|
||||
manual-number-style-delta
|
||||
n-sp
|
||||
(+ n-ep 1)))))
|
||||
|
||||
;; construct-details : (union (-> void) #f)
|
||||
(define construct-details void)
|
||||
|
||||
|
|
@ -871,26 +804,10 @@
|
|||
(when (equal? "\n" (send t get-text 0 1))
|
||||
(send t delete 0 1)))
|
||||
|
||||
(cond
|
||||
[manuals?
|
||||
(unless details-shown?
|
||||
(details-callback))
|
||||
(send show-details-parent change-children
|
||||
(λ (l)
|
||||
(remq revert-to-defaults-outer-panel
|
||||
(remq details-button l))))
|
||||
(send details/manual-parent-panel change-children
|
||||
(λ (l)
|
||||
(list manual-ordering-panel)))]
|
||||
[else
|
||||
(send details-outer-panel stretchable-width #f)
|
||||
(send details/manual-parent-panel change-children
|
||||
(λ (l)
|
||||
(list details-panel)))])
|
||||
|
||||
(send manual-ordering-text hide-caret #t)
|
||||
(send manual-ordering-text auto-wrap #t)
|
||||
(send manual-ordering-text lock #t)
|
||||
(send details-outer-panel stretchable-width #f)
|
||||
(send details/manual-parent-panel change-children
|
||||
(λ (l)
|
||||
(list details-panel)))
|
||||
|
||||
(send languages-hier-list stretchable-width #t)
|
||||
(send languages-hier-list stretchable-height #t)
|
||||
|
|
@ -1385,10 +1302,6 @@
|
|||
(define/override (default-settings)
|
||||
(make-simple-settings+assume #f 'write 'mixed-fraction-e #f #t 'debug #t))
|
||||
|
||||
(define/override (order-manuals x)
|
||||
(values
|
||||
(list #"r5rs" #"drscheme" #"tour" #"help")
|
||||
#f))
|
||||
(super-new)))
|
||||
|
||||
(define get-all-scheme-manual-keywords
|
||||
|
|
|
|||
|
|
@ -45,8 +45,6 @@
|
|||
void?))
|
||||
(default-settings (-> any/c))
|
||||
(default-settings? (-> any/c boolean?))
|
||||
(order-manuals (-> (listof bytes?)
|
||||
(values (listof bytes?) boolean?)))
|
||||
(front-end/complete-program (-> input-port?
|
||||
any/c
|
||||
(-> any/c)))
|
||||
|
|
|
|||
|
|
@ -41,8 +41,6 @@
|
|||
default-settings
|
||||
default-settings?
|
||||
|
||||
order-manuals
|
||||
|
||||
front-end/complete-program
|
||||
front-end/interaction
|
||||
config-panel
|
||||
|
|
@ -476,7 +474,6 @@
|
|||
|
||||
(define/public (first-opened) (void))
|
||||
(define/public (get-comment-character) (values "; " #\;))
|
||||
(define/public (order-manuals x) (values x #t))
|
||||
|
||||
(inherit get-language-position)
|
||||
(define/public (get-language-name)
|
||||
|
|
|
|||
|
|
@ -903,12 +903,10 @@ all of the names in the tools library, for use defining keybindings
|
|||
(proc-doc/names
|
||||
drscheme:language-configuration:language-dialog
|
||||
(->* (boolean? drscheme:language-configuration:language-settings?)
|
||||
((or/c false/c (is-a?/c top-level-window<%>))
|
||||
boolean?)
|
||||
((or/c false/c (is-a?/c top-level-window<%>)))
|
||||
(or/c false/c drscheme:language-configuration:language-settings?))
|
||||
((show-welcome? language-settings-to-show)
|
||||
((parent #t)
|
||||
(manuals? #f)))
|
||||
((parent #t)))
|
||||
@{Opens the language configuration dialog.
|
||||
See also
|
||||
@scheme[drscheme:language-configuration:fill-language-dialog].
|
||||
|
|
@ -929,9 +927,6 @@ all of the names in the tools library, for use defining keybindings
|
|||
The @scheme[parent] argument is used as the parent
|
||||
to the dialog.
|
||||
|
||||
The @scheme[manuals?] argument is passed to
|
||||
@scheme[drscheme:language-configuration:fill-language-dialog].
|
||||
|
||||
The result if @scheme[#f] when the user cancells the dialog, and
|
||||
the selected language if they hit ok.})
|
||||
|
||||
|
|
@ -942,12 +937,10 @@ all of the names in the tools library, for use defining keybindings
|
|||
(is-a?/c area-container<%>)
|
||||
drscheme:language-configuration:language-settings?)
|
||||
((or/c false/c (is-a?/c top-level-window<%>))
|
||||
boolean?
|
||||
(-> symbol? void?))
|
||||
drscheme:language-configuration:language-settings?)
|
||||
((panel button-panel language-setting)
|
||||
((re-center #f)
|
||||
(manuals? #f)
|
||||
(ok-handler void)))
|
||||
@{This procedure accepts two parent panels and
|
||||
fills them with the contents of the language dialog.
|
||||
|
|
@ -968,12 +961,6 @@ all of the names in the tools library, for use defining keybindings
|
|||
the @onscreen{Show Details} callback will recenter the window each time
|
||||
it is clicked. Otherwise, the argument is not used.
|
||||
|
||||
If @scheme[manuals?] is @scheme[#f] the usual language dialog (as seen
|
||||
in the start up drscheme window and from the Choose Language dialog
|
||||
created when drscheme is started up) is shown. If it isn't, the dialog
|
||||
does not have the details and on the right-hand side shows the manual
|
||||
ordering for the chosen language. This is used in Help Desk.
|
||||
|
||||
@scheme[ok-handler] is a function that is in charge of interfacing the OK
|
||||
button. It should accept a symbol message: @scheme['enable] and
|
||||
@scheme['disable] to toggle the button, and @scheme['execute] to run
|
||||
|
|
|
|||
|
|
@ -417,11 +417,6 @@
|
|||
(go "." (drscheme:rep:get-welcome-delta))
|
||||
(newline port)))
|
||||
|
||||
(define/private (htdp-manuals) (list (get-manual) #"teachpack" #"drscheme" #"help"))
|
||||
|
||||
(define/override (order-manuals x)
|
||||
(values (htdp-manuals) #f))
|
||||
|
||||
(inherit get-module get-transformer-module get-init-code
|
||||
use-namespace-require/copy?)
|
||||
(define/override (create-executable setting parent program-filename)
|
||||
|
|
|
|||
|
|
@ -379,16 +379,6 @@
|
|||
[else (drscheme:language:get-capability-default s)]))
|
||||
(define/public (first-opened) (void))
|
||||
|
||||
(define/public (order-manuals x)
|
||||
(let* ((beg-list '(#"profj-beginner" #"teachpack-htdc"
|
||||
#"tour" #"drscheme" #"help"))
|
||||
(int-list (cons #"profj-intermediate" beg-list)))
|
||||
(values (case level
|
||||
((beginner) beg-list)
|
||||
((intermediate intermediate+access) int-list)
|
||||
((advanced full) (cons #"profj-advanced" int-list)))
|
||||
#f)))
|
||||
|
||||
;default-settings: -> profj-settings
|
||||
(define/public (default-settings)
|
||||
(if (memq level `(beginner intermediate intermediate+access advanced))
|
||||
|
|
|
|||
|
|
@ -29,6 +29,12 @@
|
|||
dialog (which means that the `current-print' option is
|
||||
now gone from the language dialog)
|
||||
|
||||
. drscheme:language:language-dialog and
|
||||
drscheme:language:fill-language-dialog no longer accepts
|
||||
the manuals? argument
|
||||
|
||||
. The order-manuals method is gone.
|
||||
|
||||
------------------------------
|
||||
Version 372
|
||||
------------------------------
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user