bring down below 102 columns and fix a set! expression

to actually have an effect
This commit is contained in:
Robby Findler 2016-03-07 08:30:32 -06:00
parent 2ab1fb319a
commit da7a258da8

View File

@ -51,33 +51,34 @@ the state transitions / contracts are:
(define (get-preference/gui sym [def (λ () (error 'get-preference/gui "unknown pref ~s" sym))]) (define (get-preference/gui sym [def (λ () (error 'get-preference/gui "unknown pref ~s" sym))])
(define (try) (define (try)
(get-preference sym (get-preference
def sym
#:timeout-lock-there def
(λ (filename) #:timeout-lock-there
(define what-to-do (λ (filename)
(cond (define what-to-do
[get-pref-retry-result (cond
get-pref-retry-result] [get-pref-retry-result
[else get-pref-retry-result]
(define-values (res dont-ask-again?) [else
(message+check-box/custom (define-values (res dont-ask-again?)
(string-constant error-reading-preferences) (message+check-box/custom
(format (string-constant error-reading-preferences-explanation) (string-constant error-reading-preferences)
sym) (format (string-constant error-reading-preferences-explanation)
(string-constant dont-ask-again-until-drracket-restarted) ;; check label sym)
(string-constant try-again) (string-constant dont-ask-again-until-drracket-restarted) ;; check label
(string-constant give-up-and-use-the-default) (string-constant try-again)
#f (string-constant give-up-and-use-the-default)
#f #f
'(caution default=1) #f
1)) ;; cannot return #f here or get-pref-retry-result may get set wrong '(caution default=1)
(when dont-ask-again? 1)) ;; cannot return #f here or get-pref-retry-result may get set wrong
(set! get-pref-retry-result res)) (when dont-ask-again?
res])) (set! get-pref-retry-result res))
(case what-to-do res]))
[(1) (try)] (case what-to-do
[(2) (def)])))) [(1) (try)]
[(2) (def)]))))
(try)) (try))
@ -127,7 +128,9 @@ the state transitions / contracts are:
#f #f
#f ;;parent #f ;;parent
'(default=2 caution))] '(default=2 caution))]
[else (error 'preferences.rkt "preferences-lock-file-mode returned unknown mode ~s\n" the-mode)])) [else (error 'preferences.rkt
"preferences-lock-file-mode returned unknown mode ~s\n"
the-mode)]))
(case mb-ans (case mb-ans
[(2 #f) (record-actual-failure)] [(2 #f) (record-actual-failure)]
[(1) [(1)
@ -457,7 +460,8 @@ the state transitions / contracts are:
(list (string-constant editor-prefs-panel-label) (list (string-constant editor-prefs-panel-label)
(string-constant editor-general-prefs-panel-label)) (string-constant editor-general-prefs-panel-label))
(λ (editor-panel) (λ (editor-panel)
(add-check editor-panel 'framework:delete-forward? (string-constant map-delete-to-backspace) (add-check editor-panel 'framework:delete-forward?
(string-constant map-delete-to-backspace)
not not) not not)
(add-check editor-panel (add-check editor-panel
'framework:auto-set-wrap? 'framework:auto-set-wrap?
@ -543,48 +547,46 @@ the state transitions / contracts are:
(editor-panel-procs editor-panel))))]) (editor-panel-procs editor-panel))))])
(add-editor-checkbox-panel))) (add-editor-checkbox-panel)))
(define (add-general-checkbox-panel) (define (add-general-checkbox-panel) (add-general-checkbox-panel/real))
(letrec ([add-general-checkbox-panel (define (add-general-checkbox-panel/real)
(λ () (set! add-general-checkbox-panel/real void)
(set! add-general-checkbox-panel void) (add-checkbox-panel
(add-checkbox-panel (list (string-constant general-prefs-panel-label))
(list (string-constant general-prefs-panel-label)) (λ (editor-panel)
(λ (editor-panel) (make-recent-items-slider editor-panel)
(make-recent-items-slider editor-panel) (add-check editor-panel
(add-check editor-panel 'framework:autosaving-on?
'framework:autosaving-on? (string-constant auto-save-files))
(string-constant auto-save-files)) (add-check editor-panel 'framework:backup-files? (string-constant backup-files))
(add-check editor-panel 'framework:backup-files? (string-constant backup-files)) (add-check editor-panel 'framework:show-status-line (string-constant show-status-line))
(add-check editor-panel 'framework:show-status-line (string-constant show-status-line)) ;; does this not belong here?
;; does this not belong here? ;; (add-check editor-panel 'drracket:show-line-numbers (string-constant show-line-numbers)
;; (add-check editor-panel 'drracket:show-line-numbers (string-constant show-line-numbers) (add-check editor-panel 'framework:col-offsets (string-constant count-columns-from-one))
(add-check editor-panel 'framework:col-offsets (string-constant count-columns-from-one)) (add-check editor-panel
(add-check editor-panel 'framework:display-line-numbers
'framework:display-line-numbers (string-constant display-line-numbers))
(string-constant display-line-numbers)) (define print-rb (new radio-box%
(define print-rb (new radio-box% [label (string-constant printing-mode)]
[label (string-constant printing-mode)] [parent editor-panel]
[parent editor-panel] [choices (list (string-constant print-using-platform-specific-mode)
[choices (list (string-constant print-using-platform-specific-mode) (string-constant print-to-ps)
(string-constant print-to-ps) (string-constant print-to-pdf))]
(string-constant print-to-pdf))] [callback
[callback (λ (rb evt)
(λ (rb evt) (preferences:set 'framework:print-output-mode
(preferences:set 'framework:print-output-mode (case (send print-rb get-selection)
(case (send print-rb get-selection) [(0) 'standard]
[(0) 'standard] [(1) 'postscript]
[(1) 'postscript] [(2) 'pdf])))]))
[(2) 'pdf])))])) (define (update-print-rb what)
(define (update-print-rb what) (send print-rb set-selection (case what
(send print-rb set-selection (case what [(standard) 0]
[(standard) 0] [(postscript) 1]
[(postscript) 1] [(pdf) 2])))
[(pdf) 2]))) (update-print-rb (preferences:get 'framework:print-output-mode))
(update-print-rb (preferences:get 'framework:print-output-mode)) (preferences:add-callback 'framework:print-output-mode (λ (p v) (update-print-rb v)))
(preferences:add-callback 'framework:print-output-mode (λ (p v) (update-print-rb v))) (general-panel-procs editor-panel))))
(general-panel-procs editor-panel))))])
(add-general-checkbox-panel)))
(define (add-warnings-checkbox-panel) (define (add-warnings-checkbox-panel)
(letrec ([add-warnings-checkbox-panel (letrec ([add-warnings-checkbox-panel
@ -639,7 +641,8 @@ the state transitions / contracts are:
(cond (cond
[(string? default) string?] [(string? default) string?]
[(number? default) number?] [(number? default) number?]
[else (error 'internal-error.set-default "unrecognized default: ~a\n" default)])))))]) [else (error 'internal-error.set-default
"unrecognized default: ~a\n" default)])))))])
(for-each (set-default build-font-entry font-default-string string?) (for-each (set-default build-font-entry font-default-string string?)
font-families) font-families)