From d32ea402c6305c1ac9a0fa05a1c61846a3c043ce Mon Sep 17 00:00:00 2001 From: Artem Kuskis Date: Sun, 21 May 2023 17:42:25 +0100 Subject: [PATCH 1/2] Provide icon from outside and reduce amount of hard coded path --- volume-widget/volume.lua | 13 +++++++------ volume-widget/widgets/arc-widget.lua | 3 ++- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/volume-widget/volume.lua b/volume-widget/volume.lua index 4c440422..b76f446b 100644 --- a/volume-widget/volume.lua +++ b/volume-widget/volume.lua @@ -13,8 +13,9 @@ local spawn = require("awful.spawn") local gears = require("gears") local beautiful = require("beautiful") local watch = require("awful.widget.watch") -local utils = require("awesome-wm-widgets.volume-widget.utils") +local this_library_path = (...):match("(.-)[^%.]+$") +local utils = require(this_library_path .. "utils") local LIST_DEVICES_CMD = [[sh -c "pacmd list-sinks; pacmd list-sources"]] local function GET_VOLUME_CMD(device) return 'amixer -D ' .. device .. ' sget Master' end @@ -24,11 +25,11 @@ local function TOG_VOLUME_CMD(device) return 'amixer -D ' .. device .. ' sset Ma local widget_types = { - icon_and_text = require("awesome-wm-widgets.volume-widget.widgets.icon-and-text-widget"), - icon = require("awesome-wm-widgets.volume-widget.widgets.icon-widget"), - arc = require("awesome-wm-widgets.volume-widget.widgets.arc-widget"), - horizontal_bar = require("awesome-wm-widgets.volume-widget.widgets.horizontal-bar-widget"), - vertical_bar = require("awesome-wm-widgets.volume-widget.widgets.vertical-bar-widget") + icon_and_text = require(this_library_path .. "widgets.icon-and-text-widget"), + icon = require(this_library_path .. "widgets.icon-widget"), + arc = require(this_library_path .. "widgets.arc-widget"), + horizontal_bar = require(this_library_path .. "widgets.horizontal-bar-widget"), + vertical_bar = require(this_library_path .. "widgets.vertical-bar-widget") } local volume = {} diff --git a/volume-widget/widgets/arc-widget.lua b/volume-widget/widgets/arc-widget.lua index b512f127..6fdee888 100644 --- a/volume-widget/widgets/arc-widget.lua +++ b/volume-widget/widgets/arc-widget.lua @@ -13,11 +13,12 @@ function widget.get_widget(widgets_args) local bg_color = args.bg_color or '#ffffff11' local mute_color = args.mute_color or beautiful.fg_urgent local size = args.size or 18 + local icon = args.icon or ICON_DIR .. 'audio-volume-high-symbolic.svg' return wibox.widget { { id = "icon", - image = ICON_DIR .. 'audio-volume-high-symbolic.svg', + image = icon, resize = true, widget = wibox.widget.imagebox, }, From ae6f8d4cdcf5a10163d2acbafdfefff748cd8050 Mon Sep 17 00:00:00 2001 From: Artem Kuskis Date: Sun, 21 May 2023 19:20:49 +0100 Subject: [PATCH 2/2] chore: be able to provide path to icons folder and path to the custom icon --- volume-widget/widgets/arc-widget.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/volume-widget/widgets/arc-widget.lua b/volume-widget/widgets/arc-widget.lua index 6fdee888..3d7e7ef1 100644 --- a/volume-widget/widgets/arc-widget.lua +++ b/volume-widget/widgets/arc-widget.lua @@ -13,7 +13,8 @@ function widget.get_widget(widgets_args) local bg_color = args.bg_color or '#ffffff11' local mute_color = args.mute_color or beautiful.fg_urgent local size = args.size or 18 - local icon = args.icon or ICON_DIR .. 'audio-volume-high-symbolic.svg' + local icon_dir = args.icon_dir or ICON_DIR + local icon = args.icon_path or icon_dir .. 'audio-volume-high-symbolic.svg' return wibox.widget { {