Change listener-window to skov-window

diff --git a/extra/skov/basis/ui/tools/environment/tree/tree.factor b/extra/skov/basis/ui/tools/environment/tree/tree.factor
index 5d91dc904c8efb841ea24fc785c71f0675588c5d..e27c73c1df6421e1f35b95cca02fb9f0a50023af 100644 (file)
--- a/extra/skov/basis/ui/tools/environment/tree/tree.factor
+++ b/extra/skov/basis/ui/tools/environment/tree/tree.factor
@@ -7,8 +7,7 @@ skov.basis.ui.tools.environment.theme
 skov.basis.ui.tools.environment.tree splitting ui.gadgets
 ui.gadgets.borders skov.basis.ui.gadgets.buttons.round ui.gadgets.labels
 ui.gadgets.packs ui.gadgets.packs.private ui.gestures
-skov.basis.ui.pens.gradient-rounded ui.pens.solid
-skov.basis.ui.tools.environment.theme ;
+skov.basis.ui.pens.gradient-rounded ui.pens.solid ;
 FROM: skov.basis.code => call ;
 FROM: models => change-model ;
 IN: skov.basis.ui.tools.environment.tree

diff --git a/extra/skov/basis/ui/tools/listener/listener.factor b/extra/skov/basis/ui/tools/listener/listener.factor
index 5dc5d9fbc895f9559aef72f14fa7588ee98356f2..cf4380d716fc52555571867585b8ffb659df4d9c 100644 (file)
--- a/extra/skov/basis/ui/tools/listener/listener.factor
+++ b/extra/skov/basis/ui/tools/listener/listener.factor
@@ -1,22 +1,21 @@
 ! Copyright (C) 2005, 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays assocs calendar combinators
-combinators.short-circuit concurrency.flags
-concurrency.mailboxes continuations destructors documents
-documents.elements fonts hashtables help help.markup help.tips
-io io.styles kernel lexer listener literals math math.vectors
-models models.arrow models.delay namespaces parser prettyprint
-sequences source-files.errors splitting strings system threads
-ui ui.commands ui.gadgets ui.gadgets.editors ui.gadgets.glass
-ui.gadgets.labeled ui.gadgets.panes ui.gadgets.scrollers
-ui.gadgets.status-bar ui.gadgets.toolbar ui.gadgets.tracks
-ui.gestures ui.operations ui.pens.solid ui.theme
-ui.tools.browser ui.tools.common ui.tools.debugger
-ui.tools.error-list ui.tools.listener.completion
+combinators.short-circuit concurrency.flags concurrency.mailboxes
+continuations destructors documents documents.elements fonts
+hashtables help help.markup help.tips io io.styles kernel lexer
+listener literals math math.vectors models models.arrow models.delay
+namespaces parser prettyprint sequences source-files.errors splitting
+strings system threads ui ui.commands ui.gadgets ui.gadgets.borders
+ui.gadgets.editors ui.gadgets.glass ui.gadgets.labeled
+ui.gadgets.panes ui.gadgets.scrollers ui.gadgets.status-bar
+ui.gadgets.toolbar ui.gadgets.tracks ui.gestures ui.operations
+ui.pens.solid ui.theme ui.tools.browser ui.tools.common
+ui.tools.debugger ui.tools.error-list ui.tools.listener.completion
 ui.tools.listener.history ui.tools.listener.popups vocabs
-vocabs.loader vocabs.parser vocabs.refresh words ui.gadgets.borders
-ui.tools.environment ui.tools.environment.theme ;
-IN: ui.tools.listener
+vocabs.loader vocabs.parser vocabs.refresh words
+skov.basis.ui.tools.environment ;
+IN: skov.basis.ui.tools.listener
 
 TUPLE: interactor < source-editor
     output history flag mailbox thread waiting token-model word-model popup ;
@@ -240,7 +239,7 @@ M: listener-gadget focusable-child*
 : listener-busy? ( listener -- ? )
     input>> interactor-busy? ;
 
-: listener-window* ( -- listener )
+: skov-window* ( -- listener )
     <listener-gadget>
     dup "Listener" open-status-window ;
 
@@ -248,9 +247,9 @@ M: listener-gadget focusable-child*
 !     [ listener-window* drop ] with-ui ;
 
 ! skov
-: listener-window ( -- ) environment-window ;
+: skov-window ( -- ) environment-window ;
 
-\ listener-window H{ { +nullary+ t } } define-command
+\ skov-window H{ { +nullary+ t } } define-command
 
 : (get-listener) ( quot -- listener )
     find-window [
@@ -261,7 +260,7 @@ M: listener-gadget focusable-child*
             [ input>> scroll>caret ]
             [ input>> request-focus ] tri
         ] bi
-    ] [ listener-window* ] if* ; inline
+    ] [ skov-window* ] if* ; inline
 
 : get-listener ( -- listener )
     [ listener-gadget? ] (get-listener) ;
@@ -270,9 +269,9 @@ M: listener-gadget focusable-child*
 !     get-listener drop ;
 
 ! skov
-: show-listener ( -- ) [ border? ] find-window [ raise-window ] [ environment-window ] if* ;
+: show-skov ( -- ) [ border? ] find-window [ raise-window ] [ environment-window ] if* ;
 
-\ show-listener H{ { +nullary+ t } } define-command
+\ show-skov H{ { +nullary+ t } } define-command
 
 : get-ready-listener ( -- listener )
     [

diff --git a/extra/skov/basis/ui/tools/tools.factor b/extra/skov/basis/ui/tools/tools.factor
index 72f3ce2fac982115b0b5b6f04026f70470aa4f9a..1d9a3413bbec92432d1f5449d8a4c400bfcd1eee 100644 (file)
--- a/extra/skov/basis/ui/tools/tools.factor
+++ b/extra/skov/basis/ui/tools/tools.factor
@@ -4,7 +4,7 @@ USING: io.pathnames kernel literals memory namespaces sequences
 system tools.test ui ui.backend ui.commands ui.gestures
 ui.tools.browser ui.tools.button-list ui.tools.common
 ui.tools.error-list ui.tools.listener vocabs.refresh ui.tools.environment ;
-IN: ui.tools
+IN: skov.basis.ui.tools
 
 \ refresh-all H{ { +nullary+ t } { +listener+ t } } define-command
 \ refresh-and-test-all H{ { +nullary+ t } { +listener+ t } } define-command

diff --git a/extra/skov/skov.factor b/extra/skov/skov.factor
index 04eaf1f23ab9299332dd0170afd514d78abee4ea..9a51db7f8dc44037d3ae2e0c28bd27e186a447bd 100644 (file)
--- a/extra/skov/skov.factor
+++ b/extra/skov/skov.factor
@@ -14,3 +14,8 @@ skov.basis.ui.tools.environment.theme ui.gadgets ui.gadgets.buttons
 ui.gadgets.packs ui.pens ui.pens.caching vocabs words ;
 IN: skov
 
+: ui-tools-main ( -- )
+    f ui-stop-after-last-window? set-global
+    environment-window ;
+
+MAIN: ui-tools-main