From a4fd9ef38976a723a11bb06511a7fdc91e7ce560 Mon Sep 17 00:00:00 2001
From: Alice Gaudon <alice@gaudon.pro>
Date: Thu, 30 Jan 2020 00:57:08 +0100
Subject: [PATCH] Make icons white by default and add setting for power menu
 icons color

---
 assets/icons/lock.svg       | 2 +-
 assets/icons/log-out.svg    | 2 +-
 assets/icons/power.svg      | 2 +-
 assets/icons/refresh-cw.svg | 2 +-
 assets/icons/volume-1.svg   | 2 +-
 assets/icons/volume-2.svg   | 2 +-
 assets/icons/volume-x.svg   | 2 +-
 assets/icons/volume.svg     | 2 +-
 default_theme.lua           | 4 ++++
 simple/init.lua             | 9 +++++----
 10 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/assets/icons/lock.svg b/assets/icons/lock.svg
index de09d9d..5615662 100644
--- a/assets/icons/lock.svg
+++ b/assets/icons/lock.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-lock"><rect x="3" y="11" width="18" height="11" rx="2" ry="2"></rect><path d="M7 11V7a5 5 0 0 1 10 0v4"></path></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-lock"><rect x="3" y="11" width="18" height="11" rx="2" ry="2"></rect><path d="M7 11V7a5 5 0 0 1 10 0v4"></path></svg>
\ No newline at end of file
diff --git a/assets/icons/log-out.svg b/assets/icons/log-out.svg
index c9002c9..e25a96d 100644
--- a/assets/icons/log-out.svg
+++ b/assets/icons/log-out.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-log-out"><path d="M9 21H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h4"></path><polyline points="16 17 21 12 16 7"></polyline><line x1="21" y1="12" x2="9" y2="12"></line></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-log-out"><path d="M9 21H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h4"></path><polyline points="16 17 21 12 16 7"></polyline><line x1="21" y1="12" x2="9" y2="12"></line></svg>
\ No newline at end of file
diff --git a/assets/icons/power.svg b/assets/icons/power.svg
index 598308f..fccb63a 100644
--- a/assets/icons/power.svg
+++ b/assets/icons/power.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-power"><path d="M18.36 6.64a9 9 0 1 1-12.73 0"></path><line x1="12" y1="2" x2="12" y2="12"></line></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-power"><path d="M18.36 6.64a9 9 0 1 1-12.73 0"></path><line x1="12" y1="2" x2="12" y2="12"></line></svg>
\ No newline at end of file
diff --git a/assets/icons/refresh-cw.svg b/assets/icons/refresh-cw.svg
index 06c358d..dcf8d08 100644
--- a/assets/icons/refresh-cw.svg
+++ b/assets/icons/refresh-cw.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-refresh-cw"><polyline points="23 4 23 10 17 10"></polyline><polyline points="1 20 1 14 7 14"></polyline><path d="M3.51 9a9 9 0 0 1 14.85-3.36L23 10M1 14l4.64 4.36A9 9 0 0 0 20.49 15"></path></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-refresh-cw"><polyline points="23 4 23 10 17 10"></polyline><polyline points="1 20 1 14 7 14"></polyline><path d="M3.51 9a9 9 0 0 1 14.85-3.36L23 10M1 14l4.64 4.36A9 9 0 0 0 20.49 15"></path></svg>
\ No newline at end of file
diff --git a/assets/icons/volume-1.svg b/assets/icons/volume-1.svg
index 150e875..d04f1a5 100644
--- a/assets/icons/volume-1.svg
+++ b/assets/icons/volume-1.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-volume-1"><polygon points="11 5 6 9 2 9 2 15 6 15 11 19 11 5"></polygon><path d="M15.54 8.46a5 5 0 0 1 0 7.07"></path></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-volume-1"><polygon points="11 5 6 9 2 9 2 15 6 15 11 19 11 5"></polygon><path d="M15.54 8.46a5 5 0 0 1 0 7.07"></path></svg>
\ No newline at end of file
diff --git a/assets/icons/volume-2.svg b/assets/icons/volume-2.svg
index 03d521c..040677d 100644
--- a/assets/icons/volume-2.svg
+++ b/assets/icons/volume-2.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-volume-2"><polygon points="11 5 6 9 2 9 2 15 6 15 11 19 11 5"></polygon><path d="M19.07 4.93a10 10 0 0 1 0 14.14M15.54 8.46a5 5 0 0 1 0 7.07"></path></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-volume-2"><polygon points="11 5 6 9 2 9 2 15 6 15 11 19 11 5"></polygon><path d="M19.07 4.93a10 10 0 0 1 0 14.14M15.54 8.46a5 5 0 0 1 0 7.07"></path></svg>
\ No newline at end of file
diff --git a/assets/icons/volume-x.svg b/assets/icons/volume-x.svg
index be44240..55baf50 100644
--- a/assets/icons/volume-x.svg
+++ b/assets/icons/volume-x.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-volume-x"><polygon points="11 5 6 9 2 9 2 15 6 15 11 19 11 5"></polygon><line x1="23" y1="9" x2="17" y2="15"></line><line x1="17" y1="9" x2="23" y2="15"></line></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-volume-x"><polygon points="11 5 6 9 2 9 2 15 6 15 11 19 11 5"></polygon><line x1="23" y1="9" x2="17" y2="15"></line><line x1="17" y1="9" x2="23" y2="15"></line></svg>
\ No newline at end of file
diff --git a/assets/icons/volume.svg b/assets/icons/volume.svg
index 53bfe15..a850d82 100644
--- a/assets/icons/volume.svg
+++ b/assets/icons/volume.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-volume"><polygon points="11 5 6 9 2 9 2 15 6 15 11 19 11 5"></polygon></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-volume"><polygon points="11 5 6 9 2 9 2 15 6 15 11 19 11 5"></polygon></svg>
\ No newline at end of file
diff --git a/default_theme.lua b/default_theme.lua
index 5b9644d..7e326f7 100644
--- a/default_theme.lua
+++ b/default_theme.lua
@@ -193,6 +193,10 @@ theme.volume_osd_icon_1 = simple_awesome_path .. "/assets/icons/volume.svg"
 theme.volume_osd_icon_2 = simple_awesome_path .. "/assets/icons/volume-1.svg"
 theme.volume_osd_icon_3 = simple_awesome_path .. "/assets/icons/volume-2.svg"
 
+
+-- Power Menu
+theme.power_menu_icon_color = "#ffffff"
+
 return theme
 
 -- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/simple/init.lua b/simple/init.lua
index 12ca733..ee9f4ca 100644
--- a/simple/init.lua
+++ b/simple/init.lua
@@ -148,6 +148,7 @@ end
 function lockScreen()
     awful.spawn(config.awesome.lock_command)
 end
+
 hotkey.registerKeys(hotkey.make(config.keys.global_keys.lock_screen, lockScreen,
     { description = "lock your screen", group = "awesome" }))
 
@@ -161,10 +162,10 @@ local launcher = awful.widget.button({
 launcher:buttons(gears.table.join(launcher:buttons(),
     awful.button({}, 1, nil, function() showAppLauncher(false) end)))
 
-shutdown_icon = awesome.load_image(awful.util.getdir("config") .. "/assets/icons/power.svg")
-restart_icon = awesome.load_image(awful.util.getdir("config") .. "/assets/icons/refresh-cw.svg")
-logout_icon = awesome.load_image(awful.util.getdir("config") .. "/assets/icons/log-out.svg")
-lock_icon = awesome.load_image(awful.util.getdir("config") .. "/assets/icons/lock.svg")
+shutdown_icon = gears.color.recolor_image(awful.util.getdir("config") .. "/assets/icons/power.svg", beautiful.power_menu_icon_color)
+restart_icon = gears.color.recolor_image(awful.util.getdir("config") .. "/assets/icons/refresh-cw.svg", beautiful.power_menu_icon_color)
+logout_icon = gears.color.recolor_image(awful.util.getdir("config") .. "/assets/icons/log-out.svg", beautiful.power_menu_icon_color)
+lock_icon = gears.color.recolor_image(awful.util.getdir("config") .. "/assets/icons/lock.svg", beautiful.power_menu_icon_color)
 
 os_menu = awful.widget.launcher({
     image = beautiful.awesome_icon,