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

refactor: MainWindow clearer menu creation, remove private menu items

Browse source
This commit is contained in:
sithlord48 2024-12-18 23:52:55 -05:00 committed by Nick Bolton
parent 1ff7d5f4aa
commit aff3495e74
2 changed files with 27 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
src/gui/src/MainWindow.cpp
View file

@ -570,45 +570,43 @@ void MainWindow::setStatus(const QString &status)
void MainWindow::createMenuBar() void MainWindow::createMenuBar()
{ {
m_pMenuBar = new QMenuBar(this); auto menuFile = new QMenu(tr("File"));
m_pMenuFile = new QMenu(tr("File"), m_pMenuBar); menuFile->addAction(m_actionStartCore);
m_pMenuEdit = new QMenu(tr("Edit"), m_pMenuBar); menuFile->addAction(m_actionStopCore);
m_pMenuWindow = new QMenu(tr("Window"), m_pMenuBar); menuFile->addSeparator();
m_pMenuHelp = new QMenu(tr("Help"), m_pMenuBar); menuFile->addAction(m_actionSave);
menuFile->addSeparator();
menuFile->addAction(m_actionQuit);
m_pMenuBar->addAction(m_pMenuFile->menuAction()); auto menuEdit = new QMenu(tr("Edit"));
m_pMenuBar->addAction(m_pMenuEdit->menuAction()); menuEdit->addAction(m_actionSettings);
auto menuWindow = new QMenu(tr("Window"));
menuWindow->addAction(m_actionMinimize);
auto menuHelp = new QMenu(tr("Help"));
menuHelp->addAction(m_actionAbout);
menuHelp->addAction(m_actionHelp);
menuHelp->addSeparator();
menuHelp->addAction(m_actionClearSettings);
auto menuBar = new QMenuBar(this);
menuBar->addMenu(menuFile);
menuBar->addMenu(menuEdit);
#if !defined(Q_OS_MAC) #if !defined(Q_OS_MAC)
m_pMenuBar->addAction(m_pMenuWindow->menuAction()); menuBar->addMenu(menuWindow);
#endif #endif
m_pMenuBar->addAction(m_pMenuHelp->menuAction()); menuBar->addMenu(menuHelp);
m_pMenuFile->addAction(m_actionStartCore);
m_pMenuFile->addAction(m_actionStopCore);
m_pMenuFile->addSeparator();
m_pMenuFile->addAction(m_actionSave);
m_pMenuFile->addSeparator();
m_pMenuFile->addAction(m_actionQuit);
m_pMenuEdit->addAction(m_actionSettings);
m_pMenuWindow->addAction(m_actionMinimize);
m_pMenuHelp->addAction(m_actionAbout);
m_pMenuHelp->addAction(m_actionHelp);
m_pMenuFile->addSeparator();
m_pMenuHelp->addAction(m_actionClearSettings);
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(tr("Test"), m_pMenuBar); auto testMenu = new QMenu(tr("Test"));
m_pMenuBar->addMenu(testMenu); menuBar->addMenu(testMenu);
testMenu->addAction(m_actionTestFatalError); testMenu->addAction(m_actionTestFatalError);
testMenu->addAction(m_actionTestCriticalError); testMenu->addAction(m_actionTestCriticalError);
} }
setMenuBar(m_pMenuBar); setMenuBar(menuBar);
} }
void MainWindow::applyConfig() void MainWindow::applyConfig()

5
src/gui/src/MainWindow.h
View file

@ -184,11 +184,6 @@ private:
VersionChecker m_VersionChecker; VersionChecker m_VersionChecker;
deskflow::gui::TrayIcon m_TrayIcon; deskflow::gui::TrayIcon m_TrayIcon;
QMenuBar *m_pMenuBar = nullptr;
QMenu *m_pMenuFile = nullptr;
QMenu *m_pMenuEdit = nullptr;
QMenu *m_pMenuWindow = nullptr;
QMenu *m_pMenuHelp = nullptr;
QAbstractButton *m_pCancelButton = nullptr; QAbstractButton *m_pCancelButton = nullptr;
bool m_SecureSocket = false; bool m_SecureSocket = false;
bool m_SaveWindow = false; bool m_SaveWindow = false;