opensourcemirror
/
nextcloud-desktop
mirror of https://github.com/nextcloud/desktop.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #2989 from nextcloud/bugfix/fix-appearance-login-dialog 

Display the content of the login dialog correct
This commit is contained in:
Felix Weilbach 2021-03-16 14:59:33 +01:00 committed by GitHub
parent 6d6da18f9a ff7932bb54
commit 162dff9525
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/creds/webflowcredentials.cpp
View File

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

9
src/gui/creds/webflowcredentialsdialog.cpp
View File

@ -27,19 +27,12 @@ WebFlowCredentialsDialog::WebFlowCredentialsDialog(Account *account, bool useFlo
_layout->setSpacing(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->setSpacing(spacing);
_containerLayout->setMargin(margin);
_infoLabel = new QLabel();
_infoLabel->setAlignment(Qt::AlignCenter);
_containerLayout->addWidget(_infoLabel);
if (_useFlow2) {

2
src/gui/wizard/flow2authwidget.cpp
View File

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