mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-10-27 23:17:13 +03:00
Code Issues Projects Releases Packages Wiki Activity

SslButton: Only show menu when info is available.

Browse source 
For unencrypted connections there used to be a small arrow indicating
that more information was available, but clicking the button had no
effect. That indicator is now gone because we unset the SslButton's
menu for these cases.
This commit is contained in:
Christian Kamm 2015-07-02 10:49:18 +02:00
parent 4420d52919
commit 1b31f45435
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/gui/sslbutton.cpp
View file

@ -32,8 +32,8 @@ SslButton::SslButton(QWidget *parent) :
setPopupMode(QToolButton::InstantPopup);
setAutoRaise(true);
setMenu(new QMenu(this));
QObject::connect(menu(), SIGNAL(aboutToShow()),
_menu = new QMenu(this);
QObject::connect(_menu, SIGNAL(aboutToShow()),
this, SLOT(slotUpdateMenu()));
}
@ -190,14 +190,16 @@ void SslButton::updateAccountState(AccountState *accountState)
setIcon(QIcon(pm));
QSslCipher cipher = account->sslConfiguration().sessionCipher();
setToolTip(tr("This connection is encrypted using %1 bit %2.\n").arg(cipher.usedBits()).arg(cipher.name()));
setMenu(_menu);
} else {
setIcon(QIcon(QPixmap(Theme::hidpiFileName(":/client/resources/lock-http.png"))));
setToolTip(tr("This connection is NOT secure as it is not encrypted.\n"));
setMenu(nullptr);
}
}
void SslButton::slotUpdateMenu() {
menu()->clear();
_menu->clear();
if (!_accountState) {
return;
@ -214,7 +216,7 @@ void SslButton::slotUpdateMenu() {
return;
}
menu()->addAction(tr("Certificate information:"))->setEnabled(false);
_menu->addAction(tr("Certificate information:"))->setEnabled(false);
QList<QSslCertificate> tmpChain;
foreach(QSslCertificate cert, chain) {
@ -237,7 +239,7 @@ void SslButton::slotUpdateMenu() {
it.toBack();
int i = 0;
while (it.hasPrevious()) {
menu()->addMenu(buildCertMenu(menu(), it.previous(), account->approvedCerts(), i));
_menu->addMenu(buildCertMenu(_menu, it.previous(), account->approvedCerts(), i));
i++;
}
}

1
src/gui/sslbutton.h
View file

@ -45,6 +45,7 @@ private:
QMenu* buildCertMenu(QMenu *parent, const QSslCertificate& cert,
const QList<QSslCertificate>& userApproved, int pos);
QPointer<AccountState> _accountState;
QMenu* _menu;
};
} // namespace OCC