plugins/colorblindnesscorrection: mark as internal and remove configuration UI

Depends on https://invent.kde.org/plasma/plasma-desktop/-/merge_requests/2472
as it's being moved to the Accessibility KCM for greater… accessibility!

CCBUG: 488771

src/kcms/effects/kcm_kwin_effects.json

@@ -100,7 +100,7 @@
         "Name[zh_TW]": "桌面效果"
     },
     "X-DocPath": "kcontrol/kwineffects/index.html",
-    "X-KDE-Keywords": "kwin,window,manager,effect,3D effects,2D effects,graphical effects,desktop effects,animations,various animations,window management effects,window switching effect,desktop switching effect,animations,desktop animations,drivers,driver settings,rendering,render,invert effect,looking glass effect,magnifier effect,snap helper effect,track mouse effect,zoom effect,blur effect,fade effect,fade desktop effect,fall apart effect,glide effect,highlight window effect,login effect,logout effect,magic lamp effect,minimize animation effect,mouse mark effect,scale effect,screenshot effect,sheet effect,slide effect,sliding popups effect,thumbnail aside effect,translucency,translucency effect,transparency,window geometry effect,wobbly windows effect,startup feedback effect,dialog parent effect,dim inactive effect,dim screen effect,slide back effect,eye candy,candy,show FPS effect,show paint effect,cover switch effect,desktop cube effect,desktop cube animation effect,desktop grid effect,flip switch effect,present windows effect,resize window effect,background contrast effect,bling,fading,movement,motion,overview windows effect,accessibility,tile,tiling editor effect,cursor,pointer,mouse,hide cursor,hide cursor effect,hide pointer,hide pointer effect,hide mouse,hide mouse effect,colorblindness correction,color,color blindness,colorblindness,color correction",
+    "X-KDE-Keywords": "kwin,window,manager,effect,3D effects,2D effects,graphical effects,desktop effects,animations,various animations,window management effects,window switching effect,desktop switching effect,animations,desktop animations,drivers,driver settings,rendering,render,invert effect,looking glass effect,magnifier effect,snap helper effect,track mouse effect,zoom effect,blur effect,fade effect,fade desktop effect,fall apart effect,glide effect,highlight window effect,login effect,logout effect,magic lamp effect,minimize animation effect,mouse mark effect,scale effect,screenshot effect,sheet effect,slide effect,sliding popups effect,thumbnail aside effect,translucency,translucency effect,transparency,window geometry effect,wobbly windows effect,startup feedback effect,dialog parent effect,dim inactive effect,dim screen effect,slide back effect,eye candy,candy,show FPS effect,show paint effect,cover switch effect,desktop cube effect,desktop cube animation effect,desktop grid effect,flip switch effect,present windows effect,resize window effect,background contrast effect,bling,fading,movement,motion,overview windows effect,accessibility,tile,tiling editor effect,cursor,pointer,mouse,hide cursor,hide cursor effect,hide pointer,hide pointer effect,hide mouse,hide mouse effect",
     "X-KDE-Keywords[ar]": "كوين,مدير النوافذ,نافذة,نوافذ,تحريك,تركيب,تأثير,تأثيرات,تنقل,انكماش,تحريك,تبديل,طيران,إتاحة",
     "X-KDE-Keywords[az]": "kwin,window,manager,effect,3D effects,2D effects,graphical effects,desktop effects,animations,various animations,window management effects,window switching effect,desktop switching effect,animations,desktop animations,drivers,driver settings,rendering,render,invert effect,looking glass effect,magnifier effect,snap helper effect,track mouse effect,zoom effect,blur effect,fade effect,fade desktop effect,fall apart effect,glide effect,highlight window effect,login effect,logout effect,magic lamp effect,minimize animation effect,mouse mark effect,scale effect,screenshot effect,sheet effect,slide effect,sliding popups effect,thumbnail aside effect,translucency,translucency effect,transparency,window geometry effect,wobbly windows effect,startup feedback effect,dialog parent effect,dim inactive effect,dim screen effect,slide back effect,eye candy,candy,show FPS effect,show paint effect,cover switch effect,desktop cube effect,desktop cube animation effect,desktop grid effect,flip switch effect,present windows effect,resize window effect,background contrast effect,bling,fading,movement,motion,overview windows effect,accessibility, pəncərə,menecer,idarəedici,effekt,3D effekt,2D effekt,qrafik effektlər,iş masası effektləri,animasiyalar,canlanmalar,dəyişən animasiyalar,pəncərə idarə edilməsi effekti,pəncərədən-pəncərəyə keçmə effekti,iş masalarını dəyişmə effektləri,iş masası animasiyaları,sürücülər,sürücü ayarları,təsvirin işlənməsi,tərs çevirmə effekti,şüşə effekti,böyüdücü effekti,ani köməkçi effekti,kursorun izlənməsi effekti,miqyas effekti,bulanıqlıq effekti,solma effekti,iş masası yox olması effekti,daöılma effekti,sürüşmə effekti,pəncərənin vurğulanması effekti,giriş effekti,çıxış effekti,sehirli lampa effekti,yığılma animasiyası effekti,siçanla işarələmə effekti,miqyaslama effekti,ekran şəkili şəkimi effekti,səhifə effekti,sürüşmə effekti,ani pəncərə sürüşməsi effekti,kiçik yan eskiz effekti,şəffaflıq, şəffalıq effekti,pəncərənin mövqeyi effekti,dalğalanan pəncərə effekti,əks əlaqənin başlama effekti,əsas dialoq effekti,qeyri-aktiv olanların tutqunlaşması effekti,ekranın tutqunlaşması effekti,arxaya sürüşmə effekti,konfet,FPS-in göstərilməsi effekti,rəsm çəkmə effekti,örtük dyişdirmə effekti,iş masası kubu effekti,iş masası kubu animasiyası,iş masası toru effekti,çevirmə effekti,pəncərə təqdimatı effekti,pəncərə ölçüsünün dəyişdirilməsi effekti,arxa plan kontrastı effekti,parıltı,solma,hərəkət,gəzinti,pəncərələrə baxış effekti,xüsusi imkanlar",
     "X-KDE-Keywords[ca@valencia]": "kwin,finestra,gestor,efecte,efectes 3D,efectes 2D,efectes gràfics,efectes d'escriptori,animacions,animacions diverses,efectes en la gestió de les finestres,efecte en el canvi de finestra,efecte en el canvi d'escriptori,animacions,animacions a l'escriptori,controladors,configuració dels controladors,renderització,render,efecte d'inversió,efecte d'aspecte de vidre,efecte de lupa,efecte ajudant del desplaçament,efecte de seguiment del ratolí,efecte de zoom,efecte de difuminat,efecte d'esvaïment,efecte d'esvaïment de l'escriptori,efecte de trencament,efecte de lliscament,efecte de ressaltat de la finestra,efecte en l'inici de la sessió,efecte en eixir de la sessió,efecte de làmpada màgica,efecte d'animació de la minimització,efecte de marca del ratolí,efecte d'apropament,efecte de captura de la pantalla,efecte de full,efecte de diapositiva,efecte de missatges emergents lliscants,efecte de miniatures laterals,translucidesa,efecte de translucidesa,transparència,efecte de geometria de la finestra,efecte de finestres sacsejades,efecte de confirmació d'iniciada,efecte de diàleg principal,efecte d'enfosquiment en estar inactiu,efecte d'enfosquiment de la pantalla,efecte de diapositiva prèvia,decoració,efecte per a mostrar els FPS,efecte de mostrar el pintat,efecte de canvi de coberta,efecte de cub de l'escriptori,efecte d'animació del cub de l'escriptori,efecte de quadrícula de l'escriptori,efecte de canvi en roda,efecte de presentació de les finestres,efecte de redimensionat de la finestra,efecte de contrast del fons,bling,enfosquiment,moviment,efecte de resum de finestres,accessibilitat",

src/plugins/colorblindnesscorrection/CMakeLists.txt

@@ -1,47 +1,19 @@
 # SPDX-FileCopyrightText: 2023 Fushan Wen <qydwhotmail@gmail.com>
 # SPDX-License-Identifier: BSD-3-Clause
 
-kwin_add_builtin_effect(colorblindnesscorrection
+kwin_add_builtin_effect(colorblindnesscorrection)
+
+target_sources(colorblindnesscorrection PRIVATE
+    main.cpp
     colorblindnesscorrection.cpp
     colorblindnesscorrection.qrc
-    main.cpp
 )
-set(SETTINGS_HEADER "colorblindnesscorrection_settings_singleton")
+
-set(GENERATE_MOC "false")
+kconfig_add_kcfg_files(colorblindnesscorrection
-set(USE_SINGLETON "true")
+    colorblindnesscorrectionconfig.kcfgc
-set(KCFGFILE_ARGS "arg=\"true\"")
+)
-configure_file(colorblindnesscorrection_settings.kcfgc.in ${CMAKE_CURRENT_BINARY_DIR}/${SETTINGS_HEADER}.kcfgc @ONLY)
+
-configure_file(colorblindnesscorrection_settings.kcfg.in ${CMAKE_CURRENT_BINARY_DIR}/${SETTINGS_HEADER}.kcfg @ONLY)
-kconfig_add_kcfg_files(colorblindnesscorrection ${CMAKE_CURRENT_BINARY_DIR}/${SETTINGS_HEADER}.kcfgc)
 target_link_libraries(colorblindnesscorrection PRIVATE
     kwin
-
-    KF6::ConfigCore
     KF6::ConfigGui
 )
-
-# Config
-if (NOT KWIN_BUILD_KCMS)
-    return()
-endif()
-
-set(SETTINGS_HEADER "colorblindnesscorrection_settings")
-kcmutils_add_qml_kcm(kwin_colorblindnesscorrection_config SOURCES colorblindnesscorrection_config.cpp INSTALL_NAMESPACE "kwin/effects/configs" DISABLE_DESKTOP_FILE_GENERATION)
-kcmutils_generate_module_data(kwin_colorblindnesscorrection_config
-    MODULE_DATA_HEADER colorblindnesscorrection_settingsdata.h
-    MODULE_DATA_CLASS_NAME ColorBlindnessCorrectionSettingsData
-    SETTINGS_HEADERS ${SETTINGS_HEADER}.h
-    SETTINGS_CLASSES ColorBlindnessCorrectionSettings
-)
-set(GENERATE_MOC "true")
-set(USE_SINGLETON "false")
-set(KCFGFILE_ARGS "name=\"kwinrc\"")
-configure_file(colorblindnesscorrection_settings.kcfgc.in ${CMAKE_CURRENT_BINARY_DIR}/${SETTINGS_HEADER}.kcfgc @ONLY)
-configure_file(colorblindnesscorrection_settings.kcfg.in ${CMAKE_CURRENT_BINARY_DIR}/${SETTINGS_HEADER}.kcfg @ONLY)
-kconfig_add_kcfg_files(kwin_colorblindnesscorrection_config ${CMAKE_CURRENT_BINARY_DIR}/colorblindnesscorrection_settings.kcfgc GENERATE_MOC)
-target_link_libraries(kwin_colorblindnesscorrection_config
-    KF6::ConfigCore
-    KF6::KCMUtils
-    KF6::KCMUtilsQuick
-    KWinEffectsInterface
-)

src/plugins/colorblindnesscorrection/colorblindnesscorrection.cpp

@@ -9,7 +9,7 @@
 #include "effect/effecthandler.h"
 #include "opengl/glshader.h"
 
-#include "colorblindnesscorrection_settings_singleton.h"
+#include "colorblindnesscorrectionconfig.h"
 
 Q_LOGGING_CATEGORY(KWIN_COLORBLINDNESS_CORRECTION, "kwin_effect_colorblindnesscorrection", QtWarningMsg)
 

src/plugins/colorblindnesscorrection/colorblindnesscorrection.qrc

@@ -1,6 +1,6 @@
 <!DOCTYPE RCC><RCC version="1.0">
 <qresource prefix="/effects/colorblindnesscorrection/">
-  <file>shaders/colorblindesscorrection.frag</file>
+  <file>shaders/colorblindnesscorrection.frag</file>
-  <file>shaders/colorblindesscorrection_core.frag</file>
+  <file>shaders/colorblindnesscorrection_core.frag</file>
 </qresource>
 </RCC>

src/plugins/colorblindnesscorrection/colorblindnesscorrection_config.cpp

@@ -1,59 +0,0 @@
-/*
-    SPDX-FileCopyrightText: 2023 Fushan Wen <qydwhotmail@gmail.com>
-
-    SPDX-License-Identifier: GPL-2.0-or-later
-*/
-
-#include "colorblindnesscorrection_config.h"
-
-#include <QDBusConnection>
-#include <QDBusMessage>
-#include <QDBusPendingCall>
-
-#include <KPluginFactory>
-
-#include "colorblindnesscorrection_settings.h"
-#include "colorblindnesscorrection_settingsdata.h"
-#include "kwineffects_interface.h"
-
-K_PLUGIN_CLASS_WITH_JSON(KWin::ColorBlindnessCorrectionEffectConfig, "kwin_colorblindnesscorrection_config.json")
-
-namespace KWin
-{
-
-ColorBlindnessCorrectionEffectConfig::ColorBlindnessCorrectionEffectConfig(QObject *parent, const KPluginMetaData &metaData)
-    : KQuickManagedConfigModule(parent, metaData)
-    , m_data(new ColorBlindnessCorrectionSettingsData(this))
-{
-    qmlRegisterUncreatableType<ColorBlindnessCorrectionSettings>("org.kde.plasma.kwin.colorblindnesscorrectioneffect.kcm",
-                                                                 1,
-                                                                 0,
-                                                                 "ColorBlindnessCorrectionSettings",
-                                                                 QStringLiteral("Only for enums"));
-
-    setButtons(Apply | Default);
-}
-
-ColorBlindnessCorrectionEffectConfig::~ColorBlindnessCorrectionEffectConfig()
-{
-}
-
-ColorBlindnessCorrectionSettings *ColorBlindnessCorrectionEffectConfig::settings() const
-{
-    return m_data->settings();
-}
-
-void ColorBlindnessCorrectionEffectConfig::save()
-{
-    KQuickManagedConfigModule::save();
-
-    OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.KWin"),
-                                         QStringLiteral("/Effects"),
-                                         QDBusConnection::sessionBus());
-    interface.reconfigureEffect(QStringLiteral("colorblindnesscorrection"));
-}
-
-} // namespace
-
-#include "colorblindnesscorrection_config.moc"
-#include "moc_colorblindnesscorrection_config.cpp"

src/plugins/colorblindnesscorrection/colorblindnesscorrection_config.h

@@ -1,35 +0,0 @@
-/*
-    SPDX-FileCopyrightText: 2023 Fushan Wen <qydwhotmail@gmail.com>
-
-    SPDX-License-Identifier: GPL-2.0-or-later
-*/
-
-#pragma once
-
-#include <KQuickManagedConfigModule>
-
-class ColorBlindnessCorrectionSettings;
-class ColorBlindnessCorrectionSettingsData;
-
-namespace KWin
-{
-class ColorBlindnessCorrectionEffectConfig : public KQuickManagedConfigModule
-{
-    Q_OBJECT
-
-    Q_PROPERTY(ColorBlindnessCorrectionSettings *settings READ settings CONSTANT)
-
-public:
-    explicit ColorBlindnessCorrectionEffectConfig(QObject *parent, const KPluginMetaData &metaData);
-    ~ColorBlindnessCorrectionEffectConfig() override;
-
-    ColorBlindnessCorrectionSettings *settings() const;
-
-public Q_SLOTS:
-    void save() override;
-
-private:
-    ColorBlindnessCorrectionSettingsData *m_data;
-
-}; // namespace
-}

src/plugins/colorblindnesscorrection/colorblindnesscorrection_settings.kcfgc.in

@@ -1,10 +0,0 @@
-# SPDX-FileCopyrightText: 2023 Fushan Wen <qydwhotmail@gmail.com>
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-File=@SETTINGS_HEADERS@.kcfg
-ClassName=ColorBlindnessCorrectionSettings
-DefaultValueGetters=@GENERATE_MOC@
-GenerateProperties=@GENERATE_MOC@
-ParentInConstructor=@GENERATE_MOC@
-Singleton=@USE_SINGLETON@
-Mutators=true

src/plugins/colorblindnesscorrection/colorblindnesscorrectionconfig.kcfg

@@ -7,7 +7,7 @@
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
                           http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
-    <kcfgfile @KCFGFILE_ARGS@/>
+    <kcfgfile arg="true"/>
     <group name="Effect-colorblindnesscorrection">
         <entry name="Mode" type="UInt">
             <default>0</default>

src/plugins/colorblindnesscorrection/colorblindnesscorrectionconfig.kcfgc

@@ -0,0 +1,7 @@
+# SPDX-FileCopyrightText: 2023 Fushan Wen <qydwhotmail@gmail.com>
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+File=colorblindnesscorrectionconfig.kcfg
+ClassName=ColorBlindnessCorrectionSettings
+NameSpace=KWin
+Singleton=true

src/plugins/colorblindnesscorrection/kwin_colorblindnesscorrection_config.json

@@ -1,45 +0,0 @@
-{
-    "KPlugin": {
-        "License": "GPL-2.0+",
-        "Name": "Colorblindness Correction",
-        "Name[ar]": "تصحيح عمى الألوان",
-        "Name[be]": "Карэкцыя дальтанізму",
-        "Name[bg]": "Корекция на цветна слепота",
-        "Name[ca@valencia]": "Correcció del daltonisme",
-        "Name[ca]": "Correcció del daltonisme",
-        "Name[cs]": "Oprava barvosleposti",
-        "Name[da]": "Korrektion for farveblindhed",
-        "Name[en_GB]": "Colourblindness Correction",
-        "Name[eo]": "Korekto de Kolorblindeco",
-        "Name[es]": "Corrección para daltonismo",
-        "Name[eu]": "Kolore itsutasunerako zuzenketa",
-        "Name[fi]": "Värisokeuskorjaus",
-        "Name[fr]": "Correction du daltonisme",
-        "Name[gl]": "Corrección de daltonismo",
-        "Name[he]": "תיקון עיוורון צבעים",
-        "Name[hu]": "Színtévesztés-korrekció",
-        "Name[ia]": "Correction de cecitate de color",
-        "Name[id]": "Koreksi Buta Warna",
-        "Name[is]": "Leiðrétting fyrir litblindu",
-        "Name[it]": "Correzione per il daltonismo",
-        "Name[ja]": "色覚異常補正",
-        "Name[ka]": "ფერების სიბრმავის შესწორება",
-        "Name[ko]": "색각 이상 보정",
-        "Name[lt]": "Spalvinio aklumo korekcija",
-        "Name[lv]": "Krāsu akluma korekcija",
-        "Name[nl]": "Correctie voor kleurenblindheid",
-        "Name[nn]": "Korrigering for fargeblindleik",
-        "Name[pl]": "Poprawki dla ślepych na barwy",
-        "Name[pt_BR]": "Correção de daltonismo",
-        "Name[ru]": "Корректировка при цветовой слепоте",
-        "Name[sk]": "Korekcia farbosleposti",
-        "Name[sl]": "Popravek za barvno slepoto",
-        "Name[sv]": "Korrigering av färgblindhet",
-        "Name[ta]": "நிறக்குருடு திருத்தம்",
-        "Name[tr]": "Renk Körlüğü Düzeltmesi",
-        "Name[uk]": "Виправлення для дальтонізму",
-        "Name[x-test]": "xxColorblindness Correctionxx",
-        "Name[zh_CN]": "色盲校正",
-        "Name[zh_TW]": "色盲修正"
-    }
-}

src/plugins/colorblindnesscorrection/kwin_colorblindnesscorrection_config.json.license

@@ -1,2 +0,0 @@
-# SPDX-FileCopyrightText: None
-# SPDX-License-Identifier: CC0-1.0

src/plugins/colorblindnesscorrection/metadata.json

@@ -83,5 +83,7 @@
         "Name[zh_CN]": "色盲校正",
         "Name[zh_TW]": "色盲修正"
     },
-    "X-KDE-ConfigModule": "kwin_colorblindnesscorrection_config"
+    "org.kde.kwin.effect": {
+        "internal": true
+    }
 }

src/plugins/colorblindnesscorrection/ui/main.qml

@@ -1,94 +0,0 @@
-/*
-    SPDX-FileCopyrightText: 2023 Fushan Wen <qydwhotmail@gmail.com>
-
-    SPDX-License-Identifier: GPL-2.0-or-later
-*/
-
-import QtQuick
-import QtQuick.Controls as QQC
-import QtQuick.Layouts
-import org.kde.kirigami as Kirigami
-
-import org.kde.kcmutils as KCM
-import org.kde.plasma.kwin.colorblindnesscorrectioneffect.kcm
-
-KCM.SimpleKCM {
-    id: root
-
-    implicitWidth: Kirigami.Units.gridUnit * 30
-    implicitHeight: Kirigami.Units.gridUnit * 24
-
-    RowLayout {
-        id: previewArea
-        Layout.fillWidth: true
-        spacing: Kirigami.Units.smallSpacing
-
-        Item {
-            Layout.fillWidth: true
-        }
-
-        Repeater {
-            model: [
-                { name: i18nd("kwin", "Red"), colors: ["Red", "Orange", "Yellow"] },
-                { name: i18nd("kwin", "Green"), colors: ["Green", "LimeGreen", "Lime"] },
-                { name: i18nd("kwin", "Blue"), colors: ["Blue", "DeepSkyBlue", "Aqua"] },
-                { name: i18nd("kwin", "Purple"), colors: ["Purple", "Fuchsia", "Violet"] },
-            ]
-
-            delegate: Column {
-                spacing: 0
-
-                Repeater {
-                    model: modelData.colors
-                    delegate: Rectangle {
-                        width: Kirigami.Units.gridUnit * 5
-                        height: Kirigami.Units.gridUnit * 5
-                        color: modelData
-                    }
-                }
-
-                QQC.Label {
-                    anchors.horizontalCenter: parent.horizontalCenter
-                    text: modelData.name
-                }
-            }
-        }
-
-        Item {
-            Layout.fillWidth: true
-        }
-    }
-
-    Kirigami.FormLayout {
-        id: formLayout
-        anchors {
-            top: previewArea.bottom
-            topMargin: Kirigami.Units.largeSpacing
-        }
-
-        QQC.ComboBox {
-            id: colorComboBox
-            Kirigami.FormData.label: i18ndc("kwin", "@label", "Mode:")
-            currentIndex: kcm.settings.mode
-            textRole: "text"
-            valueRole: "value"
-            model: [
-                { value: 0, text: i18ndc("kwin", "@option", "Protanopia (red weak)") },
-                { value: 1, text: i18ndc("kwin", "@option", "Deuteranopia (green weak)") },
-                { value: 2, text: i18ndc("kwin", "@option", "Tritanopia (blue-yellow)") },
-            ]
-
-            onActivated: kcm.settings.mode = currentValue
-        }
-
-        QQC.Slider {
-            Kirigami.FormData.label: i18ndc("kwin", "@label", "Intensity:")
-            Layout.preferredWidth: colorComboBox.implicitWidth
-            from: 0.0
-            to: 1.0
-            value: kcm.settings.intensity
-
-            onMoved: kcm.settings.intensity = value
-        }
-    }
-}