=== modified file 'mixxx/res/skins/Shade1024x600-Netbook/skin.xml'
--- mixxx/res/skins/Shade1024x600-Netbook/skin.xml 2012-12-15 18:12:16 +0000
+++ mixxx/res/skins/Shade1024x600-Netbook/skin.xml 2013-01-15 22:47:13 +0000
@@ -212,7 +212,7 @@
[Sampler1]
36,25
139,35
-
+ #8D98A3
@@ -726,7 +726,7 @@
[Sampler2]
36,25
139,35
-
+ #8D98A3
@@ -1240,7 +1240,7 @@
[Sampler3]
36,25
139,35
-
+ #8D98A3
@@ -1754,7 +1754,7 @@
[Sampler4]
36,25
139,35
-
+ #8D98A3
@@ -2375,8 +2375,7 @@
[PreviewDeck1]
me,30f
-
- #FFFFFF
+ #8D98A3
#FFE300
#0099FF
#FF0035
@@ -3589,7 +3588,7 @@
1
2,161
250,37
-
+ #8D98A3
@@ -4933,7 +4932,7 @@
2
2,161
250,37
-
+ #8D98A3
=== modified file 'mixxx/res/skins/Shade1024x768-XGA/skin.xml'
--- mixxx/res/skins/Shade1024x768-XGA/skin.xml 2012-12-15 18:12:16 +0000
+++ mixxx/res/skins/Shade1024x768-XGA/skin.xml 2013-01-16 20:19:29 +0000
@@ -212,7 +212,7 @@
[Sampler1]
36,25
139,35
-
+ #8D98A3
@@ -726,7 +726,7 @@
[Sampler2]
36,25
139,35
-
+ #8D98A3
@@ -1240,7 +1240,7 @@
[Sampler3]
36,25
139,35
-
+ #8D98A3
@@ -1754,7 +1754,7 @@
[Sampler4]
36,25
139,35
-
+ #8D98A3
@@ -2375,7 +2375,7 @@
[PreviewDeck1]
me,30f
-
+ #8D98A3
#FFFFFF
#FFE300
#0099FF
@@ -3589,7 +3589,7 @@
1
2,161
250,37
-
+ #8D98A3
@@ -4933,7 +4933,7 @@
2
2,161
250,37
-
+ #8D98A3
=== modified file 'mixxx/res/skins/ShadeDark1024x600-Netbook/skin.xml'
--- mixxx/res/skins/ShadeDark1024x600-Netbook/skin.xml 2012-12-16 08:06:10 +0000
+++ mixxx/res/skins/ShadeDark1024x600-Netbook/skin.xml 2013-01-15 22:57:00 +0000
@@ -212,7 +212,7 @@
[Sampler1]
36,25
139,35
-
+ #3F4249
#FFE300
#0099FF
#FF0035
@@ -726,7 +726,7 @@
[Sampler2]
36,25
139,35
-
+ #3F4249
#FFE300
#0099FF
#FF0035
@@ -1240,7 +1240,7 @@
[Sampler3]
36,25
139,35
-
+ #3F4249
#FFE300
#0099FF
#FF0035
@@ -1754,7 +1754,7 @@
[Sampler4]
36,25
139,35
-
+ #3F4249
#FFE300
#0099FF
#FF0035
@@ -2375,8 +2375,7 @@
[PreviewDeck1]
me,30f
-
- #FFFFFF
+ #3F4249
#FFE300
#0099FF
#FF0035
@@ -3589,7 +3588,7 @@
1
2,161
250,37
-
+ #3F4249
#FFE300
#0099FF
@@ -4934,7 +4933,7 @@
2
2,161
250,37
-
+ #3F4249
#FFE300
@@ -6099,4 +6098,4 @@
-
\ No newline at end of file
+
=== modified file 'mixxx/res/skins/ShadeDark1024x768-XGA/skin.xml'
--- mixxx/res/skins/ShadeDark1024x768-XGA/skin.xml 2012-12-16 08:06:10 +0000
+++ mixxx/res/skins/ShadeDark1024x768-XGA/skin.xml 2013-01-15 22:58:45 +0000
@@ -212,7 +212,7 @@
[Sampler1]
36,25
139,35
-
+ #3F4249
#FFE300
#0099FF
#FF0035
@@ -726,7 +726,7 @@
[Sampler2]
36,25
139,35
-
+ #3F4249
#FFE300
#0099FF
#FF0035
@@ -1240,7 +1240,7 @@
[Sampler3]
36,25
139,35
-
+ #3F4249
#FFE300
#0099FF
#FF0035
@@ -1754,7 +1754,7 @@
[Sampler4]
36,25
139,35
-
+ #3F4249
#FFE300
#0099FF
#FF0035
@@ -2375,8 +2375,7 @@
[PreviewDeck1]
me,30f
-
- #FFFFFF
+ #3F4249
#FFE300
#0099FF
#FF0035
@@ -3589,7 +3588,7 @@
1
2,161
250,37
-
+ #3F4249
#FFE300
#0099FF
@@ -4934,7 +4933,7 @@
2
2,161
250,37
-
+ #3F4249
#FFE300
=== modified file 'mixxx/src/waveform/renderers/glslwaveformrenderersignal.cpp'
--- mixxx/src/waveform/renderers/glslwaveformrenderersignal.cpp 2012-09-19 21:04:53 +0000
+++ mixxx/src/waveform/renderers/glslwaveformrenderersignal.cpp 2013-01-16 20:22:48 +0000
@@ -357,9 +357,9 @@
glViewport(0, 0, m_framebuffer->width(), m_framebuffer->height());
- m_frameShaderProgram->setUniformValue("lowColor",m_colors.getLowColor());
- m_frameShaderProgram->setUniformValue("midColor",m_colors.getMidColor());
- m_frameShaderProgram->setUniformValue("highColor",m_colors.getHighColor());
+ m_frameShaderProgram->setUniformValue("lowColor", m_pColors->getLowColor());
+ m_frameShaderProgram->setUniformValue("midColor", m_pColors->getMidColor());
+ m_frameShaderProgram->setUniformValue("highColor", m_pColors->getHighColor());
glBindTexture(GL_TEXTURE_2D, m_signalMaxbuffer->texture());
glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR);
=== modified file 'mixxx/src/waveform/renderers/glwaveformrendererfilteredsignal.cpp'
--- mixxx/src/waveform/renderers/glwaveformrendererfilteredsignal.cpp 2012-09-19 21:04:53 +0000
+++ mixxx/src/waveform/renderers/glwaveformrendererfilteredsignal.cpp 2013-01-16 20:28:57 +0000
@@ -63,9 +63,9 @@
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
- const QColor& l = m_colors.getLowColor();
- const QColor& m = m_colors.getMidColor();
- const QColor& h = m_colors.getHighColor();
+ const QColor& l = m_pColors->getLowColor();
+ const QColor& m = m_pColors->getMidColor();
+ const QColor& h = m_pColors->getHighColor();
// Per-band gain from the EQ knobs.
float lowGain(1.0), midGain(1.0), highGain(1.0);
=== modified file 'mixxx/src/waveform/renderers/glwaveformrenderersimplesignal.cpp'
--- mixxx/src/waveform/renderers/glwaveformrenderersimplesignal.cpp 2012-09-19 21:04:53 +0000
+++ mixxx/src/waveform/renderers/glwaveformrenderersimplesignal.cpp 2013-01-16 20:25:36 +0000
@@ -62,7 +62,7 @@
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
- const QColor& color = m_colors.getSignalColor();
+ const QColor& color = m_pColors->getSignalColor();
WaveformWidgetFactory* factory = WaveformWidgetFactory::instance();
const double visualGain = factory->getVisualGain(::WaveformWidgetFactory::All);
=== modified file 'mixxx/src/waveform/renderers/qtwaveformrendererfilteredsignal.cpp'
--- mixxx/src/waveform/renderers/qtwaveformrendererfilteredsignal.cpp 2012-09-19 21:04:53 +0000
+++ mixxx/src/waveform/renderers/qtwaveformrendererfilteredsignal.cpp 2013-01-16 20:28:40 +0000
@@ -21,9 +21,9 @@
}
void QtWaveformRendererFilteredSignal::onSetup(const QDomNode& /*node*/) {
- QColor low = m_colors.getLowColor();
- QColor mid = m_colors.getMidColor();
- QColor high = m_colors.getHighColor();
+ QColor low = m_pColors->getLowColor();
+ QColor mid = m_pColors->getMidColor();
+ QColor high = m_pColors->getHighColor();
QColor lowCenter = low;
QColor midCenter = mid;
=== modified file 'mixxx/src/waveform/renderers/qtwaveformrenderersimplesignal.cpp'
--- mixxx/src/waveform/renderers/qtwaveformrenderersimplesignal.cpp 2012-11-20 00:40:18 +0000
+++ mixxx/src/waveform/renderers/qtwaveformrenderersimplesignal.cpp 2013-01-16 20:28:25 +0000
@@ -19,10 +19,10 @@
void QtWaveformRendererSimpleSignal::onSetup(const QDomNode &node){
Q_UNUSED(node);
- QColor signalColor = m_colors.getSignalColor();
+ QColor signalColor = m_pColors->getSignalColor();
signalColor.setAlphaF(0.8);
- QColor bornderColor = m_colors.getSignalColor().lighter(125);
+ QColor bornderColor = m_pColors->getSignalColor().lighter(125);
bornderColor.setAlphaF(0.5);
m_borderPen.setColor(bornderColor);
m_borderPen.setWidthF(1.25);
=== modified file 'mixxx/src/waveform/renderers/waveformrenderbackground.cpp'
--- mixxx/src/waveform/renderers/waveformrenderbackground.cpp 2012-12-11 22:24:39 +0000
+++ mixxx/src/waveform/renderers/waveformrenderbackground.cpp 2013-01-16 20:31:08 +0000
@@ -14,9 +14,7 @@
}
void WaveformRenderBackground::setup(const QDomNode& node) {
- m_backgroundColor.setNamedColor(
- WWidget::selectNodeQString(node, "BgColor"));
- m_backgroundColor = WSkinColor::getCorrectColor(m_backgroundColor);
+ m_backgroundColor = m_waveformRenderer->getWaveformSignalColors()->getBgColor();
m_backgroundPixmapPath = WWidget::selectNodeQString(node, "BgPixmap");
setDirty(true);
}
=== modified file 'mixxx/src/waveform/renderers/waveformrendererfilteredsignal.cpp'
--- mixxx/src/waveform/renderers/waveformrendererfilteredsignal.cpp 2013-01-05 20:31:30 +0000
+++ mixxx/src/waveform/renderers/waveformrendererfilteredsignal.cpp 2013-01-16 20:32:12 +0000
@@ -225,11 +225,11 @@
}
}
- painter->setPen(QPen(QBrush(m_colors.getLowColor()), 1));
+ painter->setPen(QPen(QBrush(m_pColors->getLowColor()), 1));
painter->drawLines(&m_lowLines[0], actualLowLineNumber);
- painter->setPen(QPen(QBrush(m_colors.getMidColor()), 1));
+ painter->setPen(QPen(QBrush(m_pColors->getMidColor()), 1));
painter->drawLines(&m_midLines[0], actualMidLineNumber);
- painter->setPen(QPen(QBrush(m_colors.getHighColor()), 1));
+ painter->setPen(QPen(QBrush(m_pColors->getHighColor()), 1));
painter->drawLines(&m_highLines[0], actualHighLineNumber);
painter->restore();
=== modified file 'mixxx/src/waveform/renderers/waveformrendererhsv.cpp'
--- mixxx/src/waveform/renderers/waveformrendererhsv.cpp 2012-12-14 01:26:04 +0000
+++ mixxx/src/waveform/renderers/waveformrendererhsv.cpp 2013-01-16 20:28:04 +0000
@@ -24,7 +24,7 @@
Q_UNUSED(node);
}
-void WaveformRendererHSV::draw(QPainter* painter,
+void WaveformRendererHSV::draw(QPainter* painter,
QPaintEvent* /*event*/) {
const TrackPointer trackInfo = m_waveformRenderer->getTrackInfo();
if (!trackInfo) {
@@ -72,7 +72,7 @@
double h,s,v;
// Get base color of waveform in the HSV format (s and v isn't use)
- m_colors.getLowColor().getHsvF(&h,&s,&v);
+ m_pColors->getLowColor().getHsvF(&h,&s,&v);
QColor color;
float lo, hi, total;
=== modified file 'mixxx/src/waveform/renderers/waveformrenderersignalbase.cpp'
--- mixxx/src/waveform/renderers/waveformrenderersignalbase.cpp 2012-12-04 23:46:58 +0000
+++ mixxx/src/waveform/renderers/waveformrenderersignalbase.cpp 2013-01-16 20:27:27 +0000
@@ -71,9 +71,8 @@
m_alignment = Qt::AlignCenter;
}
- m_colors.setup(node);
- m_axesColor = m_colors.getAxesColor();
-
+ m_pColors = m_waveformRenderer->getWaveformSignalColors();
+ m_axesColor = m_pColors->getAxesColor();
onSetup(node);
}
=== modified file 'mixxx/src/waveform/renderers/waveformrenderersignalbase.h'
--- mixxx/src/waveform/renderers/waveformrenderersignalbase.h 2012-09-19 21:04:53 +0000
+++ mixxx/src/waveform/renderers/waveformrenderersignalbase.h 2013-01-16 20:32:45 +0000
@@ -30,7 +30,7 @@
ControlObjectThreadMain* m_midKillControlObject;
ControlObjectThreadMain* m_highKillControlObject;
- WaveformSignalColors m_colors;
+ const WaveformSignalColors* m_pColors;
QColor m_axesColor;
Qt::Alignment m_alignment;
};
=== modified file 'mixxx/src/waveform/renderers/waveformsignalcolors.cpp'
--- mixxx/src/waveform/renderers/waveformsignalcolors.cpp 2012-12-04 23:46:58 +0000
+++ mixxx/src/waveform/renderers/waveformsignalcolors.cpp 2013-01-16 20:27:03 +0000
@@ -31,11 +31,22 @@
m_highColor = WSkinColor::getCorrectColor(m_highColor);
m_axesColor.setNamedColor(WWidget::selectNodeQString(node, "AxesColor"));
+ if (!m_axesColor.isValid()) {
+ m_axesColor = QColor(245,245,245);
+ }
m_axesColor = WSkinColor::getCorrectColor(m_axesColor);
- if (!m_axesColor.isValid()) {
- m_axesColor = QColor(245,245,245,128);
- }
+ m_playPosColor.setNamedColor(WWidget::selectNodeQString(node, "PlayPosColor"));
+ m_playPosColor = WSkinColor::getCorrectColor(m_playPosColor);
+ if (!m_playPosColor.isValid()) {
+ m_playPosColor = m_axesColor;
+ }
+
+ m_bgColor.setNamedColor(WWidget::selectNodeQString(node, "BgColor"));
+ if (!m_bgColor.isValid()) {
+ m_bgColor = QColor(0, 0, 0);
+ }
+ m_bgColor = WSkinColor::getCorrectColor(m_bgColor);
bool filteredColorValid = m_lowColor.isValid() && m_midColor.isValid() && m_highColor.isValid();
=== modified file 'mixxx/src/waveform/renderers/waveformsignalcolors.h'
--- mixxx/src/waveform/renderers/waveformsignalcolors.h 2012-12-04 23:46:58 +0000
+++ mixxx/src/waveform/renderers/waveformsignalcolors.h 2013-01-16 20:31:29 +0000
@@ -18,6 +18,8 @@
inline const QColor& getMidColor() const { return m_midColor;}
inline const QColor& getHighColor() const { return m_highColor;}
inline const QColor& getAxesColor() const { return m_axesColor;}
+ inline const QColor& getPlayPosColor() const { return m_playPosColor;}
+ inline const QColor& getBgColor() const { return m_bgColor;}
protected:
void fallBackFromSignalColor();
@@ -31,6 +33,8 @@
QColor m_midColor;
QColor m_highColor;
QColor m_axesColor;
+ QColor m_playPosColor;
+ QColor m_bgColor;
};
#endif // WAVEFORMSIGNALCOLORS_H
=== modified file 'mixxx/src/waveform/renderers/waveformwidgetrenderer.cpp'
--- mixxx/src/waveform/renderers/waveformwidgetrenderer.cpp 2012-12-10 01:59:08 +0000
+++ mixxx/src/waveform/renderers/waveformwidgetrenderer.cpp 2013-01-16 20:35:32 +0000
@@ -194,7 +194,7 @@
m_rendererStack.at(i)->draw(painter, event);
}
- painter->setPen(m_axesColor);
+ painter->setPen(m_colors.getPlayPosColor());
painter->drawLine(m_width/2,0,m_width/2,m_height);
}
@@ -243,13 +243,10 @@
void WaveformWidgetRenderer::setup( const QDomNode& node) {
- m_axesColor.setNamedColor(WWidget::selectNodeQString(node, "AxesColor"));
-
- if( !m_axesColor.isValid())
- m_axesColor = QColor(245,245,245,200);
-
- for( int i = 0; i < m_rendererStack.size(); ++i)
+ m_colors.setup(node);
+ for (int i = 0; i < m_rendererStack.size(); ++i) {
m_rendererStack[i]->setup(node);
+ }
}
void WaveformWidgetRenderer::setZoom(int zoom) {
=== modified file 'mixxx/src/waveform/renderers/waveformwidgetrenderer.h'
--- mixxx/src/waveform/renderers/waveformwidgetrenderer.h 2012-12-10 01:59:08 +0000
+++ mixxx/src/waveform/renderers/waveformwidgetrenderer.h 2013-01-16 20:24:49 +0000
@@ -9,6 +9,7 @@
#include "trackinfoobject.h"
#include "util.h"
#include "waveform/renderers/waveformrendererabstract.h"
+#include "waveform/renderers/waveformsignalcolors.h"
//#define WAVEFORMWIDGETRENDERER_DEBUG
@@ -63,6 +64,7 @@
void resize(int width, int height);
int getHeight() const { return m_height;}
int getWidth() const { return m_width;}
+ const WaveformSignalColors* getWaveformSignalColors() const { return &m_colors; };
template< class T_Renderer>
inline T_Renderer* addRenderer() {
@@ -79,7 +81,7 @@
QVector m_rendererStack;
int m_height;
int m_width;
- QColor m_axesColor;
+ WaveformSignalColors m_colors;
double m_firstDisplayedPosition;
double m_lastDisplayedPosition;
=== modified file 'mixxx/src/widget/woverview.cpp'
--- mixxx/src/widget/woverview.cpp 2013-01-03 21:46:06 +0000
+++ mixxx/src/widget/woverview.cpp 2013-01-16 20:38:45 +0000
@@ -71,19 +71,19 @@
}
void WOverview::setup(QDomNode node) {
- // Background color and pixmap, default background color to transparent
- m_qColorBackground = QColor(0, 0, 0, 0);
- const QString bgColorName = WWidget::selectNodeQString(node, "BgColor");
- if (!bgColorName.isNull()) {
- m_qColorBackground.setNamedColor(bgColorName);
- m_qColorBackground = WSkinColor::getCorrectColor(m_qColorBackground);
- }
+ m_signalColors.setup(node);
+
+ m_qColorBackground = m_signalColors.getBgColor();
// Clear the background pixmap, if it exists.
m_backgroundPixmap = QPixmap();
m_backgroundPixmapPath = WWidget::selectNodeQString(node, "BgPixmap");
if (m_backgroundPixmapPath != "") {
m_backgroundPixmap = QPixmap(WWidget::getPath(m_backgroundPixmapPath));
+ if (m_backgroundPixmap.size() != size()) {
+ qDebug() << "WOverview: BgPixmap does not fit. Widget size:" << size()
+ << "BgPixmap size: << m_backgroundPixmap.size()";
+ }
}
m_endOfTrackColor = QColor(200, 25, 20);
@@ -97,8 +97,6 @@
palette.setColor(this->backgroundRole(), m_qColorBackground);
setPalette(palette);
- m_signalColors.setup(node);
-
m_qColorMarker.setNamedColor(selectNodeQString(node, "MarkerColor"));
m_qColorMarker = WSkinColor::getCorrectColor(m_qColorMarker);
@@ -527,8 +525,8 @@
const float markPosition = offset + currentMark.m_pointControl->get() * gain;
const QLineF line(markPosition, 0.0, markPosition, (float)height());
- painter.setPen( shadowPen);
- painter.drawLine( line);
+ painter.setPen(shadowPen);
+ painter.drawLine(line);
painter.setPen(currentMark.m_color);
painter.drawLine(line);
@@ -556,7 +554,7 @@
}
//draw current position
- painter.setPen(m_qColorMarker);
+ painter.setPen(m_signalColors.getPlayPosColor());
painter.setOpacity(0.9);
painter.drawLine(m_iPos, 0, m_iPos, height());