=== modified file 'mixxx/res/skins/Outline800x480-WVGA/skin.xml'
--- mixxx/res/skins/Outline800x480-WVGA/skin.xml 2013-02-01 17:26:52 +0000
+++ mixxx/res/skins/Outline800x480-WVGA/skin.xml 2013-03-25 20:15:51 +0000
@@ -2522,7 +2522,7 @@
#FFFFFF
#191919
#FFFFFF
- #E8F8F8
+ #F8F8F8
me,me
@@ -2533,6 +2533,228 @@
vertical
+
+
+
+ horizontal
+
+
+
+ vertical
+
+
+
+ horizontal
+
+
+
+ text
+
+ [PreviewDeck1]
+
+ 50me,15f
+
+
+
+ eject
+
+ 1
+
+ 0
+ btn_eject1_over.png
+ btn_eject1.png
+
+
+
+ [PreviewDeck1],eject
+ true
+ LeftButton
+ false
+
+
+
+
+
+
+
+ horizontal
+
+
+ play_start
+
+ 2
+ true
+
+ 0
+ btn_play_sampler_down.png
+ btn_play_sampler.png
+
+
+ 1
+ btn_play_sampler_overdown.png
+ btn_play_sampler_over.png
+
+ 2,2
+
+ [PreviewDeck1],play
+ true
+ LeftButton
+
+
+ [PreviewDeck1],start
+ true
+ RightButton
+ false
+
+
+
+ waveform_overview
+
+ [PreviewDeck1]
+ me,30f
+
+ #FFFFFF
+ #FFE300
+ #0099FF
+ #FF0035
+ #FF8000
+ #00FF00
+
+ bottom
+ #FFFFFF
+ #00FF00
+ %1
+
+
+ cue_point
+ C
+ top
+ #FF001C
+ #00FF00
+
+
+ [PreviewDeck1],playposition
+ false
+
+
+
+
+
+
+
+
+
+ 20f,i
+
+
+
+
+ PeakIndicator
+
+ btn_clipping_previewdeck_over.png
+ btn_clipping_previewdeck.png
+ 0,1
+
+ [PreviewDeck1],PeakIndicator
+
+
+
+
+
+ channel_VuMeter
+
+ btn_volume_display_previewdeck_over.png
+ btn_volume_display_previewdeck.png
+ 0,12
+ false
+ 3
+ 250
+ 50
+ 3
+
+ [PreviewDeck1],VuMeter
+
+
+
+
+
+ pregain
+
+ knob_volume_previewdeck.png
+ slider_volume_previewdeck.png
+ 10,2
+ false
+
+ [PreviewDeck1],pregain
+ false
+
+
+
+
+
+
+ [PreviewDeck],show_previewdeck
+ visible
+
+
=== modified file 'mixxx/src/skin/legacyskinparser.cpp'
--- mixxx/src/skin/legacyskinparser.cpp 2013-02-27 02:06:14 +0000
+++ mixxx/src/skin/legacyskinparser.cpp 2013-03-25 19:57:09 +0000
@@ -246,6 +246,7 @@
* with their own means they're easy to move to boot -- bkgood
*/
m_pParent = new QWidget; // this'll get deleted with pParent
+ m_skinPath = skinPath;
QDomElement skinDocument = openSkin(skinPath);
if (skinDocument.isNull()) {
@@ -451,6 +452,7 @@
QWidget* pOldParent = m_pParent;
m_pParent = pGroup;
+ bool parseLibrary = false;
if (!childrenNode.isNull()) {
// Descend children
QDomNodeList children = childrenNode.childNodes();
@@ -460,8 +462,17 @@
QWidget* pChild = parseNode(node.toElement(), pGroup);
pGroup->addWidget(pChild);
}
+ if (node.nodeName() == "Splitter") {
+ parseLibrary = true;
+ qDebug() << "kain88 found a library";
+ }
}
}
+ if (parseLibrary && getSchemeList(m_skinPath).size()!=0) {
+ qDebug() << "kain88 see if we have schemes";
+ qDebug() << getSchemeList(m_skinPath);
+ pGroup->setStyleSheet(getLibraryStyle(node));
+ }
m_pParent = pOldParent;
return pGroup;
}
@@ -948,6 +959,7 @@
// This must come after the bindWidget or we will not style any of the
// LibraryView's because they have not been added yet.
+ qDebug() << "kain88 set Library";
setupWidget(node, pLibraryWidget);
return pLibraryWidget;
=== modified file 'mixxx/src/skin/legacyskinparser.h'
--- mixxx/src/skin/legacyskinparser.h 2012-11-29 01:19:52 +0000
+++ mixxx/src/skin/legacyskinparser.h 2013-03-25 19:57:09 +0000
@@ -42,7 +42,6 @@
QWidget* parseNode(QDomElement node, QWidget* pGrandparent);
// Support for various legacy behavior
- void parseColorSchemes(QDomElement node);
bool compareConfigKeys(QDomNode node, QString key);
// Parsers for each node
@@ -93,6 +92,9 @@
Tooltips m_tooltips;
static QList s_channelStrs;
static QMutex s_safeStringMutex;
+
+ private:
+ QString m_skinPath;
};