fix(moneymanagerex#4907): save setting

whalley · Aug 17, 2022 · 58dad26 · 58dad26
1 parent b321265
commit 58dad26
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 6 deletions.
diff --git a/src/constants.cpp b/src/constants.cpp
@@ -193,6 +193,7 @@ const wxString VIEW_ACCOUNTS_OPEN_STR = wxTRANSLATE("Open");
 const wxString VIEW_ACCOUNTS_CLOSED_STR = wxTRANSLATE("Closed");
 const wxString VIEW_ACCOUNTS_FAVORITES_STR = wxTRANSLATE("Favorites");
 
+const wxString INIDB_HIDE_SHARE_ACCOUNTS          = "HIDE_SHARE_ACCOUNTS";
 const wxString INIDB_BUDGET_FINANCIAL_YEARS       = "BUDGET_FINANCIAL_YEARS";
 const wxString INIDB_BUDGET_INCLUDE_TRANSFERS     = "BUDGET_INCLUDE_TRANSFERS";
 const wxString INIDB_BUDGET_SETUP_WITHOUT_SUMMARY = "BUDGET_SETUP_WITHOUT_SUMMARY";

diff --git a/src/constants.h b/src/constants.h
@@ -119,6 +119,7 @@ extern const wxString INIDB_USE_ORG_DATE_DUPLICATE;
 extern const wxString INIDB_SEND_USAGE_STATS;
 extern const wxString INIDB_CHECK_NEWS;
 
+extern const wxString INIDB_HIDE_SHARE_ACCOUNTS;
 extern const wxString INIDB_BUDGET_FINANCIAL_YEARS;
 extern const wxString INIDB_BUDGET_INCLUDE_TRANSFERS;
 extern const wxString INIDB_BUDGET_SUMMARY_WITHOUT_CATEG;

diff --git a/src/mmcustomdata.cpp b/src/mmcustomdata.cpp
@@ -626,14 +626,13 @@ void mmCustomData::OnDoubleTextEntered(wxCommandEvent& event)
     int id = event.GetId();
     wxWindow* w = FindWindowById(id, m_dialog);
     mmTextCtrl* d = static_cast<mmTextCtrl*>(w);
-    double value = 0;
     int digitScale = GetPrecision(id);
     if (d->Calculate(digitScale))
     {
+        double value;
         d->GetDouble(value);
         d->SetValue(value, digitScale);
         SetWidgetChanged(event.GetId(), d->GetValue());
-
     }
 }
 

diff --git a/src/mmframe.cpp b/src/mmframe.cpp
@@ -215,7 +215,6 @@ mmGUIFrame::mmGUIFrame(mmGUIApp* app, const wxString& title
     , toolBar_(nullptr)
     , selectedItemData_(nullptr)
     , helpFileIndex_(-1)
-    , m_hide_share_accounts(true)
     , autoRepeatTransactionsTimer_(this, AUTO_REPEAT_TRANSACTIONS_TIMER_ID)
 {
     // tell wxAuiManager to manage this frame
@@ -888,7 +887,7 @@ void mmGUIFrame::DoRecreateNavTreeControl()
         if (!m_nav_tree_ctrl->ItemHasChildren(loanAccounts)) {
             m_nav_tree_ctrl->Delete(loanAccounts);
         }
-        if (!m_nav_tree_ctrl->ItemHasChildren(shareAccounts) || m_hide_share_accounts)
+        if (!m_nav_tree_ctrl->ItemHasChildren(shareAccounts) || Option::instance().HideShareAccounts())
         {
             m_nav_tree_ctrl->Delete(shareAccounts);
         }
@@ -1792,6 +1791,7 @@ void mmGUIFrame::createMenu()
     menuBar_->Append(menuHelp, _("&Help"));
     SetMenuBar(menuBar_);
 
+    menuBar_->Check(MENU_VIEW_HIDE_SHARE_ACCOUNTS, !Option::instance().HideShareAccounts());
     menuBar_->Check(MENU_VIEW_BUDGET_FINANCIAL_YEARS, Option::instance().BudgetFinancialYears());
     menuBar_->Check(MENU_VIEW_BUDGET_TRANSFER_TOTAL, Option::instance().BudgetIncludeTransfers());
     menuBar_->Check(MENU_VIEW_BUDGET_CATEGORY_SUMMARY, Option::instance().BudgetReportWithSummaries());
@@ -3326,7 +3326,7 @@ void mmGUIFrame::OnViewLinksUpdateUI(wxUpdateUIEvent &event)
 
 void mmGUIFrame::OnHideShareAccounts(wxCommandEvent &WXUNUSED(event))
 {
-    m_hide_share_accounts = !m_hide_share_accounts;
+    Option::instance().HideShareAccounts(!Option::instance().HideShareAccounts());
     DoRecreateNavTreeControl();
 }
 

diff --git a/src/mmframe.h b/src/mmframe.h
@@ -190,7 +190,6 @@ class mmGUIFrame : public wxFrame
     void OnGotoAccount(wxCommandEvent& WXUNUSED(event));
     void OnGotoStocksAccount(wxCommandEvent& WXUNUSED(event));
 private:
-    bool m_hide_share_accounts;
     void OnHideShareAccounts(wxCommandEvent &event);
     void OnChangeGUILanguage(wxCommandEvent &event);
     void OnKeyDown(wxTreeEvent& event);

diff --git a/src/option.cpp b/src/option.cpp
@@ -96,6 +96,7 @@ void Option::LoadOptions(bool include_infotable)
 
     m_language = Option::instance().getLanguageID(true);
 
+    m_hideShareAccounts = Model_Setting::instance().GetBoolSetting(INIDB_HIDE_SHARE_ACCOUNTS, true);
     m_budgetFinancialYears = Model_Setting::instance().GetBoolSetting(INIDB_BUDGET_FINANCIAL_YEARS, false);
     m_budgetIncludeTransfers = Model_Setting::instance().GetBoolSetting(INIDB_BUDGET_INCLUDE_TRANSFERS, false);
     m_budgetReportWithSummaries = Model_Setting::instance().GetBoolSetting(INIDB_BUDGET_SUMMARY_WITHOUT_CATEG, true);
@@ -216,6 +217,17 @@ bool Option::DatabaseUpdated()
     return m_databaseUpdated;
 }
 
+void Option::HideShareAccounts(bool value)
+{
+    Model_Setting::instance().Set(INIDB_HIDE_SHARE_ACCOUNTS, value);
+    m_hideShareAccounts = value;
+}
+
+bool Option::HideShareAccounts()
+{
+    return m_hideShareAccounts;
+}
+
 void Option::BudgetFinancialYears(bool value)
 {
     Model_Setting::instance().Set(INIDB_BUDGET_FINANCIAL_YEARS, value);

diff --git a/src/option.h b/src/option.h
@@ -72,6 +72,9 @@ class Option
     void DatabaseUpdated(bool value);
     bool DatabaseUpdated();
 
+    void HideShareAccounts(bool value);
+    bool HideShareAccounts();
+
     void BudgetFinancialYears(bool value);
     bool BudgetFinancialYears();
 
@@ -167,6 +170,7 @@ class Option
     bool m_bulk_enter;
 
     bool m_databaseUpdated;
+    bool m_hideShareAccounts;               //INIDB_HIDE_SHARE_ACCOUNTS
     bool m_budgetFinancialYears;            //INIDB_BUDGET_FINANCIAL_YEARS
     bool m_budgetIncludeTransfers;          //INIDB_BUDGET_INCLUDE_TRANSFERS
     bool m_budgetReportWithSummaries;       //INIDB_BUDGET_SUMMARY_WITHOUT_CATEG