From 060e28941580d9e18786d4678a3e3a8b7f43c97e Mon Sep 17 00:00:00 2001 From: love-code-yeyixiao <188240888@qq.com> Date: Sat, 5 Oct 2024 21:47:27 +0800 Subject: [PATCH 1/2] 1.1x.x --- SandboxiePlus/SandMan/Forms/SettingsWindow.ui | 410 +++++++++--------- .../SandMan/Windows/SettingsWindow.cpp | 30 +- .../SandMan/Windows/SettingsWindow.h | 3 +- 3 files changed, 234 insertions(+), 209 deletions(-) diff --git a/SandboxiePlus/SandMan/Forms/SettingsWindow.ui b/SandboxiePlus/SandMan/Forms/SettingsWindow.ui index 581a79425a..cc0ed792f4 100644 --- a/SandboxiePlus/SandMan/Forms/SettingsWindow.ui +++ b/SandboxiePlus/SandMan/Forms/SettingsWindow.ui @@ -6,8 +6,8 @@ 0 0 - 820 - 565 + 841 + 586 @@ -48,7 +48,7 @@ QTabWidget::North - 0 + 4 @@ -1556,209 +1556,209 @@ Sandboxie Support - - - - - 0 + + + + + + 0 + 0 + - - - - Retrieve/Upgrade/Renew certificate using Serial Number - - - false - - - - - - - - 200 - 0 - - - - - 250 - 16777215 - - - - SBIE_-_____-_____-_____-_____ - - - - - - - - 7 - true - - - - HwId: 00000000-0000-0000-0000-000000000000 - - - - - - - - 75 - true - true - - - - This supporter certificate has expired, please <a href="https://sandboxie-plus.com/go.php?to=sbie-renew-cert">get an updated certificate</a>. - - - true - - - - - - - - 0 - 0 - - - - - - - :/HelpingHand.png - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - - - - - Get - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - 16777215 - 73 - - - - Enter the support certificate here - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Supporters of the Sandboxie-Plus project can receive a <a href="https://sandboxie-plus.com/go.php?to=sbie-cert">supporter certificate</a>. It's like a license key but for awesome people using open source software. :-) - - - true - - - - - - - - 0 - 0 - - - - Keeping Sandboxie up to date with the rolling releases of Windows and compatible with all web browsers is a never-ending endeavor. You can support the development by <a href="https://sandboxie-plus.com/go.php?to=sbie-contribute">directly contributing to the project</a>, showing your support by <a href="https://sandboxie-plus.com/go.php?to=sbie-obtain-cert">purchasing a supporter certificate</a>, becoming a patron by <a href="https://sandboxie-plus.com/go.php?to=patreon">subscribing on Patreon</a>, or through a <a href="https://sandboxie-plus.com/go.php?to=donate">PayPal donation</a>.<br />Your support plays a vital role in the advancement and maintenance of Sandboxie. - - - Qt::RichText - - - true - - - - - - - - 75 - true - true - - - - <a href="https://sandboxie-plus.com/go.php?to=sbie-use-cert">Certificate usage guide</a> - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - - - - - In the future, don't notify about certificate expiration - - - - - - - - 9 - true - - - - Cert Info - - - false - - - - + + + + + :/HelpingHand.png + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + + + + + + 0 + 0 + + + + Keeping Sandboxie up to date with the rolling releases of Windows and compatible with all web browsers is a never-ending endeavor. You can support the development by <a href="https://sandboxie-plus.com/go.php?to=sbie-contribute">directly contributing to the project</a>, showing your support by <a href="https://sandboxie-plus.com/go.php?to=sbie-obtain-cert">purchasing a supporter certificate</a>, becoming a patron by <a href="https://sandboxie-plus.com/go.php?to=patreon">subscribing on Patreon</a>, or through a <a href="https://sandboxie-plus.com/go.php?to=donate">PayPal donation</a>.<br />Your support plays a vital role in the advancement and maintenance of Sandboxie. + + + Qt::RichText + + + true + + + + + + + Supporters of the Sandboxie-Plus project can receive a <a href="https://sandboxie-plus.com/go.php?to=sbie-cert">supporter certificate</a>. It's like a license key but for awesome people using open source software. :-) + + + true + + + + + + + + 16777215 + 73 + + + + Enter the support certificate here + + + + + + + Show Certificate + + + + + + + + 75 + true + true + + + + This supporter certificate has expired, please <a href="https://sandboxie-plus.com/go.php?to=sbie-renew-cert">get an updated certificate</a>. + + + true + + + + + + + Retrieve/Upgrade/Renew certificate using Serial Number + + + false + + + + + + + + 75 + true + true + + + + <a href="https://sandboxie-plus.com/go.php?to=sbie-use-cert">Certificate usage guide</a> + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + + + + + + 200 + 0 + + + + + 250 + 16777215 + + + + SBIE_-_____-_____-_____-_____ + + + + + + + Get + + + + + + + Qt::Horizontal + + + + 231 + 20 + + + + + + + + + 7 + true + + + + HwId: 00000000-0000-0000-0000-000000000000 + + + + + + + Qt::Vertical + + + + 20 + 85 + + + + + + + + + 9 + true + + + + Cert Info + + + false + + + + + + + In the future, don't notify about certificate expiration + + diff --git a/SandboxiePlus/SandMan/Windows/SettingsWindow.cpp b/SandboxiePlus/SandMan/Windows/SettingsWindow.cpp index d6181e399d..369986bfce 100644 --- a/SandboxiePlus/SandMan/Windows/SettingsWindow.cpp +++ b/SandboxiePlus/SandMan/Windows/SettingsWindow.cpp @@ -507,6 +507,7 @@ CSettingsWindow::CSettingsWindow(QWidget* parent) connect(ui.lblInsiderInfo, SIGNAL(linkActivated(const QString&)), theGUI, SLOT(OpenUrl(const QString&))); m_CertChanged = false; + connect(ui.chkShowCert,SIGNAL(clicked(bool)),this,SLOT(OnCertHide())); connect(ui.txtCertificate, SIGNAL(textChanged()), this, SLOT(CertChanged())); connect(ui.txtSerial, SIGNAL(textChanged(const QString&)), this, SLOT(KeyChanged())); ui.btnGetCert->setEnabled(false); @@ -1277,7 +1278,12 @@ void CSettingsWindow::UpdateCert() //ui.lblCertLevel->setVisible(!g_Certificate.isEmpty()); if (!g_Certificate.isEmpty()) { - ui.txtCertificate->setPlainText(g_Certificate); + if (ui.chkShowCert->isChecked()) { + ui.txtCertificate->setPlainText(g_Certificate); + } + else { + ui.txtCertificate->setPlainText(QString(tr("The certificate is hidden, click the right checkbox to show"))); + } //ui.lblSupport->setVisible(false); QPalette palette = QApplication::palette(); @@ -1446,8 +1452,15 @@ void CSettingsWindow::OnCertData(const QByteArray& Certificate, const QVariantMa CSandMan::ShowMessageBox(this, QMessageBox::Critical, Message); return; } - ui.txtCertificate->setPlainText(Certificate); - ApplyCert(); + if (ui.chkShowCert->isChecked()) { + ui.txtCertificate->setPlainText(Certificate); + ApplyCert(); + } + else { + ui.txtCertificate->setPlainText(Certificate); + ApplyCert(); + ui.txtCertificate->setPlainText(QString(tr("The certificate is hidden,click the right checkbox to show it"))); + } } void CSettingsWindow::ApplyCert() @@ -2635,6 +2648,17 @@ void CSettingsWindow::CertChanged() OnOptChanged(); } +void CSettingsWindow::OnCertHide() +{ + if (ui.chkShowCert->isChecked()) { + ui.txtCertificate->setPlainText(g_Certificate); + } + else { + ui.txtCertificate->setPlainText(QString(tr("The certificate is hidden. Click the right checkbox to show it."))); + } + OnOptChanged(); +} + void CSettingsWindow::KeyChanged() { ui.btnGetCert->setEnabled(ui.txtSerial->text().length() > 5); diff --git a/SandboxiePlus/SandMan/Windows/SettingsWindow.h b/SandboxiePlus/SandMan/Windows/SettingsWindow.h index f038e41ff1..8e5e36fb1e 100644 --- a/SandboxiePlus/SandMan/Windows/SettingsWindow.h +++ b/SandboxiePlus/SandMan/Windows/SettingsWindow.h @@ -135,6 +135,7 @@ private slots: void CertChanged(); + void OnCertHide(); void KeyChanged(); void UpdateCert(); void OnGetCert(); @@ -213,4 +214,4 @@ extern QByteArray g_Certificate; extern SCertInfo g_CertInfo; #define EVAL_MAX 3 // for UI only actual limits enforced on server -#define EVAL_DAYS 10 \ No newline at end of file +#define EVAL_DAYS 10 From 7f35c610fd014d8561c14e2c2a497162e3923a88 Mon Sep 17 00:00:00 2001 From: love-code-yeyixiao <188240888@qq.com> Date: Sat, 5 Oct 2024 21:58:52 +0800 Subject: [PATCH 2/2] Update CHANGELOG.MD --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f7b9c4c266..44620556e3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ This project adheres to [Semantic Versioning](http://semver.org/). +## [1.1x.xx / 5.xx.x] - 2024-xx-xx + +### Added +- added the ability to hide certificates in editbox in Global Setting + + ## [1.14.9 / 5.69.9] - 2024-09-19 ### Added