Added volume widget

desktop/init.lua

@@ -6,7 +6,7 @@ local desktop = {
 		textclock = require("desktop.widgets.textclock"),
 		layoutbox = require("desktop.widgets.layoutbox"),
 		keymap = modules.ibus.widgets.ibus,
-		volume = require("desktop.widgets.volume"),
+		volume = modules.volume.widgets.volume,
 		tagindicator = require("desktop.widgets.tagindicator"),
 		launcher = require("desktop.widgets.launcher"),
 		shortcut = require("desktop.widgets.shortcut"),

desktop/widgets/launcher.lua

@@ -46,7 +46,4 @@ widget.widget:connect_signal("button::press",
 		end
 	end
 )
-
-wrapper.volume.commands:get(widget.update)
-
 return widget.widget

desktop/widgets/volume.lua

@@ -1,142 +0,0 @@
-local widget = {}
-
-
-widget.icon = wibox.widget {
-	resize = true,
-	image = beautiful.icons.volume.mute,
-	widget = wibox.widget.imagebox
-}
-
-widget.arc = wibox.widget {
-	{
-		widget.icon,
-		top = beautiful.dpi(1),
-		bottom = beautiful.dpi(1),
-		layout = wibox.container.margin,
-	},
-	max_value = 1,
-	thickness = beautiful.dpi(4),
-	start_angle = 4.71238898, -- 2pi*3/4
-	--forced_height = beautiful.dpi(16),
-	--forced_width = beautiful.dpi(16),
-	colors = {"#27D4CC", "#00446B"},
-	bg = "#FFFFFF30",
-	paddings = beautiful.dpi(2),
-	widget = wibox.container.arcchart
-}
-
-widget.bar = wibox.widget {
-	max_value = 100,
-	value = 0,
-	--forced_height = 20,
-	forced_width = beautiful.dpi(50),
-	paddings = 0,
-	border_width = 0,
-	color = {
-		type = "linear",
-		from = {0, 0}, to = {beautiful.dpi(50), 0},
-		stops = { { 0, "#27D4CC" }, { 1, "#00446B" }}
-	},
-	background_color = "#FFFFFF30",
-	widget = wibox.widget.progressbar,
-	shape = gears.shape.rounded_bar,
-}
-
-
-widget.widget = wibox.widget {
-	{
-		{   -- Right space
-			widget = wibox.widget.separator,
-			color = beautiful.color.transparent,
-			forced_width = beautiful.dpi(3)
-		},
-		{
-			widget.arc,
-			top = beautiful.dpi(2),
-			bottom = beautiful.dpi(2),
-			layout = wibox.container.margin,
-		},
-		{   -- Left space
-			widget = wibox.widget.separator,
-			color = beautiful.color.transparent,
-			forced_width = beautiful.dpi(3)
-		},
-		layout = wibox.layout.align.horizontal,
-	},
-	layout = wibox.container.background,
-}
-
-widget.widget:connect_signal("mouse::enter", function(result)
-	widget.widget.bg = beautiful.color.bar.hover_bg
-
-end)
-
-widget.widget:connect_signal("mouse::leave", function(result)
-	widget.widget.bg = beautiful.color.transparent
-end)
-
-widget.widget:connect_signal("button::press",
-	function(_, _, _, button, mods)
-
-		-- Right-click
-		if (button == 3) then
-			wrapper.volume.togglemute()
-
-		-- Scroll up
-		elseif (button == 4) then
-			wrapper.volume.up()
-
-		-- Scroll down
-		elseif (button == 5) then
-			wrapper.volume.down()
-		end
-	end
-)
-
-widget.update = function(status)
-
-	if (status.value == false) then
-		widget.icon.image = beautiful.icons.volume.error
-		widget.arc.value = 100;
-		widget.bar.value = 100;
-		return
-	end
-
-	widget.arc.value = status.value / 100;
-	widget.bar.value = status.value;
-
-
-	if (status.mute) then
-		-- Set muted icon
-		widget.icon.image = beautiful.icons.volume.mute
-	else
-		-- Set icon by value
-		if status.value > 70 then
-			widget.icon.image = beautiful.icons.volume.high
-		elseif status.value > 40 then
-			widget.icon.image = beautiful.icons.volume.medium
-		elseif status.value > 0 then
-			widget.icon.image = beautiful.icons.volume.low
-		elseif status.value == 0 then
-			widget.icon.image = beautiful.icons.volume.off
-		end
-	end
-end
-
-
-
--- Add various hooks
-
-wrapper.volume.add_hook(widget.update)
-wrapper.volume.commands:watch(
-	5,
-	function()
-		wrapper.volume.commands:get(widget.update)
-	end,
-	widget.widget
-)
-
--- Update volume widget at start
-wrapper.volume.commands:get(widget.update)
-
-return widget.widget