Differential D12977 Diff 35006 plugins/dockers/animation/timeline_frames_view.cpp

Changeset View

Standalone View

View Options

plugins/dockers/animation/timeline_frames_view.cpp

Context not available.
19#include "timeline_frames_view.h" 19​#include "timeline_frames_view.h"
20 20​
21#include "timeline_frames_model.h" 21​#include "timeline_frames_model.h"
22 ​
23#include "timeline_ruler_header.h" 22​#include "timeline_ruler_header.h"
24#include "timeline_layers_header.h" 23​#include "timeline_layers_header.h"
25#include "timeline_insert_keyframe_dialog.h" 24​#include "timeline_insert_keyframe_dialog.h"
26 25​#include "timeline_frames_item_delegate.h"
27#include <cmath> ​
28#include <limits> ​
29 26​
30#include <QPainter> 27​#include <QPainter>
31 ​
32#include <QFileInfo> ​
33#include <QApplication> 28​#include <QApplication>
34#include <QHeaderView> ​
35#include <QDropEvent> 29​#include <QDropEvent>
36#include <QToolButton> ​
37#include <QMenu> 30​#include <QMenu>
38#include <QScrollBar> 31​#include <QScrollBar>
39#include <QIcon> ​
40#include <QDrag> 32​#include <QDrag>
41#include <QWidgetAction> 33​#include <QInputDialog>
42#include <kis_signals_blocker.h> 34​#include <QClipboard>
43#include <kis_image_config.h> 35​#include <QMimeData>
44 36​
45#include "KSharedConfig" 37​#include "KSharedConfig"
46 38​
47#include "kis_debug.h" ​
48#include "timeline_frames_item_delegate.h" ​
49 ​
50#include "kis_zoom_button.h" 39​#include "kis_zoom_button.h"
51 ​
52#include "kis_icon_utils.h" 40​#include "kis_icon_utils.h"
53 ​
54#include "kis_animation_utils.h" 41​#include "kis_animation_utils.h"
55#include "kis_custom_modifiers_catcher.h" 42​#include "kis_custom_modifiers_catcher.h"
56#include "kis_action.h" 43​#include "kis_action.h"
Context not available.
59#include "kis_color_label_selector_widget.h" 46​#include "kis_color_label_selector_widget.h"
60#include "kis_slider_spin_box.h" 47​#include "kis_slider_spin_box.h"
61#include <KisImportExportManager.h> 48​#include <KisImportExportManager.h>
49​#include <kis_signals_blocker.h>
50​#include <kis_image_config.h>
62 51​
63#include <KoFileDialog.h> 52​#include <KoFileDialog.h>
64#include <KoIconToolTip.h> 53​#include <KoIconToolTip.h>
65#include <QStandardPaths> ​
66#include <QWidgetAction> ​
67#include <QInputDialog> ​
68 ​
69#include <QClipboard> ​
70#include <QMimeData> ​
71 ​
72#include "config-qtmultimedia.h" ​
73 54​
74typedef QPair<QRect, QModelIndex> QItemViewPaintPair; 55​typedef QPair<QRect, QModelIndex> QItemViewPaintPair;
75typedef QList<QItemViewPaintPair> QItemViewPaintPairs; 56​typedef QList<QItemViewPaintPair> QItemViewPaintPairs;
Context not available.
134 115​
135 KoIconToolTip tip; 116​ KoIconToolTip tip;
136 117​
137 KisActionManager * actionMan = 0; 118​ KisActionManager *actionMan = 0;
138}; 119​};
139 120​
140TimelineFramesView::TimelineFramesView(QWidget *parent) 121​TimelineFramesView::TimelineFramesView(QWidget *parent)
Context not available.
160 m_d->horizontalRuler = new TimelineRulerHeader(this); 141​ m_d->horizontalRuler = new TimelineRulerHeader(this);
161 this->setHorizontalHeader(m_d->horizontalRuler); 142​ this->setHorizontalHeader(m_d->horizontalRuler);
162 143​
163 connect(m_d->horizontalRuler, SIGNAL(sigInsertColumnsLeft()), SLOT(slotInsertColumnsLeft())); 144​ connect(m_d->horizontalRuler, SIGNAL(sigInsertColumnLeft()), SLOT(slotInsertKeyframeColumnLeft()));
164 connect(m_d->horizontalRuler, SIGNAL(sigInsertColumnsRight()), SLOT(slotInsertColumnsRight())); 145​ connect(m_d->horizontalRuler, SIGNAL(sigInsertColumnRight()), SLOT(slotInsertKeyframeColumnRight()));
165 146​
166 connect(m_d->horizontalRuler, SIGNAL(sigInsertColumnsLeftCustom()), SLOT(slotInsertColumnsLeftCustom())); 147​ connect(m_d->horizontalRuler, SIGNAL(sigInsertMultipleColumns()), SLOT(slotInsertMultipleKeyframeColumns()));
167 connect(m_d->horizontalRuler, SIGNAL(sigInsertColumnsRightCustom()), SLOT(slotInsertColumnsRightCustom())); ​
168 148​
169 connect(m_d->horizontalRuler, SIGNAL(sigRemoveColumns()), SLOT(slotRemoveColumns())); 149​ connect(m_d->horizontalRuler, SIGNAL(sigRemoveColumns()), SLOT(slotRemoveSelectedColumns()));
170 connect(m_d->horizontalRuler, SIGNAL(sigRemoveColumnsAndShift()), SLOT(slotRemoveColumnsAndShift())); 150​ connect(m_d->horizontalRuler, SIGNAL(sigRemoveColumnsAndShift()), SLOT(slotRemoveSelectedColumnsAndShift()));
171 151​
172 connect(m_d->horizontalRuler, SIGNAL(sigInsertHoldColumns()), SLOT(slotInsertHoldColumns())); 152​ connect(m_d->horizontalRuler, SIGNAL(sigInsertHoldColumns()), SLOT(slotInsertHoldFrameColumn()));
173 connect(m_d->horizontalRuler, SIGNAL(sigRemoveHoldColumns()), SLOT(slotRemoveHoldColumns())); 153​ connect(m_d->horizontalRuler, SIGNAL(sigRemoveHoldColumns()), SLOT(slotRemoveHoldFrameColumn()));
174 154​
175 connect(m_d->horizontalRuler, SIGNAL(sigInsertHoldColumnsCustom()), SLOT(slotInsertHoldColumnsCustom())); 155​ connect(m_d->horizontalRuler, SIGNAL(sigInsertHoldColumnsCustom()), SLOT(slotInsertMultipleHoldFrameColumns()));
176 connect(m_d->horizontalRuler, SIGNAL(sigRemoveHoldColumnsCustom()), SLOT(slotRemoveHoldColumnsCustom())); 156​ connect(m_d->horizontalRuler, SIGNAL(sigRemoveHoldColumnsCustom()), SLOT(slotRemoveMultipleHoldFrameColumns()));
177 157​
178 connect(m_d->horizontalRuler, SIGNAL(sigMirrorColumns()), SLOT(slotMirrorColumns())); 158​ connect(m_d->horizontalRuler, SIGNAL(sigMirrorColumns()), SLOT(slotMirrorColumns()));
179 159​
Context not available.
305{ 285​{
306} 286​}
307 287​
308void TimelineFramesView::setShowInTimeline(KisAction* action) 288​void TimelineFramesView::setShowInTimeline(KisAction *action)
309{ 289​{
310 m_d->showHideLayerAction = action; 290​ m_d->showHideLayerAction = action;
311 m_d->layerEditingMenu->addAction(m_d->showHideLayerAction); 291​ m_d->layerEditingMenu->addAction(m_d->showHideLayerAction);
312} 292​}
313 293​
314void TimelineFramesView::setActionManager( KisActionManager * actionManager) 294​void TimelineFramesView::setActionManager(KisActionManager *actionManager)
315{ 295​{
316 m_d->actionMan = actionManager; 296​ m_d->actionMan = actionManager;
317 m_d->horizontalRuler->setActionManager(actionManager); 297​ m_d->horizontalRuler->setActionManager(actionManager);
Context not available.
321 KisAction *action = 0; 301​ KisAction *action = 0;
322 302​
323 action = m_d->actionMan->createAction("add_blank_frame"); 303​ action = m_d->actionMan->createAction("add_blank_frame");
324 connect(action, SIGNAL(triggered()), SLOT(slotNewFrame())); 304​ connect(action, SIGNAL(triggered()), SLOT(slotAddBlankFrame()));
325 305​
326 action = m_d->actionMan->createAction("add_duplicate_frame"); 306​ action = m_d->actionMan->createAction("add_duplicate_frame");
327 connect(action, SIGNAL(triggered()), SLOT(slotCopyFrame())); 307​ connect(action, SIGNAL(triggered()), SLOT(slotAddDuplicateFrame()));
328 ​
329 action = m_d->actionMan->createAction("insert_keyframes_right"); ​
330 connect(action, SIGNAL(triggered()), SLOT(slotInsertKeyframesRight())); ​
331 308​
332 action = m_d->actionMan->createAction("insert_n_keyframes_right"); 309​ action = m_d->actionMan->createAction("insert_keyframe_left");
333 connect(action, SIGNAL(triggered()), SLOT(slotInsertKeyframesRightCustom())); 310​ connect(action, SIGNAL(triggered()), SLOT(slotInsertKeyframeLeft()));
334 311​
335 action = m_d->actionMan->createAction("insert_keyframes_left"); 312​ action = m_d->actionMan->createAction("insert_keyframe_right");
336 connect(action, SIGNAL(triggered()), SLOT(slotInsertKeyframesLeft())); 313​ connect(action, SIGNAL(triggered()), SLOT(slotInsertKeyframeRight()));
337 314​
338 action = m_d->actionMan->createAction("insert_n_keyframes_left"); 315​ action = m_d->actionMan->createAction("insert_multiple_keyframes");
339 connect(action, SIGNAL(triggered()), SLOT(slotInsertKeyframesLeftCustom())); 316​ connect(action, SIGNAL(triggered()), SLOT(slotInsertMultipleKeyframes()));
340 317​
341 action = m_d->actionMan->createAction("remove_frames_and_pull"); 318​ action = m_d->actionMan->createAction("remove_frames_and_pull");
342 connect(action, SIGNAL(triggered()), SLOT(slotRemoveFramesAndShift())); 319​ connect(action, SIGNAL(triggered()), SLOT(slotRemoveSelectedFramesAndShift()));
343 320​
344 action = m_d->actionMan->createAction("remove_frames"); 321​ action = m_d->actionMan->createAction("remove_frames");
345 connect(action, SIGNAL(triggered()), SLOT(slotRemoveFrame())); 322​ connect(action, SIGNAL(triggered()), SLOT(slotRemoveSelectedFrames()));
346 323​
347 action = m_d->actionMan->createAction("insert_hold_frame"); 324​ action = m_d->actionMan->createAction("insert_hold_frame");
348 connect(action, SIGNAL(triggered()), SLOT(slotInsertHoldFrames())); 325​ connect(action, SIGNAL(triggered()), SLOT(slotInsertHoldFrame()));
349 326​
350 action = m_d->actionMan->createAction("insert_n_hold_frames"); 327​ action = m_d->actionMan->createAction("insert_multiple_hold_frames");
351 connect(action, SIGNAL(triggered()), SLOT(slotInsertHoldFramesCustom())); 328​ connect(action, SIGNAL(triggered()), SLOT(slotInsertMultipleHoldFrames()));
352 329​
353 action = m_d->actionMan->createAction("remove_hold_frame"); 330​ action = m_d->actionMan->createAction("remove_hold_frame");
354 connect(action, SIGNAL(triggered()), SLOT(slotRemoveHoldFrames())); 331​ connect(action, SIGNAL(triggered()), SLOT(slotRemoveHoldFrame()));
355 332​
356 action = m_d->actionMan->createAction("remove_n_hold_frames"); 333​ action = m_d->actionMan->createAction("remove_multiple_hold_frames");
357 connect(action, SIGNAL(triggered()), SLOT(slotRemoveHoldFramesCustom())); 334​ connect(action, SIGNAL(triggered()), SLOT(slotRemoveMultipleHoldFrames()));
358 335​
359 action = m_d->actionMan->createAction("mirror_frames"); 336​ action = m_d->actionMan->createAction("mirror_frames");
360 connect(action, SIGNAL(triggered()), SLOT(slotMirrorFrames())); 337​ connect(action, SIGNAL(triggered()), SLOT(slotMirrorFrames()));
Context not available.
722 QTableView::rowsInserted(parent, start, end); 699​ QTableView::rowsInserted(parent, start, end);
723} 700​}
724 701​
725 ​
726inline bool isIndexDragEnabled(QAbstractItemModel *model, const QModelIndex &index) { 702​inline bool isIndexDragEnabled(QAbstractItemModel *model, const QModelIndex &index) {
727 return (model->flags(index) & Qt::ItemIsDragEnabled); 703​ return (model->flags(index) & Qt::ItemIsDragEnabled);
728} 704​}
Context not available.
948 924​
949 925​
950 if (selectionExists) { 926​ if (selectionExists) {
951 KisActionManager::safePopulateMenu(menu, "update_playback_range", m_d->actionMan); 927​ KisActionManager::safePopulateMenu(menu, "update_playback_range", m_d->actionMan);
952 } else { 928​ } else {
953 KisActionManager::safePopulateMenu(menu, "set_start_time", m_d->actionMan); 929​ KisActionManager::safePopulateMenu(menu, "set_start_time", m_d->actionMan);
954 KisActionManager::safePopulateMenu(menu, "set_end_time", m_d->actionMan); 930​ KisActionManager::safePopulateMenu(menu, "set_end_time", m_d->actionMan);
955 } 931​ }
956 menu->addSeparator(); ​
957 932​
933​ menu->addSeparator();
958 934​
959 KisActionManager::safePopulateMenu(menu, "cut_frames_to_clipboard", m_d->actionMan); 935​ KisActionManager::safePopulateMenu(menu, "cut_frames_to_clipboard", m_d->actionMan);
960 KisActionManager::safePopulateMenu(menu, "copy_frames_to_clipboard", m_d->actionMan); 936​ KisActionManager::safePopulateMenu(menu, "copy_frames_to_clipboard", m_d->actionMan);
961 KisActionManager::safePopulateMenu(menu, "paste_frames_from_clipboard", m_d->actionMan); 937​ KisActionManager::safePopulateMenu(menu, "paste_frames_from_clipboard", m_d->actionMan);
962 938​
963 menu->addSeparator(); 939​ menu->addSeparator();
964 QMenu *frames = menu->addMenu(i18nc("@item:inmenu", "Keyframes")); ​
965 KisActionManager::safePopulateMenu(frames, "insert_keyframes_right", m_d->actionMan); ​
966 KisActionManager::safePopulateMenu(frames, "insert_keyframes_left", m_d->actionMan); ​
967 940​
968 frames->addSeparator(); 941​ { //Frames submenu.
969 KisActionManager::safePopulateMenu(frames, "insert_n_keyframes_right", m_d->actionMan); 942​ QMenu *frames = menu->addMenu(i18nc("@item:inmenu", "Keyframes"));
970 KisActionManager::safePopulateMenu(frames, "insert_n_keyframes_left", m_d->actionMan); 943​ KisActionManager::safePopulateMenu(frames, "insert_keyframe_left", m_d->actionMan);
971 944​ KisActionManager::safePopulateMenu(frames, "insert_keyframe_right", m_d->actionMan);
972 QMenu *hold = menu->addMenu(i18nc("@item:inmenu", "Hold Frames")); 945​ frames->addSeparator();
973 KisActionManager::safePopulateMenu(hold, "insert_hold_frame", m_d->actionMan); 946​ KisActionManager::safePopulateMenu(frames, "insert_multiple_keyframes", m_d->actionMan);
974 KisActionManager::safePopulateMenu(hold, "remove_hold_frame", m_d->actionMan); 947​ }
975 948​
976 hold->addSeparator(); 949​ { //Holds submenu.
977 KisActionManager::safePopulateMenu(hold, "insert_n_hold_frames", m_d->actionMan); 950​ QMenu *hold = menu->addMenu(i18nc("@item:inmenu", "Hold Frames"));
978 KisActionManager::safePopulateMenu(hold, "remove_n_hold_frames", m_d->actionMan); 951​ KisActionManager::safePopulateMenu(hold, "insert_hold_frame", m_d->actionMan);
952​ KisActionManager::safePopulateMenu(hold, "remove_hold_frame", m_d->actionMan);
953​ hold->addSeparator();
954​ KisActionManager::safePopulateMenu(hold, "insert_multiple_hold_frames", m_d->actionMan);
955​ KisActionManager::safePopulateMenu(hold, "remove_multiple_hold_frames", m_d->actionMan);
956​ }
979 957​
980 menu->addSeparator(); 958​ menu->addSeparator();
959​
981 KisActionManager::safePopulateMenu(menu, "remove_frames", m_d->actionMan); 960​ KisActionManager::safePopulateMenu(menu, "remove_frames", m_d->actionMan);
982 KisActionManager::safePopulateMenu(menu, "remove_frames_and_pull", m_d->actionMan); 961​ KisActionManager::safePopulateMenu(menu, "remove_frames_and_pull", m_d->actionMan);
983 962​
984 menu->addSeparator(); 963​ menu->addSeparator();
964​
985 if (addFrameCreationActions) { 965​ if (addFrameCreationActions) {
986 KisActionManager::safePopulateMenu(menu, "add_blank_frame", m_d->actionMan); 966​ KisActionManager::safePopulateMenu(menu, "add_blank_frame", m_d->actionMan);
987 KisActionManager::safePopulateMenu(menu, "add_duplicate_frame", m_d->actionMan); 967​ KisActionManager::safePopulateMenu(menu, "add_duplicate_frame", m_d->actionMan);
Context not available.
1202 enableAction("add_blank_frame", hasEditableFrames); 1182​ enableAction("add_blank_frame", hasEditableFrames);
1203 enableAction("add_duplicate_frame", hasEditableFrames); 1183​ enableAction("add_duplicate_frame", hasEditableFrames);
1204 1184​
1205 enableAction("insert_keyframes_right", hasEditableFrames); 1185​ enableAction("insert_keyframe_left", hasEditableFrames);
1206 enableAction("insert_n_keyframes_right", hasEditableFrames); 1186​ enableAction("insert_keyframe_right", hasEditableFrames);
1207 1187​ enableAction("insert_multiple_keyframes", hasEditableFrames);
1208 enableAction("insert_keyframes_left", hasEditableFrames); ​
1209 enableAction("insert_n_keyframes_left", hasEditableFrames); ​
1210 1188​
1211 enableAction("remove_frames", hasEditableFrames && hasExistingFrames); 1189​ enableAction("remove_frames", hasEditableFrames && hasExistingFrames);
1212 enableAction("remove_frames_and_pull", hasEditableFrames); 1190​ enableAction("remove_frames_and_pull", hasEditableFrames);
1213 1191​
1214 enableAction("insert_hold_frame", hasEditableFrames); 1192​ enableAction("insert_hold_frame", hasEditableFrames);
1215 enableAction("insert_n_hold_frames", hasEditableFrames); 1193​ enableAction("insert_multiple_hold_frames", hasEditableFrames);
1216 1194​
1217 enableAction("remove_hold_frame", hasEditableFrames); 1195​ enableAction("remove_hold_frame", hasEditableFrames);
1218 enableAction("remove_n_hold_frames", hasEditableFrames); 1196​ enableAction("remove_multiple_hold_frames", hasEditableFrames);
1219 1197​
1220 enableAction("mirror_frames", hasEditableFrames && editableIndexes.size() > 1); 1198​ enableAction("mirror_frames", hasEditableFrames && editableIndexes.size() > 1);
1221 1199​
Context not available.
1284 model()->removeRow(index.row()); 1262​ model()->removeRow(index.row());
1285} 1263​}
1286 1264​
1287void TimelineFramesView::slotNewFrame() 1265​void TimelineFramesView::slotAddBlankFrame()
1288{ 1266​{
1289 QModelIndex index = currentIndex(); 1267​ QModelIndex index = currentIndex();
1290 if (!index.isValid() || 1268​ if (!index.isValid() ||
Context not available.
1296 m_d->model->createFrame(index); 1274​ m_d->model->createFrame(index);
1297} 1275​}
1298 1276​
1299void TimelineFramesView::slotCopyFrame() 1277​void TimelineFramesView::slotAddDuplicateFrame()
1300{ 1278​{
1301 QModelIndex index = currentIndex(); 1279​ QModelIndex index = currentIndex();
1302 if (!index.isValid() || 1280​ if (!index.isValid() ||
Context not available.
1322 } 1300​ }
1323} 1301​}
1324 1302​
1325void TimelineFramesView::insertFramesImpl(int insertAtColumn, int count, int timing, QSet<int> rows, bool forceEntireColumn) 1303​void TimelineFramesView::insertKeyframes(int count, int timing, TimelineDirection direction, bool entireColumn)
1326{ ​
1327 if (forceEntireColumn) { ​
1328 rows.clear(); ​
1329 for (int i = 0; i < m_d->model->rowCount(); i++) { ​
1330 if (!m_d->model->data(m_d->model->index(i, insertAtColumn), TimelineFramesModel::FrameEditableRole).toBool()) continue; ​
1331 rows.insert(i); ​
1332 } ​
1333 } ​
1334 ​
1335 if (!rows.isEmpty()) { ​
1336 m_d->model->insertFrames(insertAtColumn, rows.toList(), count, timing); ​
1337 } ​
1338} ​
1339 ​
1340void TimelineFramesView::slotInsertKeyframesLeft(int count, int timing, bool forceEntireColumn) ​
1341{ ​
1342 QSet<int> rows; ​
1343 int minColumn = 0; ​
1344 int maxColumn = 0; ​
1345 ​
1346 calculateSelectionMetrics(minColumn, maxColumn, rows); ​
1347 ​
1348 if (count <= 0) { ​
1349 count = qMax(1, maxColumn - minColumn + 1); ​
1350 } ​
1351 ​
1352 insertFramesImpl(minColumn, count, timing, rows, forceEntireColumn); ​
1353} ​
1354 ​
1355void TimelineFramesView::slotInsertKeyframesRight(int count, int timing, bool forceEntireColumn) ​
1356{ 1304​{
1357 QSet<int> rows; 1305​ QSet<int> rows;
1358 int minColumn = 0; 1306​ int minColumn = 0, maxColumn = 0;
1359 int maxColumn = 0; ​
1360 1307​
1361 calculateSelectionMetrics(minColumn, maxColumn, rows); 1308​ calculateSelectionMetrics(minColumn, maxColumn, rows);
1362 1309​
1363 if (count <= 0) { 1310​ if (count <= 0) { //Negative count? Use number of selected frames.
1364 count = qMax(1, maxColumn - minColumn + 1); 1311​ count = qMax(1, maxColumn - minColumn + 1);
1365 } 1312​ }
1366 1313​
1367 insertFramesImpl(maxColumn + 1, count, timing, rows, forceEntireColumn); 1314​ const int insertionColumn =
dkazakovUnsubmitted
Done

I would prefer to use a ternary 'if' operator in this case. That would let you use 'const' restriction on a variable, which helps in understanding the code later.

const int insertionColumn = 
    direction == TimelineDirection::RIGHT ? 
    maxColumn + 1 : 
    minColumn

But I know that the use of ternary operator is much of a matter of taste. You can use whatever version you like yourself :)

dkazakov: I would prefer to use a ternary 'if' operator in this case. That would let you use 'const'…
1368} 1315​ direction == TimelineDirection::RIGHT ?
1369 1316​ maxColumn + 1 : minColumn;
1370void TimelineFramesView::slotInsertColumnsLeft(int count, int timing) ​
1371{ ​
1372 slotInsertKeyframesLeft(count, timing, true); ​
1373} ​
1374 ​
1375void TimelineFramesView::slotInsertColumnsRight(int count, int timing) ​
1376{ ​
1377 slotInsertKeyframesRight(count, timing, true); ​
1378} ​
1379 ​
1380void TimelineFramesView::slotInsertKeyframesLeftCustom() ​
1381{ ​
1382 int count, timing; ​
1383 1317​
1384 if (m_d->insertKeyframeDialog->promptUserSettings(count, timing)) { 1318​ if (entireColumn) {
1385 slotInsertKeyframesLeft(count, timing, false); 1319​ rows.clear();
1386 } 1320​ for (int i = 0; i < m_d->model->rowCount(); i++) {
1387} 1321​ if (!m_d->model->data(m_d->model->index(i, insertionColumn), TimelineFramesModel::FrameEditableRole).toBool()) continue;
1388 1322​ rows.insert(i);
1389void TimelineFramesView::slotInsertKeyframesRightCustom() 1323​ }
1390{ ​
1391 int count, timing; ​
1392 ​
1393 if (m_d->insertKeyframeDialog->promptUserSettings(count, timing)) { ​
1394 slotInsertKeyframesRight(count, timing, false); ​
1395 } 1324​ }
1396} ​
1397 ​
1398void TimelineFramesView::slotInsertColumnsLeftCustom() ​
1399{ ​
1400 int count, timing; ​
1401 1325​
1402 if (m_d->insertKeyframeDialog->promptUserSettings(count, timing)) { 1326​ if (!rows.isEmpty()) {
1403 slotInsertColumnsLeft(count, timing); 1327​ m_d->model->insertFrames(insertionColumn, rows.toList(), count, timing);
1404 } 1328​ }
1405} 1329​}
1406 1330​
1407void TimelineFramesView::slotInsertColumnsRightCustom() 1331​void TimelineFramesView::insertMultipleKeyframes(bool entireColumn)
1408{ 1332​{
1409 int count, timing; 1333​ int count, timing;
1334​ TimelineDirection direction;
1410 1335​
1411 if (m_d->insertKeyframeDialog->promptUserSettings(count, timing)) { 1336​ if (m_d->insertKeyframeDialog->promptUserSettings(count, timing, direction)) {
1412 slotInsertColumnsRight(count, timing); 1337​ insertKeyframes(count, timing, direction, entireColumn);
1413 } 1338​ }
1414} 1339​}
1415 1340​
1416QModelIndexList TimelineFramesView::calculateSelectionSpan(bool forceEntireColumn, bool editableOnly) const 1341​QModelIndexList TimelineFramesView::calculateSelectionSpan(bool entireColumn, bool editableOnly) const
1417{ 1342​{
1418 QModelIndexList indexes; 1343​ QModelIndexList indexes;
1419 1344​
1420 if (forceEntireColumn) { 1345​ if (entireColumn) {
1421 QSet<int> rows; 1346​ QSet<int> rows;
1422 int minColumn = 0; 1347​ int minColumn = 0;
1423 int maxColumn = 0; 1348​ int maxColumn = 0;
Context not available.
1444 return indexes; 1369​ return indexes;
1445} 1370​}
1446 1371​
1447void TimelineFramesView::slotRemoveFrame(bool forceEntireColumn, bool needsOffset) 1372​void TimelineFramesView::slotRemoveSelectedFrames(bool entireColumn, bool needsOffset)
1448{ 1373​{
1449 const QModelIndexList indexes = calculateSelectionSpan(forceEntireColumn); 1374​ const QModelIndexList indexes = calculateSelectionSpan(entireColumn);
1450 1375​
1451 if (!indexes.isEmpty()) { 1376​ if (!indexes.isEmpty()) {
1452 if (needsOffset) { 1377​ if (needsOffset) {
Context not available.
1457 } 1382​ }
1458} 1383​}
1459 1384​
1460void TimelineFramesView::slotRemoveColumns() 1385​void TimelineFramesView::insertOrRemoveHoldFrames(int count, bool entireColumn)
1461{ ​
1462 slotRemoveFrame(true); ​
1463} ​
1464 ​
1465void TimelineFramesView::slotRemoveFramesAndShift(bool forceEntireColumn) ​
1466{ ​
1467 slotRemoveFrame(forceEntireColumn, true); ​
1468} ​
1469 ​
1470void TimelineFramesView::slotRemoveColumnsAndShift() ​
1471{ ​
1472 slotRemoveFramesAndShift(true); ​
1473} ​
1474 ​
1475void TimelineFramesView::slotInsertHoldFrames(int count, bool forceEntireColumn) ​
1476{ 1386​{
1477 QModelIndexList indexes; 1387​ QModelIndexList indexes;
1478 1388​
1479 if (!forceEntireColumn) { 1389​ if (!entireColumn) {
1480 Q_FOREACH (const QModelIndex &index, selectionModel()->selectedIndexes()) { 1390​ Q_FOREACH (const QModelIndex &index, selectionModel()->selectedIndexes()) {
1481 if (m_d->model->data(index, TimelineFramesModel::FrameEditableRole).toBool()) { 1391​ if (m_d->model->data(index, TimelineFramesModel::FrameEditableRole).toBool()) {
1482 indexes << index; 1392​ indexes << index;
Context not available.
1498 } 1408​ }
1499} 1409​}
1500 1410​
1501void TimelineFramesView::slotRemoveHoldFrames(int count, bool forceEntireColumn) 1411​void TimelineFramesView::insertOrRemoveMultipleHoldFrames(bool insertion, bool entireColumn)
1502{ ​
1503 slotInsertHoldFrames(-count, forceEntireColumn); ​
1504} ​
1505 ​
1506void TimelineFramesView::slotInsertHoldFramesCustom() ​
1507{ 1412​{
1508 bool ok = false; 1413​ bool ok = false;
1509 const int count = QInputDialog::getInt(this, 1414​ const int count = QInputDialog::getInt(this,
1510 i18nc("@title:window", "Insert hold frames"), 1415​ i18nc("@title:window", "Insert or Remove Hold Frames"),
1511 i18nc("@label:spinbox", "Enter number of frames"), 1416​ i18nc("@label:spinbox", "Enter number of frames"),
1512 defaultNumberOfFramesToAdd(), 1417​ defaultNumberOfFramesToAdd(),
1513 1, 10000, 1, &ok); 1418​ 1, 10000, 1, &ok);
1514 1419​
1515 if (ok) { 1420​ if (ok) {
1516 setDefaultNumberOfFramesToAdd(count); 1421​ if (insertion) {
1517 slotInsertHoldFrames(count); 1422​ setDefaultNumberOfFramesToAdd(count);
1518 } 1423​ insertOrRemoveHoldFrames(count, entireColumn);
1519} 1424​ } else {
1520 1425​ setDefaultNumberOfFramesToRemove(count);
1521void TimelineFramesView::slotRemoveHoldFramesCustom() 1426​ insertOrRemoveHoldFrames(-count, entireColumn);
1522{ 1427​ }
1523 bool ok = false; ​
1524 const int count = QInputDialog::getInt(this, ​
1525 i18nc("@title:window", "Remove hold frames"), ​
1526 i18nc("@label:spinbox", "Enter number of frames"), ​
1527 defaultNumberOfFramesToRemove(), ​
1528 1, 10000, 1, &ok); ​
1529 ​
1530 if (ok) { ​
1531 setDefaultNumberOfFramesToRemove(count); ​
1532 slotRemoveHoldFrames(count); ​
1533 } ​
1534} ​
1535 ​
1536void TimelineFramesView::slotInsertHoldColumns(int count) ​
1537{ ​
1538 slotInsertHoldFrames(count, true); ​
1539} ​
1540 ​
1541void TimelineFramesView::slotRemoveHoldColumns(int count) ​
1542{ ​
1543 slotRemoveHoldFrames(count, true); ​
1544} ​
1545 ​
1546void TimelineFramesView::slotInsertHoldColumnsCustom() ​
1547{ ​
1548 bool ok = false; ​
1549 const int count = QInputDialog::getInt(this, ​
1550 i18nc("@title:window", "Insert hold columns"), ​
1551 i18nc("@label:spinbox", "Enter number of columns"), ​
1552 defaultNumberOfColumnsToAdd(), ​
1553 1, 10000, 1, &ok); ​
1554 ​
1555 if (ok) { ​
1556 setDefaultNumberOfColumnsToAdd(count); ​
1557 slotInsertHoldColumns(count); ​
1558 } ​
1559} ​
1560 ​
1561void TimelineFramesView::slotRemoveHoldColumnsCustom() ​
1562{ ​
1563 bool ok = false; ​
1564 const int count = QInputDialog::getInt(this, ​
1565 i18nc("@title:window", "Remove hold columns"), ​
1566 i18nc("@label:spinbox", "Enter number of columns"), ​
1567 defaultNumberOfColumnsToRemove(), ​
1568 1, 10000, 1, &ok); ​
1569 ​
1570 if (ok) { ​
1571 setDefaultNumberOfColumnsToRemove(count); ​
1572 slotRemoveHoldColumns(count); ​
1573 } 1428​ }
1574} 1429​}
1575 1430​
1576void TimelineFramesView::slotMirrorFrames(bool forceEntireColumn) 1431​void TimelineFramesView::slotMirrorFrames(bool entireColumn)
1577{ 1432​{
1578 const QModelIndexList indexes = calculateSelectionSpan(forceEntireColumn); 1433​ const QModelIndexList indexes = calculateSelectionSpan(entireColumn);
1579 1434​
1580 if (!indexes.isEmpty()) { 1435​ if (!indexes.isEmpty()) {
1581 m_d->model->mirrorFrames(indexes); 1436​ m_d->model->mirrorFrames(indexes);
1582 } 1437​ }
1583} 1438​}
1584 1439​
1585void TimelineFramesView::slotMirrorColumns() 1440​void TimelineFramesView::cutCopyImpl(bool entireColumn, bool copy)
1586{ 1441​{
1587 slotMirrorFrames(true); 1442​ const QModelIndexList indexes = calculateSelectionSpan(entireColumn, !copy);
1588} ​
1589 ​
1590void TimelineFramesView::cutCopyImpl(bool forceEntireColumn, bool copy) ​
1591{ ​
1592 const QModelIndexList indexes = calculateSelectionSpan(forceEntireColumn, !copy); ​
1593 if (indexes.isEmpty()) return; 1443​ if (indexes.isEmpty()) return;
1594 1444​
1595 int minColumn = std::numeric_limits<int>::max(); 1445​ int minColumn = std::numeric_limits<int>::max();
Context not available.
1613 } 1463​ }
1614} 1464​}
1615 1465​
1616void TimelineFramesView::slotCopyFrames(bool forceEntireColumn) 1466​void TimelineFramesView::slotPasteFrames(bool entireColumn)
1617{ ​
1618 cutCopyImpl(forceEntireColumn, true); ​
1619} ​
1620 ​
1621void TimelineFramesView::slotCutFrames(bool forceEntireColumn) ​
1622{ ​
1623 cutCopyImpl(forceEntireColumn, false); ​
1624} ​
1625 ​
1626void TimelineFramesView::slotPasteFrames(bool forceEntireColumn) ​
1627{ 1467​{
1628 const QModelIndex currentIndex = 1468​ const QModelIndex currentIndex =
1629 !forceEntireColumn ? this->currentIndex() : m_d->model->index(0, this->currentIndex().column()); 1469​ !entireColumn ? this->currentIndex() : m_d->model->index(0, this->currentIndex().column());
1630 1470​
1631 if (!currentIndex.isValid()) return; 1471​ if (!currentIndex.isValid()) return;
1632 1472​
Context not available.
1644 } 1484​ }
1645} 1485​}
1646 1486​
1647void TimelineFramesView::slotCutColumns() ​
1648{ ​
1649 slotCutFrames(true); ​
1650} ​
1651 ​
1652void TimelineFramesView::slotPasteColumns() ​
1653{ ​
1654 slotPasteFrames(true); ​
1655} ​
1656 ​
1657void TimelineFramesView::slotCopyColumns() ​
1658{ ​
1659 slotCopyFrames(true); ​
1660} ​
1661 ​
1662int TimelineFramesView::defaultNumberOfFramesToAdd() const 1487​int TimelineFramesView::defaultNumberOfFramesToAdd() const
1663{ 1488​{
1664 KConfigGroup cfg = KSharedConfig::openConfig()->group("FrameActionsDefaultValues"); 1489​ KConfigGroup cfg = KSharedConfig::openConfig()->group("FrameActionsDefaultValues");
Context not available.