Mercurial > hg > svgui
comparison widgets/Thumbwheel.cpp @ 663:1a0fdad4af4d tonioni
Merge from the default branch
author | Chris Cannam |
---|---|
date | Fri, 12 Jul 2013 13:25:22 +0100 |
parents | d632a1e87018 |
children | 1a0dfcbffaf1 |
comparison
equal
deleted
inserted
replaced
660:8663a831838f | 663:1a0fdad4af4d |
---|---|
371 setMappedValue(newValue); | 371 setMappedValue(newValue); |
372 } | 372 } |
373 | 373 |
374 } else { | 374 } else { |
375 | 375 |
376 int newValue = QInputDialog::getInteger | 376 int newValue = QInputDialog::getInt |
377 (this, | 377 (this, |
378 tr("Enter new value"), | 378 tr("Enter new value"), |
379 tr("Enter a new value from %1 to %2:") | 379 tr("Enter a new value from %1 to %2:") |
380 .arg(m_min).arg(m_max), | 380 .arg(m_min).arg(m_max), |
381 getValue(), m_min, m_max, 1, &ok); | 381 getValue(), m_min, m_max, 1, &ok); |