suzanne.soy/gui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Newlines at EOFs

Browse Source 
* Another big chunk of v4-require-isms
* Allow `#lang framework/keybinding-lang' for keybinding files
* Move hierlist sources into "mrlib/hierlist", leave stub behind

svn: r10689

original commit: 7d50e61c7f6831936e13e6af5140db65db18fe1c
This commit is contained in:
Eli Barzilay 2008-07-09 07:18:06 +00:00
parent 9bbc53a7cd
commit 2fabbcf66d
50 changed files with 98 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
collects/embedded-gui/private/aligned-pasteboard.ss
View File

@ -5,21 +5,21 @@
|#
(module aligned-pasteboard mzscheme
(provide aligned-pasteboard%)
(require
mzlib/class
mred
mzlib/etc
(lib "click-forwarding-editor.ss" "mrlib")
mrlib/click-forwarding-editor
"on-show-pasteboard.ss"
"really-resized-pasteboard.ss"
"interface.ss"
"locked-pasteboard.ss"
"suppress-modify-editor.ss"
"on-show-editor.ss")
(define aligned-pasteboard%
(class* (click-forwarding-editor-mixin
(suppress-modify-editor-mixin

4
collects/embedded-gui/private/button-snip.ss
View File

@ -205,8 +205,8 @@
;; tests
#|
(require
(lib "locked-pasteboard.ss" "mrlib" "private" "aligned-pasteboard")
(lib "click-forwarding-editor.ss" "mrlib"))
mrlib/private/aligned-pasteboard/locked-pasteboard
mrlib/click-forwarding-editor)
(define (test)
(define f (new frame% (label "test") (width 200) (height 200)))

2
collects/embedded-gui/private/grid-alignment.ss
View File

@ -13,7 +13,7 @@
mzlib/list
mzlib/match
(prefix a: "alignment.ss")
(lib "click-forwarding-editor.ss" "mrlib")
mrlib/click-forwarding-editor
"on-show-pasteboard.ss"
"really-resized-pasteboard.ss"

8
collects/embedded-gui/private/tests/not-stetching.ss
View File

@ -1,13 +1,13 @@
(module not-stetching mzscheme
(require
(lib "debug.ss" "mike-lib")
mike-lib/debug
mzlib/class
mzlib/etc
mred
(lib "aligned-pasteboard.ss" "embedded-gui")
(lib "stretchable-editor-snip.ss" "embedded-gui")
(lib "verthoriz-alignment.ss" "embedded-gui"))
embedded-gui/aligned-pasteboard
embedded-gui/stretchable-editor-snip
embedded-gui/verthoriz-alignment)
(define traced-ses%
#;(override/trace stretchable-editor-snip%

2
collects/embedded-gui/private/tests/only-one-child.ss
View File

@ -7,7 +7,7 @@
(prefix a: "../alignment.ss")
"../alignment-helpers.ss"
"../dllist.ss"
(lib "click-forwarding-editor.ss" "mrlib")
mrlib/click-forwarding-editor
"../on-show-pasteboard.ss"
"../really-resized-pasteboard.ss"
"../interface.ss"

12
collects/embedded-gui/private/tests/stretching-in-alignment.ss
View File

@ -4,15 +4,15 @@
mred
mzlib/etc
mzlib/class
(lib "interface.ss" "mrlib" "private" "aligned-pasteboard")
(lib "debug.ss" "mike-lib")
mrlib/private/aligned-pasteboard/interface
mike-lib/debug
mzlib/list
mzlib/match
(prefix a: "alignment.ss")
(lib "click-forwarding-editor.ss" "mrlib")
(lib "snip-lib.ss" "mrlib" "private" "aligned-pasteboard")
(lib "aligned-pasteboard.ss" "embedded-gui")
(lib "stretchable-editor-snip.ss" "embedded-gui"))
mrlib/click-forwarding-editor
mrlib/private/aligned-pasteboard/snip-lib
embedded-gui/aligned-pasteboard
embedded-gui/stretchable-editor-snip)
(define f (new frame% (label "f") (width 400) (height 400)))
(define e (new text%))

2
collects/embedded-gui/private/tests/test-case-box.ss
View File

@ -3,7 +3,7 @@
mzlib/list
mred
mzlib/unitsig
(lib "tool.ss" "drscheme")
drscheme/tool
mzlib/etc
mzlib/match
framework

4
collects/embedded-gui/private/tests/test-show-feature.ss
View File

@ -14,7 +14,7 @@
"../snip-lib.ss"
"../interface.ss"
"../alignment-helpers.ss"
(lib "click-forwarding-editor.ss" "mrlib")
mrlib/click-forwarding-editor
"../on-show-pasteboard.ss"
"../really-resized-pasteboard.ss"
"../interface.ss"
@ -23,7 +23,7 @@
"../verthoriz-alignment.ss"
"../suppress-modify-editor.ss")
(require (lib "print-debug.ss" "mike-lib"))
(require mike-lib/print-debug)
(define aligned-pasteboard%
(class (click-forwarding-editor-mixin

4
collects/embedded-gui/private/tests/unaligned-childless-redux.ss
View File

@ -1,5 +1,5 @@
(require (lib "aligned-pasteboard.ss" "embedded-gui")
(lib "debug.ss" "mike-lib"))
(require embedded-gui/aligned-pasteboard
mike-lib/debug)
(define f (new frame% (label "f") (width 100) (height 100)))
(define e (new text%))

4
collects/framework/framework-unit.ss
View File

@ -1,7 +1,7 @@
#lang scheme/base
(require mzlib/unit
(lib "mred-sig.ss" "mred"))
mred/mred-sig)
(require "private/sig.ss"
"private/number-snip.ss"
@ -94,4 +94,4 @@
(prefix handler: framework:handler^)
(prefix scheme: framework:scheme^)
(prefix main: framework:main^))
framework-separate@ mred^))
framework-separate@ mred^))

2
collects/framework/gui-utils.ss
View File

@ -557,4 +557,4 @@
a delta suitable for use on a black background.
See also
@scheme[gui-utils:get-clicked-clickback-delta].}))
@scheme[gui-utils:get-clicked-clickback-delta].}))

4
collects/framework/main.ss
View File

@ -1,8 +1,8 @@
#reader scribble/reader
#lang scheme/gui
(require (lib "mred-unit.ss" "mred")
(lib "mred-sig.ss" "mred")
(require mred/mred-unit
mred/mred-sig
framework/framework-unit
framework/private/sig
(for-syntax scheme/base)

2
collects/framework/private/autosave.ss
View File

@ -6,7 +6,7 @@
"sig.ss"
"../gui-utils.ss"
"../preferences.ss"
(lib "mred-sig.ss" "mred")
mred/mred-sig
mzlib/list
string-constants)

2
collects/framework/private/bday.ss
View File

@ -1,4 +1,4 @@
(module bday mzscheme (require (lib "encode-decode.ss" "framework" "private"))
(module bday mzscheme (require framework/private/encode-decode)
(decode
\5d8f4
\10ec22010

2
collects/framework/private/canvas.ss
View File

@ -2,7 +2,7 @@
(require mzlib/class
"sig.ss"
"../preferences.ss"
(lib "mred-sig.ss" "mred"))
mred/mred-sig)
(import mred^
[prefix frame: framework:frame^]

2
collects/framework/private/color-model.ss
View File

@ -1,7 +1,7 @@
#lang scheme/unit
(require mzlib/class
"sig.ss"
(lib "mred-sig.ss" "mred")
mred/mred-sig
mzlib/list)
(import)

4
collects/framework/private/comment-box.ss
View File

@ -6,7 +6,7 @@
mred
"sig.ss"
"../decorated-editor-snip.ss"
(lib "include-bitmap.ss" "mrlib")
mrlib/include-bitmap
string-constants)
(import [prefix text: framework:text^]
@ -25,7 +25,7 @@
(send snipclass set-classname (format "~s" '(lib "comment-snip.ss" "framework")))
(send (get-the-snip-class-list) add snipclass)
(define bm (include-bitmap (lib "semicolon.gif" "icons")))
(define bm (include-bitmap (lib "icons/semicolon.gif")))
(define (editor-keymap-mixin %)
(class %

2
collects/framework/private/editor.ss
View File

@ -6,7 +6,7 @@
"../preferences.ss"
"../gui-utils.ss"
mzlib/etc
(lib "mred-sig.ss" "mred")
mred/mred-sig
scheme/path)
(import mred^

2
collects/framework/private/exit.ss
View File

@ -4,7 +4,7 @@
"sig.ss"
"../preferences.ss"
"../gui-utils.ss"
(lib "mred-sig.ss" "mred"))
mred/mred-sig)
(import mred^)
(export (rename framework:exit^

2
collects/framework/private/finder.ss
View File

@ -3,7 +3,7 @@
(require string-constants
"sig.ss"
"../preferences.ss"
(lib "mred-sig.ss" "mred")
mred/mred-sig
mzlib/string
scheme/path
mzlib/etc)

2
collects/framework/private/frame.ss
View File

@ -6,7 +6,7 @@
"../preferences.ss"
"../gui-utils.ss"
"bday.ss"
(lib "mred-sig.ss" "mred")
mred/mred-sig
mzlib/list
scheme/path
mzlib/etc)

2
collects/framework/private/gen-standard-menus.ss
View File

@ -282,4 +282,4 @@
@definterface[frame:standard-menus<%> (frame:basic<%>)]{
--
)
)

2
collects/framework/private/group.ss
View File

@ -5,7 +5,7 @@
"sig.ss"
"../preferences.ss"
"../gui-utils.ss"
(lib "mred-sig.ss" "mred")
mred/mred-sig
mzlib/list
scheme/path)

5
collects/framework/private/handler.ss
View File

@ -2,15 +2,14 @@
(require mzlib/class
mzlib/list
(lib "hierlist.ss" "hierlist")
mrlib/hierlist
"sig.ss"
"../preferences.ss"
"../gui-utils.ss"
(lib "mred-sig.ss" "mred")
mred/mred-sig
scheme/path
string-constants)
(import mred^
[prefix finder: framework:finder^]
[prefix group: framework:group^]

20
collects/framework/private/icon.ss
View File

@ -2,28 +2,28 @@
(require (for-syntax scheme/base)
scheme/promise
mzlib/class
(lib "include-bitmap.ss" "mrlib")
mrlib/include-bitmap
"bday.ss"
"sig.ss"
(lib "mred-sig.ss" "mred"))
mred/mred-sig)
(import mred^)
(export framework:icon^)
(define eof-bitmap (delay (include-bitmap (lib "eof.gif" "icons"))))
(define eof-bitmap (delay (include-bitmap (lib "icons/eof.gif"))))
(define (get-eof-bitmap) (force eof-bitmap))
(define anchor-bitmap (delay (include-bitmap (lib "anchor.gif" "icons"))))
(define anchor-bitmap (delay (include-bitmap (lib "icons/anchor.gif"))))
(define (get-anchor-bitmap) (force anchor-bitmap))
(define lock-bitmap (delay (include-bitmap (lib "lock.gif" "icons"))))
(define lock-bitmap (delay (include-bitmap (lib "icons/lock.gif"))))
(define (get-lock-bitmap) (force lock-bitmap))
(define unlock-bitmap (delay (include-bitmap (lib "unlock.gif" "icons"))))
(define unlock-bitmap (delay (include-bitmap (lib "icons/unlock.gif"))))
(define (get-unlock-bitmap) (force unlock-bitmap))
(define autowrap-bitmap (delay (include-bitmap (lib "return.xbm" "icons"))))
(define autowrap-bitmap (delay (include-bitmap (lib "icons/return.xbm"))))
(define (get-autowrap-bitmap) (force autowrap-bitmap))
(define paren-highlight-bitmap (delay (include-bitmap (lib "paren.xbm" "icons"))))
(define paren-highlight-bitmap (delay (include-bitmap (lib "icons/paren.xbm"))))
(define (get-paren-highlight-bitmap) (force paren-highlight-bitmap))
(define-syntax (make-get-cursor stx)
@ -46,8 +46,8 @@
(define get-up/down-cursor (make-get-cursor "up-down-cursor.xbm" "up-down-mask.xbm" 'size-n/s))
(define get-left/right-cursor (make-get-cursor "left-right-cursor.xbm" "left-right-mask.xbm" 'size-e/w))
(define mrf-on-bitmap (delay (include-bitmap (lib "mrf.png" "icons"))))
(define gc-on-bitmap (delay (include-bitmap (lib "recycle.png" "icons"))))
(define mrf-on-bitmap (delay (include-bitmap (lib "icons/mrf.png"))))
(define gc-on-bitmap (delay (include-bitmap (lib "icons/recycle.png"))))
(define (make-off-bitmap onb)
(let* ([bitmap (make-object bitmap%

7
collects/framework/private/keymap.ss
View File

@ -4,7 +4,7 @@
(require string-constants
mzlib/class
mzlib/list
(lib "mred-sig.ss" "mred")
mred/mred-sig
mzlib/match
"../preferences.ss"
"tex-table.ss"
@ -30,7 +30,10 @@
[sexp (and (file-exists? path)
(call-with-input-file path read))])
(match sexp
[`(module ,name (lib "keybinding-lang.ss" "framework") ,@(x ...))
[`(module ,name ,(or `(lib "keybinding-lang.ss" "framework")
`(lib "framework/keybinding-lang.ss")
`framework/keybinding-lang)
,@(x ...))
(let ([km (dynamic-require spec '#%keymap)])
(hash-set! user-keybindings-files spec km)
(send global chain-to-keymap km #t))]

2
collects/framework/private/main.ss
View File

@ -2,7 +2,7 @@
(require mzlib/class
"sig.ss"
"../preferences.ss"
(lib "mred-sig.ss" "mred"))
mred/mred-sig)
(import mred^
[prefix preferences: framework:preferences^]

1
collects/framework/private/mapdesc.ss
View File

@ -13,4 +13,3 @@
" ("
(symbol->string 'events)
" events)"))]))

2
collects/framework/private/menu.ss
View File

@ -2,7 +2,7 @@
(require mzlib/class
"sig.ss"
"../preferences.ss"
(lib "mred-sig.ss" "mred"))
mred/mred-sig)
(import mred^)
(export framework:menu^)

2
collects/framework/private/number-snip.ss
View File

@ -2,7 +2,7 @@
#lang scheme/unit
(require "sig.ss"
(lib "mred-sig.ss" "mred")
mred/mred-sig
mzlib/class
"../preferences.ss"
string-constants)

2
collects/framework/private/panel.ss
View File

@ -2,7 +2,7 @@
#lang scheme/unit
(require mzlib/class
"sig.ss"
(lib "mred-sig.ss" "mred")
mred/mred-sig
mzlib/list
mzlib/etc)

9
collects/framework/private/pasteboard.ss
View File

@ -1,14 +1,13 @@
#lang scheme/unit
(require "sig.ss"
(lib "mred-sig.ss" "mred"))
(require "sig.ss" mred/mred-sig)
(import mred^
[prefix editor: framework:editor^])
(export (rename framework:pasteboard^
[-keymap% keymap%]))
(init-depend mred^ framework:editor^)
(define basic% (editor:basic-mixin pasteboard%))
(define standard-style-list% (editor:standard-style-list-mixin basic%))
(define -keymap% (editor:keymap-mixin standard-style-list%))

3
collects/framework/private/path-utils.ss
View File

@ -1,6 +1,5 @@
#lang scheme/unit
(require "sig.ss"
(lib "mred-sig.ss" "mred"))
(require "sig.ss" mred/mred-sig)
(import)
(export framework:path-utils^)

2
collects/framework/private/preferences.ss
View File

@ -34,7 +34,7 @@ the state transitions / contracts are:
"sig.ss"
"../gui-utils.ss"
"../preferences.ss"
(lib "mred-sig.ss" "mred")
mred/mred-sig
mzlib/list)
(import mred^

2
collects/framework/private/standard-menus-items.ss
View File

@ -396,4 +396,4 @@
'(string-constant about-menu-item)
on-demand-do-nothing
#f)
(make-after 'help-menu 'about 'nothing)))
(make-after 'help-menu 'about 'nothing)))

4
collects/framework/private/text.ss
View File

@ -13,8 +13,8 @@ WARNING: printf is rebound in the body of the unit to always
"sig.ss"
"../gui-utils.ss"
"../preferences.ss"
(lib "mred-sig.ss" "mred")
(lib "interactive-value-port.ss" "mrlib")
mred/mred-sig
mrlib/interactive-value-port
mzlib/list
mzlib/etc
setup/dirs

2
collects/framework/private/version.ss
View File

@ -1,7 +1,7 @@
#lang scheme/unit
(require "sig.ss"
(lib "mred-sig.ss" "mred")
mred/mred-sig
mzlib/string
mzlib/list)
(import)

2
collects/hierlist/hierlist.ss
View File

@ -1,4 +1,6 @@
#lang scheme/base
;; This is a stub for legacy code
(require mrlib/hierlist)
(provide (all-from-out mrlib/hierlist))

6
collects/mrlib/hierlist.ss
View File

@ -2,9 +2,9 @@
(require mzlib/unit
scheme/gui/base
hierlist/hierlist-sig
hierlist/hierlist-unit)
"hierlist/hierlist-sig.ss"
"hierlist/hierlist-unit.ss")
(define-values/invoke-unit/infer hierlist@)
(provide-signature-elements hierlist^)

0
collects/hierlist/hierlist-sig.ss → collects/mrlib/hierlist/hierlist-sig.ss
View File

18
collects/hierlist/hierlist-unit.ss → collects/mrlib/hierlist/hierlist-unit.ss
View File

@ -3,25 +3,25 @@
(require (all-except mzlib/unit rename)
mzlib/class
mzlib/class100
(lib "mred-sig.ss" "mred")
(lib "include-bitmap.ss" "mrlib")
mred/mred-sig
mrlib/include-bitmap
"hierlist-sig.ss")
(require (rename mzlib/list sort* sort)
mzlib/etc)
(define turn-up (include-bitmap "../icons/turn-up.png" 'png))
(define turn-down (include-bitmap "../icons/turn-down.png" 'png))
(define turn-up-click (include-bitmap "../icons/turn-up-click.png" 'png))
(define turn-down-click (include-bitmap "../icons/turn-down-click.png" 'png))
(define turn-up (include-bitmap "../../icons/turn-up.png" 'png))
(define turn-down (include-bitmap "../../icons/turn-down.png" 'png))
(define turn-up-click (include-bitmap "../../icons/turn-up-click.png" 'png))
(define turn-down-click (include-bitmap "../../icons/turn-down-click.png" 'png))
(provide hierlist@)
(define-unit hierlist@
(import mred^)
(export hierlist^)
(init-depend mred^)
(define-local-member-name
(define-local-member-name
;; In hierarchical-list%
ensure-not-selected)
@ -32,7 +32,7 @@
(define blue (make-object brush% "BLUE" 'solid))
(define black-xor (make-object brush% "BLACK" 'hilite))
(define arrow-cursor (make-object cursor% 'arrow))
(define-values (up-bitmap down-bitmap up-click-bitmap down-click-bitmap)
(values turn-up turn-down turn-up-click turn-down-click))

4
collects/mrlib/include-bitmap.ss
View File

@ -2,10 +2,10 @@
(require mred
mzlib/class
mzlib/file
(lib "main-collects.ss" "setup"))
setup/main-collects)
(require-for-syntax syntax/path-spec
mzlib/cm-accomplice
(lib "main-collects.ss" "setup"))
setup/main-collects)
(provide include-bitmap
include-bitmap/relative-to)

2
collects/mrlib/matrix-snip.ss
View File

@ -2,7 +2,7 @@
(require mzlib/class
mzlib/string
(lib "cache-image-snip.ss" "mrlib"))
mrlib/cache-image-snip)
(provide visible-matrix%
matrix-snip-class%

2
collects/mrlib/path-dialog.ss
View File

@ -1,3 +1,3 @@
(module path-dialog mzscheme
(require (lib "path-dialog.ss" "mred" "private"))
(require mred/private/path-dialog)
(provide path-dialog%))

2
collects/mrlib/private/aligned-pasteboard/aligned-pasteboard.ss
View File

@ -1,7 +1,7 @@
(module aligned-pasteboard mzscheme
(require
(lib "click-forwarding-editor.ss" "mrlib")
mrlib/click-forwarding-editor
"geometry-managed-pasteboard.ss"
"locked-pasteboard.ss")

2
collects/mrlib/private/aligned-pasteboard/tests/insertion-without-display.ss
View File

@ -1,4 +1,4 @@
(require (lib "aligned-pasteboard.ss" "mrlib"))
(require mrlib/aligned-pasteboard)
(with-handlers ([exn? (lambda (x) #f)])
(send (new pasteboard%) insert (new aligned-editor-snip% (editor (new horizontal-pasteboard%))))
#t)

2
collects/mrlib/private/aligned-pasteboard/tests/test-locked-pasteboard.ss
View File

@ -1,6 +1,6 @@
(require
"../locked-pasteboard.ss"
(lib "click-forwarding-editor.ss" "mrlib"))
mrlib/click-forwarding-editor)
(define f (new frame% (width 400) (height 500) (label "test")))
(define e (new (click-forwarding-editor-mixin (locked-pasteboard-mixin pasteboard%))))

8
collects/mrlib/syntax-browser.ss
View File

@ -498,10 +498,10 @@ needed to really make this work:
(define (set-box/f! b v) (when (box? b) (set-box! b v)))
(define down-bitmap (include-bitmap (lib "turn-down.png" "icons") 'png))
(define up-bitmap (include-bitmap (lib "turn-up.png" "icons") 'png))
(define down-click-bitmap (include-bitmap (lib "turn-down-click.png" "icons") 'png))
(define up-click-bitmap (include-bitmap (lib "turn-up-click.png" "icons") 'png))
(define down-bitmap (include-bitmap (lib "icons/turn-down.png") 'png))
(define up-bitmap (include-bitmap (lib "icons/turn-up.png") 'png))
(define down-click-bitmap (include-bitmap (lib "icons/turn-down-click.png") 'png))
(define up-click-bitmap (include-bitmap (lib "icons/turn-up-click.png") 'png))
(define arrow-snip-height
(max 10
(send up-bitmap get-height)

2
collects/tests/framework/load.ss
View File

@ -46,5 +46,5 @@
(let-values ([(_1 eles _2 _3) (signature-members #'sig #'whatever)])
(with-syntax ([eles eles])
#''eles))])))
(eval '(require (lib "framework-sig.ss" "framework")))
(eval '(require framework/framework-sig))
(eval '(for-each eval (signature->symbols framework^))))))

2
collects/tests/mzscheme/cache-image-snip-test.ss
View File

@ -1,6 +1,6 @@
(load-relative "loadtest.ss")
(require (lib "cache-image-snip.ss" "mrlib")
(require mrlib/cache-image-snip
mzlib/unit)
(invoke-unit