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

Move marker undo code to seperate file

Browse Source
This commit is contained in:
Thomas Wilshaw
2021-10-22 22:15:55 +01:00
parent 2840f957bd
commit 7af6f85a7c
7 changed files with 142 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/widget/timebased/timebasedwidget.cpp
+1 -49
View File
@@ -27,6 +27,7 @@
#include "config/config.h"
#include "core.h"
#include "node/project/sequence/sequence.h"
#include "widget/marker/markerundo.h"
#include "widget/timelinewidget/undo/timelineundoworkarea.h"
namespace olive {
@@ -665,55 +666,6 @@ void TimeBasedWidget::DeleteSelected()
}
}
TimeBasedWidget::MarkerAddCommand::MarkerAddCommand(Project *project, TimelineMarkerList *marker_list, const TimeRange &range, const QString &name, int color) :
project_(project),
marker_list_(marker_list),
range_(range),
name_(name),
color_(color)
{
}
Project *TimeBasedWidget::MarkerAddCommand::GetRelevantProject() const
{
return project_;
}
void TimeBasedWidget::MarkerAddCommand::redo()
{
added_marker_ = marker_list_->AddMarker(range_, name_, color_);
}
void TimeBasedWidget::MarkerAddCommand::undo()
{
marker_list_->RemoveMarker(added_marker_);
}
TimeBasedWidget::MarkerRemoveCommand::MarkerRemoveCommand(Project* project, TimelineMarker* marker, TimelineMarkerList* marker_list) :
project_(project),
marker_(marker),
marker_list_(marker_list),
range_(marker->time()),
name_(marker->name()),
color_(marker->color())
{
}
Project *TimeBasedWidget::MarkerRemoveCommand::GetRelevantProject() const
{
return project_;
}
void TimeBasedWidget::MarkerRemoveCommand::redo()
{
marker_list_->RemoveMarker(marker_);
}
void TimeBasedWidget::MarkerRemoveCommand::undo()
{
marker_list_->AddMarker(range_, name_, color_);
}
bool TimeBasedWidget::eventFilter(QObject *object, QEvent *event)
{
if (wheel_passthrough_objects_.contains(object) && event->type() == QEvent::Wheel) {
app/widget/timebased/timebasedwidget.h
-41
View File
@@ -54,47 +54,6 @@ public:
virtual bool eventFilter(QObject* object, QEvent* event) override;
// Temp file location
class MarkerAddCommand : public UndoCommand {
public:
MarkerAddCommand(Project* project, TimelineMarkerList* marker_list, const TimeRange& range, const QString& name, int color = -1);
virtual Project* GetRelevantProject() const override;
protected:
virtual void redo() override;
virtual void undo() override;
private:
Project* project_;
TimelineMarkerList* marker_list_;
TimeRange range_;
QString name_;
int color_;
TimelineMarker* added_marker_;
};
class MarkerRemoveCommand : public UndoCommand {
public:
MarkerRemoveCommand(Project* project, TimelineMarker* marker, TimelineMarkerList* marker_list);
virtual Project* GetRelevantProject() const override;
protected:
virtual void redo() override;
virtual void undo() override;
private:
Project* project_;
TimelineMarker* marker_;
TimelineMarkerList* marker_list_;
TimeRange range_;
QString name_;
int color_;
};
public slots:
void SetTime(const rational &time);