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

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

Browse Source 
hopefully now its finally ok
This commit is contained in:
flow 2022-03-03 09:51:46 -03:00
parent 9e443faba3
commit e0c025b162
No known key found for this signature in database
GPG Key ID: 8D0F221F0A59F469
2 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -143,17 +143,19 @@ ModFolderPage::ModFolderPage(
ui(new Ui::ModFolderPage) ui(new Ui::ModFolderPage)
{ {
ui->setupUi(this); 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") { 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); 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); ui->actionsToolbar->insertSpacer(ui->actionView_configs);
m_inst = inst; m_inst = inst;

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

@ -84,7 +84,6 @@
<bool>false</bool> <bool>false</bool>
</attribute> </attribute>
<addaction name="actionAdd"/> <addaction name="actionAdd"/>
<addaction name="actionDownload"/>
<addaction name="separator"/> <addaction name="separator"/>
<addaction name="actionRemove"/> <addaction name="actionRemove"/>
<addaction name="actionEnable"/> <addaction name="actionEnable"/>
@ -97,15 +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>
</action>
<action name="actionDownload">
<property name="text">
<string>&amp;Download Mods</string>
</property>
<property name="toolTip">
<string>Download Mods</string>
</property> </property>
</action> </action>
<action name="actionRemove"> <action name="actionRemove">