created sequence type and removed old install code

This commit is contained in:
itsmattkc
2019-07-09 10:04:20 -05:00
parent ce1e189a3d
commit 9d7623d36f
12 changed files with 98 additions and 71 deletions
-67
View File
@@ -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
+1 -1
View File
@@ -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_,
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1
View File
@@ -16,6 +16,7 @@
add_subdirectory(folder)
add_subdirectory(footage)
add_subdirectory(sequence)
set(OLIVE_SOURCES
${OLIVE_SOURCES}
+23
View File
@@ -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 <http://www.gnu.org/licenses/>.
set(OLIVE_SOURCES
${OLIVE_SOURCES}
project/item/sequence/sequence.h
project/item/sequence/sequence.cpp
PARENT_SCOPE
)
+33
View File
@@ -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 <http://www.gnu.org/licenses/>.
***/
#include "sequence.h"
#include "ui/icons/icons.h"
Sequence::Sequence()
{
set_icon(olive::icon::Sequence);
}
Item::Type Sequence::type() const
{
return kSequence;
}
+34
View File
@@ -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 <http://www.gnu.org/licenses/>.
***/
#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
+2
View File
@@ -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");
+1
View File
@@ -57,6 +57,7 @@ extern QIcon ToolTransition;
// Project Icons
extern QIcon Folder;
extern QIcon Sequence;
extern QIcon Video;
extern QIcon Audio;
extern QIcon Image;
+1 -1
View File
@@ -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();
Binary file not shown.