awesomewm-mirrors
/
awesome
mirror of https://github.com/awesomeWM/awesome.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1347 from Elv13/revert_messing_indentation 

Revert some of the indentation changes
This commit is contained in:
Emmanuel Lepage Vallée 2017-01-03 01:03:00 -05:00 committed by GitHub
parent 9d69825766 6158091422
commit 7f9d62c49b
17 changed files with 182 additions and 195 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/gears/object.lua
View File

@ -45,6 +45,7 @@ function object.add_signal()
end end
--- Connect to a signal. --- Connect to a signal.
--@DOC_text_gears_object_signal_EXAMPLE@
-- @tparam string name The name of the signal -- @tparam string name The name of the signal
-- @tparam function func The callback to call when the signal is emitted -- @tparam function func The callback to call when the signal is emitted
function object:connect_signal(name, func) function object:connect_signal(name, func)

2
tests/examples/CMakeLists.txt
View File

@ -104,7 +104,7 @@ endfunction()
function(escape_code path escaped_content pre_header post_header) function(escape_code path escaped_content pre_header post_header)
file(READ ${path} path) file(READ ${path} path)
escape_string("${path}\n" "" escaped_code "") escape_string("${path}\n" "" escaped_code " ")
extract_header("${path}" example_pre_header example_post_header) extract_header("${path}" example_pre_header example_post_header)

6
tests/examples/awful/placement/compose.lua
View File

@ -2,9 +2,9 @@ screen[1]._resize {x = 175, width = 128, height = 96} --DOC_NO_USAGE --DOC_HIDE
local awful = {placement = require("awful.placement")} --DOC_HIDE local awful = {placement = require("awful.placement")} --DOC_HIDE
local c = client.gen_fake {x = 220, y = 35, width=40, height=30} --DOC_HIDE local c = client.gen_fake {x = 220, y = 35, width=40, height=30} --DOC_HIDE
-- "right" will be replaced by "left" -- "right" will be replaced by "left"
local f = (awful.placement.right + awful.placement.left) local f = (awful.placement.right + awful.placement.left)
f(client.focus) f(client.focus)
local sg = screen[1].geometry--DOC_HIDE local sg = screen[1].geometry--DOC_HIDE
assert(c.x == sg.x and c.y==sg.height/2-30/2-c.border_width--DOC_HIDE assert(c.x == sg.x and c.y==sg.height/2-30/2-c.border_width--DOC_HIDE

12
tests/examples/awful/placement/compose2.lua
View File

@ -2,14 +2,14 @@ screen[1]._resize {x = 175, width = 128, height = 96} --DOC_NO_USAGE --DOC_HIDE
local awful = {placement = require("awful.placement")} --DOC_HIDE local awful = {placement = require("awful.placement")} --DOC_HIDE
local c = client.gen_fake {x = 220, y = 35, width=40, height=30} --DOC_HIDE local c = client.gen_fake {x = 220, y = 35, width=40, height=30} --DOC_HIDE
-- Simulate Windows 7 "edge snap" (also called aero snap) feature -- Simulate Windows 7 "edge snap" (also called aero snap) feature
local axis = "vertically" local axis = "vertically"
local f = awful.placement.scale local f = awful.placement.scale
+ awful.placement.left + awful.placement.left
+ (axis and awful.placement["maximize_"..axis] or nil) + (axis and awful.placement["maximize_"..axis] or nil)
local geo = f(client.focus, {honor_workarea=true, to_percent = 0.5}) local geo = f(client.focus, {honor_workarea=true, to_percent = 0.5})
local wa = screen[1].workarea--DOC_HIDE local wa = screen[1].workarea--DOC_HIDE
assert(c.x == wa.x and geo.x == wa.x)--DOC_HIDE assert(c.x == wa.x and geo.x == wa.x)--DOC_HIDE

31
tests/examples/wibox/widget/checkbox/bg.lua
View File

@ -3,20 +3,19 @@ local wibox = require( "wibox" ) --DOC_HIDE
local beautiful = require( "beautiful" ) --DOC_HIDE local beautiful = require( "beautiful" ) --DOC_HIDE
parent:add( --DOC_HIDE parent:add( --DOC_HIDE
wibox.widget { wibox.widget {
checked = true, checked = true,
color = beautiful.bg_normal, color = beautiful.bg_normal,
bg = "#ff00ff", bg = "#ff00ff",
border_width = 3, border_width = 3,
paddings = 4, paddings = 4,
border_color = "#0000ff", border_color = "#0000ff",
check_color = "#ff0000", check_color = "#ff0000",
forced_width = 20, --DOC_HIDE forced_width = 20, --DOC_HIDE
forced_height = 20, --DOC_HIDE forced_height = 20, --DOC_HIDE
check_border_color = "#ffff00", check_border_color = "#ffff00",
check_border_width = 1, check_border_width = 1,
widget = wibox.widget.checkbox widget = wibox.widget.checkbox
} }
) --DOC_HIDE ) --DOC_HIDE
--DOC_HIDE vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80 --DOC_HIDE vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80

21
tests/examples/wibox/widget/checkbox/check_shape.lua
View File

@ -11,19 +11,18 @@ local l = wibox.widget { --DOC_HIDE
for _, s in ipairs {"rectangle", "circle", "losange", "octogon"} do for _, s in ipairs {"rectangle", "circle", "losange", "octogon"} do
l:add( --DOC_HIDE l:add( --DOC_HIDE
wibox.widget { wibox.widget {
checked = true, checked = true,
color = beautiful.bg_normal, color = beautiful.bg_normal,
paddings = 2, paddings = 2,
forced_width = 20, --DOC_HIDE forced_width = 20, --DOC_HIDE
forced_height = 20, --DOC_HIDE forced_height = 20, --DOC_HIDE
check_shape = gears.shape[s], check_shape = gears.shape[s],
widget = wibox.widget.checkbox widget = wibox.widget.checkbox
} }
) --DOC_HIDE ) --DOC_HIDE
end end
parent:add(l) --DOC_HIDE parent:add(l) --DOC_HIDE
--DOC_HIDE vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80 --DOC_HIDE vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80

56
tests/examples/wibox/widget/checkbox/custom.lua
View File

@ -3,33 +3,31 @@ local wibox = require( "wibox" ) --DOC_HIDE
local beautiful = require( "beautiful" ) --DOC_HIDE local beautiful = require( "beautiful" ) --DOC_HIDE
parent:add( --DOC_HIDE parent:add( --DOC_HIDE
wibox.widget { wibox.widget {
checked = true, checked = true,
color = beautiful.bg_normal, color = beautiful.bg_normal,
paddings = 2, paddings = 2,
forced_width = 20, --DOC_HIDE forced_width = 20, --DOC_HIDE
forced_height = 20, --DOC_HIDE forced_height = 20, --DOC_HIDE
check_shape = function(cr, width, height) check_shape = function(cr, width, height)
local rs = math.min(width, height) local rs = math.min(width, height)
cr:move_to( 0 , 0 )
cr:move_to( 0 , 0 ) cr:line_to( rs , 0 )
cr:line_to( rs , 0 ) cr:move_to( 0 , 0 )
cr:move_to( 0 , 0 ) cr:line_to( 0 , rs )
cr:line_to( 0 , rs ) cr:move_to( 0 , rs )
cr:move_to( 0 , rs ) cr:line_to( rs , rs )
cr:line_to( rs , rs ) cr:move_to( rs , 0 )
cr:move_to( rs , 0 ) cr:line_to( rs , rs )
cr:line_to( rs , rs ) cr:move_to( 0 , 0 )
cr:move_to( 0 , 0 ) cr:line_to( rs , rs )
cr:line_to( rs , rs ) cr:move_to( 0 , rs )
cr:move_to( 0 , rs ) cr:line_to( rs , 0 )
cr:line_to( rs , 0 ) end,
end, check_border_color = "#ff0000",
check_border_color = "#ff0000", check_color = "#00000000",
check_color = "#00000000", check_border_width = 1,
check_border_width = 1, widget = wibox.widget.checkbox
widget = wibox.widget.checkbox }
} ) --DOC_HIDE
) --DOC_HIDE
--DOC_HIDE vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80 --DOC_HIDE vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80

21
tests/examples/wibox/widget/checkbox/shape.lua
View File

@ -11,19 +11,18 @@ local l = wibox.widget { --DOC_HIDE
for _, s in ipairs {"rectangle", "circle", "losange", "octogon"} do for _, s in ipairs {"rectangle", "circle", "losange", "octogon"} do
l:add( --DOC_HIDE l:add( --DOC_HIDE
wibox.widget { wibox.widget {
checked = true, checked = true,
color = beautiful.bg_normal, color = beautiful.bg_normal,
paddings = 2, paddings = 2,
forced_width = 20, --DOC_HIDE forced_width = 20, --DOC_HIDE
forced_height = 20, --DOC_HIDE forced_height = 20, --DOC_HIDE
shape = gears.shape[s], shape = gears.shape[s],
widget = wibox.widget.checkbox widget = wibox.widget.checkbox
} }
) --DOC_HIDE ) --DOC_HIDE
end end
parent:add(l) --DOC_HIDE parent:add(l) --DOC_HIDE
--DOC_HIDE vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80 --DOC_HIDE vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80

49
tests/examples/wibox/widget/defaults/checkbox.lua
View File

@ -4,30 +4,29 @@ local beautiful = require( "beautiful" ) --DOC_HIDE
local gears = {shape = require("gears.shape")} --DOC_HIDE local gears = {shape = require("gears.shape")} --DOC_HIDE
parent:add( --DOC_HIDE parent:add( --DOC_HIDE
wibox.widget { --DOC_HIDE wibox.widget { --DOC_HIDE
wibox.widget { wibox.widget {
checked = true, checked = true,
color = beautiful.bg_normal, color = beautiful.bg_normal,
paddings = 2, paddings = 2,
forced_width = 20, --DOC_HIDE forced_width = 20, --DOC_HIDE
forced_height = 20, --DOC_HIDE forced_height = 20, --DOC_HIDE
shape = gears.shape.circle, shape = gears.shape.circle,
widget = wibox.widget.checkbox widget = wibox.widget.checkbox
} }
, --DOC_HIDE , --DOC_HIDE
wibox.widget { --DOC_HIDE wibox.widget { --DOC_HIDE
checked = false, --DOC_HIDE checked = false, --DOC_HIDE
color = beautiful.bg_normal, --DOC_HIDE color = beautiful.bg_normal, --DOC_HIDE
paddings = 2, --DOC_HIDE paddings = 2, --DOC_HIDE
forced_width = 20, --DOC_HIDE forced_width = 20, --DOC_HIDE
forced_height = 20, --DOC_HIDE forced_height = 20, --DOC_HIDE
shape = gears.shape.circle, --DOC_HIDE shape = gears.shape.circle, --DOC_HIDE
widget = wibox.widget.checkbox --DOC_HIDE widget = wibox.widget.checkbox --DOC_HIDE
}, --DOC_HIDE }, --DOC_HIDE
spacing = 4, --DOC_HIDE spacing = 4, --DOC_HIDE
layout = wibox.layout.fixed.horizontal --DOC_HIDE layout = wibox.layout.fixed.horizontal --DOC_HIDE
} --DOC_HIDE } --DOC_HIDE
) --DOC_HIDE
) --DOC_HIDE
--DOC_HIDE vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80 --DOC_HIDE vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80

1
tests/examples/wibox/widget/defaults/graph.lua
View File

@ -20,5 +20,4 @@ parent:add( w ) --DOC_HIDE
for _, v in ipairs(data) do --DOC_HIDE for _, v in ipairs(data) do --DOC_HIDE
w:add_value(v) --DOC_HIDE w:add_value(v) --DOC_HIDE
end --DOC_HIDE end --DOC_HIDE
--DOC_HIDE vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80 --DOC_HIDE vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80

13
tests/examples/wibox/widget/defaults/imagebox.lua
View File

@ -4,12 +4,11 @@ local beautiful = require( "beautiful" ) --DOC_HIDE
parent:add( --DOC_HIDE parent:add( --DOC_HIDE
wibox.widget { wibox.widget {
image = beautiful.awesome_icon, image = beautiful.awesome_icon,
resize = false, resize = false,
widget = wibox.widget.imagebox widget = wibox.widget.imagebox
} }
) --DOC_HIDE
) --DOC_HIDE
--DOC_HIDE vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80 --DOC_HIDE vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80

35
tests/examples/wibox/widget/defaults/piechart.lua
View File

@ -4,23 +4,22 @@ local beautiful = require( "beautiful" ) --DOC_HIDE
parent:add( --DOC_HIDE parent:add( --DOC_HIDE
wibox.widget { wibox.widget {
data_list = { data_list = {
{ 'L1', 100 }, { 'L1', 100 },
{ 'L2', 200 }, { 'L2', 200 },
{ 'L3', 300 }, { 'L3', 300 },
}, },
border_width = 1, border_width = 1,
forced_height = 50, --DOC_HIDE forced_height = 50, --DOC_HIDE
forced_width = 100, --DOC_HIDE forced_width = 100, --DOC_HIDE
colors = { colors = {
beautiful.bg_normal, beautiful.bg_normal,
beautiful.bg_highlight, beautiful.bg_highlight,
beautiful.border_color, beautiful.border_color,
}, },
widget = wibox.widget.piechart widget = wibox.widget.piechart
} }
) --DOC_HIDE
) --DOC_HIDE
--DOC_HIDE vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80 --DOC_HIDE vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80

23
tests/examples/wibox/widget/defaults/progressbar.lua
View File

@ -5,17 +5,16 @@ local beautiful = require("beautiful") --DOC_HIDE
parent:add( --DOC_HIDE parent:add( --DOC_HIDE
wibox.widget { wibox.widget {
max_value = 1, max_value = 1,
value = 0.33, value = 0.33,
forced_height = 20, forced_height = 20,
forced_width = 100, forced_width = 100,
shape = gears.shape.rounded_bar, shape = gears.shape.rounded_bar,
border_width = 2, border_width = 2,
border_color = beautiful.border_color, border_color = beautiful.border_color,
widget = wibox.widget.progressbar, widget = wibox.widget.progressbar,
} }
) --DOC_HIDE
) --DOC_HIDE
--DOC_HIDE vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80 --DOC_HIDE vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80

29
tests/examples/wibox/widget/defaults/slider.lua
View File

@ -5,20 +5,19 @@ local gears = {shape=require("gears.shape") } --DOC_HIDE
parent:add( --DOC_HIDE parent:add( --DOC_HIDE
wibox.widget { wibox.widget {
bar_shape = gears.shape.rounded_rect, bar_shape = gears.shape.rounded_rect,
bar_height = 3, bar_height = 3,
bar_color = beautiful.border_color, bar_color = beautiful.border_color,
handle_color = beautiful.bg_normal, handle_color = beautiful.bg_normal,
handle_shape = gears.shape.circle, handle_shape = gears.shape.circle,
handle_border_color = beautiful.border_color, handle_border_color = beautiful.border_color,
handle_border_width = 1, handle_border_width = 1,
value = 25, value = 25,
widget = wibox.widget.slider, widget = wibox.widget.slider,
forced_height = 50, --DOC_HIDE forced_height = 50, --DOC_HIDE
forced_width = 100, --DOC_HIDE forced_width = 100, --DOC_HIDE
} }
) --DOC_HIDE
) --DOC_HIDE
--DOC_HIDE vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80 --DOC_HIDE vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80

15
tests/examples/wibox/widget/defaults/textbox.lua
View File

@ -3,13 +3,12 @@ local wibox = require("wibox") --DOC_HIDE
parent:add( --DOC_HIDE parent:add( --DOC_HIDE
wibox.widget{ wibox.widget{
markup = "This <i>is</i> a <b>textbox</b>!!!", markup = "This <i>is</i> a <b>textbox</b>!!!",
align = "center", align = "center",
valign = "center", valign = "center",
widget = wibox.widget.textbox widget = wibox.widget.textbox
} }
) --DOC_HIDE
) --DOC_HIDE
--DOC_HIDE vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80 --DOC_HIDE vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80

37
tests/examples/wibox/widget/progressbar/text.lua
View File

@ -4,24 +4,23 @@ local beautiful = require("beautiful") --DOC_HIDE
parent:add( --DOC_HIDE parent:add( --DOC_HIDE
wibox.widget { wibox.widget {
{ {
max_value = 1, max_value = 1,
value = 0.5, value = 0.5,
forced_height = 20, forced_height = 20,
forced_width = 100, forced_width = 100,
paddings = 1, paddings = 1,
border_width = 1, border_width = 1,
border_color = beautiful.border_color, border_color = beautiful.border_color,
widget = wibox.widget.progressbar, widget = wibox.widget.progressbar,
}, },
{ {
text = "50%", text = "50%",
widget = wibox.widget.textbox, widget = wibox.widget.textbox,
}, },
layout = wibox.layout.stack layout = wibox.layout.stack
} }
) --DOC_HIDE
) --DOC_HIDE
--DOC_HIDE vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80 --DOC_HIDE vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80

25
tests/examples/wibox/widget/progressbar/vertical.lua
View File

@ -3,18 +3,17 @@ local wibox = require("wibox") --DOC_HIDE
parent:add( --DOC_HIDE parent:add( --DOC_HIDE
wibox.widget { wibox.widget {
{ {
max_value = 1, max_value = 1,
value = 0.33, value = 0.33,
widget = wibox.widget.progressbar, widget = wibox.widget.progressbar,
}, },
forced_height = 100, forced_height = 100,
forced_width = 20, forced_width = 20,
direction = "east", direction = "east",
layout = wibox.container.rotate, layout = wibox.container.rotate,
} }
) --DOC_HIDE
) --DOC_HIDE
--DOC_HIDE vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80 --DOC_HIDE vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80