Merge pull request #455 from leo78913/menubar-stuff

PrismLauncher · Nov 18, 2022 · dbd01d3 · dbd01d3
2 parents b24c096 + 7439fd6
commit dbd01d3
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/launcher/ui/MainWindow.cpp b/launcher/ui/MainWindow.cpp
@@ -297,7 +297,6 @@ class MainWindow::Ui
         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);
@@ -533,8 +532,6 @@ class MainWindow::Ui
         fileMenu->setSeparatorsCollapsible(false);
         fileMenu->addAction(actionAddInstance);
         fileMenu->addAction(actionLaunchInstance);
-        fileMenu->addAction(actionLaunchInstanceOffline);
-        fileMenu->addAction(actionLaunchInstanceDemo);
         fileMenu->addAction(actionKillInstance);
         fileMenu->addAction(actionCloseWindow);
         fileMenu->addSeparator();
@@ -584,10 +581,11 @@ class MainWindow::Ui
             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);
     }
 
@@ -605,13 +603,15 @@ class MainWindow::Ui
         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);
 
         actionNewsMenuBar = TranslatedAction(MainWindow);
         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);
     }