Add preferences for flag colors

src/XGridCtrl.cpp

@@ -204,6 +204,9 @@ void XGridCtrl::Init()
     grid.backgroundColor.AddCallback(this, &XGridCtrl::SetBackgroundColour);
     grid.whiteSquareColor.AddCallback(this, &XGridCtrl::SetWhiteSquareColor);
     grid.blackSquareColor.AddCallback(this, &XGridCtrl::SetBlackSquareColor);
+    grid.correctFlagColor.AddCallback(this, &XGridCtrl::SetCorrectColor);
+    grid.checkedFlagColor.AddCallback(this, &XGridCtrl::SetCheckedColor);
+    grid.revealedFlagColor.AddCallback(this, &XGridCtrl::SetRevealedColor);
     grid.highlightTheme.AddCallback(this, &XGridCtrl::ShowThemeHighlight);
     grid.themeSquareColor.AddCallback(this, &XGridCtrl::SetThemeSquareColor);
     grid.selectionColor.AddCallback(this, &XGridCtrl::SetSelectionColor);

src/XGridCtrl.hpp

@@ -252,6 +252,12 @@ class XGridCtrl
         { m_drawer.SetWhiteSquareColor(color); if (! IsEmpty()) Refresh(); }
     void SetBlackSquareColor(const wxColor & color)  
         { m_drawer.SetBlackSquareColor(color); if (! IsEmpty()) Refresh(); }
+    void SetCorrectColor(const wxColor & color)
+        { m_drawer.SetCorrectColor(color); if (! IsEmpty()) Refresh(); }
+    void SetCheckedColor(const wxColor & color)
+        { m_drawer.SetCheckedColor(color); if (! IsEmpty()) Refresh(); }
+    void SetRevealedColor(const wxColor & color)
+        { m_drawer.SetRevealedColor(color); if (! IsEmpty()) Refresh(); }
     void ShowThemeHighlight(bool doit = true)
         { m_drawer.ShowThemeHighlight(doit); if (! IsEmpty()) Refresh(); }
     void SetThemeSquareColor(const wxColor & color)  
@@ -268,6 +274,12 @@ class XGridCtrl
         { return m_drawer.GetWhiteSquareColor(); }
     const wxColor & GetBlackSquareColor()   const
         { return m_drawer.GetBlackSquareColor(); }
+    const wxColor & GetCorrectColor() const
+        { return m_drawer.GetCorrectColor(); }
+    const wxColor & GetCheckedColor() const
+        { return m_drawer.GetCheckedColor(); }
+    const wxColor & GetRevealedColor() const
+        { return m_drawer.GetRevealedColor(); }
     const wxColor & GetThemeSquareColor()   const
         { return m_drawer.GetThemeColor(); }
     const wxColor & GetPenColor()           const

src/config.cpp

@@ -55,6 +55,9 @@ ConfigManager::Grid_t::Grid_t(ConfigManager * cfg)
       focusedWordColor(this, _T("focusedWordColor"), &cfg->Appearance.gridHighlightColor, &GetWordHighlight),
       whiteSquareColor(this, _T("whiteSquareColor"), *wxWHITE),
       blackSquareColor(this, _T("blackSquareColor"), *wxBLACK),
+      correctFlagColor(this, _T("correctFlagColor"), wxColour(64, 193, 23)),
+      checkedFlagColor(this, _T("checkedFlagColor"), *wxBLACK),
+      revealedFlagColor(this, _T("revealedFlagColor"), wxColour(246, 36, 0)),
       highlightTheme(this, _T("highlightTheme"), false),
       themeSquareColor(this, _T("themeSquareColor"), &cfg->Appearance.gridHighlightColor, &GetThemeColor),
       selectionColor(this, _T("selectionColor"), &cfg->Appearance.listHighlightColor),

src/config.hpp

@@ -83,6 +83,9 @@ class ConfigManager : public ConfigManagerBase
         ConfigColor focusedWordColor;
         ConfigColor whiteSquareColor;
         ConfigColor blackSquareColor;
+        ConfigColor correctFlagColor;
+        ConfigColor checkedFlagColor;
+        ConfigColor revealedFlagColor;
         ConfigBool highlightTheme;
         ConfigColor themeSquareColor;
         ConfigColor selectionColor;

src/dialogs/TreePanels.hpp

@@ -250,6 +250,9 @@ class GridBaseAppearance : public AppearancePanelBase
         Add(grid.numberFont, "Number", FontDesc(FP_DEFAULT & ~FP_POINTSIZE));
         Add(grid.penColor, "Text");
         Add(grid.backgroundColor, "Background");
+        Add(grid.correctFlagColor, "Correct dot");
+        Add(grid.checkedFlagColor, "Incorrect triangle");
+        Add(grid.revealedFlagColor, "Revealed triangle");
     }
 };