multicolor ported to 4.0

README.rst

@@ -11,6 +11,7 @@ I am in the process of updating to awesome 4.0. Currently, the ported themes are
 - blackburn
 - copland
 - dremora
+- multicolor
 
 -------------------------
 Themes for Awesome WM 4.x
@@ -24,7 +25,7 @@ Themes for Awesome WM 4.x
 Description
 ===========
 
-A set of themes with the aim of making Awesome_ appearance awesome too!
+A set of themes for the Awesome_ window manager.
 
 Notable features
 ================

freedesktop

@@ -1 +1 @@
-Subproject commit 67af64e08a23cb0126294a3f536ac2aef0d58e83
+Subproject commit a81d6bdc7da07b9a7bfb9012fc9ebcb6bb893076

lain

@@ -1 +1 @@
-Subproject commit 42ef1c3f3d6e2431d44cc710f8862cdb7c11a645
+Subproject commit 2f1f0c572a85f3d393315b6b63aff12a063649b3

rc.lua.blackburn

@@ -543,9 +543,9 @@ globalkeys = awful.util.table.join(
     awful.key({ modkey }, "c", function () os.execute("xsel | xsel -b") end),
 
     -- User programs
-    awful.key({ modkey }, "q", function () awful.util.spawn(browser) end),
-    awful.key({ modkey }, "e", function () awful.util.spawn(gui_editor) end),
-    awful.key({ modkey }, "g", function () awful.util.spawn(graphics) end),
+    awful.key({ modkey }, "q", function () awful.spawn(browser) end),
+    awful.key({ modkey }, "e", function () awful.spawn(gui_editor) end),
+    awful.key({ modkey }, "g", function () awful.spawn(graphics) end),
 
     --[[ Default
     -- Prompt
@@ -564,7 +564,7 @@ globalkeys = awful.util.table.join(
 
     -- dmenu
     awful.key({ modkey }, "x", function ()
-        awful.util.spawn(string.format("dmenu_run -i -fn 'Tamsyn' -nb '%s' -nf '%s' -sb '%s' -sf '%s'",
+        awful.spawn(string.format("dmenu_run -i -fn 'Tamsyn' -nb '%s' -nf '%s' -sb '%s' -sf '%s'",
         beautiful.bg_normal, beautiful.fg_normal, beautiful.bg_focus, beautiful.fg_focus))
 		end)
 )

rc.lua.copland

@@ -124,6 +124,7 @@ red    = "#EB8F8F"
 green  = "#8FEB8F"
 
 -- Textclock
+--os.setlocale(os.getenv("LANG")) -- to localize the clock
 mytextclock = awful.widget.textclock("<span font='Tamsyn 5'> </span>%H:%M ")
 
 -- Calendar
@@ -615,9 +616,9 @@ globalkeys = awful.util.table.join(
     awful.key({ modkey }, "c", function () os.execute("xsel | xsel -b") end),
 
     -- User programs
-    awful.key({ modkey }, "q", function () awful.util.spawn(browser) end),
-    awful.key({ modkey }, "e", function () awful.util.spawn(gui_editor) end),
-    awful.key({ modkey }, "g", function () awful.util.spawn(graphics) end),
+    awful.key({ modkey }, "q", function () awful.spawn(browser) end),
+    awful.key({ modkey }, "e", function () awful.spawn(gui_editor) end),
+    awful.key({ modkey }, "g", function () awful.spawn(graphics) end),
 
     --[[ Default
     -- Prompt
@@ -636,7 +637,7 @@ globalkeys = awful.util.table.join(
 
     -- dmenu
     awful.key({ modkey }, "x", function ()
-        awful.util.spawn(string.format("dmenu_run -i -fn 'Tamsyn' -nb '%s' -nf '%s' -sb '%s' -sf '%s'",
+        awful.spawn(string.format("dmenu_run -i -fn 'Tamsyn' -nb '%s' -nf '%s' -sb '%s' -sf '%s'",
         beautiful.bg_normal, beautiful.fg_normal, beautiful.bg_focus, beautiful.fg_focus))
 		end)
 )

rc.lua.dremora

@@ -543,9 +543,9 @@ globalkeys = awful.util.table.join(
     awful.key({ modkey }, "c", function () os.execute("xsel | xsel -b") end),
 
     -- User programs
-    awful.key({ modkey }, "q", function () awful.util.spawn(browser) end),
-    awful.key({ modkey }, "e", function () awful.util.spawn(gui_editor) end),
-    awful.key({ modkey }, "g", function () awful.util.spawn(graphics) end),
+    awful.key({ modkey }, "q", function () awful.spawn(browser) end),
+    awful.key({ modkey }, "e", function () awful.spawn(gui_editor) end),
+    awful.key({ modkey }, "g", function () awful.spawn(graphics) end),
 
     --[[ Default
     -- Prompt
@@ -564,7 +564,7 @@ globalkeys = awful.util.table.join(
 
     -- dmenu
     awful.key({ modkey }, "x", function ()
-        awful.util.spawn(string.format("dmenu_run -i -fn 'Tamsyn' -nb '%s' -nf '%s' -sb '%s' -sf '%s'",
+        awful.spawn(string.format("dmenu_run -i -fn 'Tamsyn' -nb '%s' -nf '%s' -sb '%s' -sf '%s'",
         beautiful.bg_normal, beautiful.fg_normal, beautiful.bg_focus, beautiful.fg_focus))
 		end)
 )

themes/multicolor/theme.lua

@@ -7,7 +7,7 @@
 --]]
 
 
-theme                               = {}
+local theme                         = {}
 
 theme.confdir                       = os.getenv("HOME") .. "/.config/awesome/themes/multicolor"
 theme.wallpaper                     = theme.confdir .. "/wall.png"
@@ -23,21 +23,12 @@ theme.fg_normal                     = "#aaaaaa"
 theme.fg_focus                      = "#ff8c00"
 theme.fg_urgent                     = "#af1d18"
 theme.fg_minimize                   = "#ffffff"
-theme.fg_black                      = "#424242"
-theme.fg_red                        = "#ce5666"
-theme.fg_green                      = "#80a673"
-theme.fg_yellow                     = "#ffaf5f"
-theme.fg_blue                       = "#7788af"
-theme.fg_magenta                    = "#94738c"
-theme.fg_cyan                       = "#778baf"
-theme.fg_white                      = "#aaaaaa"
-theme.fg_blu                        = "#8ebdde"
 theme.border_width                  = "1"
 theme.border_normal                 = "#1c2022"
 theme.border_focus                  = "#606060"
 theme.border_marked                 = "#3ca4d8"
-theme.menu_width                    = "110"
-theme.menu_border_width             = "0"
+theme.menu_border_width             = 0
+theme.menu_width                    = 130
 theme.menu_fg_normal                = "#aaaaaa"
 theme.menu_fg_focus                 = "#ff8c00"
 theme.menu_bg_normal                = "#050505dd"
@@ -82,5 +73,6 @@ theme.layout_fullscreen             = theme.confdir .. "/icons/fullscreen.png"
 theme.layout_magnifier              = theme.confdir .. "/icons/magnifier.png"
 theme.layout_floating               = theme.confdir .. "/icons/floating.png"
 
+theme.useless_gap                   = 0
 
 return theme