yes, I'm very commit lazy
This commit is contained in:
@@ -1,9 +1,9 @@
|
||||
--------------------------------------------------------------------------------------------------------------
|
||||
-- This is the statusbar, every widget, module and so on is combined to all the stuff you see on the screen --
|
||||
--------------------------------------------------------------------------------------------------------------
|
||||
local wibox = require("wibox")
|
||||
local dpi = require("beautiful").xresources.apply_dpi
|
||||
local gshape = require("gears.shape")
|
||||
local wibox = require('wibox')
|
||||
local dpi = require('beautiful').xresources.apply_dpi
|
||||
local gshape = require('gears.shape')
|
||||
|
||||
return function(s)
|
||||
---Lookup function to return the widget from its easy name string
|
||||
@@ -13,42 +13,42 @@ return function(s)
|
||||
local widget_table = {}
|
||||
if widgets then
|
||||
for _, widget in ipairs(widgets) do
|
||||
if widget == "Audio" then
|
||||
table.insert(widget_table, require("src.widgets.audio")(s))
|
||||
elseif widget == "Battery" then
|
||||
table.insert(widget_table, require("src.widgets.battery")(User_config.battery_kind))
|
||||
elseif widget == "Bluetooth" then
|
||||
table.insert(widget_table, require("src.widgets.bluetooth")())
|
||||
elseif widget == "Clock" then
|
||||
table.insert(widget_table, require("src.widgets.clock")())
|
||||
elseif widget == "Cpu Frequency" then
|
||||
table.insert(widget_table, require("src.widgets.cpu_info")("freq", User_config.cpu_frequency))
|
||||
elseif widget == "Cpu Temperature" then
|
||||
table.insert(widget_table, require("src.widgets.cpu_info")("temp"))
|
||||
elseif widget == "Cpu Usage" then
|
||||
table.insert(widget_table, require("src.widgets.cpu_info")("usage"))
|
||||
elseif widget == "Date" then
|
||||
table.insert(widget_table, require("src.widgets.date")())
|
||||
elseif widget == "Gpu Temperature" then
|
||||
table.insert(widget_table, require("src.widgets.gpu_info")("temp"))
|
||||
elseif widget == "Gpu Usage" then
|
||||
table.insert(widget_table, require("src.widgets.gpu_info")("usage"))
|
||||
elseif widget == "Keyboard Layout" then
|
||||
table.insert(widget_table, require("src.widgets.kblayout")(s))
|
||||
elseif widget == "Tiling Layout" then
|
||||
table.insert(widget_table, require("src.widgets.layout_list")())
|
||||
elseif widget == "Network" then
|
||||
table.insert(widget_table, require("src.widgets.network")())
|
||||
elseif widget == "Power Button" then
|
||||
table.insert(widget_table, require("src.widgets.power")())
|
||||
elseif widget == "Ram Usage" then
|
||||
table.insert(widget_table, require("src.widgets.ram_info")())
|
||||
elseif widget == "Systray" then
|
||||
table.insert(widget_table, require("src.widgets.systray")(s))
|
||||
elseif widget == "Taglist" then
|
||||
table.insert(widget_table, require("src.widgets.taglist")(s))
|
||||
elseif widget == "Tasklist" then
|
||||
table.insert(widget_table, require("src.widgets.tasklist")(s))
|
||||
if widget == 'Audio' then
|
||||
table.insert(widget_table, require('src.widgets.audio')(s))
|
||||
elseif widget == 'Battery' then
|
||||
table.insert(widget_table, require('src.widgets.battery')(User_config.battery_kind))
|
||||
elseif widget == 'Bluetooth' then
|
||||
table.insert(widget_table, require('src.widgets.bluetooth')())
|
||||
elseif widget == 'Clock' then
|
||||
table.insert(widget_table, require('src.widgets.clock')())
|
||||
elseif widget == 'Cpu Frequency' then
|
||||
table.insert(widget_table, require('src.widgets.cpu_info')('freq', User_config.cpu_frequency))
|
||||
elseif widget == 'Cpu Temperature' then
|
||||
table.insert(widget_table, require('src.widgets.cpu_info')('temp'))
|
||||
elseif widget == 'Cpu Usage' then
|
||||
table.insert(widget_table, require('src.widgets.cpu_info')('usage'))
|
||||
elseif widget == 'Date' then
|
||||
table.insert(widget_table, require('src.widgets.date')())
|
||||
elseif widget == 'Gpu Temperature' then
|
||||
table.insert(widget_table, require('src.widgets.gpu_info')('temp'))
|
||||
elseif widget == 'Gpu Usage' then
|
||||
table.insert(widget_table, require('src.widgets.gpu_info')('usage'))
|
||||
elseif widget == 'Keyboard Layout' then
|
||||
table.insert(widget_table, require('src.widgets.kblayout')(s))
|
||||
elseif widget == 'Tiling Layout' then
|
||||
table.insert(widget_table, require('src.widgets.layout_list')())
|
||||
elseif widget == 'Network' then
|
||||
table.insert(widget_table, require('src.widgets.network')())
|
||||
elseif widget == 'Power Button' then
|
||||
table.insert(widget_table, require('src.widgets.power')())
|
||||
elseif widget == 'Ram Usage' then
|
||||
table.insert(widget_table, require('src.widgets.ram_info')())
|
||||
elseif widget == 'Systray' then
|
||||
table.insert(widget_table, require('src.widgets.systray')())
|
||||
elseif widget == 'Taglist' then
|
||||
table.insert(widget_table, require('src.widgets.taglist')(s))
|
||||
elseif widget == 'Tasklist' then
|
||||
table.insert(widget_table, require('src.widgets.tasklist')(s))
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -61,7 +61,7 @@ return function(s)
|
||||
local function prepare_widgets(widgets)
|
||||
local layout = {
|
||||
forced_height = dpi(50),
|
||||
layout = wibox.layout.fixed.horizontal
|
||||
layout = wibox.layout.fixed.horizontal,
|
||||
}
|
||||
for i, widget in pairs(widgets) do
|
||||
if i == 1 then
|
||||
@@ -72,7 +72,7 @@ return function(s)
|
||||
right = dpi(3),
|
||||
top = dpi(6),
|
||||
bottom = dpi(6),
|
||||
widget = wibox.container.margin
|
||||
widget = wibox.container.margin,
|
||||
})
|
||||
elseif i == #widgets then
|
||||
table.insert(layout,
|
||||
@@ -82,7 +82,7 @@ return function(s)
|
||||
right = dpi(6),
|
||||
top = dpi(6),
|
||||
bottom = dpi(6),
|
||||
widget = wibox.container.margin
|
||||
widget = wibox.container.margin,
|
||||
})
|
||||
else
|
||||
table.insert(layout,
|
||||
@@ -92,7 +92,7 @@ return function(s)
|
||||
right = dpi(3),
|
||||
top = dpi(6),
|
||||
bottom = dpi(6),
|
||||
widget = wibox.container.margin
|
||||
widget = wibox.container.margin,
|
||||
})
|
||||
end
|
||||
end
|
||||
@@ -109,17 +109,17 @@ return function(s)
|
||||
visible = true,
|
||||
x = 0,
|
||||
y = 1035,
|
||||
type = "desktop",
|
||||
type = 'desktop',
|
||||
height = dpi(55),
|
||||
width = 1920,
|
||||
bg = "#212121",
|
||||
bg = '#212121',
|
||||
shape = function(cr, width, height)
|
||||
gshape.partially_rounded_rect(cr, width, height, true, true, false, false, 8)
|
||||
end,
|
||||
}
|
||||
|
||||
w:struts {
|
||||
bottom = dpi(55)
|
||||
bottom = dpi(55),
|
||||
}
|
||||
|
||||
Global_config.bottom_struts = dpi(55)
|
||||
|
||||
Reference in New Issue
Block a user