зеркало из https://github.com/nextcloud/desktop.git
Wizard: Don't show not-so-useful result page #5726
Better immediately show the settings dialog where people can see what's going on. They can go to sync folder or webinterface from there.
This commit is contained in:
Родитель
bb244d527c
Коммит
4ed9edb104
|
@ -333,24 +333,6 @@ void Application::slotownCloudWizardDone( int res )
|
||||||
folderMan->setSyncEnabled(true);
|
folderMan->setSyncEnabled(true);
|
||||||
|
|
||||||
if( res == QDialog::Accepted ) {
|
if( res == QDialog::Accepted ) {
|
||||||
// Open the settings page for the new account if no folders
|
|
||||||
// were configured. Using the last account for this check is
|
|
||||||
// not exactly correct, but good enough.
|
|
||||||
if (!accountMan->accounts().isEmpty()) {
|
|
||||||
AccountStatePtr newAccount = accountMan->accounts().last();
|
|
||||||
bool hasFolder = false;
|
|
||||||
foreach (Folder* folder, folderMan->map()) {
|
|
||||||
if (folder->accountState() == newAccount.data()) {
|
|
||||||
hasFolder = true;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!hasFolder) {
|
|
||||||
_gui->slotShowSettings();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check connectivity of the newly created account
|
// Check connectivity of the newly created account
|
||||||
_checkConnectionTimer.start();
|
_checkConnectionTimer.start();
|
||||||
slotCheckConnection();
|
slotCheckConnection();
|
||||||
|
@ -363,6 +345,8 @@ void Application::slotownCloudWizardDone( int res )
|
||||||
&& QCoreApplication::applicationDirPath().startsWith("/Applications/");
|
&& QCoreApplication::applicationDirPath().startsWith("/Applications/");
|
||||||
#endif
|
#endif
|
||||||
Utility::setLaunchOnStartup(_theme->appName(), _theme->appNameGUI(), shouldSetAutoStart);
|
Utility::setLaunchOnStartup(_theme->appName(), _theme->appNameGUI(), shouldSetAutoStart);
|
||||||
|
|
||||||
|
_gui->slotShowSettings();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -185,6 +185,8 @@ void OwncloudWizard::slotCurrentPageChanged( int id )
|
||||||
disconnect(this, SIGNAL(finished(int)), this, SIGNAL(basicSetupFinished(int)));
|
disconnect(this, SIGNAL(finished(int)), this, SIGNAL(basicSetupFinished(int)));
|
||||||
emit basicSetupFinished(QDialog::Accepted);
|
emit basicSetupFinished(QDialog::Accepted);
|
||||||
appendToConfigurationLog( QString::null );
|
appendToConfigurationLog( QString::null );
|
||||||
|
// Immediately close on show, we currently don't want this page anymore
|
||||||
|
close();
|
||||||
}
|
}
|
||||||
|
|
||||||
setOption(QWizard::HaveCustomButton1, id == WizardCommon::Page_AdvancedSetup);
|
setOption(QWizard::HaveCustomButton1, id == WizardCommon::Page_AdvancedSetup);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче