diff options
| author | flow <flowlnlnln@gmail.com> | 2023-01-29 10:35:26 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-29 10:35:26 -0800 |
| commit | a714d5966ef9dc893a57ff4575fd8a2afd830570 (patch) | |
| tree | 48bad18e25f8f3a84d6cc74f6d34a05d3b985d9a | |
| parent | c78db5459ef7afbc8fd5a5b81b03f672f94235bc (diff) | |
| parent | 2b0252d4ae344b427c36c638e5fcd781f8e5b3ec (diff) | |
| download | PrismLauncher-a714d5966ef9dc893a57ff4575fd8a2afd830570.tar.gz PrismLauncher-a714d5966ef9dc893a57ff4575fd8a2afd830570.tar.bz2 PrismLauncher-a714d5966ef9dc893a57ff4575fd8a2afd830570.zip | |
Merge pull request #795 from leo78913/mainwindow-fixes
closes https://github.com/PrismLauncher/PrismLauncher/issues/792
| -rw-r--r-- | launcher/ui/MainWindow.cpp | 4 | ||||
| -rw-r--r-- | launcher/ui/MainWindow.ui | 6 |
2 files changed, 3 insertions, 7 deletions
diff --git a/launcher/ui/MainWindow.cpp b/launcher/ui/MainWindow.cpp index e8765b3d..6d21f5ed 100644 --- a/launcher/ui/MainWindow.cpp +++ b/launcher/ui/MainWindow.cpp @@ -192,7 +192,9 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi foldersMenuButton->setPopupMode(QToolButton::InstantPopup); helpMenuButton = dynamic_cast<QToolButton*>(ui->mainToolBar->widgetForAction(ui->actionHelpButton)); - ui->actionHelpButton->setMenu(ui->helpMenu); + ui->actionHelpButton->setMenu(new QMenu(this)); + ui->actionHelpButton->menu()->addActions(ui->helpMenu->actions()); + ui->actionHelpButton->menu()->removeAction(ui->actionCheckUpdate); helpMenuButton->setPopupMode(QToolButton::InstantPopup); auto accountMenuButton = dynamic_cast<QToolButton*>(ui->mainToolBar->widgetForAction(ui->actionAccountsButton)); diff --git a/launcher/ui/MainWindow.ui b/launcher/ui/MainWindow.ui index c9c9af94..2b6a10b1 100644 --- a/launcher/ui/MainWindow.ui +++ b/launcher/ui/MainWindow.ui @@ -621,9 +621,6 @@ </property> </action> <action name="actionAddToPATH"> - <property name="enabled"> - <bool>false</bool> - </property> <property name="icon"> <iconset theme="custom-commands"> <normaloff>.</normaloff>.</iconset> @@ -634,9 +631,6 @@ <property name="toolTip"> <string>Install a %1 symlink to /usr/local/bin</string> </property> - <property name="visible"> - <bool>false</bool> - </property> </action> <action name="actionFoldersButton"> <property name="icon"> |