From 910f0c9339dbb6f797d7076509ea181c9facf8ec Mon Sep 17 00:00:00 2001 From: Kevin Ottens Date: Wed, 7 Oct 2020 12:28:31 +0200 Subject: [PATCH] Repair SettingsDialog::showIssuesList This was completely disabled code and the connect was gone... So let's introduce the connect back and have it trigger the main window while selecting the right user. This way the new activity list is displayed and since the conflicts are shown at the top this is hopefully obvious again. Signed-off-by: Kevin Ottens --- src/gui/settingsdialog.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/gui/settingsdialog.cpp b/src/gui/settingsdialog.cpp index 1722ae9d9..e657a4fbc 100644 --- a/src/gui/settingsdialog.cpp +++ b/src/gui/settingsdialog.cpp @@ -188,13 +188,12 @@ void SettingsDialog::showFirstPage() } } -void SettingsDialog::showIssuesList(AccountState *account) { - /*for (auto it = _actionGroupWidgets.begin(); it != _actionGroupWidgets.end(); ++it) { - if (it.value() == _activitySettings[account]) { - it.key()->activate(QAction::ActionEvent::Trigger); - break; - } - }*/ +void SettingsDialog::showIssuesList(AccountState *account) +{ + const auto userModel = UserModel::instance(); + const auto id = userModel->findUserIdForAccount(account); + UserModel::instance()->switchCurrentUser(id); + emit Systray::instance()->showWindow(); } void SettingsDialog::accountAdded(AccountState *s) @@ -229,6 +228,7 @@ void SettingsDialog::accountAdded(AccountState *s) connect(accountSettings, &AccountSettings::folderChanged, _gui, &ownCloudGui::slotFoldersChanged); connect(accountSettings, &AccountSettings::openFolderAlias, _gui, &ownCloudGui::slotFolderOpenAction); + connect(accountSettings, &AccountSettings::showIssuesList, this, &SettingsDialog::showIssuesList); connect(s->account().data(), &Account::accountChangedAvatar, this, &SettingsDialog::slotAccountAvatarChanged); connect(s->account().data(), &Account::accountChangedDisplayName, this, &SettingsDialog::slotAccountDisplayNameChanged); -- 2.30.2