Changing the retrieval mechanism for UI settings

Author: PapeCoding

Src/DasherCore/DasherModule.h

@@ -42,17 +42,16 @@ class CDasherModule {
 private:
     const char *m_szName;
 
-// "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;
+    // "New" UI Settings definitions:
+    typedef std::vector<std::unique_ptr<Dasher::Settings::ModuleSetting>> UISettingList;
+    // Fill this list using the provided methods below to define which UI components could be used by the UI to change your respective setting
+    virtual void GetUISettings(UISettingList& List){};
+    static void DeclareTextboxSetting(UISettingList& List, Dasher::Parameter Param, std::string Name, std::string Description){List.push_back(std::make_unique<Dasher::Settings::TextboxSetting>(Param, Name, Description));}
+    static void DeclareSliderSetting(UISettingList& List, Dasher::Parameter Param, std::string Name, std::string Description, int min, int max, int step){List.push_back(std::make_unique<Dasher::Settings::SliderSetting>(Param, Name, Description, min, max, step));}
+    static void DeclareSpinButtonSetting(UISettingList& List, Dasher::Parameter Param, std::string Name, std::string Description, int min, int max, int step){List.push_back(std::make_unique<Dasher::Settings::SpinSetting>(Param, Name, Description, min, max, step));}
+    static void DeclareDropdownSetting(UISettingList& List, Dasher::Parameter Param, std::string Name, std::string Description, std::unordered_map<std::string, int> Enums){List.push_back(std::make_unique<Dasher::Settings::EnumSetting>(Param, Name, Description, Enums));}
+    static void DeclareSwitchSetting(UISettingList& List, Dasher::Parameter Param, std::string Name, std::string Description){List.push_back(std::make_unique<Dasher::Settings::SwitchSetting>(Param, Name, Description));}
 };
 /// @}
 

Src/DasherCore/PressFilter.cpp

@@ -3,33 +3,34 @@
 #include "Parameters.h"
 #include "SettingsStore.h"
 
-Dasher::CPressFilter::CPressFilter(CSettingsStore* pSettingsStore, CDasherInterfaceBase* pInterface, CFrameRate* pFramerate, const char *szName) : CDefaultFilter(pSettingsStore, pInterface, pFramerate, szName)
-{
-	declareSwitchSetting(BP_LM_ADAPTIVE, _("Switch Setting 1"), _("Test Description"));
-	declareSwitchSetting(BP_LM_ADAPTIVE, _("Switch Setting 2"), _("Test Description"));
+Dasher::CPressFilter::CPressFilter(CSettingsStore* pSettingsStore, CDasherInterfaceBase* pInterface, CFrameRate* pFramerate, const char *szName) : CDefaultFilter(pSettingsStore, pInterface, pFramerate, szName){}
+
+void Dasher::CPressFilter::GetUISettings(UISettingList& List){
+	DeclareSwitchSetting(List, BP_LM_ADAPTIVE, _("Switch Setting 1"), _("Test Description"));
+	DeclareSwitchSetting(List, BP_LM_ADAPTIVE, _("Switch Setting 2"), _("Test Description"));
 
-    declareDropdownSetting(LP_GEOMETRY, "Dropdown Setting 1", "Test Description",  {
+    DeclareDropdownSetting(List, 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",  {
+	DeclareDropdownSetting(List, 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},
     });
 
-	declareTextboxSetting(SP_ALPHABET_3, "Textbox Setting 1", "Test Description");
-	declareTextboxSetting(SP_ALPHABET_3, "Textbox Setting 2", "Test Description");
+	DeclareTextboxSetting(List, SP_ALPHABET_3, "Textbox Setting 1", "Test Description");
+	DeclareTextboxSetting(List, 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);
+	DeclareSliderSetting(List, LP_MAX_BITRATE, "Slider Setting 1", "Test Description", 1, 1000, 10);
+	DeclareSliderSetting(List, 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);
-}
+	DeclareSpinButtonSetting(List, LP_X_LIMIT_SPEED, "Spin Setting 1", "Test Description", 1, 1000, 10);
+	DeclareSpinButtonSetting(List, 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)
 {

Src/DasherCore/PressFilter.h

@@ -10,6 +10,8 @@ class CPressFilter : public CDefaultFilter {
 	CPressFilter(CSettingsStore* pSettingsStore, CDasherInterfaceBase* pInterface, CFrameRate* pFramerate, const char *szName);
 	void KeyDown(unsigned long iTime, Keys::VirtualKey Key, CDasherView* pDasherView, CDasherInput* pInput, CDasherModel* pModel) override;
 	void KeyUp(unsigned long iTime, Keys::VirtualKey Key, CDasherView* pView, CDasherInput* pInput, CDasherModel* pModel) override;
+
+	virtual void GetUISettings(UISettingList& List) override;
 };
 /// @}
 }