Wrap in GroupOption to allow collapsing.

Author: Mysticial

SerialPrograms/Source/CommonFramework/Globals.cpp

@@ -26,7 +26,7 @@ namespace PokemonAutomation{
 const bool IS_BETA_VERSION = true;
 const int PROGRAM_VERSION_MAJOR = 0;
 const int PROGRAM_VERSION_MINOR = 60;
-const int PROGRAM_VERSION_PATCH = 3;
+const int PROGRAM_VERSION_PATCH = 4;
 
 const std::string PROGRAM_VERSION_BASE =
     "v" + std::to_string(PROGRAM_VERSION_MAJOR) +

SerialPrograms/Source/Controllers/ControllerStateTable.cpp

@@ -313,8 +313,15 @@ std::unique_ptr<EditableTableRow> ControllerCommandTable::make_row(){
 ControllerCommandTables::~ControllerCommandTables(){
     m_type.remove_listener(*this);
 }
-ControllerCommandTables::ControllerCommandTables(const std::vector<ControllerClass>& controller_list)
-    : BatchOption(LockMode::UNLOCK_WHILE_RUNNING)
+ControllerCommandTables::ControllerCommandTables(
+    std::string label,
+    const std::vector<ControllerClass>& controller_list
+)
+    : GroupOption(
+        std::move(label),
+        LockMode::UNLOCK_WHILE_RUNNING,
+        EnableMode::ALWAYS_ENABLED
+    )
     , m_type(
         "<b>Controller Type:</b>",
         make_database(controller_list),

SerialPrograms/Source/Controllers/ControllerStateTable.h

@@ -7,7 +7,7 @@
 #ifndef PokemonAutomation_Controllers_ControllerStateTable_H
 #define PokemonAutomation_Controllers_ControllerStateTable_H
 
-#include "Common/Cpp/Options/BatchOption.h"
+#include "Common/Cpp/Options/GroupOption.h"
 #include "Common/Cpp/Options/EnumDropdownOption.h"
 #include "Common/Cpp/Options/EditableTableOption.h"
 #include "ControllerTypes.h"
@@ -89,10 +89,13 @@ class ControllerCommandTable : public EditableTableOption{
 
 
 
-class ControllerCommandTables : public BatchOption, public ConfigOption::Listener{
+class ControllerCommandTables : public GroupOption, public ConfigOption::Listener{
 public:
     ~ControllerCommandTables();
-    ControllerCommandTables(const std::vector<ControllerClass>& controller_list);
+    ControllerCommandTables(
+        std::string label,
+        const std::vector<ControllerClass>& controller_list
+    );
 
     void run(CancellableScope& scope, AbstractController& controller){
         m_table.run(scope, controller);

SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp

@@ -224,11 +224,14 @@ TestProgram::TestProgram()
     , BOX("Box", LockMode::UNLOCK_WHILE_RUNNING, 0, 0, 1, 1)
     , BUTTONS("Buttons", ProController_Button_Database(), LockMode::UNLOCK_WHILE_RUNNING, BUTTON_NONE)
     , DPAD(ProController_Dpad_Database(), LockMode::UNLOCK_WHILE_RUNNING, DPAD_NONE)
-    , COMMANDS({
-        ControllerClass::NintendoSwitch_ProController,
-        ControllerClass::NintendoSwitch_LeftJoycon,
-        ControllerClass::NintendoSwitch_RightJoycon,
-    })
+    , COMMANDS(
+        "Command Schedule:",
+        {
+            ControllerClass::NintendoSwitch_ProController,
+            ControllerClass::NintendoSwitch_LeftJoycon,
+            ControllerClass::NintendoSwitch_RightJoycon,
+        }
+    )
     , NOTIFICATION_TEST("Test", true, true, ImageAttachmentMode::JPG)
     , NOTIFICATIONS({
         &NOTIFICATION_TEST,

SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_TurboMacro.cpp

@@ -32,11 +32,14 @@ TurboMacro::TurboMacro()
         LockMode::UNLOCK_WHILE_RUNNING,
         100, 0
     )
-    , TABLE({
-        ControllerClass::NintendoSwitch_ProController,
-        ControllerClass::NintendoSwitch_LeftJoycon,
-        ControllerClass::NintendoSwitch_RightJoycon,
-    })
+    , TABLE(
+        "Command Schedule:",
+        {
+            ControllerClass::NintendoSwitch_ProController,
+            ControllerClass::NintendoSwitch_LeftJoycon,
+            ControllerClass::NintendoSwitch_RightJoycon,
+        }
+    )
 {
     PA_ADD_OPTION(LOOP);
     PA_ADD_OPTION(TABLE);