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

refactor: move Tls Label to status bar

Browse source
This commit is contained in:
sithlord48 2025-02-19 17:46:13 -05:00 committed by Nick Bolton
parent 18cc8565f9
commit d4cc66a9f9
3 changed files with 14 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -71,6 +71,7 @@ MainWindow::MainWindow(ConfigScopes &configScopes, AppConfig &appConfig)
m_guiDupeChecker{new QLocalServer(this)}, m_guiDupeChecker{new QLocalServer(this)},
m_lblSecurityStatus{new QLabel(this)}, m_lblSecurityStatus{new QLabel(this)},
m_lblStatus{new QLabel(this)}, m_lblStatus{new QLabel(this)},
m_btnFingerprint{new QToolButton(this)},
m_actionAbout{new QAction(this)}, m_actionAbout{new QAction(this)},
m_actionClearSettings{new QAction(tr("Clear settings"), this)}, m_actionClearSettings{new QAction(tr("Clear settings"), this)},
m_actionReportBug{new QAction(tr("Report a Bug"), this)}, m_actionReportBug{new QAction(tr("Report a Bug"), this)},
@ -231,12 +232,19 @@ void MainWindow::setupControls()
#endif #endif
m_btnFingerprint->setIcon(QIcon::fromTheme(QStringLiteral("fingerprint")));
m_btnFingerprint->setFixedSize(QSize(24, 24));
m_btnFingerprint->setIconSize(QSize(24, 24));
m_btnFingerprint->setAutoRaise(true);
m_btnFingerprint->setToolTip(tr("View local fingerprint"));
ui->statusBar->insertPermanentWidget(0, m_btnFingerprint);
m_lblSecurityStatus->setVisible(false); m_lblSecurityStatus->setVisible(false);
m_lblSecurityStatus->setFixedSize(QSize(24, 24)); m_lblSecurityStatus->setFixedSize(QSize(24, 24));
m_lblSecurityStatus->setScaledContents(true); m_lblSecurityStatus->setScaledContents(true);
ui->statusBar->insertPermanentWidget(0, m_lblSecurityStatus); ui->statusBar->insertPermanentWidget(1, m_lblSecurityStatus);
ui->statusBar->insertPermanentWidget(1, m_lblStatus, 1); ui->statusBar->insertPermanentWidget(2, m_lblStatus, 1);
} }
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
@ -305,7 +313,7 @@ void MainWindow::connectSlots()
connect(ui->btnConfigureServer, &QPushButton::clicked, this, [this] { showConfigureServer(""); }); connect(ui->btnConfigureServer, &QPushButton::clicked, this, [this] { showConfigureServer(""); });
connect(ui->lblComputerName, &QLabel::linkActivated, this, &MainWindow::openSettings); connect(ui->lblComputerName, &QLabel::linkActivated, this, &MainWindow::openSettings);
connect(ui->lblMyFingerprint, &QLabel::linkActivated, this, &MainWindow::showMyFingerprint); connect(m_btnFingerprint, &QToolButton::clicked, this, &MainWindow::showMyFingerprint);
connect(ui->rbModeServer, &QRadioButton::clicked, this, &MainWindow::setModeServer); connect(ui->rbModeServer, &QRadioButton::clicked, this, &MainWindow::setModeServer);
connect(ui->rbModeClient, &QRadioButton::clicked, this, &MainWindow::setModeClient); connect(ui->rbModeClient, &QRadioButton::clicked, this, &MainWindow::setModeClient);
@ -951,7 +959,7 @@ QString MainWindow::getIPAddresses() const
void MainWindow::updateLocalFingerprint() void MainWindow::updateLocalFingerprint()
{ {
ui->lblMyFingerprint->setVisible(m_appConfig.tlsEnabled() && QFile::exists(localFingerprintDb())); m_btnFingerprint->setVisible(m_appConfig.tlsEnabled() && QFile::exists(localFingerprintDb()));
} }
void MainWindow::autoAddScreen(const QString name) void MainWindow::autoAddScreen(const QString name)

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

@ -40,6 +40,7 @@ class QPushButton;
class QTextEdit; class QTextEdit;
class QComboBox; class QComboBox;
class QTabWidget; class QTabWidget;
class QToolButton;
class QCheckBox; class QCheckBox;
class QRadioButton; class QRadioButton;
class QMessageBox; class QMessageBox;
@ -205,6 +206,7 @@ private:
QLabel *m_lblSecurityStatus = nullptr; QLabel *m_lblSecurityStatus = nullptr;
QLabel *m_lblStatus = nullptr; QLabel *m_lblStatus = nullptr;
QToolButton *m_btnFingerprint = nullptr;
// Window Actions // Window Actions
QAction *m_actionAbout = nullptr; QAction *m_actionAbout = nullptr;

16
src/apps/deskflow-gui/MainWindow.ui
View file

@ -89,22 +89,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QLabel" name="lblMyFingerprint">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;TLS enabled (&lt;a href=&quot;#&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#4285f4;&quot;&gt;fingerprint&lt;/span&gt;&lt;/a&gt;)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="textFormat">
<enum>Qt::TextFormat::RichText</enum>
</property>
</widget>
</item>
<item> <item>
<widget class="QWidget" name="widgetModes" native="true"> <widget class="QWidget" name="widgetModes" native="true">
<property name="sizePolicy"> <property name="sizePolicy">