More work on the new UI settings implementation

Author: PapeCoding

Src/Common/ModuleSettings.h

@@ -37,38 +37,39 @@ namespace Dasher {
     struct ModuleSetting
     {
       SettingsType Type;
-      ModuleSetting(SettingsType Type, Dasher::Parameter Param, std::string Description) : Type(Type), Param(Param), Description(Description) {}
+      ModuleSetting(SettingsType Type, Dasher::Parameter Param, std::string Name, std::string Description) : Type(Type), Param(Param), Description(Description), Name(Name) {}
       virtual ~ModuleSetting() {};
 
+      std::string Name;
       std::string Description;
       Dasher::Parameter Param;
     };
 
-    struct TextSetting : ModuleSetting {
-      TextSetting(Dasher::Parameter Param, std::string Description) : ModuleSetting(SettingsType::TextField, Param, Description) {}
+    struct TextboxSetting : ModuleSetting {
+      TextboxSetting(Dasher::Parameter Param, std::string Name, std::string Description) : ModuleSetting(SettingsType::TextField, Param, Name, Description) {}
     };
 
     struct SliderSetting : ModuleSetting {
-      SliderSetting(Dasher::Parameter Param, std::string Description, int min, int max, int step) : ModuleSetting(SettingsType::Slider, Param, Description), min(min), max(max), step(step) {};
+      SliderSetting(Dasher::Parameter Param, std::string Name, std::string Description, int min, int max, int step) : ModuleSetting(SettingsType::Slider, Param, Name, Description), min(min), max(max), step(step) {};
       int min;
       int max;
       int step;
     };
 
     struct SpinSetting : ModuleSetting {
-      SpinSetting(Dasher::Parameter Param, std::string Description, int min, int max, int step) : ModuleSetting(SettingsType::Slider, Param, Description), min(min), max(max), step(step) {}
+      SpinSetting(Dasher::Parameter Param, std::string Name, std::string Description, int min, int max, int step) : ModuleSetting(SettingsType::Step, Param, Name, Description), min(min), max(max), step(step) {}
       int min;
       int max;
       int step;
     };
 
     struct EnumSetting : ModuleSetting {
-      EnumSetting(Dasher::Parameter Param, std::string Description, std::unordered_map<std::string, int> Enums) : ModuleSetting(SettingsType::Enum, Param, Description), Enums(Enums) {};
+      EnumSetting(Dasher::Parameter Param, std::string Name, std::string Description, std::unordered_map<std::string, int> Enums) : ModuleSetting(SettingsType::Enum, Param, Name, Description), Enums(Enums) {};
       std::unordered_map<std::string, int> Enums;
     };
 
     struct SwitchSetting : ModuleSetting {
-      SwitchSetting(Dasher::Parameter Param, std::string Description) : ModuleSetting(SettingsType::Switch, Param, Description) {};
+      SwitchSetting(Dasher::Parameter Param, std::string Name, std::string Description) : ModuleSetting(SettingsType::Switch, Param, Name, Description) {};
     };
   }
 }

Src/DasherCore/DasherModule.h

@@ -21,6 +21,7 @@
 #pragma once
 
 #include "../Common/ModuleSettings.h"
+#include <memory>
 #include <vector>
 
 class CDasherModule;
@@ -38,11 +39,20 @@ class CDasherModule {
         return false;
     }
 
-    virtual const std::vector<Dasher::Settings::ModuleSetting>& getUISettings(){return UIList;};
 private:
     const char *m_szName;
-protected:
-    std::vector<Dasher::Settings::ModuleSetting> UIList;
+
+// "New" UI Settings definitions:
+public:
+    virtual const std::vector<std::unique_ptr<Dasher::Settings::ModuleSetting>>& getUISettings(){return UISettingsList;};
+    virtual void declareTextboxSetting(Dasher::Parameter Param, std::string Name, std::string Description){UISettingsList.push_back(std::make_unique<Dasher::Settings::TextboxSetting>(Param, Name, Description));}
+    virtual void declareSliderSetting(Dasher::Parameter Param, std::string Name, std::string Description, int min, int max, int step){UISettingsList.push_back(std::make_unique<Dasher::Settings::SliderSetting>(Param, Name, Description, min, max, step));}
+    virtual void declareSpinButtonSetting(Dasher::Parameter Param, std::string Name, std::string Description, int min, int max, int step){UISettingsList.push_back(std::make_unique<Dasher::Settings::SpinSetting>(Param, Name, Description, min, max, step));}
+    virtual void declareDropdownSetting(Dasher::Parameter Param, std::string Name, std::string Description, std::unordered_map<std::string, int> Enums){UISettingsList.push_back(std::make_unique<Dasher::Settings::EnumSetting>(Param, Name, Description, Enums));}
+    virtual void declareSwitchSetting(Dasher::Parameter Param, std::string Name, std::string Description){UISettingsList.push_back(std::make_unique<Dasher::Settings::SwitchSetting>(Param, Name, Description));}
+
+private:
+    std::vector<std::unique_ptr<Dasher::Settings::ModuleSetting>> UISettingsList;
 };
 /// @}
 

Src/DasherCore/PressFilter.cpp

@@ -1,22 +1,34 @@
 #include "PressFilter.h"
 #include "I18n.h"
+#include "Parameters.h"
+#include "SettingsStore.h"
 
 Dasher::CPressFilter::CPressFilter(CSettingsStore* pSettingsStore, CDasherInterfaceBase* pInterface, CFrameRate* pFramerate, const char *szName) : CDefaultFilter(pSettingsStore, pInterface, pFramerate, szName)
 {
-	UIList.push_back(Dasher::Settings::SwitchSetting(BP_REMAP_XTREME, _("At top and bottom, scroll more and translate less (makes error-correcting easier)")));
-    UIList.push_back(Dasher::Settings::EnumSetting(LP_GEOMETRY, "Screen geometry", {
+	declareSwitchSetting(BP_LM_ADAPTIVE, _("Switch Setting 1"), _("Test Description"));
+	declareSwitchSetting(BP_LM_ADAPTIVE, _("Switch Setting 2"), _("Test Description"));
+
+    declareDropdownSetting(LP_GEOMETRY, "Dropdown Setting 1", "Test Description",  {
+        {"Old Style", Dasher::Options::ScreenGeometry::old_style},
+        {"Square without Crosshair", Dasher::Options::ScreenGeometry::square_no_xhair},
+        {"Squish", Dasher::Options::ScreenGeometry::squish},
+        {"Squaish + Log", Dasher::Options::ScreenGeometry::squish_and_log},
+    });
+	declareDropdownSetting(LP_GEOMETRY, "Dropdown Setting 2", "Test Description",  {
         {"Old Style", Dasher::Options::ScreenGeometry::old_style},
         {"Square without Crosshair", Dasher::Options::ScreenGeometry::square_no_xhair},
         {"Squish", Dasher::Options::ScreenGeometry::squish},
         {"Squaish + Log", Dasher::Options::ScreenGeometry::squish_and_log},
-    }));
-    UIList.push_back(Dasher::Settings::EnumSetting(LP_SHAPE_TYPE, "Rendering Geometry", {
-        {"Rectangle", Dasher::Options::RenderingShapeTypes::OVERLAPPING_RECTANGLE},
-        {"Triangle", Dasher::Options::RenderingShapeTypes::TRIANGLE},
-        {"Truncated Triangle", Dasher::Options::RenderingShapeTypes::TRUNCATED_TRIANGLE},
-        {"Quadric", Dasher::Options::RenderingShapeTypes::QUADRIC},
-        {"Circle", Dasher::Options::RenderingShapeTypes::CIRCLE}
-    }));
+    });
+
+	declareTextboxSetting(SP_ALPHABET_3, "Textbox Setting 1", "Test Description");
+	declareTextboxSetting(SP_ALPHABET_3, "Textbox Setting 2", "Test Description");
+
+	declareSliderSetting(LP_MAX_BITRATE, "Slider Setting 1", "Test Description", 1, 1000, 10);
+	declareSliderSetting(LP_MAX_BITRATE, "Slider Setting 2", "Test Description", 1, 1000, 50);
+
+	declareSpinButtonSetting(LP_X_LIMIT_SPEED, "Spin Setting 1", "Test Description", 1, 1000, 10);
+	declareSpinButtonSetting(LP_X_LIMIT_SPEED, "Spin Setting 2", "Test Description", 1, 1000, 50);
 }
 
 void Dasher::CPressFilter::KeyDown(unsigned long iTime, Keys::VirtualKey Key, CDasherView* pDasherView, CDasherInput* pInput, CDasherModel* pModel)