[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: |
Mon, 07 May 2007 18:14:38 +0000 |
CVSROOT: /sources/traverso
Module name: traverso
Changes by: Nicola Doebelin <n_doebelin> 07/05/07 18:14:38
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
PluginView.cpp TimeLineView.cpp
TimeLineView.h TrackPanelView.cpp
TrackPanelView.h
Log message:
New font theming implementation
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/resources/themes/default/traversotheme.xml?cvsroot=traverso&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/CorrelationMeterWidget.cpp?cvsroot=traverso&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/CorrelationMeterWidget.h?cvsroot=traverso&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/SpectralMeterWidget.cpp?cvsroot=traverso&r1=1.39&r2=1.40
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/SpectralMeterWidget.h?cvsroot=traverso&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/VUMeter.cpp?cvsroot=traverso&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/VUMeter.h?cvsroot=traverso&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/AudioClipView.cpp?cvsroot=traverso&r1=1.60&r2=1.61
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/AudioClipView.h?cvsroot=traverso&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/MarkerView.cpp?cvsroot=traverso&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/MarkerView.h?cvsroot=traverso&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/PluginView.cpp?cvsroot=traverso&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/TimeLineView.cpp?cvsroot=traverso&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/TimeLineView.h?cvsroot=traverso&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/TrackPanelView.cpp?cvsroot=traverso&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/TrackPanelView.h?cvsroot=traverso&r1=1.12&r2=1.13
Patches:
Index: resources/themes/default/traversotheme.xml
===================================================================
RCS file:
/sources/traverso/traverso/resources/themes/default/traversotheme.xml,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- resources/themes/default/traversotheme.xml 6 May 2007 22:05:17 -0000
1.24
+++ resources/themes/default/traversotheme.xml 7 May 2007 18:14:38 -0000
1.25
@@ -27,21 +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="Plugin:name" size="8" family="Bitstream Vera Sans"
/>
+ <font name="Plugin:fontscale:name" value="0.9" />
+ <font name="AudioClip:fontscale:title" value="0.9" />
+ <font name="VUMeter:fontscale:label" value="0.7" />
+ <font name="FFTSpectrum:fontscale:label" value="0.7" />
+ <font name="CorrelationMeter:fontscale:label" value="0.7" />
+ <font name="Timeline:fontscale:label" value="0.9" />
+ <font name="Timeline:fontscale:marker" value="0.9" />
+ <font name="TrackPanel:fontscale:name" value="1.0" />
+ <font name="TrackPanel:fontscale:gain" value="0.9" />
+ <font name="TrackPanel:fontscale:pan" value="0.9" />
+ <font name="TrackPanel:fontscale:led" value="0.9" />
+ <font name="TrackPanel:fontscale:bus" value="0.9" />
</fonts>
<colors>
<color name="Text:light" red="200" green="200" blue="200"
alpha="255" />
Index: src/traverso/CorrelationMeterWidget.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/CorrelationMeterWidget.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- src/traverso/CorrelationMeterWidget.cpp 6 May 2007 22:05:17 -0000
1.21
+++ src/traverso/CorrelationMeterWidget.cpp 7 May 2007 18:14:38 -0000
1.22
@@ -32,7 +32,6 @@
#include <Themer.h>
#include <ContextPointer.h>
#include <Config.h>
-#include <QApplication>
#include <QtGui>
#include <QDebug>
@@ -42,7 +41,6 @@
#include "Debugger.h"
static const float SMOOTH_SHIFT = 0.05;
-static const int FONT_SIZE = 7;
CorrelationMeterWidget::CorrelationMeterWidget(QWidget* parent)
: ViewPort(parent)
@@ -115,10 +113,6 @@
, 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");
@@ -187,8 +181,8 @@
painter->setPen(pen);
painter->drawLine(m_widget->width()/2 + centerOffset, 0,
m_widget->width()/2 + centerOffset, m_widget->height());
- painter->setFont(m_font);
- QFontMetrics fm(m_font);
+
painter->setFont(themer()->get_font("CorrelationMeter:fontscale:label"));
+ QFontMetrics fm(themer()->get_font("CorrelationMeter:fontscale:label"));
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.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- src/traverso/CorrelationMeterWidget.h 6 May 2007 22:05:17 -0000
1.9
+++ src/traverso/CorrelationMeterWidget.h 7 May 2007 18:14:38 -0000
1.10
@@ -35,7 +35,6 @@
class Command;
class QLinearGradient;
class QColor;
-class QFont;
class CorrelationMeterWidget : public ViewPort
@@ -85,7 +84,6 @@
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.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- src/traverso/SpectralMeterWidget.cpp 6 May 2007 22:05:17 -0000
1.39
+++ src/traverso/SpectralMeterWidget.cpp 7 May 2007 18:14:38 -0000
1.40
@@ -20,7 +20,6 @@
*/
#include "SpectralMeterWidget.h"
-#include <QApplication>
#include <Config.h>
#include <Information.h>
#include <PluginChain.h>
@@ -128,10 +127,7 @@
show_average = false;
sample_weight = 1;
- m_font = QApplication::font();
- m_font.setPointSize(int(m_font.pointSize() *
themer()->get_property("FFTSpectrum:fontscale", 0.75).toDouble()));
-
- QFontMetrics fm(m_font);
+ QFontMetrics fm(themer()->get_font("FFTSpectrum:fontscale:label"));
margin_l = 5;
margin_r = fm.width("-XX") + 5;
margin_t = fm.ascent()/2 + 5;
@@ -247,8 +243,8 @@
QPainter painter(&bgPixmap);
painter.fillRect(m_rect, themer()->get_color("Meter:background"));
- painter.setFont(m_font);
- QFontMetrics fm(m_font);
+ painter.setFont(themer()->get_font("FFTSpectrum:fontscale:label"));
+ QFontMetrics fm(themer()->get_font("FFTSpectrum:fontscale:label"));
QString spm;
Index: src/traverso/SpectralMeterWidget.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/SpectralMeterWidget.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- src/traverso/SpectralMeterWidget.h 6 May 2007 22:05:17 -0000 1.19
+++ src/traverso/SpectralMeterWidget.h 7 May 2007 18:14:38 -0000 1.20
@@ -36,7 +36,6 @@
class SpectralMeter;
class Command;
class SpectralMeterView;
-class QFont;
class SpectralMeterConfigWidget : public QDialog, private
Ui::SpectralMeterConfigWidget
@@ -118,7 +117,6 @@
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.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- src/traverso/VUMeter.cpp 6 May 2007 22:05:17 -0000 1.18
+++ src/traverso/VUMeter.cpp 7 May 2007 18:14:38 -0000 1.19
@@ -17,12 +17,11 @@
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.18 2007/05/06 22:05:17 n_doebelin Exp $
+ $Id: VUMeter.cpp,v 1.19 2007/05/07 18:14:38 n_doebelin Exp $
*/
#include "VUMeter.h"
-#include <QApplication>
#include <QPainter>
#include <QGradient>
#include <QSpacerItem>
@@ -64,9 +63,6 @@
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;
@@ -129,7 +125,7 @@
setAttribute(Qt::WA_OpaquePaintEvent);
channelNameLabel = new QLabel(this);
- channelNameLabel->setFont(m_font);
+
channelNameLabel->setFont(themer()->get_font("VUMeter:fontscale:label"));
channelNameLabel->setAlignment(Qt::AlignHCenter);
QVBoxLayout* mainlayout = new QVBoxLayout;
@@ -159,7 +155,7 @@
{
PENTER3;
- QFontMetrics fm(m_font);
+ QFontMetrics fm(themer()->get_font("VUMeter:fontscale:label"));
// 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,
@@ -224,11 +220,8 @@
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(m_font);
+ QFontMetrics fm(themer()->get_font("VUMeter:fontscale:label"));
setMinimumWidth(fm.width("-XX")+TICK_LINE_LENGTH + 3);
setMaximumWidth(fm.width("-XX")+TICK_LINE_LENGTH + 4);
@@ -263,12 +256,12 @@
{
PENTER4;
- QFontMetrics fm(m_font);
+ QFontMetrics fm(themer()->get_font("VUMeter:fontscale:label"));
QString spm;
int deltaY;
QPainter painter(this);
- painter.setFont(m_font);
+ painter.setFont(themer()->get_font("VUMeter:fontscale:label"));
// 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.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- src/traverso/VUMeter.h 6 May 2007 22:05:17 -0000 1.11
+++ src/traverso/VUMeter.h 7 May 2007 18:14:38 -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: VUMeter.h,v 1.11 2007/05/06 22:05:17 n_doebelin Exp $
+ $Id: VUMeter.h,v 1.12 2007/05/07 18:14:38 n_doebelin Exp $
*/
#ifndef VUMETER_H
@@ -32,7 +32,6 @@
class AudioBus;
class AudioChannel;
-class QFont;
class VUMeterRuler : public QWidget
{
@@ -73,7 +72,6 @@
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.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- src/traverso/songcanvas/AudioClipView.cpp 7 May 2007 11:09:00 -0000
1.60
+++ src/traverso/songcanvas/AudioClipView.cpp 7 May 2007 18:14:38 -0000
1.61
@@ -23,7 +23,6 @@
#include <QPainter>
#include <QPainterPath>
-#include <QApplication>
#include <QFont>
#include "AudioClipView.h"
@@ -54,9 +53,6 @@
{
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;
@@ -139,7 +135,7 @@
painter->setPen(themer()->get_color("AudioClip:contour"));
painter->drawRect(xstart, 0, pixelcount, m_height - 1);
painter->setPen(Qt::black);
- painter->setFont( m_fontTitle );
+ painter->setFont(
themer()->get_font("AudioClip:fontscale:title") );
painter->drawText(30, 0, 300, m_height, Qt::AlignVCenter,
tr("Click to reset AudioFile !"));
painter->restore();
return;
@@ -180,7 +176,7 @@
// Progress info, I think so....
painter->setPen(Qt::black);
QRect r(10, 0, 150, m_height);
- painter->setFont( m_fontTitle );
+ painter->setFont(
themer()->get_font("AudioClip:fontscale:title") );
QString si;
si.setNum((int)m_progress);
if (m_progress == 100) m_progress = 0;
@@ -528,7 +524,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(m_fontTitle);
+ p->setFont(themer()->get_font("AudioClip:fontscale:title"));
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.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- src/traverso/songcanvas/AudioClipView.h 6 May 2007 22:05:17 -0000
1.24
+++ src/traverso/songcanvas/AudioClipView.h 7 May 2007 18:14:38 -0000
1.25
@@ -36,7 +36,6 @@
class FadeView;
class Peak;
class PositionIndicator;
-class QFont;
class AudioClipView : public ViewItem
{
@@ -78,7 +77,6 @@
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.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- src/traverso/songcanvas/MarkerView.cpp 7 May 2007 10:31:21 -0000
1.12
+++ src/traverso/songcanvas/MarkerView.cpp 7 May 2007 18:14:38 -0000
1.13
@@ -25,7 +25,6 @@
#include "ClipsViewPort.h"
#include "PositionIndicator.h"
-#include <QApplication>
#include <QFont>
#include <QFontMetrics>
#include <QColor>
@@ -43,9 +42,7 @@
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);
+ QFontMetrics fm(themer()->get_font("Timeline:marker"));
m_ascent = fm.ascent();
m_width = fm.width("NI"); //Â use any two letters to set the width of
the marker indicator
@@ -73,7 +70,7 @@
}
painter->setRenderHint(QPainter::Antialiasing);
- painter->setFont( m_font );
+ painter->setFont(themer()->get_font("Timeline:fontscale:marker"));
painter->setPen(QColor(Qt::black));
painter->setBrush(m_fillColor);
@@ -99,7 +96,7 @@
prepareGeometryChange();
update_position();
- QFontMetrics fm( m_font );
+ QFontMetrics fm(themer()->get_font("Timeline:fontscale:marker"));
int descriptionwidth = fm.width(m_marker->get_description()) + 1;
if (m_active) {
Index: src/traverso/songcanvas/MarkerView.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/MarkerView.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- src/traverso/songcanvas/MarkerView.h 6 May 2007 22:05:17 -0000
1.7
+++ src/traverso/songcanvas/MarkerView.h 7 May 2007 18:14:38 -0000
1.8
@@ -28,7 +28,6 @@
class SongView;
class QColor;
class PositionIndicator;
-class QFont;
class MarkerView : public ViewItem
{
@@ -53,7 +52,6 @@
bool m_active;
bool m_dragging;
PositionIndicator* m_posIndicator;
- QFont m_font;
int m_ascent;
int m_width;
Index: src/traverso/songcanvas/PluginView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/PluginView.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- src/traverso/songcanvas/PluginView.cpp 25 Apr 2007 13:45:18 -0000
1.15
+++ src/traverso/songcanvas/PluginView.cpp 7 May 2007 18:14:38 -0000
1.16
@@ -56,7 +56,7 @@
m_name = plugin->get_name();
- QFontMetrics fm(themer()->get_font("Plugin:name"));
+ QFontMetrics fm(themer()->get_font("Plugin:fontscale:name"));
int fontwidth = fm.width(m_name);
m_boundingRect = QRectF(0, 0, fontwidth + 8, 25);
@@ -103,7 +103,7 @@
QRect rect(0, 0, width, height);
painter->fillRect(rect, brush);
painter->setPen(themer()->get_color("Plugin:text"));
- painter->setFont(themer()->get_font("Plugin:name"));
+ painter->setFont(themer()->get_font("Plugin:fontscale:name"));
painter->drawText(rect, Qt::AlignCenter, m_name);
}
Index: src/traverso/songcanvas/TimeLineView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/TimeLineView.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- src/traverso/songcanvas/TimeLineView.cpp 7 May 2007 11:09:00 -0000
1.28
+++ src/traverso/songcanvas/TimeLineView.cpp 7 May 2007 18:14:38 -0000
1.29
@@ -21,9 +21,7 @@
#include "TimeLineView.h"
-#include <QApplication>
#include <QPainter>
-#include <QFont>
#include "Themer.h"
#include "SongView.h"
@@ -43,6 +41,7 @@
#include <AddRemove.h>
#include <CommandGroup.h>
#include <InputEngine.h>
+#include <QFont>
#include <QDebug>
@@ -183,10 +182,6 @@
{
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, TIMELINE_HEIGHT);
m_timeline = m_sv->get_song()->get_timeline();
@@ -258,7 +253,7 @@
painter->fillRect(xstart, 0, pixelcount, height,
themer()->get_color("Timeline:background") );
painter->setPen(themer()->get_color("Timeline:text"));
- painter->setFont( m_font );
+ painter->setFont( themer()->get_font("Timeline:fontscale:label") );
nframes_t major;
Index: src/traverso/songcanvas/TimeLineView.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/TimeLineView.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- src/traverso/songcanvas/TimeLineView.h 6 May 2007 22:05:17 -0000
1.9
+++ src/traverso/songcanvas/TimeLineView.h 7 May 2007 18:14:38 -0000
1.10
@@ -30,7 +30,6 @@
class TimeLine;
class MarkerView;
class Marker;
-class QFont;
class TimeLineView : public ViewItem
{
@@ -59,7 +58,6 @@
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.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- src/traverso/songcanvas/TrackPanelView.cpp 7 May 2007 11:18:38 -0000
1.25
+++ src/traverso/songcanvas/TrackPanelView.cpp 7 May 2007 18:14:38 -0000
1.26
@@ -17,11 +17,10 @@
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.25 2007/05/07 11:18:38 r_sijrier Exp $
+$Id: TrackPanelView.cpp,v 1.26 2007/05/07 18:14:38 n_doebelin Exp $
*/
#include <QGraphicsScene>
-#include <QApplication>
#include <QFont>
#include "TrackPanelView.h"
#include "TrackView.h"
@@ -59,9 +58,6 @@
soloLed = new TrackPanelLed(this, "solo", "solo");
muteLed = new TrackPanelLed(this, "mute", "mute");
- 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);
}
@@ -158,11 +154,11 @@
QString title = QString::number(m_track->get_sort_index() + 1) + " " +
m_track->get_name();
if (m_track->get_height() < SMALL_HEIGHT) {
- QFontMetrics fm(m_fontName);
+ QFontMetrics
fm(themer()->get_font("TrackPanel:fontscale:name"));
title = fm.elidedText(title, Qt::ElideMiddle, 90);
}
- painter->setFont(m_fontName);
+ painter->setFont(themer()->get_font("TrackPanel:fontscale:name"));
painter->drawText(4, 12, title);
}
@@ -236,9 +232,6 @@
{
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 )
@@ -266,7 +259,7 @@
int cb = ( gain < 1 ? 150 + (int)(50 * gain) : abs((int)(10 * gain)) );
painter->setPen(themer()->get_color("TrackPanel:text"));
- painter->setFont(m_fontGain);
+ painter->setFont(themer()->get_font("TrackPanel:fontscale:gain"));
painter->drawText(0, height + 1, "GAIN");
painter->drawRect(30, 0, sliderWidth, height);
@@ -307,9 +300,6 @@
{
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 +314,7 @@
// int y;
QString s, span;
painter->setPen(themer()->get_color("TrackPanel:text"));
- painter->setFont(m_fontPan);
+ painter->setFont(themer()->get_font("TrackPanel:fontscale:pan"));
painter->drawText(0, PAN_H + 1, "PAN");
@@ -371,10 +361,6 @@
{
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 )
@@ -398,7 +384,7 @@
painter->setBrush(color);
painter->drawRoundRect(m_boundingRect, roundfactor,
roundfactor);
- painter->setFont(m_fontLed);
+
painter->setFont(themer()->get_font("TrackPanel:fontscale:led"));
painter->setPen(QColor(Qt::black));
painter->drawText(m_boundingRect, Qt::AlignCenter, m_name);
@@ -412,7 +398,7 @@
painter->setBrush(color);
painter->drawRoundRect(m_boundingRect, roundfactor,
roundfactor);
- painter->setFont(m_fontLed);
+
painter->setFont(themer()->get_font("TrackPanel:fontscale:led"));
painter->setPen(QColor(Qt::gray));
painter->drawText(m_boundingRect, Qt::AlignCenter, m_name);
@@ -449,10 +435,6 @@
{
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 )
@@ -473,7 +455,7 @@
painter->setBrush(color);
painter->drawRoundRect(m_boundingRect, roundfactor, roundfactor);
- painter->setFont(m_fontBus);
+ painter->setFont(themer()->get_font("TrackPanel:fontscale:led"));
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.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- src/traverso/songcanvas/TrackPanelView.h 6 May 2007 22:05:17 -0000
1.12
+++ src/traverso/songcanvas/TrackPanelView.h 7 May 2007 18:14:38 -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: TrackPanelView.h,v 1.12 2007/05/06 22:05:17 n_doebelin Exp $
+$Id: TrackPanelView.h,v 1.13 2007/05/07 18:14:38 n_doebelin Exp $
*/
#ifndef TRACK_PANEL_VIEW_H
@@ -30,7 +30,6 @@
class TrackPanelViewPort;
class PanelLed;
class TrackPanelView;
-class QFont;
class TrackPanelGain : public ViewItem
{
@@ -49,7 +48,6 @@
private:
Track* m_track;
- QFont m_fontGain;
};
class TrackPanelPan : public ViewItem
@@ -70,7 +68,6 @@
private:
Track* m_track;
- QFont m_fontPan;
};
@@ -89,7 +86,6 @@
QString m_name;
QString m_toggleslot;
bool m_isOn;
- QFont m_fontLed;
public slots:
void ison_changed(bool isOn);
@@ -113,7 +109,6 @@
int m_type;
QString m_busName;
QPixmap m_pix;
- QFont m_fontBus;
public slots:
void bus_changed();
@@ -150,8 +145,6 @@
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, 2007/05/06
- [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..., 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