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

feat: display client IP info when manual IP is configured

Browse source
This commit is contained in:
alizane 2026-04-20 20:22:14 +05:30 committed by Nick Bolton
parent 5035dc843d
commit 3d52de0478
1 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/lib/gui/MainWindow.cpp
View file

@ -524,14 +524,20 @@ void MainWindow::updateModeControls()
const auto mode = m_coreProcess.mode(); const auto mode = m_coreProcess.mode();
const bool isServer = mode == Settings::CoreMode::Server; const bool isServer = mode == Settings::CoreMode::Server;
const bool isClient = mode == Settings::CoreMode::Client; const bool isClient = mode == Settings::CoreMode::Client;
ui->serverOptions->setVisible(isServer); ui->serverOptions->setVisible(isServer);
ui->lblIpAddresses->setVisible(isServer);
ui->clientOptions->setVisible(isClient); ui->clientOptions->setVisible(isClient);
ui->lblNoMode->setVisible(!isServer && !isClient); ui->lblNoMode->setVisible(!isServer && !isClient);
toggleCanRunCore(canRunCore()); toggleCanRunCore(canRunCore());
if (isServer) { ui->lblIpAddresses->setVisible(
(isClient && !Settings::value(Settings::Core::Interface).toString().isEmpty()) || isServer
);
if (ui->lblIpAddresses->isVisible())
updateNetworkInfo(); updateNetworkInfo();
if (isServer) {
m_networkMonitor->startMonitoring(); m_networkMonitor->startMonitoring();
} else { } else {
m_networkMonitor->stopMonitoring(); m_networkMonitor->stopMonitoring();
@ -587,7 +593,15 @@ void MainWindow::updateSecurityIcon(bool visible)
void MainWindow::updateNetworkInfo() void MainWindow::updateNetworkInfo()
{ {
const auto mode = m_coreProcess.mode();
if (mode == CoreMode::None) {
return;
}
if (mode == CoreMode::Server)
updateIpLabel(NetworkMonitor::validAddresses()); updateIpLabel(NetworkMonitor::validAddresses());
else
updateIpLabel({Settings::value(Settings::Core::Interface).toString()});
} }
void MainWindow::serverConnectionConfigureClient(const QString &clientName) void MainWindow::serverConnectionConfigureClient(const QString &clientName)
@ -1215,7 +1229,8 @@ void MainWindow::remoteHostChanged(const QString &newRemoteHost)
void MainWindow::updateIpLabel(const QStringList &addresses) void MainWindow::updateIpLabel(const QStringList &addresses)
{ {
if (m_coreProcess.mode() != CoreMode::Server) { const auto mode = m_coreProcess.mode();
if (mode == CoreMode::None) {
return; return;
} }
@ -1232,7 +1247,6 @@ void MainWindow::updateIpLabel(const QStringList &addresses)
QString labelText = fixedIP ? tr("Using IP: ") : tr("Suggested IP: "); QString labelText = fixedIP ? tr("Using IP: ") : tr("Suggested IP: ");
QString toolTipText = tr("<p>If connecting via the hostname fails, try %1</p>"); QString toolTipText = tr("<p>If connecting via the hostname fails, try %1</p>");
// Get all available IPs for tooltip
const bool filterIpList = (serverStarted || fixedIP); const bool filterIpList = (serverStarted || fixedIP);
const QRegularExpression ipListFilter(filterIpList ? QStringLiteral("(%1)").arg(m_serverStartIPs.join("|")) : ""); const QRegularExpression ipListFilter(filterIpList ? QStringLiteral("(%1)").arg(m_serverStartIPs.join("|")) : "");
const QStringList ipList = addresses.filter(ipListFilter); const QStringList ipList = addresses.filter(ipListFilter);
@ -1257,7 +1271,7 @@ void MainWindow::updateIpLabel(const QStringList &addresses)
} }
ui->lblIpAddresses->setText(labelText); ui->lblIpAddresses->setText(labelText);
ui->lblIpAddresses->setToolTip(toolTipText); ui->lblIpAddresses->setToolTip(mode == CoreMode::Server ? toolTipText : QString());
} }
void MainWindow::updateTimeoutDelay(int newDelay) void MainWindow::updateTimeoutDelay(int newDelay)