Mercurial > hg > tony
changeset 346:65907d91f328
mergewq
author | matthiasm |
---|---|
date | Mon, 16 Jun 2014 12:25:11 +0100 |
parents | f3a9e4abec1b (current diff) 80f2cd8a30f7 (diff) |
children | c9affb380e35 |
files | .hgsubstate src/MainWindow.cpp |
diffstat | 2 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgsubstate Mon Jun 16 12:24:52 2014 +0100 +++ b/.hgsubstate Mon Jun 16 12:25:11 2014 +0100 @@ -3,5 +3,5 @@ 062f0e49187789937b6162d2904b1af20872ed5e pyin 553a5f65ef64811747a6613f759622d655db63c1 sv-dependency-builds f5c914661f6fdc7f05c2c980b0d21350d5933428 svapp -85879408f6657f4076d73839d590c9fb80b78e73 svcore -d6b79166ae0d6dcf0ed55aba08f50fdfcd229647 svgui +3efc20c59a947a137ed7fc715b2a3b0de6c02200 svcore +8be221f1831388b523b88a74fb2e3d30d2d23291 svgui
--- a/src/MainWindow.cpp Mon Jun 16 12:24:52 2014 +0100 +++ b/src/MainWindow.cpp Mon Jun 16 12:25:11 2014 +0100 @@ -216,6 +216,7 @@ connect(m_fader, SIGNAL(mouseLeft()), this, SLOT(mouseLeftWidget())); m_playSpeed = new AudioDial(frame); + m_playSpeed->setMeterColor(Qt::darkBlue); m_playSpeed->setMinimum(0); m_playSpeed->setMaximum(200); m_playSpeed->setValue(100); @@ -234,6 +235,7 @@ // Gain controls m_gainAudio = new AudioDial(frame); + m_gainAudio->setMeterColor(Qt::darkRed); m_gainAudio->setMinimum(-50); m_gainAudio->setMaximum(50); m_gainAudio->setValue(0); @@ -252,6 +254,7 @@ connect(m_gainAudio, SIGNAL(mouseLeft()), this, SLOT(mouseLeftWidget())); m_gainPitch = new AudioDial(frame); + m_gainPitch->setMeterColor(Qt::darkRed); m_gainPitch->setMinimum(-50); m_gainPitch->setMaximum(50); m_gainPitch->setValue(0); @@ -269,6 +272,7 @@ connect(m_gainPitch, SIGNAL(mouseLeft()), this, SLOT(mouseLeftWidget())); m_gainNotes = new AudioDial(frame); + m_gainNotes->setMeterColor(Qt::darkRed); m_gainNotes->setMinimum(-50); m_gainNotes->setMaximum(50); m_gainNotes->setValue(0); @@ -288,6 +292,7 @@ // Pan controls m_panAudio = new AudioDial(frame); + m_panAudio->setMeterColor(Qt::darkGreen); m_panAudio->setMinimum(-100); m_panAudio->setMaximum(100); m_panAudio->setValue(-100); @@ -306,6 +311,7 @@ connect(m_panAudio, SIGNAL(mouseLeft()), this, SLOT(mouseLeftWidget())); m_panPitch = new AudioDial(frame); + m_panPitch->setMeterColor(Qt::darkGreen); m_panPitch->setMinimum(-100); m_panPitch->setMaximum(100); m_panPitch->setValue(100); @@ -323,6 +329,7 @@ connect(m_panPitch, SIGNAL(mouseLeft()), this, SLOT(mouseLeftWidget())); m_panNotes = new AudioDial(frame); + m_panNotes->setMeterColor(Qt::darkGreen); m_panNotes->setMinimum(-100); m_panNotes->setMaximum(100); m_panNotes->setValue(100);