many project window enhancements
This commit is contained in:
itsmattkc
+129
-48
@@ -1,6 +1,14 @@
|
||||
#include "undo.h"
|
||||
|
||||
#include <QDebug>
|
||||
#include <QTreeWidgetItem>
|
||||
|
||||
#include "project/clip.h"
|
||||
#include "project/sequence.h"
|
||||
#include "panels/panels.h"
|
||||
#include "panels/project.h"
|
||||
#include "playback/playback.h"
|
||||
#include "ui/sourcetable.h"
|
||||
|
||||
QUndoStack undo_stack;
|
||||
|
||||
@@ -24,6 +32,15 @@ TimelineAction::~TimelineAction() {
|
||||
for (int i=0;i<deleted_clips.size();i++) {
|
||||
delete deleted_clips.at(i);
|
||||
}
|
||||
for (int i=0;i<deleted_media.size();i++) {
|
||||
panel_project->delete_media(deleted_media.at(i));
|
||||
delete deleted_media.at(i);
|
||||
}
|
||||
} else {
|
||||
/*for (int i=0;i<media_to_add.size();i++) {
|
||||
panel_project->delete_media(media_to_add.at(i));
|
||||
delete media_to_add.at(i);
|
||||
}*/
|
||||
}
|
||||
}
|
||||
|
||||
@@ -36,103 +53,130 @@ void TimelineAction::offset_links(QVector<Clip*>& clips, int offset) {
|
||||
}
|
||||
}
|
||||
|
||||
void TimelineAction::add_clips(QVector<Clip*>& add) {
|
||||
void TimelineAction::add_clips(Sequence* s, QVector<Clip*>& add) {
|
||||
offset_links(add, clips_to_add.size());
|
||||
clips_to_add.append(add);
|
||||
for (int i=0;i<clips_to_add.size();i++) {
|
||||
sequence_to_add_clips_to.append(s);
|
||||
}
|
||||
}
|
||||
|
||||
void TimelineAction::new_action(int action, int clip, long old_val, long new_val) {
|
||||
void TimelineAction::new_action(Sequence* s, int action, int clip, long old_val, long new_val) {
|
||||
sequences.append(s);
|
||||
actions.append(action);
|
||||
clips.append(clip);
|
||||
old_values.append(old_val);
|
||||
new_values.append(new_val);
|
||||
}
|
||||
|
||||
void TimelineAction::set_timeline_in(int clip, long value) {
|
||||
new_action(TA_IN, clip, sequence->get_clip(clip)->timeline_in, value);
|
||||
void TimelineAction::set_timeline_in(Sequence* s, int clip, long value) {
|
||||
new_action(s, TA_IN, clip, s->get_clip(clip)->timeline_in, value);
|
||||
}
|
||||
|
||||
void TimelineAction::set_timeline_out(int clip, long value) {
|
||||
new_action(TA_OUT, clip, sequence->get_clip(clip)->timeline_out, value);
|
||||
void TimelineAction::set_timeline_out(Sequence* s, int clip, long value) {
|
||||
new_action(s, TA_OUT, clip, s->get_clip(clip)->timeline_out, value);
|
||||
}
|
||||
|
||||
void TimelineAction::set_clip_in(int clip, long value) {
|
||||
new_action(TA_CLIP_IN, clip, sequence->get_clip(clip)->clip_in, value);
|
||||
void TimelineAction::set_clip_in(Sequence* s, int clip, long value) {
|
||||
new_action(s, TA_CLIP_IN, clip, s->get_clip(clip)->clip_in, value);
|
||||
}
|
||||
|
||||
void TimelineAction::set_track(int clip, int value) {
|
||||
new_action(TA_TRACK, clip, sequence->get_clip(clip)->track, value);
|
||||
void TimelineAction::set_track(Sequence* s, int clip, int value) {
|
||||
new_action(s, TA_TRACK, clip, s->get_clip(clip)->track, value);
|
||||
}
|
||||
|
||||
void TimelineAction::increase_timeline_in(int clip, long value) {
|
||||
new_action(TA_ADD_IN, clip, 0, value);
|
||||
void TimelineAction::increase_timeline_in(Sequence* s, int clip, long value) {
|
||||
new_action(s, TA_ADD_IN, clip, 0, value);
|
||||
}
|
||||
|
||||
void TimelineAction::increase_timeline_out(int clip, long value) {
|
||||
new_action(TA_ADD_OUT, clip, 0, value);
|
||||
void TimelineAction::increase_timeline_out(Sequence* s, int clip, long value) {
|
||||
new_action(s, TA_ADD_OUT, clip, 0, value);
|
||||
}
|
||||
|
||||
void TimelineAction::increase_clip_in(int clip, long value) {
|
||||
new_action(TA_ADD_CLIP_IN, clip, 0, value);
|
||||
void TimelineAction::increase_clip_in(Sequence* s, int clip, long value) {
|
||||
new_action(s, TA_ADD_CLIP_IN, clip, 0, value);
|
||||
}
|
||||
|
||||
void TimelineAction::increase_track(int clip, int value) {
|
||||
new_action(TA_ADD_TRACK, clip, 0, value);
|
||||
void TimelineAction::increase_track(Sequence* s, int clip, int value) {
|
||||
new_action(s, TA_ADD_TRACK, clip, 0, value);
|
||||
}
|
||||
|
||||
void TimelineAction::delete_clip(int clip) {
|
||||
new_action(TA_DELETE, clip, 0, 0);
|
||||
void TimelineAction::delete_clip(Sequence* s, int clip) {
|
||||
new_action(s, TA_DELETE, clip, 0, 0);
|
||||
}
|
||||
|
||||
void TimelineAction::add_media(QTreeWidgetItem* item) {
|
||||
media_to_add.append(item);
|
||||
}
|
||||
|
||||
void TimelineAction::delete_media(QTreeWidgetItem* item) {
|
||||
deleted_media.append(item);
|
||||
}
|
||||
|
||||
void TimelineAction::undo() {
|
||||
for (int i=0;i<deleted_media.size();i++) {
|
||||
QTreeWidgetItem* item = deleted_media.at(i);
|
||||
QTreeWidgetItem* parent = deleted_media_parents.at(i);
|
||||
if (parent == NULL) {
|
||||
panel_project->source_table->addTopLevelItem(item);
|
||||
} else {
|
||||
parent->addChild(item);
|
||||
}
|
||||
}
|
||||
|
||||
for (int i=0;i<actions.size();i++) {
|
||||
switch (actions.at(i)) {
|
||||
case TA_IN:
|
||||
sequence->get_clip(clips.at(i))->timeline_in = old_values.at(i);
|
||||
sequences.at(i)->get_clip(clips.at(i))->timeline_in = old_values.at(i);
|
||||
break;
|
||||
case TA_OUT:
|
||||
sequence->get_clip(clips.at(i))->timeline_out = old_values.at(i);
|
||||
sequences.at(i)->get_clip(clips.at(i))->timeline_out = old_values.at(i);
|
||||
break;
|
||||
case TA_CLIP_IN:
|
||||
sequence->get_clip(clips.at(i))->clip_in = old_values.at(i);
|
||||
sequences.at(i)->get_clip(clips.at(i))->clip_in = old_values.at(i);
|
||||
break;
|
||||
case TA_TRACK:
|
||||
sequence->get_clip(clips.at(i))->track = old_values.at(i);
|
||||
sequences.at(i)->get_clip(clips.at(i))->track = old_values.at(i);
|
||||
break;
|
||||
case TA_DELETE:
|
||||
sequence->replace_clip(clips.at(i), deleted_clips.at(new_values.at(i)));
|
||||
sequences.at(i)->replace_clip(clips.at(i), deleted_clips.at(new_values.at(i)));
|
||||
break;
|
||||
case TA_ADD_IN:
|
||||
sequence->get_clip(clips.at(i))->timeline_in -= new_values.at(i);
|
||||
sequences.at(i)->get_clip(clips.at(i))->timeline_in -= new_values.at(i);
|
||||
break;
|
||||
case TA_ADD_OUT:
|
||||
sequence->get_clip(clips.at(i))->timeline_out -= new_values.at(i);
|
||||
sequences.at(i)->get_clip(clips.at(i))->timeline_out -= new_values.at(i);
|
||||
break;
|
||||
case TA_ADD_CLIP_IN:
|
||||
sequence->get_clip(clips.at(i))->clip_in -= new_values.at(i);
|
||||
sequences.at(i)->get_clip(clips.at(i))->clip_in -= new_values.at(i);
|
||||
break;
|
||||
case TA_ADD_TRACK:
|
||||
sequence->get_clip(clips.at(i))->track -= new_values.at(i);
|
||||
sequences.at(i)->get_clip(clips.at(i))->track -= new_values.at(i);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
// restore link references to deleted clips
|
||||
for (int i=0;i<removed_link_to.size();i++) {
|
||||
sequence->get_clip(removed_link_from.at(i))->linked.append(removed_link_to.at(i));
|
||||
removed_link_from_sequence.at(i)->get_clip(removed_link_from.at(i))->linked.append(removed_link_to.at(i));
|
||||
}
|
||||
|
||||
// delete added clips
|
||||
if (clips_to_add.size() > 0) {
|
||||
int delete_count = 0;
|
||||
for (int i=0;i<clips_to_add.size();i++) {
|
||||
sequence->destroy_clip(added_indexes.at(i)-delete_count, true);
|
||||
sequence_to_add_clips_to.at(i)->destroy_clip(added_indexes.at(i)-delete_count, true);
|
||||
delete_count++;
|
||||
}
|
||||
}
|
||||
|
||||
// remove any added media
|
||||
if (media_to_add.size() > 0) {
|
||||
for (int i=0;i<media_to_add.size();i++) {
|
||||
panel_project->source_table->takeTopLevelItem(panel_project->source_table->indexOfTopLevelItem(media_to_add.at(i)));
|
||||
}
|
||||
}
|
||||
|
||||
done = false;
|
||||
}
|
||||
|
||||
@@ -141,56 +185,60 @@ void TimelineAction::redo() {
|
||||
removed_link_to.clear();
|
||||
deleted_clips.clear();
|
||||
deleted_clips_indices.clear();
|
||||
deleted_clip_sequences.clear();
|
||||
added_indexes.clear();
|
||||
deleted_media_parents.clear();
|
||||
removed_link_from_sequence.clear();
|
||||
|
||||
for (int i=0;i<actions.size();i++) {
|
||||
switch (actions.at(i)) {
|
||||
case TA_IN:
|
||||
{
|
||||
sequence->get_clip(clips.at(i))->timeline_in = new_values.at(i);
|
||||
sequences.at(i)->get_clip(clips.at(i))->timeline_in = new_values.at(i);
|
||||
}
|
||||
break;
|
||||
case TA_OUT:
|
||||
{
|
||||
sequence->get_clip(clips.at(i))->timeline_out = new_values.at(i);
|
||||
sequences.at(i)->get_clip(clips.at(i))->timeline_out = new_values.at(i);
|
||||
}
|
||||
break;
|
||||
case TA_CLIP_IN:
|
||||
{
|
||||
sequence->get_clip(clips.at(i))->clip_in = new_values.at(i);
|
||||
sequences.at(i)->get_clip(clips.at(i))->clip_in = new_values.at(i);
|
||||
}
|
||||
break;
|
||||
case TA_TRACK:
|
||||
{
|
||||
sequence->get_clip(clips.at(i))->track = new_values.at(i);
|
||||
sequences.at(i)->get_clip(clips.at(i))->track = new_values.at(i);
|
||||
}
|
||||
break;
|
||||
case TA_DELETE:
|
||||
{
|
||||
new_values[i] = deleted_clips.size();
|
||||
deleted_clips.append(sequence->get_clip(clips.at(i)));
|
||||
deleted_clips.append(sequences.at(i)->get_clip(clips.at(i)));
|
||||
deleted_clips_indices.append(clips.at(i));
|
||||
sequence->replace_clip(clips.at(i), NULL);
|
||||
deleted_clip_sequences.append(sequences.at(i));
|
||||
sequences.at(i)->replace_clip(clips.at(i), NULL);
|
||||
}
|
||||
break;
|
||||
case TA_ADD_IN:
|
||||
{
|
||||
sequence->get_clip(clips.at(i))->timeline_in += new_values.at(i);
|
||||
sequences.at(i)->get_clip(clips.at(i))->timeline_in += new_values.at(i);
|
||||
}
|
||||
break;
|
||||
case TA_ADD_OUT:
|
||||
{
|
||||
sequence->get_clip(clips.at(i))->timeline_out += new_values.at(i);
|
||||
sequences.at(i)->get_clip(clips.at(i))->timeline_out += new_values.at(i);
|
||||
}
|
||||
break;
|
||||
case TA_ADD_CLIP_IN:
|
||||
{
|
||||
sequence->get_clip(clips.at(i))->clip_in += new_values.at(i);
|
||||
sequences.at(i)->get_clip(clips.at(i))->clip_in += new_values.at(i);
|
||||
}
|
||||
break;
|
||||
case TA_ADD_TRACK:
|
||||
{
|
||||
sequence->get_clip(clips.at(i))->track += new_values.at(i);
|
||||
sequences.at(i)->get_clip(clips.at(i))->track += new_values.at(i);
|
||||
}
|
||||
break;
|
||||
}
|
||||
@@ -198,11 +246,13 @@ void TimelineAction::redo() {
|
||||
|
||||
// remove any potential link references from deleted clips
|
||||
for (int i=0;i<deleted_clips_indices.size();i++) {
|
||||
for (int j=0;j<sequence->clip_count();j++) {
|
||||
Clip* c = sequence->get_clip(j);
|
||||
Sequence* s = deleted_clip_sequences.at(i);
|
||||
for (int j=0;j<s->clip_count();j++) {
|
||||
Clip* c = s->get_clip(j);
|
||||
if (c != NULL) {
|
||||
for (int k=0;k<c->linked.size();k++) {
|
||||
if (c->linked.at(k) == deleted_clips_indices.at(i)) {
|
||||
removed_link_from_sequence.append(s);
|
||||
removed_link_from.append(j);
|
||||
removed_link_to.append(deleted_clips_indices.at(i));
|
||||
c->linked.removeAt(k);
|
||||
@@ -215,15 +265,46 @@ void TimelineAction::redo() {
|
||||
|
||||
// add any new clips
|
||||
if (clips_to_add.size() > 0) {
|
||||
int link_offset = sequence->clip_count();
|
||||
QVector<Clip*> copies;
|
||||
for (int i=0;i<clips_to_add.size();i++) {
|
||||
Clip* original = clips_to_add.at(i);
|
||||
Clip* copy = original->copy();
|
||||
copy->linked.resize(original->linked.size());
|
||||
for (int j=0;j<original->linked.size();j++) {
|
||||
copy->linked[j] = original->linked.at(j) + link_offset;
|
||||
copy->linked[j] = original->linked.at(j) + sequence_to_add_clips_to.at(i)->clip_count();
|
||||
}
|
||||
added_indexes.append(sequence->add_clip(copy));
|
||||
copies.append(copy);
|
||||
}
|
||||
for (int i=0;i<clips_to_add.size();i++) {
|
||||
added_indexes.append(sequence_to_add_clips_to.at(i)->add_clip(copies.at(i)));
|
||||
}
|
||||
}
|
||||
|
||||
// delete media
|
||||
if (deleted_media.size() > 0) {
|
||||
for (int i=0;i<deleted_media.size();i++) {
|
||||
QTreeWidgetItem* item = deleted_media.at(i);
|
||||
deleted_media_parents.append(item->parent());
|
||||
|
||||
// if we're deleting the open sequence, close it
|
||||
if (panel_project->get_type_from_tree(item) == MEDIA_TYPE_SEQUENCE) {
|
||||
if (panel_project->get_sequence_from_tree(item) == sequence) {
|
||||
set_sequence(NULL);
|
||||
}
|
||||
}
|
||||
|
||||
if (item->parent() == NULL) {
|
||||
panel_project->source_table->takeTopLevelItem(panel_project->source_table->indexOfTopLevelItem(item));
|
||||
} else {
|
||||
item->parent()->removeChild(item);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// add any new media
|
||||
if (media_to_add.size() > 0) {
|
||||
for (int i=0;i<media_to_add.size();i++) {
|
||||
panel_project->source_table->addTopLevelItem(media_to_add.at(i));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user