diff --git a/kwin/src/CMakeLists.txt b/kwin/src/CMakeLists.txt
index e645c19..d99e237 100644
--- a/kwin/src/CMakeLists.txt
+++ b/kwin/src/CMakeLists.txt
@@ -5,7 +5,7 @@ target_sources(breezy_desktop_effect PRIVATE
breezydesktopeffect.cpp
main.cpp
)
-kconfig_add_kcfg_files(breezy_desktop_effect cubeconfig.kcfgc)
+kconfig_add_kcfg_files(breezy_desktop_effect breezydesktopconfig.kcfgc)
target_include_directories(breezy_desktop_effect PRIVATE /usr/include/kwin)
target_link_libraries(breezy_desktop_effect
@@ -23,5 +23,5 @@ target_link_libraries(breezy_desktop_effect
KWin::kwin
)
-install(DIRECTORY qml DESTINATION ${KDE_INSTALL_DATADIR}/kwin/effects/breezy_desktop)
-install(FILES metadata.json DESTINATION ${KDE_INSTALL_DATADIR}/kwin/effects/breezy_desktop)
+install(DIRECTORY qml DESTINATION ${KDE_INSTALL_DATADIR}/kwin/effects/breezy_desktop_effect)
+install(FILES metadata.json DESTINATION ${KDE_INSTALL_DATADIR}/kwin/effects/breezy_desktop_effect)
diff --git a/kwin/src/cubeconfig.kcfg b/kwin/src/breezydesktopconfig.kcfg
similarity index 57%
rename from kwin/src/cubeconfig.kcfg
rename to kwin/src/breezydesktopconfig.kcfg
index 57e83db..b2129c8 100644
--- a/kwin/src/cubeconfig.kcfg
+++ b/kwin/src/breezydesktopconfig.kcfg
@@ -4,6 +4,12 @@
xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
-
+
+
+ 1.05
+ 0.2
+ 2.5
+
+
diff --git a/kwin/src/breezydesktopconfig.kcfgc b/kwin/src/breezydesktopconfig.kcfgc
new file mode 100644
index 0000000..4f16263
--- /dev/null
+++ b/kwin/src/breezydesktopconfig.kcfgc
@@ -0,0 +1,4 @@
+File=breezydesktopconfig.kcfg
+ClassName=BreezyDesktopConfig
+Singleton=true
+Mutators=true
diff --git a/kwin/src/breezydesktopeffect.cpp b/kwin/src/breezydesktopeffect.cpp
index d298320..6789161 100644
--- a/kwin/src/breezydesktopeffect.cpp
+++ b/kwin/src/breezydesktopeffect.cpp
@@ -1,5 +1,5 @@
#include "breezydesktopeffect.h"
-#include "cubeconfig.h"
+#include "breezydesktopconfig.h"
#include "effect/effect.h"
#include "effect/effecthandler.h"
#include "opengl/glutils.h"
@@ -64,7 +64,7 @@ BreezyDesktopEffect::BreezyDesktopEffect()
: m_shutdownTimer(new QTimer(this))
{
qCCritical(KWIN_XR) << "\t\t\tBreezy - constructor";
- qmlRegisterUncreatableType("org.kde.kwin.effect.breezy_desktop", 1, 0, "BreezyDesktopEffect", QStringLiteral("BreezyDesktop cannot be created in QML"));
+ qmlRegisterUncreatableType("org.kde.kwin.effect.breezy_desktop_effect", 1, 0, "BreezyDesktopEffect", QStringLiteral("BreezyDesktop cannot be created in QML"));
const QKeySequence defaultToggleShortcut = Qt::META | Qt::Key_B;
m_toggleAction = new QAction(this);
@@ -86,7 +86,7 @@ BreezyDesktopEffect::BreezyDesktopEffect()
updateCursorImage();
reconfigure(ReconfigureAll);
- setSource(QUrl::fromLocalFile(QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("kwin/effects/breezy_desktop/qml/main.qml"))));
+ setSource(QUrl::fromLocalFile(QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("kwin/effects/breezy_desktop_effect/qml/main.qml"))));
// Monitor the IMU file for changes, even if it doesn't exist at startup
m_shmDirectoryWatcher = new QFileSystemWatcher(this);
@@ -122,7 +122,8 @@ BreezyDesktopEffect::BreezyDesktopEffect()
void BreezyDesktopEffect::reconfigure(ReconfigureFlags)
{
- CubeConfig::self()->read();
+ BreezyDesktopConfig::self()->read();
+ setDisplayDistance(BreezyDesktopConfig::displayDistance());
}
QVariantMap BreezyDesktopEffect::initialProperties(Output *screen)
@@ -167,14 +168,6 @@ void BreezyDesktopEffect::deactivate()
disconnect(effects, &EffectsHandler::cursorShapeChanged, this, &BreezyDesktopEffect::updateCursorImage);
m_cursorUpdateTimer->stop();
showCursor();
-
- const QList