ui.gadgets.theme: rename to ui.theme.images.

basis/ui/gadgets/buttons/buttons.factor

@@ -3,8 +3,9 @@
 USING: accessors assocs colors combinators combinators.short-circuit
 combinators.smart fry kernel locals math.vectors memoize models
 namespaces sequences ui.commands ui.gadgets ui.gadgets.borders
-ui.gadgets.labels ui.gadgets.packs ui.theme ui.gadgets.theme ui.gadgets.worlds
+ui.gadgets.labels ui.gadgets.packs ui.theme ui.gadgets.worlds
-ui.gestures ui.pens ui.pens.image ui.pens.solid ui.pens.tile ;
+ui.gestures ui.pens ui.pens.image ui.pens.solid ui.pens.tile
+ui.theme.images ;
 FROM: models => change-model ;
 IN: ui.gadgets.buttons
 

basis/ui/gadgets/labels/labels.factor

@@ -2,8 +2,8 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors arrays colors.constants combinators fonts fry
 kernel make math.functions models namespaces sequences splitting
-strings ui.baseline-alignment ui.gadgets ui.gadgets.theme
+strings ui.baseline-alignment ui.gadgets ui.gadgets.tracks
-ui.gadgets.tracks ui.pens.solid ui.render ui.text ;
+ui.pens.solid ui.render ui.text ui.theme.images ;
 IN: ui.gadgets.labels
 
 ! A label gadget draws a string.

basis/ui/gadgets/search-tables/search-tables.factor

@@ -4,8 +4,8 @@ USING: accessors calendar combinators.short-circuit delegate fry
 kernel locals models models.delay models.search
 ui.baseline-alignment ui.gadgets ui.gadgets.borders
 ui.gadgets.buttons ui.gadgets.editors ui.gadgets.labels
-ui.gadgets.scrollers ui.gadgets.tables ui.gadgets.theme
+ui.gadgets.scrollers ui.gadgets.tables ui.gadgets.tracks
-ui.gadgets.tracks ui.gestures ui.pens ui.pens.image ;
+ui.gestures ui.pens ui.pens.image ui.theme.images ;
 IN: ui.gadgets.search-tables
 
 TUPLE: search-table < track table field ;

basis/ui/gadgets/sliders/sliders.factor

@@ -2,8 +2,8 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors assocs combinators fry kernel math math.order
 math.vectors models models.range ui.gadgets ui.gadgets.buttons
-ui.gadgets.icons ui.gadgets.theme ui.gadgets.tracks ui.gestures
+ui.gadgets.icons ui.gadgets.tracks ui.gestures ui.pens
-ui.pens ui.pens.image ui.pens.tile ;
+ui.pens.image ui.pens.tile ui.theme.images ;
 IN: ui.gadgets.sliders
 
 TUPLE: slider < track elevator thumb saved line ;

basis/ui/gadgets/tabbed/tabbed.factor

@@ -3,7 +3,7 @@
 USING: accessors colors.constants kernel models sequences
 ui.gadgets ui.gadgets.books ui.gadgets.borders
 ui.gadgets.buttons ui.gadgets.buttons.private ui.gadgets.icons
-ui.gadgets.packs ui.gadgets.theme ui.gadgets.tracks ui.pens ;
+ui.gadgets.packs ui.gadgets.tracks ui.pens ui.theme.images ;
 IN: ui.gadgets.tabbed
 
 TUPLE: tabbed-gadget < track tabs book ;

basis/ui/gadgets/theme/theme.factor

@@ -1,7 +0,0 @@
-! Copyright (C) 2009, 2010 Slava Pestov, Joe Groff.
-! See http://factorcode.org/license.txt for BSD license.
-USING: accessors io.pathnames sequences ui.images ui.theme ;
-IN: ui.gadgets.theme
-
-: theme-image ( name -- image-name )
-    "vocab:ui/gadgets/theme/" prepend-path ".tiff" append <image-name> ;

basis/ui/theme/images/images.factor

@@ -0,0 +1,7 @@
+! Copyright (C) 2009, 2010 Slava Pestov, Joe Groff.
+! See http://factorcode.org/license.txt for BSD license.
+USING: io.pathnames sequences ui.images ;
+IN: ui.theme.images
+
+: theme-image ( name -- image-name )
+    "vocab:ui/theme/images/" prepend-path ".tiff" append <image-name> ;

basis/ui/tools/browser/browser.factor

@@ -8,10 +8,10 @@ make models namespaces sequences sets ui ui.commands ui.gadgets
 ui.gadgets.borders ui.gadgets.editors ui.gadgets.editors.private
 ui.gadgets.glass ui.gadgets.labels ui.gadgets.labels.private
 ui.gadgets.panes ui.gadgets.scrollers ui.gadgets.status-bar
-ui.theme ui.gadgets.theme ui.gadgets.toolbar ui.gadgets.tracks
+ui.theme ui.gadgets.toolbar ui.gadgets.tracks
 ui.gadgets.viewports ui.gadgets.worlds ui.gestures ui.pens.solid
-ui.render ui.text ui.tools.common ui.tools.browser.history
+ui.render ui.text ui.theme.images ui.tools.common
-ui.tools.browser.popups vocabs ;
+ui.tools.browser.history ui.tools.browser.popups vocabs ;
 IN: ui.tools.browser
 
 TUPLE: browser-gadget < tool history scroller search-field popup ;

basis/ui/tools/browser/popups/popups.factor

@@ -4,8 +4,8 @@ USING: accessors arrays assocs colors.constants
 definitions.icons fry help help.topics kernel math.rectangles
 models.arrow namespaces sequences tools.crossref ui.gadgets
 ui.gadgets.glass ui.gadgets.labeled ui.gadgets.search-tables
-ui.gadgets.tables ui.gadgets.theme ui.gadgets.wrappers ui.gestures ui.images
+ui.gadgets.tables ui.gadgets.wrappers ui.gestures ui.images
-ui.operations ui.pens.solid ui.theme ;
+ui.operations ui.pens.solid ui.theme ui.theme.images ;
 FROM: ui.gadgets.wrappers => wrapper ;
 IN: ui.tools.browser.popups
 

basis/ui/tools/debugger/debugger.factor

@@ -7,9 +7,10 @@ ui.debugger ui.gestures ui.gadgets ui.pens.solid
 ui.gadgets.worlds ui.gadgets.packs ui.gadgets.buttons
 ui.gadgets.labels ui.gadgets.presentations ui.gadgets.panes
 ui.gadgets.viewports ui.gadgets.tables ui.theme
-ui.gadgets.theme ui.gadgets.tracks ui.gadgets.toolbar
+ui.gadgets.tracks ui.gadgets.toolbar ui.gadgets.scrollers
-ui.gadgets.scrollers ui.gadgets.borders ui.gadgets.status-bar
+ui.gadgets.borders ui.gadgets.status-bar ui.theme.images
-ui.tools.traceback ui.tools.inspector ui.tools.browser ui.tools.common ;
+ui.tools.traceback ui.tools.inspector ui.tools.browser
+ui.tools.common ;
 IN: ui.tools.debugger
 
 TUPLE: debugger < track error restarts restart-hook restart-list continuation ;

basis/ui/tools/inspector/inspector.factor

@@ -5,10 +5,10 @@ colors.constants models.arrow 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.theme ui.gadgets.tracks ui.gestures
+ui.gadgets.tracks ui.gestures ui.gadgets.buttons
-ui.gadgets.buttons ui.gadgets.tables ui.theme ui.gadgets.toolbar
+ui.gadgets.tables ui.theme ui.gadgets.toolbar
 ui.gadgets.status-bar ui.gadgets.labeled ui.tools.common ui
-combinators ui.gadgets.worlds ;
+combinators ui.gadgets.worlds ui.theme.images ;
 IN: ui.tools.inspector
 
 TUPLE: inspector-gadget < tool table ;

basis/ui/tools/listener/completion/completion.factor

@@ -7,9 +7,9 @@ kernel math math.vectors models.arrow models.delay parser
 present sequences sets splitting tools.completion ui.commands
 ui.gadgets ui.gadgets.editors ui.gadgets.glass
 ui.gadgets.labeled ui.gadgets.scrollers ui.gadgets.tables
-ui.gadgets.theme ui.gadgets.tracks ui.gadgets.worlds
+ui.gadgets.tracks ui.gadgets.worlds ui.gadgets.wrappers
-ui.gadgets.wrappers ui.gestures ui.images ui.operations
+ui.gestures ui.images ui.operations ui.pens.solid ui.theme
-ui.pens.solid ui.theme ui.tools.common ui.tools.listener.history
+ui.theme.images ui.tools.common ui.tools.listener.history
 ui.tools.listener.popups vocabs words ;
 IN: ui.tools.listener.completion
 

basis/ui/tools/listener/listener.factor

@@ -10,10 +10,9 @@ prettyprint sequences source-files.errors strings system threads
 tools.errors.model 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.theme
-ui.gadgets.theme
 ui.gadgets.toolbar ui.gadgets.tracks ui.gestures ui.operations
-ui.pens.solid ui.tools.browser ui.tools.common ui.tools.debugger
+ui.pens.solid ui.theme.images ui.tools.browser ui.tools.common
-ui.tools.error-list ui.tools.listener.completion
+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 ;
 IN: ui.tools.listener

basis/ui/tools/traceback/traceback.factor

@@ -5,8 +5,7 @@ kernel models models.arrow prettyprint sequences ui.commands
 ui.gadgets ui.gadgets.borders ui.gadgets.buttons
 ui.gadgets.labeled ui.gadgets.panes ui.gadgets.scrollers
 ui.gadgets.status-bar ui.gadgets.tables ui.gadgets.toolbar
-ui.theme ui.gadgets.theme ui.gadgets.tracks
+ui.theme ui.gadgets.tracks ui.gestures ui.theme.images ui.tools.common ;
-ui.gestures ui.tools.common ;
 QUALIFIED-WITH: ui.tools.inspector i
 IN: ui.tools.traceback