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

diff --git a/basis/ui/gadgets/buttons/buttons.factor b/basis/ui/gadgets/buttons/buttons.factor
index 74c72747002465c3a66fae05aa1e2d4ed4357ada..c7609dbe06da538cee7120a2953cacf17679b1f5 100644 (file)
--- 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 57ea2bb04ef25c485a7a0837a8c9fdb5f0aba30d..7ef8d6203963c777353938208b79b4486d5cb3f0 100644 (file)
--- 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 62279abc8ee3ec6bfae4b477efae9393cbd3864f..498dfdd6220e7166e0e01c222c84169c25f08c3a 100644 (file)
--- 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 12c1de1f4b9819d747e4ad6473b1a793bbc2c006..835b2029b6cf87d15c346e13937e92be19f0a364 100644 (file)
--- 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 71c35d08717bc2dfa540a54e3031712af7be6c95..cdd516a7ad021fe7182eaa004a09abc946ecac7e 100644 (file)
--- 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/active-tab-left.tiff b/basis/ui/gadgets/theme/active-tab-left.tiff
deleted file mode 100644 (file)
index 8a6c05f..0000000
Binary files a/basis/ui/gadgets/theme/active-tab-left.tiff and /dev/null differ

diff --git a/basis/ui/gadgets/theme/active-tab-lip.tiff b/basis/ui/gadgets/theme/active-tab-lip.tiff
deleted file mode 100644 (file)
index 8ff803f..0000000
Binary files a/basis/ui/gadgets/theme/active-tab-lip.tiff and /dev/null differ

diff --git a/basis/ui/gadgets/theme/active-tab-middle.tiff b/basis/ui/gadgets/theme/active-tab-middle.tiff
deleted file mode 100644 (file)
index 0f40e93..0000000
Binary files a/basis/ui/gadgets/theme/active-tab-middle.tiff and /dev/null differ

diff --git a/basis/ui/gadgets/theme/active-tab-right.tiff b/basis/ui/gadgets/theme/active-tab-right.tiff
deleted file mode 100644 (file)
index b56dc01..0000000
Binary files a/basis/ui/gadgets/theme/active-tab-right.tiff and /dev/null differ

diff --git a/basis/ui/gadgets/theme/authors.txt b/basis/ui/gadgets/theme/authors.txt
deleted file mode 100644 (file)
index 580f882..0000000
--- a/basis/ui/gadgets/theme/authors.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Slava Pestov
-Joe Groff

diff --git a/basis/ui/gadgets/theme/button-clicked-left.tiff b/basis/ui/gadgets/theme/button-clicked-left.tiff
deleted file mode 100644 (file)
index ad85bf1..0000000
Binary files a/basis/ui/gadgets/theme/button-clicked-left.tiff and /dev/null differ

diff --git a/basis/ui/gadgets/theme/button-clicked-middle.tiff b/basis/ui/gadgets/theme/button-clicked-middle.tiff
deleted file mode 100644 (file)
index 4573006..0000000
Binary files a/basis/ui/gadgets/theme/button-clicked-middle.tiff and /dev/null differ

diff --git a/basis/ui/gadgets/theme/button-clicked-right.tiff b/basis/ui/gadgets/theme/button-clicked-right.tiff
deleted file mode 100644 (file)
index ee70645..0000000
Binary files a/basis/ui/gadgets/theme/button-clicked-right.tiff and /dev/null differ

diff --git a/basis/ui/gadgets/theme/button-left.tiff b/basis/ui/gadgets/theme/button-left.tiff
deleted file mode 100644 (file)
index dba2fc4..0000000
Binary files a/basis/ui/gadgets/theme/button-left.tiff and /dev/null differ

diff --git a/basis/ui/gadgets/theme/button-middle.tiff b/basis/ui/gadgets/theme/button-middle.tiff
deleted file mode 100644 (file)
index 0c6c353..0000000
Binary files a/basis/ui/gadgets/theme/button-middle.tiff and /dev/null differ

diff --git a/basis/ui/gadgets/theme/button-right.tiff b/basis/ui/gadgets/theme/button-right.tiff
deleted file mode 100644 (file)
index aaff61e..0000000
Binary files a/basis/ui/gadgets/theme/button-right.tiff and /dev/null differ

diff --git a/basis/ui/gadgets/theme/checkbox-clicked.tiff b/basis/ui/gadgets/theme/checkbox-clicked.tiff
deleted file mode 100644 (file)
index 57026d4..0000000
Binary files a/basis/ui/gadgets/theme/checkbox-clicked.tiff and /dev/null differ

diff --git a/basis/ui/gadgets/theme/checkbox-set-clicked.tiff b/basis/ui/gadgets/theme/checkbox-set-clicked.tiff
deleted file mode 100644 (file)
index b8d5ce5..0000000
Binary files a/basis/ui/gadgets/theme/checkbox-set-clicked.tiff and /dev/null differ

diff --git a/basis/ui/gadgets/theme/checkbox-set.tiff b/basis/ui/gadgets/theme/checkbox-set.tiff
deleted file mode 100644 (file)
index 6f737a7..0000000
Binary files a/basis/ui/gadgets/theme/checkbox-set.tiff and /dev/null differ

diff --git a/basis/ui/gadgets/theme/checkbox.tiff b/basis/ui/gadgets/theme/checkbox.tiff
deleted file mode 100644 (file)
index 570d9e4..0000000
Binary files a/basis/ui/gadgets/theme/checkbox.tiff and /dev/null differ

diff --git a/basis/ui/gadgets/theme/clear-button-clicked.tiff b/basis/ui/gadgets/theme/clear-button-clicked.tiff
deleted file mode 100644 (file)
index 52e0e4a..0000000
Binary files a/basis/ui/gadgets/theme/clear-button-clicked.tiff and /dev/null differ

diff --git a/basis/ui/gadgets/theme/clear-button.tiff b/basis/ui/gadgets/theme/clear-button.tiff
deleted file mode 100644 (file)
index 5e66e39..0000000
Binary files a/basis/ui/gadgets/theme/clear-button.tiff and /dev/null differ

diff --git a/basis/ui/gadgets/theme/horizontal-scroller-handle-grip.tiff b/basis/ui/gadgets/theme/horizontal-scroller-handle-grip.tiff
deleted file mode 100644 (file)
index 3d7bd5e..0000000
Binary files a/basis/ui/gadgets/theme/horizontal-scroller-handle-grip.tiff and /dev/null differ

diff --git a/basis/ui/gadgets/theme/horizontal-scroller-handle-left.tiff b/basis/ui/gadgets/theme/horizontal-scroller-handle-left.tiff
deleted file mode 100644 (file)
index 1870426..0000000
Binary files a/basis/ui/gadgets/theme/horizontal-scroller-handle-left.tiff and /dev/null differ

diff --git a/basis/ui/gadgets/theme/horizontal-scroller-handle-middle.tiff b/basis/ui/gadgets/theme/horizontal-scroller-handle-middle.tiff
deleted file mode 100644 (file)
index 1b28ba4..0000000
Binary files a/basis/ui/gadgets/theme/horizontal-scroller-handle-middle.tiff and /dev/null differ

diff --git a/basis/ui/gadgets/theme/horizontal-scroller-handle-right.tiff b/basis/ui/gadgets/theme/horizontal-scroller-handle-right.tiff
deleted file mode 100644 (file)
index 2590b00..0000000
Binary files a/basis/ui/gadgets/theme/horizontal-scroller-handle-right.tiff and /dev/null differ

diff --git a/basis/ui/gadgets/theme/horizontal-scroller-left.tiff b/basis/ui/gadgets/theme/horizontal-scroller-left.tiff
deleted file mode 100644 (file)
index 0a03caa..0000000
Binary files a/basis/ui/gadgets/theme/horizontal-scroller-left.tiff and /dev/null differ

diff --git a/basis/ui/gadgets/theme/horizontal-scroller-leftarrow-clicked.tiff b/basis/ui/gadgets/theme/horizontal-scroller-leftarrow-clicked.tiff
deleted file mode 100644 (file)
index 311be25..0000000
Binary files a/basis/ui/gadgets/theme/horizontal-scroller-leftarrow-clicked.tiff and /dev/null differ

diff --git a/basis/ui/gadgets/theme/horizontal-scroller-middle.tiff b/basis/ui/gadgets/theme/horizontal-scroller-middle.tiff
deleted file mode 100644 (file)
index 22bb1be..0000000
Binary files a/basis/ui/gadgets/theme/horizontal-scroller-middle.tiff and /dev/null differ

diff --git a/basis/ui/gadgets/theme/horizontal-scroller-right-disabled.tiff b/basis/ui/gadgets/theme/horizontal-scroller-right-disabled.tiff
deleted file mode 100644 (file)
index ccf31bf..0000000
Binary files a/basis/ui/gadgets/theme/horizontal-scroller-right-disabled.tiff and /dev/null differ

diff --git a/basis/ui/gadgets/theme/horizontal-scroller-right.tiff b/basis/ui/gadgets/theme/horizontal-scroller-right.tiff
deleted file mode 100644 (file)
index 4aebaba..0000000
Binary files a/basis/ui/gadgets/theme/horizontal-scroller-right.tiff and /dev/null differ

diff --git a/basis/ui/gadgets/theme/horizontal-scroller-rightarrow-clicked.tiff b/basis/ui/gadgets/theme/horizontal-scroller-rightarrow-clicked.tiff
deleted file mode 100644 (file)
index 0efc9ae..0000000
Binary files a/basis/ui/gadgets/theme/horizontal-scroller-rightarrow-clicked.tiff and /dev/null differ

diff --git a/basis/ui/gadgets/theme/inactive-tab-left.tiff b/basis/ui/gadgets/theme/inactive-tab-left.tiff
deleted file mode 100644 (file)
index 164c008..0000000
Binary files a/basis/ui/gadgets/theme/inactive-tab-left.tiff and /dev/null differ

diff --git a/basis/ui/gadgets/theme/inactive-tab-middle.tiff b/basis/ui/gadgets/theme/inactive-tab-middle.tiff
deleted file mode 100644 (file)
index 3bdff5c..0000000
Binary files a/basis/ui/gadgets/theme/inactive-tab-middle.tiff and /dev/null differ

diff --git a/basis/ui/gadgets/theme/inactive-tab-right.tiff b/basis/ui/gadgets/theme/inactive-tab-right.tiff
deleted file mode 100644 (file)
index c0ddac6..0000000
Binary files a/basis/ui/gadgets/theme/inactive-tab-right.tiff and /dev/null differ

diff --git a/basis/ui/gadgets/theme/radio-clicked.tiff b/basis/ui/gadgets/theme/radio-clicked.tiff
deleted file mode 100644 (file)
index 3092f8b..0000000
Binary files a/basis/ui/gadgets/theme/radio-clicked.tiff and /dev/null differ

diff --git a/basis/ui/gadgets/theme/radio-set-clicked.tiff b/basis/ui/gadgets/theme/radio-set-clicked.tiff
deleted file mode 100644 (file)
index 21b2813..0000000
Binary files a/basis/ui/gadgets/theme/radio-set-clicked.tiff and /dev/null differ

diff --git a/basis/ui/gadgets/theme/radio-set.tiff b/basis/ui/gadgets/theme/radio-set.tiff
deleted file mode 100644 (file)
index 291b464..0000000
Binary files a/basis/ui/gadgets/theme/radio-set.tiff and /dev/null differ

diff --git a/basis/ui/gadgets/theme/radio.tiff b/basis/ui/gadgets/theme/radio.tiff
deleted file mode 100644 (file)
index 3494443..0000000
Binary files a/basis/ui/gadgets/theme/radio.tiff and /dev/null differ

diff --git a/basis/ui/gadgets/theme/resources.txt b/basis/ui/gadgets/theme/resources.txt
deleted file mode 100644 (file)
index 72238b4..0000000
--- a/basis/ui/gadgets/theme/resources.txt
+++ /dev/null
@@ -1 +0,0 @@
-*.tiff

diff --git a/basis/ui/gadgets/theme/summary.txt b/basis/ui/gadgets/theme/summary.txt
deleted file mode 100644 (file)
index 327f0d2..0000000
--- a/basis/ui/gadgets/theme/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Common colors and gradients used by the UI

diff --git a/basis/ui/gadgets/theme/theme.factor b/basis/ui/gadgets/theme/theme.factor
deleted file mode 100644 (file)
index ac19fa5..0000000
--- 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 <image-name> ;

diff --git a/basis/ui/gadgets/theme/vertical-scroller-bottom-disabled.tiff b/basis/ui/gadgets/theme/vertical-scroller-bottom-disabled.tiff
deleted file mode 100644 (file)
index ea7e118..0000000
Binary files a/basis/ui/gadgets/theme/vertical-scroller-bottom-disabled.tiff and /dev/null differ

diff --git a/basis/ui/gadgets/theme/vertical-scroller-bottom.tiff b/basis/ui/gadgets/theme/vertical-scroller-bottom.tiff
deleted file mode 100644 (file)
index 17eb84c..0000000
Binary files a/basis/ui/gadgets/theme/vertical-scroller-bottom.tiff and /dev/null differ

diff --git a/basis/ui/gadgets/theme/vertical-scroller-downarrow-clicked.tiff b/basis/ui/gadgets/theme/vertical-scroller-downarrow-clicked.tiff
deleted file mode 100644 (file)
index 8a06d05..0000000
Binary files a/basis/ui/gadgets/theme/vertical-scroller-downarrow-clicked.tiff and /dev/null differ

diff --git a/basis/ui/gadgets/theme/vertical-scroller-handle-bottom.tiff b/basis/ui/gadgets/theme/vertical-scroller-handle-bottom.tiff
deleted file mode 100644 (file)
index 1151cfc..0000000
Binary files a/basis/ui/gadgets/theme/vertical-scroller-handle-bottom.tiff and /dev/null differ

diff --git a/basis/ui/gadgets/theme/vertical-scroller-handle-grip.tiff b/basis/ui/gadgets/theme/vertical-scroller-handle-grip.tiff
deleted file mode 100644 (file)
index 6bb514c..0000000
Binary files a/basis/ui/gadgets/theme/vertical-scroller-handle-grip.tiff and /dev/null differ

diff --git a/basis/ui/gadgets/theme/vertical-scroller-handle-middle.tiff b/basis/ui/gadgets/theme/vertical-scroller-handle-middle.tiff
deleted file mode 100644 (file)
index cac14e0..0000000
Binary files a/basis/ui/gadgets/theme/vertical-scroller-handle-middle.tiff and /dev/null differ

diff --git a/basis/ui/gadgets/theme/vertical-scroller-handle-top.tiff b/basis/ui/gadgets/theme/vertical-scroller-handle-top.tiff
deleted file mode 100644 (file)
index 4f982a8..0000000
Binary files a/basis/ui/gadgets/theme/vertical-scroller-handle-top.tiff and /dev/null differ

diff --git a/basis/ui/gadgets/theme/vertical-scroller-middle.tiff b/basis/ui/gadgets/theme/vertical-scroller-middle.tiff
deleted file mode 100644 (file)
index 5d759a1..0000000
Binary files a/basis/ui/gadgets/theme/vertical-scroller-middle.tiff and /dev/null differ

diff --git a/basis/ui/gadgets/theme/vertical-scroller-top.tiff b/basis/ui/gadgets/theme/vertical-scroller-top.tiff
deleted file mode 100644 (file)
index f271136..0000000
Binary files a/basis/ui/gadgets/theme/vertical-scroller-top.tiff and /dev/null differ

diff --git a/basis/ui/gadgets/theme/vertical-scroller-uparrow-clicked.tiff b/basis/ui/gadgets/theme/vertical-scroller-uparrow-clicked.tiff
deleted file mode 100644 (file)
index 4ee2ef4..0000000
Binary files a/basis/ui/gadgets/theme/vertical-scroller-uparrow-clicked.tiff and /dev/null differ

diff --git a/basis/ui/theme/images/active-tab-left.tiff b/basis/ui/theme/images/active-tab-left.tiff
new file mode 100644 (file)
index 0000000..8a6c05f
Binary files /dev/null and b/basis/ui/theme/images/active-tab-left.tiff differ

diff --git a/basis/ui/theme/images/active-tab-lip.tiff b/basis/ui/theme/images/active-tab-lip.tiff
new file mode 100644 (file)
index 0000000..8ff803f
Binary files /dev/null and b/basis/ui/theme/images/active-tab-lip.tiff differ

diff --git a/basis/ui/theme/images/active-tab-middle.tiff b/basis/ui/theme/images/active-tab-middle.tiff
new file mode 100644 (file)
index 0000000..0f40e93
Binary files /dev/null and b/basis/ui/theme/images/active-tab-middle.tiff differ

diff --git a/basis/ui/theme/images/active-tab-right.tiff b/basis/ui/theme/images/active-tab-right.tiff
new file mode 100644 (file)
index 0000000..b56dc01
Binary files /dev/null and b/basis/ui/theme/images/active-tab-right.tiff differ

diff --git a/basis/ui/theme/images/authors.txt b/basis/ui/theme/images/authors.txt
new file mode 100644 (file)
index 0000000..580f882
--- /dev/null
+++ b/basis/ui/theme/images/authors.txt
@@ -0,0 +1,2 @@
+Slava Pestov
+Joe Groff

diff --git a/basis/ui/theme/images/button-clicked-left.tiff b/basis/ui/theme/images/button-clicked-left.tiff
new file mode 100644 (file)
index 0000000..ad85bf1
Binary files /dev/null and b/basis/ui/theme/images/button-clicked-left.tiff differ

diff --git a/basis/ui/theme/images/button-clicked-middle.tiff b/basis/ui/theme/images/button-clicked-middle.tiff
new file mode 100644 (file)
index 0000000..4573006
Binary files /dev/null and b/basis/ui/theme/images/button-clicked-middle.tiff differ

diff --git a/basis/ui/theme/images/button-clicked-right.tiff b/basis/ui/theme/images/button-clicked-right.tiff
new file mode 100644 (file)
index 0000000..ee70645
Binary files /dev/null and b/basis/ui/theme/images/button-clicked-right.tiff differ

diff --git a/basis/ui/theme/images/button-left.tiff b/basis/ui/theme/images/button-left.tiff
new file mode 100644 (file)
index 0000000..dba2fc4
Binary files /dev/null and b/basis/ui/theme/images/button-left.tiff differ

diff --git a/basis/ui/theme/images/button-middle.tiff b/basis/ui/theme/images/button-middle.tiff
new file mode 100644 (file)
index 0000000..0c6c353
Binary files /dev/null and b/basis/ui/theme/images/button-middle.tiff differ

diff --git a/basis/ui/theme/images/button-right.tiff b/basis/ui/theme/images/button-right.tiff
new file mode 100644 (file)
index 0000000..aaff61e
Binary files /dev/null and b/basis/ui/theme/images/button-right.tiff differ

diff --git a/basis/ui/theme/images/checkbox-clicked.tiff b/basis/ui/theme/images/checkbox-clicked.tiff
new file mode 100644 (file)
index 0000000..57026d4
Binary files /dev/null and b/basis/ui/theme/images/checkbox-clicked.tiff differ

diff --git a/basis/ui/theme/images/checkbox-set-clicked.tiff b/basis/ui/theme/images/checkbox-set-clicked.tiff
new file mode 100644 (file)
index 0000000..b8d5ce5
Binary files /dev/null and b/basis/ui/theme/images/checkbox-set-clicked.tiff differ

diff --git a/basis/ui/theme/images/checkbox-set.tiff b/basis/ui/theme/images/checkbox-set.tiff
new file mode 100644 (file)
index 0000000..6f737a7
Binary files /dev/null and b/basis/ui/theme/images/checkbox-set.tiff differ

diff --git a/basis/ui/theme/images/checkbox.tiff b/basis/ui/theme/images/checkbox.tiff
new file mode 100644 (file)
index 0000000..570d9e4
Binary files /dev/null and b/basis/ui/theme/images/checkbox.tiff differ

diff --git a/basis/ui/theme/images/clear-button-clicked.tiff b/basis/ui/theme/images/clear-button-clicked.tiff
new file mode 100644 (file)
index 0000000..52e0e4a
Binary files /dev/null and b/basis/ui/theme/images/clear-button-clicked.tiff differ

diff --git a/basis/ui/theme/images/clear-button.tiff b/basis/ui/theme/images/clear-button.tiff
new file mode 100644 (file)
index 0000000..5e66e39
Binary files /dev/null and b/basis/ui/theme/images/clear-button.tiff differ

diff --git a/basis/ui/theme/images/horizontal-scroller-handle-grip.tiff b/basis/ui/theme/images/horizontal-scroller-handle-grip.tiff
new file mode 100644 (file)
index 0000000..3d7bd5e
Binary files /dev/null and b/basis/ui/theme/images/horizontal-scroller-handle-grip.tiff differ

diff --git a/basis/ui/theme/images/horizontal-scroller-handle-left.tiff b/basis/ui/theme/images/horizontal-scroller-handle-left.tiff
new file mode 100644 (file)
index 0000000..1870426
Binary files /dev/null and b/basis/ui/theme/images/horizontal-scroller-handle-left.tiff differ

diff --git a/basis/ui/theme/images/horizontal-scroller-handle-middle.tiff b/basis/ui/theme/images/horizontal-scroller-handle-middle.tiff
new file mode 100644 (file)
index 0000000..1b28ba4
Binary files /dev/null and b/basis/ui/theme/images/horizontal-scroller-handle-middle.tiff differ

diff --git a/basis/ui/theme/images/horizontal-scroller-handle-right.tiff b/basis/ui/theme/images/horizontal-scroller-handle-right.tiff
new file mode 100644 (file)
index 0000000..2590b00
Binary files /dev/null and b/basis/ui/theme/images/horizontal-scroller-handle-right.tiff differ

diff --git a/basis/ui/theme/images/horizontal-scroller-left.tiff b/basis/ui/theme/images/horizontal-scroller-left.tiff
new file mode 100644 (file)
index 0000000..0a03caa
Binary files /dev/null and b/basis/ui/theme/images/horizontal-scroller-left.tiff differ

diff --git a/basis/ui/theme/images/horizontal-scroller-leftarrow-clicked.tiff b/basis/ui/theme/images/horizontal-scroller-leftarrow-clicked.tiff
new file mode 100644 (file)
index 0000000..311be25
Binary files /dev/null and b/basis/ui/theme/images/horizontal-scroller-leftarrow-clicked.tiff differ

diff --git a/basis/ui/theme/images/horizontal-scroller-middle.tiff b/basis/ui/theme/images/horizontal-scroller-middle.tiff
new file mode 100644 (file)
index 0000000..22bb1be
Binary files /dev/null and b/basis/ui/theme/images/horizontal-scroller-middle.tiff differ

diff --git a/basis/ui/theme/images/horizontal-scroller-right-disabled.tiff b/basis/ui/theme/images/horizontal-scroller-right-disabled.tiff
new file mode 100644 (file)
index 0000000..ccf31bf
Binary files /dev/null and b/basis/ui/theme/images/horizontal-scroller-right-disabled.tiff differ

diff --git a/basis/ui/theme/images/horizontal-scroller-right.tiff b/basis/ui/theme/images/horizontal-scroller-right.tiff
new file mode 100644 (file)
index 0000000..4aebaba
Binary files /dev/null and b/basis/ui/theme/images/horizontal-scroller-right.tiff differ

diff --git a/basis/ui/theme/images/horizontal-scroller-rightarrow-clicked.tiff b/basis/ui/theme/images/horizontal-scroller-rightarrow-clicked.tiff
new file mode 100644 (file)
index 0000000..0efc9ae
Binary files /dev/null and b/basis/ui/theme/images/horizontal-scroller-rightarrow-clicked.tiff differ

diff --git a/basis/ui/theme/images/images.factor b/basis/ui/theme/images/images.factor
new file mode 100644 (file)
index 0000000..691500c
--- /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 <image-name> ;

diff --git a/basis/ui/theme/images/inactive-tab-left.tiff b/basis/ui/theme/images/inactive-tab-left.tiff
new file mode 100644 (file)
index 0000000..164c008
Binary files /dev/null and b/basis/ui/theme/images/inactive-tab-left.tiff differ

diff --git a/basis/ui/theme/images/inactive-tab-middle.tiff b/basis/ui/theme/images/inactive-tab-middle.tiff
new file mode 100644 (file)
index 0000000..3bdff5c
Binary files /dev/null and b/basis/ui/theme/images/inactive-tab-middle.tiff differ

diff --git a/basis/ui/theme/images/inactive-tab-right.tiff b/basis/ui/theme/images/inactive-tab-right.tiff
new file mode 100644 (file)
index 0000000..c0ddac6
Binary files /dev/null and b/basis/ui/theme/images/inactive-tab-right.tiff differ

diff --git a/basis/ui/theme/images/radio-clicked.tiff b/basis/ui/theme/images/radio-clicked.tiff
new file mode 100644 (file)
index 0000000..3092f8b
Binary files /dev/null and b/basis/ui/theme/images/radio-clicked.tiff differ

diff --git a/basis/ui/theme/images/radio-set-clicked.tiff b/basis/ui/theme/images/radio-set-clicked.tiff
new file mode 100644 (file)
index 0000000..21b2813
Binary files /dev/null and b/basis/ui/theme/images/radio-set-clicked.tiff differ

diff --git a/basis/ui/theme/images/radio-set.tiff b/basis/ui/theme/images/radio-set.tiff
new file mode 100644 (file)
index 0000000..291b464
Binary files /dev/null and b/basis/ui/theme/images/radio-set.tiff differ

diff --git a/basis/ui/theme/images/radio.tiff b/basis/ui/theme/images/radio.tiff
new file mode 100644 (file)
index 0000000..3494443
Binary files /dev/null and b/basis/ui/theme/images/radio.tiff differ

diff --git a/basis/ui/theme/images/resources.txt b/basis/ui/theme/images/resources.txt
new file mode 100644 (file)
index 0000000..72238b4
--- /dev/null
+++ b/basis/ui/theme/images/resources.txt
@@ -0,0 +1 @@
+*.tiff

diff --git a/basis/ui/theme/images/summary.txt b/basis/ui/theme/images/summary.txt
new file mode 100644 (file)
index 0000000..327f0d2
--- /dev/null
+++ b/basis/ui/theme/images/summary.txt
@@ -0,0 +1 @@
+Common colors and gradients used by the UI

diff --git a/basis/ui/theme/images/vertical-scroller-bottom-disabled.tiff b/basis/ui/theme/images/vertical-scroller-bottom-disabled.tiff
new file mode 100644 (file)
index 0000000..ea7e118
Binary files /dev/null and b/basis/ui/theme/images/vertical-scroller-bottom-disabled.tiff differ

diff --git a/basis/ui/theme/images/vertical-scroller-bottom.tiff b/basis/ui/theme/images/vertical-scroller-bottom.tiff
new file mode 100644 (file)
index 0000000..17eb84c
Binary files /dev/null and b/basis/ui/theme/images/vertical-scroller-bottom.tiff differ

diff --git a/basis/ui/theme/images/vertical-scroller-downarrow-clicked.tiff b/basis/ui/theme/images/vertical-scroller-downarrow-clicked.tiff
new file mode 100644 (file)
index 0000000..8a06d05
Binary files /dev/null and b/basis/ui/theme/images/vertical-scroller-downarrow-clicked.tiff differ

diff --git a/basis/ui/theme/images/vertical-scroller-handle-bottom.tiff b/basis/ui/theme/images/vertical-scroller-handle-bottom.tiff
new file mode 100644 (file)
index 0000000..1151cfc
Binary files /dev/null and b/basis/ui/theme/images/vertical-scroller-handle-bottom.tiff differ

diff --git a/basis/ui/theme/images/vertical-scroller-handle-grip.tiff b/basis/ui/theme/images/vertical-scroller-handle-grip.tiff
new file mode 100644 (file)
index 0000000..6bb514c
Binary files /dev/null and b/basis/ui/theme/images/vertical-scroller-handle-grip.tiff differ

diff --git a/basis/ui/theme/images/vertical-scroller-handle-middle.tiff b/basis/ui/theme/images/vertical-scroller-handle-middle.tiff
new file mode 100644 (file)
index 0000000..cac14e0
Binary files /dev/null and b/basis/ui/theme/images/vertical-scroller-handle-middle.tiff differ

diff --git a/basis/ui/theme/images/vertical-scroller-handle-top.tiff b/basis/ui/theme/images/vertical-scroller-handle-top.tiff
new file mode 100644 (file)
index 0000000..4f982a8
Binary files /dev/null and b/basis/ui/theme/images/vertical-scroller-handle-top.tiff differ

diff --git a/basis/ui/theme/images/vertical-scroller-middle.tiff b/basis/ui/theme/images/vertical-scroller-middle.tiff
new file mode 100644 (file)
index 0000000..5d759a1
Binary files /dev/null and b/basis/ui/theme/images/vertical-scroller-middle.tiff differ

diff --git a/basis/ui/theme/images/vertical-scroller-top.tiff b/basis/ui/theme/images/vertical-scroller-top.tiff
new file mode 100644 (file)
index 0000000..f271136
Binary files /dev/null and b/basis/ui/theme/images/vertical-scroller-top.tiff differ

diff --git a/basis/ui/theme/images/vertical-scroller-uparrow-clicked.tiff b/basis/ui/theme/images/vertical-scroller-uparrow-clicked.tiff
new file mode 100644 (file)
index 0000000..4ee2ef4
Binary files /dev/null and b/basis/ui/theme/images/vertical-scroller-uparrow-clicked.tiff differ

diff --git a/basis/ui/tools/browser/browser.factor b/basis/ui/tools/browser/browser.factor
index b9988798b2f03d17b05368f477697ff790b120d0..1cb761dd8c4bfc13e63bc34ea985d93f4e5afa1e 100644 (file)
--- 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 d2bb6ef48cec612fd0f4b76b7e1061b73ec0f979..63a961cbb6bc81c74964f1ad4aa30e043d6e39e1 100644 (file)
--- 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 3ea4e7e8aeb89dcf4f99b4ff815d83960c6658d7..01bdaff61eb8acd9324a1700441d1819ed785cb7 100644 (file)
--- 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 9ce14b0e2a932d903eead1e8dc3c1f9ecbbfded4..137d6e085f0d259cdc6a6b9a7de9761a75329899 100644 (file)
--- 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 435751db2b8bbd22766783ef8feef4af9b41e154..8b623f04b1f9555acdb6f4d8aedcd237d23d6882 100644 (file)
--- 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 56a8157b0d7b196f82b8d8ced19b336e12218b25..31e7325ab13ab7d2d860676b25b37dc8225c9624 100644 (file)
--- 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 18ee54bc87efb4f91896a426bd1bd8d0cfe93056..31d73109afc9e822109ee57bb84360abc220127c 100644 (file)
--- 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