diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index ac56a76ec..1fdf229f6 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -76,73 +76,6 @@ target_link_libraries(${OLIVE_TARGET}
OpenColorIO
)
-set(OLIVE_EFFECTS
- effects/internal/cornerpin.frag
- effects/internal/dropshadow.frag
- effects/internal/ocio.frag
- effects/internal/premultiply.frag
- effects/shaders/boxblur.frag
- effects/shaders/boxblur.xml
- effects/shaders/bulge.frag
- effects/shaders/bulge.xml
- effects/shaders/chromaticaberration.frag
- effects/shaders/chromaticaberration.xml
- effects/shaders/crop.frag
- effects/shaders/crop.xml
- effects/shaders/despill.frag
- effects/shaders/despill.xml
- effects/shaders/directionalblur.frag
- effects/shaders/directionalblur.xml
- effects/shaders/flip.frag
- effects/shaders/flip.xml
- effects/shaders/gaussianblur.frag
- effects/shaders/gaussianblur.xml
- effects/shaders/need\ checking/chromakey.frag
- effects/shaders/need\ checking/chromakey.xml
- effects/shaders/need\ checking/colorcorrection.frag
- effects/shaders/need\ checking/colorcorrection.xml
- effects/shaders/need\ checking/colorsel.frag
- effects/shaders/need\ checking/colorsel.xml
- effects/shaders/need\ checking/common.frag
- effects/shaders/need\ checking/crossstitch.frag
- effects/shaders/need\ checking/crossstitch.xml
- effects/shaders/need\ checking/emboss.frag
- effects/shaders/need\ checking/emboss.xml
- effects/shaders/need\ checking/findedges.frag
- effects/shaders/need\ checking/fisheye.frag
- effects/shaders/need\ checking/fisheye.xml
- effects/shaders/need\ checking/huesatbri.frag
- effects/shaders/need\ checking/huesatbri.xml
- effects/shaders/need\ checking/invert.frag
- effects/shaders/need\ checking/invert.xml
- effects/shaders/need\ checking/lumakey.frag
- effects/shaders/need\ checking/lumakey.xml
- effects/shaders/need\ checking/posterize.frag
- effects/shaders/need\ checking/posterize.xml
- effects/shaders/need\ checking/toonify.frag
- effects/shaders/need\ checking/toonify.xml
- effects/shaders/need\ checking/volumetriclight.frag
- effects/shaders/need\ checking/volumetriclight.xml
- effects/shaders/noise.frag
- effects/shaders/noise.xml
- effects/shaders/pixelate.frag
- effects/shaders/pixelate.xml
- effects/shaders/radialblur.frag
- effects/shaders/radialblur.xml
- effects/shaders/ripple.frag
- effects/shaders/ripple.xml
- effects/shaders/sphere.frag
- effects/shaders/sphere.xml
- effects/shaders/swirl.frag
- effects/shaders/swirl.xml
- effects/shaders/tile.frag
- effects/shaders/tile.xml
- effects/shaders/vignette.frag
- effects/shaders/vignette.xml
- effects/shaders/wave.frag
- effects/shaders/wave.xml
-)
-
set(OLIVE_TS_FILES
ts/olive_ar.ts
ts/olive_bs.ts
diff --git a/app/core.cpp b/app/core.cpp
index c49c063b7..e8cb53e6d 100644
--- a/app/core.cpp
+++ b/app/core.cpp
@@ -145,7 +145,7 @@ void Core::SetTool(const olive::tool::Tool &tool)
emit ToolChanged(tool_);
}
-void Core::StartImportFootage()
+void Core::DialogImportShow()
{
// Open dialog for user to select files
QStringList files = QFileDialog::getOpenFileNames(main_window_,
diff --git a/app/core.h b/app/core.h
index 1734ab5ca..42cdc8078 100644
--- a/app/core.h
+++ b/app/core.h
@@ -107,7 +107,7 @@ public slots:
/**
* @brief Open the import footage dialog and import the files selected (runs ImportFiles())
*/
- void StartImportFootage();
+ void DialogImportShow();
/**
* @brief Create a new folder in the currently active project
diff --git a/app/panel/project/project.cpp b/app/panel/project/project.cpp
index 7203d92e6..9c34aa5ab 100644
--- a/app/panel/project/project.cpp
+++ b/app/panel/project/project.cpp
@@ -112,7 +112,7 @@ void ProjectPanel::ItemDoubleClickSlot(Item *item)
{
if (item == nullptr) {
// If the user double clicks on empty space, show the import dialog
- olive::core.StartImportFootage();
+ olive::core.DialogImportShow();
}
// FIXME: Double click Item should do something
diff --git a/app/project/item/CMakeLists.txt b/app/project/item/CMakeLists.txt
index 457197f1b..98dbe8b5e 100644
--- a/app/project/item/CMakeLists.txt
+++ b/app/project/item/CMakeLists.txt
@@ -16,6 +16,7 @@
add_subdirectory(folder)
add_subdirectory(footage)
+add_subdirectory(sequence)
set(OLIVE_SOURCES
${OLIVE_SOURCES}
diff --git a/app/project/item/sequence/CMakeLists.txt b/app/project/item/sequence/CMakeLists.txt
new file mode 100644
index 000000000..0c4b43b22
--- /dev/null
+++ b/app/project/item/sequence/CMakeLists.txt
@@ -0,0 +1,23 @@
+# Olive - Non-Linear Video Editor
+# Copyright (C) 2019 Olive Team
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see .
+
+
+set(OLIVE_SOURCES
+ ${OLIVE_SOURCES}
+ project/item/sequence/sequence.h
+ project/item/sequence/sequence.cpp
+ PARENT_SCOPE
+)
diff --git a/app/project/item/sequence/sequence.cpp b/app/project/item/sequence/sequence.cpp
new file mode 100644
index 000000000..37660c51f
--- /dev/null
+++ b/app/project/item/sequence/sequence.cpp
@@ -0,0 +1,33 @@
+/***
+
+ Olive - Non-Linear Video Editor
+ Copyright (C) 2019 Olive Team
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see .
+
+***/
+
+#include "sequence.h"
+
+#include "ui/icons/icons.h"
+
+Sequence::Sequence()
+{
+ set_icon(olive::icon::Sequence);
+}
+
+Item::Type Sequence::type() const
+{
+ return kSequence;
+}
diff --git a/app/project/item/sequence/sequence.h b/app/project/item/sequence/sequence.h
new file mode 100644
index 000000000..76b420d90
--- /dev/null
+++ b/app/project/item/sequence/sequence.h
@@ -0,0 +1,34 @@
+/***
+
+ Olive - Non-Linear Video Editor
+ Copyright (C) 2019 Olive Team
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see .
+
+***/
+
+#ifndef SEQUENCE_H
+#define SEQUENCE_H
+
+#include "project/item/item.h"
+
+class Sequence : public Item
+{
+public:
+ Sequence();
+
+ virtual Type type() const override;
+};
+
+#endif // SEQUENCE_H
diff --git a/app/ui/icons/icons.cpp b/app/ui/icons/icons.cpp
index 3fe21f526..ab90ef57d 100644
--- a/app/ui/icons/icons.cpp
+++ b/app/ui/icons/icons.cpp
@@ -54,6 +54,7 @@ QIcon olive::icon::ToolSlide;
QIcon olive::icon::ToolHand;
QIcon olive::icon::ToolTransition;
QIcon olive::icon::Folder;
+QIcon olive::icon::Sequence;
QIcon olive::icon::Video;
QIcon olive::icon::Audio;
QIcon olive::icon::Image;
@@ -94,6 +95,7 @@ void olive::icon::LoadAll()
ToolTransition = Create("transition-tool");
Folder = Create("folder");
+ Sequence = Create("sequence");
Video = Create("videosource");
Audio = Create("audiosource");
Image = Create("imagesource");
diff --git a/app/ui/icons/icons.h b/app/ui/icons/icons.h
index df362e44d..1e052a7cb 100644
--- a/app/ui/icons/icons.h
+++ b/app/ui/icons/icons.h
@@ -57,6 +57,7 @@ extern QIcon ToolTransition;
// Project Icons
extern QIcon Folder;
+extern QIcon Sequence;
extern QIcon Video;
extern QIcon Audio;
extern QIcon Image;
diff --git a/app/window/mainwindow/mainmenu.cpp b/app/window/mainwindow/mainmenu.cpp
index 85bd9fd66..c07ee06a1 100644
--- a/app/window/mainwindow/mainmenu.cpp
+++ b/app/window/mainwindow/mainmenu.cpp
@@ -43,7 +43,7 @@ MainMenu::MainMenu(QWidget *parent) :
file_save_item_ = file_menu_->AddItem("saveproj", nullptr, nullptr, "Ctrl+S");
file_save_as_item_ = file_menu_->AddItem("saveprojas", nullptr, nullptr, "Ctrl+Shift+S");
file_menu_->addSeparator();
- file_import_item_ = file_menu_->AddItem("import", &olive::core, SLOT(StartImportFootage()), "Ctrl+I");
+ file_import_item_ = file_menu_->AddItem("import", &olive::core, SLOT(DialogImportShow()), "Ctrl+I");
file_menu_->addSeparator();
file_export_item_ = file_menu_->AddItem("export", nullptr, nullptr, "Ctrl+M");
file_menu_->addSeparator();
diff --git a/history/history.db b/history/history.db
new file mode 100644
index 000000000..072800304
Binary files /dev/null and b/history/history.db differ