mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-10-26 14:25:45 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2708 from nextcloud/fix_new_account_wizard_open

Browse source 
Have the new account wizard open again
This commit is contained in:
Kevin Ottens 2020-12-14 16:28:31 +01:00 committed by GitHub
commit 2415d9525b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/gui/accountsettings.cpp
View file

@ -214,9 +214,6 @@ AccountSettings::AccountSettings(AccountState *accountState, QWidget *parent)
_ui->encryptionMessage->hide(); _ui->encryptionMessage->hide();
} }
connect(UserModel::instance(), &UserModel::addAccount,
this, &AccountSettings::slotOpenAccountWizard);
customizeStyle(); customizeStyle();
} }
@ -251,17 +248,6 @@ QString AccountSettings::selectedFolderAlias() const
return _model->data(selected, FolderStatusDelegate::FolderAliasRole).toString(); return _model->data(selected, FolderStatusDelegate::FolderAliasRole).toString();
} }
void AccountSettings::slotOpenAccountWizard()
{
// We can't call isSystemTrayAvailable with appmenu-qt5 because it breaks the systemtray
// (issue #4693, #4944)
if (qgetenv("QT_QPA_PLATFORMTHEME") == "appmenu-qt5" || QSystemTrayIcon::isSystemTrayAvailable()) {
topLevelWidget()->close();
}
OwncloudSetupWizard::runWizard(qApp, SLOT(slotownCloudWizardDone(int)), nullptr);
}
void AccountSettings::slotToggleSignInState() void AccountSettings::slotToggleSignInState()
{ {
if (_accountState->isSignedOut()) { if (_accountState->isSignedOut()) {

1
src/gui/accountsettings.h
View file

@ -89,7 +89,6 @@ protected slots:
void slotFolderWizardRejected(); void slotFolderWizardRejected();
void slotDeleteAccount(); void slotDeleteAccount();
void slotToggleSignInState(); void slotToggleSignInState();
void slotOpenAccountWizard();
void refreshSelectiveSyncStatus(); void refreshSelectiveSyncStatus();
void slotMarkSubfolderEncrypted(const FolderStatusModel::SubFolderInfo* folderInfo); void slotMarkSubfolderEncrypted(const FolderStatusModel::SubFolderInfo* folderInfo);
void slotSubfolderContextMenuRequested(const QModelIndex& idx, const QPoint& point); void slotSubfolderContextMenuRequested(const QModelIndex& idx, const QPoint& point);

2
src/gui/systray.cpp
View file

@ -119,6 +119,8 @@ Systray::Systray()
connect(UserModel::instance(), &UserModel::newUserSelected, connect(UserModel::instance(), &UserModel::newUserSelected,
this, &Systray::slotNewUserSelected); this, &Systray::slotNewUserSelected);
connect(UserModel::instance(), &UserModel::addAccount,
this, &Systray::openAccountWizard);
connect(AccountManager::instance(), &AccountManager::accountAdded, connect(AccountManager::instance(), &AccountManager::accountAdded,
this, &Systray::showWindow); this, &Systray::showWindow);