QuasarApp/CQtDeployer
4
1
Fork 0
mirror of https://github.com/QuasarApp/CQtDeployer.git synced 2025-05-12 17:39:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #593 from QuasarApp/fixIconOption

Browse Source 
Fix icon option
This commit is contained in:
Andrei Yankovich 2021-05-17 17:13:01 +03:00 committed by GitHub
commit 15dabf6b2d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Deploy/Distributions/idistribution.cpp
View File

@ -245,6 +245,10 @@ bool iDistribution::deployIcon(TemplateInfo &info, const DistroModule& pkg) {
QSet<QString> icons; QSet<QString> icons;
for (const auto& target: pkg.targets()) { for (const auto& target: pkg.targets()) {
auto icon = cfg->targets().value(target).getIcon(); auto icon = cfg->targets().value(target).getIcon();
QuasarAppUtils::Params::log(QString("%0: %1").arg(target, icon),
QuasarAppUtils::Debug);
if (icons.contains(icon)) if (icons.contains(icon))
break; break;

37
Deploy/configparser.cpp
View File

@ -75,13 +75,16 @@ void parseTargetPrivate(DeployConfig& conf,
auto pair = iconPair.split(DeployCore::getSeparator(1), splitbehavior); auto pair = iconPair.split(DeployCore::getSeparator(1), splitbehavior);
if (pair.size() == 1) { if (pair.size() == 1) {
QuasarAppUtils::Params::log(QString("Set new default icon for all tagets: " + pair.value(0)),
QuasarAppUtils::Debug);
for (auto& editableTarget: cointainer) { for (auto& editableTarget: cointainer) {
(editableTarget.*adder)(pair.value(0)); (editableTarget.*adder)(pair.value(0));
} }
continue; continue;
} }
auto targetsMap = conf.getTargetsListByFilter(pair.value(0)); const auto targetsMap = conf.getTargetsListByFilter(pair.value(0));
if (pair.value(0).isEmpty() || targetsMap.isEmpty()) { if (pair.value(0).isEmpty() || targetsMap.isEmpty()) {
@ -92,8 +95,12 @@ void parseTargetPrivate(DeployConfig& conf,
continue; continue;
} }
auto editableTarget = targetsMap.begin().value(); for (const auto &target: targetsMap) {
(editableTarget->*adder)(pair.value(1)); QuasarAppUtils::Params::log(QString("Set new icon for %0 taget. Icon: %1").
arg(pair.value(0), pair.value(1)),
QuasarAppUtils::Debug);
(target->*adder)(pair.value(1));
}
} }
} }
@ -1513,6 +1520,9 @@ bool ConfigParser::smartMoveTargets() {
QMultiHash<QString, TargetInfo> temp; QMultiHash<QString, TargetInfo> temp;
bool result = true; bool result = true;
QuasarAppUtils::Params::log(QString("Available Targets: "),
QuasarAppUtils::Debug);
for (auto i = _config.targets().cbegin(); i != _config.targets().cend(); ++i) { for (auto i = _config.targets().cbegin(); i != _config.targets().cend(); ++i) {
if (!i.value().isValid()) { if (!i.value().isValid()) {
@ -1531,10 +1541,27 @@ bool ConfigParser::smartMoveTargets() {
} }
auto newTargetKey = targetPath + "/" + target.fileName(); auto newTargetKey = targetPath + "/" + target.fileName();
temp.unite(moveTarget(i.value(), newTargetKey));
const auto newTarget = moveTarget(i.value(), newTargetKey);
temp.unite(newTarget);
QuasarAppUtils::Params::log(QString("Target: " + newTarget.begin().key()),
QuasarAppUtils::Debug);
auto pkgKey = i.value().getPackage(); auto pkgKey = i.value().getPackage();
valueLink(_config.packagesEdit(), pkgKey, DistroModule{pkgKey}).addTarget(newTargetKey); if (!_config.packagesEdit().contains(pkgKey)) {
QuasarAppUtils::Params::log(QString("The target %0 belongs to package %1"
" but this package is not initialized!").
arg(i.key(), pkgKey));
internalError();
return false;
}
valueLink(_config.packagesEdit(), pkgKey,
DistroModule{pkgKey}).addTarget(newTargetKey);
} }
_config.targetsEdit() = temp; _config.targetsEdit() = temp;