[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Traverso-commit] traverso resources/themes/default/traversotheme...
|
From: |
Nicola Doebelin |
|
Subject: |
[Traverso-commit] traverso resources/themes/default/traversotheme... |
|
Date: |
Sun, 08 Jul 2007 20:51:29 +0000 |
CVSROOT: /sources/traverso
Module name: traverso
Changes by: Nicola Doebelin <n_doebelin> 07/07/08 20:51:29
Modified files:
resources/themes/default: traversotheme.xml
src/traverso : CorrelationMeterWidget.cpp
CorrelationMeterWidget.h
SpectralMeterWidget.cpp
Log message:
Completed theming of meter widgets (VUMeter, CorrelationMeter, FFTMeter)
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/resources/themes/default/traversotheme.xml?cvsroot=traverso&r1=1.41&r2=1.42
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/CorrelationMeterWidget.cpp?cvsroot=traverso&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/CorrelationMeterWidget.h?cvsroot=traverso&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/SpectralMeterWidget.cpp?cvsroot=traverso&r1=1.42&r2=1.43
Patches:
Index: resources/themes/default/traversotheme.xml
===================================================================
RCS file:
/sources/traverso/traverso/resources/themes/default/traversotheme.xml,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- resources/themes/default/traversotheme.xml 8 Jul 2007 19:45:06 -0000
1.41
+++ resources/themes/default/traversotheme.xml 8 Jul 2007 20:51:28 -0000
1.42
@@ -33,7 +33,7 @@
<font name="Plugin:fontscale:name" value="0.9" />
<font name="AudioClip:fontscale:title" value="0.9" />
<font name="VUMeter:fontscale:label" value="0.75" />
- <font name="FFTSpectrum:fontscale:label" value="0.75" />
+ <font name="FFTMeter:fontscale:label" value="0.75" />
<font name="CorrelationMeter:fontscale:label" value="0.75" />
<font name="Timeline:fontscale:label" value="0.9" />
<font name="Timeline:fontscale:marker" value="0.95" />
@@ -100,12 +100,23 @@
<color name="Fade:default" red="255" green="0" blue="255"
alpha="85" />
<color name="Fade:bypassed" red="255" green="0" blue="255"
alpha="40" />
- <color name="Meter:margin" red="246" green="246" blue="255"
alpha="255" />
- <color name="Meter:background" red="241" green="250" blue="255"
alpha="255" />
- <color name="Meter:grid" red="205" green="223" blue="255"
alpha="255" />
- <color name="Meter:foreground" red="82" green="80" blue="123"
alpha="255"/>
- <color name="Meter:foreground:light" red="241" green="250"
blue="255" alpha="255"/>
- <color name="Meter:curve:average" red="255" green="0" blue="0"
alpha="255" />
+ <color name="CorrelationMeter:margin" red="246" green="246"
blue="255" alpha="255" />
+ <color name="CorrelationMeter:background" red="241" green="250"
blue="255" alpha="255" />
+ <color name="CorrelationMeter:grid" red="205" green="223"
blue="255" alpha="255" />
+ <color name="CorrelationMeter:foreground:center" red="82"
green="80" blue="123" alpha="255"/>
+ <color name="CorrelationMeter:foreground:side" red="241"
green="250" blue="255" alpha="255"/>
+ <color name="CorrelationMeter:centerline" red="82" green="80"
blue="123" alpha="255"/>
+ <color name="CorrelationMeter:text" red="0" green="0" blue="0"
alpha="255" />
+
+ <color name="FFTMeter:margin" red="246" green="246" blue="255"
alpha="255" />
+ <color name="FFTMeter:background" red="241" green="250"
blue="255" alpha="255" />
+ <color name="FFTMeter:grid" red="205" green="223" blue="255"
alpha="255" />
+ <color name="FFTMeter:foreground" red="82" green="80"
blue="123" alpha="255"/>
+ <color name="FFTMeter:foreground:light" red="241" green="250"
blue="255" alpha="255"/>
+ <color name="FFTMeter:curve:average" red="255" green="0"
blue="0" alpha="255" />
+ <color name="FFTMeter:tickmarks:main" red="0" green="0"
blue="0" alpha="255" />
+ <color name="FFTMeter:tickmarks:sub" red="100" green="100"
blue="100" alpha="255" />
+ <color name="FFTMeter:text" red="0" green="0" blue="0"
alpha="255" />
<color name="VUMeter:background:widget" red="255" green="255"
blue="255" alpha="255" />
<color name="VUMeter:background:bar" red="0" green="0" blue="0"
alpha="255" />
Index: src/traverso/CorrelationMeterWidget.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/CorrelationMeterWidget.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- src/traverso/CorrelationMeterWidget.cpp 24 May 2007 10:56:43 -0000
1.23
+++ src/traverso/CorrelationMeterWidget.cpp 8 Jul 2007 20:51:29 -0000
1.24
@@ -113,14 +113,9 @@
, m_meter(0)
, m_song(0)
{
- fgColor = themer()->get_color("Meter:margin");
- bgColor = themer()->get_color("Meter:background");
- hgColor = themer()->get_color("Meter:grid");
- dtColor = themer()->get_color("Text:dark");
-
- gradPhase.setColorAt(0.0,
themer()->get_color("Meter:foreground:light"));
- gradPhase.setColorAt(0.5, themer()->get_color("Meter:foreground"));
- gradPhase.setColorAt(1.0,
themer()->get_color("Meter:foreground:light"));
+ gradPhase.setColorAt(0.0,
themer()->get_color("CorrelationMeter:foreground:side"));
+ gradPhase.setColorAt(0.5,
themer()->get_color("CorrelationMeter:foreground:center"));
+ gradPhase.setColorAt(1.0,
themer()->get_color("CorrelationMeter:foreground:side"));
load_configuration();
@@ -150,7 +145,7 @@
float r = 90.0f / range;
- painter->fillRect(0, 0, m_widget->width(), m_widget->height(), bgColor);
+ painter->fillRect(0, 0, m_widget->width(), m_widget->height(),
themer()->get_color("CorrelationMeter:background"));
int lend = int(0.5*m_widget->width() - (-coeff + 1.0) * r *
m_widget->width() * (1.0 - fabs(direction)));
int rend = int(0.5*m_widget->width() + (-coeff + 1.0) * r *
m_widget->width() * (1.0 - fabs(direction)));
@@ -158,29 +153,27 @@
int wdt = abs(lend - rend);
int centerOffset = int(m_widget->width() * r * direction);
+ int lpos = int((0.50 - r) * m_widget->width());
+ int cpos = m_widget->width()/2;
+ int rpos = int((0.50 + r) * m_widget->width());
+
gradPhase.setStart(QPointF(float(lend + centerOffset), 0.0));
gradPhase.setFinalStop(QPointF(float(rend + centerOffset), 0.0));
painter->fillRect(lend + centerOffset, 0, wdt, m_widget->height(),
gradPhase);
- painter->setPen(hgColor);
-
- int lpos = int((0.50 - r) * m_widget->width());
- int cpos = int(0.50 * m_widget->width());
- int rpos = int((0.50 + r) * m_widget->width());
+ // center line
+ QPen pen(themer()->get_color("CorrelationMeter:centerline"));
+ pen.setWidth(3);
+ painter->setPen(pen);
+ painter->drawLine(m_widget->width()/2 + centerOffset, 0,
m_widget->width()/2 + centerOffset, m_widget->height());
+ painter->setPen(themer()->get_color("CorrelationMeter:grid"));
painter->drawLine(cpos, 0, cpos, m_widget->height());
-
if (range > 180) {
painter->drawLine(lpos, 0, lpos, m_widget->height());
painter->drawLine(rpos, 0, rpos, m_widget->height());
}
- // center line
- QPen pen(hgColor);
- pen.setWidth(3);
- painter->setPen(pen);
- painter->drawLine(m_widget->width()/2 + centerOffset, 0,
m_widget->width()/2 + centerOffset, m_widget->height());
-
painter->setFont(themer()->get_font("CorrelationMeter:fontscale:label"));
QFontMetrics fm(themer()->get_font("CorrelationMeter:fontscale:label"));
@@ -188,8 +181,8 @@
return;
}
- painter->setPen(dtColor);
- painter->fillRect(0, 0, m_widget->width(), fm.height() + 1, fgColor);
+ painter->setPen(themer()->get_color("CorrelationMeter:text"));
+ painter->fillRect(0, 0, m_widget->width(), fm.height() + 1,
themer()->get_color("CorrelationMeter:margin"));
painter->drawText(cpos - fm.width("C")/2, fm.ascent() + 1, "C");
if (range == 180) {
Index: src/traverso/CorrelationMeterWidget.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/CorrelationMeterWidget.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- src/traverso/CorrelationMeterWidget.h 7 May 2007 18:14:38 -0000
1.10
+++ src/traverso/CorrelationMeterWidget.h 8 Jul 2007 20:51:29 -0000
1.11
@@ -81,8 +81,6 @@
CorrelationMeter* m_meter;
Song* m_song;
QLinearGradient gradPhase;
- QColor bgColor, fgColor,
- hgColor, dtColor;
int range;
void save_configuration();
Index: src/traverso/SpectralMeterWidget.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/SpectralMeterWidget.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- src/traverso/SpectralMeterWidget.cpp 28 May 2007 11:28:26 -0000
1.42
+++ src/traverso/SpectralMeterWidget.cpp 8 Jul 2007 20:51:29 -0000
1.43
@@ -127,7 +127,7 @@
show_average = false;
sample_weight = 1;
- QFontMetrics fm(themer()->get_font("FFTSpectrum:fontscale:label"));
+ QFontMetrics fm(themer()->get_font("FFTMeter:fontscale:label"));
margin_l = 5;
margin_r = fm.width("-XX") + 5;
margin_t = fm.ascent()/2 + 5;
@@ -170,7 +170,7 @@
// draw the bars
if (m_spectrum.size()) {
QRect rect;
- QBrush brush(themer()->get_color("Meter:foreground"),
Qt::SolidPattern);
+ QBrush brush(themer()->get_color("FFTMeter:foreground"),
Qt::SolidPattern);
painter->setClipRegion(m_rect);
painter->setBrush(brush);
painter->setPen(Qt::NoPen);
@@ -191,7 +191,7 @@
// draw the average line if requested
if (show_average) {
-
painter->setPen(themer()->get_color("Meter:curve:average"));
+
painter->setPen(themer()->get_color("FFTMeter:curve:average"));
QPoint pt;
QPoint po((int)m_map_idx2xpos.at(0),
(int)db2ypos(m_avg_db.at(0)));
for (uint i = 0; i < (uint)m_avg_db.size(); ++i) {
@@ -239,12 +239,12 @@
{
// draw the background image
bgPixmap = QPixmap((int)m_boundingRect.width(),
(int)m_boundingRect.height());
- bgPixmap.fill(themer()->get_color("Meter:margin"));
+ bgPixmap.fill(themer()->get_color("FFTMeter:margin"));
QPainter painter(&bgPixmap);
- painter.fillRect(m_rect, themer()->get_color("Meter:background"));
- painter.setFont(themer()->get_font("FFTSpectrum:fontscale:label"));
- QFontMetrics fm(themer()->get_font("FFTSpectrum:fontscale:label"));
+ painter.fillRect(m_rect, themer()->get_color("FFTMeter:background"));
+ painter.setFont(themer()->get_font("FFTMeter:fontscale:label"));
+ QFontMetrics fm(themer()->get_font("FFTMeter:fontscale:label"));
QString spm;
@@ -252,10 +252,10 @@
for (float i = upper_db; i >= lower_db; i -= 10.0f) {
float f = db2ypos(i);
- painter.setPen(themer()->get_color("Meter:grid"));
+ painter.setPen(themer()->get_color("FFTMeter:grid"));
painter.drawLine(QPointF(m_rect.x(), f),
QPointF(m_rect.right(), f));
- painter.setPen(themer()->get_color("Text:dark"));
+ painter.setPen(themer()->get_color("FFTMeter:text"));
spm.sprintf("%2.0f", i);
painter.drawText(m_rect.right() + 1, (int)f + fm.ascent()/2,
spm);
}
@@ -282,11 +282,12 @@
// draw text only if there is enough space for it
if (((f - s) > last_pos) && ((f + s) <
float(m_boundingRect.width()-1))) {
- painter.setPen(themer()->get_color("Text:dark"));
+ painter.setPen(themer()->get_color("FFTMeter:text"));
painter.drawText(QPointF(f - s, m_boundingRect.height()
- fm.descent() - 3), spm);
last_pos = f + s + 1.0;
+
painter.setPen(themer()->get_color("FFTMeter:tickmarks:main"));
} else {
- painter.setPen(themer()->get_color("Text:light"));
+
painter.setPen(themer()->get_color("FFTMeter:tickmarks:sub"));
}
painter.drawLine(QPointF(f, m_rect.bottom()), QPointF(f,
m_rect.bottom() + 3));