aperx/factorio-scenario-ExpCluster
1
0
Fork 0
mirror of https://github.com/PHIDIAS0303/ExpCluster.git synced 2025-12-31 04:51:40 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'core'

Browse Source
This commit is contained in:
Cooldude2606
2018-05-20 18:41:32 +01:00
parent 53c321be9a 8571a510f7
commit 0dde0c9249
6 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ExpCore/GuiParts/center.lua
View File

@@ -17,6 +17,7 @@ center._center = {}
function center.add(obj) function center.add(obj)
if not is_type(obj,'table') then return end if not is_type(obj,'table') then return end
if not is_type(obj.name,'string') then return end if not is_type(obj.name,'string') then return end
verbose('Created Center Gui: '..name)
setmetatable(obj,{__index=center._center}) setmetatable(obj,{__index=center._center})
obj.tabs = {} obj.tabs = {}
obj._tabs = {} obj._tabs = {}
@@ -167,6 +168,7 @@ end
-- @tparam function callback this is called when button is pressed with function(root_frame) -- @tparam function callback this is called when button is pressed with function(root_frame)
-- @return self to allow chaining of _center:add_tab -- @return self to allow chaining of _center:add_tab
function center._center:add_tab(name,caption,tooltip,callback) function center._center:add_tab(name,caption,tooltip,callback)
verbose('Created Tab: '..self.name..'/'..name)
self._tabs[self.name..'_'..name] = callback self._tabs[self.name..'_'..name] = callback
self.tabs[name] = Gui.inputs.add{ self.tabs[name] = Gui.inputs.add{
type='button', type='button',

17
ExpCore/GuiParts/inputs.lua
View File

@@ -91,15 +91,16 @@ function inputs.add(obj)
if not is_type(obj.type,'string') then return end if not is_type(obj.type,'string') then return end
local type = obj.type local type = obj.type
if type == 'button' or if type == 'button' or
type == 'sprite-button' or type == 'sprite-button' or
type == 'choose-elem-button' or type == 'choose-elem-button' or
type == 'checkbox' or type == 'checkbox' or
type == 'radiobutton' or type == 'radiobutton' or
type == 'textfield' or type == 'textfield' or
type == 'text-box' or type == 'text-box' or
type == 'slider' or type == 'slider' or
type == 'drop-down' type == 'drop-down'
then else return end then else return end
verbose('Created Input: '..obj.name..' ('..obj.type..')')
if obj.type == 'button' or obj.type == 'sprite-button' then obj.style = mod_gui.button_style end if obj.type == 'button' or obj.type == 'sprite-button' then obj.style = mod_gui.button_style end
obj.draw_data = table.deepcopy(obj) obj.draw_data = table.deepcopy(obj)
obj.data = {} obj.data = {}

1
ExpCore/GuiParts/left.lua
View File

@@ -21,6 +21,7 @@ end
function left.add(obj) function left.add(obj)
if not is_type(obj,'table') then return end if not is_type(obj,'table') then return end
if not is_type(obj.name,'string') then return end if not is_type(obj.name,'string') then return end
verbose('Created Left Gui: '..obj.name)
setmetatable(obj,{__index=left._left}) setmetatable(obj,{__index=left._left})
Gui._add_data('left',obj.name,obj) Gui._add_data('left',obj.name,obj)
Gui.toolbar.add(obj.name,obj.caption,obj.tooltip,obj.toggle) Gui.toolbar.add(obj.name,obj.caption,obj.tooltip,obj.toggle)

1
ExpCore/GuiParts/popup.lua
View File

@@ -29,6 +29,7 @@ end
function popup.add(obj) function popup.add(obj)
if not is_type(obj,'table') then return end if not is_type(obj,'table') then return end
if not is_type(obj.name,'string') then return end if not is_type(obj.name,'string') then return end
verbose('Created Popup Gui: '..obj.name)
setmetatable(obj,{__index=popup._popup}) setmetatable(obj,{__index=popup._popup})
local name = obj.name; obj.name = nil local name = obj.name; obj.name = nil
Gui._add_data('popup',name,obj) Gui._add_data('popup',name,obj)

1
ExpCore/GuiParts/toolbar.lua
View File

@@ -17,6 +17,7 @@ local toolbar = {}
-- @tparam function callback the function which is called on_click -- @tparam function callback the function which is called on_click
-- @treturn table the button object that was made -- @treturn table the button object that was made
function toolbar.add(name,caption,tooltip,callback) function toolbar.add(name,caption,tooltip,callback)
verbose('Created Toolbar Button: '..name)
local button = Gui.inputs.add{type='button',name=name,caption=caption,tooltip=tooltip} local button = Gui.inputs.add{type='button',name=name,caption=caption,tooltip=tooltip}
button:on_event(Gui.inputs.events.click,callback) button:on_event(Gui.inputs.events.click,callback)
Gui._add_data('toolbar',name,button) Gui._add_data('toolbar',name,button)

1
ExpCore/commands.lua
View File

@@ -135,6 +135,7 @@ commands.add_command = function(name, description, inputs, event)
if command_calls[name] then return end if command_calls[name] then return end
if not is_type(name,'string') then return end if not is_type(name,'string') then return end
if not is_type(event,'function') then return end if not is_type(event,'function') then return end
verbose('Created Command: '..name)
local description = is_type(description,'string') and description or 'No Description' local description = is_type(description,'string') and description or 'No Description'
local inputs = is_type(inputs,'table') and inputs or {'parameter',true} local inputs = is_type(inputs,'table') and inputs or {'parameter',true}
command_data[name] = { command_data[name] = {