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

fix: Security icons showing with fresh install

Browse source 
fixes #8170
This commit is contained in:
sithlord48 2025-02-14 06:40:00 -05:00 committed by Nick Bolton
parent eb19547b45
commit 3c12915fd3
2 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/apps/deskflow-gui/MainWindow.cpp
View file

@ -128,6 +128,9 @@ MainWindow::MainWindow(ConfigScopes &configScopes, AppConfig &appConfig)
ui->btnToggleLog->setFixedHeight(ui->lblLog->height() * 0.6); ui->btnToggleLog->setFixedHeight(ui->lblLog->height() * 0.6);
#endif #endif
// Hide the security label
ui->lblConnectionSecurityStatus->setVisible(false);
ui->btnToggleLog->setStyleSheet(QStringLiteral("background:rgba(0,0,0,0);")); ui->btnToggleLog->setStyleSheet(QStringLiteral("background:rgba(0,0,0,0);"));
if (m_appConfig.logExpanded()) if (m_appConfig.logExpanded())
ui->btnToggleLog->click(); ui->btnToggleLog->click();
@ -520,6 +523,21 @@ void MainWindow::setModeClient()
m_configScopes.save(); m_configScopes.save();
} }
void MainWindow::updateSecurityIcon(bool visible)
{
ui->lblConnectionSecurityStatus->setVisible(visible);
if (!visible)
return;
bool secureSocket = m_appConfig.tlsEnabled();
const auto txt = secureSocket ? tr("Secure Connection") : tr("Insecure Connection");
ui->lblConnectionSecurityStatus->setToolTip(txt);
const auto icon = QIcon::fromTheme(secureSocket ? QIcon::ThemeIcon::SecurityHigh : QIcon::ThemeIcon::SecurityLow);
ui->lblConnectionSecurityStatus->setPixmap(icon.pixmap(QSize(32, 32)));
}
void MainWindow::serverConnectionConfigureClient(const QString &clientName) void MainWindow::serverConnectionConfigureClient(const QString &clientName)
{ {
m_serverConfigDialogState.setVisible(true); m_serverConfigDialogState.setVisible(true);
@ -786,7 +804,7 @@ void MainWindow::updateStatus()
const auto connection = m_coreProcess.connectionState(); const auto connection = m_coreProcess.connectionState();
const auto process = m_coreProcess.processState(); const auto process = m_coreProcess.processState();
ui->lblConnectionSecurityStatus->setVisible(false); updateSecurityIcon(false);
switch (process) { switch (process) {
using enum CoreProcessState; using enum CoreProcessState;
@ -812,6 +830,7 @@ void MainWindow::updateStatus()
case Listening: { case Listening: {
if (m_coreProcess.mode() == CoreMode::Server) { if (m_coreProcess.mode() == CoreMode::Server) {
updateSecurityIcon(true);
setStatus(tr("%1 is waiting for clients").arg(kAppName)); setStatus(tr("%1 is waiting for clients").arg(kAppName));
} }
@ -823,7 +842,7 @@ void MainWindow::updateStatus()
break; break;
case Connected: { case Connected: {
ui->lblConnectionSecurityStatus->setVisible(true); updateSecurityIcon(true);
if (m_secureSocket) { if (m_secureSocket) {
setStatus(tr("%1 is connected (with %2)").arg(kAppName, m_coreProcess.secureSocketVersion())); setStatus(tr("%1 is connected (with %2)").arg(kAppName, m_coreProcess.secureSocketVersion()));
} else { } else {
@ -983,12 +1002,7 @@ void MainWindow::showConfigureServer(const QString &message)
void MainWindow::secureSocket(bool secureSocket) void MainWindow::secureSocket(bool secureSocket)
{ {
m_secureSocket = secureSocket; m_secureSocket = secureSocket;
updateSecurityIcon(ui->lblConnectionSecurityStatus->isVisible());
const auto txt = secureSocket ? tr("Secure Connection") : tr("Insecure Connection");
ui->lblConnectionSecurityStatus->setToolTip(txt);
const auto icon = QIcon::fromTheme(secureSocket ? QIcon::ThemeIcon::SecurityHigh : QIcon::ThemeIcon::SecurityLow);
ui->lblConnectionSecurityStatus->setPixmap(icon.pixmap(QSize(32, 32)));
} }
void MainWindow::updateScreenName() void MainWindow::updateScreenName()

1
src/apps/deskflow-gui/MainWindow.h
View file

@ -120,6 +120,7 @@ private:
void showMyFingerprint(); void showMyFingerprint();
void setModeServer(); void setModeServer();
void setModeClient(); void setModeClient();
void updateSecurityIcon(bool visible);
std::unique_ptr<Ui::MainWindow> ui; std::unique_ptr<Ui::MainWindow> ui;