@@ -22,7 +22,7 @@
|
||||
#include "ui/dialogs/ProgressDialog.h"
|
||||
#include "ui/dialogs/ResourceDownloadDialog.h"
|
||||
|
||||
DataPackPage::DataPackPage(MinecraftInstance* instance, std::shared_ptr<DataPackFolderModel> model, QWidget* parent)
|
||||
DataPackPage::DataPackPage(BaseInstance* instance, std::shared_ptr<DataPackFolderModel> model, QWidget* parent)
|
||||
: ExternalResourcesPage(instance, model, parent)
|
||||
{
|
||||
ui->actionDownloadItem->setText(tr("Download packs"));
|
||||
@@ -30,7 +30,7 @@ DataPackPage::DataPackPage(MinecraftInstance* instance, std::shared_ptr<DataPack
|
||||
ui->actionDownloadItem->setEnabled(true);
|
||||
connect(ui->actionDownloadItem, &QAction::triggered, this, &DataPackPage::downloadDataPacks);
|
||||
ui->actionsToolbar->insertActionBefore(ui->actionAddItem, ui->actionDownloadItem);
|
||||
|
||||
|
||||
ui->actionViewConfigs->setVisible(false);
|
||||
}
|
||||
|
||||
@@ -49,8 +49,7 @@ void DataPackPage::downloadDataPacks()
|
||||
|
||||
ResourceDownload::DataPackDownloadDialog mdownload(this, std::static_pointer_cast<DataPackFolderModel>(m_model), m_instance);
|
||||
if (mdownload.exec()) {
|
||||
auto tasks =
|
||||
new ConcurrentTask("Download Data Pack", APPLICATION->settings()->get("NumberOfConcurrentDownloads").toInt());
|
||||
auto tasks = new ConcurrentTask("Download Data Pack", APPLICATION->settings()->get("NumberOfConcurrentDownloads").toInt());
|
||||
connect(tasks, &Task::failed, [this, tasks](QString reason) {
|
||||
CustomMessageBox::selectable(this, tr("Error"), reason, QMessageBox::Critical)->show();
|
||||
tasks->deleteLater();
|
||||
@@ -78,3 +77,95 @@ void DataPackPage::downloadDataPacks()
|
||||
m_model->update();
|
||||
}
|
||||
}
|
||||
|
||||
GlobalDataPackPage::GlobalDataPackPage(MinecraftInstance* instance, QWidget* parent) : QWidget(parent), m_instance(instance)
|
||||
{
|
||||
auto layout = new QVBoxLayout(this);
|
||||
layout->setContentsMargins(0, 0, 0, 0);
|
||||
setLayout(layout);
|
||||
|
||||
connect(instance->settings()->getSetting("GlobalDataPacksEnabled").get(), &Setting::SettingChanged, this, [this] {
|
||||
updateContent();
|
||||
if (m_container != nullptr)
|
||||
m_container->refreshContainer();
|
||||
});
|
||||
|
||||
connect(instance->settings()->getSetting("GlobalDataPacksPath").get(), &Setting::SettingChanged, this,
|
||||
&GlobalDataPackPage::updateContent);
|
||||
}
|
||||
|
||||
QString GlobalDataPackPage::displayName() const
|
||||
{
|
||||
if (m_underlyingPage == nullptr)
|
||||
return {};
|
||||
|
||||
return m_underlyingPage->displayName();
|
||||
}
|
||||
|
||||
QIcon GlobalDataPackPage::icon() const
|
||||
{
|
||||
if (m_underlyingPage == nullptr)
|
||||
return {};
|
||||
|
||||
return m_underlyingPage->icon();
|
||||
}
|
||||
|
||||
QString GlobalDataPackPage::helpPage() const
|
||||
{
|
||||
if (m_underlyingPage == nullptr)
|
||||
return {};
|
||||
|
||||
return m_underlyingPage->helpPage();
|
||||
}
|
||||
|
||||
bool GlobalDataPackPage::shouldDisplay() const
|
||||
{
|
||||
return m_instance->settings()->get("GlobalDataPacksEnabled").toBool();
|
||||
}
|
||||
|
||||
bool GlobalDataPackPage::apply()
|
||||
{
|
||||
return m_underlyingPage != nullptr && m_underlyingPage->apply();
|
||||
}
|
||||
|
||||
void GlobalDataPackPage::openedImpl()
|
||||
{
|
||||
if (m_underlyingPage != nullptr)
|
||||
m_underlyingPage->openedImpl();
|
||||
}
|
||||
|
||||
void GlobalDataPackPage::closedImpl()
|
||||
{
|
||||
if (m_underlyingPage != nullptr)
|
||||
m_underlyingPage->closedImpl();
|
||||
}
|
||||
|
||||
void GlobalDataPackPage::updateContent()
|
||||
{
|
||||
if (m_underlyingPage != nullptr) {
|
||||
if (m_container->selectedPage() == this)
|
||||
m_underlyingPage->closedImpl();
|
||||
|
||||
m_underlyingPage->apply();
|
||||
|
||||
layout()->removeWidget(m_underlyingPage);
|
||||
|
||||
delete m_underlyingPage;
|
||||
m_underlyingPage = nullptr;
|
||||
}
|
||||
|
||||
if (shouldDisplay()) {
|
||||
m_underlyingPage = new DataPackPage(m_instance, m_instance->dataPackList());
|
||||
|
||||
if (m_container->selectedPage() == this)
|
||||
m_underlyingPage->openedImpl();
|
||||
|
||||
layout()->addWidget(m_underlyingPage);
|
||||
}
|
||||
}
|
||||
|
||||
void GlobalDataPackPage::setParentContainer(BasePageContainer* container)
|
||||
{
|
||||
BasePage::setParentContainer(container);
|
||||
updateContent();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user