mirror of https://github.com/lcpz/lain.git
some fixes
This commit is contained in:
parent
6a2df832b5
commit
709a965d73
|
@ -29,7 +29,7 @@ local function create(background, foreground)
|
||||||
calendar.notify_icon = nil
|
calendar.notify_icon = nil
|
||||||
calendar.font_size = 12
|
calendar.font_size = 12
|
||||||
calendar.bg = background or beautiful.bg_normal or "#FFFFFF"
|
calendar.bg = background or beautiful.bg_normal or "#FFFFFF"
|
||||||
calendar.fg = foreground or beautiful.fg_normal or "#FFFFFF"
|
calendar.fg = foreground or beautiful.fg_focus or "#FFFFFF"
|
||||||
end
|
end
|
||||||
|
|
||||||
function calendar:hide()
|
function calendar:hide()
|
||||||
|
|
|
@ -43,7 +43,7 @@ function fs:show(t_out)
|
||||||
notification = naughty.notify({
|
notification = naughty.notify({
|
||||||
text = ws,
|
text = ws,
|
||||||
timeout = t_out,
|
timeout = t_out,
|
||||||
fg = beautiful.fg_focus,
|
fg = fs.color,
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -56,8 +56,8 @@ local function worker(args)
|
||||||
local refresh_timeout = args.refresh_timeout or 600
|
local refresh_timeout = args.refresh_timeout or 600
|
||||||
local header = args.header or " Hdd "
|
local header = args.header or " Hdd "
|
||||||
local header_color = args.header_color or beautiful.fg_normal or "#FFFFFF"
|
local header_color = args.header_color or beautiful.fg_normal or "#FFFFFF"
|
||||||
local color = args.color or beautiful.fg_focus or "#FFFFFF"
|
fs.color = args.color or beautiful.fg_focus or "#FFFFFF"
|
||||||
local footer = args.header or ""
|
local footer = args.footer or ""
|
||||||
local shadow = args.shadow or false
|
local shadow = args.shadow or false
|
||||||
|
|
||||||
local myfs = wibox.widget.textbox()
|
local myfs = wibox.widget.textbox()
|
||||||
|
@ -71,7 +71,7 @@ local function worker(args)
|
||||||
local function set_text()
|
local function set_text()
|
||||||
local info = fs_info['{' .. partition .. ' used_p}']
|
local info = fs_info['{' .. partition .. ' used_p}']
|
||||||
myfs:set_markup(markup(header_color, header)
|
myfs:set_markup(markup(header_color, header)
|
||||||
.. markup(color, info .. footer) .. " ")
|
.. markup(fs.color, info .. footer))
|
||||||
end
|
end
|
||||||
|
|
||||||
for line in f:lines() do -- Match: (size) (used)(avail)(use%) (mount)
|
for line in f:lines() do -- Match: (size) (used)(avail)(use%) (mount)
|
||||||
|
|
|
@ -35,8 +35,7 @@ function worker(args)
|
||||||
local refresh_timeout = args.refresh_timeout or 60
|
local refresh_timeout = args.refresh_timeout or 60
|
||||||
local header = args.header or " Mail "
|
local header = args.header or " Mail "
|
||||||
local header_color = args.header_color or beautiful.fg_normal or "#FFFFFF"
|
local header_color = args.header_color or beautiful.fg_normal or "#FFFFFF"
|
||||||
local color_newmail = args.color_newmail or beautiful.fg_focus or "#FFFFFF"
|
local color = args.color or beautiful.fg_focus or "#FFFFFF"
|
||||||
local color_nomail = args.color_nomail or beautiful.fg_normal or "#FFFFFF"
|
|
||||||
local mail_encoding = args.mail_encoding or nil
|
local mail_encoding = args.mail_encoding or nil
|
||||||
local maxlen = args.maxlen or 200
|
local maxlen = args.maxlen or 200
|
||||||
local app = args.app or "mutt"
|
local app = args.app or "mutt"
|
||||||
|
@ -63,7 +62,7 @@ function worker(args)
|
||||||
then
|
then
|
||||||
myimapcheck:set_text('')
|
myimapcheck:set_text('')
|
||||||
else
|
else
|
||||||
myimapcheck:set_markup(markup(color_nomail, " no mail "))
|
myimapcheck:set_markup(markup(color, " no mail "))
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -97,8 +96,8 @@ function worker(args)
|
||||||
elseif ws:find("CheckMailError: invalid credentials") ~= nil
|
elseif ws:find("CheckMailError: invalid credentials") ~= nil
|
||||||
then
|
then
|
||||||
helpers.set_map(mail, true)
|
helpers.set_map(mail, true)
|
||||||
myimapcheck.set_markup(markup(header_color, header) ..
|
myimapcheck:set_markup(markup(header_color, header) ..
|
||||||
markup(color_newmail, "invalid credentials "))
|
markup(color, "invalid credentials "))
|
||||||
else
|
else
|
||||||
mailcount = ws:match("%d") or "?"
|
mailcount = ws:match("%d") or "?"
|
||||||
|
|
||||||
|
@ -109,7 +108,7 @@ function worker(args)
|
||||||
end
|
end
|
||||||
|
|
||||||
myimapcheck:set_markup(markup(header_color, header) ..
|
myimapcheck:set_markup(markup(header_color, header) ..
|
||||||
markup(color_newmail, mailcount) .. " ")
|
markup(color, mailcount) .. " ")
|
||||||
|
|
||||||
if helpers.get_map(mail)
|
if helpers.get_map(mail)
|
||||||
then
|
then
|
||||||
|
@ -137,7 +136,7 @@ function worker(args)
|
||||||
end
|
end
|
||||||
|
|
||||||
naughty.notify({ title = notify_title,
|
naughty.notify({ title = notify_title,
|
||||||
fg = color_newmail,
|
fg = color,
|
||||||
text = ws,
|
text = ws,
|
||||||
icon = beautiful.lain_mail_notify or
|
icon = beautiful.lain_mail_notify or
|
||||||
helpers.icons_dir .. "mail.png",
|
helpers.icons_dir .. "mail.png",
|
||||||
|
|
|
@ -33,8 +33,8 @@ function worker(args)
|
||||||
local port = args.port or "6600"
|
local port = args.port or "6600"
|
||||||
local music_dir = args.music_dir or os.getenv("HOME") .. "/Music"
|
local music_dir = args.music_dir or os.getenv("HOME") .. "/Music"
|
||||||
local refresh_timeout = args.refresh_timeout or 1
|
local refresh_timeout = args.refresh_timeout or 1
|
||||||
local color_artist = args.color_artist or beautiful.fg_normal or "#FFFFFF"
|
local header_color = args.header_color or beautiful.fg_normal or "#FFFFFF"
|
||||||
local color_song = args.color_song or beautiful.fg_focus or "#FFFFFF"
|
local color = args.color or beautiful.fg_focus or "#FFFFFF"
|
||||||
local spr = args.spr or " "
|
local spr = args.spr or " "
|
||||||
local app = args.app or "ncmpcpp"
|
local app = args.app or "ncmpcpp"
|
||||||
local shadow = args.shadow or false
|
local shadow = args.shadow or false
|
||||||
|
@ -53,7 +53,7 @@ function worker(args)
|
||||||
then
|
then
|
||||||
mympd:set_text('')
|
mympd:set_text('')
|
||||||
else
|
else
|
||||||
mympd:set_markup(markup(color_artist, " mpd "), markup(color_song , "off "))
|
mympd:set_markup(markup(header_color, " mpd "), markup(color , "off "))
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -97,20 +97,19 @@ function worker(args)
|
||||||
mpd_state["{Date}"] .. "\n" ..
|
mpd_state["{Date}"] .. "\n" ..
|
||||||
mpd_state["{Title}"],
|
mpd_state["{Title}"],
|
||||||
icon = "/tmp/mpdcover.png",
|
icon = "/tmp/mpdcover.png",
|
||||||
fg = beautiful.fg_focus or "#FFFFFF",
|
fg = color,
|
||||||
bg = beautiful.bg_normal or "#000000" ,
|
|
||||||
timeout = 6,
|
timeout = 6,
|
||||||
replaces_id = mpd.id
|
replaces_id = mpd.id
|
||||||
}).id
|
}).id
|
||||||
end
|
end
|
||||||
mympd:set_markup(markup(color_artist, " " .. mpd_state["{Artist}"])
|
mympd:set_markup(markup(header_color, " " .. mpd_state["{Artist}"])
|
||||||
.. spr ..
|
.. spr ..
|
||||||
markup(color_song, mpd_state["{Title}"] .. " "))
|
markup(color, mpd_state["{Title}"] .. " "))
|
||||||
elseif mpd_state["{state}"] == "pause"
|
elseif mpd_state["{state}"] == "pause"
|
||||||
then
|
then
|
||||||
mympd:set_markup(markup(color_artist, " mpd")
|
mympd:set_markup(markup(header_color, " mpd")
|
||||||
.. spr ..
|
.. spr ..
|
||||||
markup(color_song, "paused "))
|
markup(color, "paused "))
|
||||||
else
|
else
|
||||||
helpers.set_map("current mpd track", nil)
|
helpers.set_map("current mpd track", nil)
|
||||||
set_nompd()
|
set_nompd()
|
||||||
|
|
|
@ -1,11 +1,9 @@
|
||||||
|
|
||||||
--[[
|
--[[
|
||||||
|
|
||||||
Yahoo's Awesome (WM) Weather Notification
|
Licensed under GNU General Public License v2
|
||||||
|
* (c) 2013, Luke Bonham
|
||||||
Licensed under WTFPL v2
|
|
||||||
* (c) 2013, Luke Bonham
|
|
||||||
|
|
||||||
--]]
|
--]]
|
||||||
|
|
||||||
local markup = require("lain.util.markup")
|
local markup = require("lain.util.markup")
|
||||||
|
@ -26,8 +24,7 @@ local tonumber = tonumber
|
||||||
|
|
||||||
local setmetatable = setmetatable
|
local setmetatable = setmetatable
|
||||||
|
|
||||||
-- yawn integration
|
-- YAhoo! Weather Notification
|
||||||
-- https://github.com/copycat-killer/yawn
|
|
||||||
-- lain.widgets.yawn
|
-- lain.widgets.yawn
|
||||||
local yawn =
|
local yawn =
|
||||||
{
|
{
|
||||||
|
@ -52,20 +49,19 @@ local update_timer = nil
|
||||||
|
|
||||||
local function fetch_weather(args)
|
local function fetch_weather(args)
|
||||||
local toshow = args.toshow or "forecast"
|
local toshow = args.toshow or "forecast"
|
||||||
local spr = args.spr or " "
|
|
||||||
local footer = args.footer or ""
|
|
||||||
|
|
||||||
local url = api_url .. units_set .. city_id
|
local url = api_url .. units_set .. city_id
|
||||||
local f = io.popen("curl --connect-timeout 1 -fsm 2 '"
|
local f = io.popen("curl --connect-timeout 1 -fsm 2 '"
|
||||||
.. url .. "'" )
|
.. url .. "'" )
|
||||||
local text = f:read("*all")
|
local text = f:read("*all")
|
||||||
io.close(f)
|
f:close()
|
||||||
|
|
||||||
-- In case of no connection or invalid city ID
|
-- In case of no connection or invalid city ID
|
||||||
-- widgets won't display
|
-- widgets won't display
|
||||||
if text == "" or text:match("City not found")
|
if text == "" or text:match("City not found")
|
||||||
then
|
then
|
||||||
sky = icon_path .. "na.png"
|
sky = icon_path .. "na.png"
|
||||||
|
yawn.icon:set_image(sky)
|
||||||
if text == "" then
|
if text == "" then
|
||||||
weather_data = "Service not available at the moment."
|
weather_data = "Service not available at the moment."
|
||||||
return "N/A"
|
return "N/A"
|
||||||
|
@ -119,14 +115,14 @@ local function fetch_weather(args)
|
||||||
if f == nil then
|
if f == nil then
|
||||||
sky = icon_path .. "na.png"
|
sky = icon_path .. "na.png"
|
||||||
else
|
else
|
||||||
io.close(f)
|
f:close()
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Localization
|
-- Localization
|
||||||
local f = io.open(localizations_path .. language, "r")
|
local f = io.open(localizations_path .. language, "r")
|
||||||
if language:find("en_") == nil and f ~= nil
|
if language:find("en_") == nil and f ~= nil
|
||||||
then
|
then
|
||||||
io.close(f)
|
f:close()
|
||||||
for line in io.lines(localizations_path .. language)
|
for line in io.lines(localizations_path .. language)
|
||||||
do
|
do
|
||||||
word = string.sub(line, 1, line:find("|")-1)
|
word = string.sub(line, 1, line:find("|")-1)
|
||||||
|
@ -136,18 +132,20 @@ local function fetch_weather(args)
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Finally setting infos
|
-- Finally setting infos
|
||||||
forecast = weather_data:match(": %S+"):gsub(": ", ""):gsub(",", "")
|
both = weather_data:match(": %S+.-\n"):gsub(": ", "")
|
||||||
yawn.forecast = markup(yawn.forecast_color, markup.font(beautiful.font, forecast))
|
forecast = weather_data:match(": %S+.-,"):gsub(": ", ""):gsub(",", "\n")
|
||||||
yawn.units = markup(yawn.units_color, markup.font(beautiful.font, units))
|
units = units:gsub(" ", "")
|
||||||
|
|
||||||
|
yawn.forecast = markup(yawn.color, " " .. markup.font(beautiful.font, forecast) .. " ")
|
||||||
|
yawn.units = markup(yawn.color, " " .. markup.font(beautiful.font, units))
|
||||||
yawn.icon:set_image(sky)
|
yawn.icon:set_image(sky)
|
||||||
|
|
||||||
if toshow == "forecast" then
|
if toshow == "forecast" then
|
||||||
return yawn.forecast
|
return yawn.forecast
|
||||||
elseif toshow == "units" then
|
elseif toshow == "units" then
|
||||||
return yawn.units
|
return yawn.units
|
||||||
else -- "both"
|
else
|
||||||
return yawn.forecast .. spr
|
return both
|
||||||
.. yawn.units .. footer
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -175,21 +173,16 @@ function yawn.show(t_out)
|
||||||
text = weather_data,
|
text = weather_data,
|
||||||
icon = sky,
|
icon = sky,
|
||||||
timeout = t_out,
|
timeout = t_out,
|
||||||
fg = yawn.notification_color
|
fg = yawn.color
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
|
|
||||||
function yawn.register(id, args)
|
function yawn.register(id, args)
|
||||||
local args = args or {}
|
local args = args or {}
|
||||||
|
|
||||||
settings = { args.toshow, args.spr, args.footer }
|
settings = args
|
||||||
|
|
||||||
yawn.units_color = args.units_color or
|
yawn.color = args.color or beautiful.fg_normal or "#FFFFFF"
|
||||||
beautiful.fg_normal or "#FFFFFF"
|
|
||||||
yawn.forecast_color = args.forecast_color or
|
|
||||||
yawn.units_color
|
|
||||||
yawn.notification_color = args.notification_color or
|
|
||||||
beautiful.fg_focus or "#FFFFFF"
|
|
||||||
|
|
||||||
if args.u == "f" then units_set = '?u=f&w=' end
|
if args.u == "f" then units_set = '?u=f&w=' end
|
||||||
|
|
||||||
|
@ -208,6 +201,8 @@ function yawn.register(id, args)
|
||||||
yawn.icon:connect_signal("mouse::leave", function()
|
yawn.icon:connect_signal("mouse::leave", function()
|
||||||
yawn.hide()
|
yawn.hide()
|
||||||
end)
|
end)
|
||||||
|
|
||||||
|
return yawn
|
||||||
end
|
end
|
||||||
|
|
||||||
function yawn.attach(widget, id, args)
|
function yawn.attach(widget, id, args)
|
||||||
|
|
Loading…
Reference in New Issue