Mirrors/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-05-21 00:37:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Feedback I

Browse Source 
Signed-off-by: QazCetelic <qaz.cetelic@protonmail.com>
This commit is contained in:
QazCetelic 2024-09-15 09:04:23 +02:00
parent 7b49fd6508
commit e35faa5522
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
launcher/icons/IconList.cpp
View File

@ -95,10 +95,8 @@ bool IconList::addPathRecursively(const QString& path)
if (!dir.exists()) if (!dir.exists())
return false; return false;
bool watching = false;
// Add the directory itself // Add the directory itself
watching = m_watcher->addPath(path); bool watching = m_watcher->addPath(path);
// Add all subdirectories // Add all subdirectories
QFileInfoList entries = dir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot); QFileInfoList entries = dir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot);
@ -134,21 +132,19 @@ void IconList::removePathRecursively(const QString& path)
QStringList IconList::getIconFilePaths() const QStringList IconList::getIconFilePaths() const
{ {
QStringList icon_files{}; QStringList iconFiles{};
QStringList directories{ m_dir.absolutePath() }; QStringList directories{ m_dir.absolutePath() };
while (!directories.isEmpty()) { while (!directories.isEmpty()) {
QString first = directories.takeFirst(); QString first = directories.takeFirst();
QDir dir(first); QDir dir(first);
for (QString& file_name : dir.entryList(QDir::AllDirs | QDir::Files | QDir::NoDotAndDotDot, QDir::Name)) { for (QFileInfo& fileInfo : dir.entryInfoList(QDir::AllDirs | QDir::Files | QDir::NoDotAndDotDot, QDir::Name)) {
QString full_path = dir.filePath(file_name); // Convert to full path if (fileInfo.isDir())
QFileInfo file_info(full_path); directories.push_back(fileInfo.absoluteFilePath());
if (file_info.isDir())
directories.push_back(full_path);
else else
icon_files.push_back(full_path); iconFiles.push_back(fileInfo.absoluteFilePath());
} }
} }
return icon_files; return iconFiles;
} }
QString formatName(const QDir& icons_dir, const QFileInfo& file) QString formatName(const QDir& icons_dir, const QFileInfo& file)
@ -157,8 +153,8 @@ QString formatName(const QDir& icons_dir, const QFileInfo& file)
return file.baseName(); return file.baseName();
constexpr auto delimiter = " » "; constexpr auto delimiter = " » ";
QString relative_path_without_extension = icons_dir.relativeFilePath(file.dir().path()) + QDir::separator() + file.baseName(); QString relativePathWithoutExtension = icons_dir.relativeFilePath(file.dir().path()) + QDir::separator() + file.baseName();
return relative_path_without_extension.replace(QDir::separator(), delimiter); return relativePathWithoutExtension.replace(QDir::separator(), delimiter);
} }
void IconList::directoryChanged(const QString& path) void IconList::directoryChanged(const QString& path)