widgets: display window names even with one screen

Icons are useless alone. We display window names even with one
screen. We try to make some space by removing less useful widgets like
icons, netgraph and some others...
This commit is contained in:
Vincent Bernat 2012-07-29 20:41:58 +02:00
parent 73b86a65a5
commit a749a63a61

View file

@ -187,15 +187,8 @@ for s = 1, screen.count() do
layoutbox[s] = awful.widget.layoutbox(s) layoutbox[s] = awful.widget.layoutbox(s)
tasklist[s] = awful.widget.tasklist( tasklist[s] = awful.widget.tasklist(
function(c) function(c)
local fn = awful.widget.tasklist.label.currenttags local title, color, _, icon = awful.widget.tasklist.label.currenttags(c, s)
local title, color, _, icon = fn(c, s) return title, color, nil, icon
if screen.count() > 1 then
-- title, color and icon
return title, color, nil, icon
elseif icon then
-- just color and icon
return "", color, nil, icon
end
end, tasklist.buttons) end, tasklist.buttons)
-- Create the taglist -- Create the taglist
@ -223,11 +216,20 @@ for s = 1, screen.count() do
layout = awful.widget.layout.horizontal.leftright layout = awful.widget.layout.horizontal.leftright
}, },
on(1, systray), on(1, systray),
sepclose, datewidget, dateicon, spacer, sepclose, datewidget, screen.count() > 1 and dateicon or "", spacer,
on(2, volwidget), on(2, volicon), on(2, spacer), on(2, volwidget), on(2, volicon), on(2, spacer),
on(2, batwidget.widget), on(2, batwidget.widget ~= "" and baticon or ""), on(2, batwidget.widget ~= "" and spacer or ""),
on(2, fswidget), on(2, fsicon), on(2, sepopen), on(2, batwidget.widget),
on(1, netgraph.widget), on(1, netdownicon), on(1, netdown), on(1, netupicon), on(1, netup), on(1, spacer), on(2, batwidget.widget ~= "" and screen.count() > 1 and baticon or ""),
on(2, batwidget.widget ~= "" and spacer or ""),
on(2, fswidget), screen.count() > 1 and on(2, fsicon) or "",
screen.count() > 1 and on(2, sepopen) or on(2, spacer),
screen.count() > 1 and on(1, netgraph.widget) or "",
on(1, netdownicon), on(1, netdown),
on(1, netupicon), on(1, netup), on(1, spacer),
on(1, memwidget), on(1, memicon), on(1, spacer), on(1, memwidget), on(1, memicon), on(1, spacer),
on(1, cpuwidget), on(1, cpuicon), on(1, sepopen), on(1, cpuwidget), on(1, cpuicon), on(1, sepopen),
tasklist[s], tasklist[s],