mirror of
https://github.com/nextcloud/desktop.git
synced 2024-11-27 17:37:36 +03:00
Show browser as independent window instead of putting it into dialog.
When browser is shown, dialog is hidden. It reappears after we are done with logging in.
This commit is contained in:
parent
f6e3838eb2
commit
72d51e4667
1 changed files with 5 additions and 2 deletions
|
@ -59,15 +59,16 @@ bool OwncloudShibbolethCredsPage::isComplete() const
|
|||
void OwncloudShibbolethCredsPage::initializePage()
|
||||
{
|
||||
WizardCommon::initErrorLabel(_ui.errorLabel);
|
||||
_browser = new ShibbolethWebView(QUrl(field("OCUrl").toString().simplified()), this);
|
||||
_browser = new ShibbolethWebView(QUrl(field("OCUrl").toString().simplified()));
|
||||
|
||||
_browser->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
|
||||
connect(_browser, SIGNAL(shibbolethCookieReceived(QNetworkCookie)),
|
||||
this, SLOT(onShibbolethCookieReceived(QNetworkCookie)));
|
||||
|
||||
_ui.contentLayout->insertWidget(0, _browser);
|
||||
//_ui.contentLayout->insertWidget(0, _browser);
|
||||
_browser->show();
|
||||
_browser->setFocus();
|
||||
wizard()->hide();
|
||||
_ui.infoLabel->show();
|
||||
_ui.infoLabel->setText(tr("Please follow the steps on displayed page above"));
|
||||
_stage = INITIAL_STEP;
|
||||
|
@ -130,6 +131,7 @@ void OwncloudShibbolethCredsPage::setConnected( bool comp )
|
|||
initializePage();
|
||||
}
|
||||
emit completeChanged();
|
||||
wizard()->show();
|
||||
}
|
||||
|
||||
void OwncloudShibbolethCredsPage::setErrorString(const QString& err)
|
||||
|
@ -156,6 +158,7 @@ void OwncloudShibbolethCredsPage::onShibbolethCookieReceived(const QNetworkCooki
|
|||
_cookie = cookie;
|
||||
_ui.infoLabel->setText("Please click \"Connect\" to check received Shibboleth session.");
|
||||
emit completeChanged();
|
||||
validatePage();
|
||||
}
|
||||
|
||||
} // ns Mirall
|
||||
|
|
Loading…
Reference in a new issue