[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: |
Thu, 16 Apr 2009 18:05:35 +0000 |
CVSROOT: /sources/traverso
Module name: traverso
Changes by: Nicola Doebelin <n_doebelin> 09/04/16 18:05:35
Modified files:
resources/themes/default: traversotheme.xml
resources/themes/gradients: traversotheme.xml
resources/themes/medium-contrast: traversotheme.xml
resources/themes/ubuntu: traversotheme.xml
src/core : Themer.cpp Themer.h
src/traverso/widgets: CorrelationMeterWidget.cpp
CorrelationMeterWidget.h
Log message:
* Correlation meter now updates instantly when the theme is changed
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/resources/themes/default/traversotheme.xml?cvsroot=traverso&r1=1.50&r2=1.51
http://cvs.savannah.gnu.org/viewcvs/traverso/resources/themes/gradients/traversotheme.xml?cvsroot=traverso&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/traverso/resources/themes/medium-contrast/traversotheme.xml?cvsroot=traverso&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/traverso/resources/themes/ubuntu/traversotheme.xml?cvsroot=traverso&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Themer.cpp?cvsroot=traverso&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Themer.h?cvsroot=traverso&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/widgets/CorrelationMeterWidget.cpp?cvsroot=traverso&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/widgets/CorrelationMeterWidget.h?cvsroot=traverso&r1=1.2&r2=1.3
Patches:
Index: resources/themes/default/traversotheme.xml
===================================================================
RCS file:
/sources/traverso/traverso/resources/themes/default/traversotheme.xml,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- resources/themes/default/traversotheme.xml 13 Apr 2009 15:27:50 -0000
1.50
+++ resources/themes/default/traversotheme.xml 16 Apr 2009 18:05:32 -0000
1.51
@@ -93,8 +93,6 @@
<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" />
@@ -163,4 +161,11 @@
<color name="Marker:blinkend" red="128" green="0" blue="255"
alpha="255" />
<color name="Marker:blink" red="255" green="0" blue="128"
alpha="255" />
</colors>
+ <gradients>
+ <gradient name="CorrelationMeter:foreground">
+ <stop value="0.0" red="241" green="250" blue="255"
alpha="255"/>
+ <stop value="0.5" red="82" green="80" blue="123"
alpha="255"/>
+ <stop value="1.0" red="241" green="250" blue="255"
alpha="255"/>
+ </gradient>
+ </gradients>
</Themer>
Index: resources/themes/gradients/traversotheme.xml
===================================================================
RCS file:
/sources/traverso/traverso/resources/themes/gradients/traversotheme.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- resources/themes/gradients/traversotheme.xml 13 Apr 2009 21:33:59
-0000 1.2
+++ resources/themes/gradients/traversotheme.xml 16 Apr 2009 18:05:33
-0000 1.3
@@ -79,8 +79,6 @@
<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" />
@@ -209,5 +207,10 @@
<stop value="0.0" red="0" green="0" blue="0"
alpha="255" />
<stop value="1.0" red="50" green="50" blue="50"
alpha="255" />
</gradient>
+ <gradient name="CorrelationMeter:foreground">
+ <stop value="0.0" red="241" green="250" blue="255"
alpha="255"/>
+ <stop value="0.5" red="82" green="80" blue="123"
alpha="255"/>
+ <stop value="1.0" red="241" green="250" blue="255"
alpha="255"/>
+ </gradient>
</gradients>
</Themer>
Index: resources/themes/medium-contrast/traversotheme.xml
===================================================================
RCS file:
/sources/traverso/traverso/resources/themes/medium-contrast/traversotheme.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- resources/themes/medium-contrast/traversotheme.xml 13 Apr 2009 15:27:50
-0000 1.8
+++ resources/themes/medium-contrast/traversotheme.xml 16 Apr 2009 18:05:33
-0000 1.9
@@ -93,8 +93,6 @@
<color name="CorrelationMeter:margin" red="200" green="200"
blue="200" alpha="255" />
<color name="CorrelationMeter:background" red="0" green="0"
blue="0" alpha="255" />
<color name="CorrelationMeter:grid" red="255" green="255"
blue="255" alpha="100" />
- <color name="CorrelationMeter:foreground:center" red="50"
green="255" blue="50" alpha="200"/>
- <color name="CorrelationMeter:foreground:side" red="0"
green="80" blue="0" alpha="200"/>
<color name="CorrelationMeter:centerline" red="100" green="255"
blue="100" alpha="230"/>
<color name="CorrelationMeter:text" red="0" green="0" blue="0"
alpha="255"/>
@@ -162,4 +160,11 @@
<color name="Marker:end" red="255" green="0" blue="0"
alpha="255" />
<color name="Marker:blinkend" red="255" green="150" blue="150"
alpha="255" />
</colors>
+ <gradients>
+ <gradient name="CorrelationMeter:foreground">
+ <stop value="0.0" red="0" green="80" blue="0"
alpha="200"/>
+ <stop value="0.5" red="50" green="255" blue="50"
alpha="200"/>
+ <stop value="1.0" red="0" green="80" blue="0"
alpha="200"/>
+ </gradient>
+ </gradients>
</Themer>
Index: resources/themes/ubuntu/traversotheme.xml
===================================================================
RCS file: /sources/traverso/traverso/resources/themes/ubuntu/traversotheme.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- resources/themes/ubuntu/traversotheme.xml 13 Apr 2009 15:27:51 -0000
1.8
+++ resources/themes/ubuntu/traversotheme.xml 16 Apr 2009 18:05:33 -0000
1.9
@@ -93,8 +93,6 @@
<color name="CorrelationMeter:margin" red="239" green="236"
blue="231" alpha="255" />
<color name="CorrelationMeter:background" red="250" green="249"
blue="247" alpha="255" />
<color name="CorrelationMeter:grid" red="0" green="0" blue="0"
alpha="100" />
- <color name="CorrelationMeter:foreground:center" red="219"
green="119" blue="50" alpha="255"/>
- <color name="CorrelationMeter:foreground:side" red="253"
green="185" blue="138" alpha="255"/>
<color name="CorrelationMeter:centerline" red="169" green="116"
blue="72" alpha="255" />
<color name="CorrelationMeter:text" red="0" green="0" blue="0"
alpha="255"/>
@@ -162,4 +160,11 @@
<color name="Marker:end" red="203" green="193" blue="183"
alpha="255" />
<color name="Marker:blinkend" red="255" green="0" blue="0"
alpha="255" />
</colors>
+ <gradients>
+ <gradient name="CorrelationMeter:foreground">
+ <stop value="0.0" red="253" green="185" blue="138"
alpha="255"/>
+ <stop value="0.5" red="219" green="119" blue="50"
alpha="255"/>
+ <stop value="1.0" red="253" green="185" blue="138"
alpha="255"/>
+ </gradient>
+ </gradients>
</Themer>
Index: src/core/Themer.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Themer.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- src/core/Themer.cpp 13 Apr 2009 15:27:51 -0000 1.12
+++ src/core/Themer.cpp 16 Apr 2009 18:05:34 -0000 1.13
@@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-$Id: Themer.cpp,v 1.12 2009/04/13 15:27:51 n_doebelin Exp $
+$Id: Themer.cpp,v 1.13 2009/04/16 18:05:34 n_doebelin Exp $
*/
#include "Themer.h"
@@ -342,6 +342,20 @@
return QBrush(themer()->get_default_color(name));
}
+//Â sometimes we need access to the gradient (e.g. if the start and finalStops
have to be
+// modified
+QLinearGradient Themer::get_gradient(const QString& name) const
+{
+ if (m_gradients.contains(name))
+ {
+qDebug() << QString("**** gradient found");
+ return m_gradients.value(name);
+ } else {
+qDebug() << QString("**** gradient NOT found");
+ return QLinearGradient();
+ }
+}
+
QFont Themer::get_font(const QString& fontname) const
{
return m_fonts.value(fontname);
Index: src/core/Themer.h
===================================================================
RCS file: /sources/traverso/traverso/src/core/Themer.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- src/core/Themer.h 13 Apr 2009 15:27:51 -0000 1.4
+++ src/core/Themer.h 16 Apr 2009 18:05:34 -0000 1.5
@@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- $Id: Themer.h,v 1.4 2009/04/13 15:27:51 n_doebelin Exp $
+ $Id: Themer.h,v 1.5 2009/04/16 18:05:34 n_doebelin Exp $
*/
#ifndef COLORMANAGER_H
@@ -53,6 +53,7 @@
QStringList get_builtin_themes();
QCursor get_cursor(const QString& name) const;
QBrush get_brush(const QString& name, QPoint start = QPoint(0,0),
QPoint stop = QPoint(0,0)) const;
+ QLinearGradient get_gradient(const QString& name) const;
static Themer* instance();
Index: src/traverso/widgets/CorrelationMeterWidget.cpp
===================================================================
RCS file:
/sources/traverso/traverso/src/traverso/widgets/CorrelationMeterWidget.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- src/traverso/widgets/CorrelationMeterWidget.cpp 15 Feb 2008 20:47:40
-0000 1.3
+++ src/traverso/widgets/CorrelationMeterWidget.cpp 16 Apr 2009 18:05:34
-0000 1.4
@@ -47,11 +47,9 @@
CorrelationMeterView::CorrelationMeterView(CorrelationMeterWidget* widget)
: MeterView(widget)
{
- 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_theme_data();
load_configuration();
+ connect(themer(), SIGNAL(themeLoaded()), this, SLOT(load_theme_data()),
Qt::QueuedConnection);
}
void CorrelationMeterView::paint(QPainter *painter, const
QStyleOptionGraphicsItem *option, QWidget *widget)
@@ -63,7 +61,7 @@
float r = 90.0f / range;
- painter->fillRect(0, 0, m_widget->width(), m_widget->height(),
themer()->get_color("CorrelationMeter:background"));
+ painter->fillRect(0, 0, m_widget->width(), m_widget->height(),
m_bgBrush);
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)));
@@ -174,5 +172,12 @@
range = config().get_property("CorrelationMeter", "Range", 360).toInt();
}
+void CorrelationMeterView::load_theme_data()
+{
+ gradPhase = themer()->get_gradient("CorrelationMeter:foreground");
+
+/** TODO: When I replace QPoint(0, 100) with QPoint(0, m_widget->height()) I
get a segmentation fault. WHY??? **/
+ m_bgBrush = themer()->get_brush("CorrelationMeter:background",
QPoint(0, 0), QPoint(0, 100));
+}
//eof
Index: src/traverso/widgets/CorrelationMeterWidget.h
===================================================================
RCS file:
/sources/traverso/traverso/src/traverso/widgets/CorrelationMeterWidget.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- src/traverso/widgets/CorrelationMeterWidget.h 15 Feb 2008 20:38:01
-0000 1.2
+++ src/traverso/widgets/CorrelationMeterWidget.h 16 Apr 2009 18:05:35
-0000 1.3
@@ -51,8 +51,9 @@
private:
float coeff;
float direction;
- QLinearGradient gradPhase;
int range;
+ QBrush m_bgBrush;
+ QLinearGradient gradPhase;
void save_configuration();
void load_configuration();
@@ -60,6 +61,7 @@
private slots:
void update_data();
void set_sheet(Sheet* sheet);
+ void load_theme_data();
public slots:
Command* set_mode();
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Traverso-commit] traverso resources/themes/default/traversotheme...,
Nicola Doebelin <=