awesome: cleanup mlp theme

diff --git a/awesome/themes/mlp/taglist/squarefw.png b/awesome/themes/mlp/taglist/squarefw.png
deleted file mode 100644 (file)
index 61c4581..0000000
Binary files a/awesome/themes/mlp/taglist/squarefw.png and /dev/null differ

diff --git a/awesome/themes/mlp/taglist/squarew.png b/awesome/themes/mlp/taglist/squarew.png
deleted file mode 100644 (file)
index 3f8b4b2..0000000
Binary files a/awesome/themes/mlp/taglist/squarew.png and /dev/null differ

diff --git a/awesome/themes/mlp/theme.lua b/awesome/themes/mlp/theme.lua
index c25de0ceede52921f537a9819c7430cbd85b5135..ab21acd5900a2fdaac7e909737f85559280f6eee 100644 (file)
--- a/awesome/themes/mlp/theme.lua
+++ b/awesome/themes/mlp/theme.lua
@@ -2,10 +2,14 @@
 -- Default awesome theme --
 ---------------------------
 
 -- Default awesome theme --
 ---------------------------
 

-local theme = {}
-local awful = require("awful")
+local theme_assets = require("beautiful.theme_assets")
+local xresources = require("beautiful.xresources")
+local dpi = xresources.apply_dpi
+
+local gfs = require("gears.filesystem")
+local theme_path = require("beautiful").theme_path

 
 

-theme.path = gears.filesystem.get_dir("config").."/themes/mlp"
+local theme = {}

 
 theme.font          = "Droid Sans 8"
 
 
 theme.font          = "Droid Sans 8"
 


@@ -33,42 +37,56 @@ theme.tooltip_bg = theme.bg_normal
 -- There are other variable sets
 -- overriding the default one when
 -- defined, the sets are:
 -- There are other variable sets
 -- overriding the default one when
 -- defined, the sets are:

--- [taglist|tasklist]_[bg|fg]_[focus|urgent]
+-- taglist_[bg|fg]_[focus|urgent|occupied|empty|volatile]
+-- tasklist_[bg|fg]_[focus|urgent]

 -- titlebar_[bg|fg]_[normal|focus]
 -- tooltip_[font|opacity|fg_color|bg_color|border_width|border_color]
 -- mouse_finder_[color|timeout|animate_timeout|radius|factor]
 -- titlebar_[bg|fg]_[normal|focus]
 -- tooltip_[font|opacity|fg_color|bg_color|border_width|border_color]
 -- mouse_finder_[color|timeout|animate_timeout|radius|factor]

+-- prompt_[fg|bg|fg_cursor|bg_cursor|font]
+-- hotkeys_[bg|fg|border_width|border_color|shape|opacity|modifiers_fg|label_bg|label_fg|group_margin|font|description_font]

 -- Example:
 --theme.taglist_bg_focus = "#ff0000"
 
 -- Example:
 --theme.taglist_bg_focus = "#ff0000"
 

--- Display the taglist squares
-theme.taglist_squares_sel   = theme.path.."/taglist/squarefw.png"
-theme.taglist_squares_unsel = theme.path.."/taglist/squarew.png"
-
-theme.taglist_icon_only = false
-
-theme.taglist_icon_01 = theme.path.."/cutiemarks/pinkie_pie.png"
-theme.taglist_icon_02 = theme.path.."/cutiemarks/rainbow_dash.png"
-theme.taglist_icon_03 = theme.path.."/cutiemarks/twilight_sparkle.png"
-theme.taglist_icon_04 = theme.path.."/cutiemarks/doctor_whooves.png"
-theme.taglist_icon_05 = theme.path.."/cutiemarks/derpy_hooves.png"
-theme.taglist_icon_06 = theme.path.."/cutiemarks/trixie.png"
-theme.taglist_icon_07 = theme.path.."/cutiemarks/soarin.png"
-theme.taglist_icon_08 = theme.path.."/cutiemarks/princess_celestia.png"
-theme.taglist_icon_09 = theme.path.."/cutiemarks/princess_luna.png"
-theme.taglist_icon_10 = theme.path.."/cutiemarks/snails.png"
-theme.taglist_icon_11 = theme.path.."/cutiemarks/snips.png"
-theme.taglist_icon_12 = theme.path.."/cutiemarks/lyra_heartstrings.png"
-theme.taglist_icon_13 = theme.path.."/cutiemarks/rarity.png"
-theme.taglist_icon_14 = theme.path.."/cutiemarks/fluttershy.png"
-theme.taglist_icon_15 = theme.path.."/cutiemarks/applejack.png"
-theme.taglist_icon_16 = theme.path.."/cutiemarks/snowflake.png"
-theme.taglist_icon_17 = theme.path.."/cutiemarks/thunderlane.png"
-theme.taglist_icon_18 = theme.path.."/cutiemarks/bon_bon.png"
+theme.taglist_icon_only = true
+
+theme.taglist_icon_01 = theme_path.."/cutiemarks/pinkie_pie.png"
+theme.taglist_icon_02 = theme_path.."/cutiemarks/rainbow_dash.png"
+theme.taglist_icon_03 = theme_path.."/cutiemarks/twilight_sparkle.png"
+theme.taglist_icon_04 = theme_path.."/cutiemarks/doctor_whooves.png"
+theme.taglist_icon_05 = theme_path.."/cutiemarks/derpy_hooves.png"
+theme.taglist_icon_06 = theme_path.."/cutiemarks/trixie.png"
+theme.taglist_icon_07 = theme_path.."/cutiemarks/soarin.png"
+theme.taglist_icon_08 = theme_path.."/cutiemarks/princess_celestia.png"
+theme.taglist_icon_09 = theme_path.."/cutiemarks/princess_luna.png"
+theme.taglist_icon_10 = theme_path.."/cutiemarks/snails.png"
+theme.taglist_icon_11 = theme_path.."/cutiemarks/snips.png"
+theme.taglist_icon_12 = theme_path.."/cutiemarks/lyra_heartstrings.png"
+theme.taglist_icon_13 = theme_path.."/cutiemarks/rarity.png"
+theme.taglist_icon_14 = theme_path.."/cutiemarks/fluttershy.png"
+theme.taglist_icon_15 = theme_path.."/cutiemarks/applejack.png"
+theme.taglist_icon_16 = theme_path.."/cutiemarks/snowflake.png"
+theme.taglist_icon_17 = theme_path.."/cutiemarks/thunderlane.png"
+theme.taglist_icon_18 = theme_path.."/cutiemarks/bon_bon.png"
+
+-- Generate taglist squares:
+local taglist_square_size = dpi(4)
+theme.taglist_squares_sel = theme_assets.taglist_squares_sel(
+    taglist_square_size, theme.fg_normal
+)
+theme.taglist_squares_unsel = theme_assets.taglist_squares_unsel(
+    taglist_square_size, theme.fg_normal
+)
+
+-- Variables set for theming notifications:
+-- notification_font
+-- notification_[bg|fg]
+-- notification_[width|height|margin]
+-- notification_[border_color|border_width|shape|opacity]

 
 -- Variables set for theming the menu:
 -- menu_[bg|fg]_[normal|focus]
 -- menu_[border_color|border_width]
 
 -- Variables set for theming the menu:
 -- menu_[bg|fg]_[normal|focus]
 -- menu_[border_color|border_width]

-theme.menu_submenu_icon = theme.path.."/submenu.png"
+theme.menu_submenu_icon = theme_path.."/submenu.png"

 theme.menu_height = 15
 theme.menu_width  = 100
 
 theme.menu_height = 15
 theme.menu_width  = 100
 


@@ -78,49 +96,32 @@ theme.menu_width  = 100
 --theme.bg_widget = "#cc0000"
 
 -- Define the image to load
 --theme.bg_widget = "#cc0000"
 
 -- Define the image to load

-theme.titlebar_ontop_button_normal_inactive = theme.path.."/titlebar/ontop_normal_inactive.png"
-theme.titlebar_ontop_button_focus_inactive  = theme.path.."/titlebar/ontop_focus_inactive.png"
-theme.titlebar_ontop_button_normal_active   = theme.path.."/titlebar/ontop_normal_active.png"
-theme.titlebar_ontop_button_focus_active    = theme.path.."/titlebar/ontop_focus_active.png"
-
-theme.titlebar_sticky_button_normal_inactive = theme.path.."/titlebar/sticky_normal_inactive.png"
-theme.titlebar_sticky_button_focus_inactive  = theme.path.."/titlebar/sticky_focus_inactive.png"
-theme.titlebar_sticky_button_normal_active   = theme.path.."/titlebar/sticky_normal_active.png"
-theme.titlebar_sticky_button_focus_active    = theme.path.."/titlebar/sticky_focus_active.png"
-
-theme.titlebar_floating_button_normal_inactive = theme.path.."/titlebar/floating_normal_inactive.png"
-theme.titlebar_floating_button_focus_inactive  = theme.path.."/titlebar/floating_focus_inactive.png"
-theme.titlebar_floating_button_normal_active   = theme.path.."/titlebar/floating_normal_active.png"
-theme.titlebar_floating_button_focus_active    = theme.path.."/titlebar/floating_focus_active.png"
-
-theme.titlebar_maximized_button_normal_inactive = theme.path.."/titlebar/maximized_normal_inactive.png"
-theme.titlebar_maximized_button_focus_inactive  = theme.path.."/titlebar/maximized_focus_inactive.png"
-theme.titlebar_maximized_button_normal_active   = theme.path.."/titlebar/maximized_normal_active.png"
-theme.titlebar_maximized_button_focus_active    = theme.path.."/titlebar/maximized_focus_active.png"
-
-theme.wallpaper = theme.path.."/background.png"
+theme.wallpaper = theme_path.."/background.png"

 
 -- You can use your own layout icons like this:
 
 -- You can use your own layout icons like this:

-theme.layout_fairh      = theme.path.."/layouts/fairhw.png"
-theme.layout_fairv      = theme.path.."/layouts/fairvw.png"
-theme.layout_floating   = theme.path.."/layouts/floatingw.png"
-theme.layout_magnifier  = theme.path.."/layouts/magnifierw.png"
-theme.layout_max        = theme.path.."/layouts/maxw.png"
-theme.layout_fullscreen = theme.path.."/layouts/fullscreenw.png"
-theme.layout_tilebottom = theme.path.."/layouts/tilebottomw.png"
-theme.layout_tileleft   = theme.path.."/layouts/tileleftw.png"
-theme.layout_tile       = theme.path.."/layouts/tilew.png"
-theme.layout_tiletop    = theme.path.."/layouts/tiletopw.png"
-theme.layout_spiral     = theme.path.."/layouts/spiralw.png"
-theme.layout_dwindle    = theme.path.."/layouts/dwindlew.png"
-theme.layout_cornernw   = theme.path.."/layouts/cornernww.png"
-theme.layout_cornerne   = theme.path.."/layouts/cornernew.png"
-theme.layout_cornersw   = theme.path.."/layouts/cornersww.png"
-theme.layout_cornerse   = theme.path.."/layouts/cornersew.png"
-
-theme.awesome_icon = "/usr/share/awesome/icons/awesome16.png"
-
-theme.mpd_default_album = theme.path.."/mpd_default_album.png"
+theme.layout_fairh      = theme_path.."/layouts/fairhw.png"
+theme.layout_fairv      = theme_path.."/layouts/fairvw.png"
+theme.layout_floating   = theme_path.."/layouts/floatingw.png"
+theme.layout_magnifier  = theme_path.."/layouts/magnifierw.png"
+theme.layout_max        = theme_path.."/layouts/maxw.png"
+theme.layout_fullscreen = theme_path.."/layouts/fullscreenw.png"
+theme.layout_tilebottom = theme_path.."/layouts/tilebottomw.png"
+theme.layout_tileleft   = theme_path.."/layouts/tileleftw.png"
+theme.layout_tile       = theme_path.."/layouts/tilew.png"
+theme.layout_tiletop    = theme_path.."/layouts/tiletopw.png"
+theme.layout_spiral     = theme_path.."/layouts/spiralw.png"
+theme.layout_dwindle    = theme_path.."/layouts/dwindlew.png"
+theme.layout_cornernw   = theme_path.."/layouts/cornernww.png"
+theme.layout_cornerne   = theme_path.."/layouts/cornernew.png"
+theme.layout_cornersw   = theme_path.."/layouts/cornersww.png"
+theme.layout_cornerse   = theme_path.."/layouts/cornersew.png"
+
+-- Generate Awesome icon:
+theme.awesome_icon = theme_assets.awesome_icon(
+    theme.menu_height, theme.bg_focus, theme.fg_focus
+)
+
+theme.mpd_default_album = theme_path.."/mpd_default_album.png"

 
 -- Define the icon theme for application icons. If not set then the icons
 -- from /usr/share/icons and /usr/share/icons/hicolor will be used.
 
 -- Define the icon theme for application icons. If not set then the icons
 -- from /usr/share/icons and /usr/share/icons/hicolor will be used.