Separating StaticFilter into own file and adding new GUISetting Methods. These will probably be replaced again soon.

Author: PapeCoding

CMakeLists.txt

@@ -84,6 +84,7 @@ set(SOURCE_FILES
 	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/SimpleTimer.cpp
 	# ${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/SocketInput.cpp
 	# ${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/SocketInputBase.cpp
+	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/StaticFilter.cpp
 	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/StylusFilter.cpp
 	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/TimeSpan.cpp
 	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/Trainer.cpp

Src/Common/ModuleSettings.h

@@ -37,39 +37,45 @@ namespace Dasher {
     struct ModuleSetting
     {
       SettingsType Type;
-      ModuleSetting(SettingsType Type, Dasher::Parameter Param, std::string Name, std::string Description) : Type(Type), Param(Param), Description(Description), Name(Name) {}
+      ModuleSetting(SettingsType Type, Dasher::Parameter Param, std::string Name, std::string Description, bool AdvancedSetting) : Type(Type), Param(Param), Description(Description), Name(Name), AdvancedSetting(AdvancedSetting) {}
       virtual ~ModuleSetting() {};
+
+      bool operator<(const ModuleSetting& other) const
+      {
+          return Name < other.Name;
+      }
 
       std::string Name;
       std::string Description;
       Dasher::Parameter Param;
+      bool AdvancedSetting;
     };
 
     struct TextboxSetting : ModuleSetting {
-      TextboxSetting(Dasher::Parameter Param, std::string Name, std::string Description) : ModuleSetting(SettingsType::TextField, Param, Name, Description) {}
+      TextboxSetting(Dasher::Parameter Param, std::string Name, std::string Description, bool AdvancedSetting) : ModuleSetting(SettingsType::TextField, Param, Name, Description, AdvancedSetting) {}
     };
 
     struct SliderSetting : ModuleSetting {
-      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) {};
+      SliderSetting(Dasher::Parameter Param, std::string Name, std::string Description, bool AdvancedSetting, int min, int max, int step) : ModuleSetting(SettingsType::Slider, Param, Name, Description, AdvancedSetting), min(min), max(max), step(step) {};
       int min;
       int max;
       int step;
     };
 
     struct SpinSetting : ModuleSetting {
-      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) {}
+      SpinSetting(Dasher::Parameter Param, std::string Name, std::string Description, bool AdvancedSetting, int min, int max, int step) : ModuleSetting(SettingsType::Step, Param, Name, Description, AdvancedSetting), min(min), max(max), step(step) {}
       int min;
       int max;
       int step;
     };
 
     struct EnumSetting : ModuleSetting {
-      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) {};
+      EnumSetting(Dasher::Parameter Param, std::string Name, std::string Description, bool AdvancedSetting, std::unordered_map<std::string, int> Enums) : ModuleSetting(SettingsType::Enum, Param, Name, Description, AdvancedSetting), Enums(Enums) {};
       std::unordered_map<std::string, int> Enums;
     };
 
     struct SwitchSetting : ModuleSetting {
-      SwitchSetting(Dasher::Parameter Param, std::string Name, std::string Description) : ModuleSetting(SettingsType::Switch, Param, Name, Description) {};
+      SwitchSetting(Dasher::Parameter Param, std::string Name, std::string Description, bool AdvancedSetting) : ModuleSetting(SettingsType::Switch, Param, Name, Description, AdvancedSetting) {};
     };
   }
-}
+}

Src/DasherCore/ButtonMode.cpp

@@ -7,6 +7,7 @@
 #include <I18n.h>
 #include <cmath>
 
+#include "DasherButtons.h"
 #include "DasherScreen.h"
 #include "DasherInterfaceBase.h"
 
@@ -29,6 +30,13 @@ static SModuleSettings sSettings[] = {
   {BP_GLOBAL_KEYBOARD, T_BOOL, -1, -1, -1, -1, _("Global keyboard grab")}
 };
 
+void CButtonMode::GetUISettings(UISettingList& List) {
+    CDasherButtons::GetUISettings(List);
+    DeclareSpinButtonSetting(List, Dasher::Parameter::LP_B, "LP_B", "", false, 2, 10, 1);
+    DeclareSpinButtonSetting(List, Dasher::Parameter::LP_S, "LP_S", "", false, 0, 256, 1);
+    DeclareSpinButtonSetting(List, Dasher::Parameter::LP_R, "LP_R", "", false, -89, 89, 10);
+}
+
 // FIX iStyle == 0
 
 CButtonMode::CButtonMode(CSettingsStore* pSettingsStore, CDasherInterfaceBase *pInterface, bool bMenu, const char *szName)

Src/DasherCore/ButtonMode.h

@@ -23,6 +23,7 @@ class CButtonMode : public CDasherButtons
   void KeyDown(unsigned long Time, Keys::VirtualKey Key, CDasherView *pView, CDasherInput *pInput, CDasherModel *pModel) override;
 
   bool GetSettings(SModuleSettings **pSettings, int *iCount) override;
+  virtual void GetUISettings(UISettingList& List) override;
  protected: 
   void SetupBoxes() override;
   void DirectKeyDown(unsigned long iTime, Keys::VirtualKey Key, CDasherView* pView, CDasherModel* pModel) override;

Src/DasherCore/ButtonMultiPress.cpp

@@ -27,6 +27,12 @@ CButtonMultiPress::CButtonMultiPress(CSettingsStore* pSettingsStore, CDasherInte
   : CDynamicButtons(pSettingsStore, pInterface, pFramerate, szName) {
 }
 
+void CButtonMultiPress::GetUISettings(UISettingList& List) {
+    CDynamicButtons::GetUISettings(List);
+    DeclareSpinButtonSetting(List, Dasher::Parameter::LP_HOLD_TIME, "LP_HOLD_TIME", "", false, 1, 1000, 1);
+    DeclareSpinButtonSetting(List, Dasher::Parameter::LP_MULTIPRESS_TIME, "LP_MULTIPRESS_TIME", "", false, 1, 1000, 1);
+}
+
 void CButtonMultiPress::Timer(unsigned long iTime, CDasherView *pView, CDasherInput *pInput, CDasherModel *pModel, CExpansionPolicy **pol) {
   if(m_bKeyDown && !m_bKeyHandled && ((iTime - m_iKeyDownTime) > static_cast<unsigned long>(m_pSettingsStore->GetLongParameter(LP_HOLD_TIME)))) {
     ButtonEvent(iTime, m_iHeldId, 1, pModel);

Src/DasherCore/ButtonMultiPress.h

@@ -38,6 +38,8 @@ class CButtonMultiPress : public CDynamicButtons {
   void KeyDown(unsigned long iTime, Keys::VirtualKey Key, CDasherView *pView, CDasherInput *pInput, CDasherModel *pModel) override;
 
   void pause() override;
+  virtual void GetUISettings(UISettingList& List) override;
+
  protected:
   virtual unsigned int maxClickCount()=0;
   void reverse(unsigned long iTime) override;

Src/DasherCore/ClickFilter.cpp

@@ -1,5 +1,6 @@
 #include "ClickFilter.h"
 #include "DasherInterfaceBase.h"
+#include "StaticFilter.h"
 #include <algorithm>
 
 using namespace Dasher;
@@ -18,6 +19,15 @@ static SModuleSettings sSettings[] = {
   {BP_CURVE_MOUSE_LINE, T_BOOL, -1, -1, -1, -1, _("Curve lines to follow the non-linearity of the view transform")},
 };
 
+void CClickFilter::GetUISettings(UISettingList& List) {
+  CStaticFilter::GetUISettings(List);
+  DeclareSwitchSetting(List, Dasher::Parameter::BP_DRAW_MOUSE_LINE, "BP_DRAW_MOUSE_LINE", "", false);
+  DeclareSwitchSetting(List, Dasher::Parameter::BP_CURVE_MOUSE_LINE, "BP_CURVE_MOUSE_LINE", "", false);
+  DeclareSpinButtonSetting(List, Dasher::Parameter::LP_LINE_WIDTH, "LP_LINE_WIDTH", "", false, 1, 1000, 1);
+  DeclareSpinButtonSetting(List, Dasher::Parameter::LP_S, "LP_S", "", false, 1, 1000, 1);
+  DeclareSpinButtonSetting(List, Dasher::Parameter::LP_MAXZOOM, "LP_MAXZOOM", "", false, 1, 1000, 1);
+}
+
 bool CClickFilter::DecorateView(CDasherView *pView, CDasherInput *pInput) {
   bool bChanged(false);
   if (m_pSettingsStore->GetBoolParameter(BP_DRAW_MOUSE_LINE)) {

Src/DasherCore/ClickFilter.h

@@ -2,7 +2,8 @@
 
 #include <I18n.h>
 
-#include "InputFilter.h"
+#include "SettingsStore.h"
+#include "StaticFilter.h"
 
 /// \ingroup InputFilter
 /// @{
@@ -26,7 +27,8 @@ class CClickFilter : public CStaticFilter, private CZoomAdjuster {
   virtual bool DecorateView(CDasherView *pView, CDasherInput *pInput) override;
   virtual void KeyDown(unsigned long iTime, Keys::VirtualKey Key, CDasherView *pView, CDasherInput *pInput, CDasherModel *pModel) override;
   virtual bool GetSettings(SModuleSettings **pSettings, int *iCount) override;
-  
+  virtual void GetUISettings(UISettingList& List) override;
+
  private:
   //for mouse lines
   myint m_iLastX, m_iLastY;

Src/DasherCore/CompassMode.cpp

@@ -21,6 +21,11 @@ static SModuleSettings sSettings[] = {
   {BP_GLOBAL_KEYBOARD, T_BOOL, -1, -1, -1, -1, _("Global keyboard grab")}
 };
 
+void CCompassMode::GetUISettings(UISettingList& List) {
+    CDasherButtons::GetUISettings(List);
+    DeclareSpinButtonSetting(List, Dasher::Parameter::LP_RIGHTZOOM, "LP_RIGHTZOOM", "", false, 1024, 10240, 1024);
+}
+
 // FIX iStyle == 2
 
 CCompassMode::CCompassMode(CSettingsStore* pSettingsStore, CDasherInterfaceBase *pInterface)

Src/DasherCore/CompassMode.h

@@ -19,6 +19,7 @@ class CCompassMode : public CDasherButtons
   bool DecorateView(CDasherView *pView, CDasherInput *pInput) override;
 
   bool GetSettings(SModuleSettings **pSettings, int *iCount) override;
+  virtual void GetUISettings(UISettingList& List) override;
 
  protected:
   void SetupBoxes() override;