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

added saving/restoring state of panels and completed nested sequences

Browse Source
This commit is contained in:
itsmattkc
2018-11-15 11:35:54 +11:00
parent 52cbd3e4fb
commit 8ce6473839
5 changed files with 106 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mainwindow.cpp
+81 -36
View File
@@ -3,6 +3,7 @@
#include "io/config.h"
#include "io/path.h"
#include "io/media.h"
#include "project/sequence.h"
@@ -55,19 +56,31 @@ void MainWindow::setup_layout() {
panel_sequence_viewer->show();
panel_timeline->show();
addDockWidget(Qt::TopDockWidgetArea, panel_project);
addDockWidget(Qt::TopDockWidgetArea, panel_footage_viewer);
tabifyDockWidget(panel_footage_viewer, panel_effect_controls);
panel_footage_viewer->raise();
addDockWidget(Qt::TopDockWidgetArea, panel_sequence_viewer);
addDockWidget(Qt::BottomDockWidgetArea, panel_timeline);
bool load_default = true;
QFile panel_config(get_data_path() + "/layout");
if (panel_config.exists() && panel_config.open(QFile::ReadOnly)) {
if (restoreState(panel_config.readAll(), 0)) {
load_default = false;
}
panel_config.close();
}
if (load_default) {
addDockWidget(Qt::TopDockWidgetArea, panel_project);
addDockWidget(Qt::TopDockWidgetArea, panel_footage_viewer);
tabifyDockWidget(panel_footage_viewer, panel_effect_controls);
panel_footage_viewer->raise();
addDockWidget(Qt::TopDockWidgetArea, panel_sequence_viewer);
addDockWidget(Qt::BottomDockWidgetArea, panel_timeline);
// workaround for strange Qt dock bug (see https://bugreports.qt.io/browse/QTBUG-65592)
#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
resizeDocks({panel_project}, {40}, Qt::Horizontal);
#endif
}
layout()->update();
// workaround for strange Qt dock bug (see https://bugreports.qt.io/browse/QTBUG-65592)
#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
resizeDocks({panel_project}, {40}, Qt::Horizontal);
#endif
}
MainWindow::MainWindow(QWidget *parent) :
@@ -213,7 +226,17 @@ MainWindow::~MainWindow() {
}
}
if (!config_dir.isEmpty()) {
// save settings
config.save(config_dir);
// save panel layout
QFile panel_config(data_dir + "/layout");
if (panel_config.open(QFile::WriteOnly)) {
panel_config.write(saveState(0));
panel_config.close();
} else {
dout << "[ERROR] Failed to save layout";
}
}
stop_audio();
@@ -302,24 +325,20 @@ void MainWindow::on_actionExport_triggered()
}
}
void MainWindow::on_actionProject_2_toggled(bool arg1)
{
panel_project->setVisible(arg1);
void MainWindow::on_actionProject_2_triggered() {
panel_project->setVisible(!panel_project->isVisible());
}
void MainWindow::on_actionEffect_Controls_toggled(bool arg1)
{
panel_effect_controls->setVisible(arg1);
void MainWindow::on_actionEffect_Controls_triggered() {
panel_effect_controls->setVisible(!panel_effect_controls->isVisible());
}
void MainWindow::on_actionViewer_toggled(bool arg1)
{
panel_sequence_viewer->setVisible(arg1);
void MainWindow::on_actionViewer_triggered() {
panel_sequence_viewer->setVisible(!panel_sequence_viewer->isVisible());
}
void MainWindow::on_actionTimeline_toggled(bool arg1)
{
panel_timeline->setVisible(arg1);
void MainWindow::on_actionTimeline_triggered() {
panel_timeline->setVisible(!panel_timeline->isVisible());
}
void MainWindow::on_actionRipple_Delete_triggered()
@@ -611,6 +630,7 @@ void MainWindow::windowMenu_About_To_Be_Shown() {
ui->actionEffect_Controls->setChecked(panel_effect_controls->isVisible());
ui->actionTimeline->setChecked(panel_timeline->isVisible());
ui->actionViewer->setChecked(panel_sequence_viewer->isVisible());
ui->actionFootage_Viewer->setChecked(panel_footage_viewer->isVisible());
}
void MainWindow::viewMenu_About_To_Be_Shown() {
@@ -896,21 +916,26 @@ void MainWindow::on_actionEdit_to_Out_Point_triggered() {
}
void MainWindow::on_actionNest_triggered() {
if (sequence != NULL) {
QVector<Clip*> selected_clips;
long earliest_point = LONG_MAX;
if (sequence != NULL) {
QVector<int> selected_clips;
long earliest_point = LONG_MAX;
// get selected clips
for (int i=0;i<sequence->clips.size();i++) {
Clip* c = sequence->clips.at(i);
if (c != NULL && panel_timeline->is_clip_selected(c, true)) {
selected_clips.append(c);
earliest_point = qMin(c->timeline_in, earliest_point);
sequence->clips[i] = NULL; // make undoable
selected_clips.append(i);
earliest_point = qMin(c->timeline_in, earliest_point);
}
}
// nest them
if (!selected_clips.isEmpty()) {
ComboAction* ca = new ComboAction();
Sequence* s = new Sequence();
// create "nest" sequence
s->name = panel_project->get_next_sequence_name("Nested Sequence");
s->width = sequence->width;
s->height = sequence->height;
@@ -918,15 +943,31 @@ void MainWindow::on_actionNest_triggered() {
s->audio_frequency = sequence->audio_frequency;
s->audio_layout = sequence->audio_layout;
// copy all selected clips to the nest
for (int i=0;i<selected_clips.size();i++) {
Clip* c = selected_clips.at(i);
s->clips.append(c);
// delete clip from old sequence
ca->append(new DeleteClipAction(sequence, selected_clips.at(i)));
// copy to new
Clip* copy = sequence->clips.at(selected_clips.at(i))->copy(s);
copy->timeline_in -= earliest_point;
copy->timeline_out -= earliest_point;
s->clips.append(copy);
}
ComboAction* ca = new ComboAction();
panel_project->new_sequence(ca, s, true, NULL);
undo_stack.push(ca);
}
// add sequence to project
panel_project->new_sequence(ca, s, false, NULL);
// add nested sequence to active sequence
QVector<void*> media_list = {s};
QVector<int> type_list = {MEDIA_TYPE_SEQUENCE};
panel_timeline->create_ghosts_from_media(sequence, earliest_point, media_list, type_list);
panel_timeline->add_clips_from_ghosts(ca, sequence);
undo_stack.push(ca);
update_ui(true);
}
}
}
@@ -937,3 +978,7 @@ void MainWindow::on_actionToggle_Show_All_triggered() {
void MainWindow::on_actionEnable_Drop_on_Media_to_Replace_triggered() {
config.drop_on_media_to_replace = !config.drop_on_media_to_replace;
}
void MainWindow::on_actionFootage_Viewer_triggered() {
panel_footage_viewer->setVisible(!panel_footage_viewer->isVisible());
}
mainwindow.h
+7 -6
View File
@@ -29,6 +29,7 @@ public slots:
void cut();
void copy();
void paste();
void on_actionNest_triggered();
protected:
void closeEvent(QCloseEvent *);
@@ -53,13 +54,13 @@ private slots:
void on_actionExport_triggered();
void on_actionProject_2_toggled(bool arg1);
void on_actionProject_2_triggered();
void on_actionEffect_Controls_toggled(bool arg1);
void on_actionEffect_Controls_triggered();
void on_actionViewer_toggled(bool arg1);
void on_actionViewer_triggered();
void on_actionTimeline_toggled(bool arg1);
void on_actionTimeline_triggered();
void on_actionRipple_Delete_triggered();
@@ -197,12 +198,12 @@ private slots:
void on_actionEdit_to_Out_Point_triggered();
void on_actionNest_triggered();
void on_actionToggle_Show_All_triggered();
void on_actionEnable_Drop_on_Media_to_Replace_triggered();
void on_actionFootage_Viewer_triggered();
private:
Ui::MainWindow *ui;
void setup_layout();
mainwindow.ui
+11 -2
View File
@@ -33,7 +33,7 @@
<x>0</x>
<y>0</y>
<width>653</width>
<height>25</height>
<height>16</height>
</rect>
</property>
<widget class="QMenu" name="menu_File">
@@ -107,6 +107,7 @@
</property>
<addaction name="actionProject_2"/>
<addaction name="actionEffect_Controls"/>
<addaction name="actionFootage_Viewer"/>
<addaction name="actionViewer"/>
<addaction name="actionTimeline"/>
<addaction name="separator"/>
@@ -370,7 +371,7 @@
<bool>true</bool>
</property>
<property name="text">
<string>Viewer</string>
<string>Sequence Viewer</string>
</property>
</action>
<action name="actionTimeline">
@@ -866,6 +867,14 @@
<string>Enable Drop File on Media to Replace</string>
</property>
</action>
<action name="actionFootage_Viewer">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>Footage Viewer</string>
</property>
</action>
</widget>
<layoutdefault spacing="6" margin="11"/>
<resources/>
project/undo.cpp
+4 -2
View File
@@ -115,8 +115,10 @@ void DeleteClipAction::undo() {
void DeleteClipAction::redo() {
// remove ref to clip
ref = seq->clips.at(index);
close_clip(ref);
if (ref->multithreaded) ref->cacher->wait();
if (ref->open) {
close_clip(ref);
if (ref->multithreaded) ref->cacher->wait();
}
seq->clips[index] = NULL;
// delete link to this clip
ui/timelinewidget.cpp
+3
View File
@@ -144,6 +144,9 @@ void TimelineWidget::show_context_menu(const QPoint& pos) {
autoscaleAction->setCheckable(true);
connect(autoscaleAction, SIGNAL(triggered(bool)), this, SLOT(toggle_autoscale()));
QAction* nestAction = menu.addAction("&Nest");
connect(nestAction, SIGNAL(triggered(bool)), mainWindow, SLOT(on_actionNest_triggered()));
// set autoscale arbitrarily to the first selected clip
autoscaleAction->setChecked(selected_clips.at(0)->autoscale);