[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, 06 May 2007 22:05:17 +0000 |
CVSROOT: /sources/traverso
Module name: traverso
Changes by: Nicola Doebelin <n_doebelin> 07/05/06 22:05:17
Modified files:
resources/themes/default: traversotheme.xml
src/traverso : CorrelationMeterWidget.cpp
CorrelationMeterWidget.h
SpectralMeterWidget.cpp SpectralMeterWidget.h
VUMeter.cpp VUMeter.h
src/traverso/songcanvas: AudioClipView.cpp AudioClipView.h
MarkerView.cpp MarkerView.h
TimeLineView.cpp TimeLineView.h
TrackPanelView.cpp TrackPanelView.h
Log message:
Fonts are now handled by the window manager, only the size can be
themed by a scale factor
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/resources/themes/default/traversotheme.xml?cvsroot=traverso&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/CorrelationMeterWidget.cpp?cvsroot=traverso&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/CorrelationMeterWidget.h?cvsroot=traverso&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/SpectralMeterWidget.cpp?cvsroot=traverso&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/SpectralMeterWidget.h?cvsroot=traverso&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/VUMeter.cpp?cvsroot=traverso&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/VUMeter.h?cvsroot=traverso&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/AudioClipView.cpp?cvsroot=traverso&r1=1.58&r2=1.59
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/AudioClipView.h?cvsroot=traverso&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/MarkerView.cpp?cvsroot=traverso&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/MarkerView.h?cvsroot=traverso&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/TimeLineView.cpp?cvsroot=traverso&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/TimeLineView.h?cvsroot=traverso&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/TrackPanelView.cpp?cvsroot=traverso&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/TrackPanelView.h?cvsroot=traverso&r1=1.11&r2=1.12
Patches:
Index: resources/themes/default/traversotheme.xml
===================================================================
RCS file:
/sources/traverso/traverso/resources/themes/default/traversotheme.xml,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- resources/themes/default/traversotheme.xml 5 May 2007 21:11:07 -0000
1.23
+++ resources/themes/default/traversotheme.xml 6 May 2007 22:05:17 -0000
1.24
@@ -27,14 +27,20 @@
<property name="VUMeter:layout:mainlayoutmargin" value="1" />
<property name="VUMeter:layout:mainlayoutspacing" value="2" />
<property name="VUMeter:layout:minimumlevelwidth" value="6" />
+
+ <property name="AudioCli:fontscale" value="0.9" />
+ <property name="VUMeter:fontscale" value="0.75" />
+ <property name="FFTSpectrum:fontscale" value="0.75" />
+ <property name="CorrelationMeter:fontscale" value="0.75" />
+ <property name="Timeline:fontscale" value="0.9" />
+ <property name="Marker:fontscale" value="0.9" />
+ <property name="TrackPanel:name:fontscale" value="1.0" />
+ <property name="TrackPanel:gain:fontscale" value="0.9" />
+ <property name="TrackPanel:pan:fontscale" value="0.9" />
+ <property name="TrackPanel:led:fontscale" value="0.9" />
+ <property name="TrackPanel:bus:fontscale" value="0.9" />
</properties>
<fonts>
- <font name="AudioClip:title" size="8" family="Bitstream Vera
Sans" />
- <font name="TrackPanel:name" size="8" family="Bitstream Vera
Sans" />
- <font name="TrackPanel:gain" size="7" family="Bitstream Vera
Sans" />
- <font name="TrackPanel:pan" size="7" family="Bitstream Vera
Sans" />
- <font name="TrackPanel:led" size="8" family="Bitstream Vera
Sans" />
- <font name="TrackPanel:bus" size="8" family="Bitstream Vera
Sans" />
<font name="Plugin:name" size="8" family="Bitstream Vera Sans"
/>
</fonts>
<colors>
Index: src/traverso/CorrelationMeterWidget.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/CorrelationMeterWidget.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- src/traverso/CorrelationMeterWidget.cpp 17 Apr 2007 19:56:46 -0000
1.20
+++ src/traverso/CorrelationMeterWidget.cpp 6 May 2007 22:05:17 -0000
1.21
@@ -32,6 +32,7 @@
#include <Themer.h>
#include <ContextPointer.h>
#include <Config.h>
+#include <QApplication>
#include <QtGui>
#include <QDebug>
@@ -114,6 +115,10 @@
, m_meter(0)
, m_song(0)
{
+
+ m_font = QApplication::font();
+ m_font.setPointSize(int(m_font.pointSize() *
themer()->get_property("CorrelationMeter:fontscale", 0.75).toDouble()));
+
fgColor = themer()->get_color("Meter:margin");
bgColor = themer()->get_color("Meter:background");
hgColor = themer()->get_color("Meter:grid");
@@ -182,8 +187,8 @@
painter->setPen(pen);
painter->drawLine(m_widget->width()/2 + centerOffset, 0,
m_widget->width()/2 + centerOffset, m_widget->height());
- painter->setFont(QFont("Bitstream Vera Sans", FONT_SIZE));
- QFontMetrics fm(QFont("Bitstream Vera Sans", FONT_SIZE));
+ painter->setFont(m_font);
+ QFontMetrics fm(m_font);
if (m_widget->height() < 2*fm.height()) {
return;
Index: src/traverso/CorrelationMeterWidget.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/CorrelationMeterWidget.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- src/traverso/CorrelationMeterWidget.h 5 Mar 2007 20:51:23 -0000
1.8
+++ src/traverso/CorrelationMeterWidget.h 6 May 2007 22:05:17 -0000
1.9
@@ -35,6 +35,7 @@
class Command;
class QLinearGradient;
class QColor;
+class QFont;
class CorrelationMeterWidget : public ViewPort
@@ -84,6 +85,8 @@
QColor bgColor, fgColor,
hgColor, dtColor;
int range;
+ QFont m_font;
+
void save_configuration();
void load_configuration();
Index: src/traverso/SpectralMeterWidget.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/SpectralMeterWidget.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- src/traverso/SpectralMeterWidget.cpp 17 Apr 2007 19:56:46 -0000
1.38
+++ src/traverso/SpectralMeterWidget.cpp 6 May 2007 22:05:17 -0000
1.39
@@ -20,6 +20,7 @@
*/
#include "SpectralMeterWidget.h"
+#include <QApplication>
#include <Config.h>
#include <Information.h>
#include <PluginChain.h>
@@ -47,7 +48,6 @@
static const float DEFAULT_VAL = -999.0f;
static const int UPDATE_INTERVAL = 40;
-static const int FONT_SIZE = 7;
static const uint MAX_SAMPLES = UINT_MAX;
@@ -128,7 +128,10 @@
show_average = false;
sample_weight = 1;
- QFontMetrics fm(QFont("Bitstream Vera Sans", FONT_SIZE));
+ m_font = QApplication::font();
+ m_font.setPointSize(int(m_font.pointSize() *
themer()->get_property("FFTSpectrum:fontscale", 0.75).toDouble()));
+
+ QFontMetrics fm(m_font);
margin_l = 5;
margin_r = fm.width("-XX") + 5;
margin_t = fm.ascent()/2 + 5;
@@ -244,8 +247,8 @@
QPainter painter(&bgPixmap);
painter.fillRect(m_rect, themer()->get_color("Meter:background"));
- painter.setFont(QFont("Bitstream Vera Sans", FONT_SIZE));
- QFontMetrics fm(QFont("Bitstream Vera Sans", FONT_SIZE));
+ painter.setFont(m_font);
+ QFontMetrics fm(m_font);
QString spm;
Index: src/traverso/SpectralMeterWidget.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/SpectralMeterWidget.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- src/traverso/SpectralMeterWidget.h 5 Mar 2007 20:51:23 -0000 1.18
+++ src/traverso/SpectralMeterWidget.h 6 May 2007 22:05:17 -0000 1.19
@@ -36,6 +36,7 @@
class SpectralMeter;
class Command;
class SpectralMeterView;
+class QFont;
class SpectralMeterConfigWidget : public QDialog, private
Ui::SpectralMeterConfigWidget
@@ -117,6 +118,7 @@
QVector<float> m_map_idx2freq;
QRect m_rect;
SpectralMeterConfigWidget *m_config;
+ QFont m_font;
QPixmap bgPixmap;
uint num_bands;
uint sample_rate;
Index: src/traverso/VUMeter.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/VUMeter.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- src/traverso/VUMeter.cpp 16 Mar 2007 00:10:26 -0000 1.17
+++ src/traverso/VUMeter.cpp 6 May 2007 22:05:17 -0000 1.18
@@ -17,14 +17,16 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- $Id: VUMeter.cpp,v 1.17 2007/03/16 00:10:26 r_sijrier Exp $
+ $Id: VUMeter.cpp,v 1.18 2007/05/06 22:05:17 n_doebelin Exp $
*/
#include "VUMeter.h"
+#include <QApplication>
#include <QPainter>
#include <QGradient>
#include <QSpacerItem>
+#include <QFont>
#include <QFontMetrics>
#include "Themer.h"
@@ -54,7 +56,6 @@
*/
static const int MAXIMUM_WIDTH = 150;
-static const int FONT_SIZE = 7;
static const int VULED_HEIGHT = 8;
// initialize static variables
@@ -63,6 +64,9 @@
VUMeter::VUMeter(QWidget* parent, AudioBus* bus)
: QWidget(parent)
{
+ m_font = QApplication::font();
+ m_font.setPointSize(int(m_font.pointSize() *
themer()->get_property("VUMeter:fontscale", 0.6).toDouble()));
+
setMaximumWidth(MAXIMUM_WIDTH);
m_minSpace = 0;
@@ -125,7 +129,7 @@
setAttribute(Qt::WA_OpaquePaintEvent);
channelNameLabel = new QLabel(this);
- channelNameLabel->setFont(QFont("Bitstream Vera Sans", FONT_SIZE));
+ channelNameLabel->setFont(m_font);
channelNameLabel->setAlignment(Qt::AlignHCenter);
QVBoxLayout* mainlayout = new QVBoxLayout;
@@ -155,7 +159,7 @@
{
PENTER3;
- QFontMetrics fm(QFont("Bitstream Vera Sans", FONT_SIZE));
+ QFontMetrics fm(m_font);
// Comment by Remon: Why the -1 here???? Without the -1 it seems to
work correctly too?
// Reply by Nic: It doesn't here (PPC). The label can't become smaller
than the text width,
@@ -220,8 +224,11 @@
VUMeterRuler::VUMeterRuler(QWidget* parent)
: QWidget(parent)
{
+ m_font = QApplication::font();
+ m_font.setPointSize(int(m_font.pointSize() *
themer()->get_property("VUMeter:fontscale", 0.6).toDouble()));
+
setAutoFillBackground(false);
- QFontMetrics fm(QFont("Bitstream Vera Sans", FONT_SIZE));
+ QFontMetrics fm(m_font);
setMinimumWidth(fm.width("-XX")+TICK_LINE_LENGTH + 3);
setMaximumWidth(fm.width("-XX")+TICK_LINE_LENGTH + 4);
@@ -256,12 +263,12 @@
{
PENTER4;
- QFontMetrics fm(QFont("Bitstream Vera Sans", FONT_SIZE));
+ QFontMetrics fm(m_font);
QString spm;
int deltaY;
QPainter painter(this);
- painter.setFont(QFont("Bitstream Vera Sans", FONT_SIZE));
+ painter.setFont(m_font);
// offset is the space occupied by the 'over' LED
float levelRange = float(height() - VULED_HEIGHT);
Index: src/traverso/VUMeter.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/VUMeter.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- src/traverso/VUMeter.h 16 Mar 2007 00:10:26 -0000 1.10
+++ src/traverso/VUMeter.h 6 May 2007 22:05:17 -0000 1.11
@@ -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: VUMeter.h,v 1.10 2007/03/16 00:10:26 r_sijrier Exp $
+ $Id: VUMeter.h,v 1.11 2007/05/06 22:05:17 n_doebelin Exp $
*/
#ifndef VUMETER_H
@@ -32,6 +32,7 @@
class AudioBus;
class AudioChannel;
+class QFont;
class VUMeterRuler : public QWidget
{
@@ -47,6 +48,7 @@
private:
std::vector<int> presetMark;
std::vector<int> lineMark;
+ QFont m_font;
};
@@ -71,6 +73,7 @@
int m_channels;
int m_minSpace;
QString m_name;
+ QFont m_font;
QLabel* channelNameLabel;
VUMeterRuler* ruler;
static QVector<float> lut;
Index: src/traverso/songcanvas/AudioClipView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/AudioClipView.cpp,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- src/traverso/songcanvas/AudioClipView.cpp 6 May 2007 18:06:14 -0000
1.58
+++ src/traverso/songcanvas/AudioClipView.cpp 6 May 2007 22:05:17 -0000
1.59
@@ -23,6 +23,8 @@
#include <QPainter>
#include <QPainterPath>
+#include <QApplication>
+#include <QFont>
#include "AudioClipView.h"
#include "SongView.h"
@@ -52,6 +54,9 @@
{
PENTERCONS;
+ m_fontTitle = QApplication::font();
+ m_fontTitle.setPointSize(int(m_fontTitle.pointSize() *
themer()->get_property("AudioClip:fontscale", 0.9).toDouble()));
+
setZValue(parent->zValue() + 1);
m_sv = sv;
@@ -131,7 +136,7 @@
painter->setPen(themer()->get_color("AudioClip:contour"));
painter->drawRect(xstart, 0, pixelcount, m_height - 1);
painter->setPen(Qt::black);
- painter->setFont( QFont( "Bitstream Vera Sans", 11 ) );
+ painter->setFont( m_fontTitle );
painter->drawText(30, 0, 300, m_height, Qt::AlignVCenter,
tr("Click to reset AudioFile !"));
painter->restore();
return;
@@ -172,7 +177,7 @@
// Progress info, I think so....
painter->setPen(Qt::black);
QRect r(10, 0, 150, m_height);
- painter->setFont( QFont( "Bitstream Vera Sans", 11 ) );
+ painter->setFont( m_fontTitle );
QString si;
si.setNum((int)m_progress);
if (m_progress == 100) m_progress = 0;
@@ -520,7 +525,7 @@
p->fillRect(xstart, 0, pixelcount, m_infoAreaHeight,
themer()->get_color("AudioClip:clipinfobackground:inactive"));
// clip info, only if xstart lies in the stringlenght range which is
calculated by a rough estimate.
if (xstart < m_clipinfoString.size() * 6) {
- p->setFont(themer()->get_font("AudioClip:title"));
+ p->setFont(m_fontTitle);
p->drawText(5, 10, m_clipinfoString);
}
}
Index: src/traverso/songcanvas/AudioClipView.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/AudioClipView.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- src/traverso/songcanvas/AudioClipView.h 30 Apr 2007 13:49:59 -0000
1.23
+++ src/traverso/songcanvas/AudioClipView.h 6 May 2007 22:05:17 -0000
1.24
@@ -36,6 +36,7 @@
class FadeView;
class Peak;
class PositionIndicator;
+class QFont;
class AudioClipView : public ViewItem
{
@@ -77,6 +78,7 @@
CurveView* curveView;
QList<Peak*> m_peakloadinglist;
PositionIndicator* m_posIndicator;
+ QFont m_fontTitle;
QTimer m_recordingTimer;
Index: src/traverso/songcanvas/MarkerView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/MarkerView.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- src/traverso/songcanvas/MarkerView.cpp 6 May 2007 00:02:38 -0000
1.10
+++ src/traverso/songcanvas/MarkerView.cpp 6 May 2007 22:05:17 -0000
1.11
@@ -25,14 +25,15 @@
#include "ClipsViewPort.h"
#include "PositionIndicator.h"
+#include <QApplication>
+#include <QFont>
+#include <QFontMetrics>
#include <QColor>
#include <Song.h>
#include <Marker.h>
#include <Utils.h>
#include <QDebug>
-#define MARKER_WIDTH 10
-
MarkerView::MarkerView(Marker* marker, SongView* sv, ViewItem* parentView)
: ViewItem(parentView, marker)
, m_dragging(false)
@@ -42,6 +43,12 @@
m_active = false;
m_posIndicator = 0;
+ m_font = QApplication::font();
+ m_font.setPointSize(int(m_font.pointSize() *
themer()->get_property("Marker:fontscale", 0.75).toDouble()));
+ QFontMetrics fm(m_font);
+ m_ascent = fm.ascent();
+ m_width = fm.width("NI"); //Â use any two letters to set the width of
the marker indicator
+
load_theme_data();
connect(m_marker, SIGNAL(positionChanged(Snappable*)), this,
SLOT(update_position()));
@@ -56,21 +63,21 @@
painter->save();
painter->setRenderHint(QPainter::Antialiasing);
- painter->setFont( QFont( "Bitstream Vera Sans", 7) );
+ painter->setFont( m_font );
painter->setPen(QColor(Qt::black));
painter->setBrush(m_fillColor);
const QPointF pts[3] = {
QPointF(0, 0),
- QPointF(MARKER_WIDTH, 0),
- QPointF(MARKER_WIDTH/2, 9) };
+ QPointF(m_width, 0),
+ QPointF(m_width/2, m_ascent) };
painter->drawPolygon(pts, 3);
- painter->drawText(14, 8, m_marker->get_description());
+ painter->drawText(m_width + 1, m_ascent, m_marker->get_description());
if (m_active) {
- painter->drawLine(MARKER_WIDTH/2, 9, MARKER_WIDTH/2,
(int)m_boundingRect.height());
+ painter->drawLine(m_width/2, m_ascent, m_width/2,
(int)m_boundingRect.height());
}
if (m_dragging) {
@@ -86,14 +93,14 @@
prepareGeometryChange();
update_position();
- QFontMetrics fm( QFont( "Bitstream Vera Sans", 7) );
+ QFontMetrics fm( m_font );
int descriptionwidth = fm.width(m_marker->get_description()) + 1;
if (m_active) {
- m_boundingRect = QRectF(0, 0, MARKER_WIDTH + descriptionwidth,
+ m_boundingRect = QRectF(-1, 0, m_width + descriptionwidth,
m_sv->get_clips_viewport()->sceneRect().height());
} else {
- m_boundingRect = QRectF(0, 0, MARKER_WIDTH + descriptionwidth,
9.0);
+ m_boundingRect = QRectF(-1, 0, m_width + descriptionwidth,
m_ascent);
}
}
@@ -101,12 +108,12 @@
void MarkerView::update_position()
{
// markerwidth / 2 == center of markerview !
- setPos( (long)(m_marker->get_when() / m_sv->scalefactor) -
(MARKER_WIDTH / 2), 0);
+ setPos( (long)(m_marker->get_when() / m_sv->scalefactor) - (m_width /
2), 0);
}
void MarkerView::set_position(int i)
{
- setPos(i - MARKER_WIDTH / 2, 0);
+ setPos(i - m_width / 2, 0);
}
void MarkerView::load_theme_data()
Index: src/traverso/songcanvas/MarkerView.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/MarkerView.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- src/traverso/songcanvas/MarkerView.h 10 Apr 2007 17:11:48 -0000
1.6
+++ src/traverso/songcanvas/MarkerView.h 6 May 2007 22:05:17 -0000
1.7
@@ -28,6 +28,7 @@
class SongView;
class QColor;
class PositionIndicator;
+class QFont;
class MarkerView : public ViewItem
{
@@ -52,6 +53,9 @@
bool m_active;
bool m_dragging;
PositionIndicator* m_posIndicator;
+ QFont m_font;
+ int m_ascent;
+ int m_width;
private slots:
void update_position();
Index: src/traverso/songcanvas/TimeLineView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/TimeLineView.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- src/traverso/songcanvas/TimeLineView.cpp 6 May 2007 00:02:38 -0000
1.25
+++ src/traverso/songcanvas/TimeLineView.cpp 6 May 2007 22:05:17 -0000
1.26
@@ -21,7 +21,9 @@
#include "TimeLineView.h"
+#include <QApplication>
#include <QPainter>
+#include <QFont>
#include "Themer.h"
#include "SongView.h"
@@ -182,6 +184,10 @@
{
PENTERCONS2;
+ m_font = QApplication::font();
+ m_font.setPointSize(int(m_font.pointSize() *
themer()->get_property("Timeline:fontscale", 0.85).toDouble()));
+
+
m_sv = view;
m_boundingRect = QRectF(0, 0, MAX_CANVAS_WIDTH, TIMELINEHEIGHT);
m_timeline = m_sv->get_song()->get_timeline();
@@ -252,7 +258,7 @@
painter->fillRect(xstart, 0, pixelcount, height,
themer()->get_color("Timeline:background") );
painter->setPen(themer()->get_color("Timeline:text"));
- painter->setFont( QFont( "Bitstream Vera Sans", 9) );
+ painter->setFont( m_font );
nframes_t major;
Index: src/traverso/songcanvas/TimeLineView.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/TimeLineView.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- src/traverso/songcanvas/TimeLineView.h 5 May 2007 20:54:03 -0000
1.8
+++ src/traverso/songcanvas/TimeLineView.h 6 May 2007 22:05:17 -0000
1.9
@@ -30,6 +30,7 @@
class TimeLine;
class MarkerView;
class Marker;
+class QFont;
class TimeLineView : public ViewItem
{
@@ -58,6 +59,7 @@
MarkerView* m_blinkingMarker;
QColor m_blinkColor;
int m_samplerate;
+ QFont m_font;
QHash<nframes_t, QString> m_zooms;
Index: src/traverso/songcanvas/TrackPanelView.cpp
===================================================================
RCS file:
/sources/traverso/traverso/src/traverso/songcanvas/TrackPanelView.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- src/traverso/songcanvas/TrackPanelView.cpp 17 Apr 2007 11:51:20 -0000
1.21
+++ src/traverso/songcanvas/TrackPanelView.cpp 6 May 2007 22:05:17 -0000
1.22
@@ -17,10 +17,12 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-$Id: TrackPanelView.cpp,v 1.21 2007/04/17 11:51:20 r_sijrier Exp $
+$Id: TrackPanelView.cpp,v 1.22 2007/05/06 22:05:17 n_doebelin Exp $
*/
#include <QGraphicsScene>
+#include <QApplication>
+#include <QFont>
#include "TrackPanelView.h"
#include "TrackView.h"
#include "SongView.h"
@@ -66,6 +68,9 @@
m_viewPort->scene()->addItem(muteLed);
+ m_fontName = QApplication::font();
+ m_fontName.setPointSize(int(m_fontName.pointSize() *
themer()->get_property("TrackPanel:name:fontscale", 0.9).toDouble()));
+
if (m_track->armed()) {
recLed->ison_changed(true);
}
@@ -162,14 +167,13 @@
void TrackPanelView::draw_panel_track_name(QPainter* painter)
{
QString title = QString::number(m_track->get_sort_index() + 1) + " " +
m_track->get_name();
- QFont font = themer()->get_font("TrackPanel:name");
if (m_track->get_height() < SMALL_HEIGHT) {
- QFontMetrics fm(font);
+ QFontMetrics fm(m_fontName);
title = fm.elidedText(title, Qt::ElideMiddle, 90);
}
- painter->setFont(font);
+ painter->setFont(m_fontName);
painter->drawText(4, 12, title);
}
@@ -242,6 +246,10 @@
, m_track(track)
{
setAcceptsHoverEvents(true);
+
+ m_fontGain = QApplication::font();
+ m_fontGain.setPointSize(int(m_fontGain.pointSize() *
themer()->get_property("TrackPanel:gain:fontscale", 0.9).toDouble()));
+
}
void TrackPanelGain::paint( QPainter * painter, const QStyleOptionGraphicsItem
* option, QWidget * widget )
@@ -269,7 +277,7 @@
int cb = ( gain < 1 ? 150 + (int)(50 * gain) : abs((int)(10 * gain)) );
painter->setPen(themer()->get_color("TrackPanel:text"));
- painter->setFont(themer()->get_font("TrackPanel:gain"));
+ painter->setFont(m_fontGain);
painter->drawText(0, height + 1, "GAIN");
painter->drawRect(30, 0, sliderWidth, height);
@@ -310,6 +318,9 @@
{
Q_UNUSED(widget);
+ m_fontPan = QApplication::font();
+ m_fontPan.setPointSize(int(m_fontPan.pointSize() *
themer()->get_property("TrackPanel:pan:fontscale", 0.9).toDouble()));
+
bool mousehover = (option->state & QStyle::State_MouseOver);
QColor color = themer()->get_color("TrackPanel:slider:background");
@@ -324,7 +335,7 @@
// int y;
QString s, span;
painter->setPen(themer()->get_color("TrackPanel:text"));
- painter->setFont(themer()->get_font("TrackPanel:pan"));
+ painter->setFont(m_fontPan);
painter->drawText(0, PAN_H + 1, "PAN");
@@ -371,6 +382,10 @@
{
m_track = parent->get_track();
setAcceptsHoverEvents(true);
+
+ m_fontLed = QApplication::font();
+ m_fontLed.setPointSize(int(m_fontLed.pointSize() *
themer()->get_property("TrackPanel:led:fontscale", 0.9).toDouble()));
+
}
void TrackPanelLed::paint(QPainter* painter, const QStyleOptionGraphicsItem *
option, QWidget * widget )
@@ -394,7 +409,7 @@
painter->setBrush(color);
painter->drawRoundRect(m_boundingRect, roundfactor,
roundfactor);
- painter->setFont(themer()->get_font("TrackPanel:led"));
+ painter->setFont(m_fontLed);
painter->setPen(QColor(Qt::black));
painter->drawText(m_boundingRect, Qt::AlignCenter, m_name);
@@ -408,7 +423,7 @@
painter->setBrush(color);
painter->drawRoundRect(m_boundingRect, roundfactor,
roundfactor);
- painter->setFont(themer()->get_font("TrackPanel:led"));
+ painter->setFont(m_fontLed);
painter->setPen(QColor(Qt::gray));
painter->drawText(m_boundingRect, Qt::AlignCenter, m_name);
@@ -445,6 +460,10 @@
{
bus_changed();
setAcceptsHoverEvents(true);
+
+ m_fontBus = QApplication::font();
+ m_fontBus.setPointSize(int(m_fontBus.pointSize() *
themer()->get_property("TrackPanel:bus:fontscale", 0.9).toDouble()));
+
}
void TrackPanelBus::paint(QPainter* painter, const QStyleOptionGraphicsItem *
option, QWidget * widget )
@@ -465,7 +484,7 @@
painter->setBrush(color);
painter->drawRoundRect(m_boundingRect, roundfactor, roundfactor);
- painter->setFont(themer()->get_font("TrackPanel:bus"));
+ painter->setFont(m_fontBus);
painter->setPen(QColor(150, 150, 150));
QString leftright = "";
Index: src/traverso/songcanvas/TrackPanelView.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/TrackPanelView.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- src/traverso/songcanvas/TrackPanelView.h 5 May 2007 20:40:35 -0000
1.11
+++ src/traverso/songcanvas/TrackPanelView.h 6 May 2007 22:05:17 -0000
1.12
@@ -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: TrackPanelView.h,v 1.11 2007/05/05 20:40:35 r_sijrier Exp $
+$Id: TrackPanelView.h,v 1.12 2007/05/06 22:05:17 n_doebelin Exp $
*/
#ifndef TRACK_PANEL_VIEW_H
@@ -30,6 +30,7 @@
class TrackPanelViewPort;
class PanelLed;
class TrackPanelView;
+class QFont;
class TrackPanelGain : public ViewItem
{
@@ -48,6 +49,7 @@
private:
Track* m_track;
+ QFont m_fontGain;
};
class TrackPanelPan : public ViewItem
@@ -68,6 +70,7 @@
private:
Track* m_track;
+ QFont m_fontPan;
};
@@ -86,6 +89,7 @@
QString m_name;
QString m_toggleslot;
bool m_isOn;
+ QFont m_fontLed;
public slots:
void ison_changed(bool isOn);
@@ -109,6 +113,7 @@
int m_type;
QString m_busName;
QPixmap m_pix;
+ QFont m_fontBus;
public slots:
void bus_changed();
@@ -145,6 +150,8 @@
TrackPanelBus* inBus;
TrackPanelBus* outBus;
+ QFont m_fontName;
+
void draw_panel_track_name(QPainter* painter);
void layout_panel_items();
- [Traverso-commit] traverso resources/themes/default/traversotheme..., Remon Sijrier, 2007/05/05
- [Traverso-commit] traverso resources/themes/default/traversotheme...,
Nicola Doebelin <=
- [Traverso-commit] traverso resources/themes/default/traversotheme..., Nicola Doebelin, 2007/05/07
- [Traverso-commit] traverso resources/themes/default/traversotheme..., Nicola Doebelin, 2007/05/07
- [Traverso-commit] traverso resources/themes/default/traversotheme..., Nicola Doebelin, 2007/05/07
- [Traverso-commit] traverso resources/themes/default/traversotheme..., Remon Sijrier, 2007/05/15
- [Traverso-commit] traverso resources/themes/default/traversotheme..., Remon Sijrier, 2007/05/21
- [Traverso-commit] traverso resources/themes/default/traversotheme..., Remon Sijrier, 2007/05/30