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

refactor: Messages::showFirstConnectionMessage check the settings for the values

Browse source
This commit is contained in:
sithlord48 2026-04-04 13:12:21 -04:00 committed by Nick Bolton
parent 632b64f12f
commit 047451696a
3 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -858,13 +858,7 @@ void MainWindow::showFirstConnectedMessage()
if (Settings::value(Settings::Gui::ShownFirstConnectedMessage).toBool())
return;
Settings::setValue(Settings::Gui::ShownFirstConnectedMessage, true);
const auto isServer = m_coreProcess.mode() == CoreMode::Server;
const auto closeToTray = Settings::value(Settings::Gui::CloseToTray).toBool();
using ProcessMode = Settings::ProcessMode;
const auto enableService = Settings::value(Settings::Core::ProcessMode).value<ProcessMode>() == ProcessMode::Service;
messages::showFirstConnectedMessage(this, closeToTray, enableService, isServer);
messages::showFirstConnectedMessage(this);
}
void MainWindow::updateStatus()

10
src/lib/gui/Messages.cpp
View file

@ -142,12 +142,11 @@ void showFirstServerStartMessage(QWidget *parent)
);
}
void showFirstConnectedMessage(QWidget *parent, bool closeToTray, bool enableService, bool isServer)
void showFirstConnectedMessage(QWidget *parent)
{
auto message = QObject::tr("<p>%1 is now connected!</p>").arg(kAppName);
if (isServer) {
if (Settings::value(Settings::Core::CoreMode).value<Settings::CoreMode>() == Settings::Server) {
message.append(
QObject::tr(
"<p>Try moving your mouse to your other computer. Once there, go ahead "
@ -159,7 +158,10 @@ void showFirstConnectedMessage(QWidget *parent, bool closeToTray, bool enableSer
message.append(QObject::tr("<p>Try controlling this computer remotely.</p>"));
}
if (!closeToTray && !enableService) {
using ProcessMode = Settings::ProcessMode;
if (Settings::value(Settings::Core::ProcessMode).value<ProcessMode>() == ProcessMode::Desktop &&
!Settings::value(Settings::Gui::CloseToTray).toBool()) {
message.append(
QObject::tr(
"<p>As you do not have the setting enabled to keep %1 running in "

2
src/lib/gui/Messages.h
View file

@ -21,7 +21,7 @@ void raiseCriticalDialog();
void showFirstServerStartMessage(QWidget *parent);
void showFirstConnectedMessage(QWidget *parent, bool closeToTray, bool enableService, bool isServer);
void showFirstConnectedMessage(QWidget *parent);
void showCloseReminder(QWidget *parent);