This commit is contained in:
DavidXanatos 2024-11-13 12:10:19 +01:00
parent 4523b54004
commit 04e9c0745c
3 changed files with 146 additions and 127 deletions

View File

@ -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

View File

@ -1592,105 +1592,7 @@
<property name="leftMargin">
<number>0</number>
</property>
<item row="6" column="1" colspan="3">
<widget class="QLabel" name="lblSerial">
<property name="text">
<string>Retrieve/Upgrade/Renew certificate using Serial Number</string>
</property>
<property name="openExternalLinks">
<bool>false</bool>
</property>
</widget>
</item>
<item row="7" column="1">
<widget class="QLineEdit" name="txtSerial">
<property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>250</width>
<height>16777215</height>
</size>
</property>
<property name="placeholderText">
<string>SBIE_-_____-_____-_____-_____</string>
</property>
</widget>
</item>
<item row="8" column="1" colspan="2">
<widget class="QLabel" name="lblHwId">
<property name="font">
<font>
<pointsize>7</pointsize>
<kerning>true</kerning>
</font>
</property>
<property name="text">
<string>HwId: 00000000-0000-0000-0000-000000000000</string>
</property>
</widget>
</item>
<item row="5" column="1" colspan="3">
<widget class="QLabel" name="lblCertExp">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
<kerning>true</kerning>
</font>
</property>
<property name="text">
<string>This supporter certificate has expired, please &lt;a href=&quot;https://sandboxie-plus.com/go.php?to=sbie-renew-cert&quot;&gt;get an updated certificate&lt;/a&gt;.</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="0" rowspan="3">
<widget class="QLabel" name="label_4">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="../Resources/SandMan.qrc">:/HelpingHand.png</pixmap>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
</widget>
</item>
<item row="7" column="2">
<widget class="QToolButton" name="btnGetCert">
<property name="text">
<string>Get</string>
</property>
</widget>
</item>
<item row="10" column="0">
<spacer name="verticalSpacer_5">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="4" column="1" colspan="4">
<item row="5" column="1" colspan="4">
<widget class="QPlainTextEdit" name="txtCertificate">
<property name="maximumSize">
<size>
@ -1703,18 +1605,12 @@
</property>
</widget>
</item>
<item row="7" column="3" colspan="2">
<spacer name="horizontalSpacer_3">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<item row="8" column="2">
<widget class="QToolButton" name="btnGetCert">
<property name="text">
<string>Get</string>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</widget>
</item>
<item row="3" column="1" colspan="4">
<widget class="QLabel" name="lblSupportCert">
@ -1726,6 +1622,25 @@
</property>
</widget>
</item>
<item row="7" column="4">
<widget class="QLabel" name="lblCertGuide">
<property name="font">
<font>
<bold>true</bold>
<kerning>true</kerning>
</font>
</property>
<property name="text">
<string>&lt;a href=&quot;https://sandboxie-plus.com/go.php?to=sbie-use-cert&quot;&gt;Certificate usage guide&lt;/a&gt;</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="1" rowspan="2" colspan="4">
<widget class="QLabel" name="lblSupport">
<property name="sizePolicy">
@ -1745,34 +1660,97 @@
</property>
</widget>
</item>
<item row="6" column="4">
<widget class="QLabel" name="lblCertGuide">
<item row="8" column="1">
<widget class="QLineEdit" name="txtSerial">
<property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>250</width>
<height>16777215</height>
</size>
</property>
<property name="placeholderText">
<string>SBIE_-_____-_____-_____-_____</string>
</property>
</widget>
</item>
<item row="7" column="1" colspan="3">
<widget class="QLabel" name="lblSerial">
<property name="text">
<string>Retrieve/Upgrade/Renew certificate using Serial Number</string>
</property>
<property name="openExternalLinks">
<bool>false</bool>
</property>
</widget>
</item>
<item row="1" column="0" rowspan="3">
<widget class="QLabel" name="label_4">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="../Resources/SandMan.qrc">:/HelpingHand.png</pixmap>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
</widget>
</item>
<item row="11" column="0">
<spacer name="verticalSpacer_5">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="8" column="3" colspan="2">
<spacer name="horizontalSpacer_3">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="6" column="1" colspan="3">
<widget class="QLabel" name="lblCertExp">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
<kerning>true</kerning>
</font>
</property>
<property name="text">
<string>&lt;a href=&quot;https://sandboxie-plus.com/go.php?to=sbie-use-cert&quot;&gt;Certificate usage guide&lt;/a&gt;</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
<string>This supporter certificate has expired, please &lt;a href=&quot;https://sandboxie-plus.com/go.php?to=sbie-renew-cert&quot;&gt;get an updated certificate&lt;/a&gt;.</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item row="12" column="0" colspan="3">
<widget class="QCheckBox" name="chkNoCheck">
<property name="text">
<string>In the future, don't notify about certificate expiration</string>
</property>
</widget>
</item>
<item row="11" column="1" colspan="4">
<item row="12" column="1" colspan="4">
<widget class="QLabel" name="lblCert">
<property name="font">
<font>
@ -1788,6 +1766,36 @@
</property>
</widget>
</item>
<item row="9" column="1" colspan="2">
<widget class="QLabel" name="lblHwId">
<property name="font">
<font>
<pointsize>7</pointsize>
<kerning>true</kerning>
</font>
</property>
<property name="text">
<string>HwId: 00000000-0000-0000-0000-000000000000</string>
</property>
</widget>
</item>
<item row="13" column="0" colspan="3">
<widget class="QCheckBox" name="chkNoCheck">
<property name="text">
<string>In the future, don't notify about certificate expiration</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QLabel" name="lblCertEntry">
<property name="text">
<string>Enter/view Supporter Certificate</string>
</property>
<property name="openExternalLinks">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</item>
</layout>
@ -1833,7 +1841,6 @@
<widget class="QLabel" name="lblUpdates">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
<kerning>true</kerning>
</font>

View File

@ -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("<a href=\"_\">%1</a>").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("<a href=\"_\">%1</a>").arg(Text));
ui.txtSerial->setVisible(false);