[office/kmymoney] /: Remove hide closed accounts option from config
Thomas Baumgart
null at kde.org
Fri Jun 4 20:50:47 BST 2021
Git commit 445958f5b904db1d8a5a1d9623b082577bc5475a by Thomas Baumgart, on behalf of Suraj Kumar Mahto.
Committed on 04/06/2021 at 19:50.
Pushed by tbaumgart into branch 'master'.
Remove hide closed accounts option from config
M +0 -10 doc/details-settings.docbook
M +0 -12 kmymoney/dialogs/settings/ksettingsgeneral.ui
M +0 -4 kmymoney/settings/kmymoney.kcfg
M +7 -1 kmymoney/settings/kmymoney.upd
M +2 -2 kmymoney/views/kaccountsview.cpp
M +1 -1 kmymoney/views/kgloballedgerview_p.h
M +4 -4 kmymoney/views/khomeview_p.h
M +2 -2 kmymoney/views/kinvestmentview_p.h
M +1 -1 kmymoney/views/ledgerview.cpp
M +1 -1 kmymoney/views/simpleledgerview.cpp
M +1 -1 kmymoney/views/splitview.cpp
M +1 -1 kmymoney/widgets/ktransactionfilter_p.h
https://invent.kde.org/office/kmymoney/commit/445958f5b904db1d8a5a1d9623b082577bc5475a
diff --git a/doc/details-settings.docbook b/doc/details-settings.docbook
index fd9b52586..2acd79b10 100644
--- a/doc/details-settings.docbook
+++ b/doc/details-settings.docbook
@@ -164,16 +164,6 @@
</listitem>
</varlistentry>
- <varlistentry>
- <term><guilabel>Do not show closed accounts</guilabel></term>
- <listitem>
- <para>Checking this box hides closed accounts from display in the Accounts,
- Ledger, and Investment Views. Hiding closed accounts makes viewing and working
- with open accounts easier. Unchecking this box will show closed accounts with
- a line drawn through them allowing viewing and reopening if needed.</para>
- </listitem>
- </varlistentry>
-
<varlistentry>
<term><guilabel>Show equity accounts</guilabel></term>
<listitem>
diff --git a/kmymoney/dialogs/settings/ksettingsgeneral.ui b/kmymoney/dialogs/settings/ksettingsgeneral.ui
index d5617c924..67a1eb7fc 100644
--- a/kmymoney/dialogs/settings/ksettingsgeneral.ui
+++ b/kmymoney/dialogs/settings/ksettingsgeneral.ui
@@ -401,18 +401,6 @@ Set it to 0 to turn the feature off.</string>
</property>
</widget>
</item>
- <item>
- <widget class="QCheckBox" name="kcfg_HideClosedAccounts">
- <property name="whatsThis">
- <string>This option hides all accounts that have been closed by the user in views and selection lists.
-
-You can use <b>View/Show all accounts</b> to temporarily show hidden accounts in the views.</string>
- </property>
- <property name="text">
- <string>Do not show closed accounts</string>
- </property>
- </widget>
- </item>
<item>
<widget class="QCheckBox" name="kcfg_ExpertMode">
<property name="text">
diff --git a/kmymoney/settings/kmymoney.kcfg b/kmymoney/settings/kmymoney.kcfg
index 119e82ebc..a92bced8a 100644
--- a/kmymoney/settings/kmymoney.kcfg
+++ b/kmymoney/settings/kmymoney.kcfg
@@ -224,10 +224,6 @@
<label>Hide unused categories</label>
<default>false</default>
</entry>
- <entry name="HideClosedAccounts" type="Bool">
- <label>Hide closed accounts</label>
- <default>false</default>
- </entry>
<entry name="ShowAllAccounts" type="Bool">
<label>Show all accounts</label>
<default>false</default>
diff --git a/kmymoney/settings/kmymoney.upd b/kmymoney/settings/kmymoney.upd
index d55becd02..5c7d35a08 100644
--- a/kmymoney/settings/kmymoney.upd
+++ b/kmymoney/settings/kmymoney.upd
@@ -1,4 +1,10 @@
+Version=5
Id=1
-File=kmymoneyrc
+File=kmymoney/kmymoneyrc
Group=List Options
Key=listErronousTransactionColor,listErroneousTransactionColor
+
+Id=remove-hide-acc-opt-2021
+File=kmymoney/kmymoneyrc
+Group=List Options
+RemoveKey=HideClosedAccounts
diff --git a/kmymoney/views/kaccountsview.cpp b/kmymoney/views/kaccountsview.cpp
index 1e687ca0f..1b8aef13d 100644
--- a/kmymoney/views/kaccountsview.cpp
+++ b/kmymoney/views/kaccountsview.cpp
@@ -107,7 +107,7 @@ void KAccountsView::refresh()
// TODO: check why the invalidate is needed here
d->m_proxyModel->invalidate();
- d->m_proxyModel->setHideClosedAccounts(KMyMoneySettings::hideClosedAccounts() && !KMyMoneySettings::showAllAccounts());
+ d->m_proxyModel->setHideClosedAccounts(!KMyMoneySettings::showAllAccounts());
d->m_proxyModel->setHideEquityAccounts(!KMyMoneySettings::expertMode());
if (KMyMoneySettings::showCategoriesInAccountsView()) {
d->m_proxyModel->addAccountGroup(QVector<eMyMoney::Account::Type> {eMyMoney::Account::Type::Income, eMyMoney::Account::Type::Expense});
@@ -273,7 +273,7 @@ void KAccountsView::slotCloseAccount()
d->m_currentAccount.setClosed(true);
MyMoneyFile::instance()->modifyAccount(d->m_currentAccount);
ft.commit();
- if (KMyMoneySettings::hideClosedAccounts())
+ if (!KMyMoneySettings::showAllAccounts())
KMessageBox::information(this, i18n("<qt>You have closed this account. It remains in the system because you have transactions which still refer to it, but it is not shown in the views. You can make it visible again by going to the View menu and selecting <b>Show all accounts</b> or by deselecting the <b>Do not show closed accounts</b> setting.</qt>"), i18n("Information"), "CloseAccountInfo");
} catch (const MyMoneyException &) {
}
diff --git a/kmymoney/views/kgloballedgerview_p.h b/kmymoney/views/kgloballedgerview_p.h
index e0ea3d6fc..05dcaa0a5 100644
--- a/kmymoney/views/kgloballedgerview_p.h
+++ b/kmymoney/views/kgloballedgerview_p.h
@@ -405,7 +405,7 @@ public:
// TODO: check why the invalidate is needed here
m_filterProxyModel->invalidate();
m_filterProxyModel->setHideFavoriteAccounts(false);
- m_filterProxyModel->setHideClosedAccounts(KMyMoneySettings::hideClosedAccounts() && !KMyMoneySettings::showAllAccounts());
+ m_filterProxyModel->setHideClosedAccounts(!KMyMoneySettings::showAllAccounts());
m_filterProxyModel->setHideEquityAccounts(!KMyMoneySettings::expertMode());
m_filterProxyModel->sort(AccountsModel::Column::AccountName);
m_accountComboBox->expandAll();
diff --git a/kmymoney/views/khomeview_p.h b/kmymoney/views/khomeview_p.h
index c0fd83730..521c52d50 100644
--- a/kmymoney/views/khomeview_p.h
+++ b/kmymoney/views/khomeview_p.h
@@ -847,13 +847,13 @@ public:
int prec = MyMoneyMoney::denomToPrec(file->baseCurrency().smallestAccountFraction());
QList<MyMoneyAccount> accounts;
- const auto showClosedAccounts = !KMyMoneySettings::hideClosedAccounts() || KMyMoneySettings::showAllAccounts();
+ const auto showAllAccounts = KMyMoneySettings::showAllAccounts();
// get list of all accounts
file->accountList(accounts);
for (QList<MyMoneyAccount>::Iterator it = accounts.begin(); it != accounts.end();) {
bool removeAccount = false;
- if (!(*it).isClosed() || showClosedAccounts) {
+ if (!(*it).isClosed() || showAllAccounts) {
switch ((*it).accountType()) {
case Account::Type::Expense:
case Account::Type::Income:
@@ -1204,10 +1204,10 @@ public:
// get list of all accounts
file->accountList(accounts);
- const auto showClosedAccounts = !KMyMoneySettings::hideClosedAccounts() || KMyMoneySettings::showAllAccounts();
+ const auto showAllAccounts = KMyMoneySettings::showAllAccounts();
for (it = accounts.constBegin(); it != accounts.constEnd();) {
- if (!(*it).isClosed() || showClosedAccounts) {
+ if (!(*it).isClosed() || showAllAccounts) {
switch ((*it).accountType()) {
// group all assets into one list but make sure that investment accounts always show up
case Account::Type::Investment:
diff --git a/kmymoney/views/kinvestmentview_p.h b/kmymoney/views/kinvestmentview_p.h
index 7fb6558f3..cb29221e5 100644
--- a/kmymoney/views/kinvestmentview_p.h
+++ b/kmymoney/views/kinvestmentview_p.h
@@ -201,11 +201,11 @@ public:
Q_Q(KInvestmentView);
/// @todo port to new model code
#if 0
- m_equitiesProxyModel->setHideClosedAccounts(KMyMoneySettings::hideClosedAccounts() && !KMyMoneySettings::showAllAccounts());
+ m_equitiesProxyModel->setHideClosedAccounts(!KMyMoneySettings::showAllAccounts());
m_equitiesProxyModel->setHideZeroBalanceAccounts(KMyMoneySettings::hideZeroBalanceEquities());
m_equitiesProxyModel->invalidate();
- m_accountsProxyModel->setHideClosedAccounts(KMyMoneySettings::hideClosedAccounts() && !KMyMoneySettings::showAllAccounts());
+ m_accountsProxyModel->setHideClosedAccounts(!KMyMoneySettings::showAllAccounts());
m_accountsProxyModel->invalidate();
if (!m_idInvAcc.isEmpty()) { // check if account to be selected exist
diff --git a/kmymoney/views/ledgerview.cpp b/kmymoney/views/ledgerview.cpp
index c0538deb2..11388d9ab 100644
--- a/kmymoney/views/ledgerview.cpp
+++ b/kmymoney/views/ledgerview.cpp
@@ -959,7 +959,7 @@ void LedgerView::slotSettingsChanged()
// KMyMoneySettings::sortNormalView()
// KMyMoneySettings::ledgerLens()
// KMyMoneySettings::showRegisterDetailed()
- d->m_proxyModel->setHideClosedAccounts(KMyMoneySettings::hideClosedAccounts());
+ d->m_proxyModel->setHideClosedAccounts(!KMyMoneySettings::showAllAccounts());
d->m_proxyModel->setHideEquityAccounts(!KMyMoneySettings::expertMode());
d->m_proxyModel->setHideFavoriteAccounts(true);
#endif
diff --git a/kmymoney/views/simpleledgerview.cpp b/kmymoney/views/simpleledgerview.cpp
index e187f4331..b36c521f1 100644
--- a/kmymoney/views/simpleledgerview.cpp
+++ b/kmymoney/views/simpleledgerview.cpp
@@ -617,7 +617,7 @@ void SimpleLedgerView::slotSettingsChanged()
{
Q_D(SimpleLedgerView);
if (d->accountsModel) {
- d->accountsModel->setHideClosedAccounts(KMyMoneySettings::hideClosedAccounts());
+ d->accountsModel->setHideClosedAccounts(!KMyMoneySettings::showAllAccounts());
d->accountsModel->setHideEquityAccounts(!KMyMoneySettings::expertMode());
d->accountsModel->setHideFavoriteAccounts(false);
}
diff --git a/kmymoney/views/splitview.cpp b/kmymoney/views/splitview.cpp
index cac4da6ef..996c645af 100644
--- a/kmymoney/views/splitview.cpp
+++ b/kmymoney/views/splitview.cpp
@@ -410,7 +410,7 @@ void SplitView::slotSettingsChanged()
// KMyMoneySettings::sortNormalView()
// KMyMoneySettings::ledgerLens()
// KMyMoneySettings::showRegisterDetailed()
- d->m_proxyModel->setHideClosedAccounts(KMyMoneySettings::hideClosedAccounts());
+ d->m_proxyModel->setHideClosedAccounts(!KMyMoneySettings::showAllAccounts());
d->m_proxyModel->setHideEquityAccounts(!KMyMoneySettings::expertMode());
d->m_proxyModel->setHideFavoriteAccounts(true);
#endif
diff --git a/kmymoney/widgets/ktransactionfilter_p.h b/kmymoney/widgets/ktransactionfilter_p.h
index 7d2ea0526..65724e408 100644
--- a/kmymoney/widgets/ktransactionfilter_p.h
+++ b/kmymoney/widgets/ktransactionfilter_p.h
@@ -378,7 +378,7 @@ public:
accountSet.addAccountGroup(eMyMoney::Account::Type::Equity);
// set the accountset to show closed account if the settings say so
- accountSet.setHideClosedAccounts(KMyMoneySettings::hideClosedAccounts() && !KMyMoneySettings::showAllAccounts());
+ accountSet.setHideClosedAccounts(!KMyMoneySettings::showAllAccounts());
accountSet.setShowInvestments(withInvestments);
accountSet.load(ui->m_accountsView);
q->connect(ui->m_accountsView, &KMyMoneyAccountSelector::stateChanged, q, &KTransactionFilter::slotUpdateSelections);
More information about the kde-doc-english
mailing list