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

progress on sequence editing

Browse Source
This commit is contained in:
itsmattkc
2018-10-12 20:41:22 +11:00
parent cdbec85a81
commit 2e577330b9
8 changed files with 113 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dialogs/newsequencedialog.cpp
+19 -10
View File
@@ -5,6 +5,8 @@
#include "panels/project.h"
#include "project/sequence.h"
#include "project/undo.h"
#include "panels/timeline.h"
#include "playback/playback.h"
#include <QVariant>
#include <QDebug>
@@ -74,21 +76,28 @@ void NewSequenceDialog::showEvent(QShowEvent *) {
}
void NewSequenceDialog::on_buttonBox_accepted() {
Sequence* s = (existing_sequence != NULL) ? existing_sequence : new Sequence();
s->name = ui->lineEdit->text();
s->width = ui->width_numeric->value();
s->height = ui->height_numeric->value();
s->frame_rate = ui->frame_rate_combobox->currentData().toDouble();
s->audio_frequency = ui->audio_frequency_combobox->currentData().toInt();
s->audio_layout = AV_CH_LAYOUT_STEREO;
if (existing_sequence == NULL) {
Sequence* s = new Sequence();
s->name = ui->lineEdit->text();
s->width = ui->width_numeric->value();
s->height = ui->height_numeric->value();
s->frame_rate = ui->frame_rate_combobox->currentData().toDouble();
s->audio_frequency = ui->audio_frequency_combobox->currentData().toInt();
s->audio_layout = AV_CH_LAYOUT_STEREO;
ComboAction* ca = new ComboAction();
panel_project->new_sequence(ca, s, true, NULL);
undo_stack.push(ca);
} else {
// TODO make editing undoable
EditSequenceCommand* esc = new EditSequenceCommand(existing_item, existing_sequence);
esc->name = ui->lineEdit->text();
esc->width = ui->width_numeric->value();
esc->height = ui->height_numeric->value();
esc->frame_rate = ui->frame_rate_combobox->currentData().toDouble();
esc->audio_frequency = ui->audio_frequency_combobox->currentData().toInt();
esc->audio_layout = AV_CH_LAYOUT_STEREO;
undo_stack.push(esc);
}
}
dialogs/newsequencedialog.h
+2 -1
View File
@@ -4,6 +4,7 @@
#include <QDialog>
class Project;
class QTreeWidgetItem;
struct Sequence;
namespace Ui {
@@ -18,6 +19,7 @@ public:
explicit NewSequenceDialog(QWidget *parent = 0);
~NewSequenceDialog();
Sequence* existing_sequence;
QTreeWidgetItem* existing_item;
void set_sequence_name(const QString& s);
protected:
@@ -25,7 +27,6 @@ protected:
private slots:
void on_buttonBox_accepted();
void on_comboBox_currentIndexChanged(int index);
private: