[Traverso-commit] traverso resources/themes/default/traversotheme...

[Nicola Doebelin]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Nicola Doebelin <n_doebelin>    07/05/07 21:29:07

Modified files:
        resources/themes/default: traversotheme.xml 
        src/core       : ViewPort.cpp 
        src/traverso/songcanvas: CurveView.cpp 
        src/traverso/widgets: InfoWidgets.cpp MessageWidget.cpp 

Log message:
        More font theming fixes

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/resources/themes/default/traversotheme.xml?cvsroot=traverso&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/ViewPort.cpp?cvsroot=traverso&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/CurveView.cpp?cvsroot=traverso&r1=1.47&r2=1.48
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/widgets/InfoWidgets.cpp?cvsroot=traverso&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/widgets/MessageWidget.cpp?cvsroot=traverso&r1=1.3&r2=1.4

Patches:
Index: resources/themes/default/traversotheme.xml
===================================================================
RCS file: 
/sources/traverso/traverso/resources/themes/default/traversotheme.xml,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- resources/themes/default/traversotheme.xml  7 May 2007 20:14:11 -0000       
1.26
+++ resources/themes/default/traversotheme.xml  7 May 2007 21:29:07 -0000       
1.27
@@ -35,13 +35,18 @@
                <font name="VUMeter:fontscale:label" value="0.75" />
                <font name="FFTSpectrum: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.9" />
+               <font name="Timeline:fontscale:label" value="0.95" />
+               <font name="Timeline:fontscale:marker" value="0.95" />
                <font name="TrackPanel:fontscale:name" value="0.9" />
                <font name="TrackPanel:fontscale:gain" value="0.8" />
                <font name="TrackPanel:fontscale:pan" value="0.8" />
-               <font name="TrackPanel:fontscale:led" value="0.8" />
-               <font name="TrackPanel:fontscale:bus" value="0.8" />
+               <font name="TrackPanel:fontscale:led" value="0.85" />
+               <font name="TrackPanel:fontscale:bus" value="0.85" />
+               <font name="InfoWidget:fontscale:values" value="0.75" />
+               <font name="Playhead:fontscale:info" value="1.50" />
+               <font name="CurveView:fontscale:label" value="0.75" />
+               <font name="ViewPort:fontscale:infocursor" value="0.95" />
+               <font name="MessageWidget:fontscale:log" value="1.0" />
        </fonts>
        <colors>
                <color name="Text:light" red="200" green="200" blue="200"  
alpha="255" />

Index: src/core/ViewPort.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/ViewPort.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- src/core/ViewPort.cpp       5 May 2007 20:54:03 -0000       1.20
+++ src/core/ViewPort.cpp       7 May 2007 21:29:07 -0000       1.21
@@ -32,6 +32,7 @@
 #include <QApplication>
 #include <Utils.h>
 #include "InputEngine.h"
+#include "Themer.h"
 
 #include "ViewPort.h"
 #include "ContextPointer.h"
@@ -276,11 +277,11 @@
        painter->drawPixmap(0, 0, m_pixmap);
        
        if (!m_text.isEmpty()) {
-               QFontMetrics fm(QFont("Bitstream Vera Sans", 11));
+               QFontMetrics 
fm(themer()->get_font("ViewPort:fontscale:infocursor"));
                int width = fm.width(m_text) + 4;
                int height = fm.height();
                QRect textArea = QRect(m_pixmap.width() + 10, m_pixmap.height() 
/ 4, width, height);
-               painter->setFont(QFont("Bitstream Vera Sans", 11));
+               
painter->setFont(themer()->get_font("ViewPort:fontscale:infocursor"));
                painter->fillRect(textArea, QBrush(Qt::white));
                painter->drawText(textArea, m_text);
        }

Index: src/traverso/songcanvas/CurveView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/CurveView.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- src/traverso/songcanvas/CurveView.cpp       7 May 2007 11:09:00 -0000       
1.47
+++ src/traverso/songcanvas/CurveView.cpp       7 May 2007 21:29:07 -0000       
1.48
@@ -286,8 +286,7 @@
        painter->drawPath(path);
        
        if (xstart <= 80 && pixelcount >= 100 ) {
-               QFont font("Bitstream Vera Sans", 8);
-               painter->setFont(font);
+               
painter->setFont(themer()->get_font("CurveView:fontscale:label"));
                painter->drawText(10, m_boundingRect.height() - 14, "Gain 
Curve");
        }
        

Index: src/traverso/widgets/InfoWidgets.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/widgets/InfoWidgets.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- src/traverso/widgets/InfoWidgets.cpp        7 May 2007 20:32:28 -0000       
1.25
+++ src/traverso/widgets/InfoWidgets.cpp        7 May 2007 21:29:07 -0000       
1.26
@@ -493,7 +493,7 @@
                fontcolor = QColor(fc, fc, fc);
        }
        
-       painter.setFont(QFont("Bitstream Vera Sans", 13));
+       painter.setFont(themer()->get_font("Playhead:fontscale:info"));
        painter.setPen(fontcolor);
        
        painter.drawPixmap(0, 0, m_background);
@@ -860,7 +860,7 @@
        painter.drawRect(rect);
        
        painter.setPen(Qt::black);
-       painter.setFont(QFont("Bitstream Vera Sans", 8));
+       painter.setFont(themer()->get_font("InfoWidget:fontscale:values"));
        
        if (m_introunding) {
                painter.drawText(0, 0, width(), height(), Qt::AlignCenter, 

Index: src/traverso/widgets/MessageWidget.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/widgets/MessageWidget.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- src/traverso/widgets/MessageWidget.cpp      11 Apr 2007 15:56:35 -0000      
1.3
+++ src/traverso/widgets/MessageWidget.cpp      7 May 2007 21:29:07 -0000       
1.4
@@ -150,7 +150,7 @@
                begin = 40;
 
 //     painter.setPen(QColor(Qt::white));
-       painter.setFont(QFont("Bitstream Vera Sans", fontSize));
+       painter.setFont(themer()->get_font("MessageWidget:fontscale:log"));
        painter.setRenderHint(QPainter::TextAntialiasing);
        painter.drawText(begin, 16, m_infoStruct.message);
        painter.drawPixmap(begin - 35, 3, pm);