nodes: use defined categories rather than arbitrary string based

app/node/audio/pan/pan.cpp

@@ -49,9 +49,9 @@ QString PanNode::id() const
   return QStringLiteral("org.olivevideoeditor.Olive.pan");
 }
 
-QString PanNode::Category() const
+QList<Node::CategoryID> PanNode::Category() const
 {
-  return tr("Audio");
+  return {kCategoryChannels};
 }
 
 QString PanNode::Description() const
@@ -64,7 +64,7 @@ Node::Capabilities PanNode::GetCapabilities(const NodeValueDatabase &) const
   return kSampleProcessor;
 }
 
-NodeInput *PanNode::ProcessesSamplesFrom(const NodeValueDatabase &value) const
+NodeInput *PanNode::ProcessesSamplesFrom(const NodeValueDatabase &) const
 {
   return samples_input_;
 }

app/node/audio/pan/pan.h

@@ -34,7 +34,7 @@ public:
 
   virtual QString Name() const override;
   virtual QString id() const override;
-  virtual QString Category() const override;
+  virtual QList<CategoryID> Category() const override;
   virtual QString Description() const override;
 
   virtual Capabilities GetCapabilities(const NodeValueDatabase&) const override;

app/node/audio/volume/volume.cpp

@@ -48,9 +48,9 @@ QString VolumeNode::id() const
   return QStringLiteral("org.olivevideoeditor.Olive.volume");
 }
 
-QString VolumeNode::Category() const
+QList<Node::CategoryID> VolumeNode::Category() const
 {
-  return tr("Audio");
+  return {kCategoryFilter};
 }
 
 QString VolumeNode::Description() const

app/node/audio/volume/volume.h

@@ -34,7 +34,7 @@ public:
 
   virtual QString Name() const override;
   virtual QString id() const override;
-  virtual QString Category() const override;
+  virtual QList<CategoryID> Category() const override;
   virtual QString Description() const override;
 
   virtual Capabilities GetCapabilities(const NodeValueDatabase&) const override;

app/node/block/block.cpp

@@ -63,9 +63,9 @@ Block::Block() :
   set_length_and_media_out(1);
 }
 
-QString Block::Category() const
+QList<Node::CategoryID> Block::Category() const
 {
-  return tr("Block");
+  return {kCategoryTimeline};
 }
 
 const rational &Block::in() const

app/node/block/block.h

@@ -49,7 +49,7 @@ public:
 
   virtual Type type() const = 0;
 
-  virtual QString Category() const override;
+  virtual QList<CategoryID> Category() const override;
 
   const rational& in() const;
   const rational& out() const;

app/node/block/transition/externaltransition.cpp

@@ -50,7 +50,7 @@ QString ExternalTransition::id() const
   return meta_.id();
 }
 
-QString ExternalTransition::Category() const
+QList<Node::CategoryID> ExternalTransition::Category() const
 {
   return meta_.Category();
 }

app/node/block/transition/externaltransition.h

@@ -37,7 +37,7 @@ public:
   virtual QString Name() const override;
   virtual QString ShortName() const override;
   virtual QString id() const override;
-  virtual QString Category() const override;
+  virtual QList<CategoryID> Category() const override;
   virtual QString Description() const override;
 
   virtual void Retranslate() override;

app/node/external.cpp

@@ -52,7 +52,7 @@ QString ExternalNode::id() const
   return meta_.id();
 }
 
-QString ExternalNode::Category() const
+QList<Node::CategoryID> ExternalNode::Category() const
 {
   return meta_.Category();
 }

app/node/external.h

@@ -41,7 +41,7 @@ public:
   virtual QString Name() const override;
   virtual QString ShortName() const override;
   virtual QString id() const override;
-  virtual QString Category() const override;
+  virtual QList<CategoryID> Category() const override;
   virtual QString Description() const override;
 
   virtual void Retranslate() override;

app/node/factory.cpp

@@ -73,34 +73,25 @@ Menu *NodeFactory::CreateMenu(QWidget* parent)
     // Make sure nodes are up-to-date with the current translation
     n->Retranslate();
 
-    QStringList path = n->Category().split('/');
+    Menu* destination = nullptr;
 
-    Menu* destination = menu;
+    QString category_name = Node::GetCategoryName(n->Category().isEmpty()
+                                                  ? Node::kCategoryUnknown
+                                                  : n->Category().first());
 
-    // Find destination menu based on category hierarchy
-    foreach (const QString& dir_name, path) {
-      // Ignore an empty directory
-      if (dir_name.isEmpty()) {
-        continue;
+    // See if a menu with this category name already exists
+    QList<QAction*> menu_actions = menu->actions();
+    foreach (QAction* action, menu_actions) {
+      if (action->menu() && action->menu()->title() == category_name) {
+        destination = static_cast<Menu*>(action->menu());
+        break;
       }
+    }
 
-      // See if a menu with this dir_name already exists
-      bool found_cat = false;
-      QList<QAction*> menu_actions = destination->actions();
-      foreach (QAction* action, menu_actions) {
-        if (action->menu() && action->menu()->title() == dir_name) {
-          destination = static_cast<Menu*>(action->menu());
-          found_cat = true;
-          break;
-        }
-      }
-
-      // Create menu here if it doesn't exist
-      if (!found_cat) {
-        Menu* new_category = new Menu(dir_name, destination);
-        destination->InsertAlphabetically(new_category);
-        destination = new_category;
-      }
+    // Create menu here if it doesn't exist
+    if (!destination) {
+      destination = new Menu(category_name, menu);
+      menu->InsertAlphabetically(destination);
     }
 
     // Add entry to menu

app/node/generator/matrix/matrix.cpp

@@ -69,9 +69,9 @@ QString MatrixGenerator::id() const
   return QStringLiteral("org.olivevideoeditor.Olive.transform");
 }
 
-QString MatrixGenerator::Category() const
+QList<Node::CategoryID> MatrixGenerator::Category() const
 {
-  return tr("Generator");
+  return {kCategoryGenerator, kCategoryMath};
 }
 
 QString MatrixGenerator::Description() const

app/node/generator/matrix/matrix.h

@@ -36,7 +36,7 @@ public:
   virtual QString Name() const override;
   virtual QString ShortName() const override;
   virtual QString id() const override;
-  virtual QString Category() const override;
+  virtual QList<CategoryID> Category() const override;
   virtual QString Description() const override;
 
   virtual void Retranslate() override;

app/node/input/media/media.cpp

@@ -35,9 +35,9 @@ MediaInput::MediaInput() :
   AddInput(footage_input_);
 }
 
-QString MediaInput::Category() const
+QList<Node::CategoryID> MediaInput::Category() const
 {
-  return tr("Input");
+  return {kCategoryInput};
 }
 
 StreamPtr MediaInput::footage()

app/node/input/media/media.h

@@ -35,7 +35,7 @@ class MediaInput : public Node
 public:
   MediaInput();
 
-  virtual QString Category() const override;
+  virtual QList<CategoryID> Category() const override;
 
   StreamPtr footage();
   void SetFootage(StreamPtr f);

app/node/input/time/timeinput.cpp

@@ -41,9 +41,9 @@ QString TimeInput::id() const
   return QStringLiteral("org.olivevideoeditor.Olive.time");
 }
 
-QString TimeInput::Category() const
+QList<Node::CategoryID> TimeInput::Category() const
 {
-  return tr("Input");
+  return {kCategoryInput};
 }
 
 QString TimeInput::Description() const

app/node/input/time/timeinput.h

@@ -35,7 +35,7 @@ public:
 
   virtual QString Name() const override;
   virtual QString id() const override;
-  virtual QString Category() const override;
+  virtual QList<CategoryID> Category() const override;
   virtual QString Description() const override;
 
   virtual NodeValueTable Value(NodeValueDatabase& value) const override;

app/node/math/math/math.cpp

@@ -61,9 +61,9 @@ QString MathNode::id() const
   return QStringLiteral("org.olivevideoeditor.Olive.math");
 }
 
-QString MathNode::Category() const
+QList<Node::CategoryID> MathNode::Category() const
 {
-  return tr("Math");
+  return {kCategoryMath};
 }
 
 QString MathNode::Description() const

app/node/math/math/math.h

@@ -34,7 +34,7 @@ public:
 
   virtual QString Name() const override;
   virtual QString id() const override;
-  virtual QString Category() const override;
+  virtual QList<CategoryID> Category() const override;
   virtual QString Description() const override;
 
   virtual void Retranslate() override;

app/node/math/trigonometry/trigonometry.cpp

@@ -48,9 +48,9 @@ QString TrigonometryNode::id() const
   return QStringLiteral("org.olivevideoeditor.Olive.trigonometry");
 }
 
-QString TrigonometryNode::Category() const
+QList<Node::CategoryID> TrigonometryNode::Category() const
 {
-  return tr("Math");
+  return {kCategoryMath};
 }
 
 QString TrigonometryNode::Description() const

app/node/math/trigonometry/trigonometry.h

@@ -34,7 +34,7 @@ public:
 
   virtual QString Name() const override;
   virtual QString id() const override;
-  virtual QString Category() const override;
+  virtual QList<CategoryID> Category() const override;
   virtual QString Description() const override;
 
   virtual void Retranslate() override;

app/node/metareader.cpp

@@ -71,9 +71,9 @@ const QString &NodeMetaReader::id() const
   return id_;
 }
 
-QString NodeMetaReader::Category() const
+QList<Node::CategoryID> NodeMetaReader::Category() const
 {
-  return GetStringForCurrentLanguage(&categories_);
+  return categories_;
 }
 
 QString NodeMetaReader::Description() const
@@ -187,7 +187,19 @@ void NodeMetaReader::XMLReadEffect(QXmlStreamReader* reader)
       XMLReadLanguageString(reader, &short_names_);
     } else if (reader->name() == QStringLiteral("category")) {
       // Pick up category
-      XMLReadLanguageString(reader, &categories_);
+      QStringList category_ids = reader->readElementText().split(':');
+
+      foreach (const QString& id, category_ids) {
+        bool ok;
+
+        int try_parse = id.toInt(&ok);
+
+        if (!ok || try_parse < 0 || try_parse >= Node::kCategoryCount) {
+          continue;
+        }
+
+        categories_.append(static_cast<Node::CategoryID>(try_parse));
+      }
     } else if (reader->name() == QStringLiteral("description")) {
       // Pick up description
       XMLReadLanguageString(reader, &descriptions_);

app/node/metareader.h

@@ -26,6 +26,7 @@
 #include <QXmlStreamReader>
 
 #include "input.h"
+#include "node/node.h"
 
 OLIVE_NAMESPACE_ENTER
 
@@ -37,7 +38,7 @@ public:
   QString Name() const;
   QString ShortName() const;
   const QString& id() const;
-  QString Category() const;
+  QList<Node::CategoryID> Category() const;
   QString Description() const;
 
   const QString& filename() const;
@@ -70,7 +71,7 @@ private:
   LanguageMap names_;
   LanguageMap short_names_;
   LanguageMap descriptions_;
-  LanguageMap categories_;
+  QList<Node::CategoryID> categories_;
   QMap<QString, LanguageMap > param_names_;
   QMap<QString, QList<LanguageMap> > combo_names_;
   QMap<QString, QList<LanguageMap> > combo_descriptions_;

app/node/node.cpp

@@ -127,12 +127,6 @@ QString Node::ShortName() const
   return Name();
 }
 
-QString Node::Category() const
-{
-  // Return an empty category for any nodes that don't use one
-  return QString();
-}
-
 QString Node::Description() const
 {
   // Return an empty string by default
@@ -560,6 +554,35 @@ void Node::DisconnectAll()
   }
 }
 
+QString Node::GetCategoryName(const CategoryID &c)
+{
+  switch (c) {
+  case kCategoryInput:
+    return tr("Input");
+  case kCategoryOutput:
+    return tr("Output");
+  case kCategoryGeneral:
+    return tr("General");
+  case kCategoryMath:
+    return tr("Math");
+  case kCategoryColor:
+    return tr("Color");
+  case kCategoryFilter:
+    return tr("Filter");
+  case kCategoryTimeline:
+    return tr("Timeline");
+  case kCategoryGenerator:
+    return tr("Generator");
+  case kCategoryChannels:
+    return tr("Channel");
+  case kCategoryUnknown:
+  case kCategoryCount:
+    break;
+  }
+
+  return tr("Uncategorized");
+}
+
 QList<TimeRange> Node::TransformTimeTo(const TimeRange &time, Node *target, NodeParam::Type direction)
 {
   QList<TimeRange> paths_found;

app/node/node.h

@@ -61,6 +61,22 @@ public:
     kSampleProcessor = 0x2
   };
 
+  enum CategoryID {
+    kCategoryUnknown = -1,
+
+    kCategoryInput,
+    kCategoryOutput,
+    kCategoryGenerator,
+    kCategoryMath,
+    kCategoryFilter,
+    kCategoryColor,
+    kCategoryGeneral,
+    kCategoryTimeline,
+    kCategoryChannels,
+
+    kCategoryCount
+  };
+
   Node();
 
   virtual ~Node() override;
@@ -115,7 +131,7 @@ public:
    * interpreted as an empty string category. This value should be run through a translator as its largely user
    * oriented.
    */
-  virtual QString Category() const;
+  virtual QList<CategoryID> Category() const = 0;
 
   /**
    * @brief Return a description of this node's purpose (optional for subclassing, but recommended)
@@ -241,6 +257,11 @@ public:
    */
   void DisconnectAll();
 
+  /**
+   * @brief Get the human-readable name for any category
+   */
+  static QString GetCategoryName(const CategoryID &c);
+
   /**
    * @brief Transforms time from this node through the connections it takes to get to the specified node
    */

app/node/output/track/track.cpp

@@ -80,9 +80,9 @@ QString TrackOutput::id() const
   return QStringLiteral("org.olivevideoeditor.Olive.track");
 }
 
-QString TrackOutput::Category() const
+QList<Node::CategoryID> TrackOutput::Category() const
 {
-  return tr("Output");
+  return {kCategoryTimeline};
 }
 
 QString TrackOutput::Description() const

app/node/output/track/track.h

@@ -44,7 +44,7 @@ public:
 
   virtual QString Name() const override;
   virtual QString id() const override;
-  virtual QString Category() const override;
+  virtual QList<CategoryID> Category() const override;
   virtual QString Description() const override;
 
   QString GetTrackName();

app/node/output/viewer/viewer.cpp

@@ -72,9 +72,9 @@ QString ViewerOutput::id() const
   return QStringLiteral("org.olivevideoeditor.Olive.vieweroutput");
 }
 
-QString ViewerOutput::Category() const
+QList<Node::CategoryID> ViewerOutput::Category() const
 {
-  return tr("Output");
+  return {kCategoryOutput};
 }
 
 QString ViewerOutput::Description() const

app/node/output/viewer/viewer.h

@@ -49,7 +49,7 @@ public:
 
   virtual QString Name() const override;
   virtual QString id() const override;
-  virtual QString Category() const override;
+  virtual QList<CategoryID> Category() const override;
   virtual QString Description() const override;
 
   NodeInput* texture_input() const;

app/shaders/alphaover.xml

@@ -4,7 +4,7 @@
     <name lang="en_US">Alpha Over</name>
     
     <!-- Effect Category -->
-    <category lang="en_US">Blend</category>
+    <category>3</category>
 
     <!-- Effect Description -->
     <description lang="en_US">

app/shaders/blur.xml

@@ -4,7 +4,7 @@
     <name lang="en_US">Blur</name>
 
     <!-- Effect Category -->
-    <category lang="en_US">Blur</category>
+    <category>4</category>
 
     <!-- Effect Description -->
     <description lang="en_US">

app/shaders/crossdissolve.xml

@@ -4,7 +4,7 @@
     <name lang="en_US">Cross Dissolve</name>
 
     <!-- Effect Category -->
-    <category lang="en_US">Transition</category>
+    <category></category>
 
     <!-- Effect Description -->
     <description lang="en_US">

app/shaders/diptoblack.xml

@@ -4,7 +4,7 @@
     <name lang="en_US">Dip to Black</name>
 
     <!-- Effect Category -->
-    <category lang="en_US">Transition</category>
+    <category></category>
 
     <!-- Effect Description -->
     <description lang="en_US">