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

merge upstream

Browse Source
This commit is contained in:
flow 2022-03-06 15:28:18 -03:00
commit 1229e90817
No known key found for this signature in database
GPG Key ID: 8D0F221F0A59F469
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
launcher/ui/pages/instance/ModFolderPage.cpp
View File

@ -143,11 +143,19 @@ ModFolderPage::ModFolderPage(
ui(new Ui::ModFolderPage) ui(new Ui::ModFolderPage)
{ {
ui->setupUi(this); ui->setupUi(this);
// This is structured like that so that these changes
// do not affect the Resouce pack and Shader pack tabs
if(id == "mods") { if(id == "mods") {
auto act = new QAction(tr("Install Mods"), this); auto act = new QAction(tr("Download mods"), this);
ui->actionsToolbar->insertActionBefore(ui->actionView_configs,act); act->setToolTip(tr("Download mods from online mod platforms"));
ui->actionsToolbar->insertActionBefore(ui->actionAdd, act);
connect(act, &QAction::triggered, this, &ModFolderPage::on_actionInstall_mods_triggered); connect(act, &QAction::triggered, this, &ModFolderPage::on_actionInstall_mods_triggered);
ui->actionAdd->setText("Add .jar");
ui->actionAdd->setToolTip("Add mods via local file");
} }
ui->actionsToolbar->insertSpacer(ui->actionView_configs); ui->actionsToolbar->insertSpacer(ui->actionView_configs);
m_inst = inst; m_inst = inst;

2
launcher/ui/pages/instance/ModFolderPage.ui
View File

@ -96,7 +96,7 @@
<string>&amp;Add</string> <string>&amp;Add</string>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>Add mods</string> <string>Add</string>
</property> </property>
</action> </action>
<action name="actionRemove"> <action name="actionRemove">