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

feat: add restart action fixes #8542

Browse source
This commit is contained in:
sithlord48 2025-06-03 22:48:03 -04:00 committed by Nick Bolton
parent d5910d77ec
commit d4d6cbb7fb
2 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -81,6 +81,7 @@ MainWindow::MainWindow()
m_actionRestore{new QAction(tr("&Open Deskflow"), this)}, m_actionRestore{new QAction(tr("&Open Deskflow"), this)},
m_actionSettings{new QAction(tr("&Preferences"), this)}, m_actionSettings{new QAction(tr("&Preferences"), this)},
m_actionStartCore{new QAction(tr("&Start"), this)}, m_actionStartCore{new QAction(tr("&Start"), this)},
m_actionRestartCore{new QAction(tr("Rest&art"), this)},
m_actionStopCore{new QAction(tr("S&top"), this)} m_actionStopCore{new QAction(tr("S&top"), this)}
{ {
const auto themeName = QStringLiteral("deskflow-%1").arg(iconMode()); const auto themeName = QStringLiteral("deskflow-%1").arg(iconMode());
@ -116,6 +117,10 @@ MainWindow::MainWindow()
m_actionStartCore->setShortcut(QKeySequence(tr("Ctrl+S"))); m_actionStartCore->setShortcut(QKeySequence(tr("Ctrl+S")));
m_actionStartCore->setIcon(QIcon::fromTheme(QStringLiteral("system-run"))); m_actionStartCore->setIcon(QIcon::fromTheme(QStringLiteral("system-run")));
m_actionRestartCore->setVisible(false);
m_actionRestartCore->setShortcut(QKeySequence(tr("Ctrl+S")));
m_actionRestartCore->setIcon(QIcon::fromTheme(QStringLiteral("view-refresh")));
m_actionStopCore->setShortcut(QKeySequence(tr("Ctrl+T"))); m_actionStopCore->setShortcut(QKeySequence(tr("Ctrl+T")));
m_actionStopCore->setIcon(QIcon::fromTheme(QIcon::ThemeIcon::ProcessStop)); m_actionStopCore->setIcon(QIcon::fromTheme(QIcon::ThemeIcon::ProcessStop));
@ -304,6 +309,7 @@ void MainWindow::connectSlots()
connect(m_actionRestore, &QAction::triggered, this, &MainWindow::showAndActivate); connect(m_actionRestore, &QAction::triggered, this, &MainWindow::showAndActivate);
connect(m_actionSettings, &QAction::triggered, this, &MainWindow::openSettings); connect(m_actionSettings, &QAction::triggered, this, &MainWindow::openSettings);
connect(m_actionStartCore, &QAction::triggered, this, &MainWindow::startCore); connect(m_actionStartCore, &QAction::triggered, this, &MainWindow::startCore);
connect(m_actionRestartCore, &QAction::triggered, this, &MainWindow::resetCore);
connect(m_actionStopCore, &QAction::triggered, this, &MainWindow::stopCore); connect(m_actionStopCore, &QAction::triggered, this, &MainWindow::stopCore);
connect(&m_versionChecker, &VersionChecker::updateFound, this, &MainWindow::versionCheckerUpdateFound); connect(&m_versionChecker, &VersionChecker::updateFound, this, &MainWindow::versionCheckerUpdateFound);
@ -417,12 +423,16 @@ void MainWindow::startCore()
{ {
m_clientConnection.setShowMessage(); m_clientConnection.setShowMessage();
m_coreProcess.start(); m_coreProcess.start();
m_actionStartCore->setVisible(false);
m_actionRestartCore->setVisible(true);
} }
void MainWindow::stopCore() void MainWindow::stopCore()
{ {
qDebug() << "stopping core process"; qDebug() << "stopping core process";
m_coreProcess.stop(); m_coreProcess.stop();
m_actionStartCore->setVisible(true);
m_actionRestartCore->setVisible(false);
} }
void MainWindow::clearSettings() void MainWindow::clearSettings()
@ -624,7 +634,7 @@ void MainWindow::open()
if (Settings::value(Settings::Core::StartedBefore).toBool()) { if (Settings::value(Settings::Core::StartedBefore).toBool()) {
if (ui->rbModeClient->isChecked() && ui->lineHostname->text().isEmpty()) if (ui->rbModeClient->isChecked() && ui->lineHostname->text().isEmpty())
return; return;
m_coreProcess.start(); startCore();
} }
} }
@ -645,6 +655,7 @@ void MainWindow::createMenuBar()
{ {
auto menuFile = new QMenu(tr("&File"), this); auto menuFile = new QMenu(tr("&File"), this);
menuFile->addAction(m_actionStartCore); menuFile->addAction(m_actionStartCore);
menuFile->addAction(m_actionRestartCore);
menuFile->addAction(m_actionStopCore); menuFile->addAction(m_actionStopCore);
menuFile->addSeparator(); menuFile->addSeparator();
menuFile->addAction(m_actionQuit); menuFile->addAction(m_actionQuit);
@ -669,7 +680,9 @@ void MainWindow::createMenuBar()
void MainWindow::setupTrayIcon() void MainWindow::setupTrayIcon()
{ {
auto trayMenu = new QMenu(this); auto trayMenu = new QMenu(this);
trayMenu->addActions({m_actionStartCore, m_actionStopCore, m_actionMinimize, m_actionRestore, m_actionTrayQuit}); trayMenu->addActions(
{m_actionStartCore, m_actionRestartCore, m_actionStopCore, m_actionMinimize, m_actionRestore, m_actionTrayQuit}
);
trayMenu->insertSeparator(m_actionMinimize); trayMenu->insertSeparator(m_actionMinimize);
trayMenu->insertSeparator(m_actionTrayQuit); trayMenu->insertSeparator(m_actionTrayQuit);
m_trayIcon->setContextMenu(trayMenu); m_trayIcon->setContextMenu(trayMenu);
@ -933,8 +946,8 @@ void MainWindow::coreProcessStateChanged(CoreProcessState state)
ui->btnToggleCore->setIcon(QIcon::fromTheme(QIcon::ThemeIcon::ProcessStop)); ui->btnToggleCore->setIcon(QIcon::fromTheme(QIcon::ThemeIcon::ProcessStop));
ui->btnApplySettings->setEnabled(true); ui->btnApplySettings->setEnabled(true);
m_actionStartCore->setVisible(false);
m_actionStartCore->setEnabled(false); m_actionRestartCore->setVisible(true);
m_actionStopCore->setEnabled(true); m_actionStopCore->setEnabled(true);
} else { } else {
@ -945,8 +958,8 @@ void MainWindow::coreProcessStateChanged(CoreProcessState state)
ui->btnToggleCore->setIcon(QIcon::fromTheme(QStringLiteral("system-run"))); ui->btnToggleCore->setIcon(QIcon::fromTheme(QStringLiteral("system-run")));
ui->btnApplySettings->setEnabled(false); ui->btnApplySettings->setEnabled(false);
m_actionStartCore->setVisible(true);
m_actionStartCore->setEnabled(true); m_actionRestartCore->setVisible(false);
m_actionStopCore->setEnabled(false); m_actionStopCore->setEnabled(false);
} }
} }
@ -1137,7 +1150,7 @@ void MainWindow::toggleCanRunCore(bool enableButtons)
{ {
ui->btnToggleCore->setEnabled(enableButtons); ui->btnToggleCore->setEnabled(enableButtons);
ui->btnConnect->setEnabled(enableButtons); ui->btnConnect->setEnabled(enableButtons);
ui->btnApplySettings->setEnabled(enableButtons); ui->btnApplySettings->setEnabled(enableButtons && m_coreProcess.isStarted());
m_actionStartCore->setEnabled(enableButtons); m_actionStartCore->setEnabled(enableButtons);
m_actionStopCore->setEnabled(enableButtons); m_actionStopCore->setEnabled(enableButtons);
} }

1
src/lib/gui/MainWindow.h
View file

@ -193,5 +193,6 @@ private:
QAction *m_actionRestore = nullptr; QAction *m_actionRestore = nullptr;
QAction *m_actionSettings = nullptr; QAction *m_actionSettings = nullptr;
QAction *m_actionStartCore = nullptr; QAction *m_actionStartCore = nullptr;
QAction *m_actionRestartCore = nullptr;
QAction *m_actionStopCore = nullptr; QAction *m_actionStopCore = nullptr;
}; };