completed node 'add' menu

app/node/CMakeLists.txt

@@ -38,8 +38,6 @@ set(OLIVE_SOURCES
   node/inputarray.cpp
   node/keyframe.h
   node/keyframe.cpp
-  node/menu.h
-  node/menu.cpp
   node/node.h
   node/node.cpp
   node/output.h

app/node/factory.cpp

@@ -13,6 +13,8 @@
 #include "output/track/track.h"
 #include "output/viewer/viewer.h"
 
+QList<Node*> NodeFactory::library_;
+
 void NodeFactory::Initialize()
 {
   Destroy();
@@ -40,7 +42,7 @@ Menu *NodeFactory::CreateMenu()
 
     QStringList path = n->Category().split('/');
 
-    QMenu* destination = menu;
+    Menu* destination = menu;
 
     // Find destination menu based on category hierarchy
     foreach (const QString& dir_name, path) {
@@ -53,8 +55,8 @@ Menu *NodeFactory::CreateMenu()
       bool found_cat = false;
       QList<QAction*> menu_actions = destination->actions();
       foreach (QAction* action, menu_actions) {
-        if (action->text() == dir_name && action->menu()) {
-          destination = action->menu();
+        if (action->menu() && action->menu()->title() == dir_name) {
+          destination = static_cast<Menu*>(action->menu());
           found_cat = true;
           break;
         }
@@ -62,14 +64,14 @@ Menu *NodeFactory::CreateMenu()
 
       // Create menu here if it doesn't exist
       if (!found_cat) {
-        Menu* new_category = new Menu();
-        destination->addMenu(new_category);
+        Menu* new_category = new Menu(dir_name);
+        destination->InsertAlphabetically(new_category);
         destination = new_category;
       }
     }
 
     // Add entry to menu
-    QAction* a = destination->addAction(n->Name());
+    QAction* a = destination->InsertAlphabetically(n->Name());
     a->setToolTip(n->Description());
   }
 

app/node/factory.h

@@ -10,18 +10,18 @@ class NodeFactory
 {
 public:
   enum InternalID {
-    kAlphaOverBlend,
+    kViewerOutput,
     kClipBlock,
     kGapBlock,
+    kAlphaOverBlend,
+    kSolidGenerator,
+    kAudioInput,
+    kTransformDistort,
     kTransitionBlock,
     kOpacity,
-    kTransformDistort,
-    kSolidGenerator,
     kVideoInput,
-    kAudioInput,
     kTimelineOutput,
     kTrackOutput,
-    kViewerOutput,
 
     // Count value
     kInternalNodeCount
@@ -33,8 +33,6 @@ public:
 
   static void Destroy();
 
-  static void Create(const Entry& create_info);
-
   static Menu* CreateMenu();
 
 private:

app/node/menu.cpp

@@ -1,28 +0,0 @@
-/***
-
-  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 "menu.h"
-
-#include "blend/alphaover/alphaover.h"
-
-NodeMenu::NodeMenu(QWidget *parent) :
-  QMenu(parent)
-{
-}

app/node/menu.h

@@ -1,38 +0,0 @@
-/***
-
-  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 NODEMENU_H
-#define NODEMENU_H
-
-#include <QMenu>
-
-#include "node.h"
-
-class NodeMenu : public QMenu
-{
-public:
-  NodeMenu(QWidget* parent = nullptr);
-
-private:
-
-
-};
-
-#endif // NODEMENU_H

app/widget/menu/menu.cpp

@@ -47,6 +47,11 @@ Menu::Menu(QWidget *parent) :
 {
 }
 
+Menu::Menu(const QString &s, QWidget *parent) :
+  QMenu(s, parent)
+{
+}
+
 QAction *Menu::AddItem(const QString &id,
                        const QObject *receiver,
                        const char *member,
@@ -59,6 +64,34 @@ QAction *Menu::AddItem(const QString &id,
   return a;
 }
 
+QAction* Menu::InsertAlphabetically(const QString &s)
+{
+  QAction* action = new QAction(s);
+  InsertAlphabetically(action);
+  return action;
+}
+
+void Menu::InsertAlphabetically(QAction *entry)
+{
+  QList<QAction*> actions = this->actions();
+
+  foreach (QAction* action, actions) {
+    if (action->text() > entry->text()) {
+      insertAction(action, entry);
+      return;
+    }
+  }
+
+  addAction(entry);
+}
+
+void Menu::InsertAlphabetically(Menu *menu)
+{
+  QAction* action = new QAction(menu->title());
+  action->setMenu(menu);
+  InsertAlphabetically(action);
+}
+
 QAction *Menu::CreateItem(QObject* parent,
                           const QString &id,
                           const QObject *receiver,

app/widget/menu/menu.h

@@ -63,6 +63,11 @@ public:
    */
   Menu(QWidget* parent = nullptr);
 
+  /**
+   * @brief Construct a popup menu
+   */
+  Menu(const QString& s, QWidget* parent = nullptr);
+
   /**
    * @brief Create a menu item and add it to this menu
    *
@@ -91,6 +96,10 @@ public:
                    const char* member,
                    const QString &key = QString());
 
+  QAction *InsertAlphabetically(const QString& s);
+  void InsertAlphabetically(QAction* entry);
+  void InsertAlphabetically(Menu* menu);
+
   /**
    * @brief Create a menu item
    *

app/widget/nodeview/nodeview.cpp

@@ -20,16 +20,19 @@
 
 #include "nodeview.h"
 
+#include "node/factory.h"
+
 NodeView::NodeView(QWidget *parent) :
   QGraphicsView(parent),
   graph_(nullptr)
 {
   setScene(&scene_);
-
   setDragMode(RubberBandDrag);
+  setContextMenuPolicy(Qt::CustomContextMenu);
 
   connect(&scene_, SIGNAL(changed(const QList<QRectF>&)), this, SLOT(ItemsChanged()));
   connect(&scene_, SIGNAL(selectionChanged()), this, SLOT(SceneSelectionChangedSlot()));
+  connect(this, SIGNAL(customContextMenuRequested(const QPoint &)), this, SLOT(ShowContextMenu(const QPoint &)));
 }
 
 NodeView::~NodeView()
@@ -193,3 +196,9 @@ void NodeView::SceneSelectionChangedSlot()
 
   emit SelectionChanged(selected_nodes);
 }
+
+void NodeView::ShowContextMenu(const QPoint &pos)
+{
+  Menu* m = NodeFactory::CreateMenu();
+  m->exec(pos);
+}

app/widget/nodeview/nodeview.h

@@ -132,6 +132,11 @@ private slots:
    */
   void SceneSelectionChangedSlot();
 
+  /**
+   * @brief Receiver for when the user right clicks (or otherwise requests a context menu)
+   */
+  void ShowContextMenu(const QPoint &pos);
+
 };
 
 #endif // NODEVIEW_H