awesome: icons are now part of the theme

diff --git a/awesome/tags.lua b/awesome/tags.lua
index 8ccc42d68aed7771c26146fbbd44d10ddf23891d..145e1f2641a3595a2d2111b7fac0ddccd39b3e81 100644 (file)
--- a/awesome/tags.lua
+++ b/awesome/tags.lua
@@ -1,47 +1,46 @@
 -- Tags {{{1
 local mytags = {}
 -- Tags {{{1
 local mytags = {}

-local path = beautiful.path
-local icon_only = true
+local theme = beautiful.get()

 
 --TODO create a list of tag objects and place them according to number of screens  (sb:20170130)
 -- single screen {{{2
 mytags[1] = {}
 mytags[1][1] = {
 
 --TODO create a list of tag objects and place them according to number of screens  (sb:20170130)
 -- single screen {{{2
 mytags[1] = {}
 mytags[1][1] = {

-    { name = "1", layout = awful.layout.suit.tile.left,   master_width_factor=0.50, icon = path.."/cutiemarks/pinkie_pie.png"},
-    { name = "2", layout = awful.layout.suit.tile,        master_width_factor=0.60, icon = path.."/cutiemarks/rainbow_dash.png"},
-    { name = "3", layout = awful.layout.suit.max,         master_width_factor=0.50, icon = path.."/cutiemarks/twilight_sparkle.png"},
-    { name = "4", layout = awful.layout.suit.tile.left,   master_width_factor=0.60, icon = path.."/cutiemarks/doctor_whooves.png"},
-    { name = "5", layout = awful.layout.suit.tile,        master_width_factor=0.30, icon = path.."/cutiemarks/derpy_hooves.png"},
-    { name = "6", layout = awful.layout.suit.tile,        master_width_factor=0.50, icon = path.."/cutiemarks/trixie.png"},
-    { name = "7", layout = awful.layout.suit.tile.bottom, master_width_factor=0.80, icon = path.."/cutiemarks/soarin.png"},
-    { name = "8", layout = awful.layout.suit.tile,        master_width_factor=0.50, icon = path.."/cutiemarks/princess_celestia.png"},
-    { name = "9", layout = awful.layout.suit.floating,    master_width_factor=0.50, icon = path.."/cutiemarks/princess_luna.png"},
+    { name = "1", layout = awful.layout.suit.tile.left,   master_width_factor=0.50, icon = theme.taglist_icon_01},
+    { name = "2", layout = awful.layout.suit.tile,        master_width_factor=0.60, icon = theme.taglist_icon_02},
+    { name = "3", layout = awful.layout.suit.max,         master_width_factor=0.50, icon = theme.taglist_icon_03},
+    { name = "4", layout = awful.layout.suit.tile.left,   master_width_factor=0.60, icon = theme.taglist_icon_04},
+    { name = "5", layout = awful.layout.suit.tile,        master_width_factor=0.30, icon = theme.taglist_icon_05},
+    { name = "6", layout = awful.layout.suit.tile,        master_width_factor=0.50, icon = theme.taglist_icon_06},
+    { name = "7", layout = awful.layout.suit.tile.bottom, master_width_factor=0.80, icon = theme.taglist_icon_07},
+    { name = "8", layout = awful.layout.suit.tile,        master_width_factor=0.50, icon = theme.taglist_icon_08},
+    { name = "9", layout = awful.layout.suit.floating,    master_width_factor=0.50, icon = theme.taglist_icon_09},

 }
 
 -- Dual screen {{{2
 mytags[2] = {}
 mytags[2][1] = {
 }
 
 -- Dual screen {{{2
 mytags[2] = {}
 mytags[2][1] = {

-    { name = "1", layout = awful.layout.suit.tile.left,   master_width_factor=0.50, icon = path.."/cutiemarks/pinkie_pie.png"},
-    { name = "2", layout = awful.layout.suit.tile.left,   master_width_factor=0.60, icon = path.."/cutiemarks/rainbow_dash.png"},
-    { name = "3", layout = awful.layout.suit.tile.left,   master_width_factor=0.60, icon = path.."/cutiemarks/twilight_sparkle.png"},
-    { name = "4", layout = awful.layout.suit.tile.left,   master_width_factor=0.60, icon = path.."/cutiemarks/doctor_whooves.png"},
-    { name = "5", layout = awful.layout.suit.tile.left,   master_width_factor=0.30, icon = path.."/cutiemarks/derpy_hooves.png"},
-    { name = "6", layout = awful.layout.suit.tile.left,   master_width_factor=0.70, icon = path.."/cutiemarks/trixie.png"},
-    { name = "7", layout = awful.layout.suit.tile.left,   master_width_factor=0.88, icon = path.."/cutiemarks/soarin.png"},
-    { name = "8", layout = awful.layout.suit.tile.left,   master_width_factor=0.84, icon = path.."/cutiemarks/princess_celestia.png"},
-    { name = "9", layout = awful.layout.suit.floating,    master_width_factor=0.50, icon = path.."/cutiemarks/princess_luna.png"},
+    { name = "1", layout = awful.layout.suit.tile.left,   master_width_factor=0.50, icon = theme.taglist_icon_01},
+    { name = "2", layout = awful.layout.suit.tile.left,   master_width_factor=0.60, icon = theme.taglist_icon_02},
+    { name = "3", layout = awful.layout.suit.tile.left,   master_width_factor=0.60, icon = theme.taglist_icon_03},
+    { name = "4", layout = awful.layout.suit.tile.left,   master_width_factor=0.60, icon = theme.taglist_icon_04},
+    { name = "5", layout = awful.layout.suit.tile.left,   master_width_factor=0.30, icon = theme.taglist_icon_05},
+    { name = "6", layout = awful.layout.suit.tile.left,   master_width_factor=0.70, icon = theme.taglist_icon_06},
+    { name = "7", layout = awful.layout.suit.tile.left,   master_width_factor=0.88, icon = theme.taglist_icon_07},
+    { name = "8", layout = awful.layout.suit.tile.left,   master_width_factor=0.84, icon = theme.taglist_icon_08},
+    { name = "9", layout = awful.layout.suit.floating,    master_width_factor=0.50, icon = theme.taglist_icon_09},

 }
 
 mytags[2][2] = {
 }
 
 mytags[2][2] = {

-    { name = "1", layout = awful.layout.suit.tile,        master_width_factor=0.60, icon = path.."/cutiemarks/snails.png"},
-    { name = "2", layout = awful.layout.suit.max,         master_width_factor=0.88, icon = path.."/cutiemarks/snips.png"},
-    { name = "3", layout = awful.layout.suit.tile,        master_width_factor=0.50, icon = path.."/cutiemarks/lyra_heartstrings.png"},
-    { name = "4", layout = awful.layout.suit.tile.left,   master_width_factor=0.80, icon = path.."/cutiemarks/rarity.png"},
-    { name = "5", layout = awful.layout.suit.tile,        master_width_factor=0.50, icon = path.."/cutiemarks/fluttershy.png"},
-    { name = "6", layout = awful.layout.suit.tile,        master_width_factor=0.50, icon = path.."/cutiemarks/applejack.png"},
-    { name = "7", layout = awful.layout.suit.tile,        master_width_factor=0.50, icon = path.."/cutiemarks/snowflake.png"},
-    { name = "8", layout = awful.layout.suit.tile,        master_width_factor=0.50, icon = path.."/cutiemarks/thunderlane.png"},
-    { name = "9", layout = awful.layout.suit.max,         master_width_factor=0.50, icon = path.."/cutiemarks/bon_bon.png"},
+    { name = "1", layout = awful.layout.suit.tile,        master_width_factor=0.60, icon = theme.taglist_icon_10},
+    { name = "2", layout = awful.layout.suit.max,         master_width_factor=0.88, icon = theme.taglist_icon_11},
+    { name = "3", layout = awful.layout.suit.tile,        master_width_factor=0.50, icon = theme.taglist_icon_12},
+    { name = "4", layout = awful.layout.suit.tile.left,   master_width_factor=0.80, icon = theme.taglist_icon_13},
+    { name = "5", layout = awful.layout.suit.tile,        master_width_factor=0.50, icon = theme.taglist_icon_14},
+    { name = "6", layout = awful.layout.suit.tile,        master_width_factor=0.50, icon = theme.taglist_icon_15},
+    { name = "7", layout = awful.layout.suit.tile,        master_width_factor=0.50, icon = theme.taglist_icon_16},
+    { name = "8", layout = awful.layout.suit.tile,        master_width_factor=0.50, icon = theme.taglist_icon_17},
+    { name = "9", layout = awful.layout.suit.max,         master_width_factor=0.50, icon = theme.taglist_icon_18},

 }
 
 -- Wallpaper {{{2
 }
 
 -- Wallpaper {{{2


@@ -74,7 +73,7 @@ awful.screen.connect_for_each_screen(function(s)
         props.screen = s
         for k,v in pairs(p) do
             props[k] = v
         props.screen = s
         for k,v in pairs(p) do
             props[k] = v

-            props['icon_only'] = icon_only
+            props['icon_only'] = theme.taglist_icon_only

         end
         tags[s][i] = awful.tag.add(p.name, props)
     end
         end
         tags[s][i] = awful.tag.add(p.name, props)
     end

diff --git a/awesome/themes/mlp/theme.lua b/awesome/themes/mlp/theme.lua
index de594e15f64589b35b45809a411a28d708ab8ead..c25de0ceede52921f537a9819c7430cbd85b5135 100644 (file)
--- a/awesome/themes/mlp/theme.lua
+++ b/awesome/themes/mlp/theme.lua
@@ -44,6 +44,27 @@ theme.tooltip_bg = theme.bg_normal
 theme.taglist_squares_sel   = theme.path.."/taglist/squarefw.png"
 theme.taglist_squares_unsel = theme.path.."/taglist/squarew.png"
 
 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"
+

 -- 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]