oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

adding sequences can now be undone

Browse Source
This commit is contained in:
itsmattkc
2018-07-19 12:17:22 +01:00
parent 48b1c21d6c
commit 33f8d7274a
7 changed files with 92 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/sourcetable.cpp
+3 -1
View File
@@ -62,7 +62,9 @@ void SourceTable::mouseDoubleClickEvent(QMouseEvent* ) {
} else if (selectedItems().count() == 1) {
QTreeWidgetItem* item = selectedItems().at(0);
if (panel_project->get_type_from_tree(item) == MEDIA_TYPE_SEQUENCE) {
set_sequence(panel_project->get_sequence_from_tree(item));
TimelineAction* ta = new TimelineAction();
ta->change_sequence(panel_project->get_sequence_from_tree(item));
undo_stack.push(ta);
}
}
}
ui/timelinewidget.cpp
+5 -4
View File
@@ -173,8 +173,9 @@ void TimelineWidget::dropEvent(QDropEvent* event) {
QVector<Clip*> added_clips;
if (sequence == NULL) {
Sequence* s = new Sequence();
Sequence* s = sequence;
if (s == NULL) {
s = new Sequence();
// dumb hardcoded default values, should be settable somewhere
s->name = panel_project->get_next_sequence_name();
@@ -184,7 +185,7 @@ void TimelineWidget::dropEvent(QDropEvent* event) {
s->audio_frequency = predicted_audio_freq;
s->audio_layout = predicted_audio_layout;
panel_project->new_sequence(s, true, NULL);
panel_project->new_sequence(ta, s, true, NULL);
} else {
// delete areas before adding
QVector<Selection> delete_areas;
@@ -252,7 +253,7 @@ void TimelineWidget::dropEvent(QDropEvent* event) {
}
}
ta->add_clips(sequence, added_clips);
ta->add_clips(s, added_clips);
panel_timeline->ghosts.clear();
panel_timeline->importing = false;