diff --git a/kwin/kwin4_effect_tv/contents/config/main.xml b/kwin/kwin4_effect_tv/contents/config/main.xml index c0f6524..4d89142 100755 --- a/kwin/kwin4_effect_tv/contents/config/main.xml +++ b/kwin/kwin4_effect_tv/contents/config/main.xml @@ -1,15 +1,13 @@ - - - - - 0 - - - 128,128,128 - - - + + + + + 0 + + + 128,128,128 + + + \ No newline at end of file diff --git a/kwin/kwin4_effect_tv/contents/ui/config.ui b/kwin/kwin4_effect_tv/contents/ui/config.ui index 8c55fdf..1a8d43e 100755 --- a/kwin/kwin4_effect_tv/contents/ui/config.ui +++ b/kwin/kwin4_effect_tv/contents/ui/config.ui @@ -1,80 +1,80 @@ - TvEffectConfigForm - - - - 0 - 0 - 498 - 451 - - - - - - - Duration: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - &Color: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - kcfg_Color - - - - - - - - 0 - 0 - - - - - - - - - 0 - 0 - - - - Default - - - milliseconds - - - 9999 - - - 5 - - - - - - - - KColorCombo - QComboBox -
kcolorcombo.h
-
-
- - -
+ BMWtvEffectConfigForm + + + + 0 + 0 + 498 + 451 + + + + + + + Duration: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + &Color: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + kcfg_Color + + + + + + + + 0 + 0 + + + + + + + + + 0 + 0 + + + + Default + + + milliseconds + + + 9999 + + + 5 + + + + + + + + KColorCombo + QComboBox +
kcolorcombo.h
+
+
+ + + \ No newline at end of file diff --git a/kwin/main.js.in b/kwin/main.js.in index 6854d4e..4b3d530 100755 --- a/kwin/main.js.in +++ b/kwin/main.js.in @@ -17,7 +17,7 @@ const blacklist = [ "ksplashqml ksplashqml" ]; -class %NICK%Effect { +class BMW%NICK%Effect { constructor() { effect.configChanged.connect(this.loadConfig.bind(this)); effect.animationEnded.connect(this.cleanupForcedRoles.bind(this)); @@ -35,7 +35,7 @@ class %NICK%Effect { const duration = effect.readConfig("Duration", defaultDuration) || defaultDuration; this.duration = animationTime(duration); - effect.setUniform(this.shader, "uEffectColor", effect.readConfig("Color", "white")); + effect.setUniform(this.shader, "uColor", effect.readConfig("Color", "white")); } static isScaleWindow(window) { @@ -121,7 +121,7 @@ class %NICK%Effect { if (effects.hasActiveFullScreenEffect) { return; } - if (!%NICK%Effect.isScaleWindow(window)) { + if (!BMW%NICK%Effect.isScaleWindow(window)) { return; } if (!window.visible || window.skipsCloseAnimation) { @@ -168,4 +168,4 @@ class %NICK%Effect { } } -new %NICK%Effect(); +new BMW%NICK%Effect();