fix extra spacing in resource packs and shader packs, and move button up

hopefully now its finally ok

2 files changed, 11 insertions, 18 deletions

diff --git a/launcher/ui/pages/instance/ModFolderPage.cpp b/launcher/ui/pages/instance/ModFolderPage.cpp
index 3becd1db..e4ad9012 100644
--- a/launcher/ui/pages/instance/ModFolderPage.cpp
+++ b/launcher/ui/pages/instance/ModFolderPage.cpp
@@ -143,17 +143,19 @@ ModFolderPage::ModFolderPage(
     ui(new Ui::ModFolderPage)
 {
     ui->setupUi(this);
-    auto act = ui->actionDownload;
+
+    // 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("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");
     }
-    else{
-        // HACK: Prevent the download button from showing in the shaders / resource packs tab
-        // This whole thing needs some cleaning up anyway, no next time we can do it properly...
-        act->setVisible(false);
-        act->setText("");
-        act->setToolTip("");
-    }
+
     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 75e0d1c5..ab59b0df 100644
--- a/launcher/ui/pages/instance/ModFolderPage.ui
+++ b/launcher/ui/pages/instance/ModFolderPage.ui
@@ -84,7 +84,6 @@
     <bool>false</bool>
    </attribute>
    <addaction name="actionAdd"/>
-   <addaction name="actionDownload"/>
    <addaction name="separator"/>
    <addaction name="actionRemove"/>
    <addaction name="actionEnable"/>
@@ -97,15 +96,7 @@
     <string>&amp;Add</string>
    </property>
    <property name="toolTip">
-    <string>Add mods</string>
-   </property>
-  </action>
-  <action name="actionDownload">
-   <property name="text">
-    <string>&amp;Download Mods</string>
-   </property>
-   <property name="toolTip">
-    <string>Download Mods</string>
+    <string>Add</string>
    </property>
   </action>
   <action name="actionRemove">