Actually move the kde files that were renamed in the last commit

31 files changed, 0 insertions, 948 deletions

diff --git a/kdeprint/slave/templates/CMakeLists.txt b/kdeprint/slave/templates/CMakeLists.txt
deleted file mode 100644
index f2344a0df..000000000
--- a/kdeprint/slave/templates/CMakeLists.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-#################################################
-#
-#  (C) 2010-2011 Serghei Amelian
-#  serghei (DOT) amelian (AT) gmail.com
-#
-#  Improvements and feedback are welcome
-#
-#  This file is released under GPL >= 2
-#
-#################################################
-
-install( FILES
-    class.template printer.template pseudo.template
-    jobs.template driver.template bar-bottom-left.png
-    bar-top-middle.png box-bottom-middle.png
-    box-top-middle.png bar-bottom-middle.png
-    bar-top-right.png box-bottom-right.png
-    box-top-right.png bar-bottom-right.png
-    bottom-left.png box-centre-tdeprint.png
-    top-left.png bar-middle-left.png bottom-middle.png
-    box-middle-left.png top-middle.png bar-middle-right.png
-    bottom-right.png box-middle-right.png top-right-tdeprint.png
-    bar-top-left.png box-bottom-left.png box-top-left.png
-    htmlstyles.css
-  DESTINATION ${DATA_INSTALL_DIR}/tdeprint/template )
diff --git a/kdeprint/slave/templates/Makefile.am b/kdeprint/slave/templates/Makefile.am
deleted file mode 100644
index 3f23f9d2d..000000000
--- a/kdeprint/slave/templates/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-template_DATA = class.template \
-		printer.template \
-		pseudo.template \
-		jobs.template \
-		driver.template \
-		bar-bottom-left.png \
-		bar-top-middle.png \
-		box-bottom-middle.png \
-		box-top-middle.png \
-		bar-bottom-middle.png \
-		bar-top-right.png \
-		box-bottom-right.png \
-		box-top-right.png \
-		bar-bottom-right.png \
-		bottom-left.png \
-		box-centre-tdeprint.png \
-		top-left.png \
-		bar-middle-left.png \
-		bottom-middle.png \
-		box-middle-left.png \
-		top-middle.png \
-		bar-middle-right.png \
-		bottom-right.png \
-		box-middle-right.png \
-		top-right-tdeprint.png \
-		bar-top-left.png \
-		box-bottom-left.png \
-		box-top-left.png \
-		htmlstyles.css
-
-templatedir = $(kde_datadir)/tdeprint/template
diff --git a/kdeprint/slave/templates/bar-bottom-left.png b/kdeprint/slave/templates/bar-bottom-left.png
deleted file mode 100644
index 30a323592..000000000
--- a/kdeprint/slave/templates/bar-bottom-left.png
+++ /dev/null
diff --git a/kdeprint/slave/templates/bar-bottom-middle.png b/kdeprint/slave/templates/bar-bottom-middle.png
deleted file mode 100644
index b2ebbbed5..000000000
--- a/kdeprint/slave/templates/bar-bottom-middle.png
+++ /dev/null
diff --git a/kdeprint/slave/templates/bar-bottom-right.png b/kdeprint/slave/templates/bar-bottom-right.png
deleted file mode 100644
index e664e1511..000000000
--- a/kdeprint/slave/templates/bar-bottom-right.png
+++ /dev/null
diff --git a/kdeprint/slave/templates/bar-middle-left.png b/kdeprint/slave/templates/bar-middle-left.png
deleted file mode 100644
index 72fda9ec2..000000000
--- a/kdeprint/slave/templates/bar-middle-left.png
+++ /dev/null
diff --git a/kdeprint/slave/templates/bar-middle-right.png b/kdeprint/slave/templates/bar-middle-right.png
deleted file mode 100644
index eb8d3201c..000000000
--- a/kdeprint/slave/templates/bar-middle-right.png
+++ /dev/null
diff --git a/kdeprint/slave/templates/bar-top-left.png b/kdeprint/slave/templates/bar-top-left.png
deleted file mode 100644
index b05fd216c..000000000
--- a/kdeprint/slave/templates/bar-top-left.png
+++ /dev/null
diff --git a/kdeprint/slave/templates/bar-top-middle.png b/kdeprint/slave/templates/bar-top-middle.png
deleted file mode 100644
index 387f81017..000000000
--- a/kdeprint/slave/templates/bar-top-middle.png
+++ /dev/null
diff --git a/kdeprint/slave/templates/bar-top-right.png b/kdeprint/slave/templates/bar-top-right.png
deleted file mode 100644
index a552ff91d..000000000
--- a/kdeprint/slave/templates/bar-top-right.png
+++ /dev/null
diff --git a/kdeprint/slave/templates/bottom-left.png b/kdeprint/slave/templates/bottom-left.png
deleted file mode 100644
index 78c9fece3..000000000
--- a/kdeprint/slave/templates/bottom-left.png
+++ /dev/null
diff --git a/kdeprint/slave/templates/bottom-middle.png b/kdeprint/slave/templates/bottom-middle.png
deleted file mode 100644
index 41e52dd8a..000000000
--- a/kdeprint/slave/templates/bottom-middle.png
+++ /dev/null
diff --git a/kdeprint/slave/templates/bottom-right.png b/kdeprint/slave/templates/bottom-right.png
deleted file mode 100644
index ef81b04a8..000000000
--- a/kdeprint/slave/templates/bottom-right.png
+++ /dev/null
diff --git a/kdeprint/slave/templates/box-bottom-left.png b/kdeprint/slave/templates/box-bottom-left.png
deleted file mode 100644
index 650fa5743..000000000
--- a/kdeprint/slave/templates/box-bottom-left.png
+++ /dev/null
diff --git a/kdeprint/slave/templates/box-bottom-middle.png b/kdeprint/slave/templates/box-bottom-middle.png
deleted file mode 100644
index 2bcd3ea03..000000000
--- a/kdeprint/slave/templates/box-bottom-middle.png
+++ /dev/null
diff --git a/kdeprint/slave/templates/box-bottom-right.png b/kdeprint/slave/templates/box-bottom-right.png
deleted file mode 100644
index 975aaeed7..000000000
--- a/kdeprint/slave/templates/box-bottom-right.png
+++ /dev/null
diff --git a/kdeprint/slave/templates/box-centre-kdeprint.png b/kdeprint/slave/templates/box-centre-kdeprint.png
deleted file mode 100644
index 97da1910e..000000000
--- a/kdeprint/slave/templates/box-centre-kdeprint.png
+++ /dev/null
diff --git a/kdeprint/slave/templates/box-middle-left.png b/kdeprint/slave/templates/box-middle-left.png
deleted file mode 100644
index 62a720178..000000000
--- a/kdeprint/slave/templates/box-middle-left.png
+++ /dev/null
diff --git a/kdeprint/slave/templates/box-middle-right.png b/kdeprint/slave/templates/box-middle-right.png
deleted file mode 100644
index aa94c0c90..000000000
--- a/kdeprint/slave/templates/box-middle-right.png
+++ /dev/null
diff --git a/kdeprint/slave/templates/box-top-left.png b/kdeprint/slave/templates/box-top-left.png
deleted file mode 100644
index 34aba9195..000000000
--- a/kdeprint/slave/templates/box-top-left.png
+++ /dev/null
diff --git a/kdeprint/slave/templates/box-top-middle.png b/kdeprint/slave/templates/box-top-middle.png
deleted file mode 100644
index 7ee2a0738..000000000
--- a/kdeprint/slave/templates/box-top-middle.png
+++ /dev/null
diff --git a/kdeprint/slave/templates/box-top-right.png b/kdeprint/slave/templates/box-top-right.png
deleted file mode 100644
index 26d16d313..000000000
--- a/kdeprint/slave/templates/box-top-right.png
+++ /dev/null
diff --git a/kdeprint/slave/templates/class.template b/kdeprint/slave/templates/class.template
deleted file mode 100644
index b6a79a1fd..000000000
--- a/kdeprint/slave/templates/class.template
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-  <meta name="generator" content=
-  "HTML Tidy for Linux/x86 (vers 1st August 2004), see www.w3.org" />
-
-  <title>%1</title>
-<style type="text/css">
-/*<![CDATA[*/
-img {margin: 0px; padding: 0px}
-body {margin: 0px; padding: 0px; background-color: #418ade;}
-.bar_text a {color: #008;};
-/*]]>*/
-</style>
-<link rel="stylesheet" href="htmlstyles.css" type="text/css" />
-</head>
-
-<body>
-  <div style=
-  "background-image: url(top-middle.png); width: 100%; height: 131px;">
-  <div style="position: absolute; right: 0px;">
-      <img src="top-right-tdeprint.png" style="margin: 0px" alt="" />
-    </div>
-
-    <div style="position: absolute; left: 0px;">
-      <img src="top-left.png" style="margin: 0px" alt="" />
-    </div>
-
-    <div style=
-    "position: absolute; top: 25px; right: 100px; text-align: right; font-size: xx-large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">
-    %1 <!-- Konqueror -->
-    </div>
-
-    <div style=
-    "position: absolute; top: 70px; right: 100px; text-align: right; font-size: large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">
-    %1 <!-- Conquer your Desktop -->
-    </div>
-  </div><!-- the bar -->
-
-  <div style=
-  "width: 100%; background-image: url(bar-middle-right.png); background-repeat: repeat-y; background-position: right; background-color: #57a1d8;">
-  <div style=
-  "width: 100%; height: 19px; background-image: url(bar-top-middle.png);">
-    <div style="width: 22px; height: 19px; float: left;">
-        <img src="bar-top-left.png" style="margin: 0px" alt="" />
-      </div>
-
-      <div style="width: 22px; height: 19px; float: right;">
-        <img src="bar-top-right.png" style="margin: 0px" alt="" />
-      </div>
-    </div>
-
-    <div style=
-    "width: 100%; background-image: url(bar-middle-left.png); background-repeat: repeat-y; text-align: center; color: white;"
-    class="bar_text">
-      %1      <!-- Menu -->
-    </div>
-
-    <div style=
-    "width: 100%; height: 25px; background-image: url(bar-bottom-middle.png);">
-    <div style="width: 22px; height: 25px; float: left;">
-        <img src="bar-bottom-left.png" style="margin: 0px" alt="" />
-      </div>
-
-      <div style="width: 22px; height: 25px; float: right;">
-        <img src="bar-bottom-right.png" style="margin: 0px" alt="" />
-      </div>
-    </div>
-  </div><!-- the main text box -->
-
-  <div align="center">
-    <div style=
-    "width: 90%; background-image: url(box-middle-right.png); background-repeat: repeat-y; background-position: right;">
-    <div style=
-    "width: 100%; height: 35px; background-image: url(box-top-middle.png);">
-      <div style="width: 20px; height: 35px; float: left;">
-          <img src="box-top-left.png" style="margin: 0px" alt="" />
-        </div>
-
-        <div style="width: 20px; height: 35px; float: right;">
-          <img src="box-top-right.png" style="margin: 0px" alt="" />
-        </div>
-      </div>
-
-      <div style=
-      "width: 100%; background-image: url(box-middle-left.png); background-repeat: repeat-y; text-align: center">
-      <div style=
-      "background-image: url(box-centre-tdeprint.png); background-repeat: no-repeat; background-color: #dfe7f3; background-position: top right; margin-left: 20px; margin-right: 20px;">
-	<h2 style="margin-top: 0px;"><img src="%1" width="32" height="32"/>&nbsp;%1<!--Title--></h2>
-	
-	<table border="1" cellspacing="0" cellpadding="1" width="100%">
-	  <tr class="top" align="left" valign="middle">
-	    <td>&nbsp;%1
-	      <!-- Printer Name --> </td>
-	  </tr>
-	  
-	  <tr>
-	    <td>
-	      <table border="1" cellspacing="0" cellpadding="2" width="100%">
-		<tr class="contentyellow">
-		  <td width="40%">%1 </td>
-		  
-		  <td width="58%">%1 <!--Type--></td>
-		</tr>
-		
-		<tr class="contentwhite">
-		  <td>%1 </td>
-		  
-		  <td>%1 <!-- State--></td>
-		</tr>
-		
-		<tr class="contentyellow">
-		  <td>%1 </td>
-		  
-		  <td>%1 <!-- Location --></td>
-		</tr>
-		
-		<tr class="contentwhite">
-		  <td>%1 </td>
-		  
-		  <td>%1 <!-- Description --></td>
-		</tr>
-		
-		<tr class="contentyellow">
-		  <td>%1 </td>
-		  
-		  <td>%1 <!-- URI --></td>
-		</tr>
-		
-	      </table>
-	    </td>
-	  </tr>
-	</table>
-	
-      </p>
-      
-      <p>
-	
-	<table border="1" cellspacing="0" cellpadding="2" width="100%">
-	  <tr class="top" align="left" valign="middle">
-	    <td>&nbsp;%1
-	      <!-- Members --></td>
-	  </tr>
-	  
-	  <tr>
-	    <td>
-	      <table border="1" cellspacing="0" cellpadding="2" width="100%">
-		<tr class="contentyellow">
-		  <td width="100%">%1</td>
-		  
-		</tr>
-		
-	      </table>
-	    </td>
-	  </tr>
-	</table>
-
-        </div>
-      </div>
-
-      <div style=
-      "width: 100%; height: 22px; background-image: url(box-bottom-middle.png);">
-      <div style="width: 25px; height: 22px; float: left;">
-          <img src="box-bottom-left.png" style="margin: 0px" alt="" />
-        </div>
-
-        <div style="width: 25px; height: 22px; float: right;">
-          <img src="box-bottom-right.png" style="margin: 0px" alt="" />
-        </div>
-      </div>
-    </div>
-  </div>
-
-  <div style=
-  "background-image: url(bottom-middle.png); width: 100%; height: 100px;">
-  <div style="position: absolute; right: 0px;">
-      <img src="bottom-right.png" style="margin: 0px" alt="" />
-    </div>
-
-    <div style="position: absolute; left: 0px;">
-      <img src="bottom-left.png" style="margin: 0px" alt="" />
-    </div>
-  </div>
-</body>
-</html>
diff --git a/kdeprint/slave/templates/driver.template b/kdeprint/slave/templates/driver.template
deleted file mode 100644
index 8ba428e74..000000000
--- a/kdeprint/slave/templates/driver.template
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-  <meta name="generator" content=
-  "HTML Tidy for Linux/x86 (vers 1st August 2004), see www.w3.org" />
-
-  <title>%1</title>
-<style type="text/css">
-/*<![CDATA[*/
-img {margin: 0px; padding: 0px}
-body {margin: 0px; padding: 0px; background-color: #418ade;}
-.bar_text a {color: #008;};
-/*]]>*/
-</style>
-<link rel="stylesheet" href="htmlstyles.css" type="text/css" />
-</head>
-
-<body>
-  <div style=
-  "background-image: url(top-middle.png); width: 100%; height: 131px;">
-  <div style="position: absolute; right: 0px;">
-      <img src="top-right-tdeprint.png" style="margin: 0px" alt="" />
-    </div>
-
-    <div style="position: absolute; left: 0px;">
-      <img src="top-left.png" style="margin: 0px" alt="" />
-    </div>
-
-    <div style=
-    "position: absolute; top: 25px; right: 100px; text-align: right; font-size: xx-large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">
-    %1 <!-- Konqueror -->
-    </div>
-
-    <div style=
-    "position: absolute; top: 70px; right: 100px; text-align: right; font-size: large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">
-    %1 <!-- Conquer your Desktop -->
-    </div>
-  </div><!-- the bar -->
-
-  <div style=
-  "width: 100%; background-image: url(bar-middle-right.png); background-repeat: repeat-y; background-position: right; background-color: #57a1d8;">
-  <div style=
-  "width: 100%; height: 19px; background-image: url(bar-top-middle.png);">
-    <div style="width: 22px; height: 19px; float: left;">
-        <img src="bar-top-left.png" style="margin: 0px" alt="" />
-      </div>
-
-      <div style="width: 22px; height: 19px; float: right;">
-        <img src="bar-top-right.png" style="margin: 0px" alt="" />
-      </div>
-    </div>
-
-    <div style=
-    "width: 100%; background-image: url(bar-middle-left.png); background-repeat: repeat-y; text-align: center; color: white;"
-    class="bar_text">
-      %1      <!-- Menu -->
-    </div>
-
-    <div style=
-    "width: 100%; height: 25px; background-image: url(bar-bottom-middle.png);">
-    <div style="width: 22px; height: 25px; float: left;">
-        <img src="bar-bottom-left.png" style="margin: 0px" alt="" />
-      </div>
-
-      <div style="width: 22px; height: 25px; float: right;">
-        <img src="bar-bottom-right.png" style="margin: 0px" alt="" />
-      </div>
-    </div>
-  </div><!-- the main text box -->
-
-  <div align="center">
-    <div style=
-    "width: 90%; background-image: url(box-middle-right.png); background-repeat: repeat-y; background-position: right;">
-    <div style=
-    "width: 100%; height: 35px; background-image: url(box-top-middle.png);">
-      <div style="width: 20px; height: 35px; float: left;">
-          <img src="box-top-left.png" style="margin: 0px" alt="" />
-        </div>
-
-        <div style="width: 20px; height: 35px; float: right;">
-          <img src="box-top-right.png" style="margin: 0px" alt="" />
-        </div>
-      </div>
-
-      <div style=
-      "width: 100%; background-image: url(box-middle-left.png); background-repeat: repeat-y; text-align: center">
-      <div style=
-      "background-image: url(box-centre-tdeprint.png); background-repeat: no-repeat; background-color: #dfe7f3; background-position: top right; margin-left: 20px; margin-right: 20px;">
-	<h2 style="margin-top: 0px;"><img src="%1" width="32" height="32"/>&nbsp;%1<!--Title--></h2>
-	
-	<table border="1" cellspacing="0" cellpadding="1" width="100%">
-	  <tr>
-	    <td>
-	      <table border="1" cellspacing="0" cellpadding="2" width="100%">
-		
-		%1
-		
-	      </table>
-	    </td>
-	  </tr>
-	</table>
-
-        </div>
-      </div>
-
-      <div style=
-      "width: 100%; height: 22px; background-image: url(box-bottom-middle.png);">
-      <div style="width: 25px; height: 22px; float: left;">
-          <img src="box-bottom-left.png" style="margin: 0px" alt="" />
-        </div>
-
-        <div style="width: 25px; height: 22px; float: right;">
-          <img src="box-bottom-right.png" style="margin: 0px" alt="" />
-        </div>
-      </div>
-    </div>
-  </div>
-
-  <div style=
-  "background-image: url(bottom-middle.png); width: 100%; height: 100px;">
-  <div style="position: absolute; right: 0px;">
-      <img src="bottom-right.png" style="margin: 0px" alt="" />
-    </div>
-
-    <div style="position: absolute; left: 0px;">
-      <img src="bottom-left.png" style="margin: 0px" alt="" />
-    </div>
-  </div>
-</body>
-</html>
diff --git a/kdeprint/slave/templates/htmlstyles.css b/kdeprint/slave/templates/htmlstyles.css
deleted file mode 100644
index 650ed76db..000000000
--- a/kdeprint/slave/templates/htmlstyles.css
+++ /dev/null
@@ -1,38 +0,0 @@
-td.main { background-color: #505050;}
-td.logo { background-color: #DDDDDD;}
-td.lines { background-color: #DDDDDD;
-           background-image: url(lines.png);}
-td.trans { background-repeat: no-repeat;}
-td.end { background-image: url(lines2.png);
-         background-repeat: x-repeat;}
-td.shadow1 { background-image: url(shadow1.png);
-             background-repeat: x-repeat;}
-tr.top { font-family: sans-serif;
-              color: #ffffff;
-              background-color: #505050}
-tr.contentyellow { font-family: sans-serif;
-                   color: #000000;
-                   background-color: #fff4c9}
-tr.contentwhite { font-family: sans-serif;
-                  color: #000000;
-                  background-color: #FFFFFF}
-tr.menurow {background-color: #505050;
-            color: #000000;
-            vertical-align: middle;}
-td.deco      {color: #ffffff;
-             background-color: #505050;
-             font-family: sans-serif;
-             font-size: small;}
-td.menuactive      {color: #ffcc00;
-             background-color: #777777;
-             font-family: sans-serif;
-             font-size: small;}
-td.menu      {color: #ffffff;
-             background-color: #505050;
-             font-family: sans-serif;}
-a.menu 	    {color: #eeeeee;
-            font-family: sans-serif;
-            font-size: small;}
-a.menu:hover {color: #ffffff;
-              text-decoration: none;}
-
diff --git a/kdeprint/slave/templates/jobs.template b/kdeprint/slave/templates/jobs.template
deleted file mode 100644
index 684899aba..000000000
--- a/kdeprint/slave/templates/jobs.template
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-  <meta name="generator" content=
-  "HTML Tidy for Linux/x86 (vers 1st August 2004), see www.w3.org" />
-
-  <title>%1</title>
-<style type="text/css">
-/*<![CDATA[*/
-img {margin: 0px; padding: 0px}
-body {margin: 0px; padding: 0px; background-color: #418ade;}
-.bar_text a {color: #008;};
-/*]]>*/
-</style>
-<link rel="stylesheet" href="htmlstyles.css" type="text/css" />
-</head>
-
-<body>
-  <div style=
-  "background-image: url(top-middle.png); width: 100%; height: 131px;">
-  <div style="position: absolute; right: 0px;">
-      <img src="top-right-tdeprint.png" style="margin: 0px" alt="" />
-    </div>
-
-    <div style="position: absolute; left: 0px;">
-      <img src="top-left.png" style="margin: 0px" alt="" />
-    </div>
-
-    <div style=
-    "position: absolute; top: 25px; right: 100px; text-align: right; font-size: xx-large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">
-    %1 <!-- Konqueror -->
-    </div>
-
-    <div style=
-    "position: absolute; top: 70px; right: 100px; text-align: right; font-size: large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">
-    %1 <!-- Conquer your Desktop -->
-    </div>
-  </div><!-- the bar -->
-
-  <div style=
-  "width: 100%; background-image: url(bar-middle-right.png); background-repeat: repeat-y; background-position: right; background-color: #57a1d8;">
-  <div style=
-  "width: 100%; height: 19px; background-image: url(bar-top-middle.png);">
-    <div style="width: 22px; height: 19px; float: left;">
-        <img src="bar-top-left.png" style="margin: 0px" alt="" />
-      </div>
-
-      <div style="width: 22px; height: 19px; float: right;">
-        <img src="bar-top-right.png" style="margin: 0px" alt="" />
-      </div>
-    </div>
-
-    <div style=
-    "width: 100%; background-image: url(bar-middle-left.png); background-repeat: repeat-y; text-align: center; color: white;"
-    class="bar_text">
-      %1      <!-- Menu -->
-    </div>
-
-    <div style=
-    "width: 100%; height: 25px; background-image: url(bar-bottom-middle.png);">
-    <div style="width: 22px; height: 25px; float: left;">
-        <img src="bar-bottom-left.png" style="margin: 0px" alt="" />
-      </div>
-
-      <div style="width: 22px; height: 25px; float: right;">
-        <img src="bar-bottom-right.png" style="margin: 0px" alt="" />
-      </div>
-    </div>
-  </div><!-- the main text box -->
-
-  <div align="center">
-    <div style=
-    "width: 90%; background-image: url(box-middle-right.png); background-repeat: repeat-y; background-position: right;">
-    <div style=
-    "width: 100%; height: 35px; background-image: url(box-top-middle.png);">
-      <div style="width: 20px; height: 35px; float: left;">
-          <img src="box-top-left.png" style="margin: 0px" alt="" />
-        </div>
-
-        <div style="width: 20px; height: 35px; float: right;">
-          <img src="box-top-right.png" style="margin: 0px" alt="" />
-        </div>
-      </div>
-
-      <div style=
-      "width: 100%; background-image: url(box-middle-left.png); background-repeat: repeat-y; text-align: center">
-      <div style=
-      "background-image: url(box-centre-tdeprint.png); background-repeat: no-repeat; background-color: #dfe7f3; background-position: top right; margin-left: 20px; margin-right: 20px;">
-	<h2 style="margin-top: 0px;"><img src="%1" width="32" height="32"/>&nbsp;%1<!--Title--></h2>
-	
-	<table border="1" cellspacing="0" cellpadding="1" width="100%">
-	  <tr>
-	    <td>
-	      <table border="1" cellspacing="0" cellpadding="2" width="100%">
-		<tr class="top">
-		  <td width="10%">%1</td>
-		  <td width="15%">%1</td>
-		  <td width="20%">%1</td>
-		  <td width="40%">%1</td>
-		  <td width="15%">%1</td>
-		</tr>
-		
-		%1
-		
-	      </table>
-	    </td>
-	  </tr>
-	</table>
-
-        </div>
-      </div>
-
-      <div style=
-      "width: 100%; height: 22px; background-image: url(box-bottom-middle.png);">
-      <div style="width: 25px; height: 22px; float: left;">
-          <img src="box-bottom-left.png" style="margin: 0px" alt="" />
-        </div>
-
-        <div style="width: 25px; height: 22px; float: right;">
-          <img src="box-bottom-right.png" style="margin: 0px" alt="" />
-        </div>
-      </div>
-    </div>
-  </div>
-
-  <div style=
-  "background-image: url(bottom-middle.png); width: 100%; height: 100px;">
-  <div style="position: absolute; right: 0px;">
-      <img src="bottom-right.png" style="margin: 0px" alt="" />
-    </div>
-
-    <div style="position: absolute; left: 0px;">
-      <img src="bottom-left.png" style="margin: 0px" alt="" />
-    </div>
-  </div>
-</body>
-</html>
diff --git a/kdeprint/slave/templates/printer.template b/kdeprint/slave/templates/printer.template
deleted file mode 100644
index 3bdfa8665..000000000
--- a/kdeprint/slave/templates/printer.template
+++ /dev/null
@@ -1,205 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-  <meta name="generator" content=
-  "HTML Tidy for Linux/x86 (vers 1st August 2004), see www.w3.org" />
-
-  <title>%1</title>
-<style type="text/css">
-/*<![CDATA[*/
-img {margin: 0px; padding: 0px}
-body {margin: 0px; padding: 0px; background-color: #418ade;}
-.bar_text a {color: #008;};
-/*]]>*/
-</style>
-<link rel="stylesheet" href="htmlstyles.css" type="text/css" />
-</head>
-
-<body>
-  <div style=
-  "background-image: url(top-middle.png); width: 100%; height: 131px;">
-  <div style="position: absolute; right: 0px;">
-      <img src="top-right-tdeprint.png" style="margin: 0px" alt="" />
-    </div>
-
-    <div style="position: absolute; left: 0px;">
-      <img src="top-left.png" style="margin: 0px" alt="" />
-    </div>
-
-    <div style=
-    "position: absolute; top: 25px; right: 100px; text-align: right; font-size: xx-large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">
-    %1 <!-- Konqueror -->
-    </div>
-
-    <div style=
-    "position: absolute; top: 70px; right: 100px; text-align: right; font-size: large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">
-    %1 <!-- Conquer your Desktop -->
-    </div>
-  </div><!-- the bar -->
-
-  <div style=
-  "width: 100%; background-image: url(bar-middle-right.png); background-repeat: repeat-y; background-position: right; background-color: #57a1d8;">
-  <div style=
-  "width: 100%; height: 19px; background-image: url(bar-top-middle.png);">
-    <div style="width: 22px; height: 19px; float: left;">
-        <img src="bar-top-left.png" style="margin: 0px" alt="" />
-      </div>
-
-      <div style="width: 22px; height: 19px; float: right;">
-        <img src="bar-top-right.png" style="margin: 0px" alt="" />
-      </div>
-    </div>
-
-    <div style=
-    "width: 100%; background-image: url(bar-middle-left.png); background-repeat: repeat-y; text-align: center; color: white;"
-    class="bar_text">
-      %1      <!-- Menu -->
-    </div>
-
-    <div style=
-    "width: 100%; height: 25px; background-image: url(bar-bottom-middle.png);">
-    <div style="width: 22px; height: 25px; float: left;">
-        <img src="bar-bottom-left.png" style="margin: 0px" alt="" />
-      </div>
-
-      <div style="width: 22px; height: 25px; float: right;">
-        <img src="bar-bottom-right.png" style="margin: 0px" alt="" />
-      </div>
-    </div>
-  </div><!-- the main text box -->
-
-  <div align="center">
-    <div style=
-    "width: 90%; background-image: url(box-middle-right.png); background-repeat: repeat-y; background-position: right;">
-    <div style=
-    "width: 100%; height: 35px; background-image: url(box-top-middle.png);">
-      <div style="width: 20px; height: 35px; float: left;">
-          <img src="box-top-left.png" style="margin: 0px" alt="" />
-        </div>
-
-        <div style="width: 20px; height: 35px; float: right;">
-          <img src="box-top-right.png" style="margin: 0px" alt="" />
-        </div>
-      </div>
-
-      <div style=
-      "width: 100%; background-image: url(box-middle-left.png); background-repeat: repeat-y; text-align: center">
-      <div style=
-      "background-image: url(box-centre-tdeprint.png); background-repeat: no-repeat; background-color: #dfe7f3; background-position: top right; margin-left: 20px; margin-right: 20px;">
-	<h2 style="margin-top: 0px;"><img src="%1" width="32" height="32"/>&nbsp;%1<!--Title--></h2>
-	
-	<table border="1" cellspacing="0" cellpadding="1" width="100%">
-	  <tr class="top" align="left" valign="middle">
-	    <td>&nbsp;%1
-	      <!-- Printer Name --> </td>
-	  </tr>
-	  
-	  <tr>
-	    <td>
-	      <table border="1" cellspacing="0" cellpadding="2" width="100%">
-		<tr class="contentyellow">
-		  <td width="41%">%1 </td>
-		  
-		  <td width="59%">%1 <!--Type--></td>
-		</tr>
-		
-		<tr class="contentwhite">
-		  <td>%1 </td>
-		  
-		  <td>%1 <!-- State--></td>
-		</tr>
-		
-		<tr class="contentyellow">
-		  <td>%1 </td>
-		  
-		  <td>%1 <!-- Location --></td>
-		</tr>
-		
-		<tr class="contentwhite">
-		  <td>%1 </td>
-		  
-		  <td>%1 <!-- Description --></td>
-		</tr>
-		
-		<tr class="contentyellow">
-		  <td>%1 </td>
-		  
-		  <td>%1 <!-- URI --></td>
-		</tr>
-		
-		<tr class="contentwhite">
-		  <td>%1 </td>
-		  
-		  <td>%1 <!-- Interface --></td>
-		</tr>
-	      </table>
-	    </td>
-	  </tr>
-	</table>
-	
-      </p>
-      
-      <p>
-	
-	<table border="1" cellspacing="0" cellpadding="2" width="100%">
-	  <tr class="top" align="left" valign="middle">
-	    <td>&nbsp;%1 <!-- Driver --></td>
-	  </tr>
-	  
-	  <tr>
-	    <td>
-	      <table border="1" cellspacing="0" cellpadding="2" width="100%">
-		<tr class="contentyellow">
-		  <td width="41%">%1 </td>
-		  
-		  <td width="59%">%1
-		    <!--Manufacturer--></td>
-		</tr>
-		
-		<tr class="contentwhite">
-		  <td>%1 </td>
-		  
-		  <td>%1 <!-- Model--></td>
-		</tr>
-		
-		<tr class="contentyellow">
-		  <td>%1 </td>
-		  
-		  <td>%1 <!-- Driver Informaton --></td>
-		</tr>
-	      </table>
-	    </td>
-	  </tr>
-	</table>
-
-        </div>
-      </div>
-
-      <div style=
-      "width: 100%; height: 22px; background-image: url(box-bottom-middle.png);">
-      <div style="width: 25px; height: 22px; float: left;">
-          <img src="box-bottom-left.png" style="margin: 0px" alt="" />
-        </div>
-
-        <div style="width: 25px; height: 22px; float: right;">
-          <img src="box-bottom-right.png" style="margin: 0px" alt="" />
-        </div>
-      </div>
-    </div>
-  </div>
-
-  <div style=
-  "background-image: url(bottom-middle.png); width: 100%; height: 100px;">
-  <div style="position: absolute; right: 0px;">
-      <img src="bottom-right.png" style="margin: 0px" alt="" />
-    </div>
-
-    <div style="position: absolute; left: 0px;">
-      <img src="bottom-left.png" style="margin: 0px" alt="" />
-    </div>
-  </div>
-</body>
-</html>
diff --git a/kdeprint/slave/templates/pseudo.template b/kdeprint/slave/templates/pseudo.template
deleted file mode 100644
index a5acc24d1..000000000
--- a/kdeprint/slave/templates/pseudo.template
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-  <meta name="generator" content=
-  "HTML Tidy for Linux/x86 (vers 1st August 2004), see www.w3.org" />
-
-  <title>%1</title>
-<style type="text/css">
-/*<![CDATA[*/
-img {margin: 0px; padding: 0px}
-body {margin: 0px; padding: 0px; background-color: #418ade;}
-.bar_text a {color: #008;};
-/*]]>*/
-</style>
-<link rel="stylesheet" href="htmlstyles.css" type="text/css" />
-</head>
-
-<body>
-  <div style=
-  "background-image: url(top-middle.png); width: 100%; height: 131px;">
-  <div style="position: absolute; right: 0px;">
-      <img src="top-right-tdeprint.png" style="margin: 0px" alt="" />
-    </div>
-
-    <div style="position: absolute; left: 0px;">
-      <img src="top-left.png" style="margin: 0px" alt="" />
-    </div>
-
-    <div style=
-    "position: absolute; top: 25px; right: 100px; text-align: right; font-size: xx-large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">
-    %1 <!-- Konqueror -->
-    </div>
-
-    <div style=
-    "position: absolute; top: 70px; right: 100px; text-align: right; font-size: large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">
-    %1 <!-- Conquer your Desktop -->
-    </div>
-  </div><!-- the bar -->
-
-  <div style=
-  "width: 100%; background-image: url(bar-middle-right.png); background-repeat: repeat-y; background-position: right; background-color: #57a1d8;">
-  <div style=
-  "width: 100%; height: 19px; background-image: url(bar-top-middle.png);">
-    <div style="width: 22px; height: 19px; float: left;">
-        <img src="bar-top-left.png" style="margin: 0px" alt="" />
-      </div>
-
-      <div style="width: 22px; height: 19px; float: right;">
-        <img src="bar-top-right.png" style="margin: 0px" alt="" />
-      </div>
-    </div>
-
-    <div style=
-    "width: 100%; background-image: url(bar-middle-left.png); background-repeat: repeat-y; text-align: center; color: white;"
-    class="bar_text">
-      %1      <!-- Menu -->
-    </div>
-
-    <div style=
-    "width: 100%; height: 25px; background-image: url(bar-bottom-middle.png);">
-    <div style="width: 22px; height: 25px; float: left;">
-        <img src="bar-bottom-left.png" style="margin: 0px" alt="" />
-      </div>
-
-      <div style="width: 22px; height: 25px; float: right;">
-        <img src="bar-bottom-right.png" style="margin: 0px" alt="" />
-      </div>
-    </div>
-  </div><!-- the main text box -->
-
-  <div align="center">
-    <div style=
-    "width: 90%; background-image: url(box-middle-right.png); background-repeat: repeat-y; background-position: right;">
-    <div style=
-    "width: 100%; height: 35px; background-image: url(box-top-middle.png);">
-      <div style="width: 20px; height: 35px; float: left;">
-          <img src="box-top-left.png" style="margin: 0px" alt="" />
-        </div>
-
-        <div style="width: 20px; height: 35px; float: right;">
-          <img src="box-top-right.png" style="margin: 0px" alt="" />
-        </div>
-      </div>
-
-      <div style=
-      "width: 100%; background-image: url(box-middle-left.png); background-repeat: repeat-y; text-align: center">
-      <div style=
-      "background-image: url(box-centre-tdeprint.png); background-repeat: no-repeat; background-color: #dfe7f3; background-position: top right; margin-left: 20px; margin-right: 20px;">
-	<h2 style="margin-top: 0px;"><img src="%1" width="32" height="32"/>&nbsp;%1<!--Title--></h2>
-	  
-	    <table border="1" cellspacing="0" cellpadding="1" width="100%">
-	      <tr class="top" align="left" valign="middle">
-		<td>&nbsp;%1
-		  <!-- Printer Name --> </td>
-	      </tr>
-	      
-	      <tr>
-		<td>
-		  <table border="1" cellspacing="0" cellpadding="2" width="100%">
-		    <tr class="contentyellow">
-		      <td width="41%">%1 </td>
-		      
-		      <td width="59%">%1 <!--Type--></td>
-		    </tr>
-		    
-		    <tr class="contentwhite">
-		      <td>%1 </td>
-		      
-		      <td>%1 <!-- State--></td>
-		    </tr>
-		    
-		    <tr class="contentyellow">
-		      <td>%1 </td>
-		      
-		      <td>%1 <!-- Location --></td>
-		    </tr>
-		    
-		  </table>
-		</td>
-	      </tr>
-	    </table>
-	    
-	  </p>
-	  
-	  <p>
-	    
-	    <table border="1" cellspacing="0" cellpadding="2" width="100%">
-	      <tr class="top" align="left" valign="middle">
-		<td>&nbsp;%1 <!-- Command Properties --></td>
-	      </tr>
-	      
-	      <tr>
-		<td>
-		  <table border="1" cellspacing="0" cellpadding="2" width="100%">
-		    <tr class="contentyellow">
-		      <td width="40%">%1 </td>
-		      
-		      <td width="58%">%1
-			<!--Command--></td>
-		    </tr>
-		    
-		    <tr class="contentwhite">
-		      <td>%1 </td>
-		      
-		      <td>%1 <!-- Use Output File --></td>
-		    </tr>
-		    
-		    <tr class="contentyellow">
-		      <td>%1 </td>
-		      
-		      <td>%1 <!-- Default Extension --></td>
-		    </tr>
-		  </table>
-		</td>
-	      </tr>
-	    </table>
-
-        </div>
-      </div>
-
-      <div style=
-      "width: 100%; height: 22px; background-image: url(box-bottom-middle.png);">
-      <div style="width: 25px; height: 22px; float: left;">
-          <img src="box-bottom-left.png" style="margin: 0px" alt="" />
-        </div>
-
-        <div style="width: 25px; height: 22px; float: right;">
-          <img src="box-bottom-right.png" style="margin: 0px" alt="" />
-        </div>
-      </div>
-    </div>
-  </div>
-
-  <div style=
-  "background-image: url(bottom-middle.png); width: 100%; height: 100px;">
-  <div style="position: absolute; right: 0px;">
-      <img src="bottom-right.png" style="margin: 0px" alt="" />
-    </div>
-
-    <div style="position: absolute; left: 0px;">
-      <img src="bottom-left.png" style="margin: 0px" alt="" />
-    </div>
-  </div>
-</body>
-</html>
diff --git a/kdeprint/slave/templates/top-left.png b/kdeprint/slave/templates/top-left.png
deleted file mode 100644
index d7551c0d5..000000000
--- a/kdeprint/slave/templates/top-left.png
+++ /dev/null
diff --git a/kdeprint/slave/templates/top-middle.png b/kdeprint/slave/templates/top-middle.png
deleted file mode 100644
index bb3fe7428..000000000
--- a/kdeprint/slave/templates/top-middle.png
+++ /dev/null
diff --git a/kdeprint/slave/templates/top-right-kdeprint.png b/kdeprint/slave/templates/top-right-kdeprint.png
deleted file mode 100644
index 56717342c..000000000
--- a/kdeprint/slave/templates/top-right-kdeprint.png
+++ /dev/null