napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[plasmalnf] Search for LNF themes like the KCM does

Browse Source
This commit is contained in:
Adriaan de Groot 2017-10-31 09:49:16 -04:00
parent 6c873f0b70
commit 41e8fdd362
2 changed files with 54 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/plasmalnf/CMakeLists.txt
View File

@ -1,6 +1,6 @@
find_package(ECM ${ECM_VERSION} REQUIRED NO_MODULE) find_package(ECM ${ECM_VERSION} REQUIRED NO_MODULE)
find_package( KF5 REQUIRED CoreAddons Service ) find_package( KF5 5.29 REQUIRED CoreAddons Plasma Service )
calamares_add_plugin( plasmalnf calamares_add_plugin( plasmalnf
TYPE job TYPE job
@ -9,5 +9,7 @@ calamares_add_plugin( plasmalnf
PlasmaLnfJob.cpp PlasmaLnfJob.cpp
LINK_PRIVATE_LIBRARIES LINK_PRIVATE_LIBRARIES
calamares calamares
KF5::Plasma
KF5::Service
SHARED_LIB SHARED_LIB
) )

52
src/modules/plasmalnf/PlasmaLnfJob.cpp
View File

@ -18,10 +18,18 @@
#include "PlasmaLnfJob.h" #include "PlasmaLnfJob.h"
#include <QProcess>
#include <QDateTime> #include <QDateTime>
#include <QDir>
#include <QProcess>
#include <QStandardPaths>
#include <QThread> #include <QThread>
#include <KService>
#include <KServiceTypeTrader>
#include <KPluginLoader> // Future
#include <Plasma/PluginLoader> // TODO: port to KPluginLoader
#include "CalamaresVersion.h" #include "CalamaresVersion.h"
#include "JobQueue.h" #include "JobQueue.h"
#include "GlobalStorage.h" #include "GlobalStorage.h"
@ -45,12 +53,54 @@ PlasmaLnfJob::prettyName() const
return tr( "Plasma Look-and-Feel Job" ); return tr( "Plasma Look-and-Feel Job" );
} }
static void _themes_by_service()
{
KService::List services;
KServiceTypeTrader* trader = KServiceTypeTrader::self();
services = trader->query("Plasma/Theme");
int c = 0;
for ( const auto s : services )
{
cDebug() << "Plasma theme '" << s->name() << '\'';
c++;
}
cDebug() << "Plasma themes by service found" << c;
}
static void _themes_by_kcm()
{
QString component;
QList<Plasma::Package> packages;
QStringList paths;
const QStringList dataPaths = QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation);
for (const QString &path : dataPaths) {
QDir dir(path + "/plasma/look-and-feel");
paths << dir.entryList(QDir::AllDirs | QDir::NoDotAndDotDot);
}
for (const QString &path : paths) {
Plasma::Package pkg = Plasma::PluginLoader::self()->loadPackage(QStringLiteral("Plasma/LookAndFeel"));
pkg.setPath(path);
pkg.setFallbackPackage(Plasma::Package());
if (component.isEmpty() || !pkg.filePath(component.toUtf8()).isEmpty()) {
packages << pkg;
cDebug() << "Plasma theme '" << pkg.metadata().pluginName() << '\'';
}
}
cDebug() << "Plasma themes by kcm found" << packages.length();
}
Calamares::JobResult Calamares::JobResult
PlasmaLnfJob::exec() PlasmaLnfJob::exec()
{ {
cDebug() << "Plasma Look-and-Feel Job"; cDebug() << "Plasma Look-and-Feel Job";
_themes_by_service();
_themes_by_kcm();
return Calamares::JobResult::ok(); return Calamares::JobResult::ok();
} }