Added audio device selector, new notification theme and much more. Rewritten some files and made a new README
This commit is contained in:
@@ -38,7 +38,7 @@ return function(s, widgets)
|
||||
{
|
||||
widget,
|
||||
left = dpi(6),
|
||||
right = dpi(3),
|
||||
right = dpi(6),
|
||||
top = dpi(6),
|
||||
bottom = dpi(6),
|
||||
widget = wibox.container.margin
|
||||
|
||||
@@ -10,12 +10,12 @@ local wibox = require("wibox")
|
||||
|
||||
return function(screen, programs)
|
||||
|
||||
local function create_dock_element(class, program, name, is_steam, size)
|
||||
local function create_dock_element(class, program, name, user_icon, is_steam, size)
|
||||
if program == nil or class == nil then
|
||||
return
|
||||
end
|
||||
is_steam = is_steam or false
|
||||
|
||||
user_icon = user_icon or nil
|
||||
local dock_element = wibox.widget {
|
||||
{
|
||||
{
|
||||
@@ -23,9 +23,9 @@ return function(screen, programs)
|
||||
resize = true,
|
||||
forced_width = size,
|
||||
forced_height = size,
|
||||
image = Get_icon(user_vars.icon_theme, nil, program, class, is_steam),
|
||||
image = user_icon or Get_icon(user_vars.icon_theme, nil, program, class, is_steam),
|
||||
widget = wibox.widget.imagebox,
|
||||
id = "icon"
|
||||
id = "icon",
|
||||
},
|
||||
margins = dpi(5),
|
||||
widget = wibox.container.margin,
|
||||
@@ -104,7 +104,7 @@ return function(screen, programs)
|
||||
local dock_elements = { layout = wibox.layout.fixed.horizontal }
|
||||
|
||||
for i, p in ipairs(pr) do
|
||||
dock_elements[i] = create_dock_element(p[1], p[2], p[3], p[4], user_vars.dock_icon_size)
|
||||
dock_elements[i] = create_dock_element(p[1], p[2], p[3], p[4], p[5], user_vars.dock_icon_size)
|
||||
end
|
||||
|
||||
return dock_elements
|
||||
@@ -181,22 +181,14 @@ return function(screen, programs)
|
||||
}
|
||||
|
||||
local function check_for_dock_hide(s)
|
||||
local naughty = require("naughty")
|
||||
if #s.selected_tag:clients() < 1 then
|
||||
dock.visible = true
|
||||
return
|
||||
end
|
||||
if s == mouse.screen then
|
||||
--[[ if mouse.current_widget then
|
||||
if tostring(mouse.current_widget):match("fake") then
|
||||
dock.visible = true
|
||||
return
|
||||
end
|
||||
end ]]
|
||||
local visible = false
|
||||
for j, c in ipairs(s.selected_tag:clients()) do
|
||||
|
||||
--naughty.notify({ title = tostring(c.class) })
|
||||
if c.maximized or c.fullscreen then
|
||||
dock.visible = false
|
||||
return
|
||||
@@ -209,10 +201,6 @@ return function(screen, programs)
|
||||
else
|
||||
dock.visible = true
|
||||
end
|
||||
--[[ if visible then
|
||||
dock.visible = visible
|
||||
return
|
||||
end ]]
|
||||
end
|
||||
else
|
||||
dock.visible = false
|
||||
|
||||
@@ -23,29 +23,30 @@ awful.screen.connect_for_each_screen(
|
||||
require("src.modules.volume_osd")(s)
|
||||
require("src.modules.brightness_osd")(s)
|
||||
require("src.modules.titlebar")
|
||||
require("src.modules.volume_controller")(s)
|
||||
|
||||
-- Widgets
|
||||
s.battery = require("src.widgets.battery")()
|
||||
s.network = require("src.widgets.network")()
|
||||
s.audio = require("src.widgets.audio")()
|
||||
--s.battery = require("src.widgets.battery")()
|
||||
s.audio = require("src.widgets.audio")(s)
|
||||
s.date = require("src.widgets.date")()
|
||||
s.clock = require("src.widgets.clock")()
|
||||
s.bluetooth = require("src.widgets.bluetooth")()
|
||||
--s.bluetooth = require("src.widgets.bluetooth")()
|
||||
s.layoutlist = require("src.widgets.layout_list")()
|
||||
s.powerbutton = require("src.widgets.power")()
|
||||
s.kblayout = require("src.widgets.kblayout")(s)
|
||||
s.taglist = require("src.widgets.taglist")(s)
|
||||
s.tasklist = require("src.widgets.tasklist")(s)
|
||||
s.systray = require("src.widgets.systray")(s)
|
||||
s.cpu_usage = require("src.widgets.cpu_info")("usage")
|
||||
s.cpu_temp = require("src.widgets.cpu_info")("temp")
|
||||
s.cpu_freq = require("src.widgets.cpu_info")("freq", "average")
|
||||
s.ram_info = require("src.widgets.ram_info")()
|
||||
s.gpu_usage = require("src.widgets.gpu_info")("usage")
|
||||
s.gpu_temp = require("src.widgets.gpu_info")("temp")
|
||||
--s.cpu_freq = require("src.widgets.cpu_info")("freq", "average")
|
||||
|
||||
-- Add more of these if statements if you want to change
|
||||
-- the modules/widgets per screen.
|
||||
if s.index == 1 then
|
||||
s.systray = require("src.widgets.systray")(s)
|
||||
s.cpu_usage = require("src.widgets.cpu_info")("usage")
|
||||
s.cpu_temp = require("src.widgets.cpu_info")("temp")
|
||||
s.gpu_usage = require("src.widgets.gpu_info")("usage")
|
||||
s.gpu_temp = require("src.widgets.gpu_info")("temp")
|
||||
|
||||
require("crylia_bar.left_bar")(s, { s.layoutlist, s.systray, s.taglist })
|
||||
require("crylia_bar.center_bar")(s, { s.tasklist })
|
||||
require("crylia_bar.right_bar")(s, { s.gpu_usage, s.gpu_temp, s.cpu_usage, s.cpu_temp, s.audio, s.kblayout, s.date, s.clock, s.powerbutton })
|
||||
@@ -53,6 +54,9 @@ awful.screen.connect_for_each_screen(
|
||||
end
|
||||
|
||||
if s.index == 2 then
|
||||
s.network = require("src.widgets.network")()
|
||||
s.ram_info = require("src.widgets.ram_info")()
|
||||
|
||||
require("crylia_bar.left_bar")(s, { s.layoutlist, s.taglist })
|
||||
require("crylia_bar.center_bar")(s, { s.tasklist })
|
||||
require("crylia_bar.right_bar")(s, { s.ram_info, s.audio, s.kblayout, s.network, s.date, s.clock, s.powerbutton })
|
||||
|
||||
Reference in New Issue
Block a user