From 0e1e8272db01010eb8c998e4bc2c70750a08f451 Mon Sep 17 00:00:00 2001
From: "David A. Cuadrado" <krawek@gmail.com>
Date: Sat, 1 Dec 2007 10:36:17 -0500
Subject: [PATCH] Modified palette file format

---
 src/components/colorpalette/palettedocument.cpp    | 60 ++--------------------
 src/components/colorpalette/paletteparser.cpp      | 58 ++++++---------------
 src/components/colorpalette/palettes/Bears.dpl     |  4 +-
 src/components/colorpalette/palettes/Bgold.dpl     |  4 +-
 src/components/colorpalette/palettes/Blues.dpl     |  4 +-
 src/components/colorpalette/palettes/Borders.dpl   |  4 +-
 .../colorpalette/palettes/BrownsAndYellows.dpl     |  4 +-
 src/components/colorpalette/palettes/Caramel.dpl   |  4 +-
 src/components/colorpalette/palettes/Cascade.dpl   |  4 +-
 src/components/colorpalette/palettes/China.dpl     |  4 +-
 src/components/colorpalette/palettes/Coldfire.dpl  |  4 +-
 .../colorpalette/palettes/CoolColors.dpl           |  4 +-
 src/components/colorpalette/palettes/Cranes.dpl    |  4 +-
 .../colorpalette/palettes/Darkpastels.dpl          |  4 +-
 src/components/colorpalette/palettes/Default.dpl   |  4 +-
 src/components/colorpalette/palettes/Ega.dpl       |  4 +-
 src/components/colorpalette/palettes/Firecode.dpl  |  4 +-
 src/components/colorpalette/palettes/Gold.dpl      |  4 +-
 .../colorpalette/palettes/GrayViolet.dpl           |  4 +-
 src/components/colorpalette/palettes/Grayblue.dpl  |  4 +-
 src/components/colorpalette/palettes/Grays.dpl     |  4 +-
 src/components/colorpalette/palettes/Greens.dpl    |  4 +-
 src/components/colorpalette/palettes/Hilite.dpl    |  4 +-
 src/components/colorpalette/palettes/Khaki.dpl     |  4 +-
 src/components/colorpalette/palettes/Lights.dpl    |  4 +-
 src/components/colorpalette/palettes/Muted.dpl     |  4 +-
 .../colorpalette/palettes/NamedColors.dpl          |  4 +-
 src/components/colorpalette/palettes/News3.dpl     |  4 +-
 src/components/colorpalette/palettes/Op2.dpl       |  4 +-
 src/components/colorpalette/palettes/Paintjet.dpl  |  4 +-
 src/components/colorpalette/palettes/Pastels.dpl   |  4 +-
 src/components/colorpalette/palettes/Plasma.dpl    |  4 +-
 src/components/colorpalette/palettes/Reds.dpl      |  4 +-
 .../colorpalette/palettes/RedsAndPurples.dpl       |  4 +-
 src/components/colorpalette/palettes/Royal.dpl     |  4 +-
 .../palettes/TangoIconThemePalette.dpl             |  4 +-
 .../colorpalette/palettes/Topographic.dpl          |  4 +-
 src/components/colorpalette/palettes/Visibone.dpl  |  4 +-
 src/components/colorpalette/palettes/Visibone2.dpl |  4 +-
 src/components/colorpalette/palettes/Volcano.dpl   |  4 +-
 .../colorpalette/palettes/WarmColors.dpl           |  4 +-
 src/components/colorpalette/palettes/Web.dpl       |  4 +-
 42 files changed, 99 insertions(+), 179 deletions(-)

diff --git a/src/components/colorpalette/palettedocument.cpp b/src/components/colorpalette/palettedocument.cpp
index 9388b3a..692e42d 100644
--- a/src/components/colorpalette/palettedocument.cpp
+++ b/src/components/colorpalette/palettedocument.cpp
@@ -20,6 +20,8 @@
 
 #include "palettedocument.h"
 
+#include <yamf/item/serializer.h>
+
 namespace Component {
 
 PaletteDocument::PaletteDocument(const QString &name, bool isEditable) : QDomDocument()
@@ -27,7 +29,7 @@ PaletteDocument::PaletteDocument(const QString &name, bool isEditable) : QDomDoc
 	QDomProcessingInstruction header = this->createProcessingInstruction("xml","version=\"1.0\" encoding=\"UTF-8\"");
 	this->appendChild(header);
 	
-	QDomElement root = createElement( "Palette" );
+	QDomElement root = createElement( "palette" );
 	root.setAttribute("name", name);
 	
 	if ( isEditable )
@@ -59,61 +61,7 @@ void PaletteDocument::addColor(const QColor &color)
 
 void PaletteDocument::addGradient(const QGradient &gradient)
 {
-	QDomElement element = createElement("gradient");
-	
-	element.setAttribute("type", gradient.type() );
-	element.setAttribute("spread", gradient.spread() );
-	const QGradient *gr = &gradient;
-	switch( gradient.type() )
-	{
-		case QGradient::LinearGradient:
-		{
-			element.setAttribute("startX", static_cast<const QLinearGradient *>(gr)->start().x() );
-			element.setAttribute("startY", static_cast<const QLinearGradient *>(gr)->start().y() );
-				
-			element.setAttribute("finalX", static_cast<const QLinearGradient *>(gr)->finalStop().x() );
-			element.setAttribute("finalY", static_cast<const QLinearGradient *>(gr)->finalStop().y() );
-		}
-		break;
-		case QGradient::RadialGradient:
-		{
-			element.setAttribute("centerX", static_cast<const QRadialGradient *>(gr)->center().x() );
-			element.setAttribute("centerY", static_cast<const QRadialGradient *>(gr)->center().y() );
-				
-			element.setAttribute("focalX", static_cast<const QRadialGradient *>(gr)->focalPoint().x() );
-			element.setAttribute("focalY", static_cast<const QRadialGradient *>(gr)->focalPoint().y() );
-				
-			element.setAttribute("radius", static_cast<const QRadialGradient *>(gr)->radius() );
-		}
-		break;
-		case QGradient::ConicalGradient:
-		{
-			element.setAttribute("centerX", static_cast<const QRadialGradient *>(gr)->center().x() );
-			element.setAttribute("centerY", static_cast<const QRadialGradient *>(gr)->center().y() );
-				
-			element.setAttribute("angle", static_cast<const QConicalGradient *>(gr)->angle() );
-		}
-		break;
-		case QGradient::NoGradient:
-		{
-		}
-		break;
-	}
-	
-	
-	QGradientStops stops = gradient.stops();
-	
-	foreach(QGradientStop stop, stops)
-	{
-		QDomElement stopElement = createElement("stop");
-		stopElement.setAttribute("value", stop.first );
-		stopElement.setAttribute("color", stop.second.name());
-		stopElement.setAttribute("alpha", stop.second.alpha());
-		
-		element.appendChild(stopElement);
-	}
-	
-	documentElement().appendChild(element);
+	documentElement().appendChild(YAMF::Item::Serializer::gradient(&gradient, *this));
 }
 
 void PaletteDocument::setElements(const QList<QBrush > &brushes)
diff --git a/src/components/colorpalette/paletteparser.cpp b/src/components/colorpalette/paletteparser.cpp
index f77e1ca..de7c9b4 100644
--- a/src/components/colorpalette/paletteparser.cpp
+++ b/src/components/colorpalette/paletteparser.cpp
@@ -21,10 +21,22 @@
 #include "paletteparser.h"
 #include <dcore/debug.h>
 
+#include <yamf/item/serializer.h>
+
 namespace Component {
 
 struct PaletteParser::Private
 {
+		Private() : isEditable(false), gradient(0)
+		{
+		}
+		~Private()
+		{
+			delete gradient;
+		}
+		
+		
+		
 		QString root, qname;
 		QString paletteName;
 		bool isEditable;
@@ -32,32 +44,22 @@ struct PaletteParser::Private
 		
 		QGradientStops gradientStops;
 		QGradient *gradient;
-		
-		~Private()
-		{
-			delete gradient;
-		}
 };
 
 PaletteParser::PaletteParser(): DCore::XmlParserBase(), d(new Private)
 {
-// 	DINIT;
-	 d->paletteName = "";
-	 d->isEditable = false;
-	 d->gradient = 0;
 }
 
 
 PaletteParser::~PaletteParser()
 {
 	delete d;
-// 	DEND;
 }
 
 
 bool PaletteParser::startTag(const QString &tag, const QXmlAttributes &atts)
 {
-	if(root() == "Palette")
+	if(root() == "palette")
 	{
 		if(tag == root())
 		{
@@ -88,37 +90,7 @@ bool PaletteParser::startTag(const QString &tag, const QXmlAttributes &atts)
 		else if(tag == "gradient" )
 		{
 			if ( d->gradient ) delete d->gradient;
-			d->gradient = 0;
-			
-			d->gradientStops.clear();
-			
-			QGradient::Type type = QGradient::Type(atts.value("type").toInt());
-			QGradient::Spread spread = QGradient::Spread(atts.value("spread").toInt());
-			switch( type )
-			{
-				case QGradient::LinearGradient:
-				{
-					d->gradient = new QLinearGradient(atts.value("startX").toDouble(),atts.value("startY").toDouble(),atts.value("finalX").toDouble(), atts.value("finalY").toDouble());
-				}
-				break;
-				case QGradient::RadialGradient:
-				{
-					d->gradient = new QRadialGradient(atts.value("centerX").toDouble(),atts.value("centerY").toDouble(), atts.value("radius").toDouble(),atts.value("focalX").toDouble(),atts.value("focalY").toDouble() );
-				}
-				break;
-				case QGradient::ConicalGradient:
-				{
-					d->gradient = new QConicalGradient(atts.value("centerX").toDouble(),atts.value("centerY").toDouble(),atts.value("angle").toDouble());
-				}
-				break;
-				default:
-				{
-					dFatal() << "No gradient type: " << type;
-				}
-				break;
-				
-			}
-			d->gradient->setSpread(spread);
+			d->gradient = YAMF::Item::Serializer::createGradient(atts);
 		}
 		else if(tag == "stop" )
 		{
@@ -133,7 +105,7 @@ bool PaletteParser::startTag(const QString &tag, const QXmlAttributes &atts)
 
 bool PaletteParser::endTag(const QString& tag)
 {
-	if ( root() == "Palette" )
+	if ( root() == "palette" )
 	{
 		if ( tag == "gradient" && d->gradient )
 		{
diff --git a/src/components/colorpalette/palettes/Bears.dpl b/src/components/colorpalette/palettes/Bears.dpl
index b77e1d3..c952016 100644
--- a/src/components/colorpalette/palettes/Bears.dpl
+++ b/src/components/colorpalette/palettes/Bears.dpl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Palette editable="false" name="Bears" >
+<palette editable="false" name="Bears" >
  <color name="#080808" alpha="255" />
  <color name="#442c2c" alpha="255" />
  <color name="#50080c" alpha="255" />
@@ -256,4 +256,4 @@
  <color name="#00385c" alpha="255" />
  <color name="#000004" alpha="255" />
  <color name="#000000" alpha="255" />
-</Palette>
+</palette>
diff --git a/src/components/colorpalette/palettes/Bgold.dpl b/src/components/colorpalette/palettes/Bgold.dpl
index d74705b..061440b 100644
--- a/src/components/colorpalette/palettes/Bgold.dpl
+++ b/src/components/colorpalette/palettes/Bgold.dpl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Palette editable="false" name="Bgold" >
+<palette editable="false" name="Bgold" >
  <color name="#ecd814" alpha="255" />
  <color name="#ecd814" alpha="255" />
  <color name="#ecd814" alpha="255" />
@@ -256,4 +256,4 @@
  <color name="#3c4874" alpha="255" />
  <color name="#404874" alpha="255" />
  <color name="#444870" alpha="255" />
-</Palette>
+</palette>
diff --git a/src/components/colorpalette/palettes/Blues.dpl b/src/components/colorpalette/palettes/Blues.dpl
index a0797f2..3d84358 100644
--- a/src/components/colorpalette/palettes/Blues.dpl
+++ b/src/components/colorpalette/palettes/Blues.dpl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Palette editable="false" name="Blues" >
+<palette editable="false" name="Blues" >
  <color name="#000000" alpha="255" />
  <color name="#000000" alpha="255" />
  <color name="#000004" alpha="255" />
@@ -256,4 +256,4 @@
  <color name="#000008" alpha="255" />
  <color name="#000000" alpha="255" />
  <color name="#000000" alpha="255" />
-</Palette>
+</palette>
diff --git a/src/components/colorpalette/palettes/Borders.dpl b/src/components/colorpalette/palettes/Borders.dpl
index 6bbd3ef..e4781b7 100644
--- a/src/components/colorpalette/palettes/Borders.dpl
+++ b/src/components/colorpalette/palettes/Borders.dpl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Palette editable="false" name="Borders" >
+<palette editable="false" name="Borders" >
  <color name="#cc34b4" alpha="255" />
  <color name="#cc34b4" alpha="255" />
  <color name="#cc34b8" alpha="255" />
@@ -256,4 +256,4 @@
  <color name="#d03ca4" alpha="255" />
  <color name="#d038a8" alpha="255" />
  <color name="#d038ac" alpha="255" />
-</Palette>
+</palette>
diff --git a/src/components/colorpalette/palettes/BrownsAndYellows.dpl b/src/components/colorpalette/palettes/BrownsAndYellows.dpl
index 9edccd9..135e477 100644
--- a/src/components/colorpalette/palettes/BrownsAndYellows.dpl
+++ b/src/components/colorpalette/palettes/BrownsAndYellows.dpl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Palette editable="false" name="Browns And Yellows" >
+<palette editable="false" name="Browns And Yellows" >
  <color name="#bdb76b" alpha="255" />
  <color name="#f0e68c" alpha="255" />
  <color name="#eee8aa" alpha="255" />
@@ -22,4 +22,4 @@
  <color name="#d2691e" alpha="255" />
  <color name="#ffa500" alpha="255" />
  <color name="#ff8c00" alpha="255" />
-</Palette>
+</palette>
diff --git a/src/components/colorpalette/palettes/Caramel.dpl b/src/components/colorpalette/palettes/Caramel.dpl
index c51e47a..54964ce 100644
--- a/src/components/colorpalette/palettes/Caramel.dpl
+++ b/src/components/colorpalette/palettes/Caramel.dpl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Palette editable="false" name="Caramel" >
+<palette editable="false" name="Caramel" >
  <color name="#303030" alpha="255" />
  <color name="#a488c0" alpha="255" />
  <color name="#ac8cc0" alpha="255" />
@@ -256,4 +256,4 @@
  <color name="#9cd4a4" alpha="255" />
  <color name="#94d4a8" alpha="255" />
  <color name="#88d8b0" alpha="255" />
-</Palette>
+</palette>
diff --git a/src/components/colorpalette/palettes/Cascade.dpl b/src/components/colorpalette/palettes/Cascade.dpl
index 70cfe75..f68ad4a 100644
--- a/src/components/colorpalette/palettes/Cascade.dpl
+++ b/src/components/colorpalette/palettes/Cascade.dpl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Palette editable="false" name="Cascade" >
+<palette editable="false" name="Cascade" >
  <color name="#6c5880" alpha="255" />
  <color name="#6c5880" alpha="255" />
  <color name="#6c5880" alpha="255" />
@@ -256,4 +256,4 @@
  <color name="#74547c" alpha="255" />
  <color name="#745880" alpha="255" />
  <color name="#705880" alpha="255" />
-</Palette>
+</palette>
diff --git a/src/components/colorpalette/palettes/China.dpl b/src/components/colorpalette/palettes/China.dpl
index b6e3d8c..63d8e79 100644
--- a/src/components/colorpalette/palettes/China.dpl
+++ b/src/components/colorpalette/palettes/China.dpl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Palette editable="false" name="China" >
+<palette editable="false" name="China" >
  <color name="#e04cf0" alpha="255" />
  <color name="#e04cf0" alpha="255" />
  <color name="#e050f0" alpha="255" />
@@ -256,4 +256,4 @@
  <color name="#9454a4" alpha="255" />
  <color name="#9058a4" alpha="255" />
  <color name="#8c60a8" alpha="255" />
-</Palette>
+</palette>
diff --git a/src/components/colorpalette/palettes/Coldfire.dpl b/src/components/colorpalette/palettes/Coldfire.dpl
index 04cd3d9..35daf82 100644
--- a/src/components/colorpalette/palettes/Coldfire.dpl
+++ b/src/components/colorpalette/palettes/Coldfire.dpl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Palette editable="false" name="Coldfire" >
+<palette editable="false" name="Coldfire" >
  <color name="#00acfc" alpha="255" />
  <color name="#00acfc" alpha="255" />
  <color name="#00acfc" alpha="255" />
@@ -256,4 +256,4 @@
  <color name="#fcfcf4" alpha="255" />
  <color name="#fcfcf8" alpha="255" />
  <color name="#fcfcfc" alpha="255" />
-</Palette>
+</palette>
diff --git a/src/components/colorpalette/palettes/CoolColors.dpl b/src/components/colorpalette/palettes/CoolColors.dpl
index b8bbe1f..c14a400 100644
--- a/src/components/colorpalette/palettes/CoolColors.dpl
+++ b/src/components/colorpalette/palettes/CoolColors.dpl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Palette editable="false" name="Cool colors" >
+<palette editable="false" name="Cool colors" >
  <color name="#112ac6" alpha="255" />
  <color name="#539be2" alpha="255" />
  <color name="#161066" alpha="255" />
@@ -8,4 +8,4 @@
  <color name="#2c6ccc" alpha="255" />
  <color name="#265121" alpha="255" />
  <color name="#04422c" alpha="255" />
-</Palette>
+</palette>
diff --git a/src/components/colorpalette/palettes/Cranes.dpl b/src/components/colorpalette/palettes/Cranes.dpl
index 7937e42..0cac9a9 100644
--- a/src/components/colorpalette/palettes/Cranes.dpl
+++ b/src/components/colorpalette/palettes/Cranes.dpl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Palette editable="false" name="Cranes" >
+<palette editable="false" name="Cranes" >
  <color name="#080808" alpha="255" />
  <color name="#c0b090" alpha="255" />
  <color name="#c0a480" alpha="255" />
@@ -256,4 +256,4 @@
  <color name="#b49474" alpha="255" />
  <color name="#88b074" alpha="255" />
  <color name="#948c7c" alpha="255" />
-</Palette>
+</palette>
diff --git a/src/components/colorpalette/palettes/Darkpastels.dpl b/src/components/colorpalette/palettes/Darkpastels.dpl
index 5d9ed18..6c89b70 100644
--- a/src/components/colorpalette/palettes/Darkpastels.dpl
+++ b/src/components/colorpalette/palettes/Darkpastels.dpl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Palette editable="false" name="Dark pastels" >
+<palette editable="false" name="Dark pastels" >
  <color name="#3868b8" alpha="255" />
  <color name="#3468b4" alpha="255" />
  <color name="#3468b4" alpha="255" />
@@ -256,4 +256,4 @@
  <color name="#3868bc" alpha="255" />
  <color name="#3868b8" alpha="255" />
  <color name="#3868b8" alpha="255" />
-</Palette>
+</palette>
diff --git a/src/components/colorpalette/palettes/Default.dpl b/src/components/colorpalette/palettes/Default.dpl
index 2129301..cd98a9f 100644
--- a/src/components/colorpalette/palettes/Default.dpl
+++ b/src/components/colorpalette/palettes/Default.dpl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Palette editable="false" name="Default" >
+<palette editable="false" name="Default" >
  <color name="#ff0000" alpha="255" />
  <color name="#ff00ff" alpha="255" />
  <color name="#0000ff" alpha="255" />
@@ -23,4 +23,4 @@
  <color name="#cccccc" alpha="255" />
  <color name="#e5e5e5" alpha="255" />
  <color name="#ffffff" alpha="255" />
-</Palette>
+</palette>
diff --git a/src/components/colorpalette/palettes/Ega.dpl b/src/components/colorpalette/palettes/Ega.dpl
index f360ca9..f478ecd 100644
--- a/src/components/colorpalette/palettes/Ega.dpl
+++ b/src/components/colorpalette/palettes/Ega.dpl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Palette editable="false" name="Ega" >
+<palette editable="false" name="Ega" >
  <color name="#000000" alpha="255" />
  <color name="#a800a8" alpha="255" />
  <color name="#fc5454" alpha="255" />
@@ -240,4 +240,4 @@
  <color name="#0054a8" alpha="255" />
  <color name="#000054" alpha="255" />
  <color name="#545454" alpha="255" />
-</Palette>
+</palette>
diff --git a/src/components/colorpalette/palettes/Firecode.dpl b/src/components/colorpalette/palettes/Firecode.dpl
index d9de8af..ca3211c 100644
--- a/src/components/colorpalette/palettes/Firecode.dpl
+++ b/src/components/colorpalette/palettes/Firecode.dpl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Palette editable="false" name="Firecode" >
+<palette editable="false" name="Firecode" >
  <color name="#000000" alpha="255" />
  <color name="#000018" alpha="255" />
  <color name="#000018" alpha="255" />
@@ -256,4 +256,4 @@
  <color name="#fcfcf4" alpha="255" />
  <color name="#fcfcf8" alpha="255" />
  <color name="#fcfcfc" alpha="255" />
-</Palette>
+</palette>
diff --git a/src/components/colorpalette/palettes/Gold.dpl b/src/components/colorpalette/palettes/Gold.dpl
index 99a0381..8cffd1e 100644
--- a/src/components/colorpalette/palettes/Gold.dpl
+++ b/src/components/colorpalette/palettes/Gold.dpl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Palette editable="false" name="Gold" >
+<palette editable="false" name="Gold" >
  <color name="#fcfc80" alpha="255" />
  <color name="#fcfc80" alpha="255" />
  <color name="#fcf87c" alpha="255" />
@@ -256,4 +256,4 @@
  <color name="#000000" alpha="255" />
  <color name="#000000" alpha="255" />
  <color name="#000000" alpha="255" />
-</Palette>
+</palette>
diff --git a/src/components/colorpalette/palettes/GrayViolet.dpl b/src/components/colorpalette/palettes/GrayViolet.dpl
index 304ead5..68615a0 100644
--- a/src/components/colorpalette/palettes/GrayViolet.dpl
+++ b/src/components/colorpalette/palettes/GrayViolet.dpl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Palette editable="false" name="GrayViolet" >
+<palette editable="false" name="GrayViolet" >
  <color name="#000000" alpha="255" />
  <color name="#000000" alpha="255" />
  <color name="#040404" alpha="255" />
@@ -256,4 +256,4 @@
  <color name="#142024" alpha="255" />
  <color name="#101818" alpha="255" />
  <color name="#080c0c" alpha="255" />
-</Palette>
+</palette>
diff --git a/src/components/colorpalette/palettes/Grayblue.dpl b/src/components/colorpalette/palettes/Grayblue.dpl
index 7924467..59bd5c5 100644
--- a/src/components/colorpalette/palettes/Grayblue.dpl
+++ b/src/components/colorpalette/palettes/Grayblue.dpl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Palette editable="false" name="Grayblue" >
+<palette editable="false" name="Grayblue" >
  <color name="#7ca480" alpha="255" />
  <color name="#7ca480" alpha="255" />
  <color name="#7ca47c" alpha="255" />
@@ -256,4 +256,4 @@
  <color name="#586ca0" alpha="255" />
  <color name="#5c6ca0" alpha="255" />
  <color name="#5c6ca4" alpha="255" />
-</Palette>
+</palette>
diff --git a/src/components/colorpalette/palettes/Grays.dpl b/src/components/colorpalette/palettes/Grays.dpl
index a2ea45a..4c1a5d1 100644
--- a/src/components/colorpalette/palettes/Grays.dpl
+++ b/src/components/colorpalette/palettes/Grays.dpl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Palette editable="false" name="Grays" >
+<palette editable="false" name="Grays" >
  <color name="#070707" alpha="255" />
  <color name="#0f0f0f" alpha="255" />
  <color name="#171717" alpha="255" />
@@ -31,4 +31,4 @@
  <color name="#e7e7e7" alpha="255" />
  <color name="#efefef" alpha="255" />
  <color name="#f7f7f7" alpha="255" />
-</Palette>
+</palette>
diff --git a/src/components/colorpalette/palettes/Greens.dpl b/src/components/colorpalette/palettes/Greens.dpl
index 7b96ea1..b6adff9 100644
--- a/src/components/colorpalette/palettes/Greens.dpl
+++ b/src/components/colorpalette/palettes/Greens.dpl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Palette editable="false" name="Greens" >
+<palette editable="false" name="Greens" >
  <color name="#000000" alpha="255" />
  <color name="#000000" alpha="255" />
  <color name="#000400" alpha="255" />
@@ -256,4 +256,4 @@
  <color name="#000800" alpha="255" />
  <color name="#000000" alpha="255" />
  <color name="#000000" alpha="255" />
-</Palette>
+</palette>
diff --git a/src/components/colorpalette/palettes/Hilite.dpl b/src/components/colorpalette/palettes/Hilite.dpl
index 7bc8e0e..a856a32 100644
--- a/src/components/colorpalette/palettes/Hilite.dpl
+++ b/src/components/colorpalette/palettes/Hilite.dpl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Palette editable="false" name="Hilite" >
+<palette editable="false" name="Hilite" >
  <color name="#a490b4" alpha="255" />
  <color name="#a090b4" alpha="255" />
  <color name="#a090b4" alpha="255" />
@@ -256,4 +256,4 @@
  <color name="#a0b8b0" alpha="255" />
  <color name="#9cb4b0" alpha="255" />
  <color name="#9cb4b0" alpha="255" />
-</Palette>
+</palette>
diff --git a/src/components/colorpalette/palettes/Khaki.dpl b/src/components/colorpalette/palettes/Khaki.dpl
index d20fe6c..95ef263 100644
--- a/src/components/colorpalette/palettes/Khaki.dpl
+++ b/src/components/colorpalette/palettes/Khaki.dpl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Palette editable="false" name="Khaki" >
+<palette editable="false" name="Khaki" >
  <color name="#90846c" alpha="255" />
  <color name="#908470" alpha="255" />
  <color name="#908470" alpha="255" />
@@ -256,4 +256,4 @@
  <color name="#405c24" alpha="255" />
  <color name="#3c5c24" alpha="255" />
  <color name="#3c5c24" alpha="255" />
-</Palette>
+</palette>
diff --git a/src/components/colorpalette/palettes/Lights.dpl b/src/components/colorpalette/palettes/Lights.dpl
index f42c0fe..b5fb4e1 100644
--- a/src/components/colorpalette/palettes/Lights.dpl
+++ b/src/components/colorpalette/palettes/Lights.dpl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Palette editable="false" name="Lights" >
+<palette editable="false" name="Lights" >
  <color name="#fffafa" alpha="255" />
  <color name="#f8f8ff" alpha="255" />
  <color name="#f5f5f5" alpha="255" />
@@ -25,4 +25,4 @@
  <color name="#e6e6fa" alpha="255" />
  <color name="#ffe4e1" alpha="255" />
  <color name="#ffffff" alpha="255" />
-</Palette>
+</palette>
diff --git a/src/components/colorpalette/palettes/Muted.dpl b/src/components/colorpalette/palettes/Muted.dpl
index d669483..e0b7f6a 100644
--- a/src/components/colorpalette/palettes/Muted.dpl
+++ b/src/components/colorpalette/palettes/Muted.dpl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Palette editable="false" name="Muted" >
+<palette editable="false" name="Muted" >
  <color name="#8b8989" alpha="255" />
  <color name="#8b8682" alpha="255" />
  <color name="#8b8378" alpha="255" />
@@ -78,4 +78,4 @@
  <color name="#551a8b" alpha="255" />
  <color name="#5d478b" alpha="255" />
  <color name="#8b7b8b" alpha="255" />
-</Palette>
+</palette>
diff --git a/src/components/colorpalette/palettes/NamedColors.dpl b/src/components/colorpalette/palettes/NamedColors.dpl
index 6210d4c..e7fa1b0 100644
--- a/src/components/colorpalette/palettes/NamedColors.dpl
+++ b/src/components/colorpalette/palettes/NamedColors.dpl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Palette editable="false" name="Named colors" >
+<palette editable="false" name="Named colors" >
  <color name="#fffafa" alpha="255" />
  <color name="#f8f8ff" alpha="255" />
  <color name="#f5f5f5" alpha="255" />
@@ -448,4 +448,4 @@
  <color name="#8b008b" alpha="255" />
  <color name="#8b0000" alpha="255" />
  <color name="#90ee90" alpha="255" />
-</Palette>
+</palette>
diff --git a/src/components/colorpalette/palettes/News3.dpl b/src/components/colorpalette/palettes/News3.dpl
index 124f6e8..e7eb134 100644
--- a/src/components/colorpalette/palettes/News3.dpl
+++ b/src/components/colorpalette/palettes/News3.dpl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Palette editable="false" name="News3" >
+<palette editable="false" name="News3" >
  <color name="#ece804" alpha="255" />
  <color name="#ece804" alpha="255" />
  <color name="#e8e804" alpha="255" />
@@ -256,4 +256,4 @@
  <color name="#543824" alpha="255" />
  <color name="#543c24" alpha="255" />
  <color name="#543c24" alpha="255" />
-</Palette>
+</palette>
diff --git a/src/components/colorpalette/palettes/Op2.dpl b/src/components/colorpalette/palettes/Op2.dpl
index 4d6f70a..beed50e 100644
--- a/src/components/colorpalette/palettes/Op2.dpl
+++ b/src/components/colorpalette/palettes/Op2.dpl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Palette editable="false" name="Op2" >
+<palette editable="false" name="Op2" >
  <color name="#cc9064" alpha="255" />
  <color name="#cc9064" alpha="255" />
  <color name="#c89468" alpha="255" />
@@ -256,4 +256,4 @@
  <color name="#b0d0b8" alpha="255" />
  <color name="#b0d4b8" alpha="255" />
  <color name="#b0d4b4" alpha="255" />
-</Palette>
+</palette>
diff --git a/src/components/colorpalette/palettes/Paintjet.dpl b/src/components/colorpalette/palettes/Paintjet.dpl
index aeac687..9b7ec39 100644
--- a/src/components/colorpalette/palettes/Paintjet.dpl
+++ b/src/components/colorpalette/palettes/Paintjet.dpl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Palette editable="false" name="Paintjet" >
+<palette editable="false" name="Paintjet" >
  <color name="#000000" alpha="255" />
  <color name="#000000" alpha="255" />
  <color name="#18140c" alpha="255" />
@@ -18,4 +18,4 @@
  <color name="#343074" alpha="255" />
  <color name="#bc306c" alpha="255" />
  <color name="#2874c4" alpha="255" />
-</Palette>
+</palette>
diff --git a/src/components/colorpalette/palettes/Pastels.dpl b/src/components/colorpalette/palettes/Pastels.dpl
index 181e393..930a21f 100644
--- a/src/components/colorpalette/palettes/Pastels.dpl
+++ b/src/components/colorpalette/palettes/Pastels.dpl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Palette editable="false" name="Pastels" >
+<palette editable="false" name="Pastels" >
  <color name="#e29191" alpha="255" />
  <color name="#99dd92" alpha="255" />
  <color name="#93d8b9" alpha="255" />
@@ -18,4 +18,4 @@
  <color name="#ff65f4" alpha="255" />
  <color name="#ff6584" alpha="255" />
  <color name="#ff6565" alpha="255" />
-</Palette>
+</palette>
diff --git a/src/components/colorpalette/palettes/Plasma.dpl b/src/components/colorpalette/palettes/Plasma.dpl
index 5db6882..bc59505 100644
--- a/src/components/colorpalette/palettes/Plasma.dpl
+++ b/src/components/colorpalette/palettes/Plasma.dpl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Palette editable="false" name="Plasma" >
+<palette editable="false" name="Plasma" >
  <color name="#f0f000" alpha="255" />
  <color name="#f0e000" alpha="255" />
  <color name="#f0d000" alpha="255" />
@@ -256,4 +256,4 @@
  <color name="#00d020" alpha="255" />
  <color name="#00e010" alpha="255" />
  <color name="#00f000" alpha="255" />
-</Palette>
+</palette>
diff --git a/src/components/colorpalette/palettes/Reds.dpl b/src/components/colorpalette/palettes/Reds.dpl
index 9500540..f0d29bc 100644
--- a/src/components/colorpalette/palettes/Reds.dpl
+++ b/src/components/colorpalette/palettes/Reds.dpl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Palette editable="false" name="Reds" >
+<palette editable="false" name="Reds" >
  <color name="#000000" alpha="255" />
  <color name="#4c0000" alpha="255" />
  <color name="#4c0000" alpha="255" />
@@ -256,4 +256,4 @@
  <color name="#540000" alpha="255" />
  <color name="#540000" alpha="255" />
  <color name="#500000" alpha="255" />
-</Palette>
+</palette>
diff --git a/src/components/colorpalette/palettes/RedsAndPurples.dpl b/src/components/colorpalette/palettes/RedsAndPurples.dpl
index 56f03cf..0e5eff9 100644
--- a/src/components/colorpalette/palettes/RedsAndPurples.dpl
+++ b/src/components/colorpalette/palettes/RedsAndPurples.dpl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Palette editable="false" name="Reds And Purples" >
+<palette editable="false" name="Reds And Purples" >
  <color name="#cd5c5c" alpha="255" />
  <color name="#b22222" alpha="255" />
  <color name="#a52a2a" alpha="255" />
@@ -30,4 +30,4 @@
  <color name="#a020f0" alpha="255" />
  <color name="#9370db" alpha="255" />
  <color name="#d8bfd8" alpha="255" />
-</Palette>
+</palette>
diff --git a/src/components/colorpalette/palettes/Royal.dpl b/src/components/colorpalette/palettes/Royal.dpl
index cfe1fd1..8f56803 100644
--- a/src/components/colorpalette/palettes/Royal.dpl
+++ b/src/components/colorpalette/palettes/Royal.dpl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Palette editable="false" name="Royal" >
+<palette editable="false" name="Royal" >
  <color name="#000000" alpha="255" />
  <color name="#3c0050" alpha="255" />
  <color name="#3c0050" alpha="255" />
@@ -256,4 +256,4 @@
  <color name="#3c0050" alpha="255" />
  <color name="#3c0050" alpha="255" />
  <color name="#3c0050" alpha="255" />
-</Palette>
+</palette>
diff --git a/src/components/colorpalette/palettes/TangoIconThemePalette.dpl b/src/components/colorpalette/palettes/TangoIconThemePalette.dpl
index 5737767..159e9af 100644
--- a/src/components/colorpalette/palettes/TangoIconThemePalette.dpl
+++ b/src/components/colorpalette/palettes/TangoIconThemePalette.dpl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Palette editable="false" name="Tango Icon Theme Palette" >
+<palette editable="false" name="Tango Icon Theme palette" >
  <color name="#fce94f" alpha="255" />
  <color name="#edd400" alpha="255" />
  <color name="#c4a000" alpha="255" />
@@ -28,4 +28,4 @@
  <color name="#888a85" alpha="255" />
  <color name="#555753" alpha="255" />
  <color name="#2e3436" alpha="255" />
-</Palette>
+</palette>
diff --git a/src/components/colorpalette/palettes/Topographic.dpl b/src/components/colorpalette/palettes/Topographic.dpl
index 7db44cf..7456702 100644
--- a/src/components/colorpalette/palettes/Topographic.dpl
+++ b/src/components/colorpalette/palettes/Topographic.dpl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Palette editable="false" name="Topographic" >
+<palette editable="false" name="Topographic" >
  <color name="#000000" alpha="255" />
  <color name="#000000" alpha="255" />
  <color name="#000000" alpha="255" />
@@ -260,4 +260,4 @@
  <color name="#fcfcfc" alpha="255" />
  <color name="#fcfcfc" alpha="255" />
  <color name="#fcfcfc" alpha="255" />
-</Palette>
+</palette>
diff --git a/src/components/colorpalette/palettes/Visibone.dpl b/src/components/colorpalette/palettes/Visibone.dpl
index 4a72279..0537004 100644
--- a/src/components/colorpalette/palettes/Visibone.dpl
+++ b/src/components/colorpalette/palettes/Visibone.dpl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Palette editable="false" name="Visibone" >
+<palette editable="false" name="Visibone" >
  <color name="#ffffff" alpha="255" />
  <color name="#cccccc" alpha="255" />
  <color name="#999999" alpha="255" />
@@ -336,4 +336,4 @@
  <color name="#999999" alpha="255" />
  <color name="#cccccc" alpha="255" />
  <color name="#ffffff" alpha="255" />
-</Palette>
+</palette>
diff --git a/src/components/colorpalette/palettes/Visibone2.dpl b/src/components/colorpalette/palettes/Visibone2.dpl
index 5a2eec8..2d95cbd 100644
--- a/src/components/colorpalette/palettes/Visibone2.dpl
+++ b/src/components/colorpalette/palettes/Visibone2.dpl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Palette editable="false" name="Visibone 2" >
+<palette editable="false" name="Visibone 2" >
  <color name="#ffffff" alpha="255" />
  <color name="#cccccc" alpha="255" />
  <color name="#999999" alpha="255" />
@@ -256,4 +256,4 @@
  <color name="#999999" alpha="255" />
  <color name="#cccccc" alpha="255" />
  <color name="#ffffff" alpha="255" />
-</Palette>
+</palette>
diff --git a/src/components/colorpalette/palettes/Volcano.dpl b/src/components/colorpalette/palettes/Volcano.dpl
index 4b7901a..2b521a6 100644
--- a/src/components/colorpalette/palettes/Volcano.dpl
+++ b/src/components/colorpalette/palettes/Volcano.dpl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Palette editable="false" name="Volcano" >
+<palette editable="false" name="Volcano" >
  <color name="#000000" alpha="255" />
  <color name="#000000" alpha="255" />
  <color name="#000008" alpha="255" />
@@ -256,4 +256,4 @@
  <color name="#000000" alpha="255" />
  <color name="#000000" alpha="255" />
  <color name="#000000" alpha="255" />
-</Palette>
+</palette>
diff --git a/src/components/colorpalette/palettes/WarmColors.dpl b/src/components/colorpalette/palettes/WarmColors.dpl
index cd4581c..71f0cb1 100644
--- a/src/components/colorpalette/palettes/WarmColors.dpl
+++ b/src/components/colorpalette/palettes/WarmColors.dpl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Palette editable="false" name="Warm colors" >
+<palette editable="false" name="Warm colors" >
  <color name="#c40909" alpha="255" />
  <color name="#d8d508" alpha="255" />
  <color name="#ed6e00" alpha="255" />
@@ -7,4 +7,4 @@
  <color name="#8c0b0b" alpha="255" />
  <color name="#e4aa04" alpha="255" />
  <color name="#750000" alpha="255" />
-</Palette>
+</palette>
diff --git a/src/components/colorpalette/palettes/Web.dpl b/src/components/colorpalette/palettes/Web.dpl
index b063a11..312cd4a 100644
--- a/src/components/colorpalette/palettes/Web.dpl
+++ b/src/components/colorpalette/palettes/Web.dpl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Palette editable="false" name="Web" >
+<palette editable="false" name="Web" >
  <color name="#ffffff" alpha="255" />
  <color name="#ffffcc" alpha="255" />
  <color name="#ffff99" alpha="255" />
@@ -216,4 +216,4 @@
  <color name="#000066" alpha="255" />
  <color name="#000033" alpha="255" />
  <color name="#000000" alpha="255" />
-</Palette>
+</palette>
-- 
2.11.4.GIT