#56: removed 'ncmpcpp toggle' due to deprecation

This commit is contained in:
luke bonham 2014-10-01 13:25:29 +02:00
parent b7016c15a1
commit c65469db20
8 changed files with 17 additions and 15 deletions

View File

@ -452,7 +452,7 @@ globalkeys = awful.util.table.join(
-- MPD control -- MPD control
awful.key({ altkey, "Control" }, "Up", awful.key({ altkey, "Control" }, "Up",
function () function ()
awful.util.spawn_with_shell("mpc toggle || ncmpcpp toggle || ncmpc toggle || pms toggle") awful.util.spawn_with_shell("mpc toggle || ncmpc toggle || pms toggle")
mpdwidget.update() mpdwidget.update()
end), end),
awful.key({ altkey, "Control" }, "Down", awful.key({ altkey, "Control" }, "Down",

View File

@ -118,6 +118,8 @@ require("freedesktop/freedesktop")
-- {{{ Wibox -- {{{ Wibox
markup = lain.util.markup markup = lain.util.markup
blue = beautiful.fg_focus blue = beautiful.fg_focus
red = "#EB8F8F"
green = "#8FEB8F"
-- Textclock -- Textclock
mytextclock = awful.widget.textclock("<span font='Tamsyn 5'> </span>%H:%M ") mytextclock = awful.widget.textclock("<span font='Tamsyn 5'> </span>%H:%M ")
@ -186,18 +188,18 @@ batupd = lain.widgets.bat({
baticon:set_image(beautiful.ac) baticon:set_image(beautiful.ac)
else else
bat_perc = tonumber(bat_now.perc) bat_perc = tonumber(bat_now.perc)
if bat_perc > 50 then if bat_perc >= 98 then
batbar:set_color(green)
elseif bat_perc > 50 then
batbar:set_color(beautiful.fg_normal) batbar:set_color(beautiful.fg_normal)
baticon:set_image(beautiful.bat) baticon:set_image(beautiful.bat)
elseif bat_perc > 15 then elseif bat_perc > 15 then
batbar:set_color(beautiful.fg_normal) batbar:set_color(beautiful.fg_normal)
baticon:set_image(beautiful.bat_low) baticon:set_image(beautiful.bat_low)
else else
batbar:set_color("#EB8F8F") batbar:set_color(red)
baticon:set_image(beautiful.bat_no) baticon:set_image(beautiful.bat_no)
end end
end end
batbar:set_value(bat_perc / 100) batbar:set_value(bat_perc / 100)
end end
@ -244,10 +246,10 @@ settings = function()
volicon:set_image(beautiful.vol) volicon:set_image(beautiful.vol)
end end
end, end,
colors = colors =
{ {
background = beautiful.bg_normal, background = beautiful.bg_normal,
mute = "#EB8F8F", mute = red,
unmute = beautiful.fg_normal unmute = beautiful.fg_normal
}}) }})
volmargin = wibox.layout.margin(volume.bar, 2, 7) volmargin = wibox.layout.margin(volume.bar, 2, 7)
@ -505,7 +507,7 @@ globalkeys = awful.util.table.join(
-- MPD control -- MPD control
awful.key({ altkey, "Control" }, "Up", awful.key({ altkey, "Control" }, "Up",
function () function ()
awful.util.spawn_with_shell("mpc toggle || ncmpcpp toggle || ncmpc toggle || pms toggle") awful.util.spawn_with_shell("mpc toggle || ncmpc toggle || pms toggle")
mpdwidget.update() mpdwidget.update()
end), end),
awful.key({ altkey, "Control" }, "Down", awful.key({ altkey, "Control" }, "Down",

View File

@ -452,7 +452,7 @@ globalkeys = awful.util.table.join(
-- MPD control -- MPD control
awful.key({ altkey, "Control" }, "Up", awful.key({ altkey, "Control" }, "Up",
function () function ()
awful.util.spawn_with_shell("mpc toggle || ncmpcpp toggle || ncmpc toggle || pms toggle") awful.util.spawn_with_shell("mpc toggle || ncmpc toggle || pms toggle")
mpdwidget.update() mpdwidget.update()
end), end),
awful.key({ altkey, "Control" }, "Down", awful.key({ altkey, "Control" }, "Down",

View File

@ -218,7 +218,7 @@ function ()
end))) end)))
play_pause_icon:buttons(awful.util.table.join(awful.button({}, 1, play_pause_icon:buttons(awful.util.table.join(awful.button({}, 1,
function () function ()
awful.util.spawn_with_shell("mpc toggle || ncmpcpp toggle || ncmpc toggle || pms toggle") awful.util.spawn_with_shell("mpc toggle || ncmpc toggle || pms toggle")
mpdwidget.update() mpdwidget.update()
end))) end)))
@ -587,7 +587,7 @@ globalkeys = awful.util.table.join(
-- MPD control -- MPD control
awful.key({ altkey, "Control" }, "Up", awful.key({ altkey, "Control" }, "Up",
function () function ()
awful.util.spawn_with_shell("mpc toggle || ncmpcpp toggle || ncmpc toggle || pms toggle") awful.util.spawn_with_shell("mpc toggle || ncmpc toggle || pms toggle")
mpdwidget.update() mpdwidget.update()
end), end),
awful.key({ altkey, "Control" }, "Down", awful.key({ altkey, "Control" }, "Down",

View File

@ -515,7 +515,7 @@ globalkeys = awful.util.table.join(
-- MPD control -- MPD control
awful.key({ altkey, "Control" }, "Up", awful.key({ altkey, "Control" }, "Up",
function () function ()
awful.util.spawn_with_shell("mpc toggle || ncmpcpp toggle || ncmpc toggle || pms toggle") awful.util.spawn_with_shell("mpc toggle || ncmpc toggle || pms toggle")
mpdwidget.update() mpdwidget.update()
end), end),
awful.key({ altkey, "Control" }, "Down", awful.key({ altkey, "Control" }, "Down",

View File

@ -504,7 +504,7 @@ globalkeys = awful.util.table.join(
-- MPD control -- MPD control
awful.key({ altkey, "Control" }, "Up", awful.key({ altkey, "Control" }, "Up",
function () function ()
awful.util.spawn_with_shell("mpc toggle || ncmpcpp toggle || ncmpc toggle || pms toggle") awful.util.spawn_with_shell("mpc toggle || ncmpc toggle || pms toggle")
mpdwidget.update() mpdwidget.update()
end), end),
awful.key({ altkey, "Control" }, "Down", awful.key({ altkey, "Control" }, "Down",

View File

@ -450,7 +450,7 @@ globalkeys = awful.util.table.join(
-- MPD control -- MPD control
awful.key({ altkey, "Control" }, "Up", awful.key({ altkey, "Control" }, "Up",
function () function ()
awful.util.spawn_with_shell("mpc toggle || ncmpcpp toggle || ncmpc toggle || pms toggle") awful.util.spawn_with_shell("mpc toggle || ncmpc toggle || pms toggle")
mpdwidget.update() mpdwidget.update()
end), end),
awful.key({ altkey, "Control" }, "Down", awful.key({ altkey, "Control" }, "Down",

View File

@ -459,7 +459,7 @@ globalkeys = awful.util.table.join(
-- MPD control -- MPD control
awful.key({ altkey, "Control" }, "Up", awful.key({ altkey, "Control" }, "Up",
function () function ()
awful.util.spawn_with_shell("mpc toggle || ncmpcpp toggle || ncmpc toggle || pms toggle") awful.util.spawn_with_shell("mpc toggle || ncmpc toggle || pms toggle")
mpdwidget.update() mpdwidget.update()
end), end),
awful.key({ altkey, "Control" }, "Down", awful.key({ altkey, "Control" }, "Down",