openclaw/deskflow
1
0
Fork 0
Code Issues Pull Requests Actions 17 Packages Projects Releases Wiki Activity

refactor: MainWindow, Create Actions in code

Browse Source
This commit is contained in:
sithlord48
2024-12-18 17:51:03 -05:00
committed by Nick Bolton
parent 937ac053fe
commit 5aa4840972
3 changed files with 101 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

128
src/gui/src/MainWindow.cpp
View File

@ -82,10 +82,35 @@ MainWindow::MainWindow(ConfigScopes &configScopes, AppConfig &appConfig)
m_ServerConnection(this, appConfig, m_ServerConfig, m_ServerConfigDialogState), m_ServerConnection(this, appConfig, m_ServerConfig, m_ServerConfigDialogState),
m_ClientConnection(this, appConfig), m_ClientConnection(this, appConfig),
m_TlsUtility(appConfig), m_TlsUtility(appConfig),
m_WindowSaveTimer(this) m_WindowSaveTimer(this),
m_actionAbout{new QAction(this)},
m_actionClearSettings{new QAction(tr("Clear settings"), this)},
m_actionHelp{new QAction(tr("Report a Bug"), this)},
m_actionMinimize{new QAction(tr("&Hide"), this)},
m_actionQuit{new QAction(tr("&Quit"), this)},
m_actionRestore{new QAction(tr("Show"), this)},
m_actionSave{new QAction(tr("Save configuration &as..."), this)},
m_actionSettings{new QAction(tr("Preferences"), this)},
m_actionStartCore{new QAction(tr("&Start"), this)},
m_actionStopCore{new QAction(tr("S&top"), this)},
m_actionTestCriticalError{new QAction(tr("Test Critical Error"), this)},
m_actionTestFatalError{new QAction(tr("Test Fatal Error"), this)}
{ {
ui->setupUi(this); ui->setupUi(this);
// Setup Actions
m_actionAbout->setText(tr("About %1...").arg(kAppName));
m_actionAbout->setMenuRole(QAction::AboutRole);
m_actionQuit->setShortcut(QKeySequence::Quit);
m_actionQuit->setMenuRole(QAction::QuitRole);
m_actionSettings->setMenuRole(QAction::PreferencesRole);
m_actionSave->setShortcut(QKeySequence(tr("Ctrl+Alt+S")));
m_actionStartCore->setShortcut(QKeySequence(tr("Ctrl+S")));
m_actionStopCore->setShortcut(QKeySequence(tr("Ctrl+T")));
createMenuBar(); createMenuBar();
setupControls(); setupControls();
connectSlots(); connectSlots();
@ -156,8 +181,6 @@ void MainWindow::setupControls()
{ {
setWindowTitle(kAppName); setWindowTitle(kAppName);
ui->m_pActionHelp->setText(tr("Report a Bug"));
secureSocket(false); secureSocket(false);
updateLocalFingerprint(); updateLocalFingerprint();
@ -223,19 +246,25 @@ void MainWindow::connectSlots()
connect(&m_CoreProcess, &CoreProcess::secureSocket, this, &MainWindow::onCoreProcessSecureSocket); connect(&m_CoreProcess, &CoreProcess::secureSocket, this, &MainWindow::onCoreProcessSecureSocket);
connect(ui->m_pActionMinimize, &QAction::triggered, this, &MainWindow::hide); connect(m_actionAbout, &QAction::triggered, this, &MainWindow::openAboutDialog);
connect(m_actionClearSettings, &QAction::triggered, this, &MainWindow::clearSettings);
connect(m_actionHelp, &QAction::triggered, this, &MainWindow::openHelpUrl);
connect(m_actionMinimize, &QAction::triggered, this, &MainWindow::hide);
connect( connect(m_actionQuit, &QAction::triggered, qApp, [this] {
ui->m_pActionRestore, &QAction::triggered, this, //
[this]() { showAndActivate(); }
);
connect(ui->m_pActionQuit, &QAction::triggered, qApp, [this] {
qDebug("quitting application"); qDebug("quitting application");
m_Quitting = true; m_Quitting = true;
QApplication::quit(); QApplication::quit();
}); });
connect(m_actionRestore, &QAction::triggered, this, &MainWindow::showAndActivate);
connect(m_actionSave, &QAction::triggered, this, &MainWindow::saveConfig);
connect(m_actionSettings, &QAction::triggered, this, &MainWindow::openSettings);
connect(m_actionStartCore, &QAction::triggered, this, &MainWindow::startCore);
connect(m_actionStopCore, &QAction::triggered, this, &MainWindow::stopCore);
connect(m_actionTestFatalError, &QAction::triggered, this, &MainWindow::testFatalError);
connect(m_actionTestCriticalError, &QAction::triggered, this, &MainWindow::testCriticalError);
connect(&m_VersionChecker, &VersionChecker::updateFound, this, &MainWindow::onVersionCheckerUpdateFound); connect(&m_VersionChecker, &VersionChecker::updateFound, this, &MainWindow::onVersionCheckerUpdateFound);
connect(&m_WindowSaveTimer, &QTimer::timeout, this, &MainWindow::onWindowSaveTimerTimeout); connect(&m_WindowSaveTimer, &QTimer::timeout, this, &MainWindow::onWindowSaveTimerTimeout);
@ -249,9 +278,8 @@ void MainWindow::connectSlots()
&m_ServerConnection, &ServerConnection::configureClient, this, &MainWindow::onServerConnectionConfigureClient &m_ServerConnection, &ServerConnection::configureClient, this, &MainWindow::onServerConnectionConfigureClient
); );
connect(&m_ServerConnection, &ServerConnection::messageShowing, this, [this]() { showAndActivate(); }); connect(&m_ServerConnection, &ServerConnection::messageShowing, this, &MainWindow::showAndActivate);
connect(&m_ClientConnection, &ClientConnection::messageShowing, this, &MainWindow::showAndActivate);
connect(&m_ClientConnection, &ClientConnection::messageShowing, this, [this]() { showAndActivate(); });
} }
void MainWindow::onAppAboutToQuit() void MainWindow::onAppAboutToQuit()
@ -346,29 +374,29 @@ void MainWindow::onCoreProcessError(CoreProcess::Error error)
} }
} }
void MainWindow::on_m_pActionStartCore_triggered() void MainWindow::startCore()
{ {
m_ClientConnection.setShowMessage(); m_ClientConnection.setShowMessage();
m_CoreProcess.start(); m_CoreProcess.start();
} }
void MainWindow::on_m_pActionStopCore_triggered() void MainWindow::stopCore()
{ {
qDebug("stopping core process"); qDebug("stopping core process");
m_CoreProcess.stop(); m_CoreProcess.stop();
} }
void MainWindow::on_m_pActionTestFatalError_triggered() const void MainWindow::testFatalError() const
{ {
qFatal("test fatal error"); qFatal("test fatal error");
} }
void MainWindow::on_m_pActionTestCriticalError_triggered() const void MainWindow::testCriticalError() const
{ {
qCritical("test critical error"); qCritical("test critical error");
} }
void MainWindow::on_m_pActionClearSettings_triggered() void MainWindow::clearSettings()
{ {
if (!messages::showClearSettings(this)) { if (!messages::showClearSettings(this)) {
qDebug("clear settings cancelled"); qDebug("clear settings cancelled");
@ -382,7 +410,7 @@ void MainWindow::on_m_pActionClearSettings_triggered()
diagnostic::clearSettings(m_ConfigScopes, true); diagnostic::clearSettings(m_ConfigScopes, true);
} }
bool MainWindow::on_m_pActionSave_triggered() bool MainWindow::saveConfig()
{ {
QString fileName = QFileDialog::getSaveFileName(this, QString("Save configuration as...")); QString fileName = QFileDialog::getSaveFileName(this, QString("Save configuration as..."));
@ -394,18 +422,18 @@ bool MainWindow::on_m_pActionSave_triggered()
return false; return false;
} }
void MainWindow::on_m_pActionAbout_triggered() void MainWindow::openAboutDialog()
{ {
AboutDialog about(this); AboutDialog about(this);
about.exec(); about.exec();
} }
void MainWindow::on_m_pActionHelp_triggered() const void MainWindow::openHelpUrl() const
{ {
QDesktopServices::openUrl(QUrl(kUrlHelp)); QDesktopServices::openUrl(QUrl(kUrlHelp));
} }
void MainWindow::on_m_pActionSettings_triggered() void MainWindow::openSettings()
{ {
auto dialog = SettingsDialog(this, m_AppConfig, m_ServerConfig, m_CoreProcess); auto dialog = SettingsDialog(this, m_AppConfig, m_ServerConfig, m_CoreProcess);
@ -454,7 +482,7 @@ void MainWindow::on_m_pButtonApply_clicked()
void MainWindow::on_m_pLabelComputerName_linkActivated(const QString &) void MainWindow::on_m_pLabelComputerName_linkActivated(const QString &)
{ {
ui->m_pActionSettings->trigger(); m_actionSettings->trigger();
} }
void MainWindow::on_m_pLabelFingerprint_linkActivated(const QString &) void MainWindow::on_m_pLabelFingerprint_linkActivated(const QString &)
@ -526,11 +554,11 @@ void MainWindow::moveEvent(QMoveEvent *event)
void MainWindow::open() void MainWindow::open()
{ {
QList<QAction *> trayActions{ui->m_pActionStartCore, ui->m_pActionStopCore, nullptr, ui->m_pActionQuit}; QList<QAction *> trayActions{m_actionStartCore, m_actionStopCore, nullptr, m_actionQuit};
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
ui->m_pActionRestore->setText(tr("Open Deskflow")); m_actionRestore->setText(tr("Open Deskflow"));
trayActions.insert(3, ui->m_pActionRestore); trayActions.insert(3, m_actionRestore);
trayActions.insert(4, nullptr); trayActions.insert(4, nullptr);
#endif #endif
m_TrayIcon.create(trayActions); m_TrayIcon.create(trayActions);
@ -585,31 +613,29 @@ void MainWindow::createMenuBar()
#endif #endif
m_pMenuBar->addAction(m_pMenuHelp->menuAction()); m_pMenuBar->addAction(m_pMenuHelp->menuAction());
m_pMenuFile->addAction(ui->m_pActionStartCore); m_pMenuFile->addAction(m_actionStartCore);
m_pMenuFile->addAction(ui->m_pActionStopCore); m_pMenuFile->addAction(m_actionStopCore);
m_pMenuFile->addSeparator(); m_pMenuFile->addSeparator();
m_pMenuFile->addAction(ui->m_pActionSave); m_pMenuFile->addAction(m_actionSave);
m_pMenuFile->addSeparator(); m_pMenuFile->addSeparator();
m_pMenuFile->addAction(ui->m_pActionQuit); m_pMenuFile->addAction(m_actionQuit);
m_pMenuEdit->addAction(ui->m_pActionSettings); m_pMenuEdit->addAction(m_actionSettings);
m_pMenuWindow->addAction(ui->m_pActionMinimize); m_pMenuWindow->addAction(m_actionMinimize);
m_pMenuHelp->addAction(ui->m_pActionAbout); m_pMenuHelp->addAction(m_actionAbout);
m_pMenuHelp->addAction(ui->m_pActionHelp); m_pMenuHelp->addAction(m_actionHelp);
m_pMenuFile->addSeparator(); m_pMenuFile->addSeparator();
m_pMenuHelp->addAction(ui->m_pActionClearSettings); m_pMenuHelp->addAction(m_actionClearSettings);
ui->m_pActionAbout->setText(QString("About %1...").arg(kAppName));
const auto enableTestMenu = strToTrue(qEnvironmentVariable("DESKFLOW_TEST_MENU")); const auto enableTestMenu = strToTrue(qEnvironmentVariable("DESKFLOW_TEST_MENU"));
if (enableTestMenu || kDebugBuild) { if (enableTestMenu || kDebugBuild) {
auto testMenu = new QMenu("Test", m_pMenuBar); auto testMenu = new QMenu("Test", m_pMenuBar);
m_pMenuBar->addMenu(testMenu); m_pMenuBar->addMenu(testMenu);
testMenu->addAction(ui->m_pActionTestFatalError); testMenu->addAction(m_actionTestFatalError);
testMenu->addAction(ui->m_pActionTestCriticalError); testMenu->addAction(m_actionTestCriticalError);
} }
setMenuBar(m_pMenuBar); setMenuBar(m_pMenuBar);
@ -864,24 +890,24 @@ void MainWindow::onCoreProcessStateChanged(CoreProcessState state)
if (state == CoreProcessState::Started || state == CoreProcessState::Starting || if (state == CoreProcessState::Started || state == CoreProcessState::Starting ||
state == CoreProcessState::RetryPending) { state == CoreProcessState::RetryPending) {
disconnect(ui->m_pButtonToggleStart, &QPushButton::clicked, ui->m_pActionStartCore, &QAction::trigger); disconnect(ui->m_pButtonToggleStart, &QPushButton::clicked, m_actionStartCore, &QAction::trigger);
connect(ui->m_pButtonToggleStart, &QPushButton::clicked, ui->m_pActionStopCore, &QAction::trigger); connect(ui->m_pButtonToggleStart, &QPushButton::clicked, m_actionStopCore, &QAction::trigger);
ui->m_pButtonToggleStart->setText(QString("&Stop")); ui->m_pButtonToggleStart->setText(QString("&Stop"));
ui->m_pButtonApply->setEnabled(true); ui->m_pButtonApply->setEnabled(true);
ui->m_pActionStartCore->setEnabled(false); m_actionStartCore->setEnabled(false);
ui->m_pActionStopCore->setEnabled(true); m_actionStopCore->setEnabled(true);
} else { } else {
disconnect(ui->m_pButtonToggleStart, &QPushButton::clicked, ui->m_pActionStopCore, &QAction::trigger); disconnect(ui->m_pButtonToggleStart, &QPushButton::clicked, m_actionStopCore, &QAction::trigger);
connect(ui->m_pButtonToggleStart, &QPushButton::clicked, ui->m_pActionStartCore, &QAction::trigger); connect(ui->m_pButtonToggleStart, &QPushButton::clicked, m_actionStartCore, &QAction::trigger);
ui->m_pButtonToggleStart->setText(QString("&Start")); ui->m_pButtonToggleStart->setText(QString("&Start"));
ui->m_pButtonApply->setEnabled(false); ui->m_pButtonApply->setEnabled(false);
ui->m_pActionStartCore->setEnabled(true); m_actionStartCore->setEnabled(true);
ui->m_pActionStopCore->setEnabled(false); m_actionStopCore->setEnabled(false);
} }
} }
@ -904,9 +930,9 @@ void MainWindow::onCoreConnectionStateChanged(CoreConnectionState state)
void MainWindow::setVisible(bool visible) void MainWindow::setVisible(bool visible)
{ {
QMainWindow::setVisible(visible); QMainWindow::setVisible(visible);
ui->m_pActionMinimize->setEnabled(visible); m_actionMinimize->setEnabled(visible);
#ifndef Q_OS_MAC #ifndef Q_OS_MAC
ui->m_pActionRestore->setEnabled(!visible); m_actionRestore->setEnabled(!visible);
#else #else
// dock hide only supported on lion :( // dock hide only supported on lion :(
ProcessSerialNumber psn = {0, kCurrentProcess}; ProcessSerialNumber psn = {0, kCurrentProcess};
@ -1024,7 +1050,7 @@ void MainWindow::enableServer(bool enable)
if (enable) { if (enable) {
ui->m_pButtonToggleStart->setEnabled(true); ui->m_pButtonToggleStart->setEnabled(true);
ui->m_pActionStartCore->setEnabled(true); m_actionStartCore->setEnabled(true);
m_CoreProcess.setMode(CoreProcess::Mode::Server); m_CoreProcess.setMode(CoreProcess::Mode::Server);
// The server can run without any clients configured, and this is actually // The server can run without any clients configured, and this is actually
@ -1048,7 +1074,7 @@ void MainWindow::enableClient(bool enable)
if (enable) { if (enable) {
ui->m_pButtonToggleStart->setEnabled(true); ui->m_pButtonToggleStart->setEnabled(true);
ui->m_pActionStartCore->setEnabled(true); m_actionStartCore->setEnabled(true);
m_CoreProcess.setMode(CoreProcess::Mode::Client); m_CoreProcess.setMode(CoreProcess::Mode::Client);
} }
} }

33
src/gui/src/MainWindow.h
View File

@ -120,6 +120,16 @@ private slots:
void onWindowSaveTimerTimeout(); void onWindowSaveTimerTimeout();
void onServerConnectionConfigureClient(const QString &clientName); void onServerConnectionConfigureClient(const QString &clientName);
void clearSettings();
void openAboutDialog();
void openHelpUrl() const;
void openSettings();
void startCore();
void stopCore();
bool saveConfig();
void testFatalError() const;
void testCriticalError() const;
// //
// Auto-connect slots // Auto-connect slots
// //
@ -131,15 +141,6 @@ private slots:
void on_m_pRadioGroupServer_clicked(bool); void on_m_pRadioGroupServer_clicked(bool);
void on_m_pRadioGroupClient_clicked(bool); void on_m_pRadioGroupClient_clicked(bool);
void on_m_pButtonConfigureServer_clicked(); void on_m_pButtonConfigureServer_clicked();
bool on_m_pActionSave_triggered();
void on_m_pActionAbout_triggered();
void on_m_pActionHelp_triggered() const;
void on_m_pActionSettings_triggered();
void on_m_pActionStartCore_triggered();
void on_m_pActionStopCore_triggered();
void on_m_pActionTestFatalError_triggered() const;
void on_m_pActionTestCriticalError_triggered() const;
void on_m_pActionClearSettings_triggered();
void on_m_pLineEditHostname_returnPressed(); void on_m_pLineEditHostname_returnPressed();
void on_m_pLineEditClientIp_returnPressed(); void on_m_pLineEditClientIp_returnPressed();
void on_m_pLineEditHostname_textChanged(const QString &text); void on_m_pLineEditHostname_textChanged(const QString &text);
@ -220,4 +221,18 @@ private:
deskflow::gui::ClientConnection m_ClientConnection; deskflow::gui::ClientConnection m_ClientConnection;
deskflow::gui::TlsUtility m_TlsUtility; deskflow::gui::TlsUtility m_TlsUtility;
QTimer m_WindowSaveTimer; QTimer m_WindowSaveTimer;
// Window Actions
QAction *m_actionAbout = nullptr;
QAction *m_actionClearSettings = nullptr;
QAction *m_actionHelp = nullptr;
QAction *m_actionMinimize = nullptr;
QAction *m_actionQuit = nullptr;
QAction *m_actionRestore = nullptr;
QAction *m_actionSave = nullptr;
QAction *m_actionSettings = nullptr;
QAction *m_actionStartCore = nullptr;
QAction *m_actionStopCore = nullptr;
QAction *m_actionTestCriticalError = nullptr;
QAction *m_actionTestFatalError = nullptr;
}; };

141
src/gui/src/MainWindow.ui
View File

@ -599,129 +599,6 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<action name="m_pActionAbout">
<property name="text">
<string>&amp;About Deskflow...</string>
</property>
<property name="shortcut">
<string notr="true"/>
</property>
</action>
<action name="m_pActionHelp">
<property name="text">
<string>Visit &amp;help site</string>
</property>
<property name="shortcut">
<string notr="true"/>
</property>
</action>
<action name="m_pActionQuit">
<property name="text">
<string>&amp;Quit</string>
</property>
<property name="statusTip">
<string>Quit</string>
</property>
<property name="shortcut">
<string notr="true">Ctrl+Q</string>
</property>
</action>
<action name="m_pActionStartCore">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>&amp;Start</string>
</property>
<property name="statusTip">
<string>Run</string>
</property>
<property name="shortcut">
<string>Ctrl+S</string>
</property>
</action>
<action name="m_pActionStopCore">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>S&amp;top</string>
</property>
<property name="statusTip">
<string>Stop</string>
</property>
<property name="shortcut">
<string>Ctrl+T</string>
</property>
</action>
<action name="m_pActionMinimize">
<property name="text">
<string>&amp;Hide</string>
</property>
<property name="toolTip">
<string>Hide</string>
</property>
<property name="shortcut">
<string notr="true"/>
</property>
</action>
<action name="m_pActionRestore">
<property name="text">
<string>&amp;Show</string>
</property>
<property name="toolTip">
<string>Show</string>
</property>
<property name="shortcut">
<string notr="true"/>
</property>
</action>
<action name="m_pActionSave">
<property name="text">
<string>Save configuration &amp;as...</string>
</property>
<property name="statusTip">
<string>Save the interactively generated server configuration to a file.</string>
</property>
<property name="shortcut">
<string notr="true">Ctrl+Alt+S</string>
</property>
</action>
<action name="m_pActionSettings">
<property name="text">
<string>Preferences</string>
</property>
<property name="toolTip">
<string>Preferences</string>
</property>
<property name="shortcut">
<string notr="true"/>
</property>
</action>
<action name="m_pActionTestFatalError">
<property name="text">
<string>Test fatal error</string>
</property>
<property name="menuRole">
<enum>QAction::TextHeuristicRole</enum>
</property>
</action>
<action name="m_pActionTestCriticalError">
<property name="text">
<string>Test critical error</string>
</property>
<property name="menuRole">
<enum>QAction::TextHeuristicRole</enum>
</property>
</action>
<action name="m_pActionClearSettings">
<property name="text">
<string>Clear settings</string>
</property>
<property name="menuRole">
<enum>QAction::TextHeuristicRole</enum>
</property>
</action>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget> <customwidget>
@ -747,22 +624,4 @@
<tabstop>m_pButtonApply</tabstop> <tabstop>m_pButtonApply</tabstop>
<tabstop>m_pButtonToggleStart</tabstop> <tabstop>m_pButtonToggleStart</tabstop>
</tabstops> </tabstops>
<connections>
<connection>
<sender>m_pButtonToggleStart</sender>
<signal>clicked()</signal>
<receiver>m_pActionStartCore</receiver>
<slot>trigger()</slot>
<hints>
<hint type="sourcelabel">
<x>361</x>
<y>404</y>
</hint>
<hint type="destinationlabel">
<x>-1</x>
<y>-1</y>
</hint>
</hints>
</connection>
</connections>
</ui> </ui>