smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: Fingerprintprevew, Add optional title text, remove label for cypher type and add option to toggle the sha mode so art or hash is visible

Browse source
This commit is contained in:
sithlord48 2025-08-24 09:13:46 -04:00 committed by Chris Rizzitello
parent 2c6c65f71e
commit 66366dd95b
3 changed files with 49 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/lib/gui/dialogs/FingerprintDialog.cpp
View file

@ -38,6 +38,7 @@ FingerprintDialog::FingerprintDialog(QWidget *parent, const Fingerprint &fingerp
if (mode == FingerprintDialogMode::Local) { if (mode == FingerprintDialogMode::Local) {
setWindowTitle(tr("Local Fingerprints")); setWindowTitle(tr("Local Fingerprints"));
m_lblHeader->setText(tr("Local computer's fingerprints")); m_lblHeader->setText(tr("Local computer's fingerprints"));
m_lblHeader->setWordWrap(false);
m_lblFooter->setVisible(false); m_lblFooter->setVisible(false);
m_buttonBox->setStandardButtons(QDialogButtonBox::Ok); m_buttonBox->setStandardButtons(QDialogButtonBox::Ok);
connect(m_buttonBox->button(QDialogButtonBox::Ok), &QPushButton::clicked, this, &QDialog::accept); connect(m_buttonBox->button(QDialogButtonBox::Ok), &QPushButton::clicked, this, &QDialog::accept);

56
src/lib/gui/widgets/FingerprintPreview.cpp
View file

@ -12,18 +12,30 @@
#include <net/SecureUtils.h> #include <net/SecureUtils.h>
FingerprintPreview::FingerprintPreview(QWidget *parent, const Fingerprint &fingerprint) : QFrame(parent) FingerprintPreview::FingerprintPreview(
QWidget *parent, const Fingerprint &fingerprint, const QString &titleText, bool hashMode
)
: QFrame(parent)
{ {
setFrameShape(QFrame::StyledPanel); setFrameShape(QFrame::StyledPanel);
setFrameStyle(QFrame::Sunken); setFrameStyle(QFrame::Sunken);
setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum); setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
setLayout(fingerprint.type == Fingerprint::Type::SHA256 ? sha256Layout(fingerprint) : emptyLayout()); setLayout(
fingerprint.type == Fingerprint::Type::SHA256 ? sha256Layout(fingerprint, titleText, hashMode) : emptyLayout()
);
adjustSize(); adjustSize();
setFixedSize(size()); setFixedSize(size());
} }
void FingerprintPreview::toggleMode(bool hashMode)
{
if (m_lblHash)
m_lblHash->setVisible(hashMode);
if (m_lblArt)
m_lblArt->setVisible(!hashMode);
}
QLayout *FingerprintPreview::emptyLayout() QLayout *FingerprintPreview::emptyLayout()
{ {
auto *label = new QLabel(tr("Invalid hash format")); auto *label = new QLabel(tr("Invalid hash format"));
@ -32,32 +44,42 @@ QLayout *FingerprintPreview::emptyLayout()
return layout; return layout;
} }
QLayout *FingerprintPreview::sha256Layout(const Fingerprint &fingerprint) QLayout *FingerprintPreview::sha256Layout(const Fingerprint &fingerprint, const QString &titleText, bool hashMode)
{ {
auto labelSha256 = new QLabel(QStringLiteral("SHA256:"), this); auto labelTitle = new QLabel(titleText, this);
labelSha256->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum); auto f = font();
f.setBold(true);
f.setItalic(true);
labelTitle->setFont(f);
labelTitle->setAlignment(Qt::AlignTop | Qt::AlignHCenter);
labelTitle->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
labelTitle->setVisible(!titleText.isEmpty());
auto lblSha256String = new QLabel(deskflow::formatSSLFingerprintColumns(fingerprint.data), this); m_lblHash = new QLabel(deskflow::formatSSLFingerprintColumns(fingerprint.data), this);
lblSha256String->setAlignment(Qt::AlignTop | Qt::AlignHCenter); m_lblHash->setAlignment(Qt::AlignVCenter | Qt::AlignHCenter);
lblSha256String->setTextInteractionFlags(Qt::TextSelectableByMouse); m_lblHash->setTextInteractionFlags(Qt::TextSelectableByMouse);
m_lblHash->setVisible(hashMode);
auto lblSha256Art = new QLabel(deskflow::generateFingerprintArt(fingerprint.data), this); m_lblArt = new QLabel(deskflow::generateFingerprintArt(fingerprint.data), this);
lblSha256Art->setAlignment(Qt::AlignVCenter | Qt::AlignHCenter); m_lblArt->setAlignment(Qt::AlignVCenter | Qt::AlignHCenter);
lblSha256Art->setTextInteractionFlags(Qt::TextSelectableByMouse); m_lblArt->setTextInteractionFlags(Qt::TextSelectableByMouse);
m_lblArt->setVisible(!hashMode);
QFont f = font(); f = font();
f.setFamilies({"Hack", "Liberation Mono", "Monospace", "Andale Mono"}); f.setFamilies({"Hack", "Liberation Mono", "Monospace", "Andale Mono"});
f.setStyleHint(QFont::Monospace); f.setStyleHint(QFont::Monospace);
lblSha256Art->setFont(f); m_lblArt->setFont(f);
auto innersha256Layout = new QHBoxLayout(); auto innersha256Layout = new QHBoxLayout();
innersha256Layout->setContentsMargins(0, 0, 0, 0); innersha256Layout->setContentsMargins(0, 0, 0, 0);
innersha256Layout->addWidget(lblSha256String); innersha256Layout->addWidget(m_lblHash);
innersha256Layout->addWidget(lblSha256Art); innersha256Layout->addWidget(m_lblArt);
auto sha256Layout = new QVBoxLayout(); auto sha256Layout = new QVBoxLayout();
sha256Layout->addWidget(labelSha256); sha256Layout->setContentsMargins(0, 0, 0, 0);
sha256Layout->addWidget(labelTitle);
sha256Layout->addLayout(innersha256Layout); sha256Layout->addLayout(innersha256Layout);
sha256Layout->addSpacerItem(new QSpacerItem(0, 0, QSizePolicy::Preferred, QSizePolicy::Expanding));
auto frameSha256 = new QFrame(this); auto frameSha256 = new QFrame(this);
frameSha256->setFrameShape(QFrame::StyledPanel); frameSha256->setFrameShape(QFrame::StyledPanel);

11
src/lib/gui/widgets/FingerprintPreview.h
View file

@ -9,14 +9,21 @@
#include <QFrame> #include <QFrame>
#include <net/Fingerprint.h> #include <net/Fingerprint.h>
class QLabel;
class FingerprintPreview : public QFrame class FingerprintPreview : public QFrame
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit FingerprintPreview(QWidget *parent, const Fingerprint &fingerprint = {}); explicit FingerprintPreview(
QWidget *parent, const Fingerprint &fingerprint = {}, const QString &titleText = {}, bool hashMode = false
);
~FingerprintPreview() override = default; ~FingerprintPreview() override = default;
void toggleMode(bool hashMode);
private: private:
QLayout *emptyLayout(); QLayout *emptyLayout();
QLayout *sha256Layout(const Fingerprint &fingerprint = {}); QLayout *sha256Layout(const Fingerprint &fingerprint = {}, const QString &titleText = {}, bool hashMode = false);
QLabel *m_lblHash = nullptr;
QLabel *m_lblArt = nullptr;
}; };