From: copycat-killer <dada@archlinux.info>
Date: Mon, 23 Jan 2017 14:14:16 +0000 (+0100)
Subject: alsabar: revert #275; remove buttons and beautiful deps
X-Git-Url: https://git.madduck.net/etc/awesome.git/commitdiff_plain/f53ae25b0c4e9c6d78d30ead1f1f13e34dce187e?hp=09c0a3f27b6c0b61a55e7875b9a967e98cd3daf8

alsabar: revert #275; remove buttons and beautiful deps
---

diff --git a/widgets/alsabar.lua b/widgets/alsabar.lua
index 3ade35c..430063b 100644
--- a/widgets/alsabar.lua
+++ b/widgets/alsabar.lua
@@ -6,7 +6,6 @@
 
 local helpers      = require("lain.helpers")
 local awful        = require("awful")
-local beautiful    = require("beautiful")
 local naughty      = require("naughty")
 local wibox        = require("wibox")
 local math         = { modf   = math.modf }
@@ -21,23 +20,19 @@ local terminal     = "urxvtc" or "xterm"
 -- ALSA volume bar
 -- lain.widgets.alsabar
 local alsabar = {
+<<<<<<< HEAD
+=======
     channel = "Master",
     step    = "1%",
     mixer   = "amixer",
 
+>>>>>>> 09c0a3f27b6c0b61a55e7875b9a967e98cd3daf8
     colors = {
-        background = beautiful.bg_normal,
+        background = "#000000",
         mute       = "#EB8F8F",
         unmute     = "#A4CE8A"
     },
 
-    notifications = {
-        font      = beautiful.font:sub(beautiful.font:find(""), beautiful.font:find(" ")),
-        font_size = "11",
-        color     = beautiful.fg_normal,
-        screen    = 1
-    },
-
     _current_level = 0,
     _muted         = false
 }
@@ -52,6 +47,18 @@ local function worker(args)
     local ticks_size   = args.ticks_size or 7
     local vertical     = args.vertical or false
 
+<<<<<<< HEAD
+    alsabar.cmd                 = args.cmd or "amixer"
+    alsabar.channel             = args.channel or "Master"
+    alsabar.colors              = args.colors or alsabar.colors
+    alsabar.followtag           = args.followtag or false
+    alsabar._notify             = args.notify or "on"
+    alsabar.notification_preset = args.notification_preset
+
+    if not alsabar.notification_preset then
+        alsabar.notification_preset      = naughty.config.defaults
+        alsabar.notification_preset.font = "Monospace 11"
+=======
     alsabar.mixer         = args.mixer or alsabar.mixer
     alsabar.channel       = args.channel or alsabar.channel
     alsabar.togglechannel = args.togglechannel or alsabar.togglechannel
@@ -62,6 +69,7 @@ local function worker(args)
     alsabar.followtag     = args.followtag or false
     if alsabar.togglechannel then
             alsabar.cmd   = args.cmd or { "bash", "-c", string.format("%s get %s; %s get %s", alsabar.mixer, alsabar.channel, alsabar.mixer, alsabar.togglechannel)}
+>>>>>>> 09c0a3f27b6c0b61a55e7875b9a967e98cd3daf8
     end
 
     alsabar.bar = wibox.widget {
@@ -107,8 +115,7 @@ local function worker(args)
             then
                 alsabar._current_level = tonumber(volu) or alsabar._current_level
                 alsabar.bar:set_value(alsabar._current_level / 100)
-                if (not mute and tonumber(volu) == 0) or mute == "off"
-                then
+                if (not mute and tonumber(volu) == 0) or mute == "off" then
                     alsabar._muted = true
                     alsabar.tooltip:set_text ("[Muted]")
                     alsabar.bar.color = alsabar.colors.mute
@@ -131,15 +138,7 @@ local function worker(args)
 
     function alsabar.notify()
         alsabar.update(function()
-            local preset = {
-                title   = "",
-                text    = "",
-                timeout = 5,
-                screen  = alsabar.notifications.screen,
-                font    = string.format("%s %s", alsabar.notifications.font,
-                          alsabar.notifications.font_size),
-                fg      = alsabar.notifications.color
-            }
+            local preset = alsabar.notification_preset
 
             if alsabar._muted then
                 preset.title = string.format("%s - Muted", alsabar.channel)
@@ -153,18 +152,17 @@ local function worker(args)
 
             if alsabar.followtag then preset.screen = awful.screen.focused() end
 
-            if alsabar._notify then
-                alsabar._notify = naughty.notify ({
-                    replaces_id = alsabar._notify.id,
-                    preset      = preset,
-                })
-            else
-                alsabar._notify = naughty.notify ({ preset = preset })
+            if alsabar._notify == "on" then
+                alsabar.id = naughty.notify ({
+                    replaces_id = alsabar.id,
+                    preset      = preset
+                }).id
             end
         end)
     end
 
     timer_id = string.format("alsabar-%s-%s", alsabar.cmd, alsabar.channel)
+
     helpers.newtimer(timer_id, timeout, alsabar.update)
 
     return alsabar
diff --git a/wiki b/wiki
index a1f6085..a361f62 160000
--- a/wiki
+++ b/wiki
@@ -1 +1 @@
-Subproject commit a1f6085dae8150248baf97bb12229c1c81387f24
+Subproject commit a361f62a126fb7de921bc3c49db8a35bebad355a