From fbd33b1716ad1796785905368f4b3576512d0263 Mon Sep 17 00:00:00 2001 From: taj-ny <79316397+taj-ny@users.noreply.github.com> Date: Tue, 13 Aug 2024 18:32:27 +0200 Subject: [PATCH 01/10] readme: update --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 485ca67a0..66b3fcea1 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -# kwin-effects-forceblur [![AUR Version](https://img.shields.io/aur/version/kwin-effects-forceblur)](https://aur.archlinux.org/packages/kwin-effects-forceblur) -Kwin-effects-forceblur (name subject to change) is a fork of the KWin Blur effect for KDE Plasma 6 with several improvements and bug fixes. +# KWin Better Blur [![AUR Version](https://img.shields.io/aur/version/kwin-effects-forceblur)](https://aur.archlinux.org/packages/kwin-effects-forceblur) +Better Blur (formerly kwin-effects-forceblur) is a fork of the KWin Blur effect with several improvements and bug fixes. Latest features are available on the ``develop`` branch. @@ -110,7 +110,7 @@ Remove the *build* directory when rebuilding the effect. > [!NOTE] > If the effect stops working after a system upgrade, you will need to rebuild it. -Since kwin-effects-forceblur is a fork, you need to disable the stock blur effect and any other blur effects you may be using. +This effect will conflict with the stock blur effect and any other forks of it. 1. Install the plugin. 2. Open the *Desktop Effects* page in *System Settings*. From 4d90df0e39991e5cf2e2827442f4e5ae3ea8ad36 Mon Sep 17 00:00:00 2001 From: taj-ny <79316397+taj-ny@users.noreply.github.com> Date: Tue, 13 Aug 2024 18:34:14 +0200 Subject: [PATCH 02/10] flake.nix: update description --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index cc735f9ad..a0c0bb05e 100644 --- a/flake.nix +++ b/flake.nix @@ -1,5 +1,5 @@ { - description = "A fork of the KWin Blur effect for KDE Plasma 6 with the ability to blur any window on Wayland and X11"; + description = "Fork of the KWin Blur effect for KDE Plasma 6 with force blur and more"; inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; From 5cf92bc5166f224d5e929ea3fc54eec235db6004 Mon Sep 17 00:00:00 2001 From: taj-ny <79316397+taj-ny@users.noreply.github.com> Date: Tue, 13 Aug 2024 18:34:51 +0200 Subject: [PATCH 03/10] package.nix: update package name and description --- package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.nix b/package.nix index 108ff643d..c445b7445 100644 --- a/package.nix +++ b/package.nix @@ -8,7 +8,7 @@ }: stdenv.mkDerivation rec { - pname = "kwin-effects-forceblur"; + pname = "kwin-better-blur"; version = "1.3.1"; src = ./.; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "A fork of the KWin Blur effect for KDE Plasma 6 with the ability to blur any window on Wayland and X11"; + description = "Fork of the KWin Blur effect for KDE Plasma 6 with force blur and more"; license = licenses.gpl3; homepage = "https://github.com/taj-ny/kwin-effects-forceblur"; }; From 36bbb0316f126dd9fca308b3dae96d226023f4cf Mon Sep 17 00:00:00 2001 From: taj-ny <79316397+taj-ny@users.noreply.github.com> Date: Tue, 13 Aug 2024 18:35:57 +0200 Subject: [PATCH 04/10] flake.lock: update --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 409ad87c0..76f9307bd 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1718160348, - "narHash": "sha256-9YrUjdztqi4Gz8n3mBuqvCkMo4ojrA6nASwyIKWMpus=", + "lastModified": 1723362943, + "narHash": "sha256-dFZRVSgmJkyM0bkPpaYRtG/kRMRTorUIDj8BxoOt1T4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "57d6973abba7ea108bac64ae7629e7431e0199b6", + "rev": "a58bc8ad779655e790115244571758e8de055e3d", "type": "github" }, "original": { From ce8f0dd8b56579ffaae8321b5c774c0cf487bc12 Mon Sep 17 00:00:00 2001 From: taj-ny <79316397+taj-ny@users.noreply.github.com> Date: Tue, 13 Aug 2024 18:47:59 +0200 Subject: [PATCH 05/10] rename stuff --- CMakeLists.txt | 2 +- src/blur.cpp | 2 +- src/kcm/CMakeLists.txt | 14 +++++++------- src/metadata.json | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8e73239f8..abf31c668 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.16.0) -project(forceblur) +project(kwin_better_blur) set(PROJECT_VERSION "1.3.1") set(PROJECT_VERSION_MAJOR 0) diff --git a/src/blur.cpp b/src/blur.cpp index 7254702e6..50dcfe13a 100644 --- a/src/blur.cpp +++ b/src/blur.cpp @@ -37,7 +37,7 @@ #include -Q_LOGGING_CATEGORY(KWIN_BLUR, "kwin_effect_forceblur", QtWarningMsg) +Q_LOGGING_CATEGORY(KWIN_BLUR, "kwin_better_blur_forceblur", QtWarningMsg) static void ensureResources() { diff --git a/src/kcm/CMakeLists.txt b/src/kcm/CMakeLists.txt index f697bb4be..7072ba56b 100644 --- a/src/kcm/CMakeLists.txt +++ b/src/kcm/CMakeLists.txt @@ -1,16 +1,16 @@ -set(kwin_forceblur_config_SRCS blur_config.cpp blur_config.h) +set(kwin_better_blur_config_SRCS blur_config.cpp blur_config.h) -ki18n_wrap_ui(kwin_forceblur_config_SRCS blur_config.ui) -kconfig_add_kcfg_files(kwin_forceblur_config_SRCS ../blurconfig.kcfgc) +ki18n_wrap_ui(kwin_better_blur_config_SRCS blur_config.ui) +kconfig_add_kcfg_files(kwin_better_blur_config_SRCS ../blurconfig.kcfgc) -qt_add_dbus_interface(kwin_forceblur_config_SRCS ${KWIN_EFFECTS_INTERFACE} kwineffects_interface) +qt_add_dbus_interface(kwin_better_blur_config_SRCS ${KWIN_EFFECTS_INTERFACE} kwineffects_interface) -add_library(kwin_forceblur_config MODULE ${kwin_forceblur_config_SRCS}) -target_link_libraries(kwin_forceblur_config +add_library(kwin_better_blur_config MODULE ${kwin_better_blur_config_SRCS}) +target_link_libraries(kwin_better_blur_config KF6::KCMUtils KF6::CoreAddons KF6::I18n Qt6::DBus ) -install(TARGETS kwin_forceblur_config DESTINATION ${KDE_INSTALL_PLUGINDIR}/kwin/effects/configs) +install(TARGETS kwin_better_blur_config DESTINATION ${KDE_INSTALL_PLUGINDIR}/kwin/effects/configs) diff --git a/src/metadata.json b/src/metadata.json index f79011916..52f1b6254 100644 --- a/src/metadata.json +++ b/src/metadata.json @@ -12,7 +12,7 @@ "Description": "Blurs the background behind user-specified windows", "EnabledByDefault": false, "License": "GPL", - "Name": "Force Blur" + "Name": "Better Blur (formerly Force Blur)" }, - "X-KDE-ConfigModule": "kwin_forceblur_config" + "X-KDE-ConfigModule": "kwin_better_blur_config" } From 24719f765e940bc528536a25b91af1af524c6398 Mon Sep 17 00:00:00 2001 From: taj-ny <79316397+taj-ny@users.noreply.github.com> Date: Tue, 13 Aug 2024 18:48:14 +0200 Subject: [PATCH 06/10] metadata: update description --- src/metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/metadata.json b/src/metadata.json index 52f1b6254..e85268a7b 100644 --- a/src/metadata.json +++ b/src/metadata.json @@ -9,7 +9,7 @@ } ], "Category": "Appearance", - "Description": "Blurs the background behind user-specified windows", + "Description": "Fork of the KWin Blur effect for KDE Plasma 6 with force blur and more", "EnabledByDefault": false, "License": "GPL", "Name": "Better Blur (formerly Force Blur)" From 5b168f1a8b5f59641db6e4a3b82776b1ba12567c Mon Sep 17 00:00:00 2001 From: taj-ny <79316397+taj-ny@users.noreply.github.com> Date: Tue, 13 Aug 2024 18:51:15 +0200 Subject: [PATCH 07/10] readme: update --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 66b3fcea1..5001a9dd7 100644 --- a/README.md +++ b/README.md @@ -22,13 +22,13 @@ Fixes for blur-related Plasma bugs that haven't been patched yet.
NixOS (flakes)
- + ``flake.nix``: ```nix { inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - + kwin-effects-forceblur = { url = "github:taj-ny/kwin-effects-forceblur"; inputs.nixpkgs.follows = "nixpkgs"; @@ -36,10 +36,10 @@ Fixes for blur-related Plasma bugs that haven't been patched yet. }; } ``` - + ```nix { inputs, pkgs, ... }: - + { environment.systemPackages = [ inputs.kwin-effects-forceblur.packages.${pkgs.system}.default @@ -107,7 +107,7 @@ sudo make install Remove the *build* directory when rebuilding the effect. # Usage -> [!NOTE] +> [!NOTE] > If the effect stops working after a system upgrade, you will need to rebuild it. This effect will conflict with the stock blur effect and any other forks of it. @@ -115,10 +115,10 @@ This effect will conflict with the stock blur effect and any other forks of it. 1. Install the plugin. 2. Open the *Desktop Effects* page in *System Settings*. 3. Disable any blur effects. -4. Enable the *Force Blur* effect. +4. Enable the *Better Blur* effect. For more detailed descriptions of some options, check out [this wiki page](https://github.com/taj-ny/kwin-effects-forceblur/wiki/Configuration). - + ### Window transparency The window needs to be translucent in order for the blur to be visible. This can be done in multiple ways: - Use a transparent theme for the program if it supports it From c9a17d610faaa6058d9e99d7653fb64cde87c724 Mon Sep 17 00:00:00 2001 From: taj-ny <79316397+taj-ny@users.noreply.github.com> Date: Tue, 13 Aug 2024 18:53:26 +0200 Subject: [PATCH 08/10] {flake,package}.nix: update description --- flake.nix | 2 +- package.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index a0c0bb05e..d8ae15bd7 100644 --- a/flake.nix +++ b/flake.nix @@ -1,5 +1,5 @@ { - description = "Fork of the KWin Blur effect for KDE Plasma 6 with force blur and more"; + description = "Fork of the KWin Blur effect for KDE Plasma 6 with additional features (including force blur) and bug fixes"; inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; diff --git a/package.nix b/package.nix index c445b7445..f28a9dfae 100644 --- a/package.nix +++ b/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "Fork of the KWin Blur effect for KDE Plasma 6 with force blur and more"; + description = "Fork of the KWin Blur effect for KDE Plasma 6 with additional features (including force blur) and bug fixes"; license = licenses.gpl3; homepage = "https://github.com/taj-ny/kwin-effects-forceblur"; }; From 95e0de84dc919350e745f08846ee6fea9ac5d240 Mon Sep 17 00:00:00 2001 From: taj-ny <79316397+taj-ny@users.noreply.github.com> Date: Tue, 13 Aug 2024 18:54:50 +0200 Subject: [PATCH 09/10] readme: update --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5001a9dd7..408c15c7d 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # KWin Better Blur [![AUR Version](https://img.shields.io/aur/version/kwin-effects-forceblur)](https://aur.archlinux.org/packages/kwin-effects-forceblur) -Better Blur (formerly kwin-effects-forceblur) is a fork of the KWin Blur effect with several improvements and bug fixes. +Better Blur (formerly kwin-effects-forceblur) is a fork the KWin Blur effect for KDE Plasma 6 with additional features and bug fixes. Latest features are available on the ``develop`` branch. From c61495777804585ef5613d1cccbff0c40e5fae0d Mon Sep 17 00:00:00 2001 From: taj-ny <79316397+taj-ny@users.noreply.github.com> Date: Tue, 13 Aug 2024 18:55:34 +0200 Subject: [PATCH 10/10] blur.cpp: fix effect id for logging --- src/blur.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/blur.cpp b/src/blur.cpp index 50dcfe13a..1b838eaca 100644 --- a/src/blur.cpp +++ b/src/blur.cpp @@ -37,7 +37,7 @@ #include -Q_LOGGING_CATEGORY(KWIN_BLUR, "kwin_better_blur_forceblur", QtWarningMsg) +Q_LOGGING_CATEGORY(KWIN_BLUR, "kwin_better_blur", QtWarningMsg) static void ensureResources() {