diff --git a/autotests/test_builtin_effectloader.cpp b/autotests/test_builtin_effectloader.cpp index dbc0f9d0de..6c7e6f6b2b 100644 --- a/autotests/test_builtin_effectloader.cpp +++ b/autotests/test_builtin_effectloader.cpp @@ -65,7 +65,7 @@ void TestBuiltInEffectLoader::testHasEffect_data() QTest::addColumn("expected"); QTest::newRow("blur") << QStringLiteral("blur") << true; - QTest::newRow("with kwin4_effect_ prefix") << QStringLiteral("kwin4_effect_blur") << true; + QTest::newRow("with kwin4_effect_ prefix") << QStringLiteral("kwin4_effect_blur") << false; QTest::newRow("case sensitive") << QStringLiteral("BlUR") << true; QTest::newRow("Contrast") << QStringLiteral("contrast") << true; QTest::newRow("CoverSwitch") << QStringLiteral("coverswitch") << true; @@ -318,7 +318,7 @@ void TestBuiltInEffectLoader::testLoadEffect_data() // QTest::newRow("WindowGeometry") << QStringLiteral("windowgeometry") << true << xc; QTest::newRow("WobblyWindows") << QStringLiteral("wobblywindows") << false << xc; QTest::newRow("WobblyWindows-GL") << QStringLiteral("wobblywindows") << true << oc; - QTest::newRow("Zoom") << QStringLiteral("kwin4_effect_zoom") << true << xc; + QTest::newRow("Zoom") << QStringLiteral("zoom") << true << xc; QTest::newRow("Non Existing") << QStringLiteral("InvalidName") << false << xc; QTest::newRow("Fade - Scripted") << QStringLiteral("fade") << false << xc; QTest::newRow("Fade - Scripted + kwin4_effect") << QStringLiteral("kwin4_effect_fade") << false << xc; @@ -471,26 +471,23 @@ void TestBuiltInEffectLoader::testLoadAllEffects() KSharedConfig::Ptr config = KSharedConfig::openConfig(QString(), KConfig::SimpleConfig); - // TODO: remove once the KCM doesn't use this prefix - const QString kwin4 = QStringLiteral("kwin4_effect_"); - // prepare the configuration to hard enable/disable the effects we want to load KConfigGroup plugins = config->group("Plugins"); - plugins.writeEntry(kwin4 + QStringLiteral("dashboardEnabled"), false); - plugins.writeEntry(kwin4 + QStringLiteral("desktopgridEnabled"), false); - plugins.writeEntry(kwin4 + QStringLiteral("highlightwindowEnabled"), false); - plugins.writeEntry(kwin4 + QStringLiteral("kscreenEnabled"), false); - plugins.writeEntry(kwin4 + QStringLiteral("logoutEnabled"), false); - plugins.writeEntry(kwin4 + QStringLiteral("minimizeanimationEnabled"), false); - plugins.writeEntry(kwin4 + QStringLiteral("presentwindowsEnabled"), false); - plugins.writeEntry(kwin4 + QStringLiteral("screenedgeEnabled"), false); - plugins.writeEntry(kwin4 + QStringLiteral("screenshotEnabled"), false); - plugins.writeEntry(kwin4 + QStringLiteral("slideEnabled"), false); - plugins.writeEntry(kwin4 + QStringLiteral("slidingpopupsEnabled"), false); - plugins.writeEntry(kwin4 + QStringLiteral("startupfeedbackEnabled"), false); - plugins.writeEntry(kwin4 + QStringLiteral("zoomEnabled"), false); + plugins.writeEntry(QStringLiteral("dashboardEnabled"), false); + plugins.writeEntry(QStringLiteral("desktopgridEnabled"), false); + plugins.writeEntry(QStringLiteral("highlightwindowEnabled"), false); + plugins.writeEntry(QStringLiteral("kscreenEnabled"), false); + plugins.writeEntry(QStringLiteral("logoutEnabled"), false); + plugins.writeEntry(QStringLiteral("minimizeanimationEnabled"), false); + plugins.writeEntry(QStringLiteral("presentwindowsEnabled"), false); + plugins.writeEntry(QStringLiteral("screenedgeEnabled"), false); + plugins.writeEntry(QStringLiteral("screenshotEnabled"), false); + plugins.writeEntry(QStringLiteral("slideEnabled"), false); + plugins.writeEntry(QStringLiteral("slidingpopupsEnabled"), false); + plugins.writeEntry(QStringLiteral("startupfeedbackEnabled"), false); + plugins.writeEntry(QStringLiteral("zoomEnabled"), false); // enable lookingglass as it's not supported - plugins.writeEntry(kwin4 + QStringLiteral("lookingglassEnabled"), true); + plugins.writeEntry(QStringLiteral("lookingglassEnabled"), true); plugins.sync(); loader.setConfig(config); @@ -511,7 +508,7 @@ void TestBuiltInEffectLoader::testLoadAllEffects() QVERIFY(!spy.wait(10)); // now let's prepare a config which has one effect explicitly enabled - plugins.writeEntry(kwin4 + QStringLiteral("mouseclickEnabled"), true); + plugins.writeEntry(QStringLiteral("mouseclickEnabled"), true); plugins.sync(); loader.queryAndLoadAll(); @@ -528,7 +525,7 @@ void TestBuiltInEffectLoader::testLoadAllEffects() spy.clear(); // let's delete one of the default entries - plugins.deleteEntry(kwin4 + QStringLiteral("kscreenEnabled")); + plugins.deleteEntry(QStringLiteral("kscreenEnabled")); plugins.sync(); QVERIFY(spy.isEmpty()); diff --git a/effectloader.cpp b/effectloader.cpp index 70be722310..2e58c5f61f 100644 --- a/effectloader.cpp +++ b/effectloader.cpp @@ -110,9 +110,7 @@ void BuiltInEffectLoader::queryAndLoadAll() if (m_loadedEffects.contains(effect)) { continue; } - // as long as the KCM uses kwin4_effect_ we need to add it, TODO remove - const QString key = QStringLiteral("kwin4_effect_") + - BuiltInEffects::nameForEffect(effect); + const QString key = BuiltInEffects::nameForEffect(effect); const LoadEffectFlags flags = readConfig(key, BuiltInEffects::enabledByDefault(effect)); if (flags.testFlag(LoadEffectFlag::Load)) { m_queue->enqueue(qMakePair(effect, flags)); @@ -175,12 +173,7 @@ bool BuiltInEffectLoader::loadEffect(const QString &name, BuiltInEffect effect, QString BuiltInEffectLoader::internalName(const QString& name) const { - QString internalName = name.toLower(); - // as long as the KCM uses kwin4_effect_ we need to add it, TODO remove - if (internalName.startsWith(QStringLiteral("kwin4_effect_"))) { - internalName = internalName.mid(13); - } - return internalName; + return name.toLower(); } static const QString s_nameProperty = QStringLiteral("X-KDE-PluginInfo-Name"); diff --git a/effects.cpp b/effects.cpp index 4d882088e2..c3a8674f47 100644 --- a/effects.cpp +++ b/effects.cpp @@ -1484,7 +1484,7 @@ bool EffectsHandlerImpl::isScreenLocked() const QString EffectsHandlerImpl::debug(const QString& name, const QString& parameter) const { - QString internalName = name.startsWith(QStringLiteral("kwin4_effect_")) ? name : QStringLiteral("kwin4_effect_") + name; + QString internalName = name.toLower();; for (QVector< EffectPair >::const_iterator it = loaded_effects.constBegin(); it != loaded_effects.constEnd(); ++it) { if ((*it).first == internalName) { return it->second->debug(parameter); diff --git a/effects/blur/blur_config.cpp b/effects/blur/blur_config.cpp index 9bef02d775..d2407b01bc 100644 --- a/effects/blur/blur_config.cpp +++ b/effects/blur/blur_config.cpp @@ -52,7 +52,7 @@ void BlurEffectConfig::save() OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.kwin.Effects"), QStringLiteral("/Effects"), QDBusConnection::sessionBus()); - interface.reconfigureEffect(QStringLiteral("kwin4_effect_blur")); + interface.reconfigureEffect(QStringLiteral("blur")); } } // namespace KWin diff --git a/effects/blur/blur_config.desktop b/effects/blur/blur_config.desktop index 048e1a75ee..5a63b0829e 100644 --- a/effects/blur/blur_config.desktop +++ b/effects/blur/blur_config.desktop @@ -3,7 +3,7 @@ Type=Service X-KDE-ServiceTypes=KCModule X-KDE-Library=kwin_blur_config -X-KDE-ParentComponents=kwin4_effect_blur +X-KDE-ParentComponents=blur Name=Blur Name[uk]=Розмивання diff --git a/effects/coverswitch/coverswitch_config.cpp b/effects/coverswitch/coverswitch_config.cpp index d1e87fba74..e4a198f557 100644 --- a/effects/coverswitch/coverswitch_config.cpp +++ b/effects/coverswitch/coverswitch_config.cpp @@ -57,7 +57,7 @@ void CoverSwitchEffectConfig::save() OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.kwin.Effects"), QStringLiteral("/Effects"), QDBusConnection::sessionBus()); - interface.reconfigureEffect(QStringLiteral("kwin4_effect_coverswitch")); + interface.reconfigureEffect(QStringLiteral("coverswitch")); } } // namespace diff --git a/effects/coverswitch/coverswitch_config.desktop b/effects/coverswitch/coverswitch_config.desktop index 4a52b102c6..220adb2e07 100644 --- a/effects/coverswitch/coverswitch_config.desktop +++ b/effects/coverswitch/coverswitch_config.desktop @@ -3,7 +3,7 @@ Type=Service X-KDE-ServiceTypes=KCModule X-KDE-Library=kwin_coverswitch_config -X-KDE-ParentComponents=kwin4_effect_coverswitch +X-KDE-ParentComponents=coverswitch Name=Cover Switch Name[uk]=Перемикач обкладинок diff --git a/effects/cube/cube_config.cpp b/effects/cube/cube_config.cpp index 2b6c2879b5..37e79e4764 100644 --- a/effects/cube/cube_config.cpp +++ b/effects/cube/cube_config.cpp @@ -94,7 +94,7 @@ void CubeEffectConfig::save() OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.kwin.Effects"), QStringLiteral("/Effects"), QDBusConnection::sessionBus()); - interface.reconfigureEffect(QStringLiteral("kwin4_effect_cube")); + interface.reconfigureEffect(QStringLiteral("cube")); } void CubeEffectConfig::capsSelectionChanged() diff --git a/effects/cube/cube_config.desktop b/effects/cube/cube_config.desktop index dcf502cff8..c94bf7e991 100644 --- a/effects/cube/cube_config.desktop +++ b/effects/cube/cube_config.desktop @@ -3,7 +3,7 @@ Type=Service X-KDE-ServiceTypes=KCModule X-KDE-Library=kwin_cube_config -X-KDE-ParentComponents=kwin4_effect_cube +X-KDE-ParentComponents=cube Name=Desktop Cube Name[uk]=Куб стільниць diff --git a/effects/cube/cubeslide_config.cpp b/effects/cube/cubeslide_config.cpp index 15edc7be8f..4079660ede 100644 --- a/effects/cube/cubeslide_config.cpp +++ b/effects/cube/cubeslide_config.cpp @@ -59,7 +59,7 @@ void CubeSlideEffectConfig::save() OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.kwin.Effects"), QStringLiteral("/Effects"), QDBusConnection::sessionBus()); - interface.reconfigureEffect(QStringLiteral("kwin4_effect_cubeslide")); + interface.reconfigureEffect(QStringLiteral("cubeslide")); } } // namespace diff --git a/effects/cube/cubeslide_config.desktop b/effects/cube/cubeslide_config.desktop index e3048349be..b29fe29f7f 100644 --- a/effects/cube/cubeslide_config.desktop +++ b/effects/cube/cubeslide_config.desktop @@ -3,7 +3,7 @@ Type=Service X-KDE-ServiceTypes=KCModule X-KDE-Library=kwin_cubeslide_config -X-KDE-ParentComponents=kwin4_effect_cubeslide +X-KDE-ParentComponents=cubeslide Name=Desktop Cube Animation Name[uk]=Анімація куба стільниць diff --git a/effects/dashboard/dashboard_config.cpp b/effects/dashboard/dashboard_config.cpp index 476c9efc5d..90e1ecdbcd 100644 --- a/effects/dashboard/dashboard_config.cpp +++ b/effects/dashboard/dashboard_config.cpp @@ -53,7 +53,7 @@ void DashboardEffectConfig::save() OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.kwin.Effects"), QStringLiteral("/Effects"), QDBusConnection::sessionBus()); - interface.reconfigureEffect(QStringLiteral("kwin4_effect_dashboard")); + interface.reconfigureEffect(QStringLiteral("dashboard")); } } // namespace KWin diff --git a/effects/dashboard/dashboard_config.desktop b/effects/dashboard/dashboard_config.desktop index 6a19162a8a..6c83e78e21 100644 --- a/effects/dashboard/dashboard_config.desktop +++ b/effects/dashboard/dashboard_config.desktop @@ -3,7 +3,7 @@ Type=Service X-KDE-ServiceTypes=KCModule X-KDE-Library=kwin_dashboard_config -X-KDE-ParentComponents=kwin4_effect_dashboard +X-KDE-ParentComponents=dashboard Name=Dashboard Name[uk]=Панель приладів diff --git a/effects/desktopgrid/desktopgrid_config.cpp b/effects/desktopgrid/desktopgrid_config.cpp index 12b3065892..516feae70c 100644 --- a/effects/desktopgrid/desktopgrid_config.cpp +++ b/effects/desktopgrid/desktopgrid_config.cpp @@ -110,7 +110,7 @@ void DesktopGridEffectConfig::save() OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.kwin.Effects"), QStringLiteral("/Effects"), QDBusConnection::sessionBus()); - interface.reconfigureEffect(QStringLiteral("kwin4_effect_desktopgrid")); + interface.reconfigureEffect(QStringLiteral("desktopgrid")); } void DesktopGridEffectConfig::load() diff --git a/effects/desktopgrid/desktopgrid_config.desktop b/effects/desktopgrid/desktopgrid_config.desktop index df60d4401a..783f415c60 100644 --- a/effects/desktopgrid/desktopgrid_config.desktop +++ b/effects/desktopgrid/desktopgrid_config.desktop @@ -3,7 +3,7 @@ Type=Service X-KDE-ServiceTypes=KCModule X-KDE-Library=kwin_desktopgrid_config -X-KDE-ParentComponents=kwin4_effect_desktopgrid +X-KDE-ParentComponents=desktopgrid Name=Desktop Grid Name[uk]=Таблиця стільниць diff --git a/effects/diminactive/diminactive_config.cpp b/effects/diminactive/diminactive_config.cpp index cb9ecf0106..3bcf0e83bc 100644 --- a/effects/diminactive/diminactive_config.cpp +++ b/effects/diminactive/diminactive_config.cpp @@ -64,7 +64,7 @@ void DimInactiveEffectConfig::save() OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.kwin.Effects"), QStringLiteral("/Effects"), QDBusConnection::sessionBus()); - interface.reconfigureEffect(QStringLiteral("kwin4_effect_diminactive")); + interface.reconfigureEffect(QStringLiteral("diminactive")); } } // namespace diff --git a/effects/diminactive/diminactive_config.desktop b/effects/diminactive/diminactive_config.desktop index ea0ba3d1af..70cea4380e 100644 --- a/effects/diminactive/diminactive_config.desktop +++ b/effects/diminactive/diminactive_config.desktop @@ -3,7 +3,7 @@ Type=Service X-KDE-ServiceTypes=KCModule X-KDE-Library=kwin_diminactive_config -X-KDE-ParentComponents=kwin4_effect_diminactive +X-KDE-ParentComponents=diminactive Name=Dim Inactive Name[uk]=Затемнення неактивних diff --git a/effects/flipswitch/flipswitch_config.cpp b/effects/flipswitch/flipswitch_config.cpp index caf5f2f688..aa03d55d73 100644 --- a/effects/flipswitch/flipswitch_config.cpp +++ b/effects/flipswitch/flipswitch_config.cpp @@ -85,7 +85,7 @@ void FlipSwitchEffectConfig::save() OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.kwin.Effects"), QStringLiteral("/Effects"), QDBusConnection::sessionBus()); - interface.reconfigureEffect(QStringLiteral("kwin4_effect_flipswitch")); + interface.reconfigureEffect(QStringLiteral("flipswitch")); } diff --git a/effects/flipswitch/flipswitch_config.desktop b/effects/flipswitch/flipswitch_config.desktop index e543e23cde..0e601fa4d6 100644 --- a/effects/flipswitch/flipswitch_config.desktop +++ b/effects/flipswitch/flipswitch_config.desktop @@ -3,7 +3,7 @@ Type=Service X-KDE-ServiceTypes=KCModule X-KDE-Library=kwin_flipswitch_config -X-KDE-ParentComponents=kwin4_effect_flipswitch +X-KDE-ParentComponents=flipswitch Name=Flip Switch Name[uk]=Тасування карток diff --git a/effects/glide/glide_config.cpp b/effects/glide/glide_config.cpp index 6851955ce0..a8fdfc9208 100644 --- a/effects/glide/glide_config.cpp +++ b/effects/glide/glide_config.cpp @@ -51,7 +51,7 @@ void GlideEffectConfig::save() OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.kwin.Effects"), QStringLiteral("/Effects"), QDBusConnection::sessionBus()); - interface.reconfigureEffect(QStringLiteral("kwin4_effect_glide")); + interface.reconfigureEffect(QStringLiteral("glide")); } } // namespace KWin #include "glide_config.moc" diff --git a/effects/glide/glide_config.desktop b/effects/glide/glide_config.desktop index 6a0f9de42e..d5596f255c 100644 --- a/effects/glide/glide_config.desktop +++ b/effects/glide/glide_config.desktop @@ -3,7 +3,7 @@ Type=Service X-KDE-ServiceTypes=KCModule X-KDE-Library=kwin_glide_config -X-KDE-ParentComponents=kwin4_effect_glide +X-KDE-ParentComponents=glide Name=Glide Name[uk]=Плин diff --git a/effects/invert/invert_config.cpp b/effects/invert/invert_config.cpp index b4388cf4b4..9cde1ab7df 100644 --- a/effects/invert/invert_config.cpp +++ b/effects/invert/invert_config.cpp @@ -90,7 +90,7 @@ void InvertEffectConfig::save() OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.kwin.Effects"), QStringLiteral("/Effects"), QDBusConnection::sessionBus()); - interface.reconfigureEffect(QStringLiteral("kwin4_effect_invert")); + interface.reconfigureEffect(QStringLiteral("invert")); } void InvertEffectConfig::defaults() diff --git a/effects/invert/invert_config.desktop b/effects/invert/invert_config.desktop index 88fd51b4f1..5d552bd914 100644 --- a/effects/invert/invert_config.desktop +++ b/effects/invert/invert_config.desktop @@ -3,7 +3,7 @@ Type=Service X-KDE-ServiceTypes=KCModule X-KDE-Library=kwin_invert_config -X-KDE-ParentComponents=kwin4_effect_invert +X-KDE-ParentComponents=invert Name=Invert Name[uk]=Інверсія diff --git a/effects/lookingglass/lookingglass_config.cpp b/effects/lookingglass/lookingglass_config.cpp index 9589589d42..68f4ae85d7 100644 --- a/effects/lookingglass/lookingglass_config.cpp +++ b/effects/lookingglass/lookingglass_config.cpp @@ -102,7 +102,7 @@ void LookingGlassEffectConfig::save() OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.kwin.Effects"), QStringLiteral("/Effects"), QDBusConnection::sessionBus()); - interface.reconfigureEffect(QStringLiteral("kwin4_effect_lookingglass")); + interface.reconfigureEffect(QStringLiteral("lookingglass")); } void LookingGlassEffectConfig::defaults() diff --git a/effects/lookingglass/lookingglass_config.desktop b/effects/lookingglass/lookingglass_config.desktop index db08f391db..6f52dc1761 100644 --- a/effects/lookingglass/lookingglass_config.desktop +++ b/effects/lookingglass/lookingglass_config.desktop @@ -3,7 +3,7 @@ Type=Service X-KDE-ServiceTypes=KCModule X-KDE-Library=kwin_lookingglass_config -X-KDE-ParentComponents=kwin4_effect_lookingglass +X-KDE-ParentComponents=lookingglass Name=Looking Glass Name[uk]=Збільшувальне скло diff --git a/effects/magiclamp/magiclamp_config.cpp b/effects/magiclamp/magiclamp_config.cpp index 6978332648..136c2247c6 100644 --- a/effects/magiclamp/magiclamp_config.cpp +++ b/effects/magiclamp/magiclamp_config.cpp @@ -61,7 +61,7 @@ void MagicLampEffectConfig::save() OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.kwin.Effects"), QStringLiteral("/Effects"), QDBusConnection::sessionBus()); - interface.reconfigureEffect(QStringLiteral("kwin4_effect_magiclamp")); + interface.reconfigureEffect(QStringLiteral("magiclamp")); } } // namespace diff --git a/effects/magiclamp/magiclamp_config.desktop b/effects/magiclamp/magiclamp_config.desktop index d4fb1783bc..fe992bc4c2 100644 --- a/effects/magiclamp/magiclamp_config.desktop +++ b/effects/magiclamp/magiclamp_config.desktop @@ -3,7 +3,7 @@ Type=Service X-KDE-ServiceTypes=KCModule X-KDE-Library=kwin_magiclamp_config -X-KDE-ParentComponents=kwin4_effect_magiclamp +X-KDE-ParentComponents=magiclamp Name=Magic Lamp Name[uk]=Чарівна лампа diff --git a/effects/magnifier/magnifier_config.cpp b/effects/magnifier/magnifier_config.cpp index de0e33b57f..68fc4789d6 100644 --- a/effects/magnifier/magnifier_config.cpp +++ b/effects/magnifier/magnifier_config.cpp @@ -103,7 +103,7 @@ void MagnifierEffectConfig::save() OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.kwin.Effects"), QStringLiteral("/Effects"), QDBusConnection::sessionBus()); - interface.reconfigureEffect(QStringLiteral("kwin4_effect_magnifier")); + interface.reconfigureEffect(QStringLiteral("magnifier")); } void MagnifierEffectConfig::defaults() diff --git a/effects/magnifier/magnifier_config.desktop b/effects/magnifier/magnifier_config.desktop index 6657e4499d..8e5277f5bb 100644 --- a/effects/magnifier/magnifier_config.desktop +++ b/effects/magnifier/magnifier_config.desktop @@ -3,7 +3,7 @@ Type=Service X-KDE-ServiceTypes=KCModule X-KDE-Library=kwin_magnifier_config -X-KDE-ParentComponents=kwin4_effect_magnifier +X-KDE-ParentComponents=magnifier Name=Magnifier Name[uk]=Лупа diff --git a/effects/mouseclick/mouseclick_config.cpp b/effects/mouseclick/mouseclick_config.cpp index 1d8a63b1d6..c5fd4f15d3 100644 --- a/effects/mouseclick/mouseclick_config.cpp +++ b/effects/mouseclick/mouseclick_config.cpp @@ -83,7 +83,7 @@ void MouseClickEffectConfig::save() OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.kwin.Effects"), QStringLiteral("/Effects"), QDBusConnection::sessionBus()); - interface.reconfigureEffect(QStringLiteral("kwin4_effect_mouseclick")); + interface.reconfigureEffect(QStringLiteral("mouseclick")); } } // namespace diff --git a/effects/mouseclick/mouseclick_config.desktop b/effects/mouseclick/mouseclick_config.desktop index 7975e35b4d..b1402445a1 100644 --- a/effects/mouseclick/mouseclick_config.desktop +++ b/effects/mouseclick/mouseclick_config.desktop @@ -3,7 +3,7 @@ Type=Service X-KDE-ServiceTypes=KCModule X-KDE-Library=kwin_mouseclick_config -X-KDE-ParentComponents=kwin4_effect_mouseclick +X-KDE-ParentComponents=mouseclick Name=Mouse Click Animation Name[uk]=Анімація за клацанням миші diff --git a/effects/mousemark/mousemark_config.cpp b/effects/mousemark/mousemark_config.cpp index 75b6d20237..f00c9e63cc 100644 --- a/effects/mousemark/mousemark_config.cpp +++ b/effects/mousemark/mousemark_config.cpp @@ -97,7 +97,7 @@ void MouseMarkEffectConfig::save() OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.kwin.Effects"), QStringLiteral("/Effects"), QDBusConnection::sessionBus()); - interface.reconfigureEffect(QStringLiteral("kwin4_effect_mousemark")); + interface.reconfigureEffect(QStringLiteral("mousemark")); } } // namespace diff --git a/effects/mousemark/mousemark_config.desktop b/effects/mousemark/mousemark_config.desktop index 3e8e60a40f..99f9ffa275 100644 --- a/effects/mousemark/mousemark_config.desktop +++ b/effects/mousemark/mousemark_config.desktop @@ -3,7 +3,7 @@ Type=Service X-KDE-ServiceTypes=KCModule X-KDE-Library=kwin_mousemark_config -X-KDE-ParentComponents=kwin4_effect_mousemark +X-KDE-ParentComponents=mousemark Name=Mouse Mark Name[uk]=Позначки мишкою diff --git a/effects/presentwindows/presentwindows_config.cpp b/effects/presentwindows/presentwindows_config.cpp index 50cc9e0e84..5639b2fd88 100644 --- a/effects/presentwindows/presentwindows_config.cpp +++ b/effects/presentwindows/presentwindows_config.cpp @@ -101,7 +101,7 @@ void PresentWindowsEffectConfig::save() OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.kwin.Effects"), QStringLiteral("/Effects"), QDBusConnection::sessionBus()); - interface.reconfigureEffect(QStringLiteral("kwin4_effect_presentwindows")); + interface.reconfigureEffect(QStringLiteral("presentwindows")); } void PresentWindowsEffectConfig::defaults() diff --git a/effects/presentwindows/presentwindows_config.desktop b/effects/presentwindows/presentwindows_config.desktop index 156acaf9d2..ac980a25d0 100644 --- a/effects/presentwindows/presentwindows_config.desktop +++ b/effects/presentwindows/presentwindows_config.desktop @@ -3,7 +3,7 @@ Type=Service X-KDE-ServiceTypes=KCModule X-KDE-Library=kwin_presentwindows_config -X-KDE-ParentComponents=kwin4_effect_presentwindows +X-KDE-ParentComponents=presentwindows Name=Present Windows Name[uk]=Показ вікон diff --git a/effects/resize/resize_config.cpp b/effects/resize/resize_config.cpp index 0744059f52..ddb6db4b9c 100644 --- a/effects/resize/resize_config.cpp +++ b/effects/resize/resize_config.cpp @@ -60,7 +60,7 @@ void ResizeEffectConfig::save() OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.kwin.Effects"), QStringLiteral("/Effects"), QDBusConnection::sessionBus()); - interface.reconfigureEffect(QStringLiteral("kwin4_effect_resize")); + interface.reconfigureEffect(QStringLiteral("resize")); } } // namespace diff --git a/effects/resize/resize_config.desktop b/effects/resize/resize_config.desktop index ad44b4708d..5dc72a866b 100644 --- a/effects/resize/resize_config.desktop +++ b/effects/resize/resize_config.desktop @@ -3,7 +3,7 @@ Type=Service X-KDE-ServiceTypes=KCModule X-KDE-Library=kwin_resize_config -X-KDE-ParentComponents=kwin4_effect_resize +X-KDE-ParentComponents=resize Name=Resize Window Name[uk]=Зміна розмірів вікон diff --git a/effects/showfps/showfps_config.cpp b/effects/showfps/showfps_config.cpp index eb44442a1d..227389c602 100644 --- a/effects/showfps/showfps_config.cpp +++ b/effects/showfps/showfps_config.cpp @@ -57,7 +57,7 @@ void ShowFpsEffectConfig::save() OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.kwin.Effects"), QStringLiteral("/Effects"), QDBusConnection::sessionBus()); - interface.reconfigureEffect(QStringLiteral("kwin4_effect_showfps")); + interface.reconfigureEffect(QStringLiteral("showfps")); } } // namespace diff --git a/effects/showfps/showfps_config.desktop b/effects/showfps/showfps_config.desktop index 287edcfaa7..a537932b1d 100644 --- a/effects/showfps/showfps_config.desktop +++ b/effects/showfps/showfps_config.desktop @@ -3,7 +3,7 @@ Type=Service X-KDE-ServiceTypes=KCModule X-KDE-Library=kwin_showfps_config -X-KDE-ParentComponents=kwin4_effect_showfps +X-KDE-ParentComponents=showfps Name=Show FPS Name[uk]=Показ частоти кадрів diff --git a/effects/thumbnailaside/thumbnailaside_config.cpp b/effects/thumbnailaside/thumbnailaside_config.cpp index 2bdc3f54b2..e6522acc21 100644 --- a/effects/thumbnailaside/thumbnailaside_config.cpp +++ b/effects/thumbnailaside/thumbnailaside_config.cpp @@ -89,7 +89,7 @@ void ThumbnailAsideEffectConfig::save() OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.kwin.Effects"), QStringLiteral("/Effects"), QDBusConnection::sessionBus()); - interface.reconfigureEffect(QStringLiteral("kwin4_effect_thumbnailaside")); + interface.reconfigureEffect(QStringLiteral("thumbnailaside")); } } // namespace diff --git a/effects/thumbnailaside/thumbnailaside_config.desktop b/effects/thumbnailaside/thumbnailaside_config.desktop index f02d91661c..a866c0ad29 100644 --- a/effects/thumbnailaside/thumbnailaside_config.desktop +++ b/effects/thumbnailaside/thumbnailaside_config.desktop @@ -3,7 +3,7 @@ Type=Service X-KDE-ServiceTypes=KCModule X-KDE-Library=kwin_thumbnailaside_config -X-KDE-ParentComponents=kwin4_effect_thumbnailaside +X-KDE-ParentComponents=thumbnailaside Name=Thumbnail Aside Name[uk]=Мініатюри збоку diff --git a/effects/trackmouse/trackmouse_config.cpp b/effects/trackmouse/trackmouse_config.cpp index 73e559c982..2ed9899b72 100644 --- a/effects/trackmouse/trackmouse_config.cpp +++ b/effects/trackmouse/trackmouse_config.cpp @@ -102,7 +102,7 @@ void TrackMouseEffectConfig::save() OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.kwin.Effects"), QStringLiteral("/Effects"), QDBusConnection::sessionBus()); - interface.reconfigureEffect(QStringLiteral("kwin4_effect_trackmouse")); + interface.reconfigureEffect(QStringLiteral("trackmouse")); } void TrackMouseEffectConfig::defaults() diff --git a/effects/trackmouse/trackmouse_config.desktop b/effects/trackmouse/trackmouse_config.desktop index 845c829eb1..cf8f78ac99 100644 --- a/effects/trackmouse/trackmouse_config.desktop +++ b/effects/trackmouse/trackmouse_config.desktop @@ -3,7 +3,7 @@ Type=Service X-KDE-ServiceTypes=KCModule X-KDE-Library=kwin_trackmouse_config -X-KDE-ParentComponents=kwin4_effect_trackmouse +X-KDE-ParentComponents=trackmouse Name=Track Mouse Name[uk]=Сліди мишки diff --git a/effects/windowgeometry/windowgeometry_config.cpp b/effects/windowgeometry/windowgeometry_config.cpp index 18884e7edc..18c04db10c 100644 --- a/effects/windowgeometry/windowgeometry_config.cpp +++ b/effects/windowgeometry/windowgeometry_config.cpp @@ -79,7 +79,7 @@ void WindowGeometryConfig::save() OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.kwin.Effects"), QStringLiteral("/Effects"), QDBusConnection::sessionBus()); - interface.reconfigureEffect(QStringLiteral("kwin4_effect_windowgeometry")); + interface.reconfigureEffect(QStringLiteral("windowgeometry")); } void WindowGeometryConfig::defaults() diff --git a/effects/windowgeometry/windowgeometry_config.desktop b/effects/windowgeometry/windowgeometry_config.desktop index 462eea57f6..839e0a96d2 100644 --- a/effects/windowgeometry/windowgeometry_config.desktop +++ b/effects/windowgeometry/windowgeometry_config.desktop @@ -3,7 +3,7 @@ Type=Service X-KDE-ServiceTypes=KCModule X-KDE-Library=kwin_windowgeometry_config -X-KDE-ParentComponents=kwin4_effect_windowgeometry +X-KDE-ParentComponents=windowgeometry Name=WindowGeometry Name[uk]=Розміри вікна diff --git a/effects/wobblywindows/wobblywindows_config.cpp b/effects/wobblywindows/wobblywindows_config.cpp index 08ce204d55..78746212a4 100644 --- a/effects/wobblywindows/wobblywindows_config.cpp +++ b/effects/wobblywindows/wobblywindows_config.cpp @@ -101,7 +101,7 @@ void WobblyWindowsEffectConfig::save() OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.kwin.Effects"), QStringLiteral("/Effects"), QDBusConnection::sessionBus()); - interface.reconfigureEffect(QStringLiteral("kwin4_effect_wobblywindows")); + interface.reconfigureEffect(QStringLiteral("wobblywindows")); } void WobblyWindowsEffectConfig::wobblinessChanged() diff --git a/effects/wobblywindows/wobblywindows_config.desktop b/effects/wobblywindows/wobblywindows_config.desktop index 2883d88515..81812bf651 100644 --- a/effects/wobblywindows/wobblywindows_config.desktop +++ b/effects/wobblywindows/wobblywindows_config.desktop @@ -3,7 +3,7 @@ Type=Service X-KDE-ServiceTypes=KCModule X-KDE-Library=kwin_wobblywindows_config -X-KDE-ParentComponents=kwin4_effect_wobblywindows +X-KDE-ParentComponents=wobblywindows Name=Wobbly Windows Name[uk]=Желейні вікна diff --git a/effects/zoom/zoom_config.cpp b/effects/zoom/zoom_config.cpp index 502f332cc5..dc0189b231 100644 --- a/effects/zoom/zoom_config.cpp +++ b/effects/zoom/zoom_config.cpp @@ -139,7 +139,7 @@ void ZoomEffectConfig::save() OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.kwin.Effects"), QStringLiteral("/Effects"), QDBusConnection::sessionBus()); - interface.reconfigureEffect(QStringLiteral("kwin4_effect_zoom")); + interface.reconfigureEffect(QStringLiteral("zoom")); } } // namespace diff --git a/effects/zoom/zoom_config.desktop b/effects/zoom/zoom_config.desktop index e5f4fc1012..ac6c2107b3 100644 --- a/effects/zoom/zoom_config.desktop +++ b/effects/zoom/zoom_config.desktop @@ -3,7 +3,7 @@ Type=Service X-KDE-ServiceTypes=KCModule X-KDE-Library=kwin_zoom_config -X-KDE-ParentComponents=kwin4_effect_zoom +X-KDE-ParentComponents=zoom Name=Zoom Name[uk]=Масштабування diff --git a/kcmkwin/kwincompositing/effectconfig.cpp b/kcmkwin/kwincompositing/effectconfig.cpp index 9089ca3720..13cd9dfdeb 100644 --- a/kcmkwin/kwincompositing/effectconfig.cpp +++ b/kcmkwin/kwincompositing/effectconfig.cpp @@ -66,13 +66,6 @@ void EffectConfig::openConfig(const QString &serviceName, bool scripted) kcm = KPluginTrader::createInstanceFromQuery(s_pluginDir, QString(), QStringLiteral("[X-KDE-ParentComponents] == '%1'").arg(serviceName), &dialog); - if (!kcm) { - // HACK: try again with "kwin4_effect_" - const QString name = QStringLiteral("kwin4_effect_") + serviceName; - kcm = KPluginTrader::createInstanceFromQuery(s_pluginDir, QString(), - QStringLiteral("[X-KDE-ParentComponents] == '%1'").arg(name), - &dialog); - } } if (!kcm) { return; diff --git a/kcmkwin/kwincompositing/model.cpp b/kcmkwin/kwincompositing/model.cpp index f7612d1418..aefaafa1d0 100644 --- a/kcmkwin/kwincompositing/model.cpp +++ b/kcmkwin/kwincompositing/model.cpp @@ -235,7 +235,7 @@ void EffectModel::loadEffects() effect.category = translatedCategory(data.category); effect.serviceName = data.name; effect.enabledByDefault = data.enabled; - effect.effectStatus = kwinConfig.readEntry(QStringLiteral("kwin4_effect_") + effect.serviceName + "Enabled", effect.enabledByDefault); + effect.effectStatus = kwinConfig.readEntry(effect.serviceName + "Enabled", effect.enabledByDefault); effect.video = data.video; effect.supported = true; effect.exclusiveGroup = data.exclusiveCategory; @@ -243,7 +243,7 @@ void EffectModel::loadEffects() effect.scripted = false; auto it = std::find_if(configs.begin(), configs.end(), [data](const KPluginInfo &info) { - return info.property(QStringLiteral("X-KDE-ParentComponents")).toString() == QStringLiteral("kwin4_effect_") + data.name; + return info.property(QStringLiteral("X-KDE-ParentComponents")).toString() == data.name; }); effect.configurable = it != configs.end(); @@ -382,11 +382,6 @@ void EffectModel::syncConfig() const EffectData &effect = *(it); QString key = effect.serviceName + QStringLiteral("Enabled"); - // HACK: workaround for built-in effects, needs to be removed once everything is transited to new names - if (!key.startsWith(QStringLiteral("kwin4_effect_"))) { - key = QStringLiteral("kwin4_effect_") + key; - } - const bool effectConfigStatus = kwinConfig.readEntry(key, effect.enabledByDefault); if (effect.effectStatus != effectConfigStatus) { diff --git a/kcmkwin/kwindesktop/main.cpp b/kcmkwin/kwindesktop/main.cpp index 800c4d137b..447fd8b228 100644 --- a/kcmkwin/kwindesktop/main.cpp +++ b/kcmkwin/kwindesktop/main.cpp @@ -266,7 +266,7 @@ void KWinDesktopConfig::load() // Set current option to "none" if no plugin is activated. m_ui->effectComboBox->setCurrentIndex(0); auto enableBuiltInEffect = [&effectconfig,this](BuiltInEffect effect, int index) { - const QString key = QStringLiteral("kwin4_effect_") + BuiltInEffects::nameForEffect(effect) + QStringLiteral("Enabled"); + const QString key = BuiltInEffects::nameForEffect(effect) + QStringLiteral("Enabled"); if (effectconfig.readEntry(key, BuiltInEffects::enabledByDefault(effect))) { m_ui->effectComboBox->setCurrentIndex(index); } @@ -339,26 +339,26 @@ void KWinDesktopConfig::save() switch(desktopSwitcher) { case 0: // no effect - effectconfig.writeEntry("kwin4_effect_slideEnabled", false); - effectconfig.writeEntry("kwin4_effect_cubeslideEnabled", false); + effectconfig.writeEntry("slideEnabled", false); + effectconfig.writeEntry("cubeslideEnabled", false); effectconfig.writeEntry("kwin4_effect_fadedesktopEnabled", false); break; case 1: // slide - effectconfig.writeEntry("kwin4_effect_slideEnabled", true); - effectconfig.writeEntry("kwin4_effect_cubeslideEnabled", false); + effectconfig.writeEntry("slideEnabled", true); + effectconfig.writeEntry("cubeslideEnabled", false); effectconfig.writeEntry("kwin4_effect_fadedesktopEnabled", false); break; case 2: // cube - effectconfig.writeEntry("kwin4_effect_slideEnabled", false); - effectconfig.writeEntry("kwin4_effect_cubeslideEnabled", true); + effectconfig.writeEntry("slideEnabled", false); + effectconfig.writeEntry("cubeslideEnabled", true); effectconfig.writeEntry("kwin4_effect_fadedesktopEnabled", false); break; case 3: // fadedesktop - effectconfig.writeEntry("kwin4_effect_slideEnabled", false); - effectconfig.writeEntry("kwin4_effect_cubeslideEnabled", false); + effectconfig.writeEntry("slideEnabled", false); + effectconfig.writeEntry("cubeslideEnabled", false); effectconfig.writeEntry("kwin4_effect_fadedesktopEnabled", true); break; } @@ -584,8 +584,7 @@ void KWinDesktopConfig::slotConfigureEffectClicked() QString effect; switch(m_ui->effectComboBox->currentIndex()) { case 2: - // HACK: kwin4_effect_ needs to be removed - effect = QStringLiteral("kwin4_effect_") + BuiltInEffects::nameForEffect(BuiltInEffect::CubeSlide); + effect = BuiltInEffects::nameForEffect(BuiltInEffect::CubeSlide); break; default: return; diff --git a/kcmkwin/kwinoptions/windows.cpp b/kcmkwin/kwinoptions/windows.cpp index 6572149785..3ca2348d42 100644 --- a/kcmkwin/kwinoptions/windows.cpp +++ b/kcmkwin/kwinoptions/windows.cpp @@ -585,7 +585,7 @@ void KMovingConfig::save(void) cg.writeEntry(KWM_CNTR_SNAP_ZONE, getCenterSnapZone()); cg.writeEntry("SnapOnlyWhenOverlapping", m_ui->OverlapSnap->isChecked()); - KConfigGroup(config, "Plugins").writeEntry("kwin4_effect_windowgeometryEnabled", getGeometryTip()); + KConfigGroup(config, "Plugins").writeEntry("windowgeometryEnabled", getGeometryTip()); if (standAlone) { config->sync(); diff --git a/kcmkwin/kwinscreenedges/main.cpp b/kcmkwin/kwinscreenedges/main.cpp index c952521033..614cc0f5fd 100644 --- a/kcmkwin/kwinscreenedges/main.cpp +++ b/kcmkwin/kwinscreenedges/main.cpp @@ -156,8 +156,7 @@ void KWinScreenEdgesConfig::sanitizeCooldown() // Copied from kcmkwin/kwincompositing/main.cpp bool KWinScreenEdgesConfig::effectEnabled(const BuiltInEffect& effect, const KConfigGroup& cfg) const { - // HACK: remove kwin4_effect_ - return cfg.readEntry("kwin4_effect_" + BuiltInEffects::nameForEffect(effect) + "Enabled", BuiltInEffects::enabledByDefault(effect)); + return cfg.readEntry(BuiltInEffects::nameForEffect(effect) + "Enabled", BuiltInEffects::enabledByDefault(effect)); } //----------------------------------------------------------------------------- diff --git a/kcmkwin/kwintabbox/main.cpp b/kcmkwin/kwintabbox/main.cpp index dfe3ddbce6..6f457efcd5 100644 --- a/kcmkwin/kwintabbox/main.cpp +++ b/kcmkwin/kwintabbox/main.cpp @@ -313,11 +313,11 @@ void KWinTabBoxConfig::save() // activate effects if not active KConfigGroup effectconfig(m_config, "Plugins"); if (coverSwitch || coverSwitchAlternative) - effectconfig.writeEntry("kwin4_effect_coverswitchEnabled", true); + effectconfig.writeEntry("coverswitchEnabled", true); if (flipSwitch || flipSwitchAlternative) - effectconfig.writeEntry("kwin4_effect_flipswitchEnabled", true); + effectconfig.writeEntry("flipswitchEnabled", true); if (highlightWindows) - effectconfig.writeEntry("kwin4_effect_highlightwindowEnabled", true); + effectconfig.writeEntry("highlightwindowEnabled", true); effectconfig.sync(); KConfigGroup coverswitchconfig(m_config, "Effect-CoverSwitch"); coverswitchconfig.writeEntry("TabBox", coverSwitch); @@ -387,8 +387,7 @@ void KWinTabBoxConfig::defaults() bool KWinTabBoxConfig::effectEnabled(const BuiltInEffect& effect, const KConfigGroup& cfg) const { - // HACK: remove kwin4_effect_ - return cfg.readEntry("kwin4_effect_" + BuiltInEffects::nameForEffect(effect) + "Enabled", BuiltInEffects::enabledByDefault(effect)); + return cfg.readEntry(BuiltInEffects::nameForEffect(effect) + "Enabled", BuiltInEffects::enabledByDefault(effect)); } void KWinTabBoxConfig::updateUiFromConfig(KWinTabBoxConfigForm* ui, const KWin::TabBox::TabBoxConfig& config) @@ -488,8 +487,7 @@ void KWinTabBoxConfig::configureEffectClicked() connect(buttonBox, SIGNAL(accepted()), configDialog, SLOT(accept())); connect(buttonBox, SIGNAL(rejected()), configDialog, SLOT(reject())); - // HACK: kwin4_effect_ needs to be removed - const QString name = QStringLiteral("kwin4_effect_") + BuiltInEffects::nameForEffect(effect == CoverSwitch ? BuiltInEffect::CoverSwitch : BuiltInEffect::FlipSwitch); + const QString name = BuiltInEffects::nameForEffect(effect == CoverSwitch ? BuiltInEffect::CoverSwitch : BuiltInEffect::FlipSwitch); KCModule *kcm = KPluginTrader::createInstanceFromQuery(QStringLiteral("kf5/kwin/effects/configs/"), QString(), QStringLiteral("[X-KDE-ParentComponents] == '%1'").arg(name),