From a461bf400fae30ed513e97adfa7ac741cdf6e0c7 Mon Sep 17 00:00:00 2001
From: Kat Inskip <kat@inskip.me>
Date: Mon, 5 Feb 2024 19:28:12 -0800
Subject: [PATCH] feat: kde fixes, icon, logging

---
 konawall/environments/kde.py |  55 ++++++++++++++++++++++++++++++-----
 konawall/gui.py              |  18 ++++++++----
 konawall/icon.png            | Bin 0 -> 3205 bytes
 package.nix                  |   2 +-
 setup.py                     |   4 ++-
 5 files changed, 64 insertions(+), 15 deletions(-)
 create mode 100644 konawall/icon.png

diff --git a/konawall/environments/kde.py b/konawall/environments/kde.py
index e7bbd79..797beed 100644
--- a/konawall/environments/kde.py
+++ b/konawall/environments/kde.py
@@ -1,16 +1,55 @@
 import subprocess
+import dbus
 from konawall.module_loader import add_environment
 
+# https://powersnail.com/2023/set-plasma-wallpaper/
+
+SCRIPT_GET_DESKTOPS = """
+function getDesktops() {
+    return desktops()
+        .filter(d => d.screen != -1)
+        .sort((a, b) => screenGeometry(a.screen).left - screenGeometry(b.screen).left);
+}
+"""
+
+SCRIPT_SET_WALLPAPER = """
+function setWallpaper(desktop, path) {
+    desktop.wallpaperPlugin = "org.kde.image"
+    desktop.currentConfigGroup = Array("Wallpaper", "org.kde.image", "General")
+    desktop.writeConfig("Image", path)
+}
+"""
+
+SCRIPT_ALL = f"""
+{SCRIPT_GET_DESKTOPS}
+{SCRIPT_SET_WALLPAPER}
+const imageList = IMAGE_LIST;
+getDesktops().forEach((desktop, i) => setWallpaper(desktop, imageList[i % imageList.length]));
+"""
+
+
+SCRIPT_ONE = f"""
+{SCRIPT_GET_DESKTOPS}
+{SCRIPT_SET_WALLPAPER}
+setWallpaper(getDesktops()[DESKTOP_ID], IMAGE);
+"""
 """
 This sets the wallpaper on KDE.
 """
+
+def quote(s):
+    return "'" + s + "'"
+
+def plasma_dbus():
+    bus = dbus.SessionBus()
+    plasma = dbus.Interface(
+        bus.get_object("org.kde.plasmashell", "/PlasmaShell"), dbus_interface="org.kde.PlasmaShell"
+    )
+    return plasma
+
+
 @add_environment("kde_setter")
 def set_wallpapers(files: list, displays: list):
-    for file in files:
-        kde_script = f"""
-        for (const desktop of desktops()) {{
-            desktop.currentConfigGroup = ["Wallpaper", "org.kde.image", "General"]
-            desktop.writeConfig("Image", "{file}")
-        }}
-        """
-        subprocess.run(["qdbus", "org.kde.plasmashell", "/PlasmaShell", "org.kde.PlasmaShell.evaluateScript", kde_script])
\ No newline at end of file
+    image_list_string = "[" + ",".join(quote(p) for p in files) + "]"
+    script = SCRIPT_ALL.replace("IMAGE_LIST", image_list_string)
+    plasma_dbus().evaluateScript(script)
\ No newline at end of file
diff --git a/konawall/gui.py b/konawall/gui.py
index ca58520..4df3fef 100755
--- a/konawall/gui.py
+++ b/konawall/gui.py
@@ -70,10 +70,7 @@ class Konawall(wx.adv.TaskBarIcon):
         height = 128
 
         # Missing texture style, magenta and black checkerboard
-        image = Image.new('RGB', (width, height), (0, 0, 0))
-        dc = ImageDraw.Draw(image)
-        dc.rectangle((0, 0, width//2, height//2), fill=(255, 0, 255))
-        dc.rectangle((width//2, height//2, width, height), fill=(255, 0, 255))
+        image = Image.open(os.path.join(os.path.dirname(__file__), 'icon.png'))
         if "wxMSW" in wx.PlatformInfo:
             image = image.resize((16, 16))
         elif "wxGTK" in wx.PlatformInfo:
@@ -331,7 +328,18 @@ def main():
     except:
         version = "testing version"
 
-    file_logger = logging.FileHandler("app.log", mode="a")
+    if wx.Platform == "__WXGTK__":
+        from xdg_base_dirs import xdg_config_home
+        log_path = os.path.join(xdg_config_home(), "konawall", "log.toml") 
+    if wx.Platform == "__WXMAC__":
+        log_path_string = "~/Library/Application Support/konawall/log.toml"
+        log_path = os.path.expanduser(log_path_string)
+    elif wx.Platform == "__WXMSW__":
+        log_path_string = "%APPDATA%\\konawall\\log.toml"
+        log_path = os.path.expandvars(log_path_string)
+    else:
+        log_path = os.path.join(os.path.expanduser("~"), ".config", "konawall", "log.toml")
+    file_logger = logging.FileHandler(log_path, mode="a")
     console_logger = logging.StreamHandler()
     logging.basicConfig(
         level=logging.DEBUG,
diff --git a/konawall/icon.png b/konawall/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..a21660e78d205e4b1c829d00ac1fec7ba0cdb62d
GIT binary patch
literal 3205
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

literal 0
HcmV?d00001

diff --git a/package.nix b/package.nix
index 5bd3f02..8e151db 100644
--- a/package.nix
+++ b/package.nix
@@ -18,7 +18,7 @@ in
     doCheck = false;
 
     propagatedBuildInputs = let
-      dependencyNames = lib.attrNames poetryBlock.dependencies;
+      dependencyNames = (lib.attrNames poetryBlock.dependencies) ++ ["dbus-python"];
       dependencies = map (name: python311Packages.${name} or dependencyReplacements.${name}) dependencyNames;
     in
       dependencies;
diff --git a/setup.py b/setup.py
index 92639b3..9e4e7b0 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,4 @@
-from setuptools import setup
+from setuptools import setup, find_packages
 
 with open("README.MD", "r") as f:
     long_description = f.read()
@@ -16,6 +16,8 @@ setup(
     author_email = poetryBlock["authors"][0].split(" <")[1][:-1],
     description = poetryBlock["description"],
     long_description = long_description,
+    package_data={'': ['*.png', '*.jpg', '*.jpeg', '*.gif', '*.bmp', '*.tiff', '*.webp']},
+    include_package_data=True,
     entry_points = {
         "console_scripts": [
             "konawall = konawall.gui:main",