[plasma/plasma-workspace/Plasma/6.7] libklookandfeel: libklookandfeel: Drop Latte Dock integration
David Edmundson <[email protected]>
| Newsgroups | gmane.comp.kde.cvs |
|---|---|
| Message-ID | <[email protected]> |
Git commit 05c320aba5169e1ea2ea432b6c4abcbaf688825c by David Edmundson, on behalf of Nicolas Fella.
Committed on 23/07/2026 at 10:38.
Pushed by davidedmundson into branch 'Plasma/6.7'.
libklookandfeel: Drop Latte Dock integration
Latte Dock doesn't work with Plasma 6
(cherry picked from commit a5e95e05dcd419f9e3ec07d0622b884414023356)
M +0 -29 libklookandfeel/klookandfeelmanager.cpp
M +0 -2 libklookandfeel/klookandfeelmanager.h
https://invent.kde.org/plasma/plasma-workspace/-/commit/05c320aba5169e1ea2ea432b6c4abcbaf688825c
diff --git a/libklookandfeel/klookandfeelmanager.cpp b/libklookandfeel/klookandfeelmanager.cpp
index 30b00e7a5e..b773f13db9 100644
--- a/libklookandfeel/klookandfeelmanager.cpp
+++ b/libklookandfeel/klookandfeelmanager.cpp
@@ -82,8 +82,6 @@ KLookAndFeelManager::KLookAndFeelManager(QObject *parent)
, m_fontsChanged(false)
, m_plasmaLocked(false)
{
- m_applyLatteLayout = (KService::serviceByDesktopName(u"org.kde.latte-dock"_s) != nullptr);
-
QDBusMessage message = QDBusMessage::createMethodCall(QStringLiteral("org.kde.plasmashell"),
QStringLiteral("/PlasmaShell"),
QStringLiteral("org.kde.PlasmaShell"),
@@ -311,28 +309,6 @@ void KLookAndFeelManager::setIcons(const QString &theme)
Q_EMIT iconsChanged();
}
-void KLookAndFeelManager::setLatteLayout(const QString &filepath, const QString &name)
-{
- if (filepath.isEmpty()) {
- // there is no latte layout
- KIO::CommandLauncherJob latteapp(QStringLiteral("latte-dock"), {QStringLiteral("--disable-autostart")});
- latteapp.setDesktopName(u"org.kde.latte-dock"_s);
- latteapp.start();
-
- QDBusMessage quitmessage = QDBusMessage::createMethodCall(QStringLiteral("org.kde.lattedock"),
- QStringLiteral("/MainApplication"),
- QStringLiteral("org.qtproject.Qt.QCoreApplication"),
- QStringLiteral("quit"));
- QDBusConnection::sessionBus().call(quitmessage, QDBus::NoBlock);
- } else {
- KIO::CommandLauncherJob latteapp(
- QStringLiteral("latte-dock"),
- {QStringLiteral("--enable-autostart"), QStringLiteral("--import-layout"), filepath, QStringLiteral("--suggested-layout-name"), name});
- latteapp.setDesktopName(u"org.kde.latte-dock"_s);
- latteapp.start();
- }
-}
-
void KLookAndFeelManager::setPlasmaTheme(const QString &theme)
{
if (theme.isEmpty()) {
@@ -506,11 +482,6 @@ void KLookAndFeelManager::save(const KPackage::Package &package, Contents applyM
message.setArguments(args);
QDBusConnection::sessionBus().call(message, QDBus::NoBlock);
-
- if (m_applyLatteLayout) {
- //! latte exists in system and user has chosen to update desktop layout
- setLatteLayout(package.filePath("layouts", u"looknfeel.layout.latte"_s), package.metadata().name());
- }
}
if (!package.filePath("layoutdefaults").isEmpty()) {
diff --git a/libklookandfeel/klookandfeelmanager.h b/libklookandfeel/klookandfeelmanager.h
index 2f4b3483c9..109d6a1ad0 100644
--- a/libklookandfeel/klookandfeelmanager.h
+++ b/libklookandfeel/klookandfeelmanager.h
@@ -83,7 +83,6 @@ public:
void setPlasmaTheme(const QString &theme);
void setCursorTheme(const QString theme);
void setSplashScreen(const QString &theme);
- void setLatteLayout(const QString &filepath, const QString &name);
void setWindowSwitcher(const QString &theme);
void setWindowDecoration(const QString &library, const QString &theme, bool noPlugin);
void setTitlebarLayout(const QString &leftbtns, const QString &rightbtns);
@@ -128,7 +127,6 @@ private:
static KConfig configDefaults(const QString &filename);
Mode m_mode = Mode::Apply;
- bool m_applyLatteLayout : 1;
bool m_plasmashellChanged : 1;
bool m_fontsChanged : 1;
bool m_plasmaLocked : 1;