diff --git a/app/packageplugins/shell/nowdockpackage.cpp b/app/packageplugins/shell/dockpackage.cpp similarity index 68% rename from app/packageplugins/shell/nowdockpackage.cpp rename to app/packageplugins/shell/dockpackage.cpp index db9e3d305..eeb4952a5 100644 --- a/app/packageplugins/shell/nowdockpackage.cpp +++ b/app/packageplugins/shell/dockpackage.cpp @@ -1,32 +1,35 @@ -#include "nowdockpackage.h" +#include "dockpackage.h" + +#include #include #include -#include -NowDockPackage::NowDockPackage(QObject *parent, const QVariantList &args) +namespace Latte { + +DockPackage::DockPackage(QObject *parent, const QVariantList &args) : KPackage::PackageStructure(parent, args) { } -NowDockPackage::~NowDockPackage() +DockPackage::~DockPackage() { } -void NowDockPackage::initPackage(KPackage::Package *package) +void DockPackage::initPackage(KPackage::Package *package) { auto fallback = KPackage::PackageLoader::self()->loadPackage("Plasma/Shell", "org.kde.plasma.desktop"); package->setDefaultPackageRoot(QStringLiteral("plasma/shells/")); package->setPath("org.kde.latte.shell"); - package->addFileDefinition("nowdockui", QStringLiteral("views/Panel.qml"), i18n("Now Dock panel")); + package->addFileDefinition("lattedockui", QStringLiteral("views/Panel.qml"), i18n("Latte Dock panel")); //Configuration - package->addFileDefinition("nowdockconfigurationui", QStringLiteral("configuration/LatteDockConfiguration.qml"), i18n("Dock configuration UI")); + package->addFileDefinition("lattedockconfigurationui", QStringLiteral("configuration/LatteDockConfiguration.qml"), i18n("Dock configuration UI")); package->addFileDefinition("configmodel", QStringLiteral("configuration/config.qml"), i18n("Config model")); package->setFallbackPackage(fallback); qDebug() << "package is valid" << package->isValid(); } -void NowDockPackage::pathChanged(KPackage::Package *package) +void DockPackage::pathChanged(KPackage::Package *package) { if (!package->metadata().isValid()) return; @@ -40,3 +43,5 @@ void NowDockPackage::pathChanged(KPackage::Package *package) package->setFallbackPackage(KPackage::Package()); } } + +} diff --git a/app/packageplugins/shell/nowdockpackage.h b/app/packageplugins/shell/dockpackage.h similarity index 59% rename from app/packageplugins/shell/nowdockpackage.h rename to app/packageplugins/shell/dockpackage.h index d7937c982..f754e3631 100644 --- a/app/packageplugins/shell/nowdockpackage.h +++ b/app/packageplugins/shell/dockpackage.h @@ -5,14 +5,17 @@ #include -class NowDockPackage : public KPackage::PackageStructure { +namespace Latte { +class DockPackage : public KPackage::PackageStructure { Q_OBJECT public: - explicit NowDockPackage(QObject *parent = 0, const QVariantList &args = QVariantList()); + explicit DockPackage(QObject *parent = 0, const QVariantList &args = QVariantList()); - ~NowDockPackage() override; + ~DockPackage() override; void initPackage(KPackage::Package *package) override; void pathChanged(KPackage::Package *package) override; }; + +} #endif // NOWDOCKPACKAGE_H