From 59e3cf93b73a671e313b55042348d5abcc8763fc Mon Sep 17 00:00:00 2001 From: John Benediktsson Date: Sun, 15 May 2016 10:50:30 -0700 Subject: [PATCH] ui.gadgets.theme: rename to ui.theme.images. --- basis/ui/gadgets/buttons/buttons.factor | 5 +++-- basis/ui/gadgets/labels/labels.factor | 4 ++-- basis/ui/gadgets/search-tables/search-tables.factor | 4 ++-- basis/ui/gadgets/sliders/sliders.factor | 4 ++-- basis/ui/gadgets/tabbed/tabbed.factor | 2 +- basis/ui/gadgets/theme/theme.factor | 7 ------- .../theme => theme/images}/active-tab-left.tiff | Bin .../theme => theme/images}/active-tab-lip.tiff | Bin .../theme => theme/images}/active-tab-middle.tiff | Bin .../theme => theme/images}/active-tab-right.tiff | Bin .../ui/{gadgets/theme => theme/images}/authors.txt | 0 .../theme => theme/images}/button-clicked-left.tiff | Bin .../images}/button-clicked-middle.tiff | Bin .../images}/button-clicked-right.tiff | Bin .../theme => theme/images}/button-left.tiff | Bin .../theme => theme/images}/button-middle.tiff | Bin .../theme => theme/images}/button-right.tiff | Bin .../theme => theme/images}/checkbox-clicked.tiff | Bin .../images}/checkbox-set-clicked.tiff | Bin .../theme => theme/images}/checkbox-set.tiff | Bin .../{gadgets/theme => theme/images}/checkbox.tiff | Bin .../images}/clear-button-clicked.tiff | Bin .../theme => theme/images}/clear-button.tiff | Bin .../images}/horizontal-scroller-handle-grip.tiff | Bin .../images}/horizontal-scroller-handle-left.tiff | Bin .../images}/horizontal-scroller-handle-middle.tiff | Bin .../images}/horizontal-scroller-handle-right.tiff | Bin .../images}/horizontal-scroller-left.tiff | Bin .../horizontal-scroller-leftarrow-clicked.tiff | Bin .../images}/horizontal-scroller-middle.tiff | Bin .../images}/horizontal-scroller-right-disabled.tiff | Bin .../images}/horizontal-scroller-right.tiff | Bin .../horizontal-scroller-rightarrow-clicked.tiff | Bin basis/ui/theme/images/images.factor | 7 +++++++ .../theme => theme/images}/inactive-tab-left.tiff | Bin .../theme => theme/images}/inactive-tab-middle.tiff | Bin .../theme => theme/images}/inactive-tab-right.tiff | Bin .../theme => theme/images}/radio-clicked.tiff | Bin .../theme => theme/images}/radio-set-clicked.tiff | Bin .../{gadgets/theme => theme/images}/radio-set.tiff | Bin basis/ui/{gadgets/theme => theme/images}/radio.tiff | Bin .../{gadgets/theme => theme/images}/resources.txt | 0 .../ui/{gadgets/theme => theme/images}/summary.txt | 0 .../images}/vertical-scroller-bottom-disabled.tiff | Bin .../images}/vertical-scroller-bottom.tiff | Bin .../vertical-scroller-downarrow-clicked.tiff | Bin .../images}/vertical-scroller-handle-bottom.tiff | Bin .../images}/vertical-scroller-handle-grip.tiff | Bin .../images}/vertical-scroller-handle-middle.tiff | Bin .../images}/vertical-scroller-handle-top.tiff | Bin .../images}/vertical-scroller-middle.tiff | Bin .../images}/vertical-scroller-top.tiff | Bin .../images}/vertical-scroller-uparrow-clicked.tiff | Bin basis/ui/tools/browser/browser.factor | 6 +++--- basis/ui/tools/browser/popups/popups.factor | 4 ++-- basis/ui/tools/debugger/debugger.factor | 7 ++++--- basis/ui/tools/inspector/inspector.factor | 6 +++--- .../ui/tools/listener/completion/completion.factor | 6 +++--- basis/ui/tools/listener/listener.factor | 5 ++--- basis/ui/tools/traceback/traceback.factor | 3 +-- 60 files changed, 35 insertions(+), 35 deletions(-) delete mode 100644 basis/ui/gadgets/theme/theme.factor rename basis/ui/{gadgets/theme => theme/images}/active-tab-left.tiff (100%) rename basis/ui/{gadgets/theme => theme/images}/active-tab-lip.tiff (100%) rename basis/ui/{gadgets/theme => theme/images}/active-tab-middle.tiff (100%) rename basis/ui/{gadgets/theme => theme/images}/active-tab-right.tiff (100%) rename basis/ui/{gadgets/theme => theme/images}/authors.txt (100%) rename basis/ui/{gadgets/theme => theme/images}/button-clicked-left.tiff (100%) rename basis/ui/{gadgets/theme => theme/images}/button-clicked-middle.tiff (100%) rename basis/ui/{gadgets/theme => theme/images}/button-clicked-right.tiff (100%) rename basis/ui/{gadgets/theme => theme/images}/button-left.tiff (100%) rename basis/ui/{gadgets/theme => theme/images}/button-middle.tiff (100%) rename basis/ui/{gadgets/theme => theme/images}/button-right.tiff (100%) rename basis/ui/{gadgets/theme => theme/images}/checkbox-clicked.tiff (100%) rename basis/ui/{gadgets/theme => theme/images}/checkbox-set-clicked.tiff (100%) rename basis/ui/{gadgets/theme => theme/images}/checkbox-set.tiff (100%) rename basis/ui/{gadgets/theme => theme/images}/checkbox.tiff (100%) rename basis/ui/{gadgets/theme => theme/images}/clear-button-clicked.tiff (100%) rename basis/ui/{gadgets/theme => theme/images}/clear-button.tiff (100%) rename basis/ui/{gadgets/theme => theme/images}/horizontal-scroller-handle-grip.tiff (100%) rename basis/ui/{gadgets/theme => theme/images}/horizontal-scroller-handle-left.tiff (100%) rename basis/ui/{gadgets/theme => theme/images}/horizontal-scroller-handle-middle.tiff (100%) rename basis/ui/{gadgets/theme => theme/images}/horizontal-scroller-handle-right.tiff (100%) rename basis/ui/{gadgets/theme => theme/images}/horizontal-scroller-left.tiff (100%) rename basis/ui/{gadgets/theme => theme/images}/horizontal-scroller-leftarrow-clicked.tiff (100%) rename basis/ui/{gadgets/theme => theme/images}/horizontal-scroller-middle.tiff (100%) rename basis/ui/{gadgets/theme => theme/images}/horizontal-scroller-right-disabled.tiff (100%) rename basis/ui/{gadgets/theme => theme/images}/horizontal-scroller-right.tiff (100%) rename basis/ui/{gadgets/theme => theme/images}/horizontal-scroller-rightarrow-clicked.tiff (100%) create mode 100644 basis/ui/theme/images/images.factor rename basis/ui/{gadgets/theme => theme/images}/inactive-tab-left.tiff (100%) rename basis/ui/{gadgets/theme => theme/images}/inactive-tab-middle.tiff (100%) rename basis/ui/{gadgets/theme => theme/images}/inactive-tab-right.tiff (100%) rename basis/ui/{gadgets/theme => theme/images}/radio-clicked.tiff (100%) rename basis/ui/{gadgets/theme => theme/images}/radio-set-clicked.tiff (100%) rename basis/ui/{gadgets/theme => theme/images}/radio-set.tiff (100%) rename basis/ui/{gadgets/theme => theme/images}/radio.tiff (100%) rename basis/ui/{gadgets/theme => theme/images}/resources.txt (100%) rename basis/ui/{gadgets/theme => theme/images}/summary.txt (100%) rename basis/ui/{gadgets/theme => theme/images}/vertical-scroller-bottom-disabled.tiff (100%) rename basis/ui/{gadgets/theme => theme/images}/vertical-scroller-bottom.tiff (100%) rename basis/ui/{gadgets/theme => theme/images}/vertical-scroller-downarrow-clicked.tiff (100%) rename basis/ui/{gadgets/theme => theme/images}/vertical-scroller-handle-bottom.tiff (100%) rename basis/ui/{gadgets/theme => theme/images}/vertical-scroller-handle-grip.tiff (100%) rename basis/ui/{gadgets/theme => theme/images}/vertical-scroller-handle-middle.tiff (100%) rename basis/ui/{gadgets/theme => theme/images}/vertical-scroller-handle-top.tiff (100%) rename basis/ui/{gadgets/theme => theme/images}/vertical-scroller-middle.tiff (100%) rename basis/ui/{gadgets/theme => theme/images}/vertical-scroller-top.tiff (100%) rename basis/ui/{gadgets/theme => theme/images}/vertical-scroller-uparrow-clicked.tiff (100%) diff --git a/basis/ui/gadgets/buttons/buttons.factor b/basis/ui/gadgets/buttons/buttons.factor index 74c7274700..c7609dbe06 100644 --- a/basis/ui/gadgets/buttons/buttons.factor +++ b/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.gestures ui.pens ui.pens.image ui.pens.solid ui.pens.tile ; +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.theme.images ; FROM: models => change-model ; IN: ui.gadgets.buttons diff --git a/basis/ui/gadgets/labels/labels.factor b/basis/ui/gadgets/labels/labels.factor index 57ea2bb04e..7ef8d62039 100644 --- a/basis/ui/gadgets/labels/labels.factor +++ b/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 -ui.gadgets.tracks ui.pens.solid ui.render ui.text ; +strings ui.baseline-alignment ui.gadgets ui.gadgets.tracks +ui.pens.solid ui.render ui.text ui.theme.images ; IN: ui.gadgets.labels ! A label gadget draws a string. diff --git a/basis/ui/gadgets/search-tables/search-tables.factor b/basis/ui/gadgets/search-tables/search-tables.factor index 62279abc8e..498dfdd622 100644 --- a/basis/ui/gadgets/search-tables/search-tables.factor +++ b/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.tracks ui.gestures ui.pens ui.pens.image ; +ui.gadgets.scrollers ui.gadgets.tables ui.gadgets.tracks +ui.gestures ui.pens ui.pens.image ui.theme.images ; IN: ui.gadgets.search-tables TUPLE: search-table < track table field ; diff --git a/basis/ui/gadgets/sliders/sliders.factor b/basis/ui/gadgets/sliders/sliders.factor index 12c1de1f4b..835b2029b6 100644 --- a/basis/ui/gadgets/sliders/sliders.factor +++ b/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.pens ui.pens.image ui.pens.tile ; +ui.gadgets.icons ui.gadgets.tracks ui.gestures ui.pens +ui.pens.image ui.pens.tile ui.theme.images ; IN: ui.gadgets.sliders TUPLE: slider < track elevator thumb saved line ; diff --git a/basis/ui/gadgets/tabbed/tabbed.factor b/basis/ui/gadgets/tabbed/tabbed.factor index 71c35d0871..cdd516a7ad 100644 --- a/basis/ui/gadgets/tabbed/tabbed.factor +++ b/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 ; diff --git a/basis/ui/gadgets/theme/theme.factor b/basis/ui/gadgets/theme/theme.factor deleted file mode 100644 index ac19fa5225..0000000000 --- a/basis/ui/gadgets/theme/theme.factor +++ /dev/null @@ -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 ; diff --git a/basis/ui/gadgets/theme/active-tab-left.tiff b/basis/ui/theme/images/active-tab-left.tiff similarity index 100% rename from basis/ui/gadgets/theme/active-tab-left.tiff rename to basis/ui/theme/images/active-tab-left.tiff diff --git a/basis/ui/gadgets/theme/active-tab-lip.tiff b/basis/ui/theme/images/active-tab-lip.tiff similarity index 100% rename from basis/ui/gadgets/theme/active-tab-lip.tiff rename to basis/ui/theme/images/active-tab-lip.tiff diff --git a/basis/ui/gadgets/theme/active-tab-middle.tiff b/basis/ui/theme/images/active-tab-middle.tiff similarity index 100% rename from basis/ui/gadgets/theme/active-tab-middle.tiff rename to basis/ui/theme/images/active-tab-middle.tiff diff --git a/basis/ui/gadgets/theme/active-tab-right.tiff b/basis/ui/theme/images/active-tab-right.tiff similarity index 100% rename from basis/ui/gadgets/theme/active-tab-right.tiff rename to basis/ui/theme/images/active-tab-right.tiff diff --git a/basis/ui/gadgets/theme/authors.txt b/basis/ui/theme/images/authors.txt similarity index 100% rename from basis/ui/gadgets/theme/authors.txt rename to basis/ui/theme/images/authors.txt diff --git a/basis/ui/gadgets/theme/button-clicked-left.tiff b/basis/ui/theme/images/button-clicked-left.tiff similarity index 100% rename from basis/ui/gadgets/theme/button-clicked-left.tiff rename to basis/ui/theme/images/button-clicked-left.tiff diff --git a/basis/ui/gadgets/theme/button-clicked-middle.tiff b/basis/ui/theme/images/button-clicked-middle.tiff similarity index 100% rename from basis/ui/gadgets/theme/button-clicked-middle.tiff rename to basis/ui/theme/images/button-clicked-middle.tiff diff --git a/basis/ui/gadgets/theme/button-clicked-right.tiff b/basis/ui/theme/images/button-clicked-right.tiff similarity index 100% rename from basis/ui/gadgets/theme/button-clicked-right.tiff rename to basis/ui/theme/images/button-clicked-right.tiff diff --git a/basis/ui/gadgets/theme/button-left.tiff b/basis/ui/theme/images/button-left.tiff similarity index 100% rename from basis/ui/gadgets/theme/button-left.tiff rename to basis/ui/theme/images/button-left.tiff diff --git a/basis/ui/gadgets/theme/button-middle.tiff b/basis/ui/theme/images/button-middle.tiff similarity index 100% rename from basis/ui/gadgets/theme/button-middle.tiff rename to basis/ui/theme/images/button-middle.tiff diff --git a/basis/ui/gadgets/theme/button-right.tiff b/basis/ui/theme/images/button-right.tiff similarity index 100% rename from basis/ui/gadgets/theme/button-right.tiff rename to basis/ui/theme/images/button-right.tiff diff --git a/basis/ui/gadgets/theme/checkbox-clicked.tiff b/basis/ui/theme/images/checkbox-clicked.tiff similarity index 100% rename from basis/ui/gadgets/theme/checkbox-clicked.tiff rename to basis/ui/theme/images/checkbox-clicked.tiff diff --git a/basis/ui/gadgets/theme/checkbox-set-clicked.tiff b/basis/ui/theme/images/checkbox-set-clicked.tiff similarity index 100% rename from basis/ui/gadgets/theme/checkbox-set-clicked.tiff rename to basis/ui/theme/images/checkbox-set-clicked.tiff diff --git a/basis/ui/gadgets/theme/checkbox-set.tiff b/basis/ui/theme/images/checkbox-set.tiff similarity index 100% rename from basis/ui/gadgets/theme/checkbox-set.tiff rename to basis/ui/theme/images/checkbox-set.tiff diff --git a/basis/ui/gadgets/theme/checkbox.tiff b/basis/ui/theme/images/checkbox.tiff similarity index 100% rename from basis/ui/gadgets/theme/checkbox.tiff rename to basis/ui/theme/images/checkbox.tiff diff --git a/basis/ui/gadgets/theme/clear-button-clicked.tiff b/basis/ui/theme/images/clear-button-clicked.tiff similarity index 100% rename from basis/ui/gadgets/theme/clear-button-clicked.tiff rename to basis/ui/theme/images/clear-button-clicked.tiff diff --git a/basis/ui/gadgets/theme/clear-button.tiff b/basis/ui/theme/images/clear-button.tiff similarity index 100% rename from basis/ui/gadgets/theme/clear-button.tiff rename to basis/ui/theme/images/clear-button.tiff diff --git a/basis/ui/gadgets/theme/horizontal-scroller-handle-grip.tiff b/basis/ui/theme/images/horizontal-scroller-handle-grip.tiff similarity index 100% rename from basis/ui/gadgets/theme/horizontal-scroller-handle-grip.tiff rename to basis/ui/theme/images/horizontal-scroller-handle-grip.tiff diff --git a/basis/ui/gadgets/theme/horizontal-scroller-handle-left.tiff b/basis/ui/theme/images/horizontal-scroller-handle-left.tiff similarity index 100% rename from basis/ui/gadgets/theme/horizontal-scroller-handle-left.tiff rename to basis/ui/theme/images/horizontal-scroller-handle-left.tiff diff --git a/basis/ui/gadgets/theme/horizontal-scroller-handle-middle.tiff b/basis/ui/theme/images/horizontal-scroller-handle-middle.tiff similarity index 100% rename from basis/ui/gadgets/theme/horizontal-scroller-handle-middle.tiff rename to basis/ui/theme/images/horizontal-scroller-handle-middle.tiff diff --git a/basis/ui/gadgets/theme/horizontal-scroller-handle-right.tiff b/basis/ui/theme/images/horizontal-scroller-handle-right.tiff similarity index 100% rename from basis/ui/gadgets/theme/horizontal-scroller-handle-right.tiff rename to basis/ui/theme/images/horizontal-scroller-handle-right.tiff diff --git a/basis/ui/gadgets/theme/horizontal-scroller-left.tiff b/basis/ui/theme/images/horizontal-scroller-left.tiff similarity index 100% rename from basis/ui/gadgets/theme/horizontal-scroller-left.tiff rename to basis/ui/theme/images/horizontal-scroller-left.tiff diff --git a/basis/ui/gadgets/theme/horizontal-scroller-leftarrow-clicked.tiff b/basis/ui/theme/images/horizontal-scroller-leftarrow-clicked.tiff similarity index 100% rename from basis/ui/gadgets/theme/horizontal-scroller-leftarrow-clicked.tiff rename to basis/ui/theme/images/horizontal-scroller-leftarrow-clicked.tiff diff --git a/basis/ui/gadgets/theme/horizontal-scroller-middle.tiff b/basis/ui/theme/images/horizontal-scroller-middle.tiff similarity index 100% rename from basis/ui/gadgets/theme/horizontal-scroller-middle.tiff rename to basis/ui/theme/images/horizontal-scroller-middle.tiff diff --git a/basis/ui/gadgets/theme/horizontal-scroller-right-disabled.tiff b/basis/ui/theme/images/horizontal-scroller-right-disabled.tiff similarity index 100% rename from basis/ui/gadgets/theme/horizontal-scroller-right-disabled.tiff rename to basis/ui/theme/images/horizontal-scroller-right-disabled.tiff diff --git a/basis/ui/gadgets/theme/horizontal-scroller-right.tiff b/basis/ui/theme/images/horizontal-scroller-right.tiff similarity index 100% rename from basis/ui/gadgets/theme/horizontal-scroller-right.tiff rename to basis/ui/theme/images/horizontal-scroller-right.tiff diff --git a/basis/ui/gadgets/theme/horizontal-scroller-rightarrow-clicked.tiff b/basis/ui/theme/images/horizontal-scroller-rightarrow-clicked.tiff similarity index 100% rename from basis/ui/gadgets/theme/horizontal-scroller-rightarrow-clicked.tiff rename to basis/ui/theme/images/horizontal-scroller-rightarrow-clicked.tiff diff --git a/basis/ui/theme/images/images.factor b/basis/ui/theme/images/images.factor new file mode 100644 index 0000000000..691500c618 --- /dev/null +++ b/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 ; diff --git a/basis/ui/gadgets/theme/inactive-tab-left.tiff b/basis/ui/theme/images/inactive-tab-left.tiff similarity index 100% rename from basis/ui/gadgets/theme/inactive-tab-left.tiff rename to basis/ui/theme/images/inactive-tab-left.tiff diff --git a/basis/ui/gadgets/theme/inactive-tab-middle.tiff b/basis/ui/theme/images/inactive-tab-middle.tiff similarity index 100% rename from basis/ui/gadgets/theme/inactive-tab-middle.tiff rename to basis/ui/theme/images/inactive-tab-middle.tiff diff --git a/basis/ui/gadgets/theme/inactive-tab-right.tiff b/basis/ui/theme/images/inactive-tab-right.tiff similarity index 100% rename from basis/ui/gadgets/theme/inactive-tab-right.tiff rename to basis/ui/theme/images/inactive-tab-right.tiff diff --git a/basis/ui/gadgets/theme/radio-clicked.tiff b/basis/ui/theme/images/radio-clicked.tiff similarity index 100% rename from basis/ui/gadgets/theme/radio-clicked.tiff rename to basis/ui/theme/images/radio-clicked.tiff diff --git a/basis/ui/gadgets/theme/radio-set-clicked.tiff b/basis/ui/theme/images/radio-set-clicked.tiff similarity index 100% rename from basis/ui/gadgets/theme/radio-set-clicked.tiff rename to basis/ui/theme/images/radio-set-clicked.tiff diff --git a/basis/ui/gadgets/theme/radio-set.tiff b/basis/ui/theme/images/radio-set.tiff similarity index 100% rename from basis/ui/gadgets/theme/radio-set.tiff rename to basis/ui/theme/images/radio-set.tiff diff --git a/basis/ui/gadgets/theme/radio.tiff b/basis/ui/theme/images/radio.tiff similarity index 100% rename from basis/ui/gadgets/theme/radio.tiff rename to basis/ui/theme/images/radio.tiff diff --git a/basis/ui/gadgets/theme/resources.txt b/basis/ui/theme/images/resources.txt similarity index 100% rename from basis/ui/gadgets/theme/resources.txt rename to basis/ui/theme/images/resources.txt diff --git a/basis/ui/gadgets/theme/summary.txt b/basis/ui/theme/images/summary.txt similarity index 100% rename from basis/ui/gadgets/theme/summary.txt rename to basis/ui/theme/images/summary.txt diff --git a/basis/ui/gadgets/theme/vertical-scroller-bottom-disabled.tiff b/basis/ui/theme/images/vertical-scroller-bottom-disabled.tiff similarity index 100% rename from basis/ui/gadgets/theme/vertical-scroller-bottom-disabled.tiff rename to basis/ui/theme/images/vertical-scroller-bottom-disabled.tiff diff --git a/basis/ui/gadgets/theme/vertical-scroller-bottom.tiff b/basis/ui/theme/images/vertical-scroller-bottom.tiff similarity index 100% rename from basis/ui/gadgets/theme/vertical-scroller-bottom.tiff rename to basis/ui/theme/images/vertical-scroller-bottom.tiff diff --git a/basis/ui/gadgets/theme/vertical-scroller-downarrow-clicked.tiff b/basis/ui/theme/images/vertical-scroller-downarrow-clicked.tiff similarity index 100% rename from basis/ui/gadgets/theme/vertical-scroller-downarrow-clicked.tiff rename to basis/ui/theme/images/vertical-scroller-downarrow-clicked.tiff diff --git a/basis/ui/gadgets/theme/vertical-scroller-handle-bottom.tiff b/basis/ui/theme/images/vertical-scroller-handle-bottom.tiff similarity index 100% rename from basis/ui/gadgets/theme/vertical-scroller-handle-bottom.tiff rename to basis/ui/theme/images/vertical-scroller-handle-bottom.tiff diff --git a/basis/ui/gadgets/theme/vertical-scroller-handle-grip.tiff b/basis/ui/theme/images/vertical-scroller-handle-grip.tiff similarity index 100% rename from basis/ui/gadgets/theme/vertical-scroller-handle-grip.tiff rename to basis/ui/theme/images/vertical-scroller-handle-grip.tiff diff --git a/basis/ui/gadgets/theme/vertical-scroller-handle-middle.tiff b/basis/ui/theme/images/vertical-scroller-handle-middle.tiff similarity index 100% rename from basis/ui/gadgets/theme/vertical-scroller-handle-middle.tiff rename to basis/ui/theme/images/vertical-scroller-handle-middle.tiff diff --git a/basis/ui/gadgets/theme/vertical-scroller-handle-top.tiff b/basis/ui/theme/images/vertical-scroller-handle-top.tiff similarity index 100% rename from basis/ui/gadgets/theme/vertical-scroller-handle-top.tiff rename to basis/ui/theme/images/vertical-scroller-handle-top.tiff diff --git a/basis/ui/gadgets/theme/vertical-scroller-middle.tiff b/basis/ui/theme/images/vertical-scroller-middle.tiff similarity index 100% rename from basis/ui/gadgets/theme/vertical-scroller-middle.tiff rename to basis/ui/theme/images/vertical-scroller-middle.tiff diff --git a/basis/ui/gadgets/theme/vertical-scroller-top.tiff b/basis/ui/theme/images/vertical-scroller-top.tiff similarity index 100% rename from basis/ui/gadgets/theme/vertical-scroller-top.tiff rename to basis/ui/theme/images/vertical-scroller-top.tiff diff --git a/basis/ui/gadgets/theme/vertical-scroller-uparrow-clicked.tiff b/basis/ui/theme/images/vertical-scroller-uparrow-clicked.tiff similarity index 100% rename from basis/ui/gadgets/theme/vertical-scroller-uparrow-clicked.tiff rename to basis/ui/theme/images/vertical-scroller-uparrow-clicked.tiff diff --git a/basis/ui/tools/browser/browser.factor b/basis/ui/tools/browser/browser.factor index b9988798b2..1cb761dd8c 100644 --- a/basis/ui/tools/browser/browser.factor +++ b/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.tools.browser.popups vocabs ; +ui.render ui.text ui.theme.images ui.tools.common +ui.tools.browser.history ui.tools.browser.popups vocabs ; IN: ui.tools.browser TUPLE: browser-gadget < tool history scroller search-field popup ; diff --git a/basis/ui/tools/browser/popups/popups.factor b/basis/ui/tools/browser/popups/popups.factor index d2bb6ef48c..63a961cbb6 100644 --- a/basis/ui/tools/browser/popups/popups.factor +++ b/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.operations ui.pens.solid ui.theme ; +ui.gadgets.tables ui.gadgets.wrappers ui.gestures ui.images +ui.operations ui.pens.solid ui.theme ui.theme.images ; FROM: ui.gadgets.wrappers => wrapper ; IN: ui.tools.browser.popups diff --git a/basis/ui/tools/debugger/debugger.factor b/basis/ui/tools/debugger/debugger.factor index 3ea4e7e8ae..01bdaff61e 100644 --- a/basis/ui/tools/debugger/debugger.factor +++ b/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.scrollers ui.gadgets.borders ui.gadgets.status-bar -ui.tools.traceback ui.tools.inspector ui.tools.browser ui.tools.common ; +ui.gadgets.tracks ui.gadgets.toolbar ui.gadgets.scrollers +ui.gadgets.borders ui.gadgets.status-bar ui.theme.images +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 ; diff --git a/basis/ui/tools/inspector/inspector.factor b/basis/ui/tools/inspector/inspector.factor index 9ce14b0e2a..137d6e085f 100644 --- a/basis/ui/tools/inspector/inspector.factor +++ b/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.buttons ui.gadgets.tables ui.theme ui.gadgets.toolbar +ui.gadgets.tracks ui.gestures ui.gadgets.buttons +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 ; diff --git a/basis/ui/tools/listener/completion/completion.factor b/basis/ui/tools/listener/completion/completion.factor index 435751db2b..8b623f04b1 100644 --- a/basis/ui/tools/listener/completion/completion.factor +++ b/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.wrappers ui.gestures ui.images ui.operations -ui.pens.solid ui.theme ui.tools.common ui.tools.listener.history +ui.gadgets.tracks ui.gadgets.worlds ui.gadgets.wrappers +ui.gestures ui.images ui.operations ui.pens.solid ui.theme +ui.theme.images ui.tools.common ui.tools.listener.history ui.tools.listener.popups vocabs words ; IN: ui.tools.listener.completion diff --git a/basis/ui/tools/listener/listener.factor b/basis/ui/tools/listener/listener.factor index 56a8157b0d..31e7325ab1 100644 --- a/basis/ui/tools/listener/listener.factor +++ b/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.tools.error-list ui.tools.listener.completion +ui.pens.solid ui.theme.images 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 ; IN: ui.tools.listener diff --git a/basis/ui/tools/traceback/traceback.factor b/basis/ui/tools/traceback/traceback.factor index 18ee54bc87..31d73109af 100644 --- a/basis/ui/tools/traceback/traceback.factor +++ b/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.gestures ui.tools.common ; +ui.theme ui.gadgets.tracks ui.gestures ui.theme.images ui.tools.common ; QUALIFIED-WITH: ui.tools.inspector i IN: ui.tools.traceback