Differential D12843 Diff 34218 plugins/dockers/animation/timeline_frames_view.cpp

Changeset View

Standalone View

View Options

plugins/dockers/animation/timeline_frames_view.cpp

Context not available.
22 22​
23#include "timeline_ruler_header.h" 23​#include "timeline_ruler_header.h"
24#include "timeline_layers_header.h" 24​#include "timeline_layers_header.h"
25​#include "timeline_insert_keyframe_dialog.h"
25 26​
26#include <cmath> 27​#include <cmath>
27#include <limits> 28​#include <limits>
Context not available.
112 QAction *audioMuteAction; 113​ QAction *audioMuteAction;
113 KisSliderSpinBox *volumeSlider; 114​ KisSliderSpinBox *volumeSlider;
114 115​
115 ​
116 QMenu *layerEditingMenu; 116​ QMenu *layerEditingMenu;
117 QMenu *existingLayersMenu; 117​ QMenu *existingLayersMenu;
118 118​
119​ TimelineInsertKeyframeDialog *insertKeyframeDialog;
120​
119 KisZoomButton *zoomDragButton; 121​ KisZoomButton *zoomDragButton;
120 122​
121 bool dragInProgress; 123​ bool dragInProgress;
Context not available.
192 connect(horizontalScrollBar(), SIGNAL(valueChanged(int)), SLOT(slotUpdateInfiniteFramesCount())); 194​ connect(horizontalScrollBar(), SIGNAL(valueChanged(int)), SLOT(slotUpdateInfiniteFramesCount()));
193 connect(horizontalScrollBar(), SIGNAL(sliderReleased()), SLOT(slotUpdateInfiniteFramesCount())); 195​ connect(horizontalScrollBar(), SIGNAL(sliderReleased()), SLOT(slotUpdateInfiniteFramesCount()));
194 196​
195 ​
196 /********** New Layer Menu ***********************************************************/ 197​ /********** New Layer Menu ***********************************************************/
197 198​
198 m_d->addLayersButton = new QToolButton(this); 199​ m_d->addLayersButton = new QToolButton(this);
Context not available.
270 m_d->multiframeColorSelectorAction->setDefaultWidget(m_d->multiframeColorSelector); 271​ m_d->multiframeColorSelectorAction->setDefaultWidget(m_d->multiframeColorSelector);
271 connect(m_d->multiframeColorSelector, &KisColorLabelSelectorWidget::currentIndexChanged, this, &TimelineFramesView::slotColorLabelChanged); 272​ connect(m_d->multiframeColorSelector, &KisColorLabelSelectorWidget::currentIndexChanged, this, &TimelineFramesView::slotColorLabelChanged);
272 273​
274​ /********** Insert Keyframes Dialog **************************************************/
275​
276​ m_d->insertKeyframeDialog = new TimelineInsertKeyframeDialog(this);
277​
273 /********** Zoom Button **************************************************************/ 278​ /********** Zoom Button **************************************************************/
274 279​
275 m_d->zoomDragButton = new KisZoomButton(this); 280​ m_d->zoomDragButton = new KisZoomButton(this);
Context not available.
371 376​
372 action = m_d->actionMan->createAction("update_playback_range"); 377​ action = m_d->actionMan->createAction("update_playback_range");
373 connect(action, SIGNAL(triggered()), SLOT(slotUpdatePlackbackRange())); 378​ connect(action, SIGNAL(triggered()), SLOT(slotUpdatePlackbackRange()));
374 ​
375 ​
376 ​
377 } 379​ }
378} 380​}
379 381​
Context not available.
563 m_d->model->setAudioVolume(qreal(value) / 100.0); 565​ m_d->model->setAudioVolume(qreal(value) / 100.0);
564} 566​}
565 567​
566 ​
567 ​
568 ​
569void TimelineFramesView::slotUpdateInfiniteFramesCount() 568​void TimelineFramesView::slotUpdateInfiniteFramesCount()
570{ 569​{
571 if (horizontalScrollBar()->isSliderDown()) return; 570​ if (horizontalScrollBar()->isSliderDown()) return;
Context not available.
988 KisActionManager::safePopulateMenu(menu, "add_duplicate_frame", m_d->actionMan); 987​ KisActionManager::safePopulateMenu(menu, "add_duplicate_frame", m_d->actionMan);
989 menu->addSeparator(); 988​ menu->addSeparator();
990 } 989​ }
991 ​
992} 990​}
993 991​
994void TimelineFramesView::mousePressEvent(QMouseEvent *event) 992​void TimelineFramesView::mousePressEvent(QMouseEvent *event)
Context not available.
1324 } 1322​ }
1325} 1323​}
1326 1324​
1327void TimelineFramesView::insertFramesImpl(int insertAtColumn, int count, QSet<int> rows, bool forceEntireColumn) 1325​void TimelineFramesView::insertFramesImpl(int insertAtColumn, int count, int timing, QSet<int> rows, bool forceEntireColumn)
1328{ 1326​{
1329 if (forceEntireColumn) { 1327​ if (forceEntireColumn) {
1330 rows.clear(); 1328​ rows.clear();
Context not available.
1335 } 1333​ }
1336 1334​
1337 if (!rows.isEmpty()) { 1335​ if (!rows.isEmpty()) {
1338 m_d->model->insertFrames(insertAtColumn, rows.toList(), count); 1336​ m_d->model->insertFrames(insertAtColumn, rows.toList(), count, timing);
1339 } 1337​ }
1340} 1338​}
1341 1339​
1342void TimelineFramesView::slotInsertKeyframesLeft(int count, bool forceEntireColumn) 1340​void TimelineFramesView::slotInsertKeyframesLeft(int count, int timing, bool forceEntireColumn)
1343{ 1341​{
1344 QSet<int> rows; 1342​ QSet<int> rows;
1345 int minColumn = 0; 1343​ int minColumn = 0;
Context not available.
1351 count = qMax(1, maxColumn - minColumn + 1); 1349​ count = qMax(1, maxColumn - minColumn + 1);
1352 } 1350​ }
1353 1351​
1354 insertFramesImpl(minColumn, count, rows, forceEntireColumn); 1352​ insertFramesImpl(minColumn, count, timing, rows, forceEntireColumn);
1355} 1353​}
1356 1354​
1357void TimelineFramesView::slotInsertKeyframesRight(int count, bool forceEntireColumn) 1355​void TimelineFramesView::slotInsertKeyframesRight(int count, int timing, bool forceEntireColumn)
1358{ 1356​{
1359 QSet<int> rows; 1357​ QSet<int> rows;
1360 int minColumn = 0; 1358​ int minColumn = 0;
Context not available.
1366 count = qMax(1, maxColumn - minColumn + 1); 1364​ count = qMax(1, maxColumn - minColumn + 1);
1367 } 1365​ }
1368 1366​
1369 insertFramesImpl(maxColumn + 1, count, rows, forceEntireColumn); 1367​ insertFramesImpl(maxColumn + 1, count, timing, rows, forceEntireColumn);
1370} 1368​}
1371 1369​
1372void TimelineFramesView::slotInsertColumnsLeft(int count) 1370​void TimelineFramesView::slotInsertColumnsLeft(int count, int timing)
1373{ 1371​{
1374 slotInsertKeyframesLeft(count, true); 1372​ slotInsertKeyframesLeft(count, timing, true);
1375} 1373​}
1376 1374​
1377void TimelineFramesView::slotInsertColumnsRight(int count) 1375​void TimelineFramesView::slotInsertColumnsRight(int count, int timing)
1378{ 1376​{
1379 slotInsertKeyframesRight(count, true); 1377​ slotInsertKeyframesRight(count, timing, true);
1380} 1378​}
1381 1379​
1382void TimelineFramesView::slotInsertKeyframesLeftCustom() 1380​void TimelineFramesView::slotInsertKeyframesLeftCustom()
1383{ 1381​{
1384 bool ok = false; 1382​ int count, timing;
1385 const int count = QInputDialog::getInt(this, ​
1386 i18nc("@title:window", "Insert left"), ​
1387 i18nc("@label:spinbox", "Enter number of frames"), ​
1388 defaultNumberOfFramesToAdd(), ​
1389 1, 10000, 1, &ok); ​
1390 1383​
1391 if (ok) { 1384​ if (m_d->insertKeyframeDialog->promptUserSettings(count, timing)) {
1392 setDefaultNumberOfFramesToAdd(count); 1385​ slotInsertKeyframesLeft(count, timing, false);
1393 slotInsertKeyframesLeft(count); ​
1394 } 1386​ }
1395} 1387​}
1396 1388​
1397 ​
1398void TimelineFramesView::slotInsertKeyframesRightCustom() 1389​void TimelineFramesView::slotInsertKeyframesRightCustom()
1399{ 1390​{
1400 bool ok = false; 1391​ int count, timing;
dkazakovUnsubmitted
Done

There is a spurious true parameter that should actually be false :)

Right now if you have two visible layers in timeline, this action works as "insert columns" instead of "insert frames".

PS:
Perhaps we should change these booleans to QFlags in the future, but it is out of scope of this patch of course :)

dkazakov: There is a spurious `true` parameter that should actually be `false` :) Right now if you have…
1401 const int count = QInputDialog::getInt(this, ​
1402 i18nc("@title:window", "Insert right"), ​
1403 i18nc("@label:spinbox", "Enter number of frames"), ​
1404 defaultNumberOfFramesToAdd(), ​
1405 1, 10000, 1, &ok); ​
1406 1392​
1407 if (ok) { 1393​ if (m_d->insertKeyframeDialog->promptUserSettings(count, timing)) {
1408 setDefaultNumberOfFramesToAdd(count); 1394​ slotInsertKeyframesRight(count, timing, false);
1409 slotInsertKeyframesRight(count); ​
1410 } 1395​ }
1411} 1396​}
1412 1397​
1413void TimelineFramesView::slotInsertColumnsLeftCustom() 1398​void TimelineFramesView::slotInsertColumnsLeftCustom()
1414{ 1399​{
1415 bool ok = false; 1400​ int count, timing;
1416 const int count = QInputDialog::getInt(this, ​
1417 i18nc("@title:window", "Insert left"), ​
1418 i18nc("@label:spinbox", "Enter number of columns"), ​
1419 defaultNumberOfColumnsToAdd(), ​
1420 1, 10000, 1, &ok); ​
1421 1401​
1422 if (ok) { 1402​ if (m_d->insertKeyframeDialog->promptUserSettings(count, timing)) {
1423 setDefaultNumberOfColumnsToAdd(count); 1403​ slotInsertColumnsLeft(count, timing);
1424 slotInsertColumnsLeft(count); ​
1425 } 1404​ }
1426} 1405​}
1427 1406​
1428 ​
1429void TimelineFramesView::slotInsertColumnsRightCustom() 1407​void TimelineFramesView::slotInsertColumnsRightCustom()
1430{ 1408​{
1431 bool ok = false; 1409​ int count, timing;
1432 const int count = QInputDialog::getInt(this, ​
1433 i18nc("@title:window", "Insert right"), ​
1434 i18nc("@label:spinbox", "Enter number of columns"), ​
1435 defaultNumberOfColumnsToAdd(), ​
1436 1, 10000, 1, &ok); ​
1437 1410​
1438 if (ok) { 1411​ if (m_d->insertKeyframeDialog->promptUserSettings(count, timing)) {
1439 setDefaultNumberOfColumnsToAdd(count); 1412​ slotInsertColumnsLeft(count, timing);
1440 slotInsertColumnsRight(count); ​
1441 } 1413​ }
1442} 1414​}
1443 1415​
Context not available.