diff options
| author | flow <thiagodonato300@gmail.com> | 2022-03-06 15:28:18 -0300 |
|---|---|---|
| committer | flow <thiagodonato300@gmail.com> | 2022-03-06 15:28:18 -0300 |
| commit | 1229e908175e16158ccff8dc400ca509337a1812 (patch) | |
| tree | 0d2e9afd80f575230de4d5596f081a1e15409835 | |
| parent | 5a638fa97711231638615f920462ed5f5f4507e0 (diff) | |
| parent | 53468ea474fb29886192a6fab0a25d1219fd9a1c (diff) | |
| download | PrismLauncher-1229e908175e16158ccff8dc400ca509337a1812.tar.gz PrismLauncher-1229e908175e16158ccff8dc400ca509337a1812.tar.bz2 PrismLauncher-1229e908175e16158ccff8dc400ca509337a1812.zip | |
merge upstream
| -rw-r--r-- | launcher/ui/pages/instance/ModFolderPage.cpp | 12 | ||||
| -rw-r--r-- | launcher/ui/pages/instance/ModFolderPage.ui | 2 |
2 files changed, 11 insertions, 3 deletions
diff --git a/launcher/ui/pages/instance/ModFolderPage.cpp b/launcher/ui/pages/instance/ModFolderPage.cpp index b342accf..e4ad9012 100644 --- a/launcher/ui/pages/instance/ModFolderPage.cpp +++ b/launcher/ui/pages/instance/ModFolderPage.cpp @@ -143,11 +143,19 @@ ModFolderPage::ModFolderPage( ui(new Ui::ModFolderPage) { 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") { - auto act = new QAction(tr("Install Mods"), this); - ui->actionsToolbar->insertActionBefore(ui->actionView_configs,act); + auto act = new QAction(tr("Download mods"), this); + 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); + + ui->actionAdd->setText("Add .jar"); + ui->actionAdd->setToolTip("Add mods via local file"); } + ui->actionsToolbar->insertSpacer(ui->actionView_configs); m_inst = inst; diff --git a/launcher/ui/pages/instance/ModFolderPage.ui b/launcher/ui/pages/instance/ModFolderPage.ui index 0fb51e84..ab59b0df 100644 --- a/launcher/ui/pages/instance/ModFolderPage.ui +++ b/launcher/ui/pages/instance/ModFolderPage.ui @@ -96,7 +96,7 @@ <string>&Add</string> </property> <property name="toolTip"> - <string>Add mods</string> + <string>Add</string> </property> </action> <action name="actionRemove"> |