lain: new commit

lain

@@ -1 +1 @@
-Subproject commit 4073bd7cdf79e118e97c0b0f7dba08927bc31d46
+Subproject commit c02fcdb2e9480927f7b0b21f38d20dd203b7d8bd

rc.lua.template

@@ -383,7 +383,7 @@ globalkeys = my_table.join(
               {description = "dropdown application", group = "launcher"}),
 
     -- Widgets popups
-    awful.key({ altkey, }, "c", function () lain.widget.calendar.show(7) end,
+    awful.key({ altkey, }, "c", function () beautiful.cal.show(7) end,
               {description = "show calendar", group = "widgets"}),
     awful.key({ altkey, }, "h", function () if beautiful.fs then beautiful.fs.show(7) end end,
               {description = "show filesystem", group = "widgets"}),

themes/blackburn/theme.lua

@@ -82,7 +82,7 @@ local mytextclock = wibox.widget.textclock(" %H:%M ")
 mytextclock.font = theme.font
 
 -- Calendar
-lain.widget.calendar({
+theme.cal = lain.widget.cal({
     attach_to = { mytextclock },
     notification_preset = {
         font = "Misc Tamsyn 11",

themes/copland/theme.lua

@@ -99,14 +99,14 @@ local mytextclock = wibox.widget.textclock("<span font='Misc Tamzen 5'> </span>%
 mytextclock.font = theme.font
 
 -- Calendar
-lain.widget.calendar {
+theme.cal = lain.widget.cal({
     attach_to = { mytextclock },
     notification_preset = {
         font = "Misc Tamzen 11",
         fg   = theme.fg_normal,
         bg   = theme.bg_normal
     }
-}
+})
 
 --[[ Mail IMAP check
 -- commented because it needs to be set before use

themes/dremora/theme.lua

@@ -83,7 +83,7 @@ local mytextclock = wibox.widget.textclock(markup(gray, " %a")
 mytextclock.font = theme.font
 
 -- Calendar
-lain.widget.calendar({
+theme.cal = lain.widget.cal({
     attach_to = { mytextclock },
     notification_preset = {
         font = "Misc Tamsyn 11",

themes/holo/theme.lua

@@ -112,7 +112,7 @@ local mytextcalendar = wibox.widget.textclock(markup.fontfg(theme.font, "#FFFFFF
 local calendar_icon = wibox.widget.imagebox(theme.calendar)
 local calbg = wibox.container.background(mytextcalendar, theme.bg_focus, gears.shape.rectangle)
 local calendarwidget = wibox.container.margin(calbg, 0, 0, 5, 5)
-lain.widget.calendar({
+theme.cal = lain.widget.cal({
     attach_to = { mytextclock, mytextcalendar },
     notification_preset = {
         fg = "#FFFFFF",

themes/multicolor/theme.lua

@@ -99,7 +99,7 @@ local mytextclock = wibox.widget.textclock(markup("#7788af", "%A %d %B ") .. mar
 mytextclock.font = theme.font
 
 -- Calendar
-theme.cal = lain.widget.calendar({
+theme.cal = theme.cal = lain.widget.cal({
     attach_to = { mytextclock },
     notification_preset = {
         font = "xos4 Terminus 10",

themes/powerarrow-dark/theme.lua

@@ -100,7 +100,7 @@ local clock = awful.widget.watch(
 )
 
 -- Calendar
-theme.cal = lain.widget.calendar({
+theme.cal = theme.cal = lain.widget.cal({
     attach_to = { clock },
     notification_preset = {
         font = "xos4 Terminus 10",

themes/powerarrow/theme.lua

@@ -108,7 +108,7 @@ local binclock = require("themes.powerarrow.binclock"){
 }
 
 -- Calendar
-theme.cal = lain.widget.calendar({
+theme.cal = theme.cal = lain.widget.cal({
     --cal = "cal --color=always",
     attach_to = { binclock.widget },
     notification_preset = {

themes/rainbow/theme.lua

@@ -92,7 +92,7 @@ local mytextclock = wibox.widget.textclock(markup(white, " %H:%M "))
 mytextclock.font = theme.font
 
 -- Calendar
-lain.widget.calendar({
+theme.cal = lain.widget.cal({
     attach_to = { mytextclock },
     notification_preset = {
         font = "Misc Tamsyn 11",

themes/steamburn/theme.lua

@@ -85,7 +85,7 @@ local mytextclock = wibox.widget.textclock(" %H:%M ")
 mytextclock.font = theme.font
 
 -- Calendar
-lain.widget.calendar({
+theme.cal = lain.widget.cal({
     attach_to = { mytextclock },
     notification_preset = {
         font = "Misc Tamsyn 11",

themes/vertex/theme.lua

@@ -113,7 +113,7 @@ local markup = lain.util.markup
 --os.setlocale(os.getenv("LANG")) -- to localize the clock
 local mytextclock = wibox.widget.textclock(markup("#FFFFFF", "%a %d %b, %H:%M"))
 mytextclock.font = theme.font
-lain.widget.calendar({
+theme.cal = lain.widget.cal({
     attach_to = { mytextclock },
     notification_preset = {
         fg = "#FFFFFF",