From ffa97036a87abf266bd8279c4771dabe2a079fa2 Mon Sep 17 00:00:00 2001 From: Ryan Culpepper Date: Wed, 3 Feb 2010 14:43:23 +0000 Subject: [PATCH 1/2] macro-stepper: removed drscheme,etc dep on macro-debugger (changed capability to normal symbol constant) svn: r17953 --- collects/drscheme/private/language-configuration.ss | 3 +-- collects/drscheme/private/module-language.ss | 3 +-- collects/macro-debugger/capability.ss | 7 ------- collects/macro-debugger/tool.ss | 7 ++++--- collects/swindle/tool.ss | 3 +-- 5 files changed, 7 insertions(+), 16 deletions(-) delete mode 100644 collects/macro-debugger/capability.ss diff --git a/collects/drscheme/private/language-configuration.ss b/collects/drscheme/private/language-configuration.ss index b4e127dace..4bb454330d 100644 --- a/collects/drscheme/private/language-configuration.ss +++ b/collects/drscheme/private/language-configuration.ss @@ -6,7 +6,6 @@ scheme/string scheme/list "drsig.ss" - macro-debugger/capability string-constants mred framework @@ -1338,7 +1337,7 @@ (super-new) (define/augment (capability-value key) (cond - [(eq? key macro-stepper-capability-key) #t] + [(eq? key 'macro-stepper:enabled) #t] [else (inner (drscheme:language:get-capability-default key) capability-value key)])))) diff --git a/collects/drscheme/private/module-language.ss b/collects/drscheme/private/module-language.ss index ebefb4a619..b6235eeca3 100644 --- a/collects/drscheme/private/module-language.ss +++ b/collects/drscheme/private/module-language.ss @@ -13,7 +13,6 @@ framework string-constants planet/config - macro-debugger/capability "drsig.ss" "rep.ss") @@ -86,7 +85,7 @@ (cond [(eq? key 'drscheme:autocomplete-words) (drscheme:language-configuration:get-all-manual-keywords)] - [(eq? key macro-stepper-capability-key) #t] + [(eq? key 'macro-stepper:enabled) #t] [else (drscheme:language:get-capability-default key)])) ;; config-panel : as in super class diff --git a/collects/macro-debugger/capability.ss b/collects/macro-debugger/capability.ss deleted file mode 100644 index 506f1afbbc..0000000000 --- a/collects/macro-debugger/capability.ss +++ /dev/null @@ -1,7 +0,0 @@ -#lang scheme/base - -(provide macro-stepper-capability-key) - -(define macro-stepper-capability-key - (string->uninterned-symbol "Enable Macro Stepper")) - diff --git a/collects/macro-debugger/tool.ss b/collects/macro-debugger/tool.ss index 7b864cc291..0f737f7de7 100644 --- a/collects/macro-debugger/tool.ss +++ b/collects/macro-debugger/tool.ss @@ -8,7 +8,6 @@ drscheme/tool mrlib/switchable-button string-constants - "capability.ss" "model/trace.ss" "model/deriv.ss" "model/deriv-util.ss" @@ -17,6 +16,8 @@ "view/stepper.ss" "view/prefs.ss") +;; Capability name: 'macro-stepper:enabled + (provide tool@) (define-local-member-name allow-macro-stepper?) @@ -82,7 +83,7 @@ (define (phase1) (drscheme:language:register-capability - macro-stepper-capability-key + 'macro-stepper:enabled boolean? #f)) (define (phase2) (void)) @@ -163,7 +164,7 @@ (let ([lang (drscheme:language-configuration:language-settings-language (send (get-definitions-text) get-next-settings))]) - (send lang capability-value macro-stepper-capability-key))) + (send lang capability-value 'macro-stepper:enabled))) (define/private (enable/disable-stuff enable?) (if enable? diff --git a/collects/swindle/tool.ss b/collects/swindle/tool.ss index ee8673c16a..6b87d0ce57 100644 --- a/collects/swindle/tool.ss +++ b/collects/swindle/tool.ss @@ -9,7 +9,6 @@ mzlib/list mred net/sendurl - macro-debugger/capability string-constants) (provide tool@) @@ -37,7 +36,7 @@ (super-instantiate ())))) (define/augment (capability-value key) (cond - [(eq? key macro-stepper-capability-key) #t] + [(eq? key 'macro-stepper:enabled) #t] [else (inner (drscheme:language:get-capability-default key) capability-value key)])) (define/override (use-namespace-require/copy?) #t) From 0bda2f0e1846387078d544675857fc66f685ead8 Mon Sep 17 00:00:00 2001 From: Robby Findler Date: Wed, 3 Feb 2010 15:34:11 +0000 Subject: [PATCH 2/2] moved the debugging options in the details part of the module panel so they are side-by-side, which should make the dialog more likely to fit on a netbook screen svn: r17955 --- collects/drscheme/private/language.ss | 54 +++++++++++++------- collects/drscheme/private/module-language.ss | 29 ++++++----- 2 files changed, 50 insertions(+), 33 deletions(-) diff --git a/collects/drscheme/private/language.ss b/collects/drscheme/private/language.ss index 6fcdcf82ee..c65be46822 100644 --- a/collects/drscheme/private/language.ss +++ b/collects/drscheme/private/language.ss @@ -239,15 +239,30 @@ (string-constant case-sensitive-label) input-panel void))] - [debugging (new radio-box% - (label #f) - (choices - (list (string-constant no-debugging-or-profiling) - (string-constant debugging) - (string-constant debugging-and-profiling) - (string-constant test-coverage))) - (parent dynamic-panel) - (callback debugging-radio-box-callback))] + [debugging-panel (new horizontal-panel% + [parent dynamic-panel] + [stretchable-height #f] + [alignment '(left center)])] + [debugging-left (new radio-box% + (label #f) + (choices + (list (string-constant no-debugging-or-profiling) + (string-constant debugging))) + (parent debugging-panel) + (callback + (λ (a b) + (send debugging-right set-selection #f) + (debugging-radio-box-callback a b))))] + [debugging-right (new radio-box% + (label #f) + (choices + (list (string-constant debugging-and-profiling) + (string-constant test-coverage))) + (parent debugging-panel) + (callback + (λ (a b) + (send debugging-left set-selection #f) + (debugging-radio-box-callback a b))))] [output-style (make-object radio-box% (string-constant output-style-label) (list (string-constant constructor-printing-style) @@ -272,7 +287,7 @@ (string-constant use-pretty-printer-label) output-panel void)]) - (get-debugging-radio-box debugging) + (get-debugging-radio-box debugging-left debugging-right) (dynamic-panel-extras dynamic-panel) (case-lambda @@ -290,11 +305,13 @@ 'mixed-fraction-e) (send show-sharing get-value) (send insert-newlines get-value) - (case (send debugging get-selection) + (case (send debugging-left get-selection) [(0) 'none] [(1) 'debug] - [(2) 'debug/profile] - [(3) 'test-coverage]))] + [(#f) + (case (send debugging-right get-selection) + [(0) 'debug/profile] + [(1) 'test-coverage])]))] [(settings) (when case-sensitive (send case-sensitive set-value @@ -308,12 +325,11 @@ 'repeating-decimal-e)) (send show-sharing set-value (simple-settings-show-sharing settings)) (send insert-newlines set-value (simple-settings-insert-newlines settings)) - (send debugging set-selection - (case (simple-settings-annotations settings) - [(none) 0] - [(debug) 1] - [(debug/profile) 2] - [(test-coverage) 3]))]))) + (case (simple-settings-annotations settings) + [(none) (send debugging-right set-selection #f) (send debugging-left set-selection 0)] + [(debug) (send debugging-right set-selection #f) (send debugging-left set-selection 1)] + [(debug/profile) (send debugging-left set-selection #f) (send debugging-right set-selection 0)] + [(test-coverage) (send debugging-left set-selection #f) (send debugging-right set-selection 1)])]))) ;; simple-module-based-language-render-value/format : TST settings port (union #f (snip% -> void)) (union 'infinity number) -> void (define (simple-module-based-language-render-value/format value settings port width) diff --git a/collects/drscheme/private/module-language.ss b/collects/drscheme/private/module-language.ss index b6235eeca3..a17020ccd9 100644 --- a/collects/drscheme/private/module-language.ss +++ b/collects/drscheme/private/module-language.ss @@ -407,17 +407,18 @@ (define compilation-on-check-box #f) (define compilation-on? #t) (define save-stacktrace-on-check-box #f) - (define debugging-radio-box #f) + (define left-debugging-radio-box #f) + (define right-debugging-radio-box #f) (define simple-case-lambda (drscheme:language:simple-module-based-language-config-panel new-parent #:case-sensitive #t - #:get-debugging-radio-box (λ (rb) (set! debugging-radio-box rb)) + #:get-debugging-radio-box (λ (rb-l rb-r) (set! left-debugging-radio-box rb-l) (set! right-debugging-radio-box rb-r)) #:debugging-radio-box-callback (λ (debugging-radio-box evt) - (update-compilation-checkbox debugging-radio-box)) + (update-compilation-checkbox left-debugging-radio-box right-debugging-radio-box)) #:dynamic-panel-extras (λ (dynamic-panel) @@ -430,14 +431,14 @@ (set! save-stacktrace-on-check-box (new check-box% [label (string-constant preserve-stacktrace-information)] [parent dynamic-panel]))))) - (define (update-compilation-checkbox debugging-radio-box) - (case (send debugging-radio-box get-selection) - [(2 3) - (send compilation-on-check-box enable #f) - (send compilation-on-check-box set-value #f)] + (define (update-compilation-checkbox left-debugging-radio-box right-debugging-radio-box) + (case (send left-debugging-radio-box get-selection) [(0 1) (send compilation-on-check-box enable #t) - (send compilation-on-check-box set-value compilation-on?)])) + (send compilation-on-check-box set-value compilation-on?)] + [(#f) + (send compilation-on-check-box enable #f) + (send compilation-on-check-box set-value #f)])) (define cp-panel (new group-box-panel% [parent new-parent] @@ -585,7 +586,7 @@ (install-collection-paths '(default)) (update-buttons) (install-auto-text default-auto-text) - (update-compilation-checkbox debugging-radio-box) + (update-compilation-checkbox left-debugging-radio-box right-debugging-radio-box) (case-lambda [() @@ -596,9 +597,9 @@ (list (get-collection-paths) (get-command-line-args) (get-auto-text) - (case (send debugging-radio-box get-selection) - [(2 3) #f] - [(0 1) compilation-on?]) + (case (send left-debugging-radio-box get-selection) + [(0 1) compilation-on?] + [(#f) #f]) (send save-stacktrace-on-check-box get-value)))))] [(settings) (simple-case-lambda settings) @@ -607,7 +608,7 @@ (install-auto-text (module-language-settings-auto-text settings)) (set! compilation-on? (module-language-settings-compilation-on? settings)) (send compilation-on-check-box set-value (module-language-settings-compilation-on? settings)) - (update-compilation-checkbox debugging-radio-box) + (update-compilation-checkbox left-debugging-radio-box right-debugging-radio-box) (send save-stacktrace-on-check-box set-value (module-language-settings-full-trace? settings)) (update-buttons)]))