alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move show package info after parsing -t flag

Browse Source 
This makes showing the contents of all package types possible.
This commit is contained in:
Sebastian Kügler 2013-04-27 03:38:47 +02:00
parent 29d823cde7
commit 992587bb8c
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/plasmapkg/plasmapkg.cpp
View File

@ -123,13 +123,6 @@ void PlasmaPkg::runMain()
d->package = d->args->getOption("show"); d->package = d->args->getOption("show");
} }
if (d->args->isSet("show")) {
const QString pluginName = d->package;
showPackageInfo(pluginName);
exit(0);
return;
}
if (!QDir::isAbsolutePath(d->package)) { if (!QDir::isAbsolutePath(d->package)) {
d->packageFile = QDir(QDir::currentPath() + '/' + d->package).absolutePath(); d->packageFile = QDir(QDir::currentPath() + '/' + d->package).absolutePath();
d->packageFile = QFileInfo(d->packageFile).canonicalFilePath(); d->packageFile = QFileInfo(d->packageFile).canonicalFilePath();
@ -284,6 +277,12 @@ void PlasmaPkg::runMain()
//d->packageRoot = d->installer->defaultPackageRoot(); //d->packageRoot = d->installer->defaultPackageRoot();
//pluginTypes << d->installer->type(); //pluginTypes << d->installer->type();
} }
if (d->args->isSet("show")) {
const QString pluginName = d->package;
showPackageInfo(pluginName);
exit(0);
return;
}
if (d->args->isSet("list")) { if (d->args->isSet("list")) {
d->coutput(i18n("Listing service types: %1", d->pluginTypes.join(", "))); d->coutput(i18n("Listing service types: %1", d->pluginTypes.join(", ")));
@ -418,6 +417,7 @@ void PlasmaPkg::showPackageInfo(const QString& pluginName)
Plasma::Package pkg = Plasma::PluginLoader::self()->loadPackage("Plasma/Applet"); Plasma::Package pkg = Plasma::PluginLoader::self()->loadPackage("Plasma/Applet");
//QString p = findPackageRoot("org.kde.microblog-qml", "plasma/plasmoids/"); //QString p = findPackageRoot("org.kde.microblog-qml", "plasma/plasmoids/");
pkg.setDefaultPackageRoot(d->packageRoot);
pkg.setPath(pluginName); pkg.setPath(pluginName);