all themes: use dynamic themes/icon dir

This applies the same change that 74295393af applied to the default
theme to all other themes.

Signed-off-by: Uli Schlachter <psychon@znc.in>
This commit is contained in:
Uli Schlachter 2017-01-25 09:29:59 +01:00
parent 508614dfd2
commit 0e6077116a
2 changed files with 83 additions and 80 deletions

View File

@ -7,6 +7,7 @@
local theme_assets = require("beautiful.theme_assets") local theme_assets = require("beautiful.theme_assets")
local xresources = require("beautiful.xresources") local xresources = require("beautiful.xresources")
local dpi = xresources.apply_dpi local dpi = xresources.apply_dpi
local themes_path = require("awful.util").get_themes_dir()
-- BASICS -- BASICS
@ -31,27 +32,27 @@ theme.border_focus = "#729fcf"
theme.border_marked = "#eeeeec" theme.border_marked = "#eeeeec"
-- IMAGES -- IMAGES
theme.layout_fairh = "@AWESOME_THEMES_PATH@/sky/layouts/fairh.png" theme.layout_fairh = themes_path .. "sky/layouts/fairh.png"
theme.layout_fairv = "@AWESOME_THEMES_PATH@/sky/layouts/fairv.png" theme.layout_fairv = themes_path .. "sky/layouts/fairv.png"
theme.layout_floating = "@AWESOME_THEMES_PATH@/sky/layouts/floating.png" theme.layout_floating = themes_path .. "sky/layouts/floating.png"
theme.layout_magnifier = "@AWESOME_THEMES_PATH@/sky/layouts/magnifier.png" theme.layout_magnifier = themes_path .. "sky/layouts/magnifier.png"
theme.layout_max = "@AWESOME_THEMES_PATH@/sky/layouts/max.png" theme.layout_max = themes_path .. "sky/layouts/max.png"
theme.layout_fullscreen = "@AWESOME_THEMES_PATH@/sky/layouts/fullscreen.png" theme.layout_fullscreen = themes_path .. "sky/layouts/fullscreen.png"
theme.layout_tilebottom = "@AWESOME_THEMES_PATH@/sky/layouts/tilebottom.png" theme.layout_tilebottom = themes_path .. "sky/layouts/tilebottom.png"
theme.layout_tileleft = "@AWESOME_THEMES_PATH@/sky/layouts/tileleft.png" theme.layout_tileleft = themes_path .. "sky/layouts/tileleft.png"
theme.layout_tile = "@AWESOME_THEMES_PATH@/sky/layouts/tile.png" theme.layout_tile = themes_path .. "sky/layouts/tile.png"
theme.layout_tiletop = "@AWESOME_THEMES_PATH@/sky/layouts/tiletop.png" theme.layout_tiletop = themes_path .. "sky/layouts/tiletop.png"
theme.layout_spiral = "@AWESOME_THEMES_PATH@/sky/layouts/spiral.png" theme.layout_spiral = themes_path .. "sky/layouts/spiral.png"
theme.layout_dwindle = "@AWESOME_THEMES_PATH@/sky/layouts/dwindle.png" theme.layout_dwindle = themes_path .. "sky/layouts/dwindle.png"
theme.layout_cornernw = "@AWESOME_THEMES_PATH@/sky/layouts/cornernw.png" theme.layout_cornernw = themes_path .. "sky/layouts/cornernw.png"
theme.layout_cornerne = "@AWESOME_THEMES_PATH@/sky/layouts/cornerne.png" theme.layout_cornerne = themes_path .. "sky/layouts/cornerne.png"
theme.layout_cornersw = "@AWESOME_THEMES_PATH@/sky/layouts/cornersw.png" theme.layout_cornersw = themes_path .. "sky/layouts/cornersw.png"
theme.layout_cornerse = "@AWESOME_THEMES_PATH@/sky/layouts/cornerse.png" theme.layout_cornerse = themes_path .. "sky/layouts/cornerse.png"
theme.awesome_icon = "@AWESOME_THEMES_PATH@/sky/awesome-icon.png" theme.awesome_icon = themes_path .. "sky/awesome-icon.png"
-- from default for now... -- from default for now...
theme.menu_submenu_icon = "@AWESOME_THEMES_PATH@/default/submenu.png" theme.menu_submenu_icon = themes_path .. "default/submenu.png"
-- Generate taglist squares: -- Generate taglist squares:
local taglist_square_size = dpi(4) local taglist_square_size = dpi(4)
@ -63,38 +64,38 @@ theme.taglist_squares_unsel = theme_assets.taglist_squares_unsel(
) )
-- MISC -- MISC
theme.wallpaper = "@AWESOME_THEMES_PATH@/sky/sky-background.png" theme.wallpaper = themes_path .. "sky/sky-background.png"
theme.taglist_squares = "true" theme.taglist_squares = "true"
theme.titlebar_close_button = "true" theme.titlebar_close_button = "true"
theme.menu_height = dpi(15) theme.menu_height = dpi(15)
theme.menu_width = dpi(100) theme.menu_width = dpi(100)
-- Define the image to load -- Define the image to load
theme.titlebar_close_button_normal = "@AWESOME_THEMES_PATH@/default/titlebar/close_normal.png" theme.titlebar_close_button_normal = themes_path .. "default/titlebar/close_normal.png"
theme.titlebar_close_button_focus = "@AWESOME_THEMES_PATH@/default/titlebar/close_focus.png" theme.titlebar_close_button_focus = themes_path .. "default/titlebar/close_focus.png"
theme.titlebar_minimize_button_normal = "@AWESOME_THEMES_PATH@/default/titlebar/minimize_normal.png" theme.titlebar_minimize_button_normal = themes_path .. "default/titlebar/minimize_normal.png"
theme.titlebar_minimize_button_focus = "@AWESOME_THEMES_PATH@/default/titlebar/minimize_focus.png" theme.titlebar_minimize_button_focus = themes_path .. "default/titlebar/minimize_focus.png"
theme.titlebar_ontop_button_normal_inactive = "@AWESOME_THEMES_PATH@/default/titlebar/ontop_normal_inactive.png" theme.titlebar_ontop_button_normal_inactive = themes_path .. "default/titlebar/ontop_normal_inactive.png"
theme.titlebar_ontop_button_focus_inactive = "@AWESOME_THEMES_PATH@/default/titlebar/ontop_focus_inactive.png" theme.titlebar_ontop_button_focus_inactive = themes_path .. "default/titlebar/ontop_focus_inactive.png"
theme.titlebar_ontop_button_normal_active = "@AWESOME_THEMES_PATH@/default/titlebar/ontop_normal_active.png" theme.titlebar_ontop_button_normal_active = themes_path .. "default/titlebar/ontop_normal_active.png"
theme.titlebar_ontop_button_focus_active = "@AWESOME_THEMES_PATH@/default/titlebar/ontop_focus_active.png" theme.titlebar_ontop_button_focus_active = themes_path .. "default/titlebar/ontop_focus_active.png"
theme.titlebar_sticky_button_normal_inactive = "@AWESOME_THEMES_PATH@/default/titlebar/sticky_normal_inactive.png" theme.titlebar_sticky_button_normal_inactive = themes_path .. "default/titlebar/sticky_normal_inactive.png"
theme.titlebar_sticky_button_focus_inactive = "@AWESOME_THEMES_PATH@/default/titlebar/sticky_focus_inactive.png" theme.titlebar_sticky_button_focus_inactive = themes_path .. "default/titlebar/sticky_focus_inactive.png"
theme.titlebar_sticky_button_normal_active = "@AWESOME_THEMES_PATH@/default/titlebar/sticky_normal_active.png" theme.titlebar_sticky_button_normal_active = themes_path .. "default/titlebar/sticky_normal_active.png"
theme.titlebar_sticky_button_focus_active = "@AWESOME_THEMES_PATH@/default/titlebar/sticky_focus_active.png" theme.titlebar_sticky_button_focus_active = themes_path .. "default/titlebar/sticky_focus_active.png"
theme.titlebar_floating_button_normal_inactive = "@AWESOME_THEMES_PATH@/default/titlebar/floating_normal_inactive.png" theme.titlebar_floating_button_normal_inactive = themes_path .. "default/titlebar/floating_normal_inactive.png"
theme.titlebar_floating_button_focus_inactive = "@AWESOME_THEMES_PATH@/default/titlebar/floating_focus_inactive.png" theme.titlebar_floating_button_focus_inactive = themes_path .. "default/titlebar/floating_focus_inactive.png"
theme.titlebar_floating_button_normal_active = "@AWESOME_THEMES_PATH@/default/titlebar/floating_normal_active.png" theme.titlebar_floating_button_normal_active = themes_path .. "default/titlebar/floating_normal_active.png"
theme.titlebar_floating_button_focus_active = "@AWESOME_THEMES_PATH@/default/titlebar/floating_focus_active.png" theme.titlebar_floating_button_focus_active = themes_path .. "default/titlebar/floating_focus_active.png"
theme.titlebar_maximized_button_normal_inactive = "@AWESOME_THEMES_PATH@/default/titlebar/maximized_normal_inactive.png" theme.titlebar_maximized_button_normal_inactive = themes_path .. "default/titlebar/maximized_normal_inactive.png"
theme.titlebar_maximized_button_focus_inactive = "@AWESOME_THEMES_PATH@/default/titlebar/maximized_focus_inactive.png" theme.titlebar_maximized_button_focus_inactive = themes_path .. "default/titlebar/maximized_focus_inactive.png"
theme.titlebar_maximized_button_normal_active = "@AWESOME_THEMES_PATH@/default/titlebar/maximized_normal_active.png" theme.titlebar_maximized_button_normal_active = themes_path .. "default/titlebar/maximized_normal_active.png"
theme.titlebar_maximized_button_focus_active = "@AWESOME_THEMES_PATH@/default/titlebar/maximized_focus_active.png" theme.titlebar_maximized_button_focus_active = themes_path .. "default/titlebar/maximized_focus_active.png"
return theme return theme

View File

@ -3,9 +3,11 @@
-- By Adrian C. (anrxc) -- -- By Adrian C. (anrxc) --
------------------------------- -------------------------------
local themes_path = require("awful.util").get_themes_dir()
-- {{{ Main -- {{{ Main
local theme = {} local theme = {}
theme.wallpaper = "@AWESOME_THEMES_PATH@/zenburn/zenburn-background.png" theme.wallpaper = themes_path .. "zenburn/zenburn-background.png"
-- }}} -- }}}
-- {{{ Styles -- {{{ Styles
@ -70,61 +72,61 @@ theme.menu_width = 100
-- {{{ Icons -- {{{ Icons
-- {{{ Taglist -- {{{ Taglist
theme.taglist_squares_sel = "@AWESOME_THEMES_PATH@/zenburn/taglist/squarefz.png" theme.taglist_squares_sel = themes_path .. "zenburn/taglist/squarefz.png"
theme.taglist_squares_unsel = "@AWESOME_THEMES_PATH@/zenburn/taglist/squarez.png" theme.taglist_squares_unsel = themes_path .. "zenburn/taglist/squarez.png"
--theme.taglist_squares_resize = "false" --theme.taglist_squares_resize = "false"
-- }}} -- }}}
-- {{{ Misc -- {{{ Misc
theme.awesome_icon = "@AWESOME_THEMES_PATH@/zenburn/awesome-icon.png" theme.awesome_icon = themes_path .. "zenburn/awesome-icon.png"
theme.menu_submenu_icon = "@AWESOME_THEMES_PATH@/default/submenu.png" theme.menu_submenu_icon = themes_path .. "default/submenu.png"
-- }}} -- }}}
-- {{{ Layout -- {{{ Layout
theme.layout_tile = "@AWESOME_THEMES_PATH@/zenburn/layouts/tile.png" theme.layout_tile = themes_path .. "zenburn/layouts/tile.png"
theme.layout_tileleft = "@AWESOME_THEMES_PATH@/zenburn/layouts/tileleft.png" theme.layout_tileleft = themes_path .. "zenburn/layouts/tileleft.png"
theme.layout_tilebottom = "@AWESOME_THEMES_PATH@/zenburn/layouts/tilebottom.png" theme.layout_tilebottom = themes_path .. "zenburn/layouts/tilebottom.png"
theme.layout_tiletop = "@AWESOME_THEMES_PATH@/zenburn/layouts/tiletop.png" theme.layout_tiletop = themes_path .. "zenburn/layouts/tiletop.png"
theme.layout_fairv = "@AWESOME_THEMES_PATH@/zenburn/layouts/fairv.png" theme.layout_fairv = themes_path .. "zenburn/layouts/fairv.png"
theme.layout_fairh = "@AWESOME_THEMES_PATH@/zenburn/layouts/fairh.png" theme.layout_fairh = themes_path .. "zenburn/layouts/fairh.png"
theme.layout_spiral = "@AWESOME_THEMES_PATH@/zenburn/layouts/spiral.png" theme.layout_spiral = themes_path .. "zenburn/layouts/spiral.png"
theme.layout_dwindle = "@AWESOME_THEMES_PATH@/zenburn/layouts/dwindle.png" theme.layout_dwindle = themes_path .. "zenburn/layouts/dwindle.png"
theme.layout_max = "@AWESOME_THEMES_PATH@/zenburn/layouts/max.png" theme.layout_max = themes_path .. "zenburn/layouts/max.png"
theme.layout_fullscreen = "@AWESOME_THEMES_PATH@/zenburn/layouts/fullscreen.png" theme.layout_fullscreen = themes_path .. "zenburn/layouts/fullscreen.png"
theme.layout_magnifier = "@AWESOME_THEMES_PATH@/zenburn/layouts/magnifier.png" theme.layout_magnifier = themes_path .. "zenburn/layouts/magnifier.png"
theme.layout_floating = "@AWESOME_THEMES_PATH@/zenburn/layouts/floating.png" theme.layout_floating = themes_path .. "zenburn/layouts/floating.png"
theme.layout_cornernw = "@AWESOME_THEMES_PATH@/zenburn/layouts/cornernw.png" theme.layout_cornernw = themes_path .. "zenburn/layouts/cornernw.png"
theme.layout_cornerne = "@AWESOME_THEMES_PATH@/zenburn/layouts/cornerne.png" theme.layout_cornerne = themes_path .. "zenburn/layouts/cornerne.png"
theme.layout_cornersw = "@AWESOME_THEMES_PATH@/zenburn/layouts/cornersw.png" theme.layout_cornersw = themes_path .. "zenburn/layouts/cornersw.png"
theme.layout_cornerse = "@AWESOME_THEMES_PATH@/zenburn/layouts/cornerse.png" theme.layout_cornerse = themes_path .. "zenburn/layouts/cornerse.png"
-- }}} -- }}}
-- {{{ Titlebar -- {{{ Titlebar
theme.titlebar_close_button_focus = "@AWESOME_THEMES_PATH@/zenburn/titlebar/close_focus.png" theme.titlebar_close_button_focus = themes_path .. "zenburn/titlebar/close_focus.png"
theme.titlebar_close_button_normal = "@AWESOME_THEMES_PATH@/zenburn/titlebar/close_normal.png" theme.titlebar_close_button_normal = themes_path .. "zenburn/titlebar/close_normal.png"
theme.titlebar_minimize_button_normal = "@AWESOME_THEMES_PATH@/default/titlebar/minimize_normal.png" theme.titlebar_minimize_button_normal = themes_path .. "default/titlebar/minimize_normal.png"
theme.titlebar_minimize_button_focus = "@AWESOME_THEMES_PATH@/default/titlebar/minimize_focus.png" theme.titlebar_minimize_button_focus = themes_path .. "default/titlebar/minimize_focus.png"
theme.titlebar_ontop_button_focus_active = "@AWESOME_THEMES_PATH@/zenburn/titlebar/ontop_focus_active.png" theme.titlebar_ontop_button_focus_active = themes_path .. "zenburn/titlebar/ontop_focus_active.png"
theme.titlebar_ontop_button_normal_active = "@AWESOME_THEMES_PATH@/zenburn/titlebar/ontop_normal_active.png" theme.titlebar_ontop_button_normal_active = themes_path .. "zenburn/titlebar/ontop_normal_active.png"
theme.titlebar_ontop_button_focus_inactive = "@AWESOME_THEMES_PATH@/zenburn/titlebar/ontop_focus_inactive.png" theme.titlebar_ontop_button_focus_inactive = themes_path .. "zenburn/titlebar/ontop_focus_inactive.png"
theme.titlebar_ontop_button_normal_inactive = "@AWESOME_THEMES_PATH@/zenburn/titlebar/ontop_normal_inactive.png" theme.titlebar_ontop_button_normal_inactive = themes_path .. "zenburn/titlebar/ontop_normal_inactive.png"
theme.titlebar_sticky_button_focus_active = "@AWESOME_THEMES_PATH@/zenburn/titlebar/sticky_focus_active.png" theme.titlebar_sticky_button_focus_active = themes_path .. "zenburn/titlebar/sticky_focus_active.png"
theme.titlebar_sticky_button_normal_active = "@AWESOME_THEMES_PATH@/zenburn/titlebar/sticky_normal_active.png" theme.titlebar_sticky_button_normal_active = themes_path .. "zenburn/titlebar/sticky_normal_active.png"
theme.titlebar_sticky_button_focus_inactive = "@AWESOME_THEMES_PATH@/zenburn/titlebar/sticky_focus_inactive.png" theme.titlebar_sticky_button_focus_inactive = themes_path .. "zenburn/titlebar/sticky_focus_inactive.png"
theme.titlebar_sticky_button_normal_inactive = "@AWESOME_THEMES_PATH@/zenburn/titlebar/sticky_normal_inactive.png" theme.titlebar_sticky_button_normal_inactive = themes_path .. "zenburn/titlebar/sticky_normal_inactive.png"
theme.titlebar_floating_button_focus_active = "@AWESOME_THEMES_PATH@/zenburn/titlebar/floating_focus_active.png" theme.titlebar_floating_button_focus_active = themes_path .. "zenburn/titlebar/floating_focus_active.png"
theme.titlebar_floating_button_normal_active = "@AWESOME_THEMES_PATH@/zenburn/titlebar/floating_normal_active.png" theme.titlebar_floating_button_normal_active = themes_path .. "zenburn/titlebar/floating_normal_active.png"
theme.titlebar_floating_button_focus_inactive = "@AWESOME_THEMES_PATH@/zenburn/titlebar/floating_focus_inactive.png" theme.titlebar_floating_button_focus_inactive = themes_path .. "zenburn/titlebar/floating_focus_inactive.png"
theme.titlebar_floating_button_normal_inactive = "@AWESOME_THEMES_PATH@/zenburn/titlebar/floating_normal_inactive.png" theme.titlebar_floating_button_normal_inactive = themes_path .. "zenburn/titlebar/floating_normal_inactive.png"
theme.titlebar_maximized_button_focus_active = "@AWESOME_THEMES_PATH@/zenburn/titlebar/maximized_focus_active.png" theme.titlebar_maximized_button_focus_active = themes_path .. "zenburn/titlebar/maximized_focus_active.png"
theme.titlebar_maximized_button_normal_active = "@AWESOME_THEMES_PATH@/zenburn/titlebar/maximized_normal_active.png" theme.titlebar_maximized_button_normal_active = themes_path .. "zenburn/titlebar/maximized_normal_active.png"
theme.titlebar_maximized_button_focus_inactive = "@AWESOME_THEMES_PATH@/zenburn/titlebar/maximized_focus_inactive.png" theme.titlebar_maximized_button_focus_inactive = themes_path .. "zenburn/titlebar/maximized_focus_inactive.png"
theme.titlebar_maximized_button_normal_inactive = "@AWESOME_THEMES_PATH@/zenburn/titlebar/maximized_normal_inactive.png" theme.titlebar_maximized_button_normal_inactive = themes_path .. "zenburn/titlebar/maximized_normal_inactive.png"
-- }}} -- }}}
-- }}} -- }}}