made sidebar tabs use separate images for theming instead of one

	made sidebar tabs use separate images for theming instead of
	one monolithic image.  Added a directory of tab images to the
	arlo theme.

21 files changed, 26 insertions, 4 deletions

diff --git a/icons/arlo/Makefile.am b/icons/arlo/Makefile.am
index 50ca3afac..37b3d7e35 100644
--- a/icons/arlo/Makefile.am
+++ b/icons/arlo/Makefile.am
@@ -1,5 +1,7 @@
 arlodir = $(datadir)/pixmaps/nautilus/arlo
 
+SUBDIRS = sidebar_tab_pieces
+
 arlo_DATA =					\
 	arlo.xml				\
 	decrement.png				\
@@ -7,7 +9,6 @@ arlo_DATA =					\
 	i-regular.png				\
 	increment.png				\
 	number_strip.png			\
-	sidebar_tab_pieces.png			\
 	theme_preview.png			\
 	zoom_body.png
 		
diff --git a/icons/arlo/arlo.xml b/icons/arlo/arlo.xml
index 5840aab9f..5bf5e41ba 100644
--- a/icons/arlo/arlo.xml
+++ b/icons/arlo/arlo.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0"?>
 <theme name="arlo">
   <directory BACKGROUND_TILE_IMAGE="backgrounds/white_ribs.png"/>
-  <sidebar SIDEBAR_BACKGROUND_COLOR="rgb:6666/9999/9999-rgb:0000/3333/3333|90-rgb:0000/0000/0000:h" SIDEBAR_BACKGROUND_TILE_IMAGE="backgrounds/.striated.png" TAB_PIECE_IMAGE="sidebar_tab_pieces.png" COMBINE="TRUE"
-  		   PIECE_OFFSETS="1,1,20,4:1,13,20,13:1,47,20,61:1,123,20,139:1,212,20,220:1,5,20,8:1,14,20,14:1,62,20,76:1,16,20,30:1,221,20,229:1,9,20,12:1,15,24,15:1,93,24,107:1,157,20,173:1,194,20,194"
-  		   LEFT_OFFSET="0" LABEL_COLOR="rgb:FFFF/FFFF/FFFF" TAB_FONT="-*-helvetica-medium-i-normal-*-12-*-*-*-*-*-*-*" />
+  <sidebar SIDEBAR_BACKGROUND_COLOR="rgb:6666/9999/9999-rgb:0000/3333/3333|90-rgb:0000/0000/0000:h" SIDEBAR_BACKGROUND_TILE_IMAGE="backgrounds/.striated.png" TAB_PIECE_IMAGES="sidebar_tab_pieces" COMBINE="TRUE"
+  		   LEFT_OFFSET="0" TEXT_H_OFFSET="-4" LABEL_COLOR="rgb:FFFF/FFFF/FFFF" />
   <desktop BACKGROUND_TILE_IMAGE="backgrounds/ice.png"/>
   <zoom_control NUMBER_V_OFFSET="-11" DIGIT_WIDTH="6"/>
 </theme>
diff --git a/icons/arlo/sidebar_tab_pieces.png b/icons/arlo/sidebar_tab_pieces.png
deleted file mode 100644
index 89a152bfa..000000000
--- a/icons/arlo/sidebar_tab_pieces.png
+++ /dev/null
diff --git a/icons/arlo/sidebar_tab_pieces/.cvsignore b/icons/arlo/sidebar_tab_pieces/.cvsignore
new file mode 100644
index 000000000..282522db0
--- /dev/null
+++ b/icons/arlo/sidebar_tab_pieces/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/icons/arlo/sidebar_tab_pieces/Makefile.am b/icons/arlo/sidebar_tab_pieces/Makefile.am
new file mode 100644
index 000000000..8b056ba8e
--- /dev/null
+++ b/icons/arlo/sidebar_tab_pieces/Makefile.am
@@ -0,0 +1,20 @@
+arlotabdir = $(datadir)/pixmaps/nautilus/arlo/sidebar_tab_pieces
+
+arlo_tab_DATA =					\
+	fill-active.png				\
+	fill-empty-space.png			\
+	fill-prelight.png			\
+	fill.png				\
+	left-bumper-active.png			\
+	left-bumper-prelight.png		\
+	middle-normal-normal.png		\
+	middle-normal-prelight.png		\
+	middle-prelight-normal.png		\
+	right-bumper-prelight.png		\
+	right-bumper.png			\
+	right-empty-space.png			\
+	right-top-active.png			\
+	right-top-prelight.png			\
+	right-top.png
+		
+EXTRA_DIST = $(arlo_tab_DATA)
diff --git a/icons/arlo/sidebar_tab_pieces/fill-active.png b/icons/arlo/sidebar_tab_pieces/fill-active.png
new file mode 100644
index 000000000..c63c16212
--- /dev/null
+++ b/icons/arlo/sidebar_tab_pieces/fill-active.png
diff --git a/icons/arlo/sidebar_tab_pieces/fill-empty-space.png b/icons/arlo/sidebar_tab_pieces/fill-empty-space.png
new file mode 100644
index 000000000..985d6401d
--- /dev/null
+++ b/icons/arlo/sidebar_tab_pieces/fill-empty-space.png
diff --git a/icons/arlo/sidebar_tab_pieces/fill-prelight.png b/icons/arlo/sidebar_tab_pieces/fill-prelight.png
new file mode 100644
index 000000000..e88106c04
--- /dev/null
+++ b/icons/arlo/sidebar_tab_pieces/fill-prelight.png
diff --git a/icons/arlo/sidebar_tab_pieces/fill.png b/icons/arlo/sidebar_tab_pieces/fill.png
new file mode 100644
index 000000000..880e805c5
--- /dev/null
+++ b/icons/arlo/sidebar_tab_pieces/fill.png
diff --git a/icons/arlo/sidebar_tab_pieces/left-bumper-active.png b/icons/arlo/sidebar_tab_pieces/left-bumper-active.png
new file mode 100644
index 000000000..e38015985
--- /dev/null
+++ b/icons/arlo/sidebar_tab_pieces/left-bumper-active.png
diff --git a/icons/arlo/sidebar_tab_pieces/left-bumper-prelight.png b/icons/arlo/sidebar_tab_pieces/left-bumper-prelight.png
new file mode 100644
index 000000000..36eac28fd
--- /dev/null
+++ b/icons/arlo/sidebar_tab_pieces/left-bumper-prelight.png
diff --git a/icons/arlo/sidebar_tab_pieces/left-bumper.png b/icons/arlo/sidebar_tab_pieces/left-bumper.png
new file mode 100644
index 000000000..e178a7069
--- /dev/null
+++ b/icons/arlo/sidebar_tab_pieces/left-bumper.png
diff --git a/icons/arlo/sidebar_tab_pieces/middle-normal-normal.png b/icons/arlo/sidebar_tab_pieces/middle-normal-normal.png
new file mode 100644
index 000000000..95d72a451
--- /dev/null
+++ b/icons/arlo/sidebar_tab_pieces/middle-normal-normal.png
diff --git a/icons/arlo/sidebar_tab_pieces/middle-normal-prelight.png b/icons/arlo/sidebar_tab_pieces/middle-normal-prelight.png
new file mode 100644
index 000000000..420a131d0
--- /dev/null
+++ b/icons/arlo/sidebar_tab_pieces/middle-normal-prelight.png
diff --git a/icons/arlo/sidebar_tab_pieces/middle-prelight-normal.png b/icons/arlo/sidebar_tab_pieces/middle-prelight-normal.png
new file mode 100644
index 000000000..07e751acf
--- /dev/null
+++ b/icons/arlo/sidebar_tab_pieces/middle-prelight-normal.png
diff --git a/icons/arlo/sidebar_tab_pieces/right-bumper-prelight.png b/icons/arlo/sidebar_tab_pieces/right-bumper-prelight.png
new file mode 100644
index 000000000..bfc8a05c9
--- /dev/null
+++ b/icons/arlo/sidebar_tab_pieces/right-bumper-prelight.png
diff --git a/icons/arlo/sidebar_tab_pieces/right-bumper.png b/icons/arlo/sidebar_tab_pieces/right-bumper.png
new file mode 100644
index 000000000..c1f670ca8
--- /dev/null
+++ b/icons/arlo/sidebar_tab_pieces/right-bumper.png
diff --git a/icons/arlo/sidebar_tab_pieces/right-empty-space.png b/icons/arlo/sidebar_tab_pieces/right-empty-space.png
new file mode 100644
index 000000000..1307b81c0
--- /dev/null
+++ b/icons/arlo/sidebar_tab_pieces/right-empty-space.png
diff --git a/icons/arlo/sidebar_tab_pieces/right-top-active.png b/icons/arlo/sidebar_tab_pieces/right-top-active.png
new file mode 100644
index 000000000..dd4da7e0d
--- /dev/null
+++ b/icons/arlo/sidebar_tab_pieces/right-top-active.png
diff --git a/icons/arlo/sidebar_tab_pieces/right-top-prelight.png b/icons/arlo/sidebar_tab_pieces/right-top-prelight.png
new file mode 100644
index 000000000..38f6e5558
--- /dev/null
+++ b/icons/arlo/sidebar_tab_pieces/right-top-prelight.png
diff --git a/icons/arlo/sidebar_tab_pieces/right-top.png b/icons/arlo/sidebar_tab_pieces/right-top.png
new file mode 100644
index 000000000..fad6699cb
--- /dev/null
+++ b/icons/arlo/sidebar_tab_pieces/right-top.png