Fix blacknblack theme.

7 files changed, 3 insertions, 55 deletions

diff --git a/configure.ac b/configure.ac
index aa1eda3bd..6487b02c4 100755
--- a/configure.ac
+++ b/configure.ac
@@ -261,6 +261,7 @@ data/graphics/sprites/Makefile
 data/sfx/Makefile
 data/sfx/system/Makefile
 data/themes/Makefile
+data/themes/blacknblack/Makefile
 data/themes/blackwood/Makefile
 data/themes/classic/Makefile
 data/themes/enchilado/Makefile
diff --git a/data/themes/CMakeLists.txt b/data/themes/CMakeLists.txt
index 9a0fef1b2..ba1498108 100644
--- a/data/themes/CMakeLists.txt
+++ b/data/themes/CMakeLists.txt
@@ -1,3 +1,4 @@
+ADD_SUBDIRECTORY(blacknblack)
 ADD_SUBDIRECTORY(blackwood)
 ADD_SUBDIRECTORY(classic)
 ADD_SUBDIRECTORY(enchilado)
diff --git a/data/themes/Makefile.am b/data/themes/Makefile.am
index d0ec767d4..2df9751a7 100644
--- a/data/themes/Makefile.am
+++ b/data/themes/Makefile.am
@@ -1,4 +1,4 @@
 
-SUBDIRS = blackwood classic enchilado mana pink redandblack unity wood
+SUBDIRS = blacknblack blackwood classic enchilado mana pink redandblack unity wood
 
 EXTRA_DIST = CMakeLists.txt
diff --git a/data/themes/blacknblack/CMakeLists.txt b/data/themes/blacknblack/CMakeLists.txt
index b903ae1e8..473a61a2a 100644
--- a/data/themes/blacknblack/CMakeLists.txt
+++ b/data/themes/blacknblack/CMakeLists.txt
@@ -26,18 +26,10 @@ SET (FILES
     selection.png
     slider.png
     slider_hilight.png
-    speechbubble.xml
     sticky_button.png
     tab.png
     tab_hilight.png
     tabselected.png
-    target-cursor-blue-l.png
-    target-cursor-blue-m.png
-    target-cursor-blue-s.png
-    target-cursor-red-l.png
-    target-cursor-red-m.png
-    target-cursor-red-s.png
-    unknown-item.png
     vscroll_down_default.png
     vscroll_down_highlight.png
     vscroll_down_pressed.png
@@ -47,7 +39,6 @@ SET (FILES
     vscroll_up_highlight.png
     vscroll_up_pressed.png
     window.png
-    window.xml
     )
 
 INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/themes/blacknblack)
diff --git a/data/themes/blacknblack/Makefile.am b/data/themes/blacknblack/Makefile.am
index 78ba1c8a8..46ae20a9b 100644
--- a/data/themes/blacknblack/Makefile.am
+++ b/data/themes/blacknblack/Makefile.am
@@ -13,7 +13,6 @@ gui_DATA =				\
 	close_button.png		\
 	colors.xml		\
 	deepbox.png			\
-	window.xml				\
 	hscroll_left_default.png	\
 	hscroll_left_highlight.png	\
 	hscroll_left_pressed.png	\
@@ -30,18 +29,10 @@ gui_DATA =				\
 	selection.png			\
 	slider.png			\
 	slider_hilight.png		\
-	speechbubble.xml		\
 	sticky_button.png		\
 	tab.png				\
 	tab_hilight.png			\
 	tabselected.png			\
-	target-cursor-blue-l.png	\
-	target-cursor-blue-m.png	\
-	target-cursor-blue-s.png	\
-	target-cursor-red-l.png		\
-	target-cursor-red-m.png		\
-	target-cursor-red-s.png		\
-	unknown-item.png		\
 	vscroll_down_default.png	\
 	vscroll_down_highlight.png	\
 	vscroll_down_pressed.png	\
diff --git a/data/themes/blacknblack/speechbubble.xml b/data/themes/blacknblack/speechbubble.xml
deleted file mode 100644
index 84b6557b3..000000000
--- a/data/themes/blacknblack/speechbubble.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<skinset name="SpeechBubble" image="bubble.png">
-    <widget type="Window">
-        <!-- Top Row -->
-        <part type="top-left-corner" xpos="0" ypos="0" width="5" height="5" />
-	<part type="top-edge" xpos="5" ypos="0" width="5" height="5" />
-	<part type="top-right-corner" xpos="10" ypos="0" width="5" height="5" />
-
-	<!-- Middle Row -->
-	<part type="left-edge" xpos="0" ypos="5" width="5" height="5" />
-	<part type="bg-quad" xpos="5" ypos="5" width="5" height="5" />
-	<part type="right-edge" xpos="10" ypos="5" width="5" height="5" />
-
-	<!-- Bottom Row -->
-	<part type="bottom-left-corner" xpos="0" ypos="10" width="5" height="5" />
-	<part type="bottom-edge" xpos="5" ypos="10" width="5" height="5" />
-	<part type="bottom-right-corner" xpos="10" ypos="10" width="5" height="5" />
-	</widget>
-</skinset>
diff --git a/data/themes/blacknblack/window.xml b/data/themes/blacknblack/window.xml
deleted file mode 100644
index f27dbc7f3..000000000
--- a/data/themes/blacknblack/window.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<skinset name="Default" image="window.png">
-	<widget type="Window">
-		<!-- Top Row -->
-		<part type="top-left-corner" xpos="0" ypos="0" width="4" height="4" />
-		<part type="top-edge" xpos="4" ypos="0" width="32" height="4" />
-		<part type="top-right-corner" xpos="36" ypos="0" width="4" height="4" />
-
-		<!-- Middle Row -->
-		<part type="left-edge" xpos="0" ypos="4" width="4" height="216" />
-		<part type="bg-quad" xpos="4" ypos="4" width="32" height="216" />
-		<part type="right-edge" xpos="36" ypos="4" width="4" height="216" />
-
-		<!-- Bottom Row -->
-		<part type="bottom-left-corner" xpos="0" ypos="220" width="4" height="4" />
-		<part type="bottom-edge" xpos="4" ypos="220" width="32" height="4" />
-		<part type="bottom-right-corner" xpos="36" ypos="220" width="4" height="4" />
-	</widget>
-</skinset>