rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[fix](ui): Adjust SSL references to say 'TLS' as well 

This fixes #898.

Signed-off-by: Dom Rodriguez <shymega@shymega.org.uk>
This commit is contained in:
Dom Rodriguez 2020-10-04 20:40:34 +01:00
parent 43708ae0d6
commit 2485454815
No known key found for this signature in database
GPG Key ID: 72DCF1231E54BD43
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/src/MainWindowBase.ui
View File

@ -77,7 +77,7 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text"> <property name="text">
<string>SSL Fingerprint:</string> <string>SSL/TLS Fingerprint:</string>
</property> </property>
</widget> </widget>
</item> </item>

2
src/gui/src/SettingsDialogBase.ui
View File

@ -184,7 +184,7 @@
<item row="2" column="0"> <item row="2" column="0">
<widget class="QCheckBox" name="m_pCheckBoxEnableCrypto"> <widget class="QCheckBox" name="m_pCheckBoxEnableCrypto">
<property name="text"> <property name="text">
<string>Enable &amp;SSL</string> <string>Enable &amp;SSL/TLS</string>
</property> </property>
</widget> </widget>
</item> </item>

8
src/gui/src/SslCertificate.cpp
View File

@ -85,7 +85,7 @@ std::pair<bool, std::string> SslCertificate::runTool(const QStringList& args)
if (!success || code != 0) if (!success || code != 0)
{ {
emit error( emit error(
QString("SSL tool failed: %1\n\nCode: %2\nError: %3") QString("SSL/TLS tool failed: %1\n\nCode: %2\nError: %3")
.arg(program) .arg(program)
.arg(process.exitCode()) .arg(process.exitCode())
.arg(standardError.isEmpty() ? "Unknown" : standardError)); .arg(standardError.isEmpty() ? "Unknown" : standardError));
@ -139,7 +139,7 @@ void SslCertificate::generateCertificate()
return; return;
} }
emit info(tr("SSL certificate generated.")); emit info(tr("SSL/TLS certificate generated."));
} }
generateFingerprint(filename); generateFingerprint(filename);
@ -173,10 +173,10 @@ void SslCertificate::generateFingerprint(const QString& certificateFilename)
i, output.size() - i); i, output.size() - i);
Fingerprint::local().trust(QString::fromStdString(fingerprint), false); Fingerprint::local().trust(QString::fromStdString(fingerprint), false);
emit info(tr("SSL fingerprint generated.")); emit info(tr("SSL/TLS fingerprint generated."));
} }
else { else {
emit error(tr("Failed to find SSL fingerprint.")); emit error(tr("Failed to find SSL/TLS fingerprint."));
} }
} }