From d567a727b5447e7d45d1c71eed04691020a7cacf Mon Sep 17 00:00:00 2001 From: luke bonham Date: Thu, 19 Sep 2013 20:54:11 +0200 Subject: [PATCH] lain: new commit --- README.rst | 1 + lain | 2 +- rc.lua.blackburn | 14 ++++---------- rc.lua.dremora | 14 ++++---------- rc.lua.holo | 15 ++++----------- rc.lua.multicolor | 6 ------ rc.lua.powerarrow-darker | 7 +------ rc.lua.rainbow | 14 ++++---------- rc.lua.steamburn | 6 ------ .../icons/{awesome_icon.png => awesome.png} | Bin themes/rainbow/theme.lua | 6 +++--- 11 files changed, 22 insertions(+), 63 deletions(-) rename themes/rainbow/icons/{awesome_icon.png => awesome.png} (100%) diff --git a/README.rst b/README.rst index d19d75c..a5951cc 100644 --- a/README.rst +++ b/README.rst @@ -41,6 +41,7 @@ Notable features - Non-empty tag browsing - Tag renaming - Dynamic useless gaps +- Dynamic tagging Gallery ======= diff --git a/lain b/lain index 74f4507..5320872 160000 --- a/lain +++ b/lain @@ -1 +1 @@ -Subproject commit 74f4507743e694cc17b85746247ec7a816d6924d +Subproject commit 53208723736b34e4b6c2c23fd77757fd46c436cf diff --git a/rc.lua.blackburn b/rc.lua.blackburn index 7d07084..b92be02 100755 --- a/rc.lua.blackburn +++ b/rc.lua.blackburn @@ -346,12 +346,6 @@ globalkeys = awful.util.table.join( awful.key({ altkey }, "Left", function () lain.util.tag_view_nonempty(-1) end), awful.key({ altkey }, "Right", function () lain.util.tag_view_nonempty(1) end), - -- Dynamic tag renaming - awful.key({ altkey, "Shift" }, "r", - function () - lain.util.prompt_rename_tag(mypromptbox) - end ), - -- Default client focus awful.key({ altkey }, "k", function () @@ -397,6 +391,10 @@ globalkeys = awful.util.table.join( mywibox[mouse.screen].visible = not mywibox[mouse.screen].visible end), + -- On the fly useless gaps change + awful.key({ altkey, "Control" }, "+", function () lain.util.useless_gaps_resize(1) end), + awful.key({ altkey, "Control" }, "-", function () lain.util.useless_gaps_resize(-1) end), + -- Layout manipulation awful.key({ modkey, "Shift" }, "j", function () awful.client.swap.byidx( 1) end), awful.key({ modkey, "Shift" }, "k", function () awful.client.swap.byidx( -1) end), @@ -420,10 +418,6 @@ globalkeys = awful.util.table.join( awful.key({ modkey, "Shift" }, "space", function () awful.layout.inc(layouts, -1) end), awful.key({ modkey, "Control" }, "n", awful.client.restore), - -- On the fly useless gaps change - awful.key({ altkey, "Control" }, "+", function () lain.util.useless_gaps_resize(1) end), - awful.key({ altkey, "Control" }, "-", function () lain.util.useless_gaps_resize(-1) end), - -- Standard program awful.key({ modkey, }, "Return", function () awful.util.spawn(terminal) end), awful.key({ modkey, "Control" }, "r", awesome.restart), diff --git a/rc.lua.dremora b/rc.lua.dremora index eefe18f..ea7b5ff 100755 --- a/rc.lua.dremora +++ b/rc.lua.dremora @@ -342,12 +342,6 @@ globalkeys = awful.util.table.join( awful.key({ altkey }, "Left", function () lain.util.tag_view_nonempty(-1) end), awful.key({ altkey }, "Right", function () lain.util.tag_view_nonempty(1) end), - -- Dynamic tag renaming - awful.key({ altkey, "Shift" }, "r", - function () - lain.util.prompt_rename_tag(mypromptbox) - end ), - -- Default client focus awful.key({ altkey }, "k", function () @@ -393,6 +387,10 @@ globalkeys = awful.util.table.join( mywibox[mouse.screen].visible = not mywibox[mouse.screen].visible end), + -- On the fly useless gaps change + awful.key({ altkey, "Control" }, "+", function () lain.util.useless_gaps_resize(1) end), + awful.key({ altkey, "Control" }, "-", function () lain.util.useless_gaps_resize(-1) end), + -- Layout manipulation awful.key({ modkey, "Shift" }, "j", function () awful.client.swap.byidx( 1) end), awful.key({ modkey, "Shift" }, "k", function () awful.client.swap.byidx( -1) end), @@ -416,10 +414,6 @@ globalkeys = awful.util.table.join( awful.key({ modkey, "Shift" }, "space", function () awful.layout.inc(layouts, -1) end), awful.key({ modkey, "Control" }, "n", awful.client.restore), - -- On the fly useless gaps change - awful.key({ altkey, "Control" }, "+", function () lain.util.useless_gaps_resize(1) end), - awful.key({ altkey, "Control" }, "-", function () lain.util.useless_gaps_resize(-1) end), - -- Standard program awful.key({ modkey, }, "Return", function () awful.util.spawn(terminal) end), awful.key({ modkey, "Control" }, "r", awesome.restart), diff --git a/rc.lua.holo b/rc.lua.holo index 972dcdf..55437a1 100755 --- a/rc.lua.holo +++ b/rc.lua.holo @@ -448,7 +448,6 @@ for s = 1, screen.count() do mybottomwibox[s]:set_bg("#242424") -- Create a borderbox above the bottomwibox - awful.screen.padding(screen[s], { bottom = 1 }) lain.widgets.borderbox(mybottomwibox[s], s, { position = "above", color = "#0099CC" } ) end -- }}} @@ -476,12 +475,6 @@ globalkeys = awful.util.table.join( awful.key({ altkey }, "Left", function () lain.util.tag_view_nonempty(-1) end), awful.key({ altkey }, "Right", function () lain.util.tag_view_nonempty(1) end), - -- Dynamic tag renaming - awful.key({ altkey, "Shift" }, "r", - function () - lain.util.prompt_rename_tag(mypromptbox) - end ), - -- Default client focus awful.key({ altkey }, "k", function () @@ -528,6 +521,10 @@ globalkeys = awful.util.table.join( mybottomwibox[mouse.screen].visible = not mybottomwibox[mouse.screen].visible end), + -- On the fly useless gaps change + awful.key({ altkey, "Control" }, "+", function () lain.util.useless_gaps_resize(1) end), + awful.key({ altkey, "Control" }, "-", function () lain.util.useless_gaps_resize(-1) end), + -- Layout manipulation awful.key({ modkey, "Shift" }, "j", function () awful.client.swap.byidx( 1) end), awful.key({ modkey, "Shift" }, "k", function () awful.client.swap.byidx( -1) end), @@ -551,10 +548,6 @@ globalkeys = awful.util.table.join( awful.key({ modkey, "Shift" }, "space", function () awful.layout.inc(layouts, -1) end), awful.key({ modkey, "Control" }, "n", awful.client.restore), - -- On the fly useless gaps change - awful.key({ altkey, "Control" }, "+", function () lain.util.useless_gaps_resize(1) end), - awful.key({ altkey, "Control" }, "-", function () lain.util.useless_gaps_resize(-1) end), - -- Standard program awful.key({ modkey, }, "Return", function () awful.util.spawn(terminal) end), awful.key({ modkey, "Control" }, "r", awesome.restart), diff --git a/rc.lua.multicolor b/rc.lua.multicolor index 6af099b..06bcb75 100755 --- a/rc.lua.multicolor +++ b/rc.lua.multicolor @@ -409,12 +409,6 @@ globalkeys = awful.util.table.join( awful.key({ altkey }, "Left", function () lain.util.tag_view_nonempty(-1) end), awful.key({ altkey }, "Right", function () lain.util.tag_view_nonempty(1) end), - -- Dynamic tag renaming - awful.key({ altkey, "Shift" }, "r", - function () - lain.util.prompt_rename_tag(mypromptbox) - end ), - -- Default client focus awful.key({ altkey }, "k", function () diff --git a/rc.lua.powerarrow-darker b/rc.lua.powerarrow-darker index 49a9a89..8714faf 100755 --- a/rc.lua.powerarrow-darker +++ b/rc.lua.powerarrow-darker @@ -90,6 +90,7 @@ tags = { names = { "1", "2", "3", "4", "5"}, layout = { layouts[1], layouts[2], layouts[3], layouts[1], layouts[4] } } + for s = 1, screen.count() do tags[s] = awful.tag(tags.names, s, tags.layout) end @@ -399,12 +400,6 @@ globalkeys = awful.util.table.join( awful.key({ altkey }, "Left", function () lain.util.tag_view_nonempty(-1) end), awful.key({ altkey }, "Right", function () lain.util.tag_view_nonempty(1) end), - -- Dynamic tag renaming - awful.key({ altkey, "Shift" }, "r", - function () - lain.util.prompt_rename_tag(mypromptbox) - end ), - -- Default client focus awful.key({ altkey }, "k", function () diff --git a/rc.lua.rainbow b/rc.lua.rainbow index 979414e..e10f2af 100755 --- a/rc.lua.rainbow +++ b/rc.lua.rainbow @@ -341,12 +341,6 @@ globalkeys = awful.util.table.join( awful.key({ altkey }, "Left", function () lain.util.tag_view_nonempty(-1) end), awful.key({ altkey }, "Right", function () lain.util.tag_view_nonempty(1) end), - -- Dynamic tag renaming - awful.key({ altkey, "Shift" }, "r", - function () - lain.util.prompt_rename_tag(mypromptbox) - end ), - -- Default client focus awful.key({ altkey }, "k", function () @@ -392,6 +386,10 @@ globalkeys = awful.util.table.join( mywibox[mouse.screen].visible = not mywibox[mouse.screen].visible end), + -- On the fly useless gaps change + awful.key({ altkey, "Control" }, "+", function () lain.util.useless_gaps_resize(1) end), + awful.key({ altkey, "Control" }, "-", function () lain.util.useless_gaps_resize(-1) end), + -- Layout manipulation awful.key({ modkey, "Shift" }, "j", function () awful.client.swap.byidx( 1) end), awful.key({ modkey, "Shift" }, "k", function () awful.client.swap.byidx( -1) end), @@ -415,10 +413,6 @@ globalkeys = awful.util.table.join( awful.key({ modkey, "Shift" }, "space", function () awful.layout.inc(layouts, -1) end), awful.key({ modkey, "Control" }, "n", awful.client.restore), - -- On the fly useless gaps change - awful.key({ altkey, "Control" }, "+", function () lain.util.useless_gaps_resize(1) end), - awful.key({ altkey, "Control" }, "-", function () lain.util.useless_gaps_resize(-1) end), - -- Standard program awful.key({ modkey, }, "Return", function () awful.util.spawn(terminal) end), awful.key({ modkey, "Control" }, "r", awesome.restart), diff --git a/rc.lua.steamburn b/rc.lua.steamburn index 40f7635..0bf8d01 100755 --- a/rc.lua.steamburn +++ b/rc.lua.steamburn @@ -346,12 +346,6 @@ globalkeys = awful.util.table.join( awful.key({ altkey }, "Left", function () lain.util.tag_view_nonempty(-1) end), awful.key({ altkey }, "Right", function () lain.util.tag_view_nonempty(1) end), - -- Dynamic tag renaming - awful.key({ altkey, "Shift" }, "r", - function () - lain.util.prompt_rename_tag(mypromptbox) - end ), - -- Default client focus awful.key({ altkey }, "k", function () diff --git a/themes/rainbow/icons/awesome_icon.png b/themes/rainbow/icons/awesome.png similarity index 100% rename from themes/rainbow/icons/awesome_icon.png rename to themes/rainbow/icons/awesome.png diff --git a/themes/rainbow/theme.lua b/themes/rainbow/theme.lua index 4633063..d2365f8 100644 --- a/themes/rainbow/theme.lua +++ b/themes/rainbow/theme.lua @@ -33,9 +33,9 @@ theme.tasklist_floating = theme.ocol .. "[F]" .. theme.ccol theme.tasklist_maximized_horizontal = theme.ocol .. "[M] " .. theme.ccol theme.tasklist_maximized_vertical = "" theme.tasklist_disable_icon = true - -theme.awesome_icon = theme.dir .. "/icons/awesome_icon.png" -theme.menu_submenu_icon = theme.dir .. "/icons/submenu.png" + +theme.menu_awesome_icon = theme.dir .."/icons/awesome.png" +theme.menu_submenu_icon = theme.dir .."/icons/submenu.png" theme.taglist_squares_sel = theme.dir .. "/icons/square_sel.png" theme.taglist_squares_unsel = theme.dir .. "/icons/square_unsel.png" theme.vol_bg = theme.dir .. "/icons/vol_bg.png"