AstralTransRocketries/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-09-09 20:13:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: icon import with dot in name (#3919)

Browse Source
This commit is contained in:
Alexandru Ionut Tripon 2025-06-29 16:49:17 +03:00 committed by GitHub
commit 3d4ed25dee
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
launcher/InstanceImportTask.cpp
View File

@ -263,9 +263,9 @@ void InstanceImportTask::extractFinished()
}
}
bool installIcon(QString root, QString instIcon)
bool installIcon(QString root, QString instIconKey)
{
auto importIconPath = IconUtils::findBestIconIn(root, instIcon);
auto importIconPath = IconUtils::findBestIconIn(root, instIconKey);
if (importIconPath.isNull() || !QFile::exists(importIconPath))
importIconPath = IconUtils::findBestIconIn(root, "icon.png");
if (importIconPath.isNull() || !QFile::exists(importIconPath))
@ -273,10 +273,10 @@ bool installIcon(QString root, QString instIcon)
if (!importIconPath.isNull() && QFile::exists(importIconPath)) {
// import icon
auto iconList = APPLICATION->icons();
if (iconList->iconFileExists(instIcon)) {
iconList->deleteIcon(instIcon);
if (iconList->iconFileExists(instIconKey)) {
iconList->deleteIcon(instIconKey);
}
iconList->installIcon(importIconPath, instIcon);
iconList->installIcon(importIconPath, instIconKey + ".png");
return true;
}
return false;

7
launcher/icons/IconList.cpp
View File

@ -55,7 +55,7 @@ IconList::IconList(const QStringList& builtinPaths, const QString& path, QObject
QDir instanceIcons(builtinPath);
auto fileInfoList = instanceIcons.entryInfoList(QDir::Files, QDir::Name);
for (const auto& fileInfo : fileInfoList) {
builtinNames.insert(fileInfo.baseName());
builtinNames.insert(fileInfo.completeBaseName());
}
}
for (const auto& builtinName : builtinNames) {
@ -127,10 +127,11 @@ QStringList IconList::getIconFilePaths() const
QString formatName(const QDir& iconsDir, const QFileInfo& iconFile)
{
if (iconFile.dir() == iconsDir)
return iconFile.baseName();
return iconFile.completeBaseName();
constexpr auto delimiter = " » ";
QString relativePathWithoutExtension = iconsDir.relativeFilePath(iconFile.dir().path()) + QDir::separator() + iconFile.baseName();
QString relativePathWithoutExtension =
iconsDir.relativeFilePath(iconFile.dir().path()) + QDir::separator() + iconFile.completeBaseName();
return relativePathWithoutExtension.replace(QDir::separator(), delimiter);
}