Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
NOISSUE improve icon handling while importing and exporting instances
Now it handles formats other than png.
- Loading branch information
Showing
8 changed files
with
129 additions
and
38 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,62 @@ | ||
#include "IconUtils.h" | ||
|
||
#include "FileSystem.h" | ||
#include <QDirIterator> | ||
|
||
#include <array> | ||
|
||
namespace { | ||
std::array<const char *, 6> validIconExtensions = { | ||
"svg", | ||
"png", | ||
"ico", | ||
"gif", | ||
"jpg", | ||
"jpeg" | ||
}; | ||
} | ||
|
||
namespace IconUtils{ | ||
|
||
QString findBestIconIn(const QString &folder, const QString & iconKey) { | ||
int best_found = validIconExtensions.size(); | ||
QString best_filename; | ||
|
||
QDirIterator it(folder, QDir::NoDotAndDotDot | QDir::Files, QDirIterator::NoIteratorFlags); | ||
while (it.hasNext()) { | ||
it.next(); | ||
auto fileInfo = it.fileInfo(); | ||
|
||
if(fileInfo.completeBaseName() != iconKey) | ||
continue; | ||
|
||
auto extension = fileInfo.suffix(); | ||
|
||
for(int i = 0; i < best_found; i++) { | ||
if(extension == validIconExtensions[i]) { | ||
best_found = i; | ||
qDebug() << i << " : " << fileInfo.fileName(); | ||
best_filename = fileInfo.fileName(); | ||
} | ||
} | ||
} | ||
return FS::PathCombine(folder, best_filename); | ||
} | ||
|
||
QString getIconFilter() { | ||
QString out; | ||
QTextStream stream(&out); | ||
stream << '('; | ||
for(size_t i = 0; i < validIconExtensions.size() - 1; i++) { | ||
if(i > 0) { | ||
stream << " "; | ||
} | ||
stream << "*." << validIconExtensions[i]; | ||
} | ||
stream << " *." << validIconExtensions[validIconExtensions.size() - 1]; | ||
stream << ')'; | ||
return out; | ||
} | ||
|
||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
#pragma once | ||
|
||
#include <QString> | ||
#include "multimc_logic_export.h" | ||
|
||
namespace IconUtils { | ||
|
||
// Given a folder and an icon key, find 'best' of the icons with the given key in there and return its path | ||
MULTIMC_LOGIC_EXPORT QString findBestIconIn(const QString &folder, const QString & iconKey); | ||
|
||
// Get icon file type filter for file browser dialogs | ||
MULTIMC_LOGIC_EXPORT QString getIconFilter(); | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters