global: made every user action set a project "modified" state that will prevent

the main window from closing instantly
This commit is contained in:
itsmattkc
2020-03-03 14:33:45 +11:00
parent 0f5cd40c45
commit baf3fbde05
25 changed files with 377 additions and 238 deletions
@@ -124,38 +124,38 @@ void FootagePropertiesDialog::accept() {
}
FootagePropertiesDialog::FootageChangeCommand::FootageChangeCommand(Footage *footage, const QString &name, QUndoCommand* command) :
QUndoCommand(command),
UndoCommand(command),
footage_(footage),
new_name_(name)
{
}
void FootagePropertiesDialog::FootageChangeCommand::redo()
void FootagePropertiesDialog::FootageChangeCommand::redo_internal()
{
old_name_ = footage_->name();
footage_->set_name(new_name_);
}
void FootagePropertiesDialog::FootageChangeCommand::undo()
void FootagePropertiesDialog::FootageChangeCommand::undo_internal()
{
footage_->set_name(old_name_);
}
FootagePropertiesDialog::StreamEnableChangeCommand::StreamEnableChangeCommand(StreamPtr stream, bool enabled, QUndoCommand *command) :
QUndoCommand(command),
UndoCommand(command),
stream_(stream),
old_enabled_(stream->enabled()),
new_enabled_(enabled)
{
}
void FootagePropertiesDialog::StreamEnableChangeCommand::redo()
void FootagePropertiesDialog::StreamEnableChangeCommand::redo_internal()
{
stream_->set_enabled(new_enabled_);
}
void FootagePropertiesDialog::StreamEnableChangeCommand::undo()
void FootagePropertiesDialog::StreamEnableChangeCommand::undo_internal()
{
stream_->set_enabled(old_enabled_);
}
@@ -28,9 +28,9 @@
#include <QLineEdit>
#include <QListWidget>
#include <QStackedWidget>
#include <QUndoCommand>
#include "project/item/footage/footage.h"
#include "undo/undocommand.h"
/**
* @brief The MediaPropertiesDialog class
@@ -54,14 +54,15 @@ public:
*/
FootagePropertiesDialog(QWidget *parent, Footage* footage);
private:
class FootageChangeCommand : public QUndoCommand {
class FootageChangeCommand : public UndoCommand {
public:
FootageChangeCommand(Footage* footage,
const QString& name,
QUndoCommand *command = nullptr);
virtual void redo() override;
virtual void undo() override;
protected:
virtual void redo_internal() override;
virtual void undo_internal() override;
private:
Footage* footage_;
@@ -70,14 +71,15 @@ private:
QString old_name_;
};
class StreamEnableChangeCommand : public QUndoCommand {
class StreamEnableChangeCommand : public UndoCommand {
public:
StreamEnableChangeCommand(StreamPtr stream,
bool enabled,
QUndoCommand* command = nullptr);
virtual void redo() override;
virtual void undo() override;
protected:
virtual void redo_internal() override;
virtual void undo_internal() override;
private:
StreamPtr stream_;
@@ -71,14 +71,14 @@ VideoStreamProperties::VideoStreamChangeCommand::VideoStreamChangeCommand(ImageS
bool premultiplied,
QString colorspace,
QUndoCommand *parent) :
QUndoCommand(parent),
UndoCommand(parent),
stream_(stream),
new_premultiplied_(premultiplied),
new_colorspace_(colorspace)
{
}
void VideoStreamProperties::VideoStreamChangeCommand::redo()
void VideoStreamProperties::VideoStreamChangeCommand::redo_internal()
{
old_premultiplied_ = stream_->premultiplied_alpha();
old_colorspace_ = stream_->colorspace();
@@ -87,7 +87,7 @@ void VideoStreamProperties::VideoStreamChangeCommand::redo()
stream_->set_colorspace(new_colorspace_);
}
void VideoStreamProperties::VideoStreamChangeCommand::undo()
void VideoStreamProperties::VideoStreamChangeCommand::undo_internal()
{
stream_->set_premultiplied_alpha(old_premultiplied_);
stream_->set_colorspace(old_colorspace_);
@@ -23,10 +23,10 @@
#include <QCheckBox>
#include <QComboBox>
#include <QUndoCommand>
#include "project/item/footage/videostream.h"
#include "streamproperties.h"
#include "undo/undocommand.h"
class VideoStreamProperties : public StreamProperties
{
@@ -51,15 +51,16 @@ private:
*/
QComboBox* video_color_space_;
class VideoStreamChangeCommand : public QUndoCommand {
class VideoStreamChangeCommand : public UndoCommand {
public:
VideoStreamChangeCommand(ImageStreamPtr stream,
bool premultiplied,
QString colorspace,
QUndoCommand* parent = nullptr);
virtual void redo() override;
virtual void undo() override;
protected:
virtual void redo_internal() override;
virtual void undo_internal() override;
private:
ImageStreamPtr stream_;
+3 -3
View File
@@ -198,7 +198,7 @@ SequenceDialog::SequenceParamCommand::SequenceParamCommand(Sequence* s,
const AudioParams& audio_params,
const QString& name,
QUndoCommand* parent) :
QUndoCommand(parent),
UndoCommand(parent),
sequence_(s),
new_video_params_(video_params),
new_audio_params_(audio_params),
@@ -209,14 +209,14 @@ SequenceDialog::SequenceParamCommand::SequenceParamCommand(Sequence* s,
{
}
void SequenceDialog::SequenceParamCommand::redo()
void SequenceDialog::SequenceParamCommand::redo_internal()
{
sequence_->set_video_params(new_video_params_);
sequence_->set_audio_params(new_audio_params_);
sequence_->set_name(new_name_);
}
void SequenceDialog::SequenceParamCommand::undo()
void SequenceDialog::SequenceParamCommand::undo_internal()
{
sequence_->set_video_params(old_video_params_);
sequence_->set_audio_params(old_audio_params_);
+6 -4
View File
@@ -24,9 +24,9 @@
#include <QComboBox>
#include <QDialog>
#include <QSpinBox>
#include <QUndoCommand>
#include "project/item/sequence/sequence.h"
#include "undo/undocommand.h"
/**
* @brief A dialog for editing Sequence parameters
@@ -112,7 +112,7 @@ private:
/**
* @brief A QUndoCommand for setting the parameters on a sequence
*/
class SequenceParamCommand : public QUndoCommand {
class SequenceParamCommand : public UndoCommand {
public:
SequenceParamCommand(Sequence* s,
const VideoParams& video_params,
@@ -120,8 +120,10 @@ private:
const QString& name,
QUndoCommand* parent = nullptr);
virtual void redo() override;
virtual void undo() override;
protected:
virtual void redo_internal() override;
virtual void undo_internal() override;
private:
Sequence* sequence_;
+4 -4
View File
@@ -333,18 +333,18 @@ void SpeedDurationDialog::DurationChanged()
}
BlockReverseCommand::BlockReverseCommand(Block *block, QUndoCommand *parent) :
QUndoCommand(parent),
UndoCommand(parent),
block_(block)
{
}
void BlockReverseCommand::redo()
void BlockReverseCommand::redo_internal()
{
block_->set_media_in(block_->media_out());
block_->set_speed(-block_->speed());
}
void BlockReverseCommand::undo()
void BlockReverseCommand::undo_internal()
{
redo();
redo_internal();
}
+5 -4
View File
@@ -3,12 +3,12 @@
#include <QCheckBox>
#include <QDialog>
#include <QUndoCommand>
#include "node/block/clip/clip.h"
#include "node/output/track/track.h"
#include "widget/slider/floatslider.h"
#include "widget/slider/timeslider.h"
#include "undo/undocommand.h"
class SpeedDurationDialog : public QDialog
{
@@ -44,12 +44,13 @@ private slots:
void DurationChanged();
};
class BlockReverseCommand : public QUndoCommand {
class BlockReverseCommand : public UndoCommand {
public:
BlockReverseCommand(Block* block, QUndoCommand* parent = nullptr);
virtual void redo() override;
virtual void undo() override;
protected:
virtual void redo_internal() override;
virtual void undo_internal() override;
private:
Block* block_;