fix font names; closes #237

This commit is contained in:
Luca CPZ 2018-09-14 10:53:39 +02:00
parent 9e65579b64
commit ff4caa01b7
3 changed files with 15 additions and 15 deletions

2
lain

@ -1 +1 @@
Subproject commit 53ebca2867c5d9c9ab7c5d3f37ccc91784322cd7 Subproject commit 4073bd7cdf79e118e97c0b0f7dba08927bc31d46

View File

@ -17,7 +17,7 @@ local my_table = awful.util.table or gears.table -- 4.{0,1} compatibility
local theme = {} local theme = {}
theme.dir = os.getenv("HOME") .. "/.config/awesome/themes/copland" theme.dir = os.getenv("HOME") .. "/.config/awesome/themes/copland"
theme.wallpaper = theme.dir .. "/wall.png" theme.wallpaper = theme.dir .. "/wall.png"
theme.font = "Tamzen 10.5" theme.font = "Misc Tamzen 10.5"
theme.fg_normal = "#BBBBBB" theme.fg_normal = "#BBBBBB"
theme.fg_focus = "#78A4FF" theme.fg_focus = "#78A4FF"
theme.bg_normal = "#111111" theme.bg_normal = "#111111"
@ -95,18 +95,18 @@ local green = "#8FEB8F"
-- Textclock -- Textclock
--os.setlocale(os.getenv("LANG")) -- to localize the clock --os.setlocale(os.getenv("LANG")) -- to localize the clock
local mytextclock = wibox.widget.textclock("<span font='Tamzen 5'> </span>%H:%M ") local mytextclock = wibox.widget.textclock("<span font='Misc Tamzen 5'> </span>%H:%M ")
mytextclock.font = theme.font mytextclock.font = theme.font
-- Calendar -- Calendar
lain.widget.calendar({ lain.widget.calendar {
attach_to = { mytextclock }, attach_to = { mytextclock },
notification_preset = { notification_preset = {
font = "Tamzen 11", font = "Misc Tamzen 11",
fg = theme.fg_normal, fg = theme.fg_normal,
bg = theme.bg_normal bg = theme.bg_normal
} }
}) }
--[[ Mail IMAP check --[[ Mail IMAP check
-- commented because it needs to be set before use -- commented because it needs to be set before use
@ -120,7 +120,7 @@ local mail = lain.widget.imap({
count = "" count = ""
if mailcount > 0 then if mailcount > 0 then
mail = "<span font='Tamzen 5'> </span>Mail " mail = "<span font='Misc Tamzen 5'> </span>Mail "
count = mailcount .. " " count = mailcount .. " "
end end
@ -135,11 +135,11 @@ theme.mpd = lain.widget.mpd({
settings = function() settings = function()
if mpd_now.state == "play" then if mpd_now.state == "play" then
title = mpd_now.title title = mpd_now.title
artist = " " .. mpd_now.artist .. markup("#777777", " <span font='Tamzen 2'> </span>|<span font='Tamzen 5'> </span>") artist = " " .. mpd_now.artist .. markup("#777777", " <span font='Misc Tamzen 2'> </span>|<span font='Misc Tamzen 5'> </span>")
mpdicon:set_image(theme.play) mpdicon:set_image(theme.play)
elseif mpd_now.state == "pause" then elseif mpd_now.state == "pause" then
title = "mpd " title = "mpd "
artist = "paused" .. markup("#777777", " |<span font='Tamzen 5'> </span>") artist = "paused" .. markup("#777777", " |<span font='Misc Tamzen 5'> </span>")
mpdicon:set_image(theme.pause) mpdicon:set_image(theme.pause)
else else
title = "" title = ""
@ -215,7 +215,7 @@ local fsbar = wibox.widget {
widget = wibox.widget.progressbar, widget = wibox.widget.progressbar,
} }
theme.fs = lain.widget.fs { theme.fs = lain.widget.fs {
notification_preset = { fg = theme.fg_normal, bg = theme.bg_normal, font = "Tamzen 10.5" }, notification_preset = { fg = theme.fg_normal, bg = theme.bg_normal, font = "Misc Tamzen 10.5" },
settings = function() settings = function()
if fs_now["/home"].percentage < 90 then if fs_now["/home"].percentage < 90 then
fsbar:set_color(theme.fg_normal) fsbar:set_color(theme.fg_normal)
@ -282,10 +282,10 @@ theme.weather = lain.widget.weather({
}) })
-- Separators -- Separators
local first = wibox.widget.textbox(markup.font("Tamzen 3", " ")) local first = wibox.widget.textbox(markup.font("Misc Tamzen 3", " "))
local spr = wibox.widget.textbox(' ') local spr = wibox.widget.textbox(' ')
local small_spr = wibox.widget.textbox(markup.font("Tamzen 4", " ")) local small_spr = wibox.widget.textbox(markup.font("Misc Tamzen 4", " "))
local bar_spr = wibox.widget.textbox(markup.font("Tamzen 3", " ") .. markup.fontfg(theme.font, "#777777", "|") .. markup.font("Tamzen 5", " ")) local bar_spr = wibox.widget.textbox(markup.font("Misc Tamzen 3", " ") .. markup.fontfg(theme.font, "#777777", "|") .. markup.font("Misc Tamzen 5", " "))
-- Eminent-like task filtering -- Eminent-like task filtering
local orig_filter = awful.widget.taglist.filter.all local orig_filter = awful.widget.taglist.filter.all

View File

@ -248,12 +248,12 @@ local mywifisig = awful.widget.watch(
function(widget, stdout) function(widget, stdout)
local carrier, perc = stdout:match("(%d)-(%d+)") local carrier, perc = stdout:match("(%d)-(%d+)")
local tiptext = stdout:gsub("(%d)-(%d+)", ""):gsub("%s+$", "") local tiptext = stdout:gsub("(%d)-(%d+)", ""):gsub("%s+$", "")
perc = tonumber(perc)
if carrier == "1" then if carrier == "1" or not perc then
wificon:set_image(theme.wifidisc) wificon:set_image(theme.wifidisc)
wifitooltip:set_markup("No carrier") wifitooltip:set_markup("No carrier")
else else
perc = tonumber(perc)
if perc <= 5 then if perc <= 5 then
wificon:set_image(theme.wifinone) wificon:set_image(theme.wifinone)
elseif perc <= 25 then elseif perc <= 25 then