Mercurial > hg > tony
comparison src/MainWindow.cpp @ 343:6d9adf82347d
Colour in the pan & gain dials. This isn't a good solution to the difficulty of remembering which is which -- not least because they're still indistinguishable if you're red-green colourblind. But it is probably better than what we had, and it's consistent with SV. Meanwhile see bug #984 about finding a better solution.
author | Chris Cannam |
---|---|
date | Mon, 16 Jun 2014 11:45:57 +0100 |
parents | 05449a49cbb4 |
children | 80f2cd8a30f7 |
comparison
equal
deleted
inserted
replaced
341:6b57c58b88d2 | 343:6d9adf82347d |
---|---|
214 m_fader = new Fader(frame, false); | 214 m_fader = new Fader(frame, false); |
215 connect(m_fader, SIGNAL(mouseEntered()), this, SLOT(mouseEnteredWidget())); | 215 connect(m_fader, SIGNAL(mouseEntered()), this, SLOT(mouseEnteredWidget())); |
216 connect(m_fader, SIGNAL(mouseLeft()), this, SLOT(mouseLeftWidget())); | 216 connect(m_fader, SIGNAL(mouseLeft()), this, SLOT(mouseLeftWidget())); |
217 | 217 |
218 m_playSpeed = new AudioDial(frame); | 218 m_playSpeed = new AudioDial(frame); |
219 m_playSpeed->setMeterColor(Qt::darkBlue); | |
219 m_playSpeed->setMinimum(0); | 220 m_playSpeed->setMinimum(0); |
220 m_playSpeed->setMaximum(200); | 221 m_playSpeed->setMaximum(200); |
221 m_playSpeed->setValue(100); | 222 m_playSpeed->setValue(100); |
222 m_playSpeed->setFixedWidth(24); | 223 m_playSpeed->setFixedWidth(24); |
223 m_playSpeed->setFixedHeight(24); | 224 m_playSpeed->setFixedHeight(24); |
232 connect(m_playSpeed, SIGNAL(mouseEntered()), this, SLOT(mouseEnteredWidget())); | 233 connect(m_playSpeed, SIGNAL(mouseEntered()), this, SLOT(mouseEnteredWidget())); |
233 connect(m_playSpeed, SIGNAL(mouseLeft()), this, SLOT(mouseLeftWidget())); | 234 connect(m_playSpeed, SIGNAL(mouseLeft()), this, SLOT(mouseLeftWidget())); |
234 | 235 |
235 // Gain controls | 236 // Gain controls |
236 m_gainAudio = new AudioDial(frame); | 237 m_gainAudio = new AudioDial(frame); |
238 m_gainAudio->setMeterColor(Qt::darkRed); | |
237 m_gainAudio->setMinimum(-50); | 239 m_gainAudio->setMinimum(-50); |
238 m_gainAudio->setMaximum(50); | 240 m_gainAudio->setMaximum(50); |
239 m_gainAudio->setValue(0); | 241 m_gainAudio->setValue(0); |
240 m_gainAudio->setDefaultValue(0); | 242 m_gainAudio->setDefaultValue(0); |
241 //m_gainAudio->setFixedWidth(40); | 243 //m_gainAudio->setFixedWidth(40); |
250 this, SLOT(audioGainChanged(int))); | 252 this, SLOT(audioGainChanged(int))); |
251 connect(m_gainAudio, SIGNAL(mouseEntered()), this, SLOT(mouseEnteredWidget())); | 253 connect(m_gainAudio, SIGNAL(mouseEntered()), this, SLOT(mouseEnteredWidget())); |
252 connect(m_gainAudio, SIGNAL(mouseLeft()), this, SLOT(mouseLeftWidget())); | 254 connect(m_gainAudio, SIGNAL(mouseLeft()), this, SLOT(mouseLeftWidget())); |
253 | 255 |
254 m_gainPitch = new AudioDial(frame); | 256 m_gainPitch = new AudioDial(frame); |
257 m_gainPitch->setMeterColor(Qt::darkRed); | |
255 m_gainPitch->setMinimum(-50); | 258 m_gainPitch->setMinimum(-50); |
256 m_gainPitch->setMaximum(50); | 259 m_gainPitch->setMaximum(50); |
257 m_gainPitch->setValue(0); | 260 m_gainPitch->setValue(0); |
258 m_gainPitch->setDefaultValue(0); | 261 m_gainPitch->setDefaultValue(0); |
259 m_gainPitch->setFixedWidth(24); | 262 m_gainPitch->setFixedWidth(24); |
267 this, SLOT(pitchGainChanged(int))); | 270 this, SLOT(pitchGainChanged(int))); |
268 connect(m_gainPitch, SIGNAL(mouseEntered()), this, SLOT(mouseEnteredWidget())); | 271 connect(m_gainPitch, SIGNAL(mouseEntered()), this, SLOT(mouseEnteredWidget())); |
269 connect(m_gainPitch, SIGNAL(mouseLeft()), this, SLOT(mouseLeftWidget())); | 272 connect(m_gainPitch, SIGNAL(mouseLeft()), this, SLOT(mouseLeftWidget())); |
270 | 273 |
271 m_gainNotes = new AudioDial(frame); | 274 m_gainNotes = new AudioDial(frame); |
275 m_gainNotes->setMeterColor(Qt::darkRed); | |
272 m_gainNotes->setMinimum(-50); | 276 m_gainNotes->setMinimum(-50); |
273 m_gainNotes->setMaximum(50); | 277 m_gainNotes->setMaximum(50); |
274 m_gainNotes->setValue(0); | 278 m_gainNotes->setValue(0); |
275 m_gainNotes->setDefaultValue(0); | 279 m_gainNotes->setDefaultValue(0); |
276 m_gainNotes->setFixedWidth(24); | 280 m_gainNotes->setFixedWidth(24); |
286 connect(m_gainNotes, SIGNAL(mouseLeft()), this, SLOT(mouseLeftWidget())); | 290 connect(m_gainNotes, SIGNAL(mouseLeft()), this, SLOT(mouseLeftWidget())); |
287 // End of Gain controls | 291 // End of Gain controls |
288 | 292 |
289 // Pan controls | 293 // Pan controls |
290 m_panAudio = new AudioDial(frame); | 294 m_panAudio = new AudioDial(frame); |
295 m_panAudio->setMeterColor(Qt::darkGreen); | |
291 m_panAudio->setMinimum(-100); | 296 m_panAudio->setMinimum(-100); |
292 m_panAudio->setMaximum(100); | 297 m_panAudio->setMaximum(100); |
293 m_panAudio->setValue(-100); | 298 m_panAudio->setValue(-100); |
294 m_panAudio->setDefaultValue(-100); | 299 m_panAudio->setDefaultValue(-100); |
295 m_panAudio->setFixedWidth(24); | 300 m_panAudio->setFixedWidth(24); |
304 this, SLOT(audioPanChanged(int))); | 309 this, SLOT(audioPanChanged(int))); |
305 connect(m_panAudio, SIGNAL(mouseEntered()), this, SLOT(mouseEnteredWidget())); | 310 connect(m_panAudio, SIGNAL(mouseEntered()), this, SLOT(mouseEnteredWidget())); |
306 connect(m_panAudio, SIGNAL(mouseLeft()), this, SLOT(mouseLeftWidget())); | 311 connect(m_panAudio, SIGNAL(mouseLeft()), this, SLOT(mouseLeftWidget())); |
307 | 312 |
308 m_panPitch = new AudioDial(frame); | 313 m_panPitch = new AudioDial(frame); |
314 m_panPitch->setMeterColor(Qt::darkGreen); | |
309 m_panPitch->setMinimum(-100); | 315 m_panPitch->setMinimum(-100); |
310 m_panPitch->setMaximum(100); | 316 m_panPitch->setMaximum(100); |
311 m_panPitch->setValue(100); | 317 m_panPitch->setValue(100); |
312 m_panPitch->setDefaultValue(100); | 318 m_panPitch->setDefaultValue(100); |
313 m_panPitch->setFixedWidth(24); | 319 m_panPitch->setFixedWidth(24); |
321 this, SLOT(pitchPanChanged(int))); | 327 this, SLOT(pitchPanChanged(int))); |
322 connect(m_panPitch, SIGNAL(mouseEntered()), this, SLOT(mouseEnteredWidget())); | 328 connect(m_panPitch, SIGNAL(mouseEntered()), this, SLOT(mouseEnteredWidget())); |
323 connect(m_panPitch, SIGNAL(mouseLeft()), this, SLOT(mouseLeftWidget())); | 329 connect(m_panPitch, SIGNAL(mouseLeft()), this, SLOT(mouseLeftWidget())); |
324 | 330 |
325 m_panNotes = new AudioDial(frame); | 331 m_panNotes = new AudioDial(frame); |
332 m_panNotes->setMeterColor(Qt::darkGreen); | |
326 m_panNotes->setMinimum(-100); | 333 m_panNotes->setMinimum(-100); |
327 m_panNotes->setMaximum(100); | 334 m_panNotes->setMaximum(100); |
328 m_panNotes->setValue(100); | 335 m_panNotes->setValue(100); |
329 m_panNotes->setDefaultValue(100); | 336 m_panNotes->setDefaultValue(100); |
330 m_panNotes->setFixedWidth(24); | 337 m_panNotes->setFixedWidth(24); |