fix: Fix some stuff in the menu bar

 - Remove duplicated launch actions
 - Enable the add instance action icon in menus
 - Remove ugly separator at the end of the help menu if the updater is disabled
 - Add icons to the help and news menu items

Signed-off-by: leo78913 <leo3758@riseup.net>

1 files changed, 5 insertions, 5 deletions

diff --git a/launcher/ui/MainWindow.cpp b/launcher/ui/MainWindow.cpp
index 85b00b67..6e3b95ff 100644
--- a/launcher/ui/MainWindow.cpp
+++ b/launcher/ui/MainWindow.cpp
@@ -290,7 +290,6 @@ public:
         actionAddInstance = TranslatedAction(MainWindow);
         actionAddInstance->setObjectName(QStringLiteral("actionAddInstance"));
         actionAddInstance->setIcon(APPLICATION->getThemedIcon("new"));
-        actionAddInstance->setIconVisibleInMenu(false);
         actionAddInstance.setTextId(QT_TRANSLATE_NOOP("MainWindow", "Add Instanc&e..."));
         actionAddInstance.setTooltipId(QT_TRANSLATE_NOOP("MainWindow", "Add a new instance."));
         actionAddInstance->setShortcut(QKeySequence::New);
@@ -509,8 +508,6 @@ public:
         fileMenu->setSeparatorsCollapsible(false);
         fileMenu->addAction(actionAddInstance);
         fileMenu->addAction(actionLaunchInstance);
-        fileMenu->addAction(actionLaunchInstanceOffline);
-        fileMenu->addAction(actionLaunchInstanceDemo);
         fileMenu->addAction(actionKillInstance);
         fileMenu->addAction(actionCloseWindow);
         fileMenu->addSeparator();
@@ -555,10 +552,11 @@ public:
             helpMenu->addAction(actionDISCORD);
         if (!BuildConfig.SUBREDDIT_URL.isEmpty())
             helpMenu->addAction(actionREDDIT);
-        helpMenu->addSeparator();
         if(BuildConfig.UPDATER_ENABLED)
+        {
+            helpMenu->addSeparator();
             helpMenu->addAction(actionCheckUpdate);
-
+        }
         MainWindow->setMenuBar(menuBar);
     }
 
@@ -576,6 +574,7 @@ public:
         actionOpenWiki->setObjectName(QStringLiteral("actionOpenWiki"));
         actionOpenWiki.setTextId(QT_TRANSLATE_NOOP("MainWindow", "%1 &Help"));
         actionOpenWiki.setTooltipId(QT_TRANSLATE_NOOP("MainWindow", "Open the %1 wiki"));
+        actionOpenWiki->setIcon(APPLICATION->getThemedIcon("help"));
         connect(actionOpenWiki, &QAction::triggered, MainWindow, &MainWindow::on_actionOpenWiki_triggered);
         all_actions.append(&actionOpenWiki);
 
@@ -583,6 +582,7 @@ public:
         actionNewsMenuBar->setObjectName(QStringLiteral("actionNewsMenuBar"));
         actionNewsMenuBar.setTextId(QT_TRANSLATE_NOOP("MainWindow", "%1 &News"));
         actionNewsMenuBar.setTooltipId(QT_TRANSLATE_NOOP("MainWindow", "Open the %1 wiki"));
+        actionNewsMenuBar->setIcon(APPLICATION->getThemedIcon("news"));
         connect(actionNewsMenuBar, &QAction::triggered, MainWindow, &MainWindow::on_actionMoreNews_triggered);
         all_actions.append(&actionNewsMenuBar);
     }