diff --git a/app/view/settings/primaryconfigview.cpp b/app/view/settings/primaryconfigview.cpp index 56ebd0baf..eea5b3c02 100644 --- a/app/view/settings/primaryconfigview.cpp +++ b/app/view/settings/primaryconfigview.cpp @@ -696,64 +696,6 @@ void PrimaryConfigView::hideConfigWindow() hideSecondaryWindow(); } -void PrimaryConfigView::updateLaunchersForGroup(int groupInt) -{ - Types::LaunchersGroup group = (Types::LaunchersGroup)groupInt; - - //! when the layout/global launchers list is empty then the current dock launchers are used for them - //! as a start point - if (m_corona && m_latteView->layout()) { - if ((group == Types::LayoutLaunchers && m_latteView->layout()->launchers().isEmpty()) - || (group == Types::GlobalLaunchers && m_corona->universalSettings()->launchers().isEmpty())) { - - Plasma::Containment *c = m_latteView->containment(); - - const auto &applets = c->applets(); - - for (auto *applet : applets) { - KPluginMetaData meta = applet->kPackage().metadata(); - - if (meta.pluginId() == "org.kde.latte.plasmoid") { - if (QQuickItem *appletInterface = applet->property("_plasma_graphicObject").value()) { - const auto &childItems = appletInterface->childItems(); - - if (childItems.isEmpty()) { - continue; - } - - for (QQuickItem *item : childItems) { - if (auto *metaObject = item->metaObject()) { - // not using QMetaObject::invokeMethod to avoid warnings when calling - // this on applets that don't have it or other child items since this - // is pretty much trial and error. - // Also, "var" arguments are treated as QVariant in QMetaObject - - int methodIndex = metaObject->indexOfMethod("getLauncherList()"); - - if (methodIndex == -1) { - continue; - } - - QMetaMethod method = metaObject->method(methodIndex); - - QVariant launchers; - - if (method.invoke(item, Q_RETURN_ARG(QVariant, launchers))) { - if (group == Types::LayoutLaunchers) { - m_latteView->layout()->setLaunchers(launchers.toStringList()); - } else if (group == Types::GlobalLaunchers) { - m_corona->universalSettings()->setLaunchers(launchers.toStringList()); - } - } - } - } - } - } - } - } - } -} - //!BEGIN borders Plasma::FrameSvg::EnabledBorders PrimaryConfigView::enabledBorders() const { diff --git a/app/view/settings/primaryconfigview.h b/app/view/settings/primaryconfigview.h index f58827d9e..5f4c41707 100644 --- a/app/view/settings/primaryconfigview.h +++ b/app/view/settings/primaryconfigview.h @@ -108,7 +108,6 @@ public slots: Q_INVOKABLE void hideConfigWindow(); Q_INVOKABLE void setSticker(bool blockFocusLost); Q_INVOKABLE void syncGeometry(); - Q_INVOKABLE void updateLaunchersForGroup(int groupInt); Q_INVOKABLE void updateEffects(); signals: diff --git a/shell/package/contents/configuration/pages/TasksConfig.qml b/shell/package/contents/configuration/pages/TasksConfig.qml index 9b85db2d3..6f270ac89 100644 --- a/shell/package/contents/configuration/pages/TasksConfig.qml +++ b/shell/package/contents/configuration/pages/TasksConfig.qml @@ -382,7 +382,6 @@ PlasmaComponents.Page { id: launchersGroup onCurrentChanged: { if (current.checked) { - viewConfig.updateLaunchersForGroup(current.group); tasks.configuration.launchersGroup = current.group; } }