From aff3495e74fb2ff8ad0e7c43c45034984d1a252b Mon Sep 17 00:00:00 2001
From: sithlord48 <sithlord48@gmail.com>
Date: Wed, 18 Dec 2024 23:52:55 -0500
Subject: [PATCH] refactor: MainWindow clearer menu creation, remove private
 menu items

---
 src/gui/src/MainWindow.cpp | 56 ++++++++++++++++++--------------------
 src/gui/src/MainWindow.h   |  5 ----
 2 files changed, 27 insertions(+), 34 deletions(-)

diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp
index 827b592d4..88680029b 100644
--- a/src/gui/src/MainWindow.cpp
+++ b/src/gui/src/MainWindow.cpp
@@ -570,45 +570,43 @@ void MainWindow::setStatus(const QString &status)
 
 void MainWindow::createMenuBar()
 {
-  m_pMenuBar = new QMenuBar(this);
-  m_pMenuFile = new QMenu(tr("File"), m_pMenuBar);
-  m_pMenuEdit = new QMenu(tr("Edit"), m_pMenuBar);
-  m_pMenuWindow = new QMenu(tr("Window"), m_pMenuBar);
-  m_pMenuHelp = new QMenu(tr("Help"), m_pMenuBar);
+  auto menuFile = new QMenu(tr("File"));
+  menuFile->addAction(m_actionStartCore);
+  menuFile->addAction(m_actionStopCore);
+  menuFile->addSeparator();
+  menuFile->addAction(m_actionSave);
+  menuFile->addSeparator();
+  menuFile->addAction(m_actionQuit);
 
-  m_pMenuBar->addAction(m_pMenuFile->menuAction());
-  m_pMenuBar->addAction(m_pMenuEdit->menuAction());
+  auto menuEdit = new QMenu(tr("Edit"));
+  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)
-  m_pMenuBar->addAction(m_pMenuWindow->menuAction());
+  menuBar->addMenu(menuWindow);
 #endif
-  m_pMenuBar->addAction(m_pMenuHelp->menuAction());
-
-  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);
+  menuBar->addMenu(menuHelp);
 
   const auto enableTestMenu = strToTrue(qEnvironmentVariable("DESKFLOW_TEST_MENU"));
-
   if (enableTestMenu || kDebugBuild) {
-    auto testMenu = new QMenu(tr("Test"), m_pMenuBar);
-    m_pMenuBar->addMenu(testMenu);
+    auto testMenu = new QMenu(tr("Test"));
+    menuBar->addMenu(testMenu);
     testMenu->addAction(m_actionTestFatalError);
     testMenu->addAction(m_actionTestCriticalError);
   }
 
-  setMenuBar(m_pMenuBar);
+  setMenuBar(menuBar);
 }
 
 void MainWindow::applyConfig()
diff --git a/src/gui/src/MainWindow.h b/src/gui/src/MainWindow.h
index 212a12291..621f227d7 100644
--- a/src/gui/src/MainWindow.h
+++ b/src/gui/src/MainWindow.h
@@ -184,11 +184,6 @@ private:
 
   VersionChecker m_VersionChecker;
   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;
   bool m_SecureSocket = false;
   bool m_SaveWindow = false;