diff --git a/AUTHORS b/AUTHORS index 8dba36d..5d44a59 100644 --- a/AUTHORS +++ b/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 diff --git a/data/Almond-blue.qrc b/data/Almond-blue.qrc new file mode 100644 index 0000000..f4804b3 --- /dev/null +++ b/data/Almond-blue.qrc @@ -0,0 +1,20 @@ + + +Almond-blue/Balance.bmp +Almond-blue/Cbuttons.bmp +Almond-blue/Eq_Ex.bmp +Almond-blue/EqMain.bmp +Almond-blue/Main.bmp +Almond-blue/MonoSter.bmp +Almond-blue/Numbers.bmp +Almond-blue/PlayPaus.bmp +Almond-blue/PlEdit.bmp +Almond-blue/PlEdit.txt +Almond-blue/PosBar.bmp +Almond-blue/ShufRep.bmp +Almond-blue/Text.bmp +Almond-blue/Titlebar.bmp +Almond-blue/VisColor.txt +Almond-blue/Volume.bmp + + diff --git a/data/Almond-blue/Balance.bmp b/data/Almond-blue/Balance.bmp new file mode 100644 index 0000000..579b63a Binary files /dev/null and b/data/Almond-blue/Balance.bmp differ diff --git a/data/Almond-blue/Cbuttons.bmp b/data/Almond-blue/Cbuttons.bmp new file mode 100644 index 0000000..fe95ab9 Binary files /dev/null and b/data/Almond-blue/Cbuttons.bmp differ diff --git a/data/Almond-blue/EqMain.bmp b/data/Almond-blue/EqMain.bmp new file mode 100644 index 0000000..28ce909 Binary files /dev/null and b/data/Almond-blue/EqMain.bmp differ diff --git a/data/Almond-blue/Eq_Ex.bmp b/data/Almond-blue/Eq_Ex.bmp new file mode 100644 index 0000000..8b48afa Binary files /dev/null and b/data/Almond-blue/Eq_Ex.bmp differ diff --git a/data/Almond-blue/Main.bmp b/data/Almond-blue/Main.bmp new file mode 100644 index 0000000..b1e0cee Binary files /dev/null and b/data/Almond-blue/Main.bmp differ diff --git a/data/Almond-blue/MonoSter.bmp b/data/Almond-blue/MonoSter.bmp new file mode 100644 index 0000000..3937d81 Binary files /dev/null and b/data/Almond-blue/MonoSter.bmp differ diff --git a/data/Almond-blue/Numbers.bmp b/data/Almond-blue/Numbers.bmp new file mode 100644 index 0000000..bebb10a Binary files /dev/null and b/data/Almond-blue/Numbers.bmp differ diff --git a/data/Almond-blue/PlEdit.bmp b/data/Almond-blue/PlEdit.bmp new file mode 100644 index 0000000..13d739d Binary files /dev/null and b/data/Almond-blue/PlEdit.bmp differ diff --git a/data/Almond-blue/PlEdit.txt b/data/Almond-blue/PlEdit.txt new file mode 100644 index 0000000..b8078a0 --- /dev/null +++ b/data/Almond-blue/PlEdit.txt @@ -0,0 +1,8 @@ +[Text] +Normal=#62d8ff +Current=#ffffff +NormalBG=#0f262e +SelectedBG=#1d5e73 +MbFG=#62d8ff +MbBG=#0f262e +Font=Arial \ No newline at end of file diff --git a/data/Almond-blue/PlayPaus.bmp b/data/Almond-blue/PlayPaus.bmp new file mode 100644 index 0000000..597704b Binary files /dev/null and b/data/Almond-blue/PlayPaus.bmp differ diff --git a/data/Almond-blue/PosBar.bmp b/data/Almond-blue/PosBar.bmp new file mode 100644 index 0000000..d7ec9ce Binary files /dev/null and b/data/Almond-blue/PosBar.bmp differ diff --git a/data/Almond-blue/Readme.txt b/data/Almond-blue/Readme.txt new file mode 100644 index 0000000..769c82b --- /dev/null +++ b/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 \ No newline at end of file diff --git a/data/Almond-blue/ShufRep.bmp b/data/Almond-blue/ShufRep.bmp new file mode 100644 index 0000000..33a9cf4 Binary files /dev/null and b/data/Almond-blue/ShufRep.bmp differ diff --git a/data/Almond-blue/Text.bmp b/data/Almond-blue/Text.bmp new file mode 100644 index 0000000..9cdabcb Binary files /dev/null and b/data/Almond-blue/Text.bmp differ diff --git a/data/Almond-blue/Titlebar.bmp b/data/Almond-blue/Titlebar.bmp new file mode 100644 index 0000000..793a4b4 Binary files /dev/null and b/data/Almond-blue/Titlebar.bmp differ diff --git a/data/Almond-blue/VisColor.txt b/data/Almond-blue/VisColor.txt new file mode 100644 index 0000000..131dbb0 --- /dev/null +++ b/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, diff --git a/data/Almond-blue/Volume.bmp b/data/Almond-blue/Volume.bmp new file mode 100644 index 0000000..08797a2 Binary files /dev/null and b/data/Almond-blue/Volume.bmp differ diff --git a/data/CleanAMP.qrc b/data/CleanAMP.qrc new file mode 100644 index 0000000..842cbbb --- /dev/null +++ b/data/CleanAMP.qrc @@ -0,0 +1,26 @@ + + + CleanAMP/Eq_ex.png + CleanAMP/GENEX.png + CleanAMP/Gen.png + CleanAMP/monoster.png + CleanAMP/PLEDIT.TXT + CleanAMP/ReadMe.txt + CleanAMP/Thumbs.db + CleanAMP/VIDEO.png + CleanAMP/Volume.png + CleanAMP/balance.png + CleanAMP/cbuttons.png + CleanAMP/eqmain.png + CleanAMP/main.png + CleanAMP/mb.png + CleanAMP/numbers.png + CleanAMP/playpaus.png + CleanAMP/pledit.png + CleanAMP/posbar.png + CleanAMP/shufrep.png + CleanAMP/text.png + CleanAMP/titlebar.png + CleanAMP/viscolor.txt + + diff --git a/data/promoe.qrc b/data/promoe.qrc index d3e59e4..f61619c 100644 --- a/data/promoe.qrc +++ b/data/promoe.qrc @@ -4,27 +4,5 @@ noartist.png nosong.png noalbum.png - CleanAMP/Eq_ex.png - CleanAMP/GENEX.png - CleanAMP/Gen.png - CleanAMP/monoster.png - CleanAMP/PLEDIT.TXT - CleanAMP/ReadMe.txt - CleanAMP/Thumbs.db - CleanAMP/VIDEO.png - CleanAMP/Volume.png - CleanAMP/balance.png - CleanAMP/cbuttons.png - CleanAMP/eqmain.png - CleanAMP/main.png - CleanAMP/mb.png - CleanAMP/numbers.png - CleanAMP/playpaus.png - CleanAMP/pledit.png - CleanAMP/posbar.png - CleanAMP/shufrep.png - CleanAMP/text.png - CleanAMP/titlebar.png - CleanAMP/viscolor.txt diff --git a/src/Skin.cpp b/src/Skin.cpp index 5cf568b..7b805b8 100644 --- a/src/Skin.cpp +++ b/src/Skin.cpp @@ -19,6 +19,8 @@ #include #include +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; } diff --git a/src/SkinChooser.cpp b/src/SkinChooser.cpp index 942ac35..9fc70f0 100644 --- a/src/SkinChooser.cpp +++ b/src/SkinChooser.cpp @@ -19,10 +19,13 @@ #include #include #include +#include #include #include #include +#include + 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)", - ":CleanAMP/", this); + new SkinChooserItem (QIcon (QIcon(Skin::getPixmap("main", ":/skins/Almond-blue"))), + "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; diff --git a/src/src.pro b/src/src.pro index 0dd8786..ad9840f 100644 --- a/src/src.pro +++ b/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