mirror of
https://github.com/elenapan/dotfiles.git
synced 2026-01-11 03:32:38 +08:00
Change icons module from global to local
This commit is contained in:
parent
a275dab8c0
commit
33add54ac1
17 changed files with 24 additions and 14 deletions
|
|
@ -4,6 +4,7 @@ local wibox = require("wibox")
|
|||
local naughty = require("naughty")
|
||||
local beautiful = require("beautiful")
|
||||
local helpers = require("helpers")
|
||||
local icons = require("icons")
|
||||
|
||||
apps = {}
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ local awful = require("awful")
|
|||
local gears = require("gears")
|
||||
local wibox = require("wibox")
|
||||
local beautiful = require("beautiful")
|
||||
--local xrdb = xresources.get_current_theme()
|
||||
local icons = require("icons")
|
||||
|
||||
local helpers = require("helpers")
|
||||
local keys = require("keys")
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ local gears = require("gears")
|
|||
local wibox = require("wibox")
|
||||
local beautiful = require("beautiful")
|
||||
local naughty = require("naughty")
|
||||
local icons = require("icons")
|
||||
local helpers = require("helpers")
|
||||
|
||||
local keygrabber = require("awful.keygrabber")
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ local wibox = require("wibox")
|
|||
local beautiful = require("beautiful")
|
||||
local naughty = require("naughty")
|
||||
local helpers = require("helpers")
|
||||
local icons = require("icons")
|
||||
|
||||
local keygrabber = require("awful.keygrabber")
|
||||
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ local awful = require("awful")
|
|||
local gears = require("gears")
|
||||
local wibox = require("wibox")
|
||||
local beautiful = require("beautiful")
|
||||
local icons = require("icons")
|
||||
-- local naughty = require("naughty")
|
||||
|
||||
local helpers = require("helpers")
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ local awful = require("awful")
|
|||
local gears = require("gears")
|
||||
local wibox = require("wibox")
|
||||
local beautiful = require("beautiful")
|
||||
local icons = require("icons")
|
||||
|
||||
local helpers = require("helpers")
|
||||
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ local beautiful = require("beautiful")
|
|||
local xresources = require("beautiful.xresources")
|
||||
local dpi = xresources.apply_dpi
|
||||
local wibox = require("wibox")
|
||||
local icons = require("icons")
|
||||
|
||||
local naughty = require("naughty")
|
||||
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@ local weather = wibox.widget{
|
|||
layout = wibox.layout.fixed.horizontal
|
||||
}
|
||||
|
||||
local icons = {
|
||||
local weather_icons = {
|
||||
["01d"] = { icon = sun_icon, color = x.color3 },
|
||||
["01n"] = { icon = moon_icon, color = x.color4 },
|
||||
["02d"] = { icon = dcloud_icon, color = x.color3 },
|
||||
|
|
@ -93,12 +93,12 @@ local icons = {
|
|||
awesome.connect_signal("evil::weather", function(temperature, description, icon_code)
|
||||
local icon
|
||||
local color
|
||||
if icons[icon_code] then
|
||||
icon = icons[icon_code].icon
|
||||
color = icons[icon_code].color
|
||||
if weather_icons[icon_code] then
|
||||
icon = weather_icons[icon_code].icon
|
||||
color = weather_icons[icon_code].color
|
||||
else
|
||||
icon = icons['_'].icon
|
||||
color = icons['_'].color
|
||||
icon = weather_icons['_'].icon
|
||||
color = weather_icons['_'].color
|
||||
end
|
||||
|
||||
weather_icon.markup = helpers.colorize_text(icon, color)
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ local gears = require("gears")
|
|||
local wibox = require("wibox")
|
||||
local beautiful = require("beautiful")
|
||||
local naughty = require("naughty")
|
||||
local icons = require("icons")
|
||||
|
||||
local weather_temperature_symbol
|
||||
if user.weather_units == "metric" then
|
||||
|
|
@ -30,7 +31,7 @@ local weather = wibox.widget{
|
|||
layout = wibox.layout.fixed.horizontal
|
||||
}
|
||||
|
||||
local icons = {
|
||||
local weather_icons = {
|
||||
["01d"] = icons.sun,
|
||||
["01n"] = icons.star,
|
||||
["02d"] = icons.dcloud,
|
||||
|
|
@ -55,10 +56,10 @@ local icons = {
|
|||
}
|
||||
|
||||
awesome.connect_signal("evil::weather", function(temperature, description, icon_code)
|
||||
if icons[icon_code] then
|
||||
weather_icon.image = icons[icon_code]
|
||||
if weather_icons[icon_code] then
|
||||
weather_icon.image = weather_icons[icon_code]
|
||||
else
|
||||
weather_icon.image = icons['_']
|
||||
weather_icon.image = weather_icons['_']
|
||||
end
|
||||
|
||||
weather_text.markup = description.." "..tostring(temperature)..weather_temperature_symbol
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
local naughty = require("naughty")
|
||||
local helpers = require("helpers")
|
||||
local icons = require("icons")
|
||||
|
||||
-- Helper variables
|
||||
local charger_first_time = true
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
local naughty = require("naughty")
|
||||
local icons = require("icons")
|
||||
|
||||
local notif
|
||||
local first_time = true
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
local awful = require("awful")
|
||||
local naughty = require("naughty")
|
||||
local helpers = require("helpers")
|
||||
local icons = require("icons")
|
||||
|
||||
local jump_to_client = naughty.action { name = "Jump to client" }
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
local naughty = require("naughty")
|
||||
local icons = require("icons")
|
||||
|
||||
notifications.mpd = {}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
local naughty = require("naughty")
|
||||
local icons = require("icons")
|
||||
|
||||
local notif
|
||||
local timeout = 1.5
|
||||
|
|
|
|||
|
|
@ -194,7 +194,7 @@ end)
|
|||
-- Features
|
||||
-- ===================================================================
|
||||
-- Initialize global icons variable and load icon theme
|
||||
icons = require("icons")
|
||||
local icons = require("icons")
|
||||
icons.init(icon_theme)
|
||||
-- Load helper functions
|
||||
local helpers = require("helpers")
|
||||
|
|
|
|||
|
|
@ -249,7 +249,6 @@ theme.taglist_squares_unsel = theme_assets.taglist_squares_unsel(
|
|||
)
|
||||
|
||||
-- Variables set for theming the menu:
|
||||
-- theme.menu_submenu_icon = icons.submenu
|
||||
theme.menu_height = dpi(35)
|
||||
theme.menu_width = dpi(180)
|
||||
theme.menu_bg_normal = x.color0
|
||||
|
|
|
|||
|
|
@ -250,7 +250,6 @@ theme.taglist_squares_unsel = theme_assets.taglist_squares_unsel(
|
|||
)
|
||||
|
||||
-- Variables set for theming the menu:
|
||||
-- theme.menu_submenu_icon = icons.submenu
|
||||
theme.menu_height = dpi(35)
|
||||
theme.menu_width = dpi(180)
|
||||
theme.menu_bg_normal = x.color0
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue