From bd604e4f916c0d347633eb852b71beb1243ae223 Mon Sep 17 00:00:00 2001 From: Yessiest Date: Thu, 18 Nov 2021 02:03:04 +0400 Subject: [PATCH] The Great Restrucute Pt. 1: The restructurening --- core/layout.lua | 1 + core/vars.lua | 1 + libs/thumbnail.lua | 21 ++ rc.lua | 3 +- themes/icons.lua | 55 ++++ themes/redmond98/assets/redmond98borders.svg | 204 -------------- themes/redmond98/assets/win98bordersv1.svg | 71 ----- .../redmond98/assets/win98bordersv1layer2.svg | 71 ----- .../battery-caution-charging-symbolic.svg | 12 - .../icons/battery-caution-symbolic.svg | 9 - .../icons/battery-empty-charging-symbolic.svg | 12 - .../icons/battery-empty-symbolic.svg | 9 - .../icons/battery-full-charged-symbolic.svg | 70 ----- .../icons/battery-full-charging-symbolic.svg | 69 ----- .../redmond98/icons/battery-full-symbolic.svg | 62 ---- .../icons/battery-good-charging-symbolic.svg | 69 ----- .../redmond98/icons/battery-good-symbolic.svg | 62 ---- .../icons/battery-low-charging-symbolic.svg | 71 ----- .../redmond98/icons/battery-low-symbolic.svg | 62 ---- .../icons/battery-missing-symbolic.svg | 69 ----- themes/redmond98/icons/lock.svg | 12 - themes/redmond98/icons/shutdown.svg | 12 - themes/redmond98/icons/suspend.svg | 13 - themes/redmond98/icons/volume-high.svg | 15 - themes/redmond98/icons/volume-low.svg | 14 - themes/redmond98/icons/volume-medium.svg | 15 - themes/redmond98/icons/volume-muted.svg | 23 -- themes/redmond98/layouts/cornerne.png | Bin 272 -> 0 bytes themes/redmond98/layouts/cornernew.png | Bin 272 -> 0 bytes themes/redmond98/layouts/cornernw.png | Bin 263 -> 0 bytes themes/redmond98/layouts/cornernww.png | Bin 264 -> 0 bytes themes/redmond98/layouts/cornerse.png | Bin 264 -> 0 bytes themes/redmond98/layouts/cornersew.png | Bin 264 -> 0 bytes themes/redmond98/layouts/cornersw.png | Bin 263 -> 0 bytes themes/redmond98/layouts/cornersww.png | Bin 264 -> 0 bytes themes/redmond98/layouts/dwindle.png | Bin 320 -> 0 bytes themes/redmond98/layouts/dwindlew.png | Bin 320 -> 0 bytes themes/redmond98/layouts/fairh.png | Bin 245 -> 0 bytes themes/redmond98/layouts/fairhw.png | Bin 245 -> 0 bytes themes/redmond98/layouts/fairv.png | Bin 246 -> 0 bytes themes/redmond98/layouts/fairvw.png | Bin 246 -> 0 bytes themes/redmond98/layouts/floating.png | Bin 282 -> 0 bytes themes/redmond98/layouts/floatingw.png | Bin 282 -> 0 bytes themes/redmond98/layouts/fullscreen.png | Bin 866 -> 0 bytes themes/redmond98/layouts/fullscreenw.png | Bin 865 -> 0 bytes themes/redmond98/layouts/magnifier.png | Bin 345 -> 0 bytes themes/redmond98/layouts/magnifierw.png | Bin 345 -> 0 bytes themes/redmond98/layouts/max.png | Bin 574 -> 0 bytes themes/redmond98/layouts/maxw.png | Bin 581 -> 0 bytes themes/redmond98/layouts/spiral.png | Bin 328 -> 0 bytes themes/redmond98/layouts/spiralw.png | Bin 328 -> 0 bytes themes/redmond98/layouts/tile.png | Bin 265 -> 0 bytes themes/redmond98/layouts/tilebottom.png | Bin 264 -> 0 bytes themes/redmond98/layouts/tilebottomw.png | Bin 264 -> 0 bytes themes/redmond98/layouts/tileleft.png | Bin 266 -> 0 bytes themes/redmond98/layouts/tileleftw.png | Bin 266 -> 0 bytes themes/redmond98/layouts/tiletop.png | Bin 260 -> 0 bytes themes/redmond98/layouts/tiletopw.png | Bin 265 -> 0 bytes themes/redmond98/layouts/tilew.png | Bin 265 -> 0 bytes themes/redmond98/submenu.png | Bin 440 -> 0 bytes themes/redmond98/taglist/squarefw.png | Bin 187 -> 0 bytes themes/redmond98/taglist/squarew.png | Bin 193 -> 0 bytes themes/redmond98/theme.lua | 264 ------------------ themes/redmond98/titlebar/close_focus.png | Bin 966 -> 0 bytes themes/redmond98/titlebar/close_normal.png | Bin 966 -> 0 bytes .../titlebar/floating_focus_active.png | Bin 386 -> 0 bytes .../titlebar/floating_focus_inactive.png | Bin 237 -> 0 bytes .../titlebar/floating_normal_active.png | Bin 386 -> 0 bytes .../titlebar/floating_normal_inactive.png | Bin 237 -> 0 bytes .../titlebar/maximized_focus_active.png | Bin 480 -> 0 bytes .../titlebar/maximized_focus_inactive.png | Bin 452 -> 0 bytes .../titlebar/maximized_normal_active.png | Bin 480 -> 0 bytes .../titlebar/maximized_normal_inactive.png | Bin 452 -> 0 bytes themes/redmond98/titlebar/minimize_focus.png | Bin 234 -> 0 bytes themes/redmond98/titlebar/minimize_normal.png | Bin 225 -> 0 bytes .../redmond98/titlebar/ontop_focus_active.png | Bin 467 -> 0 bytes .../titlebar/ontop_focus_inactive.png | Bin 604 -> 0 bytes .../titlebar/ontop_normal_active.png | Bin 467 -> 0 bytes .../titlebar/ontop_normal_inactive.png | Bin 604 -> 0 bytes .../titlebar/sticky_focus_active.png | Bin 654 -> 0 bytes .../titlebar/sticky_focus_inactive.png | Bin 758 -> 0 bytes .../titlebar/sticky_normal_active.png | Bin 654 -> 0 bytes .../titlebar/sticky_normal_inactive.png | Bin 758 -> 0 bytes themes/unity2/icons/README.md | 5 + themes/unity2/icons/mail.svg | 167 +++++++++++ themes/unity2/icons/wallpaper.svg | 127 +++++++++ themes/unity2/theme.lua | 112 +++----- widgets/battery.lua | 12 +- widgets/{mailbox/init.lua => mailbox.lua} | 9 +- widgets/mailbox/Mail.png | Bin 5118 -> 0 bytes widgets/volume.lua | 4 - .../{wallpapers/init.lua => wallpapers.lua} | 28 +- widgets/wallpapers/wallpaper-icon.png | Bin 13478 -> 0 bytes 93 files changed, 440 insertions(+), 1395 deletions(-) create mode 100644 libs/thumbnail.lua create mode 100644 themes/icons.lua delete mode 100644 themes/redmond98/assets/redmond98borders.svg delete mode 100644 themes/redmond98/assets/win98bordersv1.svg delete mode 100644 themes/redmond98/assets/win98bordersv1layer2.svg delete mode 100644 themes/redmond98/icons/battery-caution-charging-symbolic.svg delete mode 100644 themes/redmond98/icons/battery-caution-symbolic.svg delete mode 100644 themes/redmond98/icons/battery-empty-charging-symbolic.svg delete mode 100644 themes/redmond98/icons/battery-empty-symbolic.svg delete mode 100644 themes/redmond98/icons/battery-full-charged-symbolic.svg delete mode 100644 themes/redmond98/icons/battery-full-charging-symbolic.svg delete mode 100644 themes/redmond98/icons/battery-full-symbolic.svg delete mode 100644 themes/redmond98/icons/battery-good-charging-symbolic.svg delete mode 100644 themes/redmond98/icons/battery-good-symbolic.svg delete mode 100644 themes/redmond98/icons/battery-low-charging-symbolic.svg delete mode 100644 themes/redmond98/icons/battery-low-symbolic.svg delete mode 100644 themes/redmond98/icons/battery-missing-symbolic.svg delete mode 100644 themes/redmond98/icons/lock.svg delete mode 100644 themes/redmond98/icons/shutdown.svg delete mode 100644 themes/redmond98/icons/suspend.svg delete mode 100644 themes/redmond98/icons/volume-high.svg delete mode 100644 themes/redmond98/icons/volume-low.svg delete mode 100644 themes/redmond98/icons/volume-medium.svg delete mode 100644 themes/redmond98/icons/volume-muted.svg delete mode 100644 themes/redmond98/layouts/cornerne.png delete mode 100644 themes/redmond98/layouts/cornernew.png delete mode 100644 themes/redmond98/layouts/cornernw.png delete mode 100644 themes/redmond98/layouts/cornernww.png delete mode 100644 themes/redmond98/layouts/cornerse.png delete mode 100644 themes/redmond98/layouts/cornersew.png delete mode 100644 themes/redmond98/layouts/cornersw.png delete mode 100644 themes/redmond98/layouts/cornersww.png delete mode 100644 themes/redmond98/layouts/dwindle.png delete mode 100644 themes/redmond98/layouts/dwindlew.png delete mode 100644 themes/redmond98/layouts/fairh.png delete mode 100644 themes/redmond98/layouts/fairhw.png delete mode 100644 themes/redmond98/layouts/fairv.png delete mode 100644 themes/redmond98/layouts/fairvw.png delete mode 100644 themes/redmond98/layouts/floating.png delete mode 100644 themes/redmond98/layouts/floatingw.png delete mode 100644 themes/redmond98/layouts/fullscreen.png delete mode 100644 themes/redmond98/layouts/fullscreenw.png delete mode 100644 themes/redmond98/layouts/magnifier.png delete mode 100644 themes/redmond98/layouts/magnifierw.png delete mode 100644 themes/redmond98/layouts/max.png delete mode 100644 themes/redmond98/layouts/maxw.png delete mode 100644 themes/redmond98/layouts/spiral.png delete mode 100644 themes/redmond98/layouts/spiralw.png delete mode 100644 themes/redmond98/layouts/tile.png delete mode 100644 themes/redmond98/layouts/tilebottom.png delete mode 100644 themes/redmond98/layouts/tilebottomw.png delete mode 100644 themes/redmond98/layouts/tileleft.png delete mode 100644 themes/redmond98/layouts/tileleftw.png delete mode 100644 themes/redmond98/layouts/tiletop.png delete mode 100644 themes/redmond98/layouts/tiletopw.png delete mode 100644 themes/redmond98/layouts/tilew.png delete mode 100644 themes/redmond98/submenu.png delete mode 100644 themes/redmond98/taglist/squarefw.png delete mode 100644 themes/redmond98/taglist/squarew.png delete mode 100644 themes/redmond98/theme.lua delete mode 100644 themes/redmond98/titlebar/close_focus.png delete mode 100644 themes/redmond98/titlebar/close_normal.png delete mode 100644 themes/redmond98/titlebar/floating_focus_active.png delete mode 100644 themes/redmond98/titlebar/floating_focus_inactive.png delete mode 100644 themes/redmond98/titlebar/floating_normal_active.png delete mode 100644 themes/redmond98/titlebar/floating_normal_inactive.png delete mode 100644 themes/redmond98/titlebar/maximized_focus_active.png delete mode 100644 themes/redmond98/titlebar/maximized_focus_inactive.png delete mode 100644 themes/redmond98/titlebar/maximized_normal_active.png delete mode 100644 themes/redmond98/titlebar/maximized_normal_inactive.png delete mode 100644 themes/redmond98/titlebar/minimize_focus.png delete mode 100644 themes/redmond98/titlebar/minimize_normal.png delete mode 100644 themes/redmond98/titlebar/ontop_focus_active.png delete mode 100644 themes/redmond98/titlebar/ontop_focus_inactive.png delete mode 100644 themes/redmond98/titlebar/ontop_normal_active.png delete mode 100644 themes/redmond98/titlebar/ontop_normal_inactive.png delete mode 100644 themes/redmond98/titlebar/sticky_focus_active.png delete mode 100644 themes/redmond98/titlebar/sticky_focus_inactive.png delete mode 100644 themes/redmond98/titlebar/sticky_normal_active.png delete mode 100644 themes/redmond98/titlebar/sticky_normal_inactive.png create mode 100644 themes/unity2/icons/README.md create mode 100644 themes/unity2/icons/mail.svg create mode 100644 themes/unity2/icons/wallpaper.svg rename widgets/{mailbox/init.lua => mailbox.lua} (92%) delete mode 100644 widgets/mailbox/Mail.png rename widgets/{wallpapers/init.lua => wallpapers.lua} (78%) delete mode 100644 widgets/wallpapers/wallpaper-icon.png diff --git a/core/layout.lua b/core/layout.lua index f5e782c..9cc1de1 100644 --- a/core/layout.lua +++ b/core/layout.lua @@ -55,6 +55,7 @@ awful.screen.connect_for_each_screen(function(s) bg = beautiful.topbar_bg }) -- Add screen lock + require("widgets.lock")({screen = s, obscure = true}) require("widgets.unitybar")(s,{ top_widgets = { require("widgets.polytasklist")({ diff --git a/core/vars.lua b/core/vars.lua index 7f2cb9f..d7bc1cb 100644 --- a/core/vars.lua +++ b/core/vars.lua @@ -4,6 +4,7 @@ local gears = require("gears") global = {} global.awesome_dir = os.getenv("HOME").."/.config/awesome/" global.config_dir = os.getenv("HOME").."/.awesome/" +global.themes_dir = os.getenv("HOME").."/.config/awesome/themes/" global.theme = global.awesome_dir .. "themes/unity2/theme.lua" global.terminal = "xterm" global.editor = os.getenv("EDITOR") or "vim" diff --git a/libs/thumbnail.lua b/libs/thumbnail.lua new file mode 100644 index 0000000..fdc792c --- /dev/null +++ b/libs/thumbnail.lua @@ -0,0 +1,21 @@ +-- A small utility function to generate thumbnails for images +local spawn = require("awful.spawn") +local thumbnailer = {} +thumbnailer.generate = function(path,thumb_path,height) + assert(type(path) == "string", "argumenr #1 (path) is not a string") + assert(type(thumb_path) == "string", "argument #2 (thumbnail path) is not a string") + assert(type(height) == "number","argument #3 (height) is not a number") + if os.execute("ls "..path) ~= 0 then + return false, "unable to access image directory" + end + if os.execute("ls "..thumb_path) == 0 then + return true + end + if os.execute("mkdir "..thumb_path) ~= 0 then + return false, "unable to create thumbnail directory" + end + spawn("mogrify -thumbnail x"..tostring(height).." -path '"..thumb_path.."' '"..path.."'/*.{jpg,png}") + return true +end + +return thumbnailer diff --git a/rc.lua b/rc.lua index 3604f35..ca08770 100644 --- a/rc.lua +++ b/rc.lua @@ -28,6 +28,7 @@ require("awful.hotkeys_popup.keys") require("core.error") require("core.vars") require("core.style") +require("themes.icons") require("core.binds") require("core.layout") require("core.rules") @@ -41,4 +42,4 @@ end) require("custom_binds") require("awesomerc") -require("powerman") +--require("powerman") diff --git a/themes/icons.lua b/themes/icons.lua new file mode 100644 index 0000000..e1b1a74 --- /dev/null +++ b/themes/icons.lua @@ -0,0 +1,55 @@ +-- Icons definitions for custom widgets +local beautiful = require("beautiful") +local beautiful_assets = require("beautiful").theme_assets +local gears = require("gears") +function beautiful.recolor_icon_group(tbl,regex,color) + for k,v in pairs(tbl) do + if k:match(regex) then + beautiful[k] = gears.color.recolor_image(v,color) + end + end +end +-- Define dir to icons +global.themes_dir = global.themes_dir or (os.getenv("HOME").."/.config/awesome/themes/") +beautiful.name = beautiful.name or "default" +beautiful.icon_dir = beautiful.icon_dir or global.themes_dir..beautiful.name.."/icons/" +print(beautiful.icon_dir) +-- Recolor icons +beautiful_assets.recolor_titlebar(beautiful,beautiful.fg_normal,"normal") +beautiful_assets.recolor_titlebar(beautiful,beautiful.fg_focus,"focus") +beautiful_assets.recolor_layout(beautiful,beautiful.fg_normal) +local temp = {} +-- Powermenu icons +temp.powercontrol_icon_shutdown = beautiful.icon_dir.."shutdown.svg" +temp.powercontrol_icon_suspend = beautiful.icon_dir.."suspend.svg" +temp.powercontrol_icon_lock = beautiful.icon_dir.."lock.svg" +beautiful.recolor_icon_group(temp,"^powercontrol_.+",beautiful.fg_normal) + + +-- Volume icons +temp.volume_icon_high = beautiful.icon_dir.."volume-high.svg" +temp.volume_icon_medium = beautiful.icon_dir.."volume-medium.svg" +temp.volume_icon_low = beautiful.icon_dir.."volume-low.svg" +temp.volume_icon_muted = beautiful.icon_dir.."volume-muted.svg" +beautiful.recolor_icon_group(temp,"^volume_.+",beautiful.fg_normal) + +-- Battery icons +temp.battery_caution_charging_symbolic = beautiful.icon_dir.."battery-caution-charging-symbolic.svg" +temp.battery_caution_symbolic = beautiful.icon_dir.."battery-caution-symbolic.svg" +temp.battery_empty_charging_symbolic = beautiful.icon_dir.."battery-empty-charging-symbolic.svg" +temp.battery_empty_symbolic = beautiful.icon_dir.."battery-empty-symbolic.svg" +temp.battery_full_charged_symbolic = beautiful.icon_dir.."battery-full-charged-symbolic.svg" +temp.battery_full_charging_symbolic = beautiful.icon_dir.."battery-full-charging-symbolic.svg" +temp.battery_full_symbolic = beautiful.icon_dir.."battery-full-symbolic.svg" +temp.battery_good_charging_symbolic = beautiful.icon_dir.."battery-good-charging-symbolic.svg" +temp.battery_good_symbolic = beautiful.icon_dir.."battery-good-symbolic.svg" +temp.battery_low_charging_symbolic = beautiful.icon_dir.."battery-low-charging-symbolic.svg" +temp.battery_low_symbolic = beautiful.icon_dir.."battery-low-symbolic.svg" +temp.battery_missing_symbolic = beautiful.icon_dir.."battery-missing-symbolic.svg" +beautiful.recolor_icon_group(temp,"^battery_.+",beautiful.fg_normal) + +-- Widget icons +beautiful.wallpapers_icon = gears.color.recolor_image(beautiful.icon_dir.."wallpaper.svg",beautiful.fg_normal) +beautiful.mailbox_icon = gears.color.recolor_image(beautiful.icon_dir.."mail.svg",beautiful.fg_normal) + + diff --git a/themes/redmond98/assets/redmond98borders.svg b/themes/redmond98/assets/redmond98borders.svg deleted file mode 100644 index 0d8530d..0000000 --- a/themes/redmond98/assets/redmond98borders.svg +++ /dev/null @@ -1,204 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/themes/redmond98/assets/win98bordersv1.svg b/themes/redmond98/assets/win98bordersv1.svg deleted file mode 100644 index 57d674b..0000000 --- a/themes/redmond98/assets/win98bordersv1.svg +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/themes/redmond98/assets/win98bordersv1layer2.svg b/themes/redmond98/assets/win98bordersv1layer2.svg deleted file mode 100644 index 315b4a1..0000000 --- a/themes/redmond98/assets/win98bordersv1layer2.svg +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/themes/redmond98/icons/battery-caution-charging-symbolic.svg b/themes/redmond98/icons/battery-caution-charging-symbolic.svg deleted file mode 100644 index 56fe444..0000000 --- a/themes/redmond98/icons/battery-caution-charging-symbolic.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - diff --git a/themes/redmond98/icons/battery-caution-symbolic.svg b/themes/redmond98/icons/battery-caution-symbolic.svg deleted file mode 100644 index 3fb7d4a..0000000 --- a/themes/redmond98/icons/battery-caution-symbolic.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - diff --git a/themes/redmond98/icons/battery-empty-charging-symbolic.svg b/themes/redmond98/icons/battery-empty-charging-symbolic.svg deleted file mode 100644 index e3e8620..0000000 --- a/themes/redmond98/icons/battery-empty-charging-symbolic.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - diff --git a/themes/redmond98/icons/battery-empty-symbolic.svg b/themes/redmond98/icons/battery-empty-symbolic.svg deleted file mode 100644 index 710c02b..0000000 --- a/themes/redmond98/icons/battery-empty-symbolic.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - diff --git a/themes/redmond98/icons/battery-full-charged-symbolic.svg b/themes/redmond98/icons/battery-full-charged-symbolic.svg deleted file mode 100644 index ae88a8c..0000000 --- a/themes/redmond98/icons/battery-full-charged-symbolic.svg +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/themes/redmond98/icons/battery-full-charging-symbolic.svg b/themes/redmond98/icons/battery-full-charging-symbolic.svg deleted file mode 100644 index 2db325e..0000000 --- a/themes/redmond98/icons/battery-full-charging-symbolic.svg +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/themes/redmond98/icons/battery-full-symbolic.svg b/themes/redmond98/icons/battery-full-symbolic.svg deleted file mode 100644 index 7daa418..0000000 --- a/themes/redmond98/icons/battery-full-symbolic.svg +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - diff --git a/themes/redmond98/icons/battery-good-charging-symbolic.svg b/themes/redmond98/icons/battery-good-charging-symbolic.svg deleted file mode 100644 index 0b54f56..0000000 --- a/themes/redmond98/icons/battery-good-charging-symbolic.svg +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/themes/redmond98/icons/battery-good-symbolic.svg b/themes/redmond98/icons/battery-good-symbolic.svg deleted file mode 100644 index b55a8e0..0000000 --- a/themes/redmond98/icons/battery-good-symbolic.svg +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - diff --git a/themes/redmond98/icons/battery-low-charging-symbolic.svg b/themes/redmond98/icons/battery-low-charging-symbolic.svg deleted file mode 100644 index 56fb9cc..0000000 --- a/themes/redmond98/icons/battery-low-charging-symbolic.svg +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/themes/redmond98/icons/battery-low-symbolic.svg b/themes/redmond98/icons/battery-low-symbolic.svg deleted file mode 100644 index ab50fc2..0000000 --- a/themes/redmond98/icons/battery-low-symbolic.svg +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - diff --git a/themes/redmond98/icons/battery-missing-symbolic.svg b/themes/redmond98/icons/battery-missing-symbolic.svg deleted file mode 100644 index f96c4b2..0000000 --- a/themes/redmond98/icons/battery-missing-symbolic.svg +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - diff --git a/themes/redmond98/icons/lock.svg b/themes/redmond98/icons/lock.svg deleted file mode 100644 index 974b65c..0000000 --- a/themes/redmond98/icons/lock.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - diff --git a/themes/redmond98/icons/shutdown.svg b/themes/redmond98/icons/shutdown.svg deleted file mode 100644 index affd2a5..0000000 --- a/themes/redmond98/icons/shutdown.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - diff --git a/themes/redmond98/icons/suspend.svg b/themes/redmond98/icons/suspend.svg deleted file mode 100644 index d64205d..0000000 --- a/themes/redmond98/icons/suspend.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - diff --git a/themes/redmond98/icons/volume-high.svg b/themes/redmond98/icons/volume-high.svg deleted file mode 100644 index 486ec0b..0000000 --- a/themes/redmond98/icons/volume-high.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - diff --git a/themes/redmond98/icons/volume-low.svg b/themes/redmond98/icons/volume-low.svg deleted file mode 100644 index 824a3f6..0000000 --- a/themes/redmond98/icons/volume-low.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/themes/redmond98/icons/volume-medium.svg b/themes/redmond98/icons/volume-medium.svg deleted file mode 100644 index 5e6dd1f..0000000 --- a/themes/redmond98/icons/volume-medium.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - diff --git a/themes/redmond98/icons/volume-muted.svg b/themes/redmond98/icons/volume-muted.svg deleted file mode 100644 index bf8f17a..0000000 --- a/themes/redmond98/icons/volume-muted.svg +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/themes/redmond98/layouts/cornerne.png b/themes/redmond98/layouts/cornerne.png deleted file mode 100644 index c85bd56a3ccc2cd058c1ebdaeb9d7a8fb683b644..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 272 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e&H|6fVxatW5N34Jm|X!BWH0gb zb!ETLD$CC=?c6u53@F4O;1l8sq;qp~&CJY{l$4%5d)D%1Z97nixg^Lhm|^yBr!{+K z1G$Vz-tI0e{TVj{ft(6Y7sn8f<8P;2D!DgUFQ zvtokxOW{S2gWicwl|Halckd!E=67*gS`Folk<++O?22{RB0Pi7@^9K5=Q~SScPO$I zW*k+>%syR_E9zh+d2j;LhJU^DH%s06&tS8w+3n&B{iwaM>cVFjj=J9!-3W98gQu&X J%Q~loCIF4@UM2tl diff --git a/themes/redmond98/layouts/cornernew.png b/themes/redmond98/layouts/cornernew.png deleted file mode 100644 index c3fd98618746b81cb7940ac9088bd53cc4f18967..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 272 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e&H|6fVxatW5N34Jm|X!BWH0gb zb!ETLD$CEW^7X}TZ=eu=fKP}kkY2H3g_4re#ful8J$p8xPa9+=Q%R6tFvEej-}yU$ zJjNt%cNeBK?wS-Jr_$5KF~p?6*E#@GHO2;#GlO*PXD5)2AA80v*BN>FVdQ I&MBb@04)MuU;qFB diff --git a/themes/redmond98/layouts/cornernw.png b/themes/redmond98/layouts/cornernw.png deleted file mode 100644 index dfe78b3da94de0befd857e47a253647df611d6ea..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 263 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e&H|6fVxatW5N34Jm|X!BWH0gb zb!ETLD$CE$9Po%w0Vu>D;1l8sq;qp~&CJY{l$4%5d)D%1Z97nixg^Lhm|^yBr!{+K z1G$Vz-tI0e{TVj{ft-9#7sn8fbnQLB)w7Xd#)}nA z2NyIXq$s+Ym$7;z91syGd6F?p#)<32Y_*NzNi5xtkG%YAxHj%+tzmWIn679zQA9)e yPur0rV&V}qlsy^0H8^=qzR^4@q2#h41H+^LjFlfYZ!rK`&EV>}Vp2D^ r&Y6iz7^)o5Too+pxq3fu6{1-oD!M<`?yVv diff --git a/themes/redmond98/layouts/cornerse.png b/themes/redmond98/layouts/cornerse.png deleted file mode 100644 index 023ae79ad454e06284a5c7aa0cc429d3baf16c29..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 264 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e&H|6fVxatW5N34Jm|X!BWH0gb zb!ETLD$CDr#s9ob11Q8F;1l8sq;qm|l$4ar%*>uWdsZo0kN^~7DhcunX1JcG(&Z22 zF(!GtyRh_U+zbSA3O!vMLp+WrCrF4mcyMy?EHq&g=IC+oN!92*$il=S?Y7w1eI8R2 zW2^Csi9Cn-G{O~HHuQFsG;#%Ol}ywMIQB>^#9s;wQHC1ea37z{MmJ~$Pjeh+9lgQu&X%Q~loCIDN5N(cY| diff --git a/themes/redmond98/layouts/cornersew.png b/themes/redmond98/layouts/cornersew.png deleted file mode 100644 index f7cfa1c0db222304f9d880c023601c576fd5e040..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 264 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e&H|6fVxatW5N34Jm|X!BWH0gb zb!ETLD$CDrTxM<80~F#9@Ck7R(koW1P*PI5c=6)1XU`_|X@ksUDhcunW;pQnJAVg| z$C%{p?!uJDU6TUj6neTihIkxLPLL3BIKs-ov(SW1n8U}xCtaiWAPW_56RBi3pEFojSz;MPdY~mqR<8MIA89ZJ6T-G@yGywpICQY0G diff --git a/themes/redmond98/layouts/cornersw.png b/themes/redmond98/layouts/cornersw.png deleted file mode 100644 index c1453c9fd005d78c90ca4021c97ff7a6be40bfcc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 263 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e&H|6fVxatW5N34Jm|X!BWH0gb zb!ETLD$6gx!IgE>3@F4O;1l8sq;qm|l$4ar%*>uWdsZo0kN^~7DhcunX1JcG(&Z22 zF(!GtyRh_U+zbSA3OrpLLp+YZof62!pvd8}+gUvz|H5DX?E$(y78m@lZ2G!SMNXn` z#wGO=wPwJ~P-p(1|6&#G~0 yWvlHWgEfhFxWnGPd*aVpcSJ#_j!p61Tbp%GYjv0{uI~Wa&EVC;4o;^Fa;`B725K~EzUogWn`(It9 zKpta~x4R2d8h1?!kW=XC;uzx5`F6@dP6kCDmbVAPaukmI%NDX}<&FGMykf;?E~5z# z+FCZS8rFB{FXdXfca{EDuAR=OX0!YYRQRx-t@M^E$9@=QD@S+`Ag zYY6j?(BU~Ob<8&L={-L=tq;mFVdQ&MBb@01#$Z AEC2ui diff --git a/themes/redmond98/layouts/dwindle.png b/themes/redmond98/layouts/dwindle.png deleted file mode 100644 index 9902d22d9fe71e7fcb27ebb4dc6060e5d1bf6b1e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 320 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e=3*z$5DpHG+YkL80J)q69+AaB z<<~)&(Me-=1yE43#5JNMI6tkVJh3R1p}f3YFEcN@I61K(RWH9NefB#WDWD?t0G|+7 zAgu@n%F4=0xPhwB%yOVoo{}KHUeVH?;Y4|>V5y~}6KPNpN c8ax1cTu7JkOv%?(R3)DDQp8<e zr8>M=riXfO(0aibc>LhKqv39jF9KOzSf+@t`_dqo$-IIgz3RXRwQF8)RVFd%r?5_5 g_~)d@LxTrEj|=HCo+mdKI;Vst02Qcz*8l(j diff --git a/themes/redmond98/layouts/fairh.png b/themes/redmond98/layouts/fairh.png deleted file mode 100644 index d41deead1ee2490ce0ada3a48c16a9a898535222..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 245 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e=3*z$5DpHG+YkL80J)q69+AaB z<<~)&(Me-=1yE43#5JNMI6tkVJh3R1p}f3YFEcN@I61K(RWH9NefB#WDWD>W0G|+7 zAg!#dtb_r6|GT*ZD92tBE-?C@snutH7kHZHl8kyAs)w*6C^|qtdZeq+OWAn zLFSO=!E;PaMH&arNrf7$O3=_!nDHi5QO5nv8b>C#;_oY(0$C3ml`}K&>)WzVFDqRJ PG>5^{)z4*}Q$iB}b|yz_ diff --git a/themes/redmond98/layouts/fairhw.png b/themes/redmond98/layouts/fairhw.png deleted file mode 100644 index bb50e3ae13ecba910f0777618649b856f6408328..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 245 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e=3*z$5DpHG+YkL80J)q69+AaB z<<~)&(Me-=1yE43#5JNMI6tkVJh3R1p}f3YFEcN@I61K(RWH9NefB#WDWD>W0G|+7 zApIN$o*{vQ7k^g)<=9Jt{DK)gy}TbieiCiIW(82l#?!?y#N&8!f`rI{H8MO+8#Xs6 z$Q;rW0G|+7 zAg!#dtb_r6|GT*ZD92tBE-?C@snutH7kHZww^AIAs)w*6C^|qtdU`CGT7lD z(5DjAbda^FD5c?`Y^Z}jD~qzXsOJ&EW^0cF8M9=3Coj${3OSfD>j*PL%Qsv0xNA?< Qfd(;ny85}Sb4q9e0A;#IW&i*H diff --git a/themes/redmond98/layouts/fairvw.png b/themes/redmond98/layouts/fairvw.png deleted file mode 100644 index 4f4ed52219e33c9189a536b712b3cc82f277ff4a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 246 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e=3*z$5DpHG+YkL80J)q69+AaB z<<~)&(Me-=1yE43#5JNMI6tkVJh3R1p}f3YFEcN@I61K(RWH9NefB#WDWD>W0G|+7 zApIN$o*{vQ7k^g)<=9Jt{DK)gy}TbieiCiIW(82l*3-o?#N&8!f`rI{H8PA%20I)C z`c#6N4ze~Cr8FFr4R!EmWl{DP^*kcjZ0&I%W0s8X#j+S3j3^P6`0G|+7 zAgv4rO4z{SwStR5c9aD91vAKcdU`R)Q0)K! diff --git a/themes/redmond98/layouts/floatingw.png b/themes/redmond98/layouts/floatingw.png deleted file mode 100644 index 481589427960286e42e6c5c4e764e1222dccf10d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 282 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e=3*z$5DpHG+YkL80J)q69+AaB z<<~)&(Me-=1yE43#5JNMI6tkVJh3R1p}f3YFEcN@I61K(RWH9NefB#WDWD>`0G|+7 zApP{|)8{bo3>BQ=6(|JRQ4-`A%pmLO<-P6E<0mbTVp4&Ek)AG&As)w*6C^|qB&&%9 z^ekB*G`lI&gDWkGbupKlXph!{UZx7Zql*)y6j_a5E@cR3WC~B{^K}%O#1zwz#M;v$ w(vhU0AdtG4t8Ge?*Pl@7Yg=ZTSZL)joT}LD)L)->8fXcFr>mdKI;Vst0H7CS?*IS* diff --git a/themes/redmond98/layouts/fullscreen.png b/themes/redmond98/layouts/fullscreen.png deleted file mode 100644 index d02f6fc339a93c92f0b238c89d1889d3da811381..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 866 zcmV-o1D*VdP)lCcZQz;03CZsP%%N zFX}ho(MS2V;Ipwe=t2SiW42_n*)BVCrtNG!Cpjs-@=h`8S5d z%Md=Q#!;|cmtq6+mxXXC-tud^uJdYRzA^w$-t+D>*XoMjA6K`yDRNfws0E7+}LSGu)9``0l z;J0V+rtRX5B}n+C$XEzLh<`DZ6q!LuQYi4LB@leY8%vV%rpbBs-p1W0v_uR6a>!|N zry;UK##IyAXydgIdd?^SPD17fJ;A*V+r+zidK3VTLWbC=AhawkTwNCL-*u~ zK?r|z#k+c%6aY<;rjDxjSO^;AxNil%>2*A}=N*O={mgyGrjM@##Ux^OQ}&y@BE$gH s0Q~odrs@+4VP7P5^T9|qHa6M*0ydFz%Ff(hL;wH)07*qoM6N<$f+5&_C;$Ke diff --git a/themes/redmond98/layouts/fullscreenw.png b/themes/redmond98/layouts/fullscreenw.png deleted file mode 100644 index 5c35bfa8afe6c4f091f3895d92c50f845df52483..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 865 zcmV-n1D^beP)DEINg2jB%EarEGlDCI7^0NIKDE~nlw6Yw>-q|E}IwOrD#hdl~f3bJRyW_bzF)=YQ%_^13 zn{v5agdfb97ocr@BminSgW?D7L;-Lx%Ps)o0)Wly$Lsa_*?c~KahMm2#l>2!c9$IY z+$Q?yGXm~YAA|m=@33=IYCA(F92Hli(KyEj&}=r(j}X5;Veye6v|6nTYydRB4r@!7q6%bM ziB0J3K(Vs{U?8~^^3c>vKz6qa{}dD>B~CU5!OIC2uS3`fi1P{?07lZQzT+F}gh|Wu z_i;OX)ni5ae9guza9un0IicbMAz&7`!3N+s&drpF{|^EFO(jCN*Z?q)+{V51B_-l@ z2;Xrv+_5nT{($eL@Y$ar{FDU|0U!VbfB+Bx0zd!=00AHX1b_e#00O`WfR|#yo{dG( zxA@#np?Fs<08*GlI2*N+{);34=?eP>qa3T7+)$MVAfdsx= zf_IWG-dce~P>DRp9nPEjzSaW}p5D0C0^<2aR9h+t24(4p$lIzs9OEa0kCaYCww2?vM9cdB~x)0G|+7 zAg!jRrlO*v3L8SBlE>)0G|+7 zApQ99<0ns^Jbn7~ISf3*2JDrd=>S#pmIV0)Gf2zGdU|2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4b=pctzcxp`j&fO&(QQ6C>GkF+rq|wF-V;qT%Xi;A z$@3&v@g)BwpSCrIQb4eiVFT|2<^wSivl%mXGn`@ZtGl>NkD>UaFC!DPM{YNN!_42^ zcAYPb%o=ib#;5J;V@(LSP#$i=AZTmx<-RcIfiwEYW*kuz_nz@HQ0l-9iOZinJcJqi zgBap$)#tlQcrnZnxOiKO_kfGBBWnNy7&Rm?9%HzdJ?Fyo_qv-*7-rwzzRDx4hN0#) z=TZiNi=UPD@-iOiQ@$&5z@UCLH|v4Er#rG5-t@n3W-M@wkW`32%q@9f+I7CuY%fG> z?pIl{9c{FIQwqT6hGjm?|P5AJ5mZE_ElZT^0G>fMaK zgKa8K&o3@J?C=Q%(yQ$6qayO?wu2_WHwohM8h6A`XlY)WrHDX0xeW!iHnJ zpRSvtI^n0^zE$bPrFN5E?e^Pus(o^4e$z_l|0}-)F9^O+uHKbAVdnXm?24q%3`$nI ztL`0}#4(rQ#zmh1#zRaU|CX=Z7SN(;od2?aA~48*{$RCRx%I-Xea|lg2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4jwZ_m&7OIeW7A=9_Z| z?y;Kvo_O{gkEcKe5G-k$xt(zjv%v9VlVmmVXx4b(9RRfI-|p5hWY-EmNS1|NFDHTv2xuUD9G9Q z;v^?STAk+RA0|u<8@c@t$Q;N%YIxlzfKkK&j1ELKNH%O|6aNyqt;>YdKyad;>`5=l zhE0E2f*H=Q{&J12L4l)b(OgwwhQ}qL>D&%Y1u^CacKP+0GPnw8F)yjEFk@Eno$9=p z;f&3h9rvsnSQ77ZFc`-_kI7ecD9Yc>u&XqaPgjqFHcVj6un2)oY18 z|L@-X`b;9nQ>o-#t`^UONBg@Mu5>+mAvO5vhb<3_esDXi;T2>JV1S@(M!SC&QTzt0 ze%&pSmG?E>%KC__Ti)U;-;FCFcMJGy)#IC7M4q0F|Gs>4?|h~+cTQ&{f32}(JKy!~ zL(Dm5zseVH?;Y4|YH4ETUc-UaS>tnUB<;@-y)(9=rh^uTT#p6zJ jsU5!5EUpyKW5K}Csin)9_P(eI=nMu=S3j3^P6(R3)DDQp8<g zO?Ko2F&7FIRtmq^D<|;WLXNe9=@j>ydK<0@v1S2W3J)9XcYUlDw!GP+!WyAv8gZ5F oq~0iD6%>FVdQ&MBb@07`m(0ssI2 diff --git a/themes/redmond98/layouts/tile.png b/themes/redmond98/layouts/tile.png deleted file mode 100644 index 3ede21e8cf98ce00b16ced05213f7436c8dc6664..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 265 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e=3*z$5DpHG+YkL80J)q69+AaB z<<~)&(Me-=1yE43#5JNMI6tkVJh3R1p}f3YFEcN@I61K(RWH9NefB#WDWD>W0G|+7 zAg!#dtb_r6|GT*ZD92tBE-?C@snutH7kHZ0iG_7As)w*6C^|qtdZeq+OWAn zLFSO=!E;PaMH&arNrf61aB;Xz(`tFxaVE*Zm`{4aY9^V?Ni6w&%i1rRSk6*&7hRyG k5V11RyHg{x=l~mdKI;Vst0FISWYybcN diff --git a/themes/redmond98/layouts/tilebottom.png b/themes/redmond98/layouts/tilebottom.png deleted file mode 100644 index 6f8c2570ae64d88453f888fadb1e6e20b4b7e531..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 264 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e=3*z$5DpHG+YkL80J)q69+AaB z<<~)&(Me-=1yE43#5JNMI6tkVJh3R1p}f3YFEcN@I61K(RWH9NefB#WDWD>W0G|+7 zAg!#dtb_r6|GT*ZD92tBE-?C@snutH7kHZ{+=$5As)w*6C^|qtdUXYVAAF| zzIFl2ngufa5}^+9tSrjjqT88{ADpNlm}$ge&HeDK&>Nj44TsK2g*y0yW#|3du+i=E glNC)DO*%OlY~*!5=bHM@0UFKV>FVdQ&MBb@0B_1oUH||9 diff --git a/themes/redmond98/layouts/tilebottomw.png b/themes/redmond98/layouts/tilebottomw.png deleted file mode 100644 index a1de7b29fc3476f41d29ed09b6c87a6880aeb785..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 264 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e=3*z$5DpHG+YkL80J)q69+AaB z<<~)&(Me-=1yE43#5JNMI6tkVJh3R1p}f3YFEcN@I61K(RWH9NefB#WDWD>W0G|+7 zApIN$o*{vQ7k^g)<=9Jt{DK)gy}TbieiCiIW(82l-_yl0#N&8!f`rI{H8ScPOxhgB z*DhdLvp|MlBGe(Cl||WGbUV}WgA)}5GmSW`xgVYtdZV+X;m|p$PzQgo?7V*)Ho9GY gvZCptNhc?Rjl9n1TvPu!K%*HvUHx3vIVCg!0M2k+^#A|> diff --git a/themes/redmond98/layouts/tileleft.png b/themes/redmond98/layouts/tileleft.png deleted file mode 100644 index 31d6870477a706d765b66ebb3ac2f76ba2bbd0ee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 266 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e=3*z$5DpHG+YkL80J)q69+AaB z<<~)&(Me-=1yE43#5JNMI6tkVJh3R1p}f3YFEcN@I61K(RWH9NefB#WDWD>W0G|+7 zAg!#dtb_r6|GT*ZD92tBE-?C@snutH7kHZfu1goAs)w*6C^|qtdZeq+OWAn zLFSO=!E;PaMH&arNrgK2v))+5;o7Lx^0woQQ(yz{g=ofYQ#@vwyI($>F-yjG@?tIz l&&e87rM8)LCh)Q`Fl5cw`Mk`lcR$c@22WQ%mvv4FO#m>2QJMe% diff --git a/themes/redmond98/layouts/tileleftw.png b/themes/redmond98/layouts/tileleftw.png deleted file mode 100644 index cf14c25e6dfcea21b1ce34e1a8e26da6d865f895..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 266 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e=3*z$5DpHG+YkL80J)q69+AaB z<<~)&(Me-=1yE43#5JNMI6tkVJh3R1p}f3YFEcN@I61K(RWH9NefB#WDWD>W0G|+7 zApIN$o*{vQ7k^g)<=9Jt{DK)gy}TbieiCiIW(80v(9^{+#N&8!f`rI{H8MO+8#Xs6 z$Q;r)HajO1YR}`BGVKD#z diff --git a/themes/redmond98/layouts/tiletop.png b/themes/redmond98/layouts/tiletop.png deleted file mode 100644 index 98cade20c8ad66f318a3c9ce484f54c7f5cc0fc4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 260 zcmeAS@N?(olHy`uVBq!ia0vp^79h;R3?!pgsObVJ=3*z$5DpHG+YkL80J)q69+AaB z<<~)&(Me-=1yE43#5JNMI6tkVJh3R1p}f3YFEcN@I61K(RWH9NefB#WDWD>W0G|+7 zAg!#dtb_r6|GT*ZD92tBE-?C@snutH7kHZ-kvUwAr_~T4Yb*t71-Ex))a6o zZef&OEyE?TVWXR>=A<@e#^D fu=>%o5*CIkC!Nn+FN#Hg#xi)i`njxgN@xNAmIg|^ diff --git a/themes/redmond98/layouts/tiletopw.png b/themes/redmond98/layouts/tiletopw.png deleted file mode 100644 index d1d0872b8a6008c2686a6c455a412e7ae428166e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 265 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e=3*z$5DpHG+YkL80J)q69+AaB z<<~)&(Me-=1yE43#5JNMI6tkVJh3R1p}f3YFEcN@I61K(RWH9NefB#WDWD>W0G|+7 zApIN$o*{vQ7k^g)<=9Jt{DK)gy}TbieiCiIW(80vz|+Ms#N&8!f`rI{H8MO+8#Xs6 z$Q;rW0G|+7 zApIN$o*{vQ7k^g)<=9Jt{DK)gy}TbieiCiIW(80vz|+Ms#N&8!f`rI{H8MO+8#Xs6 z$Q;rP000>X1^@s6#OZ}&00004b3#c}2nYxW zd2z8Hj+`L9UQg2LG>t}MEh2;Ea(U|nQA(kdBAd<9YPAv(`2en+Ap7$9 zJe^KwE+TKhr4wXdu~;OEA~PC|UVw8a$i8y9{L}CE<2a6=fKw-kQVQSqsaC6BA~H^r zQjEnx?oJHr&dIz4a@dl*-CY>| zgW!U_%O?XxI14-?iy0WWg+Z8+Vb&Z8pdfpRr>`sf4K5~rW#b#FTbqDFk|nMYCC>S| zxv6<249-QVi6yBi3gww484B*6z5(HleBwYwVxBIJAr_~TfA}*P^a!vnP7vu~;$dKz X$MK&rzAi=usDi=M)z4*}Q$iB}5zjAs diff --git a/themes/redmond98/taglist/squarew.png b/themes/redmond98/taglist/squarew.png deleted file mode 100644 index 913f2ca6ba168e824644509d6fed72b31c677d49..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 193 zcmeAS@N?(olHy`uVBq!ia0vp^96+qV!3HGtKUiJ>QjEnx?oJHr&dIz4a@dl*-CY>| zgW!U_%O?XxI14-?iy0WWg+Z8+Vb&Z8pdfpRr>`sf4K5~rW$n|Rx>tZgk|nMYCC>S| zxv6<249-QVi6yBi3gww484B*6z5(HleBwYwGM+AuAr_~TfA}*PG;qo!WN03EeKyd5 d%Z(A}pyPS@6O*PM?E$J|@O1TaS?83{1OQ#WGiU$+ diff --git a/themes/redmond98/theme.lua b/themes/redmond98/theme.lua deleted file mode 100644 index fcbb7d2..0000000 --- a/themes/redmond98/theme.lua +++ /dev/null @@ -1,264 +0,0 @@ -local theme_assets = require("beautiful.theme_assets") -local xresources = require("beautiful.xresources") -local dpi = xresources.apply_dpi - -local gears = require("gears") -local wibox = require("wibox") -local gfs = require("gears.filesystem") -local themes_path = os.getenv("HOME").."/.config/awesome/themes/" -local theme_name = "redmond98" - -local theme = {} - -theme.font = "Ubuntu Regular 9" -theme.unitybar_width = dpi(55) - -theme.tasklist_button_shape_border_width = dpi(1) -theme.tasklist_button_shape_border_color = "#262626AA" -theme.launcher_button_shape_border_width = dpi(1) -theme.launcher_button_shape_border_color = "#262626AA" -theme.launcher_button_size = 44 -theme.tasklist_button_size = 44 -theme.macbar_height = 45 -theme.menu_button_inner_margin = 2 -theme.bg_normal = "#c2c3c3" -theme.bg_focus = "#e2e3e3" -theme.bg_urgent = "#e2e3e3" -theme.bg_minimize = "#d2d3d3" -theme.bg_systray = theme.bg_normal - -theme.fg_normal = "#121212" -theme.fg_focus = "#121212" -theme.fg_urgent = "#121212" -theme.fg_minimize = "#121212" - -theme.useless_gap = dpi(10) -theme.border_width = dpi(1) -theme.border_normal = theme.bg_normal -theme.border_focus = theme.bg_focus -theme.border_marked = theme.bg_marked - --- There are other variable sets --- overriding the default one when --- defined, the sets are: --- taglist_[bg|fg]_[focus|urgent|occupied|empty|volatile] --- tasklist_[bg|fg]_[focus|urgent] --- titlebar_[bg|fg]_[normal|focus] --- tooltip_[font|opacity|fg_color|bg_color|border_width|border_color] --- mouse_finder_[color|timeout|animate_timeout|radius|factor] --- prompt_[fg|bg|fg_cursor|bg_cursor|font] --- hotkeys_[bg|fg|border_width|border_color|shape|opacity|modifiers_fg|label_bg|label_fg|group_margin|font|description_font] --- Example: ---theme.taglist_bg_focus = "#ff0000" -theme.hotkeys_border_color = "#262626" -theme.hotkeys_opacity = 0.2 -theme.bgimage = function(context, cr, width, height) - local surface = gears.surface( - themes_path..theme_name.."/assets/redmond98borders.svg" - ) - local bg_width,bg_height = gears.surface.get_size(surface) - cr:scale(width / bg_width, height / bg_height) - cr:set_source_surface(surface) - cr:paint() -end -theme.button_widget = function(style) - return { - { - id = "widget_container", - widget = wibox.container.margin, - margins = style.button_inner_margin, - }, - bgimage = theme.bgimage, - id = "widget_background", - widget = wibox.container.background, - shape = style.button_shape, - shape_border_width = style.button_shape_border_width, - shape_border_color = style.button_shape_border_color, - fg = style.button_fg_normal - } -end -theme.icon_widget = function(style) - return { - { - id = "widget_container", - widget = wibox.container.margin, - margins = style.icon_inner_margin, - }, - bgimage = theme.bgimage, - id = "widget_background", - widget = wibox.container.background, - shape = style.icon_shape, - shape_border_width = style.icon_shape_border_width, - shape_border_color = style.icon_shape_border_color, - fg = style.icon_fg_normal - } -end -theme.container_widget = function(style) - return { - { - id = "widget_container", - widget = wibox.container.margin, - margins = style.container_inner_margin, - }, - bgimage = theme.bgimage, - id = "widget_background", - widget = wibox.container.background, - shape = style.container_shape, - shape_border_width = style.container_shape_border_width, - shape_border_color = style.container_shape_border_color, - fg = style.container_fg_normal - } -end -theme.inputbox_widget = function(style,prompt) - return { - { - { - id = "widget_prompt", - markup = prompt or "", - widget = wibox.widget.textbox, - fg = style.inputbox_fg_normal - }, - id = "widget_container", - widget = wibox.container.margin, - margins = style.inputbox_inner_margin, - }, - bgimage = theme.bgimage, - id = "widget_background", - widget = wibox.container.background, - shape = style.inputbox_shape, - shape_border_width = style.inputbox_shape_border_width, - shape_border_color = style.inputbox_shape_border_color - } -end -theme.titlebar_bg_focus = { - type = "linear", - from = { 0, 15 }, - to = { 0, 0 }, - stops = { { 0, "#3C3C3C"} , { 1 , "#424242"} } -} - -theme.titlebar_bg_normal = { - type = "linear", - from = { 0, 15 }, - to = { 0, 0 }, - stops = { { 0, "#161617"} , { 1 , "#222223"} } - -} -theme.topbar_bg = theme.titlebar_bg_normal - --- Generate taglist squares: -local taglist_square_size = dpi(4) -theme.taglist_squares_sel = theme_assets.taglist_squares_sel( - taglist_square_size, theme.fg_normal -) -theme.taglist_squares_unsel = theme_assets.taglist_squares_unsel( - taglist_square_size, theme.fg_normal -) - --- Variables set for theming notifications: --- notification_font --- not1ification_[bg|fg] --- notification_[width|height|margin] --- notification_[border_color|border_width|shape|opacity] -theme.notification_width = dpi(250) -theme.notification_height = dpi(80) --- Variables set for theming the menu: --- menu_[bg|fg]_[normal|focus] --- menu_[border_color|border_width] -theme.menu_submenu_icon = themes_path..theme_name.."/submenu.png" -theme.menu_height = dpi(18) -theme.menu_width = dpi(140) - --- You can add as many variables as --- you wish and access them by using --- beautiful.variable in your rc.lua ---theme.bg_widget = "#cc0000" - --- Define the image to load -theme.titlebar_close_button_normal = themes_path..theme_name.."/titlebar/close_normal.png" -theme.titlebar_close_button_focus = themes_path..theme_name.."/titlebar/close_focus.png" - -theme.titlebar_minimize_button_normal = themes_path..theme_name.."/titlebar/minimize_normal.png" -theme.titlebar_minimize_button_focus = themes_path..theme_name.."/titlebar/minimize_focus.png" - -theme.titlebar_ontop_button_normal_inactive = themes_path..theme_name.."/titlebar/ontop_normal_inactive.png" -theme.titlebar_ontop_button_focus_inactive = themes_path..theme_name.."/titlebar/ontop_focus_inactive.png" -theme.titlebar_ontop_button_normal_active = themes_path..theme_name.."/titlebar/ontop_normal_active.png" -theme.titlebar_ontop_button_focus_active = themes_path..theme_name.."/titlebar/ontop_focus_active.png" - -theme.titlebar_sticky_button_normal_inactive = themes_path..theme_name.."/titlebar/sticky_normal_inactive.png" -theme.titlebar_sticky_button_focus_inactive = themes_path..theme_name.."/titlebar/sticky_focus_inactive.png" -theme.titlebar_sticky_button_normal_active = themes_path..theme_name.."/titlebar/sticky_normal_active.png" -theme.titlebar_sticky_button_focus_active = themes_path..theme_name.."/titlebar/sticky_focus_active.png" - -theme.titlebar_floating_button_normal_inactive = themes_path..theme_name.."/titlebar/floating_normal_inactive.png" -theme.titlebar_floating_button_focus_inactive = themes_path..theme_name.."/titlebar/floating_focus_inactive.png" -theme.titlebar_floating_button_normal_active = themes_path..theme_name.."/titlebar/floating_normal_active.png" -theme.titlebar_floating_button_focus_active = themes_path..theme_name.."/titlebar/floating_focus_active.png" - -theme.titlebar_maximized_button_normal_inactive = themes_path..theme_name.."/titlebar/maximized_normal_inactive.png" -theme.titlebar_maximized_button_focus_inactive = themes_path..theme_name.."/titlebar/maximized_focus_inactive.png" -theme.titlebar_maximized_button_normal_active = themes_path..theme_name.."/titlebar/maximized_normal_active.png" -theme.titlebar_maximized_button_focus_active = themes_path..theme_name.."/titlebar/maximized_focus_active.png" - -theme.wallpaper = themes_path..theme_name.."/background.png" - --- You can use your own layout icons like this: -theme.layout_fairh = themes_path..theme_name.."/layouts/fairhw.png" -theme.layout_fairv = themes_path..theme_name.."/layouts/fairvw.png" -theme.layout_floating = themes_path..theme_name.."/layouts/floatingw.png" -theme.layout_magnifier = themes_path..theme_name.."/layouts/magnifierw.png" -theme.layout_max = themes_path..theme_name.."/layouts/maxw.png" -theme.layout_fullscreen = themes_path..theme_name.."/layouts/fullscreenw.png" -theme.layout_tilebottom = themes_path..theme_name.."/layouts/tilebottomw.png" -theme.layout_tileleft = themes_path..theme_name.."/layouts/tileleftw.png" -theme.layout_tile = themes_path..theme_name.."/layouts/tilew.png" -theme.layout_tiletop = themes_path..theme_name.."/layouts/tiletopw.png" -theme.layout_spiral = themes_path..theme_name.."/layouts/spiralw.png" -theme.layout_dwindle = themes_path..theme_name.."/layouts/dwindlew.png" -theme.layout_cornernw = themes_path..theme_name.."/layouts/cornernww.png" -theme.layout_cornerne = themes_path..theme_name.."/layouts/cornernew.png" -theme.layout_cornersw = themes_path..theme_name.."/layouts/cornersww.png" -theme.layout_cornerse = themes_path..theme_name.."/layouts/cornersew.png" - --- Generate Awesome icon: -theme.awesome_icon = theme_assets.awesome_icon( - theme.menu_height, theme.bg_focus, theme.fg_focus -) - --- Define the icon theme for application icons. If not set then the icons --- from /usr/share/icons and /usr/share/icons/hicolor will be used. -theme.icon_theme = "Adwaita" - --- Recolor icons -theme_assets.recolor_titlebar(theme,theme.fg_normal,"normal") -theme_assets.recolor_titlebar(theme,theme.fg_focus,"focus") -theme_assets.recolor_layout(theme,theme.fg_normal) - --- Powermenu icons -theme.powercontrol_icon_shutdown = themes_path..theme_name.."/icons/shutdown.svg" -theme.powercontrol_icon_suspend = themes_path..theme_name.."/icons/suspend.svg" -theme.powercontrol_icon_lock = themes_path..theme_name.."/icons/lock.svg" - --- Volume icons -theme.volume_icon_high = themes_path..theme_name.."/icons/volume-high.svg" -theme.volume_icon_medium = themes_path..theme_name.."/icons/volume-medium.svg" -theme.volume_icon_low = themes_path..theme_name.."/icons/volume-low.svg" -theme.volume_icon_muted = themes_path..theme_name.."/icons/volume-muted.svg" - --- Battery icons -theme.battery_caution_charging_symbolic = themes_path..theme_name.."/icons/battery-caution-charging-symbolic.svg" -theme.battery_caution_symbolic = themes_path..theme_name.."/icons/battery-caution-symbolic.svg" -theme.battery_empty_charging_symbolic = themes_path..theme_name.."/icons/battery-empty-charging-symbolic.svg" -theme.battery_empty_symbolic = themes_path..theme_name.."/icons/battery-empty-symbolic.svg" -theme.battery_full_charged_symbolic = themes_path..theme_name.."/icons/battery-full-charged-symbolic.svg" -theme.battery_full_charging_symbolic = themes_path..theme_name.."/icons/battery-full-charging-symbolic.svg" -theme.battery_full_symbolic = themes_path..theme_name.."/icons/battery-full-symbolic.svg" -theme.battery_good_charging_symbolic = themes_path..theme_name.."/icons/battery-good-charging-symbolic.svg" -theme.battery_good_symbolic = themes_path..theme_name.."/icons/battery-good-symbolic.svg" -theme.battery_low_charging_symbolic = themes_path..theme_name.."/icons/battery-low-charging-symbolic.svg" -theme.battery_low_symbolic = themes_path..theme_name.."/icons/battery-low-symbolic.svg" -theme.battery_missing_symbolic = themes_path..theme_name.."/icons/battery-missing-symbolic.svg" -return theme - --- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80 diff --git a/themes/redmond98/titlebar/close_focus.png b/themes/redmond98/titlebar/close_focus.png deleted file mode 100644 index 01ef82565db041f356c02173b69cc60d4275ebac..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 966 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!n2Vh}LpV4%Za?&Y0OWEOctjQh zm0t&8MkkHg6+l7B64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq!<_&xdVJc zT!D&Tym;~I)vMR9U*Erf|KY=jj~_pN^5n_$=g)!SFJHcdNCDXpaiG-Gr%#{308kka zU==|Y1S$t|(L^9-0JXymL!q%MMp1#p!DR@N62i=tE3PgD21i6mkY6wZHxI9XppdYr zn7D+buAaVup^>qPshNL3U{FYCQgTXKdPaFeQ*%peTYJaEt=o6(+_ih}zWoO-U%7hy z#+|$O9z1;V^x5+luU@}-`|kaRkDoq&`TFhqkKcd(%3u2Y02uTqJzX3_A`ZWumK)CK zDAKTo?C#?C@7}z4eJ{WIoz3|>H+LIbPkPcO zT_)&}qW5a;_xEL6XWZuNx^(aFB?+E|;X!eXH9vRoYuItE?)%BEu=r(R){Pf|e-z%; z@J?}TnJ=+R=YD_p)<)BgPiq|Km`jU2>}6a2N9eOmXnm#WDM<_N`sBH57|+V*{qS&< zvs&XgPvV#1wD1R0bR3v-I##Xt$H||6<($>5Y2Ca!@`1}9^Kl&1oxnD!J$p{%<%5lh z#|}&6zumikS^1$FIfcfe=LgKsRGwInlKJmp)Y?M_4y&HJC%ug?ws~T^l-GWy;|Y%z zwtk9F$T#?G;LR)G9UvRc4KRow-fb&cb*-4*ICvIvpQT&i8az9j~`PpLr(2)OI5~f;Q zIrk#@Z|Bq0)<3!~vlxG|R_es<6ne-rr9xhAmE(l?GYYfo-alfSxig_dDy8IT;P!vV zyCpT^jy%Y`B!2dI>TFMGa z5^?zLwA^q;N0El@9DzBVFM97y2yvM>Ws;6}Zs50n|Ko+!Wp@|9fA{9a>wEdt?`+QB zxw+fedeW0N=`ul&6unn#zrQcrI^#B9*QI-ZFG=t$3=fK9togZvU&D@Tb>B~Rg~cxm zvu?Zy{G;%$hIfi%%Y2DlI`{j#w>Fw~d|Kl;$6Q+MVK3YAKSG~nLhCC{Pf1#E*C)?i z!+2Ic?}vw@oYfk~c@n=2r-eV5qT|4v)3IvBKTiJqE9b0cP3z{>kq=z-YuyScjQ6lCGoSzQsT!(5~#Z=DoQvI1HYyelF{r5}E*-qWlX0 diff --git a/themes/redmond98/titlebar/floating_focus_active.png b/themes/redmond98/titlebar/floating_focus_active.png deleted file mode 100644 index 82dcc7ca6d97a2a90afcde2bd3be3e4826e0d5f3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 386 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!n2Vh}LpV4%Za?&Y0OWEOctjQh zm0t&8MkkHg6+l7B64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1UT1AIbU zf%O0X|6ja#@$A{N=U@O~Jbn5U!Ud9W5g>y|P~P?KEYN6~k|4ie24+PQQ!^V+-^{G+ zh09lN+qwI|xm$Pdzxwp!*WWnt!uLRRrJgR1ArXh)UN`4!aNuzXEIL=%xbwedX66Rn zT;@xE>f#=say)Qj@h!*PZq@@E*sT~hytyc>;LyO(*w4t#u;Y|)!)MkHjtSctdKpAM zuQGFCN;oHd!=~}eCWezgu9X~Mdh*MWL*NJVgq79m%!$=nzbEkvRhKbuc(fzzzhWgQ P3>Z9J{an^LB{Ts5w(z^i diff --git a/themes/redmond98/titlebar/floating_focus_inactive.png b/themes/redmond98/titlebar/floating_focus_inactive.png deleted file mode 100644 index c19ba8005593d7583ec3dc84785ef4ad0763d197..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 237 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e=3*z$5DpHG+YkL80J)q69+AaB z<<~)&(Me-=1yE43#5JNMI6tkVJh3R1p}f3YFEcN@I61K(RWH9NefB#WDWD>u0G|+7 zApIN$o`HeG-IvZlQPz?mzhH*Utn5!B`!7xc3fOqMIEHu}Pfn0vEl3dJV)o0B(I{x` zZe38gKtY7@g2iGkH_-`;8xkf3H+EYtDs(HpwxTJJ^{`DkuK@!?wUIr~`8_{-faWlG My85}Sb4q9e0L<`Cxc~qF diff --git a/themes/redmond98/titlebar/floating_normal_active.png b/themes/redmond98/titlebar/floating_normal_active.png deleted file mode 100644 index 62342d19e7a9fad2384d3ebb68e065de18a05400..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 386 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!n2Vh}LpV4%Za?&Y0OWEOctjQh zm0t&8MkkHg6+l7B64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1UT1AIbU zf%K|Xt2S-gv~lA`Ah{U~AdD?rw!lSz!ay!W7LCLzKJP(u8_;N(k|4ie24+PQQ!^V+ z-^{G+h09lN+qwI|xm$Pdzxwp!*WWnt!uLRRrJgR1ArXh)UN`4!aNuzXEIL=%xbwed zX66RnT;@xE>f#=say)Qj@h!*PZq@@E*sT~hytyc>;LyO(*w4t#u;Y|)!)MkHjtSct zdKpAMuQGFCN;oHd!=~}eCWezgu9X~Mdh*MWL*NJVgq79m%!$=nzbEkvRhKbuc(fzz TzhWgQ3>Z9J{an^LB{Ts5C|s&j diff --git a/themes/redmond98/titlebar/floating_normal_inactive.png b/themes/redmond98/titlebar/floating_normal_inactive.png deleted file mode 100644 index e2bbdfa1793b1bff74d7a745e952778a672eaf3c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 237 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e=3*z$5DpHG+YkL80J)q69+AaB z<<~)&(Me-=1yE43#5JNMI6tkVJh3R1p}f3YFEcN@I61K(RWH9NefB#WDWD>u0G|+7 zAiZVFmQ9;BZH58fK2>X=C~HZOUob;vR`w^6{TC+z1#CQB978;gCnrd-79g{GOjZ QKyw&8UHx3vIVCg!0PqV+WdHyG diff --git a/themes/redmond98/titlebar/maximized_focus_active.png b/themes/redmond98/titlebar/maximized_focus_active.png deleted file mode 100644 index d7dffd75563da170dd3287f488c32aefb9289776..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 480 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!n2Vh}LpV4%Za?&Y0OWEOctjQh zm0t&8MkkHg6+l7B64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1Ty1AIbU zf%G#lcn$+kpFRaLA%a-Rebf3s0<{U01o;IsxVd|JdHcqvEnWTS@ssaAuWgoF!oa}D z?CIhd5^?zL^}Bq{3OuY2ZduN;xBl_Ze>b*zgU5-gF+-5F}_Tjl(lveY& z`4hkV)$=(zzt{FIyd5LC>+RgYPeSI6f!A2|4ZLo@U~&5?6QO+dxx9(wF3&UeuU7Hj jeyf_e=c@dYSqA#u-PN}}HZ4m61{H&+tDnm{r-UW|fWyvx diff --git a/themes/redmond98/titlebar/maximized_focus_inactive.png b/themes/redmond98/titlebar/maximized_focus_inactive.png deleted file mode 100644 index 844389f1fb02fae94cd7c715e7f28ed04c991b02..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 452 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e=3*z$5DpHG+YkL80J)q69+AaB z<<~)&(Me-=1yE43#5JNMI6tkVJh3R1p}f3YFEcN@I61K(RWH9NefB#WDWD>)0G|+7 zAbtDx?Z;s7?Af#D&!0bi`V>wAMd09Y`*VAsYTl9{zhDM-6;)%?^7@93B}EAZxL z#D8JOB4PX5OFg{XU-niK2A)Ei3#ums_c)@Lyt*5T4Y0RQF&0oc7}a zP8<(eeRg+Ly!$LBKO;?W`Ml*aHA%CgJF4P}KeVpQf4GHD%juRvsDrRb%a^7QrrZLB zCGvj+Hp=H*Kk%(tnDrvd?L_X|+&uy+1#CWWeZMIZWBHvT>%aD^Khxdjm{430C7}Gki>Hy>kWKFhOM?ab0X>F}Vum|2Z-03v&D-f( VR(tv5bD;MbJYD@<);T3K0RRdpzFhzS diff --git a/themes/redmond98/titlebar/maximized_normal_active.png b/themes/redmond98/titlebar/maximized_normal_active.png deleted file mode 100644 index a705f8164298c1f1741425effec9ad1d57ce37ed..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 480 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!n2Vh}LpV4%Za?&Y0OWEOctjQh zm0t&8MkkHg6+l7B64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1Ty1AIbU zf%N9ho40J)vT4&M2m?X_MSu*f;OMt6Za{4UB|(0{3~uh8Uf#a(X-ii>di>=3&ug3I zmM}0dGJCo>hD02Gd;Kn7vjPw6gIkt!?5%(N^WV+wGBe0=m(J-!JFnJtZsQQTdWB`D z{d4Y_x0nsiPB)Tcc*7u5jl|@KtAwy}&KFp)Ez>#WI!%=kx<=91W%=d~2L! z3O<)}RVZ@le6HrxapL*#c|OA&0mf@zCo`>R6iRp@*SN5{lP6YMa+hP$3%8jIqkVYp z7NylZZvMnCfAxHh&hNFo3vb6r?s_{n@RN{vW8gJbeFLxCFIe1u%0wt%eJ*bzxy$p6 o{i{{{x8JHJ?zt+zWR`(`cX#z|k4?*xfI-FJ>FVdQ&MBb@0Q$tm4gdfE diff --git a/themes/redmond98/titlebar/maximized_normal_inactive.png b/themes/redmond98/titlebar/maximized_normal_inactive.png deleted file mode 100644 index 4c1ab1f91f3191b9f1324a7aebdc82fb5cf83baf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 452 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e=3*z$5DpHG+YkL80J)q69+AaB z<<~)&(Me-=1yE43#5JNMI6tkVJh3R1p}f3YFEcN@I61K(RWH9NefB#WDWD>)0G|+7 zAiZtdwv8J%Zr;3k%a$#hHf;iuKsFEn*$@Uq#AfmyeV}UIk|4ie26h!yW7G2bhK?mm zmn|tdU<8!-?CIhd;&J@#rM4euN`b|i&(rCh^cHT zGT1Bd=4ZrzVaFn2``SxAyxU*)R!6f;5^H!hN8sufhG#7+{5Y3esi*K?Vv-P^)O=L; zU;do-;{r|`4_SS7cT~LlEG9oAO>p_V|7 zrVysw0)-{=e*`wl=UhMVty!4$BFpVW?%Uja3`fi?m=bO;U{JW`$l0)V{%$6Ps&_>n z`c^jnJ#G6Y{+;BRpV#ZZ_NzbB-R783To5Io{J@K+k=u|>?+8nS1^WR#hK^!}J2P*8 bc_z)<=~`BM`Qvk-_Zd80{an^LB{Ts5=8d)( diff --git a/themes/redmond98/titlebar/minimize_focus.png b/themes/redmond98/titlebar/minimize_focus.png deleted file mode 100644 index caaceb296dc2e49a723b425a62aa12b6cc060ce0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 234 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e&H|6fVxatW5N34Jm|X!BWH0gb zb!ETL!6vN4lv}Np1Qe1E@Ck7R($AhfdkzLb1_S_k|NsAg{Cl4PP@1hI$S;_IJuCau zkH}&{GoT1#lDE4HN87!rRX~ojr;B5V$MNI@3D(64B0LfXp5EN9tcjVKejZ$RE^TNK zQDM!DVASL~m9f5Ifiy=|Fzall^eYEMT-ccwbLNQjFx_HgDAf=9bAA4*y+Gp_JYD@< J);T3K0RS~8P4fT% diff --git a/themes/redmond98/titlebar/minimize_normal.png b/themes/redmond98/titlebar/minimize_normal.png deleted file mode 100644 index 36621d0f3993fb0739d99558b5b46838c3a87e41..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 225 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e&H|6fVxatW5N34Jm|X!BWH0gb zb!ETL!6vM#^Y6{ZETE7?fKP}kklws`^QKLkfFvCJ|NsB$-P_VYIku7@zhDOTtn5!e zB8vshfFg`Z-tI2!Vu>BEfgD>;7sn8f*71 zni+90AlTu;Y^@t27K>X{7b~zyym%oCRBge`kiI-@?}V!_n1BW`c)I$ztaD0e0sz}E BN7?`Y diff --git a/themes/redmond98/titlebar/ontop_focus_active.png b/themes/redmond98/titlebar/ontop_focus_active.png deleted file mode 100644 index 312c00ba8246608404568b1338cba9b264847bdc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 467 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!n2Vh}LpV4%Za?&Y0OWEOctjQh zm0t&8MkkHg6+l7B64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1S_1AIbU zf%O0X|F2%X`r^flmoHxeNg#Ok?Adb|fUuuFeF_l(G9YXq36vragzcG{3ba_QB*-tA zft5{6Tu0Z#)5|+HuDqkOt9!-DRa>@h+kf!PrOQ_yJbd){$&WvO6_zS{0d>stba4!c zIQ;hdNxmink=Dd55eGTv1URI=`)#ijJ!!L*rdsTr`t#GDOZNP-rEi5d;|rNk z?gnLH1&0O(#{VpA?|w2iShL?@xH0dX%W>a^>DiYIlz+Uf)xXZxFp=4f!HchgSs-5C zWhZBWbZ(%aZ8<~D4#jH>J~9T3AHK#m)*2dX@XU5m_P2V%W{JY_&xzP7Z c^O9+2*)B-3tX(;y7U)t2Pgg&ebxsLQ0C;ZdcK`qY diff --git a/themes/redmond98/titlebar/ontop_focus_inactive.png b/themes/redmond98/titlebar/ontop_focus_inactive.png deleted file mode 100644 index a48e1c5c7a4b20a783fb8afe704616531d367039..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 604 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!n2Vh}LpV4%Za?&Y0OWEOctjQh zm0t&8MkkHg6+l7B64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1UH2l#}z z0_p!SaP{id`}glZe*F0L>(@ZWvuDqqKY#x6A@jx=l%tUoZnBGYcCBC$E5rsJOI@yt=Wu zjkBkhcVKvWUU5lfReSfO8FLn`TD@`SzWt{!T)TDu(c>rYKYafB&{yph(aa1vpBB}n zeXRMsX2$$kdzYon6Z`nI(4bs6Qo(@7|6RvB{(I^B{lDIxfBW*npT1k}eiu8sKK>)q z{hl9nUu8;}^tSHUm*g(b82$4*zw=5bhr@N}m&>H??`BfJ6=}bSLEs?+yTyS{ diff --git a/themes/redmond98/titlebar/ontop_normal_active.png b/themes/redmond98/titlebar/ontop_normal_active.png deleted file mode 100644 index 117a203c65f0de56854c427b6125a147c8c0aeba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 467 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!n2Vh}LpV4%Za?&Y0OWEOctjQh zm0t&8MkkHg6+l7B64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1S_1AIbU zf%KU(XI8CRwQk+IjT<*^*|KFT7;M_KY4hgIKrR{sA_yme3^;(OgmdvQzOkO|23o9E z666=mz{(~juA}SW>E#_8SKiUt)xBcnsx4c$?LTR)GTn8@tL;Kf(L zED$g6vXiqwIyX?zww$46hvGE`9~lG24_{*&YYmMxavE-D7(MgdGvn*|rtg_w{@w7? gTmdKI;Vst0GABY_5c6? diff --git a/themes/redmond98/titlebar/ontop_normal_inactive.png b/themes/redmond98/titlebar/ontop_normal_inactive.png deleted file mode 100644 index d3a10c8a7d1f94a8f99dfbcda0e8338beef56657..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 604 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!n2Vh}LpV4%Za?&Y0OWEOctjQh zm0t&8MkkHg6+l7B64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1UH2l#}z z0_p$%|F2rLYXAQIaB}0ujqBI1-@JMAwr$&hYzSlP)~!JHmMvR=44?=QY}&L5NCHK` zJOme694HIq0!bi%C_^J5iXnoy)Szhra;Ido{{%YSrX(AeR0yWdN z0?j$^>Eaj?aro^tcd@1b9)^QWT^eE=w7d2;%bxsu{;8XMM#O~kZnZQ2o_VIu=$SM_ zpqE*oz*nT8v89+k zi|W!o)_h(wWB#nY%hKkFeSBJIP%a#)V8G-5uHzm5z4ZP5UvJO9eR<(e-z|5)iyd7b z|B>l_&yTvVGNnv&8?HB&zv)F;j$I0*KXLdZTpVB`;VQua{b|>XYbyB`ttSr zk6*w4{QdXQ>-P_!aZf#6977@wzrAvt?~s82OTgvo_X1V#_ik_b`@dd^Nz>xllUPQl zPjiZ9s(Z_|8;XifJ)dT^JzatO&4GDWuQzUG&`D{W!;q4~c>KsU`BU-EPtJVpcRb=c z&2m9UWYhPwul#yfrtxs!Fl7D1(Xl_RfH$Fm&wPp1qWK0E4}>PM@7i|!$^u!2;+A@&Q+O>Sd&5oo!9KPjrH;U8PhMs1gM6M3d=aetMz`PUzv1^1lKu>9!}IM3_H$92GL zgUZ*NJjYBH@R~{mF!r)NQS@fMG+_~A;)jb2-{%P$FJh7s^$28C4-WjbP0l+XkKj-jRa#!x(bdz}KXKaZx$_q+ zT)brIvYiLcU%qkY!NW&So<4i=>g~JtA3lEi{pat$NcD5TAZ8Twba4!cIQ(|<$uK5E z0as=wt;I@8N*A=wad8-(P*Kp>eCqfA{z7IUE1jU&=Q~c_{rc$My2)NG1`<5~yR7Sv ze2NvVIcCu))4+d@hnZoHq!PpW0@k#J9BB`E_Z-qapmk#35TB9V}k|LqfeI zH-D8u$lsSM=e@OF?-%-e`Cpmqm-=59Uwvnr@@LlJ`8^@BcQ<^ysCq2=kDtf?H~hcW z{Lk0DP@}kr`Sv^KrjFb;p}(BDVwd>j3d26B%k7e%pssQG?_9Np_n`+CvCB0c4bIuw zJ+uE!H1`?(|9+d?zVWALxL^PNu<6zNZ69`RzxS-WTS}w;uIKm0clY%c`@wonq;ZYAiBJSE=ovg+{an^LB{Ts5ij1~F diff --git a/themes/redmond98/titlebar/sticky_normal_active.png b/themes/redmond98/titlebar/sticky_normal_active.png deleted file mode 100644 index bdb5595dbafe4cd35499dc8c638f26ce27ceb835..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 654 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!n2Vh}LpV4%Za?&Y0OWEOctjQh zm0t&8MkkHg6+l7B64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1Uf1o(uw z0_p$%|F2rL>dculKyv^7{XlZtwrx9h?AW?>>!wYcwrtt5apOiH8%S>6ym`Zh4M0I4 z7s!T)K-2)aK$Soe&H#!70gwwM(WKA>A<95HDFab2w0MF3aV`n+3ua(sW@Y2x6qS@$ zR8mn>*U-||HFFIJi%%^mEh}$soiu&soOuhEtysNw!gnPb5^?zLmE(Me3 z5!Y#!3pyg3zNdZV*Sj)}hx>*h>mQDe{b>cf2@QPaORN^nH?VjhG>LuJw&Pb8$TAeS z%==)U;q`5D8^eo0%LV*NQAG{^*m5>%yR4hYGi8hWtF+C({^%^Y=X{3cPmjQPUOzsr z17;gkzTV_HX0m|SR4Rb6m+gt7H}jTx9q@PtbS~la#1OAftM4;Lr9ujIUEO VV$V(cq5||VgQu&X%Q~loCIC1(MV9~o diff --git a/themes/redmond98/titlebar/sticky_normal_inactive.png b/themes/redmond98/titlebar/sticky_normal_inactive.png deleted file mode 100644 index a96b9b1951dee732d570ce3afe9512f9e4546d8f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 758 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!n2Vh}LpV4%Za?&Y0OWEOctjQh zm0t&8MkkHg6+l7B64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1Tk2Ka=y z0_lc^hE=Op?ccv2NN(G<4Z_&Db0?6!Wy_Y08#e+O8#ZiMzkWTCv3c|6ty{MO1%ZrB zn>N9@K$Q?SP!Pg~Fd%AxB0vU&4Iz<5fEpoOAOj8{h5)$`^*{z(1g?e>M&715=YjK=Z`^tC@X?c}&tANG`|kaRkDq@3`TH+Y{Twie83jFE977@w zzny$CjLA^Im6=Ivv67O~1+8;j97ZQp6f`!U`u)GZkXgt|Cn)y$j#GEPKDxJVvR8|N z1ke92>-r;~Vnu6?Sv1Nt@So#hW|$+X#IU}AHEkhB+C$zwhjb5Uo!B?|&@zAh8?{LX zi`V~`t+h5latSLXVq{@2A<-`S@8nRR%6Pl)W@4c{)R9*h3t z=kfmy|F1Rw^K~!OC@x~Y{m!|mBezZHFK4dUB|f>ruutl8yW}URYh3<2SFPcF=z&G- za*aoWb9Q#m?0*x@eMbMk-zK+j{OK9)*S|k(di8$Whh5w6J?rk4(x|`d`MvSo{XO$N t;~h86&tYL<|G#zi)9%_tpr`zPu$~iXT;pyc6afr+22WQ%mvv4FO#rh4ggO8K diff --git a/themes/unity2/icons/README.md b/themes/unity2/icons/README.md new file mode 100644 index 0000000..b43f74a --- /dev/null +++ b/themes/unity2/icons/README.md @@ -0,0 +1,5 @@ +battery status icons, lock/shutdown/suspend icons, volume status icons were taken from the Breeze icons theme. (https://develop.kde.org/frameworks/breeze-icons/, copyright KDE and licensed under the GNU LGPL version 3 or later) + +battery status icons in particular were modified to look somewhat less ugly when recolored to a single color. this was done because the config automatically recolors all icons to the color value of the foreground (text) color. + +the author of this config does not claim copyright of any icons present in this folder unless stated otherwise in the icon's license metadata. diff --git a/themes/unity2/icons/mail.svg b/themes/unity2/icons/mail.svg new file mode 100644 index 0000000..59d2196 --- /dev/null +++ b/themes/unity2/icons/mail.svg @@ -0,0 +1,167 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/themes/unity2/icons/wallpaper.svg b/themes/unity2/icons/wallpaper.svg new file mode 100644 index 0000000..67ede24 --- /dev/null +++ b/themes/unity2/icons/wallpaper.svg @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/themes/unity2/theme.lua b/themes/unity2/theme.lua index cfb63ef..fc21716 100644 --- a/themes/unity2/theme.lua +++ b/themes/unity2/theme.lua @@ -2,15 +2,12 @@ local theme_assets = require("beautiful.theme_assets") local xresources = require("beautiful.xresources") local dpi = xresources.apply_dpi -local gfs = require("gears.filesystem") -local themes_path = os.getenv("HOME").."/.config/awesome/themes/" -local theme_name = "unity2" - local theme = {} +theme.name = "unity2" + theme.font = "Ubuntu Regular 9" theme.unitybar_width = dpi(55) - theme.icon_rounding = 5 theme.tasklist_button_shape_border_width = dpi(1) theme.tasklist_button_shape_border_color = "#262626AA" @@ -91,7 +88,7 @@ theme.notification_height = dpi(80) -- Variables set for theming the menu: -- menu_[bg|fg]_[normal|focus] -- menu_[border_color|border_width] -theme.menu_submenu_icon = themes_path..theme_name.."/submenu.png" +theme.menu_submenu_icon = global.themes_dir..theme.name.."/submenu.png" theme.menu_height = dpi(18) theme.menu_width = dpi(140) @@ -101,51 +98,51 @@ theme.menu_width = dpi(140) --theme.bg_widget = "#cc0000" -- Define the image to load -theme.titlebar_close_button_normal = themes_path..theme_name.."/titlebar/close_normal.png" -theme.titlebar_close_button_focus = themes_path..theme_name.."/titlebar/close_focus.png" +theme.titlebar_close_button_normal = global.themes_dir..theme.name.."/titlebar/close_normal.png" +theme.titlebar_close_button_focus = global.themes_dir..theme.name.."/titlebar/close_focus.png" -theme.titlebar_minimize_button_normal = themes_path..theme_name.."/titlebar/minimize_normal.png" -theme.titlebar_minimize_button_focus = themes_path..theme_name.."/titlebar/minimize_focus.png" +theme.titlebar_minimize_button_normal = global.themes_dir..theme.name.."/titlebar/minimize_normal.png" +theme.titlebar_minimize_button_focus = global.themes_dir..theme.name.."/titlebar/minimize_focus.png" -theme.titlebar_ontop_button_normal_inactive = themes_path..theme_name.."/titlebar/ontop_normal_inactive.png" -theme.titlebar_ontop_button_focus_inactive = themes_path..theme_name.."/titlebar/ontop_focus_inactive.png" -theme.titlebar_ontop_button_normal_active = themes_path..theme_name.."/titlebar/ontop_normal_active.png" -theme.titlebar_ontop_button_focus_active = themes_path..theme_name.."/titlebar/ontop_focus_active.png" +theme.titlebar_ontop_button_normal_inactive = global.themes_dir..theme.name.."/titlebar/ontop_normal_inactive.png" +theme.titlebar_ontop_button_focus_inactive = global.themes_dir..theme.name.."/titlebar/ontop_focus_inactive.png" +theme.titlebar_ontop_button_normal_active = global.themes_dir..theme.name.."/titlebar/ontop_normal_active.png" +theme.titlebar_ontop_button_focus_active = global.themes_dir..theme.name.."/titlebar/ontop_focus_active.png" -theme.titlebar_sticky_button_normal_inactive = themes_path..theme_name.."/titlebar/sticky_normal_inactive.png" -theme.titlebar_sticky_button_focus_inactive = themes_path..theme_name.."/titlebar/sticky_focus_inactive.png" -theme.titlebar_sticky_button_normal_active = themes_path..theme_name.."/titlebar/sticky_normal_active.png" -theme.titlebar_sticky_button_focus_active = themes_path..theme_name.."/titlebar/sticky_focus_active.png" +theme.titlebar_sticky_button_normal_inactive = global.themes_dir..theme.name.."/titlebar/sticky_normal_inactive.png" +theme.titlebar_sticky_button_focus_inactive = global.themes_dir..theme.name.."/titlebar/sticky_focus_inactive.png" +theme.titlebar_sticky_button_normal_active = global.themes_dir..theme.name.."/titlebar/sticky_normal_active.png" +theme.titlebar_sticky_button_focus_active = global.themes_dir..theme.name.."/titlebar/sticky_focus_active.png" -theme.titlebar_floating_button_normal_inactive = themes_path..theme_name.."/titlebar/floating_normal_inactive.png" -theme.titlebar_floating_button_focus_inactive = themes_path..theme_name.."/titlebar/floating_focus_inactive.png" -theme.titlebar_floating_button_normal_active = themes_path..theme_name.."/titlebar/floating_normal_active.png" -theme.titlebar_floating_button_focus_active = themes_path..theme_name.."/titlebar/floating_focus_active.png" +theme.titlebar_floating_button_normal_inactive = global.themes_dir..theme.name.."/titlebar/floating_normal_inactive.png" +theme.titlebar_floating_button_focus_inactive = global.themes_dir..theme.name.."/titlebar/floating_focus_inactive.png" +theme.titlebar_floating_button_normal_active = global.themes_dir..theme.name.."/titlebar/floating_normal_active.png" +theme.titlebar_floating_button_focus_active = global.themes_dir..theme.name.."/titlebar/floating_focus_active.png" -theme.titlebar_maximized_button_normal_inactive = themes_path..theme_name.."/titlebar/maximized_normal_inactive.png" -theme.titlebar_maximized_button_focus_inactive = themes_path..theme_name.."/titlebar/maximized_focus_inactive.png" -theme.titlebar_maximized_button_normal_active = themes_path..theme_name.."/titlebar/maximized_normal_active.png" -theme.titlebar_maximized_button_focus_active = themes_path..theme_name.."/titlebar/maximized_focus_active.png" +theme.titlebar_maximized_button_normal_inactive = global.themes_dir..theme.name.."/titlebar/maximized_normal_inactive.png" +theme.titlebar_maximized_button_focus_inactive = global.themes_dir..theme.name.."/titlebar/maximized_focus_inactive.png" +theme.titlebar_maximized_button_normal_active = global.themes_dir..theme.name.."/titlebar/maximized_normal_active.png" +theme.titlebar_maximized_button_focus_active = global.themes_dir..theme.name.."/titlebar/maximized_focus_active.png" -theme.wallpaper = themes_path..theme_name.."/background.png" +theme.wallpaper = global.themes_dir..theme.name.."/background.png" -- You can use your own layout icons like this: -theme.layout_fairh = themes_path..theme_name.."/layouts/fairhw.png" -theme.layout_fairv = themes_path..theme_name.."/layouts/fairvw.png" -theme.layout_floating = themes_path..theme_name.."/layouts/floatingw.png" -theme.layout_magnifier = themes_path..theme_name.."/layouts/magnifierw.png" -theme.layout_max = themes_path..theme_name.."/layouts/maxw.png" -theme.layout_fullscreen = themes_path..theme_name.."/layouts/fullscreenw.png" -theme.layout_tilebottom = themes_path..theme_name.."/layouts/tilebottomw.png" -theme.layout_tileleft = themes_path..theme_name.."/layouts/tileleftw.png" -theme.layout_tile = themes_path..theme_name.."/layouts/tilew.png" -theme.layout_tiletop = themes_path..theme_name.."/layouts/tiletopw.png" -theme.layout_spiral = themes_path..theme_name.."/layouts/spiralw.png" -theme.layout_dwindle = themes_path..theme_name.."/layouts/dwindlew.png" -theme.layout_cornernw = themes_path..theme_name.."/layouts/cornernww.png" -theme.layout_cornerne = themes_path..theme_name.."/layouts/cornernew.png" -theme.layout_cornersw = themes_path..theme_name.."/layouts/cornersww.png" -theme.layout_cornerse = themes_path..theme_name.."/layouts/cornersew.png" +theme.layout_fairh = global.themes_dir..theme.name.."/layouts/fairhw.png" +theme.layout_fairv = global.themes_dir..theme.name.."/layouts/fairvw.png" +theme.layout_floating = global.themes_dir..theme.name.."/layouts/floatingw.png" +theme.layout_magnifier = global.themes_dir..theme.name.."/layouts/magnifierw.png" +theme.layout_max = global.themes_dir..theme.name.."/layouts/maxw.png" +theme.layout_fullscreen = global.themes_dir..theme.name.."/layouts/fullscreenw.png" +theme.layout_tilebottom = global.themes_dir..theme.name.."/layouts/tilebottomw.png" +theme.layout_tileleft = global.themes_dir..theme.name.."/layouts/tileleftw.png" +theme.layout_tile = global.themes_dir..theme.name.."/layouts/tilew.png" +theme.layout_tiletop = global.themes_dir..theme.name.."/layouts/tiletopw.png" +theme.layout_spiral = global.themes_dir..theme.name.."/layouts/spiralw.png" +theme.layout_dwindle = global.themes_dir..theme.name.."/layouts/dwindlew.png" +theme.layout_cornernw = global.themes_dir..theme.name.."/layouts/cornernww.png" +theme.layout_cornerne = global.themes_dir..theme.name.."/layouts/cornernew.png" +theme.layout_cornersw = global.themes_dir..theme.name.."/layouts/cornersww.png" +theme.layout_cornerse = global.themes_dir..theme.name.."/layouts/cornersew.png" -- Generate Awesome icon: theme.awesome_icon = theme_assets.awesome_icon( @@ -156,35 +153,6 @@ theme.awesome_icon = theme_assets.awesome_icon( -- from /usr/share/icons and /usr/share/icons/hicolor will be used. theme.icon_theme = "Adwaita" --- Recolor icons -theme_assets.recolor_titlebar(theme,theme.fg_normal,"normal") -theme_assets.recolor_titlebar(theme,theme.fg_focus,"focus") -theme_assets.recolor_layout(theme,theme.fg_normal) - --- Powermenu icons -theme.powercontrol_icon_shutdown = themes_path..theme_name.."/icons/shutdown.svg" -theme.powercontrol_icon_suspend = themes_path..theme_name.."/icons/suspend.svg" -theme.powercontrol_icon_lock = themes_path..theme_name.."/icons/lock.svg" - --- Volume icons -theme.volume_icon_high = themes_path..theme_name.."/icons/volume-high.svg" -theme.volume_icon_medium = themes_path..theme_name.."/icons/volume-medium.svg" -theme.volume_icon_low = themes_path..theme_name.."/icons/volume-low.svg" -theme.volume_icon_muted = themes_path..theme_name.."/icons/volume-muted.svg" - --- Battery icons -theme.battery_caution_charging_symbolic = themes_path..theme_name.."/icons/battery-caution-charging-symbolic.svg" -theme.battery_caution_symbolic = themes_path..theme_name.."/icons/battery-caution-symbolic.svg" -theme.battery_empty_charging_symbolic = themes_path..theme_name.."/icons/battery-empty-charging-symbolic.svg" -theme.battery_empty_symbolic = themes_path..theme_name.."/icons/battery-empty-symbolic.svg" -theme.battery_full_charged_symbolic = themes_path..theme_name.."/icons/battery-full-charged-symbolic.svg" -theme.battery_full_charging_symbolic = themes_path..theme_name.."/icons/battery-full-charging-symbolic.svg" -theme.battery_full_symbolic = themes_path..theme_name.."/icons/battery-full-symbolic.svg" -theme.battery_good_charging_symbolic = themes_path..theme_name.."/icons/battery-good-charging-symbolic.svg" -theme.battery_good_symbolic = themes_path..theme_name.."/icons/battery-good-symbolic.svg" -theme.battery_low_charging_symbolic = themes_path..theme_name.."/icons/battery-low-charging-symbolic.svg" -theme.battery_low_symbolic = themes_path..theme_name.."/icons/battery-low-symbolic.svg" -theme.battery_missing_symbolic = themes_path..theme_name.."/icons/battery-missing-symbolic.svg" return theme -- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80 diff --git a/widgets/battery.lua b/widgets/battery.lua index 891e133..6f22842 100644 --- a/widgets/battery.lua +++ b/widgets/battery.lua @@ -6,14 +6,11 @@ local awmtk = require("awmtk") return function(args) local style = awmtk.style(awmtk.defaults, args.style or {},"battery_") local device = args.device or "default" - local power_command = args.command or "upower -d" - local function get_icon(name) - return style[name] - end + local power_command = args.command or {"upower", "-d"} local icon = style.icon({ { widget = wibox.widget.imagebox, - image = get_icon("battery_missing_symbolic"), + image = style["battery_missing_symbolic"], id = "widget_icon", resize = true }, @@ -30,12 +27,11 @@ return function(args) timeout = 10, call_now = true, callback = function() - awful.spawn.easy_async_with_shell(power_command, function(out) + awful.spawn.easy_async(power_command, function(out) local icon_name = out:match("icon%-name:%s+'(battery%-[^']+)'") local value = out:match("percentage:%s+(%d+%%)") icon:get_children_by_id("widget_icon")[1].image = - gears.color.recolor_image(get_icon(icon_name:gsub("%-","_")), - style.battery_icon_fg_normal) + style[icon_name:gsub("%-","_")] if args.percentage and value then icon:get_children_by_id("widget_text")[1].markup = value end diff --git a/widgets/mailbox/init.lua b/widgets/mailbox.lua similarity index 92% rename from widgets/mailbox/init.lua rename to widgets/mailbox.lua index 0ef3bbb..66f1f3a 100644 --- a/widgets/mailbox/init.lua +++ b/widgets/mailbox.lua @@ -7,14 +7,10 @@ local naughty = require("naughty") local awmtk_status,awmtk = pcall(require,"awmtk") local dbus_config = require("naughty.dbus") local widget = {} -local path_to_icons = os.getenv("HOME").."/.config/awesome/widgets/mailbox/" local function worker(args) - local style = {} local args = args or {} -- Set up style variables - if awmtk_status then - style = awmtk.style(awmtk.defaults,args.style,"mailbox_") - end + style = awmtk.style(awmtk.defaults,args.style,"mailbox_") style.mailbox_container_width = style.mailbox_container_width or 260 style.mailbox_button_height = style.mailbox_button_heihgt or 40 args.mail_limit = args.mail_limit or 8 @@ -47,8 +43,7 @@ local function worker(args) -- Create a mailbox button args.screen.notify_widget = style.icon ( { - image = gears.color.recolor_image(path_to_icons.."Mail.png", - style.mailbox_icon_fg_normal), + image = style["mailbox_icon"], widget = wibox.widget.imagebox },{},{ function() diff --git a/widgets/mailbox/Mail.png b/widgets/mailbox/Mail.png deleted file mode 100644 index d5f0ed9154621fa2c7d00aa319b3e0a5252708dc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5118 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 GpZ*8(+%d}l diff --git a/widgets/volume.lua b/widgets/volume.lua index b0185a3..b905fbd 100644 --- a/widgets/volume.lua +++ b/widgets/volume.lua @@ -16,10 +16,6 @@ return function(args) "Master", "Headphone" } - for k,v in pairs(icons) do - icons[k] = gears.color.recolor_image(v, - style.volume_icon_fg_normal) - end local function get_icon(percent) if percent >= 66 then return icons.high diff --git a/widgets/wallpapers/init.lua b/widgets/wallpapers.lua similarity index 78% rename from widgets/wallpapers/init.lua rename to widgets/wallpapers.lua index 0dffe5a..175579b 100644 --- a/widgets/wallpapers/init.lua +++ b/widgets/wallpapers.lua @@ -3,10 +3,9 @@ local beautiful = require("beautiful") local gears = require("gears") local spawn = require("awful.spawn") local wibox = require("wibox") -local naughty = require("naughty") local awmtk = require("awmtk") +local thumbnailer = require("thumbnail") local widget = {} -local path_to_icons = os.getenv("HOME").."/.config/awesome/widgets/wallpapers/" local function ls(path) local ls_data = io.popen("ls -1 "..path) local output = {} @@ -21,20 +20,22 @@ end local function worker(args) local args = args or {} - if not args["screen"] then error("Screen not specified") end - if not args["path"] then error("Path to wallpapers folder not specified") end - args["configdir"] = args["configdir"] or os.getenv("HOME") + assert(type(args["screen"]) ~= "nil","Screen not specified") + assert(type(args["path"]) ~= "nil","Path to wallpapers folder not specified") + --add an extra slash to path if there is none + if not args["path"]:match("/$") then + args["path"] = args["path"].."/" + end --create local style - local style = {} - style = awmtk.style(awmtk.defaults,args.style or {},"wallpapers_") + local style = awmtk.style(awmtk.defaults,args.style or {},"wallpapers_") --set wallpaper - local handler = io.open(args["configdir"].."/.wallpaper","r") + local handler = io.open(global.config_dir.."/.wallpaper","r") if handler then local wallpaper_path = handler:read("*a") gears.wallpaper.maximized(wallpaper_path,args["screen"]) end local function update_last_wallpaper(s) - local handler = io.open(args["configdir"].."/.wallpaper","w") + local handler = io.open(global.config_dir.."/.wallpaper","w") handler:write(s) handler:close() end @@ -44,12 +45,14 @@ local function worker(args) if not (v:match("%.jpg$") or v:match("%.png$")) then image_list[k] = nil end - end + end + --generate thumbnails to save up memory + thumbnailer.generate(args["path"],args["path"]..".thumbnails",60) --style variables local button_bg = style.wallpapers_button_bg_focus local function new_wallpaper_button(image,s) local new_widget = style.button({ - image = args["path"]..image, + image = args["path"]..".thumbnails/"..image, resize = true, widget = wibox.widget.imagebox },{ @@ -84,8 +87,7 @@ local function worker(args) } )) local clip_widget = style.icon({ - image = gears.color.recolor_image(path_to_icons.."wallpaper-icon.png", - style.wallpapers_icon_fg_normal), + image = style["wallpapers_icon"], resize = true, widget = wibox.widget.imagebox },{},{ diff --git a/widgets/wallpapers/wallpaper-icon.png b/widgets/wallpapers/wallpaper-icon.png deleted file mode 100644 index d7c6f9bd0c19882c7a7b06f6ace67b49f792abc9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13478 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