Add the possibility to create custom GLSL filters and use them as nodes.

app/config/config.cpp

@@ -164,6 +164,18 @@ void Config::SetDefaults()
   SetEntryInternal(QStringLiteral("OfflinePixelFormat"), NodeValue::kInt, PixelFormat::F16);
 
   SetEntryInternal(QStringLiteral("MarkerColor"), NodeValue::kInt, ColorCoding::kLime);
+
+  // Code editor
+  SetEntryInternal(QStringLiteral("EditorUseInternal"), NodeValue::kBoolean, true);
+
+  SetEntryInternal(QStringLiteral("EditorExternalCommand"), NodeValue::kText, QString());
+  SetEntryInternal(QStringLiteral("EditorExternalParams"), NodeValue::kText, QString());
+  SetEntryInternal(QStringLiteral("EditorExternalTempFolder"), NodeValue::kText,
+                   QStandardPaths::standardLocations( QStandardPaths::TempLocation).at(0));
+  SetEntryInternal(QStringLiteral("EditorInternalFontSize"), NodeValue::kInt, 14);
+  SetEntryInternal(QStringLiteral("EditorInternalIndentSize"), NodeValue::kInt, 3);
+  SetEntryInternal(QStringLiteral("EditorInternalWindowWidth"), NodeValue::kInt, 800);
+  SetEntryInternal(QStringLiteral("EditorInternalWindowHeight"), NodeValue::kInt, 600);
 }
 
 void Config::Load()

app/dialog/CMakeLists.txt

@@ -17,6 +17,7 @@
 add_subdirectory(about)
 add_subdirectory(actionsearch)
 add_subdirectory(autorecovery)
+add_subdirectory(codeeditor)
 add_subdirectory(color)
 add_subdirectory(configbase)
 add_subdirectory(diskcache)

app/dialog/codeeditor/CMakeLists.txt

@@ -0,0 +1,32 @@
+# Olive - Non-Linear Video Editor
+# Copyright (C) 2021 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}
+  dialog/codeeditor/editor.h
+  dialog/codeeditor/editor.cpp
+  dialog/codeeditor/glslhighlighter.h
+  dialog/codeeditor/glslhighlighter.cpp
+  dialog/codeeditor/codeeditordialog.h
+  dialog/codeeditor/codeeditordialog.cpp
+  dialog/codeeditor/externaleditorproxy.h
+  dialog/codeeditor/externaleditorproxy.cpp
+  dialog/codeeditor/searchtextbar.h
+  dialog/codeeditor/searchtextbar.cpp
+  dialog/codeeditor/messagehighlighter.h
+  dialog/codeeditor/messagehighlighter.cpp
+  PARENT_SCOPE
+)

app/dialog/codeeditor/codeeditordialog.cpp

@@ -0,0 +1,162 @@
+#include "codeeditordialog.h"
+#include "searchtextbar.h"
+
+#include <QBoxLayout>
+#include <QDialogButtonBox>
+#include <QMenuBar>
+#include <QClipboard>
+#include <QGuiApplication>
+#include <QTextDocumentFragment>
+
+
+namespace olive {
+
+CodeEditorDialog::CodeEditorDialog(const QString &start, QWidget* parent) :
+  QDialog(parent)
+{
+  QVBoxLayout* layout = new QVBoxLayout(this);
+
+  // Create text edit widget
+  text_edit_ = new CodeEditor( this);
+  text_edit_->document()->setPlainText(start);
+  text_edit_->gotoLineNumber(1);
+  layout->addWidget(text_edit_);
+
+  // Create buttons
+  QDialogButtonBox* buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
+  layout->addWidget(buttons);
+  connect(buttons, &QDialogButtonBox::accepted, this, &CodeEditorDialog::accept);
+  connect(buttons, &QDialogButtonBox::rejected, this, &CodeEditorDialog::reject);
+
+  // this does not work on all platforms
+  setWindowFlag( Qt::WindowMaximizeButtonHint, true);
+
+  QMenuBar * menu_bar = new QMenuBar( text_edit_);
+  QMenu * edit_menu = new QMenu(tr("Edit"), text_edit_);
+  QMenu * edit_addSnippet_menu = new QMenu(tr("add input"), text_edit_);
+
+  edit_menu->addMenu( edit_addSnippet_menu);
+  menu_bar->addMenu( edit_menu);
+
+  QAction * add_texture_input = edit_addSnippet_menu->addAction(tr("texture"));
+  QAction * add_color_input = edit_addSnippet_menu->addAction(tr("color"));
+  QAction * add_float_input = edit_addSnippet_menu->addAction(tr("float"));
+  QAction * add_int_input = edit_addSnippet_menu->addAction(tr("integer"));
+  QAction * add_boolean_input = edit_addSnippet_menu->addAction(tr("boolean"));
+  QAction * add_selection_input = edit_addSnippet_menu->addAction(tr("selection"));
+  QAction * add_point_input = edit_addSnippet_menu->addAction(tr("point"));
+
+  connect( add_texture_input, &QAction::triggered, this, &CodeEditorDialog::OnActionAddInputTexture);
+  connect( add_color_input, &QAction::triggered, this, &CodeEditorDialog::OnActionAddInputColor);
+  connect( add_float_input, &QAction::triggered, this, &CodeEditorDialog::OnActionAddInputFloat);
+  connect( add_int_input, &QAction::triggered, this, &CodeEditorDialog::OnActionAddInputInt);
+  connect( add_boolean_input, &QAction::triggered, this, &CodeEditorDialog::OnActionAddInputBoolean);
+  connect( add_selection_input, &QAction::triggered, this, &CodeEditorDialog::OnActionAddInputSelection);
+  connect( add_point_input, &QAction::triggered, this, &CodeEditorDialog::OnActionAddInputPoint);
+
+  search_bar_ = new SearchTextBar( this);
+  search_bar_->hide();
+  layout->addWidget( search_bar_);
+
+  QAction * show_find_dialog = edit_menu->addAction(tr("find/replace"));
+  show_find_dialog->setShortcut( QKeySequence(Qt::CTRL | Qt::Key_F));
+
+  connect( show_find_dialog, &QAction::triggered, this, &CodeEditorDialog::OnFindRequest);
+
+  connect( search_bar_, &SearchTextBar::searchTextForward, text_edit_, &CodeEditor::onSearchForwardRequest);
+  connect( search_bar_, &SearchTextBar::searchTextBackward, text_edit_, &CodeEditor::onSearchBackwardRequest);
+  connect( search_bar_, &SearchTextBar::replaceText, text_edit_, &CodeEditor::onReplaceTextRequest);
+
+  connect( text_edit_, &CodeEditor::textNotFound, search_bar_, &SearchTextBar::onTextNotFound);
+
+  layout->setMenuBar( menu_bar);
+}
+
+void CodeEditorDialog::OnActionAddInputTexture()
+{
+  text_edit_->insertPlainText(
+        "//OVE name: my input\n"
+        "//OVE type: TEXTURE\n"
+        "//OVE flag: NOT_KEYFRAMABLE\n"
+        "//OVE description: \n"
+        "uniform sampler2D my_input;\n");
+}
+
+void CodeEditorDialog::OnActionAddInputColor()
+{
+  text_edit_->insertPlainText(
+        "//OVE name: my color\n"
+        "//OVE type: COLOR\n"
+        "//OVE default: RGBA(0.5, 0.5, 1,  1)\n"
+        "//OVE description: \n"
+        "uniform vec4 my_color;\n");
+}
+
+void CodeEditorDialog::OnActionAddInputFloat()
+{
+  text_edit_->insertPlainText(
+        "//OVE name: my float\n"
+        "//OVE type: FLOAT\n"
+        "//OVE flag: NOT_CONNECTABLE\n"
+        "//OVE min: 0.0\n"
+        "//OVE max: 3.0\n"
+        "//OVE default: 1.0\n"
+        "//OVE description: \n"
+        "uniform float my_float;\n");
+}
+
+void CodeEditorDialog::OnActionAddInputInt()
+{
+  text_edit_->insertPlainText(
+        "//OVE name: my int\n"
+        "//OVE type: INTEGER\n"
+        "//OVE flag: NOT_CONNECTABLE\n"
+        "//OVE min: -10\n"
+        "//OVE max: 10\n"
+        "//OVE default: 0\n"
+        "//OVE description:\n"
+        "uniform int my_int;\n");
+}
+
+void CodeEditorDialog::OnActionAddInputBoolean()
+{
+  text_edit_->insertPlainText(
+        "//OVE name: my boolean\n"
+        "//OVE type: BOOLEAN\n"
+        "//OVE flag: NOT_CONNECTABLE, NOT_KEYFRAMABLE\n"
+        "//OVE default: false\n"
+        "//OVE description: \n"
+        "uniform bool my_bool;\n");
+}
+
+void CodeEditorDialog::OnActionAddInputSelection()
+{
+  text_edit_->insertPlainText(
+        "//OVE name: my selection\n"
+        "//OVE type: SELECTION\n"
+        "//OVE values: \"FIRST CHOICE\", \"SECOND CHOICE\"\n"
+        "//OVE default: 0\n"
+        "//OVE description: \n"
+        "uniform int my_selection;\n");
+}
+
+void CodeEditorDialog::OnActionAddInputPoint()
+{
+  text_edit_->insertPlainText(
+        "//OVE name: my point\n"
+        "//OVE type: POINT\n"
+        "//OVE shape: SQUARE\n"
+        "//OVE default: (0.4, 0.2)\n"
+        "//OVE description: \n"
+        "uniform vec2 my_point;\n");
+}
+
+void CodeEditorDialog::OnFindRequest()
+{
+  QString text_to_find = text_edit_->textCursor().selection().toPlainText();
+  search_bar_->showBar( text_to_find);
+}
+
+
+}  // namespace olive
+

app/dialog/codeeditor/codeeditordialog.h

@@ -0,0 +1,60 @@
+/***
+
+  Olive - Non-Linear Video Editor
+  Copyright (C) 2021 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 CODEEDITORDIALOG_H
+#define CODEEDITORDIALOG_H
+
+#include <QDialog>
+#include "dialog/codeeditor/editor.h"
+
+namespace olive {
+
+class SearchTextBar;
+
+
+/// @brief Wrapper QDialog window for the code editor
+class CodeEditorDialog : public QDialog
+{
+  Q_OBJECT
+public:
+  CodeEditorDialog(const QString &start, QWidget* parent = nullptr);
+
+  QString text() const
+  {
+    return text_edit_->toPlainText();
+  }
+
+private:
+  CodeEditor* text_edit_;
+  SearchTextBar * search_bar_;
+
+private slots:
+  void OnActionAddInputTexture();
+  void OnActionAddInputColor();
+  void OnActionAddInputFloat();
+  void OnActionAddInputInt();
+  void OnActionAddInputBoolean();
+  void OnActionAddInputSelection();
+  void OnActionAddInputPoint();
+  void OnFindRequest();
+};
+
+}  // namespace olive
+
+#endif // CODEEDITORDIALOG_H