add devkits and simple touch; use SectionedComboBox

Author: dromer

Source/Heavy/DaisyExporter.h

@@ -5,6 +5,89 @@
  */
 #pragma once
 
+class SectionedComboComponent : public PropertiesPanelProperty {
+public:
+    SectionedComboComponent(String const& name, Value const& targetValue,
+        std::vector<std::pair<String, StringArray>> sections, StringArray extra)
+        : PropertiesPanelProperty(name)
+    {
+        // 1. Populate the combo itself with the flat list, ids 1..N.
+        //    This gives the closed combo its selected-item text and keeps
+        //    the id == flat index convention intact.
+        int id = 1;
+        for (auto& [title, items] : sections)
+            for (auto& item : items)
+                comboBox.addItem(item, id++);
+        for (auto& item : extra)
+            comboBox.addItem(item, id++);
+
+        comboBox.getProperties().set("Style", "Inspector");
+        comboBox.getSelectedIdAsValue().referTo(targetValue);
+
+        // sections/extra live on the inner combo for showPopup()
+        comboBox.sections = std::move(sections);
+        comboBox.extra = std::move(extra);
+
+        addAndMakeVisible(comboBox);
+    }
+
+    PropertiesPanelProperty* createCopy() override
+    {
+        return new SectionedComboComponent(getName(), comboBox.getSelectedIdAsValue(),
+            comboBox.sections, comboBox.extra);
+    }
+
+    void resized() override
+    {
+        comboBox.setBounds(getLocalBounds().removeFromRight(getWidth() / (2 - hideLabel)));
+    }
+
+private:
+    class SectionedComboBox : public ComboBox {
+    public:
+        std::vector<std::pair<String, StringArray>> sections;
+        StringArray extra;
+
+        void mouseDown(MouseEvent const& e) override
+        {
+            showMenu();
+        }
+
+    private:
+        void showMenu()
+        {
+            PopupMenu menu;
+            int id = 1;
+            for (auto& [title, items] : sections) {
+                PopupMenu sub;
+                for (auto& item : items)
+                    sub.addItem(id++, item);
+                menu.addSubMenu(title, sub);
+            }
+            if (extra.size()) {
+                menu.addSeparator();
+                for (auto& item : extra)
+                    menu.addItem(id++, item);
+            }
+
+            menu.showMenuAsync(
+                PopupMenu::Options()
+                    .withTargetComponent(this)
+                    .withItemThatMustBeVisible(getSelectedId())
+                    .withInitiallySelectedItem(getSelectedId())
+                    .withMinimumWidth(getWidth())
+                    .withMaximumNumColumns(1)
+                    .withStandardItemHeight(24),
+                ModalCallbackFunction::create([this](int result) {
+                    if (result != 0)
+                        setSelectedId(result, sendNotificationSync);
+                }));
+        }
+    };
+
+    SectionedComboBox comboBox;
+};
+
 class DaisyExporter final : public ExporterBase {
 public:
     Value targetBoardValue = SynchronousValue(var(1));
@@ -27,7 +110,10 @@ class DaisyExporter final : public ExporterBase {
         exportTypeValue = var(3);
 
         PropertiesArray properties;
-        properties.add(new PropertiesPanel::ComboComponent("Target board", targetBoardValue, { "Pod", "Petal", "Patch", "Patch.Init()", "Field", "Versio", "Terrarium", "Hothouse", "Simple", "Custom JSON..." }));
+        properties.add(new SectionedComboComponent("Target board", targetBoardValue,
+            { { "Official", { "Pod", "Petal", "Patch", "Patch.Init()", "Field", "Desktop Devkit", "Eurorack Devkit", "Pedal Devkit" } },
+              { "Community", { "Versio", "Terrarium", "Hothouse", "Simple Touch" } } },
+            { "Custom JSON..." }));
         properties.add(new PropertiesPanel::ComboComponent("Export type", exportTypeValue, getExportTypes()));
         usbMidiProperty = new PropertiesPanel::BoolComponent("USB MIDI", usbMidiValue, { "No", "Yes" });
         properties.add(usbMidiProperty);
@@ -135,7 +221,7 @@ class DaisyExporter final : public ExporterBase {
             int const idx = getValue<int>(targetBoardValue);
 
             // Custom board option
-            if (idx == 10 && !blockDialog) {
+            if (idx == 13 && !blockDialog) {
                 Dialogs::showOpenDialog([this](URL const& url) {
                     auto const result = url.getLocalFile();
                     if (result.existsAsFile()) {
@@ -217,10 +303,10 @@ class DaisyExporter final : public ExporterBase {
         }
 
         // set board definition
-        auto boards = StringArray { "pod", "petal", "patch", "patch_init", "field", "versio", "terrarium", "hothouse", "simple", "custom" };
+        auto boards = StringArray { "pod", "petal", "patch", "patch_init", "field", "desktop_devkit", "eurorack_devkit", "pedal_devkit", "versio", "terrarium", "hothouse", "simple_touch", "custom" };
         auto const& board = boards[target];
 
-        auto extra_boards = StringArray { "versio", "terrarium", "hothouse", "simple" };
+        auto extra_boards = StringArray { "versio", "terrarium", "hothouse", "simple_touch" };
 
         DynamicObject::Ptr metaJson(new DynamicObject());
         var metaDaisy(new DynamicObject());