diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index d6e7b6a91..d925d9d08 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -41,6 +41,7 @@ target_link_libraries( Qt5::Qml Qt5::X11Extras KF5::I18n + KF5::Declarative KF5::CoreAddons KF5::XmlGui KF5::Plasma diff --git a/app/dockconfigview.cpp b/app/dockconfigview.cpp index 77a107e08..6a7515730 100644 --- a/app/dockconfigview.cpp +++ b/app/dockconfigview.cpp @@ -28,6 +28,7 @@ #include #include +#include #include #include @@ -76,7 +77,10 @@ void DockConfigView::init() setColor(Qt::transparent); rootContext()->setContextProperty(QStringLiteral("dock"), m_dockView); rootContext()->setContextProperty(QStringLiteral("dockConfig"), this); - rootContext()->setContextObject(new KLocalizedContext(this)); + KDeclarative::KDeclarative kdeclarative; + kdeclarative.setDeclarativeEngine(engine()); + kdeclarative.setTranslationDomain(QStringLiteral("latte-dock")); + kdeclarative.setupBindings(); auto source = QUrl::fromLocalFile(m_dockView->containment()->corona()->kPackage().filePath("lattedockconfigurationui")); setSource(source); syncSlideEffect(); diff --git a/app/dockview.cpp b/app/dockview.cpp index e6ac2b7ed..a1d5a262b 100644 --- a/app/dockview.cpp +++ b/app/dockview.cpp @@ -83,9 +83,8 @@ DockView::DockView(Plasma::Corona *corona, QScreen *targetScreen) }, Qt::DirectConnection); auto *dockCorona = qobject_cast(this->corona()); - if (dockCorona) { + if (dockCorona) connect(dockCorona, &DockCorona::docksCountChanged, this, &DockView::docksCountChanged); - } } DockView::~DockView() @@ -115,7 +114,6 @@ void DockView::init() updateFormFactor(); syncGeometry(); }); - engine()->rootContext()->setContextObject(new KLocalizedContext(this)); rootContext()->setContextProperty(QStringLiteral("dock"), this); setSource(corona()->kPackage().filePath("lattedockui")); setVisible(true); diff --git a/app/main.cpp b/app/main.cpp index 9eceeb5a0..1d156430c 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -45,9 +45,9 @@ int main(int argc, char **argv) { QQuickWindow::setDefaultAlphaBuffer(true); QApplication app(argc, argv); + KLocalizedString::setApplicationDomain("latte-dock"); app.setApplicationVersion(version); app.setOrganizationDomain(QStringLiteral("latte-dock")); - KLocalizedString::setApplicationDomain("latte-dock"); app.setApplicationName(QStringLiteral("lattedock")); app.setWindowIcon(QIcon::fromTheme(QStringLiteral("latte-dock"))); //! set pattern for debug messages