1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00

Merge branch 'pr2818'

This commit is contained in:
tux3 2016-01-20 16:58:16 +01:00
commit e93c1baa6c
No known key found for this signature in database
GPG Key ID: 7E086DD661263264

View File

@ -172,11 +172,18 @@ void LoginScreen::onLoginUsernameSelected(const QString &name)
{ {
ui->loginPasswordLabel->show(); ui->loginPasswordLabel->show();
ui->loginPassword->show(); ui->loginPassword->show();
// there is no way to do autologin if profile is encrypted, and
// visible option confuses users into thinking that it is possible,
// thus disable it (and hope that users won't think that it's a bug)
ui->autoLoginCB->setEnabled(false);
ui->autoLoginCB->setToolTip(tr("Password protected profile can't be loaded automatically."));
} }
else else
{ {
ui->loginPasswordLabel->hide(); ui->loginPasswordLabel->hide();
ui->loginPassword->hide(); ui->loginPassword->hide();
ui->autoLoginCB->setEnabled(true);
ui->autoLoginCB->setToolTip("");
} }
} }