diff --git a/CHANGELOG.md b/CHANGELOG.md
index 02b474d7..f3ae95b3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
## [1.15.2 / 5.70.2] - 2024-10-
+### Added
+- added the ability to hide certificates in editbox in Global Setting (idea by Yeyixiao)
+
### Fixed
- fixed Sign the .tmp file that gets dropped when installing or updating Sandboxie Plus [#2643](https://github.com/sandboxie-plus/Sandboxie/issues/2643)
- fixed issue with DLL unloading
diff --git a/SandboxiePlus/SandMan/Forms/SettingsWindow.ui b/SandboxiePlus/SandMan/Forms/SettingsWindow.ui
index cf7af23a..923bf6ae 100644
--- a/SandboxiePlus/SandMan/Forms/SettingsWindow.ui
+++ b/SandboxiePlus/SandMan/Forms/SettingsWindow.ui
@@ -1592,105 +1592,7 @@
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
-
-
-
-
- -
+
-
@@ -1703,18 +1605,12 @@
- -
-
-
- Qt::Horizontal
+
-
+
+
+ Get
-
-
- 40
- 20
-
-
-
+
-
@@ -1726,6 +1622,25 @@
+ -
+
+
+
+ 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
+
+
+
-
@@ -1745,34 +1660,97 @@
- -
-
+
-
+
+
+
+ 200
+ 0
+
+
+
+
+ 250
+ 16777215
+
+
+
+ SBIE_-_____-_____-_____-_____
+
+
+
+ -
+
+
+ Retrieve/Upgrade/Renew certificate using Serial Number
+
+
+ false
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+
+
+ :/HelpingHand.png
+
+
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
- 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
+ This supporter certificate has expired, please <a href="https://sandboxie-plus.com/go.php?to=sbie-renew-cert">get an updated certificate</a>.
true
- -
-
-
- In the future, don't notify about certificate expiration
-
-
-
- -
+
-
@@ -1788,6 +1766,36 @@
+ -
+
+
+
+ 7
+ true
+
+
+
+ HwId: 00000000-0000-0000-0000-000000000000
+
+
+
+ -
+
+
+ In the future, don't notify about certificate expiration
+
+
+
+ -
+
+
+ Enter/view Supporter Certificate
+
+
+ false
+
+
+
@@ -1833,7 +1841,6 @@
- 75
true
true
diff --git a/SandboxiePlus/SandMan/Windows/SettingsWindow.cpp b/SandboxiePlus/SandMan/Windows/SettingsWindow.cpp
index 3d0e1f02..f4cd35c5 100644
--- a/SandboxiePlus/SandMan/Windows/SettingsWindow.cpp
+++ b/SandboxiePlus/SandMan/Windows/SettingsWindow.cpp
@@ -522,7 +522,16 @@ CSettingsWindow::CSettingsWindow(QWidget* parent)
"SIGNATURE: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=="
);
- if (g_CertInfo.active) {
+ if (g_CertInfo.active)
+ {
+ QString Text1 = ui.lblCertEntry->text();
+ ui.lblCertEntry->setText(QString("%1").arg(Text1));
+ ui.txtCertificate->setVisible(false);
+ connect(ui.lblCertEntry, &QLabel::linkActivated, this, [=]() {
+ ui.lblCertEntry->setText(Text1);
+ ui.txtCertificate->setVisible(true);
+ });
+
QString Text = ui.lblSerial->text();
ui.lblSerial->setText(QString("%1").arg(Text));
ui.txtSerial->setVisible(false);