Replace "self program" with "this program" in fstk boilerplates

... and remove trailing whitespace.
master
est31 2015-09-21 20:03:35 +02:00
parent d130c36e14
commit 1adc7bf5c6
4 changed files with 51 additions and 51 deletions

View File

@ -1,18 +1,18 @@
--Minetest --Minetest
--Copyright (C) 2014 sapier --Copyright (C) 2014 sapier
-- --
--self program is free software; you can redistribute it and/or modify --This program is free software; you can redistribute it and/or modify
--it under the terms of the GNU Lesser General Public License as published by --it under the terms of the GNU Lesser General Public License as published by
--the Free Software Foundation; either version 2.1 of the License, or --the Free Software Foundation; either version 2.1 of the License, or
--(at your option) any later version. --(at your option) any later version.
-- --
--self program is distributed in the hope that it will be useful, --This program is distributed in the hope that it will be useful,
--but WITHOUT ANY WARRANTY; without even the implied warranty of --but WITHOUT ANY WARRANTY; without even the implied warranty of
--MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--GNU Lesser General Public License for more details. --GNU Lesser General Public License for more details.
-- --
--You should have received a copy of the GNU Lesser General Public License along --You should have received a copy of the GNU Lesser General Public License along
--with self program; if not, write to the Free Software Foundation, Inc., --with this program; if not, write to the Free Software Foundation, Inc.,
--51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
@ -24,11 +24,11 @@ local function buttonbar_formspec(self)
local formspec = string.format("box[%f,%f;%f,%f;%s]", local formspec = string.format("box[%f,%f;%f,%f;%s]",
self.pos.x,self.pos.y ,self.size.x,self.size.y,self.bgcolor) self.pos.x,self.pos.y ,self.size.x,self.size.y,self.bgcolor)
for i=self.startbutton,#self.buttons,1 do for i=self.startbutton,#self.buttons,1 do
local btn_name = self.buttons[i].name local btn_name = self.buttons[i].name
local btn_pos = {} local btn_pos = {}
if self.orientation == "horizontal" then if self.orientation == "horizontal" then
btn_pos.x = self.pos.x + --base pos btn_pos.x = self.pos.x + --base pos
(i - self.startbutton) * self.btn_size + --button offset (i - self.startbutton) * self.btn_size + --button offset
@ -36,7 +36,7 @@ local function buttonbar_formspec(self)
else else
btn_pos.x = self.pos.x + (self.btn_size * 0.05) btn_pos.x = self.pos.x + (self.btn_size * 0.05)
end end
if self.orientation == "vertical" then if self.orientation == "vertical" then
btn_pos.y = self.pos.y + --base pos btn_pos.y = self.pos.y + --base pos
(i - self.startbutton) * self.btn_size + --button offset (i - self.startbutton) * self.btn_size + --button offset
@ -44,18 +44,18 @@ local function buttonbar_formspec(self)
else else
btn_pos.y = self.pos.y + (self.btn_size * 0.05) btn_pos.y = self.pos.y + (self.btn_size * 0.05)
end end
if (self.orientation == "vertical" and if (self.orientation == "vertical" and
(btn_pos.y + self.btn_size <= self.pos.y + self.size.y)) or (btn_pos.y + self.btn_size <= self.pos.y + self.size.y)) or
(self.orientation == "horizontal" and (self.orientation == "horizontal" and
(btn_pos.x + self.btn_size <= self.pos.x + self.size.x)) then (btn_pos.x + self.btn_size <= self.pos.x + self.size.x)) then
local borders="true" local borders="true"
if self.buttons[i].image ~= nil then if self.buttons[i].image ~= nil then
borders="false" borders="false"
end end
formspec = formspec .. formspec = formspec ..
string.format("image_button[%f,%f;%f,%f;%s;%s;%s;true;%s]tooltip[%s;%s]", string.format("image_button[%f,%f;%f,%f;%s;%s;%s;true;%s]tooltip[%s;%s]",
btn_pos.x, btn_pos.y, self.btn_size, self.btn_size, btn_pos.x, btn_pos.y, self.btn_size, self.btn_size,
@ -75,7 +75,7 @@ local function buttonbar_formspec(self)
btn_dec_pos.y = self.pos.y + (self.btn_size * 0.05) btn_dec_pos.y = self.pos.y + (self.btn_size * 0.05)
local btn_inc_pos = {} local btn_inc_pos = {}
local btn_size = {} local btn_size = {}
if self.orientation == "horizontal" then if self.orientation == "horizontal" then
btn_size.x = 0.5 btn_size.x = 0.5
btn_size.y = self.btn_size btn_size.y = self.btn_size
@ -87,25 +87,25 @@ local function buttonbar_formspec(self)
btn_inc_pos.x = self.pos.x + (self.btn_size * 0.05) btn_inc_pos.x = self.pos.x + (self.btn_size * 0.05)
btn_inc_pos.y = self.pos.y + self.size.y - 0.5 btn_inc_pos.y = self.pos.y + self.size.y - 0.5
end end
local text_dec = "<" local text_dec = "<"
local text_inc = ">" local text_inc = ">"
if self.orientation == "vertical" then if self.orientation == "vertical" then
text_dec = "^" text_dec = "^"
text_inc = "v" text_inc = "v"
end end
formspec = formspec .. formspec = formspec ..
string.format("image_button[%f,%f;%f,%f;;btnbar_dec_%s;%s;true;true]", string.format("image_button[%f,%f;%f,%f;;btnbar_dec_%s;%s;true;true]",
btn_dec_pos.x, btn_dec_pos.y, btn_size.x, btn_size.y, btn_dec_pos.x, btn_dec_pos.y, btn_size.x, btn_size.y,
self.name, text_dec) self.name, text_dec)
formspec = formspec .. formspec = formspec ..
string.format("image_button[%f,%f;%f,%f;;btnbar_inc_%s;%s;true;true]", string.format("image_button[%f,%f;%f,%f;;btnbar_inc_%s;%s;true;true]",
btn_inc_pos.x, btn_inc_pos.y, btn_size.x, btn_size.y, btn_inc_pos.x, btn_inc_pos.y, btn_size.x, btn_size.y,
self.name, text_inc) self.name, text_inc)
end end
return formspec return formspec
end end
@ -113,16 +113,16 @@ local function buttonbar_buttonhandler(self, fields)
if fields["btnbar_inc_" .. self.name] ~= nil and if fields["btnbar_inc_" .. self.name] ~= nil and
self.startbutton < #self.buttons then self.startbutton < #self.buttons then
self.startbutton = self.startbutton + 1 self.startbutton = self.startbutton + 1
return true return true
end end
if fields["btnbar_dec_" .. self.name] ~= nil and self.startbutton > 1 then if fields["btnbar_dec_" .. self.name] ~= nil and self.startbutton > 1 then
self.startbutton = self.startbutton - 1 self.startbutton = self.startbutton - 1
return true return true
end end
for i=1,#self.buttons,1 do for i=1,#self.buttons,1 do
if fields[self.buttons[i].name] ~= nil then if fields[self.buttons[i].name] ~= nil then
return self.userbuttonhandler(fields) return self.userbuttonhandler(fields)
@ -134,35 +134,35 @@ local buttonbar_metatable = {
handle_buttons = buttonbar_buttonhandler, handle_buttons = buttonbar_buttonhandler,
handle_events = function(self, event) end, handle_events = function(self, event) end,
get_formspec = buttonbar_formspec, get_formspec = buttonbar_formspec,
hide = function(self) self.hidden = true end, hide = function(self) self.hidden = true end,
show = function(self) self.hidden = false end, show = function(self) self.hidden = false end,
delete = function(self) ui.delete(self) end, delete = function(self) ui.delete(self) end,
add_button = function(self, name, caption, image, tooltip) add_button = function(self, name, caption, image, tooltip)
if caption == nil then caption = "" end if caption == nil then caption = "" end
if image == nil then image = "" end if image == nil then image = "" end
if tooltip == nil then tooltip = "" end if tooltip == nil then tooltip = "" end
table.insert(self.buttons,{ name=name, caption=caption, image=image, tooltip=tooltip}) table.insert(self.buttons,{ name=name, caption=caption, image=image, tooltip=tooltip})
if self.orientation == "horizontal" then if self.orientation == "horizontal" then
if ( (self.btn_size * #self.buttons) + (self.btn_size * 0.05 *2) if ( (self.btn_size * #self.buttons) + (self.btn_size * 0.05 *2)
> self.size.x ) then > self.size.x ) then
self.btn_initial_offset = self.btn_size * 0.05 + 0.5 self.btn_initial_offset = self.btn_size * 0.05 + 0.5
self.have_move_buttons = true self.have_move_buttons = true
end end
else else
if ((self.btn_size * #self.buttons) + (self.btn_size * 0.05 *2) if ((self.btn_size * #self.buttons) + (self.btn_size * 0.05 *2)
> self.size.y ) then > self.size.y ) then
self.btn_initial_offset = self.btn_size * 0.05 + 0.5 self.btn_initial_offset = self.btn_size * 0.05 + 0.5
self.have_move_buttons = true self.have_move_buttons = true
end end
end end
end, end,
set_bgparams = function(self, bgcolor) set_bgparams = function(self, bgcolor)
if (type(bgcolor) == "string") then if (type(bgcolor) == "string") then
self.bgcolor = bgcolor self.bgcolor = bgcolor
@ -189,20 +189,20 @@ function buttonbar_create(name, cbf_buttonhandler, pos, orientation, size)
self.startbutton = 1 self.startbutton = 1
self.have_move_buttons = false self.have_move_buttons = false
self.hidden = false self.hidden = false
if self.orientation == "horizontal" then if self.orientation == "horizontal" then
self.btn_size = self.size.y self.btn_size = self.size.y
else else
self.btn_size = self.size.x self.btn_size = self.size.x
end end
if (self.btn_initial_offset == nil) then if (self.btn_initial_offset == nil) then
self.btn_initial_offset = self.btn_size * 0.05 self.btn_initial_offset = self.btn_size * 0.05
end end
self.userbuttonhandler = cbf_buttonhandler self.userbuttonhandler = cbf_buttonhandler
self.buttons = {} self.buttons = {}
setmetatable(self,buttonbar_metatable) setmetatable(self,buttonbar_metatable)
ui.add(self) ui.add(self)

View File

@ -1,18 +1,18 @@
--Minetest --Minetest
--Copyright (C) 2014 sapier --Copyright (C) 2014 sapier
-- --
--self program is free software; you can redistribute it and/or modify --This program is free software; you can redistribute it and/or modify
--it under the terms of the GNU Lesser General Public License as published by --it under the terms of the GNU Lesser General Public License as published by
--the Free Software Foundation; either version 2.1 of the License, or --the Free Software Foundation; either version 2.1 of the License, or
--(at your option) any later version. --(at your option) any later version.
-- --
--self program is distributed in the hope that it will be useful, --this program is distributed in the hope that it will be useful,
--but WITHOUT ANY WARRANTY; without even the implied warranty of --but WITHOUT ANY WARRANTY; without even the implied warranty of
--MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--GNU Lesser General Public License for more details. --GNU Lesser General Public License for more details.
-- --
--You should have received a copy of the GNU Lesser General Public License along --You should have received a copy of the GNU Lesser General Public License along
--with self program; if not, write to the Free Software Foundation, Inc., --with this program; if not, write to the Free Software Foundation, Inc.,
--51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
local function dialog_event_handler(self,event) local function dialog_event_handler(self,event)
@ -61,7 +61,7 @@ function dialog_create(name,get_formspec,buttonhandler,eventhandler)
self.formspec = get_formspec self.formspec = get_formspec
self.buttonhandler = buttonhandler self.buttonhandler = buttonhandler
self.user_eventhandler = eventhandler self.user_eventhandler = eventhandler
setmetatable(self,dialog_metatable) setmetatable(self,dialog_metatable)
ui.add(self) ui.add(self)

View File

@ -1,18 +1,18 @@
--Minetest --Minetest
--Copyright (C) 2014 sapier --Copyright (C) 2014 sapier
-- --
--self program is free software; you can redistribute it and/or modify --This program is free software; you can redistribute it and/or modify
--it under the terms of the GNU Lesser General Public License as published by --it under the terms of the GNU Lesser General Public License as published by
--the Free Software Foundation; either version 2.1 of the License, or --the Free Software Foundation; either version 2.1 of the License, or
--(at your option) any later version. --(at your option) any later version.
-- --
--self program is distributed in the hope that it will be useful, --This program is distributed in the hope that it will be useful,
--but WITHOUT ANY WARRANTY; without even the implied warranty of --but WITHOUT ANY WARRANTY; without even the implied warranty of
--MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--GNU Lesser General Public License for more details. --GNU Lesser General Public License for more details.
-- --
--You should have received a copy of the GNU Lesser General Public License along --You should have received a copy of the GNU Lesser General Public License along
--with self program; if not, write to the Free Software Foundation, Inc., --with this program; if not, write to the Free Software Foundation, Inc.,
--51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
@ -61,7 +61,7 @@ local function get_formspec(self)
local formspec = "" local formspec = ""
if not self.hidden and (self.parent == nil or not self.parent.hidden) then if not self.hidden and (self.parent == nil or not self.parent.hidden) then
if self.parent == nil then if self.parent == nil then
local tsize = self.tablist[self.last_tab_index].tabsize or local tsize = self.tablist[self.last_tab_index].tabsize or
{width=self.width, height=self.height} {width=self.width, height=self.height}
@ -87,11 +87,11 @@ local function handle_buttons(self,fields)
if self.hidden then if self.hidden then
return false return false
end end
if self:handle_tab_buttons(fields) then if self:handle_tab_buttons(fields) then
return true return true
end end
if self.glb_btn_handler ~= nil and if self.glb_btn_handler ~= nil and
self.glb_btn_handler(self,fields) then self.glb_btn_handler(self,fields) then
return true return true
@ -112,16 +112,16 @@ end
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
local function handle_events(self,event) local function handle_events(self,event)
if self.hidden then if self.hidden then
return false return false
end end
if self.glb_evt_handler ~= nil and if self.glb_evt_handler ~= nil and
self.glb_evt_handler(self,event) then self.glb_evt_handler(self,event) then
return true return true
end end
if self.tablist[self.last_tab_index].evt_handler ~= nil then if self.tablist[self.last_tab_index].evt_handler ~= nil then
return return
self.tablist[self.last_tab_index].evt_handler( self.tablist[self.last_tab_index].evt_handler(
@ -131,7 +131,7 @@ local function handle_events(self,event)
self.tablist[self.last_tab_index].tabdata self.tablist[self.last_tab_index].tabdata
) )
end end
return false return false
end end
@ -160,16 +160,16 @@ local function switch_to_tab(self, index)
self.tablist[self.last_tab_index].on_change("LEAVE", self.tablist[self.last_tab_index].on_change("LEAVE",
self.current_tab, self.tablist[index].name) self.current_tab, self.tablist[index].name)
end end
--update tabview data --update tabview data
self.last_tab_index = index self.last_tab_index = index
local old_tab = self.current_tab local old_tab = self.current_tab
self.current_tab = self.tablist[index].name self.current_tab = self.tablist[index].name
if (self.autosave_tab) then if (self.autosave_tab) then
core.setting_set(self.name .. "_LAST",self.current_tab) core.setting_set(self.name .. "_LAST",self.current_tab)
end end
-- call for tab to enter -- call for tab to enter
if self.tablist[index].on_change ~= nil then if self.tablist[index].on_change ~= nil then
self.tablist[index].on_change("ENTER", self.tablist[index].on_change("ENTER",
@ -197,14 +197,14 @@ local function set_tab_by_name(self, name)
return true return true
end end
end end
return false return false
end end
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
local function hide_tabview(self) local function hide_tabview(self)
self.hidden=true self.hidden=true
--call on_change as we're not gonna show self tab any longer --call on_change as we're not gonna show self tab any longer
if self.tablist[self.last_tab_index].on_change ~= nil then if self.tablist[self.last_tab_index].on_change ~= nil then
self.tablist[self.last_tab_index].on_change("LEAVE", self.tablist[self.last_tab_index].on_change("LEAVE",
@ -215,7 +215,7 @@ end
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
local function show_tabview(self) local function show_tabview(self)
self.hidden=false self.hidden=false
-- call for tab to enter -- call for tab to enter
if self.tablist[self.last_tab_index].on_change ~= nil then if self.tablist[self.last_tab_index].on_change ~= nil then
self.tablist[self.last_tab_index].on_change("ENTER", self.tablist[self.last_tab_index].on_change("ENTER",
@ -265,7 +265,7 @@ function tabview_create(name, size, tabheaderpos)
self.current_tab = nil self.current_tab = nil
self.last_tab_index = 1 self.last_tab_index = 1
self.tablist = {} self.tablist = {}
self.autosave_tab = false self.autosave_tab = false
ui.add(self) ui.add(self)

View File

@ -1,18 +1,18 @@
--Minetest --Minetest
--Copyright (C) 2014 sapier --Copyright (C) 2014 sapier
-- --
--self program is free software; you can redistribute it and/or modify --This program is free software; you can redistribute it and/or modify
--it under the terms of the GNU Lesser General Public License as published by --it under the terms of the GNU Lesser General Public License as published by
--the Free Software Foundation; either version 2.1 of the License, or --the Free Software Foundation; either version 2.1 of the License, or
--(at your option) any later version. --(at your option) any later version.
-- --
--self program is distributed in the hope that it will be useful, --This program is distributed in the hope that it will be useful,
--but WITHOUT ANY WARRANTY; without even the implied warranty of --but WITHOUT ANY WARRANTY; without even the implied warranty of
--MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--GNU Lesser General Public License for more details. --GNU Lesser General Public License for more details.
-- --
--You should have received a copy of the GNU Lesser General Public License along --You should have received a copy of the GNU Lesser General Public License along
--with self program; if not, write to the Free Software Foundation, Inc., --with this program; if not, write to the Free Software Foundation, Inc.,
--51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
ui = {} ui = {}