Mercurial > hg > svgui
comparison layer/TimeValueLayer.cpp @ 919:a5488775f880 osx-retina
Pass proxy to layer for painting
author | Chris Cannam |
---|---|
date | Wed, 18 Mar 2015 13:52:07 +0000 |
parents | 4fe7a09be0fe |
children | fa96108d552d |
comparison
equal
deleted
inserted
replaced
918:4fe7a09be0fe | 919:a5488775f880 |
---|---|
1701 bool realign = false; | 1701 bool realign = false; |
1702 | 1702 |
1703 if (clipboardHasDifferentAlignment(v, from)) { | 1703 if (clipboardHasDifferentAlignment(v, from)) { |
1704 | 1704 |
1705 QMessageBox::StandardButton button = | 1705 QMessageBox::StandardButton button = |
1706 QMessageBox::question(v, tr("Re-align pasted items?"), | 1706 QMessageBox::question(v->getView(), tr("Re-align pasted items?"), |
1707 tr("The items you are pasting came from a layer with different source material from this one. Do you want to re-align them in time, to match the source material for this layer?"), | 1707 tr("The items you are pasting came from a layer with different source material from this one. Do you want to re-align them in time, to match the source material for this layer?"), |
1708 QMessageBox::Yes | QMessageBox::No | QMessageBox::Cancel, | 1708 QMessageBox::Yes | QMessageBox::No | QMessageBox::Cancel, |
1709 QMessageBox::Yes); | 1709 QMessageBox::Yes); |
1710 | 1710 |
1711 if (button == QMessageBox::Cancel) { | 1711 if (button == QMessageBox::Cancel) { |