GH-2971 Brand mod model for resource/texture pack pages
This commit is contained in:
parent
c92b44e6d6
commit
b246fc171e
@ -302,6 +302,10 @@ set(MINECRAFT_SOURCES
|
|||||||
minecraft/mod/ModFolderLoadTask.cpp
|
minecraft/mod/ModFolderLoadTask.cpp
|
||||||
minecraft/mod/LocalModParseTask.h
|
minecraft/mod/LocalModParseTask.h
|
||||||
minecraft/mod/LocalModParseTask.cpp
|
minecraft/mod/LocalModParseTask.cpp
|
||||||
|
minecraft/mod/ResourcePackFolderModel.h
|
||||||
|
minecraft/mod/ResourcePackFolderModel.cpp
|
||||||
|
minecraft/mod/TexturePackFolderModel.h
|
||||||
|
minecraft/mod/TexturePackFolderModel.cpp
|
||||||
|
|
||||||
# Assets
|
# Assets
|
||||||
minecraft/AssetsUtils.h
|
minecraft/AssetsUtils.h
|
||||||
|
@ -29,6 +29,8 @@
|
|||||||
#include "meta/VersionList.h"
|
#include "meta/VersionList.h"
|
||||||
|
|
||||||
#include "mod/ModFolderModel.h"
|
#include "mod/ModFolderModel.h"
|
||||||
|
#include "mod/ResourcePackFolderModel.h"
|
||||||
|
#include "mod/TexturePackFolderModel.h"
|
||||||
#include "WorldList.h"
|
#include "WorldList.h"
|
||||||
|
|
||||||
#include "icons/IIconList.h"
|
#include "icons/IIconList.h"
|
||||||
@ -986,7 +988,7 @@ std::shared_ptr<ModFolderModel> MinecraftInstance::resourcePackList() const
|
|||||||
{
|
{
|
||||||
if (!m_resource_pack_list)
|
if (!m_resource_pack_list)
|
||||||
{
|
{
|
||||||
m_resource_pack_list.reset(new ModFolderModel(resourcePacksDir()));
|
m_resource_pack_list.reset(new ResourcePackFolderModel(resourcePacksDir()));
|
||||||
m_resource_pack_list->disableInteraction(isRunning());
|
m_resource_pack_list->disableInteraction(isRunning());
|
||||||
connect(this, &BaseInstance::runningStatusChanged, m_resource_pack_list.get(), &ModFolderModel::disableInteraction);
|
connect(this, &BaseInstance::runningStatusChanged, m_resource_pack_list.get(), &ModFolderModel::disableInteraction);
|
||||||
}
|
}
|
||||||
@ -997,7 +999,7 @@ std::shared_ptr<ModFolderModel> MinecraftInstance::texturePackList() const
|
|||||||
{
|
{
|
||||||
if (!m_texture_pack_list)
|
if (!m_texture_pack_list)
|
||||||
{
|
{
|
||||||
m_texture_pack_list.reset(new ModFolderModel(texturePacksDir()));
|
m_texture_pack_list.reset(new TexturePackFolderModel(texturePacksDir()));
|
||||||
m_texture_pack_list->disableInteraction(isRunning());
|
m_texture_pack_list->disableInteraction(isRunning());
|
||||||
connect(this, &BaseInstance::runningStatusChanged, m_texture_pack_list.get(), &ModFolderModel::disableInteraction);
|
connect(this, &BaseInstance::runningStatusChanged, m_texture_pack_list.get(), &ModFolderModel::disableInteraction);
|
||||||
}
|
}
|
||||||
|
23
api/logic/minecraft/mod/ResourcePackFolderModel.cpp
Normal file
23
api/logic/minecraft/mod/ResourcePackFolderModel.cpp
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
#include "ResourcePackFolderModel.h"
|
||||||
|
|
||||||
|
ResourcePackFolderModel::ResourcePackFolderModel(const QString &dir) : ModFolderModel(dir) {
|
||||||
|
}
|
||||||
|
|
||||||
|
QVariant ResourcePackFolderModel::headerData(int section, Qt::Orientation orientation, int role) const {
|
||||||
|
if (role == Qt::ToolTipRole) {
|
||||||
|
switch (section) {
|
||||||
|
case ActiveColumn:
|
||||||
|
return tr("Is the resource pack enabled?");
|
||||||
|
case NameColumn:
|
||||||
|
return tr("The name of the resource pack.");
|
||||||
|
case VersionColumn:
|
||||||
|
return tr("The version of the resource pack.");
|
||||||
|
case DateColumn:
|
||||||
|
return tr("The date and time this resource pack was last changed (or added).");
|
||||||
|
default:
|
||||||
|
return QVariant();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return ModFolderModel::headerData(section, orientation, role);
|
||||||
|
}
|
13
api/logic/minecraft/mod/ResourcePackFolderModel.h
Normal file
13
api/logic/minecraft/mod/ResourcePackFolderModel.h
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "ModFolderModel.h"
|
||||||
|
|
||||||
|
class MULTIMC_LOGIC_EXPORT ResourcePackFolderModel : public ModFolderModel
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
public:
|
||||||
|
explicit ResourcePackFolderModel(const QString &dir);
|
||||||
|
|
||||||
|
QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
|
||||||
|
};
|
23
api/logic/minecraft/mod/TexturePackFolderModel.cpp
Normal file
23
api/logic/minecraft/mod/TexturePackFolderModel.cpp
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
#include "TexturePackFolderModel.h"
|
||||||
|
|
||||||
|
TexturePackFolderModel::TexturePackFolderModel(const QString &dir) : ModFolderModel(dir) {
|
||||||
|
}
|
||||||
|
|
||||||
|
QVariant TexturePackFolderModel::headerData(int section, Qt::Orientation orientation, int role) const {
|
||||||
|
if (role == Qt::ToolTipRole) {
|
||||||
|
switch (section) {
|
||||||
|
case ActiveColumn:
|
||||||
|
return tr("Is the texture pack enabled?");
|
||||||
|
case NameColumn:
|
||||||
|
return tr("The name of the texture pack.");
|
||||||
|
case VersionColumn:
|
||||||
|
return tr("The version of the texture pack.");
|
||||||
|
case DateColumn:
|
||||||
|
return tr("The date and time this texture pack was last changed (or added).");
|
||||||
|
default:
|
||||||
|
return QVariant();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return ModFolderModel::headerData(section, orientation, role);
|
||||||
|
}
|
13
api/logic/minecraft/mod/TexturePackFolderModel.h
Normal file
13
api/logic/minecraft/mod/TexturePackFolderModel.h
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "ModFolderModel.h"
|
||||||
|
|
||||||
|
class MULTIMC_LOGIC_EXPORT TexturePackFolderModel : public ModFolderModel
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
public:
|
||||||
|
explicit TexturePackFolderModel(const QString &dir);
|
||||||
|
|
||||||
|
QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
|
||||||
|
};
|
@ -1,4 +1,5 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "ModFolderPage.h"
|
#include "ModFolderPage.h"
|
||||||
#include "ui_ModFolderPage.h"
|
#include "ui_ModFolderPage.h"
|
||||||
|
|
||||||
@ -12,8 +13,8 @@ public:
|
|||||||
{
|
{
|
||||||
ui->actionView_configs->setVisible(false);
|
ui->actionView_configs->setVisible(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual ~ResourcePackPage() {}
|
virtual ~ResourcePackPage() {}
|
||||||
|
|
||||||
virtual bool shouldDisplay() const override
|
virtual bool shouldDisplay() const override
|
||||||
{
|
{
|
||||||
return !m_inst->traits().contains("no-texturepacks") &&
|
return !m_inst->traits().contains("no-texturepacks") &&
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "ModFolderPage.h"
|
#include "ModFolderPage.h"
|
||||||
#include "ui_ModFolderPage.h"
|
#include "ui_ModFolderPage.h"
|
||||||
|
|
||||||
@ -13,6 +14,7 @@ public:
|
|||||||
ui->actionView_configs->setVisible(false);
|
ui->actionView_configs->setVisible(false);
|
||||||
}
|
}
|
||||||
virtual ~TexturePackPage() {}
|
virtual ~TexturePackPage() {}
|
||||||
|
|
||||||
virtual bool shouldDisplay() const override
|
virtual bool shouldDisplay() const override
|
||||||
{
|
{
|
||||||
return m_inst->traits().contains("texturepacks");
|
return m_inst->traits().contains("texturepacks");
|
||||||
|
Loading…
Reference in New Issue
Block a user