From f12b163a7b5797297fda9a4dbe546678c8764bf1 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Tue, 17 Feb 2009 08:26:33 -0600 Subject: [PATCH] ui.tools.inspector: clean up --- basis/ui/operations/operations.factor | 6 ++++++ basis/ui/tools/inspector/inspector.factor | 15 ++++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/basis/ui/operations/operations.factor b/basis/ui/operations/operations.factor index aa81899462..b15c34e35f 100644 --- a/basis/ui/operations/operations.factor +++ b/basis/ui/operations/operations.factor @@ -48,11 +48,17 @@ operations [ ] initialize : primary-operation ( obj -- operation ) [ command>> +primary+ word-prop ] find-operation ; +: invoke-primary-operation ( obj -- ) + dup primary-operation invoke-command ; + : secondary-operation ( obj -- operation ) dup [ command>> +secondary+ word-prop ] find-operation [ ] [ primary-operation ] ?if ; +: invoke-secondary-operation ( obj -- ) + dup secondary-operation invoke-command ; + : default-flags ( -- assoc ) H{ { +keyboard+ f } { +primary+ f } { +secondary+ f } } ; diff --git a/basis/ui/tools/inspector/inspector.factor b/basis/ui/tools/inspector/inspector.factor index dfff7cbf42..0154251f35 100644 --- a/basis/ui/tools/inspector/inspector.factor +++ b/basis/ui/tools/inspector/inspector.factor @@ -1,13 +1,12 @@ ! Copyright (C) 2006, 2009 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. USING: accessors inspector namespaces kernel models fry -models.filter prettyprint sequences mirrors assocs classes -io io.styles arrays hashtables math.order sorting refs fonts +colors.constants models.filter prettyprint sequences mirrors assocs +classes io io.styles arrays hashtables math.order sorting refs fonts ui.tools.browser ui.commands ui.operations ui.gadgets ui.gadgets.panes -ui.gadgets.scrollers ui.gadgets.slots ui.gadgets.tracks -ui.gestures ui.gadgets.buttons ui.gadgets.tables -ui.gadgets.status-bar ui.gadgets.labeled -ui.tools.common ui ; +ui.gadgets.scrollers ui.gadgets.slots ui.gadgets.tracks ui.gestures +ui.gadgets.buttons ui.gadgets.tables ui.gadgets.status-bar +ui.gadgets.labeled ui.tools.common ui ; IN: ui.tools.inspector TUPLE: inspector-gadget < tool table ; @@ -62,8 +61,10 @@ M: hashtable make-slot-descriptions : ( model -- table ) [ make-slot-descriptions ] inspector-renderer - [ dup primary-operation invoke-command ] >>action + [ invoke-primary-operation ] >>action monospace-font >>font + COLOR: dark-gray >>column-line-color + 6 >>gap 15 >>min-rows 15 >>max-rows 40 >>min-cols