awesomewm-mirrors
/
lain
mirror of https://github.com/lcpz/lain.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'd125q-master' 

weather.lua -- improve icon and notification text handling
This commit is contained in:
copycat-killer 2015-11-03 20:00:01 +01:00
parent 2b8a2bc2ae 9f8eb5d0a2
commit 2f2ff600e8
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
widgets/weather.lua
View File

@ -46,11 +46,13 @@ local function worker(args)
function (day, desc, tmin, tmax) function (day, desc, tmin, tmax)
return string.format("<b>%s</b>: %s, %d - %d ", day, desc, tmin, tmax) return string.format("<b>%s</b>: %s, %d - %d ", day, desc, tmin, tmax)
end end
local weather_na_markup = args.weather_na_markup or " N/A "
local followmouse = args.followmouse or false local followmouse = args.followmouse or false
local settings = args.settings or function() end local settings = args.settings or function() end
weather.widget = wibox.widget.textbox('') weather.widget = wibox.widget.textbox(weather_na_markup)
weather.icon = wibox.widget.imagebox() weather.icon_path = icons_path .. "na.png"
weather.icon = wibox.widget.imagebox(weather.icon_path)
function weather.show(t_out) function weather.show(t_out)
weather.hide() weather.hide()
@ -60,7 +62,8 @@ local function worker(args)
end end
weather.notification = naughty.notify({ weather.notification = naughty.notify({
text = weather.notification_text, text = weather.notification_text
or "Waiting for the server to respond...",
icon = weather.icon_path, icon = weather.icon_path,
timeout = t_out, timeout = t_out,
preset = notification_preset preset = notification_preset
@ -106,7 +109,6 @@ local function worker(args)
end end
end end
else else
weather.icon_path = icons_path .. "na.png"
weather.notification_text = "API/connection error or bad/not set city ID" weather.notification_text = "API/connection error or bad/not set city ID"
end end
end) end)
@ -120,13 +122,14 @@ local function worker(args)
if not err and weather_now ~= nil and tonumber(weather_now["cod"]) == 200 then if not err and weather_now ~= nil and tonumber(weather_now["cod"]) == 200 then
weather.icon_path = icons_path .. weather_now["weather"][1]["icon"] .. ".png" weather.icon_path = icons_path .. weather_now["weather"][1]["icon"] .. ".png"
weather.icon:set_image(weather.icon_path)
widget = weather.widget widget = weather.widget
settings() settings()
else else
weather.widget._layout.text = " N/A " -- tries to avoid textbox bugs weather.icon_path = icons_path .. "na.png"
weather.icon:set_image(icons_path .. "na.png") weather.widget:set_markup(weather_na_markup)
end end
weather.icon:set_image(weather.icon_path)
end) end)
end end