OTHER: Changed default skin to Almond-blue

I don't know under which license CleanAMP is provided, and I don't want to take
any risks, so I had to replace it. As the default skin is included in the
binary, it might be even necessary for it to be GPL, so I choose the debranded
Almond-blue skin for the time beeing.

Added creator of Almond-blue to AUTHORS file

Also added some magic to make it easier to add new skins through the resource
system

AUTHORS

@@ -35,6 +35,10 @@ W: http://tobi.nu/
 P: 1024D/9B1FA0CB 527E C4EC D205 88ED FC07  B744 315F F685 9B1F A0CB
 D: Previous main developer and coordinator.
 
+N: Laszlo Simon
+E: laszlo.simon@gmail.com
+D: Creator of the Almond-blue theme
+
 N: Daniel Svensson
 E: daniel@nittionio.nu
 P: 1024D/633F5931 9D2D 8156 23A2 8305 95A2 4D71 7BF0 2E28 633F 5931

data/Almond-blue.qrc

@@ -0,0 +1,20 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource prefix="/skins">
+<file>Almond-blue/Balance.bmp</file>
+<file>Almond-blue/Cbuttons.bmp</file>
+<file>Almond-blue/Eq_Ex.bmp</file>
+<file>Almond-blue/EqMain.bmp</file>
+<file>Almond-blue/Main.bmp</file>
+<file>Almond-blue/MonoSter.bmp</file>
+<file>Almond-blue/Numbers.bmp</file>
+<file>Almond-blue/PlayPaus.bmp</file>
+<file>Almond-blue/PlEdit.bmp</file>
+<file>Almond-blue/PlEdit.txt</file>
+<file>Almond-blue/PosBar.bmp</file>
+<file>Almond-blue/ShufRep.bmp</file>
+<file>Almond-blue/Text.bmp</file>
+<file>Almond-blue/Titlebar.bmp</file>
+<file>Almond-blue/VisColor.txt</file>
+<file>Almond-blue/Volume.bmp</file>
+</qresource>
+</RCC>

data/Almond-blue/PlEdit.txt

@@ -0,0 +1,8 @@
+[Text]
+Normal=#62d8ff
+Current=#ffffff
+NormalBG=#0f262e
+SelectedBG=#1d5e73
+MbFG=#62d8ff
+MbBG=#0f262e
+Font=Arial

data/Almond-blue/Readme.txt

@@ -0,0 +1,9 @@
+AlmondXMMSPlayer v1
+by Laszlo Simon (laszlo.simon@gmail.com)
+
+My first XMMS skin, made for my Almond metacity theme. 
+
+changelog: 
+2006.06.19. - first public release
+
+2006 Laszlo Simon. General Public License

data/Almond-blue/VisColor.txt

@@ -0,0 +1,24 @@
+17,32,49,
+88,130,162,
+103,114,126,
+98,110,122,
+94,106,118,
+90,102,114,
+86,98,111,
+82,93,108,
+17,36,58,
+17,38,62,
+18,41,65,
+18,43,69,
+19,46,73,
+19,48,76,
+20,51,80,
+20,53,84,
+21,55,88,
+21,58,92,
+99,217,255,
+99,217,255,
+99,217,255,
+99,217,255,
+99,217,255,
+99,217,255,

data/CleanAMP.qrc

@@ -0,0 +1,26 @@
+<!DOCTYPE RCC><RCC version="1.0">
+	<qresource prefix="/skins">
+		<file>CleanAMP/Eq_ex.png</file>
+		<file>CleanAMP/GENEX.png</file>
+		<file>CleanAMP/Gen.png</file>
+		<file>CleanAMP/monoster.png</file>
+		<file>CleanAMP/PLEDIT.TXT</file>
+		<file>CleanAMP/ReadMe.txt</file>
+		<file>CleanAMP/Thumbs.db</file>
+		<file>CleanAMP/VIDEO.png</file>
+		<file>CleanAMP/Volume.png</file>
+		<file>CleanAMP/balance.png</file>
+		<file>CleanAMP/cbuttons.png</file>
+		<file>CleanAMP/eqmain.png</file>
+		<file>CleanAMP/main.png</file>
+		<file>CleanAMP/mb.png</file>
+		<file>CleanAMP/numbers.png</file>
+		<file>CleanAMP/playpaus.png</file>
+		<file>CleanAMP/pledit.png</file>
+		<file>CleanAMP/posbar.png</file>
+		<file>CleanAMP/shufrep.png</file>
+		<file>CleanAMP/text.png</file>
+		<file>CleanAMP/titlebar.png</file>
+		<file>CleanAMP/viscolor.txt</file>
+	</qresource>
+</RCC>

data/promoe.qrc

@@ -4,27 +4,5 @@
 		<file>noartist.png</file>
 		<file>nosong.png</file>
 		<file>noalbum.png</file>
-		<file>CleanAMP/Eq_ex.png</file>
-		<file>CleanAMP/GENEX.png</file>
-		<file>CleanAMP/Gen.png</file>
-		<file>CleanAMP/monoster.png</file>
-		<file>CleanAMP/PLEDIT.TXT</file>
-		<file>CleanAMP/ReadMe.txt</file>
-		<file>CleanAMP/Thumbs.db</file>
-		<file>CleanAMP/VIDEO.png</file>
-		<file>CleanAMP/Volume.png</file>
-		<file>CleanAMP/balance.png</file>
-		<file>CleanAMP/cbuttons.png</file>
-		<file>CleanAMP/eqmain.png</file>
-		<file>CleanAMP/main.png</file>
-		<file>CleanAMP/mb.png</file>
-		<file>CleanAMP/numbers.png</file>
-		<file>CleanAMP/playpaus.png</file>
-		<file>CleanAMP/pledit.png</file>
-		<file>CleanAMP/posbar.png</file>
-		<file>CleanAMP/shufrep.png</file>
-		<file>CleanAMP/text.png</file>
-		<file>CleanAMP/titlebar.png</file>
-		<file>CleanAMP/viscolor.txt</file>
 	</qresource>
 </RCC>

src/Skin.cpp

@@ -19,6 +19,8 @@
 #include <QPainter>
 #include <QSettings>
 
+static const QString defaultSkin = ":/skins/Almond-blue/";
+
 Skin *Skin::singleton = NULL;
 
 Skin *Skin::getInstance (void)
@@ -36,7 +38,7 @@ Skin::Skin ()
 	setPositions ();
 
 	QSettings settings;
-	setSkin (settings.value("skin/path", ":CleanAMP/").toString ());
+	setSkin (settings.value("skin/path", defaultSkin).toString ());
 }
 
 
@@ -62,7 +64,7 @@ Skin::setSkin (const QString& name)
 	       ParsePLEdit() &&
 	       BuildNumbers() &&
 	       BuildPlaylist () )) {
-		setSkin (":CleanAMP/");
+		setSkin (defaultSkin);
 		return false;
 	}
 

src/SkinChooser.cpp

@@ -19,10 +19,13 @@
 #include <QDir>
 #include <QFile>
 #include <QIcon>
+#include <QImageReader>
 #include <QLabel>
 #include <QSettings>
 #include <QVBoxLayout>
 
+#include <QtDebug>
+
 SkinChooser::SkinChooser (QWidget *parent) : QDialog (parent)
 {
 
@@ -48,8 +51,17 @@ SkinList::SkinList (QWidget *parent) : QListWidget (parent)
 {
 	setIconSize (QSize (137, 58));
 
-	new SkinChooserItem (QIcon (":CleanAMP/main.png"), "CleanAMP (default)",
+	new SkinChooserItem (QIcon (QIcon(Skin::getPixmap("main", ":/skins/Almond-blue"))),
-	                     ":CleanAMP/", this);
+	                      "Almond-blue (default)",
+	                     ":/skins/Almond-blue/", this);
+
+	foreach(QString skin,  QDir(":/skins").entryList()) {
+		if (skin == "Almond-blue") continue;
+		QString path = ":/skins/" + skin;
+		QIcon icon = QIcon(Skin::getPixmap("main", path));
+		if (icon.isNull()) continue;
+		new SkinChooserItem(icon, skin, path, this);
+	}
 
 	QSettings settings;
 	QStringList searchpath;

src/src.pro

@@ -20,6 +20,7 @@ TARGET = promoe
 DESTDIR = $$PWD/..
 
 RESOURCES += ../data/promoe.qrc
+RESOURCES += ../data/Almond-blue.qrc
 macx:RC_FILE = promoe.icns
 macx:INCLUDEPATH = /sw/include