diff options
author | Florian Jung <flo@windfisch.org> | 2011-08-18 16:45:06 +0000 |
---|---|---|
committer | Florian Jung <flo@windfisch.org> | 2011-08-18 16:45:06 +0000 |
commit | 0002e57359fb002a70cc9559308619ff611718c9 (patch) | |
tree | 4d430468df5c1a38895ae9f56a61127240e5ea2b /muse2/muse/master | |
parent | 3513555193d44fe99bc30dd3bf04701278a797a1 (diff) | |
parent | 35c95c10cca9938210818c0b809b1ff4f9c4ad3d (diff) |
merged with trunk, except:
- not applied the "masteredit saves toolbar state" change, as this
is done by TopWin here in experimental
- fixed some indentation error in scoreedit.cpp
Diffstat (limited to 'muse2/muse/master')
-rw-r--r-- | muse2/muse/master/master.cpp | 3 | ||||
-rw-r--r-- | muse2/muse/master/masteredit.cpp | 2 | ||||
-rw-r--r-- | muse2/muse/master/tscale.cpp | 12 |
3 files changed, 9 insertions, 8 deletions
diff --git a/muse2/muse/master/master.cpp b/muse2/muse/master/master.cpp index 4a33a8c4..6293e64c 100644 --- a/muse2/muse/master/master.cpp +++ b/muse2/muse/master/master.cpp @@ -22,9 +22,6 @@ #include "icons.h" #include "audio.h" -extern void drawTickRaster(QPainter& p, int x, int y, - int w, int h, int quant); - //--------------------------------------------------------- // Master //--------------------------------------------------------- diff --git a/muse2/muse/master/masteredit.cpp b/muse2/muse/master/masteredit.cpp index 68e8a3b2..777e6066 100644 --- a/muse2/muse/master/masteredit.cpp +++ b/muse2/muse/master/masteredit.cpp @@ -112,6 +112,7 @@ MasterEdit::MasterEdit() addToolBar(tools2); QToolBar* enableMaster = addToolBar(tr("Enable master")); + enableMaster->setObjectName("Enable master"); enableButton = new QToolButton(); enableButton->setCheckable(true); enableButton->setText(tr("Enable")); @@ -121,6 +122,7 @@ MasterEdit::MasterEdit() connect(enableButton, SIGNAL(toggled(bool)), song, SLOT(setMasterFlag(bool))); QToolBar* info = addToolBar(tr("Info")); + info->setObjectName("Info"); QLabel* label = new QLabel(tr("Cursor")); label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); label->setIndent(3); diff --git a/muse2/muse/master/tscale.cpp b/muse2/muse/master/tscale.cpp index d37d5924..9ea34fba 100644 --- a/muse2/muse/master/tscale.cpp +++ b/muse2/muse/master/tscale.cpp @@ -20,8 +20,9 @@ TScale::TScale(QWidget* parent, int ymag) : View(parent, 1, ymag) { - setFont(config.fonts[3]); - int w = 4 * QFontMetrics(config.fonts[4]).width('0'); + setFont(config.fonts[4]); + //int w = 4 * QFontMetrics(config.fonts[4]).width('0'); + int w = 4 * fontMetrics().width('0'); setFixedWidth(w); setMouseTracking(true); } @@ -34,7 +35,7 @@ void TScale::pdraw(QPainter& p, const QRect& r) { int y = r.y(); int h = r.height(); - p.setFont(config.fonts[4]); + //p.setFont(config.fonts[4]); QString s; for (int i = 30000; i <= 250000; i += 10000) { int yy = mapy(280000 - i); @@ -44,8 +45,9 @@ void TScale::pdraw(QPainter& p, const QRect& r) continue; p.drawLine(0, yy, width(), yy); s.setNum(i/1000); - QFontMetrics fm(config.fonts[4]); - p.drawText(width() - fm.width(s) - 1, yy-2, s); + //QFontMetrics fm(config.fonts[4]); + //p.drawText(width() - fm.width(s) - 1, yy-2, s); + p.drawText(width() - fontMetrics().width(s) - 1, yy-2, s); // Use the window font. Tim p4.0.31 } } |