various improvements

project/undo.cpp

@@ -11,6 +11,7 @@
 #include "panels/project.h"
 #include "panels/effectcontrols.h"
 #include "panels/viewer.h"
+#include "panels/timeline.h"
 #include "playback/playback.h"
 #include "ui/sourcetable.h"
 #include "effects/effect.h"
@@ -426,28 +427,39 @@ AddClipCommand::~AddClipCommand() {
     for (int i=0;i<clips.size();i++) {
         delete clips.at(i);
     }
+	for (int i=0;i<undone_clips.size();i++) {
+		delete undone_clips.at(i);
+	}
 }
 
 void AddClipCommand::undo() {
     for (int i=0;i<clips.size();i++) {
-        delete seq->clips.last();
+		Clip* c = seq->clips.last();
+		panel_timeline->deselect_area(c->timeline_in, c->timeline_out, c->track);
+		undone_clips.prepend(c);
         seq->clips.removeLast();
     }
 	mainWindow->setWindowModified(old_project_changed);
 }
 
 void AddClipCommand::redo() {
-    // TODO does this actually need to copy?
-    int linkOffset = seq->clips.size();
-    for (int i=0;i<clips.size();i++) {
-        Clip* original = clips.at(i);
-        Clip* copy = original->copy(seq);
-        copy->linked.resize(original->linked.size());
-        for (int j=0;j<original->linked.size();j++) {
-            copy->linked[j] = original->linked.at(j) + linkOffset;
-        }
-        seq->clips.append(copy);
-    }
+	if (undone_clips.size() > 0) {
+		for (int i=0;i<undone_clips.size();i++) {
+			seq->clips.append(undone_clips.at(i));
+		}
+		undone_clips.clear();
+	} else {
+		int linkOffset = seq->clips.size();
+		for (int i=0;i<clips.size();i++) {
+			Clip* original = clips.at(i);
+			Clip* copy = original->copy(seq);
+			copy->linked.resize(original->linked.size());
+			for (int j=0;j<original->linked.size();j++) {
+				copy->linked[j] = original->linked.at(j) + linkOffset;
+			}
+			seq->clips.append(copy);
+		}
+	}
 	mainWindow->setWindowModified(true);
 }
 
@@ -1370,14 +1382,14 @@ void SetAutoscaleAction::undo() {
     for (int i=0;i<clips.size();i++) {
         clips.at(i)->autoscale = !clips.at(i)->autoscale;
     }
-    panel_viewer->viewer_widget->update();
+	panel_sequence_viewer->viewer_widget->update();
 }
 
 void SetAutoscaleAction::redo() {
     for (int i=0;i<clips.size();i++) {
         clips.at(i)->autoscale = !clips.at(i)->autoscale;
     }
-    panel_viewer->viewer_widget->update();
+	panel_sequence_viewer->viewer_widget->update();
 }
 
 AddMarkerAction::AddMarkerAction(Sequence* s, long t, QString n) :

project/undo.h

@@ -218,93 +218,10 @@ public:
 private:
     Sequence* seq;
     QVector<Clip*> clips;
+	QVector<Clip*> undone_clips;
 	bool old_project_changed;
 };
 
-/*class TimelineAction : public QUndoCommand {
-public:
-    TimelineAction();
-    ~TimelineAction();
-    void change_sequence(Sequence* s);
-    void new_sequence(QTreeWidgetItem* s, QTreeWidgetItem* parent);
-    void add_clips(Sequence* s, QVector<Clip*>& add);
-    void set_timeline_in(Sequence* s, int clip, long value);
-    void increase_timeline_in(Sequence* s, int clip, long value);
-    void set_timeline_out(Sequence* s, int clip, long value);
-    void increase_timeline_out(Sequence* s, int clip, long value);
-    void set_clip_in(Sequence* s, int clip, long value);
-    void increase_clip_in(Sequence* s, int clip, long value);
-    void set_track(Sequence* s, int clip, int value);
-    void increase_track(Sequence* s, int clip, int value);
-    void delete_clip(Sequence* s, int clip);
-	void add_media(QTreeWidgetItem* item, QTreeWidgetItem* parent);
-    void delete_media(QTreeWidgetItem* item);
-    void ripple(Sequence* s, long point, long length);
-    void ripple(Sequence* s, long point, long length, QVector<int> &ignore);
-    void set_in_out(Sequence* s, bool enabled, long in, long out);
-	void add_effect(Sequence* s, int clip, int effect);
-	void add_transition(Sequence* s, int clip, int transition, int type);
-	void modify_transition(Sequence* s, int clip, int type, long length);
-	void delete_transition(Sequence* s, int clip, int type);
-    void undo();
-    void redo();
-private:
-    bool done;
-
-    bool change_seq;
-    Sequence* old_seq;
-    Sequence* new_seq;
-
-    QVector<QTreeWidgetItem*> new_sequence_items;
-    QVector<QTreeWidgetItem*> new_sequence_parents;
-
-    QVector<Sequence*> sequences;
-    QVector<int> actions;
-    QVector<int> clips;
-	QVector<int> transition_types;
-    QVector<long> old_values;
-    QVector<long> new_values;
-
-    QVector<Clip*> deleted_clips;
-    QVector<int> deleted_clips_indices;
-    QVector<Sequence*> deleted_clip_sequences;
-
-    QVector<Sequence*> sequence_to_add_clips_to;
-    QVector<Clip*> clips_to_add;
-    QVector<int> added_indexes;
-
-    QVector<Sequence*> removed_link_from_sequence;
-    QVector<int> removed_link_from;
-    QVector<int> removed_link_to;
-
-    QVector<QTreeWidgetItem*> deleted_media;
-    QVector<QTreeWidgetItem*> deleted_media_parents;
-
-    QVector<QTreeWidgetItem*> media_to_add;
-	QVector<QTreeWidgetItem*> media_to_add_parents;
-
-    Sequence* ripple_sequence;
-    bool ripple_enabled;
-    long ripple_point;
-    long ripple_length;
-    QVector<int> rippled_clips;
-    QVector<int> ripple_ignores;
-
-    bool change_in_out;
-    Sequence* change_in_out_sequence;
-    bool old_in_out_enabled;
-    bool new_in_out_enabled;
-    long old_sequence_in;
-    long new_sequence_in;
-    long old_sequence_out;
-    long new_sequence_out;
-
-	void new_action(Sequence* s, int action, int clip, int transition_type, long old_val, long new_val);
-    void offset_links(QVector<Clip*>& clips, int offset);
-
-	bool old_project_changed;
-};*/
-
 class LinkCommand : public QUndoCommand {
 public:
     LinkCommand();