Merge branch 'Sorky-patch-2'
This commit is contained in:
commit
b899afa1bd
|
@ -226,10 +226,12 @@ function theme.at_screen_connect(s)
|
||||||
-- We need one layoutbox per screen.
|
-- We need one layoutbox per screen.
|
||||||
s.mylayoutbox = awful.widget.layoutbox(s)
|
s.mylayoutbox = awful.widget.layoutbox(s)
|
||||||
s.mylayoutbox:buttons(my_table.join(
|
s.mylayoutbox:buttons(my_table.join(
|
||||||
awful.button({ }, 1, function () awful.layout.inc( 1) end),
|
awful.button({}, 1, function () awful.layout.inc( 1) end),
|
||||||
awful.button({ }, 3, function () awful.layout.inc(-1) end),
|
awful.button({}, 2, function () awful.layout.set( awful.layout.layouts[1] ) end),
|
||||||
awful.button({ }, 4, function () awful.layout.inc( 1) end),
|
awful.button({}, 3, function () awful.layout.inc(-1) end),
|
||||||
awful.button({ }, 5, function () awful.layout.inc(-1) end)))
|
awful.button({}, 4, function () awful.layout.inc( 1) end),
|
||||||
|
awful.button({}, 5, function () awful.layout.inc(-1) end)))
|
||||||
|
|
||||||
-- Create a taglist widget
|
-- Create a taglist widget
|
||||||
s.mytaglist = awful.widget.taglist(s, awful.widget.taglist.filter.all, awful.util.taglist_buttons)
|
s.mytaglist = awful.widget.taglist(s, awful.widget.taglist.filter.all, awful.util.taglist_buttons)
|
||||||
|
|
||||||
|
|
|
@ -318,10 +318,11 @@ function theme.at_screen_connect(s)
|
||||||
-- We need one layoutbox per screen.
|
-- We need one layoutbox per screen.
|
||||||
s.mylayoutbox = awful.widget.layoutbox(s)
|
s.mylayoutbox = awful.widget.layoutbox(s)
|
||||||
s.mylayoutbox:buttons(my_table.join(
|
s.mylayoutbox:buttons(my_table.join(
|
||||||
awful.button({ }, 1, function () awful.layout.inc( 1) end),
|
awful.button({}, 1, function () awful.layout.inc( 1) end),
|
||||||
awful.button({ }, 3, function () awful.layout.inc(-1) end),
|
awful.button({}, 2, function () awful.layout.set( awful.layout.layouts[1] ) end),
|
||||||
awful.button({ }, 4, function () awful.layout.inc( 1) end),
|
awful.button({}, 3, function () awful.layout.inc(-1) end),
|
||||||
awful.button({ }, 5, function () awful.layout.inc(-1) end)))
|
awful.button({}, 4, function () awful.layout.inc( 1) end),
|
||||||
|
awful.button({}, 5, function () awful.layout.inc(-1) end)))
|
||||||
|
|
||||||
-- Create a taglist widget
|
-- Create a taglist widget
|
||||||
s.mytaglist = awful.widget.taglist(s, awful.widget.taglist.filter.all, awful.util.taglist_buttons)
|
s.mytaglist = awful.widget.taglist(s, awful.widget.taglist.filter.all, awful.util.taglist_buttons)
|
||||||
|
|
|
@ -207,10 +207,11 @@ function theme.at_screen_connect(s)
|
||||||
-- We need one layoutbox per screen.
|
-- We need one layoutbox per screen.
|
||||||
s.mylayoutbox = awful.widget.layoutbox(s)
|
s.mylayoutbox = awful.widget.layoutbox(s)
|
||||||
s.mylayoutbox:buttons(my_table.join(
|
s.mylayoutbox:buttons(my_table.join(
|
||||||
awful.button({ }, 1, function () awful.layout.inc( 1) end),
|
awful.button({}, 1, function () awful.layout.inc( 1) end),
|
||||||
awful.button({ }, 3, function () awful.layout.inc(-1) end),
|
awful.button({}, 2, function () awful.layout.set( awful.layout.layouts[1] ) end),
|
||||||
awful.button({ }, 4, function () awful.layout.inc( 1) end),
|
awful.button({}, 3, function () awful.layout.inc(-1) end),
|
||||||
awful.button({ }, 5, function () awful.layout.inc(-1) end)))
|
awful.button({}, 4, function () awful.layout.inc( 1) end),
|
||||||
|
awful.button({}, 5, function () awful.layout.inc(-1) end)))
|
||||||
-- Create a taglist widget
|
-- Create a taglist widget
|
||||||
s.mytaglist = awful.widget.taglist(s, awful.widget.taglist.filter.all, awful.util.taglist_buttons)
|
s.mytaglist = awful.widget.taglist(s, awful.widget.taglist.filter.all, awful.util.taglist_buttons)
|
||||||
|
|
||||||
|
|
|
@ -304,10 +304,11 @@ function theme.at_screen_connect(s)
|
||||||
-- We need one layoutbox per screen.
|
-- We need one layoutbox per screen.
|
||||||
s.mylayoutbox = awful.widget.layoutbox(s)
|
s.mylayoutbox = awful.widget.layoutbox(s)
|
||||||
s.mylayoutbox:buttons(my_table.join(
|
s.mylayoutbox:buttons(my_table.join(
|
||||||
awful.button({ }, 1, function () awful.layout.inc( 1) end),
|
awful.button({}, 1, function () awful.layout.inc( 1) end),
|
||||||
awful.button({ }, 3, function () awful.layout.inc(-1) end),
|
awful.button({}, 2, function () awful.layout.set( awful.layout.layouts[1] ) end),
|
||||||
awful.button({ }, 4, function () awful.layout.inc( 1) end),
|
awful.button({}, 3, function () awful.layout.inc(-1) end),
|
||||||
awful.button({ }, 5, function () awful.layout.inc(-1) end)))
|
awful.button({}, 4, function () awful.layout.inc( 1) end),
|
||||||
|
awful.button({}, 5, function () awful.layout.inc(-1) end)))
|
||||||
-- Create a taglist widget
|
-- Create a taglist widget
|
||||||
s.mytaglist = awful.widget.taglist(s, awful.widget.taglist.filter.all, awful.util.taglist_buttons, { bg_focus = barcolor })
|
s.mytaglist = awful.widget.taglist(s, awful.widget.taglist.filter.all, awful.util.taglist_buttons, { bg_focus = barcolor })
|
||||||
|
|
||||||
|
|
|
@ -270,10 +270,11 @@ function theme.at_screen_connect(s)
|
||||||
-- We need one layoutbox per screen.
|
-- We need one layoutbox per screen.
|
||||||
s.mylayoutbox = awful.widget.layoutbox(s)
|
s.mylayoutbox = awful.widget.layoutbox(s)
|
||||||
s.mylayoutbox:buttons(my_table.join(
|
s.mylayoutbox:buttons(my_table.join(
|
||||||
awful.button({ }, 1, function () awful.layout.inc( 1) end),
|
awful.button({}, 1, function () awful.layout.inc( 1) end),
|
||||||
awful.button({ }, 3, function () awful.layout.inc(-1) end),
|
awful.button({}, 2, function () awful.layout.set( awful.layout.layouts[1] ) end),
|
||||||
awful.button({ }, 4, function () awful.layout.inc( 1) end),
|
awful.button({}, 3, function () awful.layout.inc(-1) end),
|
||||||
awful.button({ }, 5, function () awful.layout.inc(-1) end)))
|
awful.button({}, 4, function () awful.layout.inc( 1) end),
|
||||||
|
awful.button({}, 5, function () awful.layout.inc(-1) end)))
|
||||||
-- Create a taglist widget
|
-- Create a taglist widget
|
||||||
s.mytaglist = awful.widget.taglist(s, awful.widget.taglist.filter.all, awful.util.taglist_buttons)
|
s.mytaglist = awful.widget.taglist(s, awful.widget.taglist.filter.all, awful.util.taglist_buttons)
|
||||||
|
|
||||||
|
|
|
@ -277,10 +277,11 @@ function theme.at_screen_connect(s)
|
||||||
-- We need one layoutbox per screen.
|
-- We need one layoutbox per screen.
|
||||||
s.mylayoutbox = awful.widget.layoutbox(s)
|
s.mylayoutbox = awful.widget.layoutbox(s)
|
||||||
s.mylayoutbox:buttons(my_table.join(
|
s.mylayoutbox:buttons(my_table.join(
|
||||||
awful.button({ }, 1, function () awful.layout.inc( 1) end),
|
awful.button({}, 1, function () awful.layout.inc( 1) end),
|
||||||
awful.button({ }, 3, function () awful.layout.inc(-1) end),
|
awful.button({}, 2, function () awful.layout.set( awful.layout.layouts[1] ) end),
|
||||||
awful.button({ }, 4, function () awful.layout.inc( 1) end),
|
awful.button({}, 3, function () awful.layout.inc(-1) end),
|
||||||
awful.button({ }, 5, function () awful.layout.inc(-1) end)))
|
awful.button({}, 4, function () awful.layout.inc( 1) end),
|
||||||
|
awful.button({}, 5, function () awful.layout.inc(-1) end)))
|
||||||
-- Create a taglist widget
|
-- Create a taglist widget
|
||||||
s.mytaglist = awful.widget.taglist(s, awful.widget.taglist.filter.all, awful.util.taglist_buttons)
|
s.mytaglist = awful.widget.taglist(s, awful.widget.taglist.filter.all, awful.util.taglist_buttons)
|
||||||
|
|
||||||
|
|
|
@ -316,10 +316,11 @@ function theme.at_screen_connect(s)
|
||||||
-- We need one layoutbox per screen.
|
-- We need one layoutbox per screen.
|
||||||
s.mylayoutbox = awful.widget.layoutbox(s)
|
s.mylayoutbox = awful.widget.layoutbox(s)
|
||||||
s.mylayoutbox:buttons(my_table.join(
|
s.mylayoutbox:buttons(my_table.join(
|
||||||
awful.button({ }, 1, function () awful.layout.inc( 1) end),
|
awful.button({}, 1, function () awful.layout.inc( 1) end),
|
||||||
awful.button({ }, 3, function () awful.layout.inc(-1) end),
|
awful.button({}, 2, function () awful.layout.set( awful.layout.layouts[1] ) end),
|
||||||
awful.button({ }, 4, function () awful.layout.inc( 1) end),
|
awful.button({}, 3, function () awful.layout.inc(-1) end),
|
||||||
awful.button({ }, 5, function () awful.layout.inc(-1) end)))
|
awful.button({}, 4, function () awful.layout.inc( 1) end),
|
||||||
|
awful.button({}, 5, function () awful.layout.inc(-1) end)))
|
||||||
-- Create a taglist widget
|
-- Create a taglist widget
|
||||||
s.mytaglist = awful.widget.taglist(s, awful.widget.taglist.filter.all, awful.util.taglist_buttons)
|
s.mytaglist = awful.widget.taglist(s, awful.widget.taglist.filter.all, awful.util.taglist_buttons)
|
||||||
|
|
||||||
|
|
|
@ -231,6 +231,7 @@ function theme.at_screen_connect(s)
|
||||||
awful.tag.attached_connect_signal(s, "property::layout", function () update_txt_layoutbox(s) end)
|
awful.tag.attached_connect_signal(s, "property::layout", function () update_txt_layoutbox(s) end)
|
||||||
s.mytxtlayoutbox:buttons(my_table.join(
|
s.mytxtlayoutbox:buttons(my_table.join(
|
||||||
awful.button({}, 1, function() awful.layout.inc(1) end),
|
awful.button({}, 1, function() awful.layout.inc(1) end),
|
||||||
|
awful.button({}, 2, function () awful.layout.set( awful.layout.layouts[1] ) end),
|
||||||
awful.button({}, 3, function() awful.layout.inc(-1) end),
|
awful.button({}, 3, function() awful.layout.inc(-1) end),
|
||||||
awful.button({}, 4, function() awful.layout.inc(1) end),
|
awful.button({}, 4, function() awful.layout.inc(1) end),
|
||||||
awful.button({}, 5, function() awful.layout.inc(-1) end)))
|
awful.button({}, 5, function() awful.layout.inc(-1) end)))
|
||||||
|
|
|
@ -227,6 +227,7 @@ function theme.at_screen_connect(s)
|
||||||
awful.tag.attached_connect_signal(s, "property::layout", function () update_txt_layoutbox(s) end)
|
awful.tag.attached_connect_signal(s, "property::layout", function () update_txt_layoutbox(s) end)
|
||||||
s.mytxtlayoutbox:buttons(my_table.join(
|
s.mytxtlayoutbox:buttons(my_table.join(
|
||||||
awful.button({}, 1, function() awful.layout.inc(1) end),
|
awful.button({}, 1, function() awful.layout.inc(1) end),
|
||||||
|
awful.button({}, 2, function () awful.layout.set( awful.layout.layouts[1] ) end),
|
||||||
awful.button({}, 3, function() awful.layout.inc(-1) end),
|
awful.button({}, 3, function() awful.layout.inc(-1) end),
|
||||||
awful.button({}, 4, function() awful.layout.inc(1) end),
|
awful.button({}, 4, function() awful.layout.inc(1) end),
|
||||||
awful.button({}, 5, function() awful.layout.inc(-1) end)))
|
awful.button({}, 5, function() awful.layout.inc(-1) end)))
|
||||||
|
|
|
@ -407,10 +407,11 @@ function theme.at_screen_connect(s)
|
||||||
-- We need one layoutbox per screen.
|
-- We need one layoutbox per screen.
|
||||||
s.mylayoutbox = awful.widget.layoutbox(s)
|
s.mylayoutbox = awful.widget.layoutbox(s)
|
||||||
s.mylayoutbox:buttons(my_table.join(
|
s.mylayoutbox:buttons(my_table.join(
|
||||||
awful.button({ }, 1, function () awful.layout.inc( 1) end),
|
awful.button({}, 1, function () awful.layout.inc( 1) end),
|
||||||
awful.button({ }, 3, function () awful.layout.inc(-1) end),
|
awful.button({}, 2, function () awful.layout.set( awful.layout.layouts[1] ) end),
|
||||||
awful.button({ }, 4, function () awful.layout.inc( 1) end),
|
awful.button({}, 3, function () awful.layout.inc(-1) end),
|
||||||
awful.button({ }, 5, function () awful.layout.inc(-1) end)))
|
awful.button({}, 4, function () awful.layout.inc( 1) end),
|
||||||
|
awful.button({}, 5, function () awful.layout.inc(-1) end)))
|
||||||
s.layoutb = wibox.container.margin(s.mylayoutbox, 8, 11, 3, 3)
|
s.layoutb = wibox.container.margin(s.mylayoutbox, 8, 11, 3, 3)
|
||||||
|
|
||||||
-- Create a taglist widget
|
-- Create a taglist widget
|
||||||
|
|
Loading…
Reference in New Issue