Display the content of the login dialog correct

This adjustment is necessary because of the changes of the new account
wizard that were introduced with:
e0b7ef15b2

Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
This commit is contained in:
Felix Weilbach 2021-03-11 11:32:23 +01:00 committed by Felix Weilbach (Rebase PR Action)
parent 6d6da18f9a
commit ff7932bb54
3 changed files with 5 additions and 10 deletions

View file

@ -156,7 +156,7 @@ void WebFlowCredentials::askFromUser() {
_askDialog->setUrl(url); _askDialog->setUrl(url);
} }
QString msg = tr("You have been logged out of %1 as user %2. Please login again") QString msg = tr("You have been logged out of %1 as user %2. Please login again.")
.arg(_account->displayName(), _user); .arg(_account->displayName(), _user);
_askDialog->setInfo(msg); _askDialog->setInfo(msg);

View file

@ -27,19 +27,12 @@ WebFlowCredentialsDialog::WebFlowCredentialsDialog(Account *account, bool useFlo
_layout->setSpacing(0); _layout->setSpacing(0);
_layout->setMargin(0); _layout->setMargin(0);
if(_useFlow2) {
_headerBanner = new HeaderBanner(this);
_layout->addWidget(_headerBanner);
Theme *theme = Theme::instance();
_headerBanner->setup(tr("Log in"), theme->wizardHeaderLogo(), theme->wizardHeaderBanner(),
Qt::AutoText, QString::fromLatin1("color:#fff;"));
}
_containerLayout = new QVBoxLayout(this); _containerLayout = new QVBoxLayout(this);
_containerLayout->setSpacing(spacing); _containerLayout->setSpacing(spacing);
_containerLayout->setMargin(margin); _containerLayout->setMargin(margin);
_infoLabel = new QLabel(); _infoLabel = new QLabel();
_infoLabel->setAlignment(Qt::AlignCenter);
_containerLayout->addWidget(_infoLabel); _containerLayout->addWidget(_infoLabel);
if (_useFlow2) { if (_useFlow2) {

View file

@ -45,6 +45,8 @@ Flow2AuthWidget::Flow2AuthWidget(QWidget *parent)
_ui.progressLayout->addWidget(_progressIndi); _ui.progressLayout->addWidget(_progressIndi);
stopSpinner(false); stopSpinner(false);
customizeStyle();
} }
void Flow2AuthWidget::setLogo() void Flow2AuthWidget::setLogo()