Merge branch 'master' of https://github.com/olive-editor/olive

app/dialog/CMakeLists.txt

@@ -23,6 +23,7 @@ add_subdirectory(diskcache)
 add_subdirectory(export)
 add_subdirectory(footagerelink)
 add_subdirectory(keyframeproperties)
+add_subdirectory(nodeproperties)
 add_subdirectory(preferences)
 add_subdirectory(progress)
 add_subdirectory(rendercancel)

app/dialog/about/about.cpp

@@ -26,23 +26,33 @@
 #include <QVBoxLayout>
 
 #include "common/qtutils.h"
+#include "config/config.h"
 #include "patreon.h"
 #include "scrollinglabel.h"
 
 namespace olive {
 
-AboutDialog::AboutDialog(QWidget *parent) :
+AboutDialog::AboutDialog(bool welcome_dialog, QWidget *parent) :
   QDialog(parent)
 {
-  setWindowTitle(tr("About %1").arg(QApplication::applicationName()));
+  if (welcome_dialog) {
+    setWindowTitle(tr("Welcome to %1").arg(QApplication::applicationName()));
+  } else {
+    setWindowTitle(tr("About %1").arg(QApplication::applicationName()));
+  }
+
+  QFontMetrics fm = fontMetrics();
 
   QVBoxLayout* layout = new QVBoxLayout(this);
+  layout->setMargin(fm.height());
 
-  layout->addWidget(new QLabel());
+  QHBoxLayout *horiz_layout = new QHBoxLayout();
+  horiz_layout->setMargin(fm.height());
+  horiz_layout->setSpacing(fm.height()*2);
 
   QLabel* icon = new QLabel(QStringLiteral("<html><img src=':/graphics/olive-splash.png'></html>"));
   icon->setAlignment(Qt::AlignCenter);
-  layout->addWidget(icon);
+  horiz_layout->addWidget(icon);
 
   // Construct About text
   QLabel* label =
@@ -58,23 +68,36 @@ AboutDialog::AboutDialog(QWidget *parent) :
                                                          "This software is licensed under the GNU GPL Version 3.")));
 
   // Set text formatting
-  label->setAlignment(Qt::AlignCenter);
+  label->setAlignment(Qt::AlignLeft | Qt::AlignVCenter);
   label->setWordWrap(true);
   label->setOpenExternalLinks(true);
   label->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum);
-  layout->addWidget(label);
+  horiz_layout->addWidget(label);
+
+  layout->addLayout(horiz_layout);
+
+  // Patrons where possible
+  layout->addWidget(new QLabel());
+
+  QString opening_statement;
+
+  if (welcome_dialog || patrons.isEmpty()) {
+    opening_statement = tr("<b>Olive relies on support from the community to continue its development.</b>");
+  } else {
+    opening_statement = tr("Olive wouldn't be possible without the support of gracious donations from the following people.");
+  }
+
+  QLabel* support_lbl = new QLabel(tr("<html>%1 "
+                                        "If you like this project, please consider making a "
+                                        "<a href='https://olivevideoeditor.org/donate.php'>one-time donation</a> or "
+                                        "<a href='https://www.patreon.com/olivevideoeditor'>pledging monthly</a> to "
+                                        "support its development.</html>").arg(opening_statement));
+  support_lbl->setWordWrap(true);
+  support_lbl->setAlignment(Qt::AlignCenter);
+  support_lbl->setOpenExternalLinks(true);
+  layout->addWidget(support_lbl);
 
-  // Patrons where necessary
   if (!patrons.isEmpty()) {
-    layout->addWidget(new QLabel());
-
-    QLabel* support_lbl = new QLabel(tr("<html>Olive wouldn't be possible without the support of gracious "
-                                        "donations from <a href='https://www.patreon.com/olivevideoeditor'>Patreon</a></html>:"));
-    support_lbl->setWordWrap(true);
-    support_lbl->setAlignment(Qt::AlignCenter);
-    support_lbl->setOpenExternalLinks(true);
-    layout->addWidget(support_lbl);
-
     ScrollingLabel* scroll = new ScrollingLabel(patrons);
     scroll->StartAnimating();
     layout->addWidget(scroll);
@@ -82,13 +105,37 @@ AboutDialog::AboutDialog(QWidget *parent) :
 
   layout->addWidget(new QLabel());
 
+  QHBoxLayout *btn_layout = new QHBoxLayout();
+  btn_layout->setMargin(0);
+  btn_layout->setSpacing(0);
+
+  if (welcome_dialog) {
+    dont_show_again_checkbox_ = new QCheckBox(tr("Don't show this message again"));
+    btn_layout->addWidget(dont_show_again_checkbox_);
+  } else {
+    dont_show_again_checkbox_ = nullptr;
+  }
+
   QDialogButtonBox* buttons = new QDialogButtonBox(QDialogButtonBox::Ok, this);
-  buttons->setCenterButtons(true);
-  layout->addWidget(buttons);
+  if (!welcome_dialog) {
+    buttons->setCenterButtons(true);
+  }
+  btn_layout->addWidget(buttons);
+
+  layout->addLayout(btn_layout);
 
   connect(buttons, &QDialogButtonBox::accepted, this, &QDialog::accept);
 
   setFixedSize(sizeHint());
 }
 
+void AboutDialog::accept()
+{
+  if (dont_show_again_checkbox_ && dont_show_again_checkbox_->isChecked()) {
+    Config::Current()[QStringLiteral("ShowWelcomeDialog")] = false;
+  }
+
+  QDialog::accept();
+}
+
 }

app/dialog/about/about.h

@@ -21,6 +21,7 @@
 #ifndef ABOUTDIALOG_H
 #define ABOUTDIALOG_H
 
+#include <QCheckBox>
 #include <QDialog>
 
 #include "common/define.h"
@@ -46,7 +47,14 @@ public:
    *
    * QWidget parent object. Usually this will be MainWindow.
    */
-  explicit AboutDialog(QWidget *parent = nullptr);
+  explicit AboutDialog(bool welcome_dialog, QWidget *parent = nullptr);
+
+public slots:
+  virtual void accept() override;
+
+private:
+  QCheckBox *dont_show_again_checkbox_;
+
 };
 
 }

app/dialog/about/scrollinglabel.cpp

@@ -26,7 +26,7 @@
 
 namespace olive {
 
-const int ScrollingLabel::kMinLineHeight = 5;
+const int ScrollingLabel::kMinLineHeight = 10;
 
 ScrollingLabel::ScrollingLabel(QWidget *parent) :
   QWidget(parent),

app/dialog/nodeproperties/CMakeLists.txt

@@ -0,0 +1,22 @@
+# 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/nodeproperties/nodepropertiesdialog.cpp
+  dialog/nodeproperties/nodepropertiesdialog.h
+  PARENT_SCOPE
+)

app/dialog/nodeproperties/nodepropertiesdialog.cpp

@@ -0,0 +1,74 @@
+/***
+
+  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/>.
+
+***/
+
+#include "nodepropertiesdialog.h"
+
+#include <QDialogButtonBox>
+#include <QHBoxLayout>
+
+#include "core.h"
+#include "widget/nodeview/nodeviewundo.h"
+
+namespace olive {
+
+NodePropertiesDialog::NodePropertiesDialog(Node *node, const rational &timebase, QWidget *parent) :
+  QDialog(parent),
+  node_(node)
+{
+  setWindowTitle(tr("Node Properties"));
+
+  QVBoxLayout *layout = new QVBoxLayout(this);
+
+  QHBoxLayout *label_layout = new QHBoxLayout();
+  label_layout->setMargin(0);
+  layout->addLayout(label_layout);
+
+  label_layout->addWidget(new QLabel(tr("Name:")));
+
+  label_edit_ = new QLineEdit();
+  label_edit_->setText(node->GetLabel());
+  label_layout->addWidget(label_edit_);
+
+  NodeParamViewItem *item = new NodeParamViewItem(node);
+  item->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+  item->SetTimebase(timebase);
+  item->setTitleBarWidget(new QWidget());
+  layout->addWidget(item);
+
+  layout->addStretch();
+
+  QDialogButtonBox *btns = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
+  connect(btns, &QDialogButtonBox::accepted, this, &NodePropertiesDialog::accept);
+  connect(btns, &QDialogButtonBox::rejected, this, &NodePropertiesDialog::reject);
+  layout->addWidget(btns);
+}
+
+void NodePropertiesDialog::accept()
+{
+  if (label_edit_->text() != node_->GetLabel()) {
+    NodeRenameCommand* rename_command = new NodeRenameCommand();
+    rename_command->AddNode(node_, label_edit_->text());
+    Core::instance()->undo_stack()->push(rename_command);
+  }
+
+  QDialog::accept();
+}
+
+}

app/dialog/nodeproperties/nodepropertiesdialog.h

@@ -0,0 +1,52 @@
+/***
+
+  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 NODEPROPERTIESDIALOG_H
+#define NODEPROPERTIESDIALOG_H
+
+#include <QDialog>
+
+#include "widget/nodeparamview/nodeparamviewitem.h"
+
+namespace olive {
+
+class NodePropertiesDialog : public QDialog
+{
+  Q_OBJECT
+public:
+  NodePropertiesDialog(Node *node, const rational &timebase, QWidget *parent = nullptr);
+  NodePropertiesDialog(const QVector<Node *> &node, const rational &timebase, QWidget *parent = nullptr) :
+    NodePropertiesDialog(node.first(), timebase, parent)
+  {
+  }
+
+public slots:
+  virtual void accept() override;
+
+private:
+  Node *node_;
+
+  QLineEdit *label_edit_;
+
+};
+
+}
+
+#endif // NODEPROPERTIESDIALOG_H