From 09929eee2f558b9cbb7acb170c78903db69a58fd Mon Sep 17 00:00:00 2001 From: Luca CPZ Date: Fri, 14 Sep 2018 21:24:48 +0200 Subject: [PATCH] lain: new commit --- lain | 2 +- rc.lua.template | 2 +- themes/blackburn/theme.lua | 2 +- themes/copland/theme.lua | 4 ++-- themes/dremora/theme.lua | 2 +- themes/holo/theme.lua | 2 +- themes/multicolor/theme.lua | 2 +- themes/powerarrow-dark/theme.lua | 2 +- themes/powerarrow/theme.lua | 2 +- themes/rainbow/theme.lua | 2 +- themes/steamburn/theme.lua | 2 +- themes/vertex/theme.lua | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/lain b/lain index 4073bd7..c02fcdb 160000 --- a/lain +++ b/lain @@ -1 +1 @@ -Subproject commit 4073bd7cdf79e118e97c0b0f7dba08927bc31d46 +Subproject commit c02fcdb2e9480927f7b0b21f38d20dd203b7d8bd diff --git a/rc.lua.template b/rc.lua.template index 23445bb..6c7c805 100644 --- a/rc.lua.template +++ b/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"}), diff --git a/themes/blackburn/theme.lua b/themes/blackburn/theme.lua index 26f3187..9e3fd0c 100644 --- a/themes/blackburn/theme.lua +++ b/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", diff --git a/themes/copland/theme.lua b/themes/copland/theme.lua index cac30b7..584712d 100644 --- a/themes/copland/theme.lua +++ b/themes/copland/theme.lua @@ -99,14 +99,14 @@ local mytextclock = wibox.widget.textclock(" % 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 diff --git a/themes/dremora/theme.lua b/themes/dremora/theme.lua index c3d8ca0..a85d712 100644 --- a/themes/dremora/theme.lua +++ b/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", diff --git a/themes/holo/theme.lua b/themes/holo/theme.lua index aafb1be..3a630be 100644 --- a/themes/holo/theme.lua +++ b/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", diff --git a/themes/multicolor/theme.lua b/themes/multicolor/theme.lua index f8495dd..1c5b527 100644 --- a/themes/multicolor/theme.lua +++ b/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", diff --git a/themes/powerarrow-dark/theme.lua b/themes/powerarrow-dark/theme.lua index e4dfa40..5750ef1 100644 --- a/themes/powerarrow-dark/theme.lua +++ b/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", diff --git a/themes/powerarrow/theme.lua b/themes/powerarrow/theme.lua index f9982bb..08da2ff 100644 --- a/themes/powerarrow/theme.lua +++ b/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 = { diff --git a/themes/rainbow/theme.lua b/themes/rainbow/theme.lua index 03f8be5..fd2635f 100644 --- a/themes/rainbow/theme.lua +++ b/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", diff --git a/themes/steamburn/theme.lua b/themes/steamburn/theme.lua index 8385f1c..015af92 100644 --- a/themes/steamburn/theme.lua +++ b/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", diff --git a/themes/vertex/theme.lua b/themes/vertex/theme.lua index 858fbe4..ef32eb1 100644 --- a/themes/vertex/theme.lua +++ b/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",