From 8facd0cf682e59d25f4387d9d24f325920c555f0 Mon Sep 17 00:00:00 2001
From: "Peter F. Patel-Schneider" <pfpschneider@gmail.com>
Date: Wed, 14 Feb 2024 15:14:16 -0500
Subject: [PATCH] dist: rename light icons and install them in correct place

---
 lib/solaar/ui/icons.py                              |   2 +-
 setup.py                                            |   2 +-
 .../icons/{light_000.png => solaar-light_000.png}   | Bin
 .../icons/{light_020.png => solaar-light_020.png}   | Bin
 .../icons/{light_040.png => solaar-light_040.png}   | Bin
 .../icons/{light_060.png => solaar-light_060.png}   | Bin
 .../icons/{light_080.png => solaar-light_080.png}   | Bin
 .../icons/{light_100.png => solaar-light_100.png}   | Bin
 .../{light_unknown.png => solaar-light_unknown.png} | Bin
 9 files changed, 2 insertions(+), 2 deletions(-)
 rename share/solaar/icons/{light_000.png => solaar-light_000.png} (100%)
 rename share/solaar/icons/{light_020.png => solaar-light_020.png} (100%)
 rename share/solaar/icons/{light_040.png => solaar-light_040.png} (100%)
 rename share/solaar/icons/{light_060.png => solaar-light_060.png} (100%)
 rename share/solaar/icons/{light_080.png => solaar-light_080.png} (100%)
 rename share/solaar/icons/{light_100.png => solaar-light_100.png} (100%)
 rename share/solaar/icons/{light_unknown.png => solaar-light_unknown.png} (100%)

diff --git a/lib/solaar/ui/icons.py b/lib/solaar/ui/icons.py
index 59772954..4c258cc9 100644
--- a/lib/solaar/ui/icons.py
+++ b/lib/solaar/ui/icons.py
@@ -101,7 +101,7 @@ def _battery_icon_name(level, charging):
 def lux(level=None):
     if level is None or level < 0:
         return 'light_unknown'
-    return 'light_%03d' % (20 * ((level + 50) // 100))
+    return 'solaar-light_%03d' % (20 * ((level + 50) // 100))
 
 
 #
diff --git a/setup.py b/setup.py
index 603180d6..5f28ea19 100755
--- a/setup.py
+++ b/setup.py
@@ -32,7 +32,7 @@ def _data_files():
     from os.path import dirname as _dirname
 
     yield 'share/icons/hicolor/scalable/apps', _glob('share/solaar/icons/solaar*.svg')
-    yield 'share/icons/hicolor/scalable/apps', _glob('share/solaar/icons/light_*.png')
+    yield 'share/icons/hicolor/32x32/apps', _glob('share/solaar/icons/light_*.png')
 
     for mo in _glob('share/locale/*/LC_MESSAGES/solaar.mo'):
         yield _dirname(mo), [mo]
diff --git a/share/solaar/icons/light_000.png b/share/solaar/icons/solaar-light_000.png
similarity index 100%
rename from share/solaar/icons/light_000.png
rename to share/solaar/icons/solaar-light_000.png
diff --git a/share/solaar/icons/light_020.png b/share/solaar/icons/solaar-light_020.png
similarity index 100%
rename from share/solaar/icons/light_020.png
rename to share/solaar/icons/solaar-light_020.png
diff --git a/share/solaar/icons/light_040.png b/share/solaar/icons/solaar-light_040.png
similarity index 100%
rename from share/solaar/icons/light_040.png
rename to share/solaar/icons/solaar-light_040.png
diff --git a/share/solaar/icons/light_060.png b/share/solaar/icons/solaar-light_060.png
similarity index 100%
rename from share/solaar/icons/light_060.png
rename to share/solaar/icons/solaar-light_060.png
diff --git a/share/solaar/icons/light_080.png b/share/solaar/icons/solaar-light_080.png
similarity index 100%
rename from share/solaar/icons/light_080.png
rename to share/solaar/icons/solaar-light_080.png
diff --git a/share/solaar/icons/light_100.png b/share/solaar/icons/solaar-light_100.png
similarity index 100%
rename from share/solaar/icons/light_100.png
rename to share/solaar/icons/solaar-light_100.png
diff --git a/share/solaar/icons/light_unknown.png b/share/solaar/icons/solaar-light_unknown.png
similarity index 100%
rename from share/solaar/icons/light_unknown.png
rename to share/solaar/icons/solaar-light_unknown.png