mirror of
https://github.com/PrismLauncher/PrismLauncher.git
synced 2026-07-06 21:36:58 +03:00
Merge remote-tracking branch 'upstream/develop' into data-packs
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
This commit is contained in:
commit
6ab4fef0c5
686 changed files with 15261 additions and 9719 deletions
|
|
@ -84,7 +84,7 @@ void InfoFrame::updateWithMod(Mod const& m)
|
|||
|
||||
QString text = "";
|
||||
QString name = "";
|
||||
QString link = m.metaurl();
|
||||
QString link = m.homepage();
|
||||
if (m.name().isEmpty())
|
||||
name = m.internal_id();
|
||||
else
|
||||
|
|
@ -93,7 +93,7 @@ void InfoFrame::updateWithMod(Mod const& m)
|
|||
if (link.isEmpty())
|
||||
text = name;
|
||||
else {
|
||||
text = "<a href=\"" + link + "\">" + name + "</a>";
|
||||
text = "<a href=\"" + QUrl(link).toEncoded() + "\">" + name + "</a>";
|
||||
}
|
||||
if (!m.authors().isEmpty())
|
||||
text += " by " + m.authors().join(", ");
|
||||
|
|
@ -145,7 +145,13 @@ void InfoFrame::updateWithMod(Mod const& m)
|
|||
|
||||
void InfoFrame::updateWithResource(const Resource& resource)
|
||||
{
|
||||
setName(resource.name());
|
||||
const QString homepage = resource.homepage();
|
||||
|
||||
if (!homepage.isEmpty())
|
||||
setName("<a href=\"" + homepage + "\">" + resource.name() + "</a>");
|
||||
else
|
||||
setName(resource.name());
|
||||
|
||||
setImage();
|
||||
}
|
||||
|
||||
|
|
@ -209,7 +215,14 @@ QString InfoFrame::renderColorCodes(QString input)
|
|||
|
||||
void InfoFrame::updateWithResourcePack(ResourcePack& resource_pack)
|
||||
{
|
||||
setName(renderColorCodes(resource_pack.name()));
|
||||
QString name = renderColorCodes(resource_pack.name());
|
||||
|
||||
const QString homepage = resource_pack.homepage();
|
||||
if (!homepage.isEmpty()) {
|
||||
name = "<a href=\"" + homepage + "\">" + name + "</a>";
|
||||
}
|
||||
|
||||
setName(name);
|
||||
setDescription(renderColorCodes(resource_pack.description()));
|
||||
setImage(resource_pack.image({ 64, 64 }));
|
||||
}
|
||||
|
|
@ -222,7 +235,14 @@ void InfoFrame::updateWithDataPack(DataPack& data_pack) {
|
|||
|
||||
void InfoFrame::updateWithTexturePack(TexturePack& texture_pack)
|
||||
{
|
||||
setName(renderColorCodes(texture_pack.name()));
|
||||
QString name = renderColorCodes(texture_pack.name());
|
||||
|
||||
const QString homepage = texture_pack.homepage();
|
||||
if (!homepage.isEmpty()) {
|
||||
name = "<a href=\"" + homepage + "\">" + name + "</a>";
|
||||
}
|
||||
|
||||
setName(name);
|
||||
setDescription(renderColorCodes(texture_pack.description()));
|
||||
setImage(texture_pack.image({ 64, 64 }));
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue