0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #795 from leo78913/mainwindow-fixes

Browse Source 
closes https://github.com/PrismLauncher/PrismLauncher/issues/792
This commit is contained in:
flow 2023-01-29 10:35:26 -08:00 committed by GitHub
commit a714d5966e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
launcher/ui/MainWindow.cpp
View File

@ -192,7 +192,9 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
foldersMenuButton->setPopupMode(QToolButton::InstantPopup); foldersMenuButton->setPopupMode(QToolButton::InstantPopup);
helpMenuButton = dynamic_cast<QToolButton*>(ui->mainToolBar->widgetForAction(ui->actionHelpButton)); 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); helpMenuButton->setPopupMode(QToolButton::InstantPopup);
auto accountMenuButton = dynamic_cast<QToolButton*>(ui->mainToolBar->widgetForAction(ui->actionAccountsButton)); auto accountMenuButton = dynamic_cast<QToolButton*>(ui->mainToolBar->widgetForAction(ui->actionAccountsButton));

6
launcher/ui/MainWindow.ui
View File

@ -621,9 +621,6 @@
</property> </property>
</action> </action>
<action name="actionAddToPATH"> <action name="actionAddToPATH">
<property name="enabled">
<bool>false</bool>
</property>
<property name="icon"> <property name="icon">
<iconset theme="custom-commands"> <iconset theme="custom-commands">
<normaloff>.</normaloff>.</iconset> <normaloff>.</normaloff>.</iconset>
@ -634,9 +631,6 @@
<property name="toolTip"> <property name="toolTip">
<string>Install a %1 symlink to /usr/local/bin</string> <string>Install a %1 symlink to /usr/local/bin</string>
</property> </property>
<property name="visible">
<bool>false</bool>
</property>
</action> </action>
<action name="actionFoldersButton"> <action name="actionFoldersButton">
<property name="icon"> <property name="icon">