diff --git a/AutoInvite.lua b/AutoInvite.lua index 57ec669..25f6c71 100644 --- a/AutoInvite.lua +++ b/AutoInvite.lua @@ -1,6 +1,6 @@ -- This file is part of AutoInvite -- --- (C) 2015 Scott Yeskie (Sasky) +-- (C) 2016 Scott Yeskie (Sasky) -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -24,7 +24,7 @@ AutoInvite.AddonId = "AutoInvite" local function b(v) if v then return "T" else return "F" end end local function nn(val) if val == nil then return "NIL" else return val end end local function dbg(msg) if AutoInvite.debug then d("|c999999" .. msg) end end -local function echo(msg) CHAT_SYSTEM.primaryContainer.currentBuffer:AddMessage("|CFFFF00"..msg) end +local function echo(msg) CHAT_SYSTEM.primaryContainer.currentBuffer:AddMessage("|CFFFF00" .. msg) end AutoInvite.isCyrodiil = function(unit) if unit == nil then unit = "player" end @@ -38,26 +38,26 @@ end --Main callback fired on chat message AutoInvite.callback = function(_, messageType, from, message) - if not AutoInvite.enabled or not AutoInvite.listening then - return - end + if not AutoInvite.enabled or not AutoInvite.listening then + return + end --TODO: Move this to the actual invite send so not per-message - if GetGroupSize() >= AutoInvite.cfg.maxSize then + if GetGroupSize() >= AutoInvite.cfg.maxSize then echo(GetString(SI_AUTO_INVITE_GROUP_FULL_STOP)) AutoInvite.stopListening() - end + end - if string.lower(message) == AutoInvite.cfg.watchStr and from ~= nil and from ~= "" then - if (messageType >= CHAT_CHANNEL_GUILD_1 and messageType <= CHAT_CHANNEL_OFFICER_5) or messageType == CHAT_CHANNEL_WHISPER then + if string.lower(message) == AutoInvite.cfg.watchStr and from ~= nil and from ~= "" then + if (messageType >= CHAT_CHANNEL_GUILD_1 and messageType <= CHAT_CHANNEL_OFFICER_5) or messageType == CHAT_CHANNEL_WHISPER then from = AutoInvite.accountNameLookup(messageType, from) - if from == "" or from == nil then return end + if from == "" or from == nil then return end end - echo(zo_strformat(GetString(SI_AUTO_INVITE_SEND_TO_USER),from)) + echo(zo_strformat(GetString(SI_AUTO_INVITE_SEND_TO_USER), from)) AutoInvite:invitePlayer(from) - end - --d("Checking message '" .. string.lower(message) .."' ?= '" .. AutoInvite.cfg.watchStr .."'") + end + --d("Checking message '" .. string.lower(message) .."' ?= '" .. AutoInvite.cfg.watchStr .."'") end -- @@ -108,7 +108,7 @@ end --- Event control ------------------------------------------------ AutoInvite.disable = function() - AutoInvite.enabled = false + AutoInvite.enabled = false AutoInvite.stopListening() EVENT_MANAGER:UnregisterForUpdate(AutoInvite.AddonId) EVENT_MANAGER:UnregisterForEvent(AutoInvite.AddonId, EVENT_GROUP_INVITE_RESPONSE) @@ -129,10 +129,10 @@ AutoInvite.startListening = function(restart) EVENT_MANAGER:RegisterForEvent(AutoInvite.AddonId, EVENT_GROUP_INVITE_RESPONSE, AutoInvite.inviteResponse) end - if not AutoInvite.listening and GetGroupSize() < AutoInvite.cfg.maxSize then - --Add handler - EVENT_MANAGER:RegisterForEvent(AutoInvite.AddonId, EVENT_CHAT_MESSAGE_CHANNEL, AutoInvite.callback) - AutoInvite.listening = true + if not AutoInvite.listening and GetGroupSize() < AutoInvite.cfg.maxSize then + --Add handler + EVENT_MANAGER:RegisterForEvent(AutoInvite.AddonId, EVENT_CHAT_MESSAGE_CHANNEL, AutoInvite.callback) + AutoInvite.listening = true if restart ~= nil then echo(zo_strformat(GetString(SI_AUTO_INVITE_GROUP_OPEN_RESTART), AutoInvite.cfg.watchStr)) else diff --git a/AutoInviteUI.lua b/AutoInviteUI.lua index d487565..b2a2bfc 100644 --- a/AutoInviteUI.lua +++ b/AutoInviteUI.lua @@ -1,6 +1,6 @@ -- This file is part of AutoInvite -- --- (C) 2014 Scott Yeskie (Sasky) +-- (C) 2016 Scott Yeskie (Sasky) -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/lang/de.lua b/lang/de.lua index 38f07b4..885f671 100644 --- a/lang/de.lua +++ b/lang/de.lua @@ -1,6 +1,6 @@ -- This file is part of AutoInvite -- --- (C) 2015 Scott Yeskie (Sasky) +-- (C) 2016 Scott Yeskie (Sasky) -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -70,4 +70,4 @@ ZO_CreateStringId("SI_AUTO_INVITE_SLASHCMD_HELP", "|CFFFF00/ai help|r - Zeigt di --Templates for using in code (reference): --ZO_CreateStringId("SI_AUTO_INVITE_", ) --GetString(SI_AUTO_INVITE...) ---zo_strformat(GetString(SI_AUTO_INVITE_...), param1, param2)) \ No newline at end of file +--zo_strformat(GetString(SI_AUTO_INVITE_...), param1, param2)) diff --git a/lang/en.lua b/lang/en.lua index 8d59298..7cac2ba 100644 --- a/lang/en.lua +++ b/lang/en.lua @@ -1,6 +1,6 @@ -- This file is part of AutoInvite -- --- (C) 2015 Scott Yeskie (Sasky) +-- (C) 2016 Scott Yeskie (Sasky) -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -70,4 +70,4 @@ ZO_CreateStringId("SI_AUTO_INVITE_SLASHCMD_HELP", "|CFFFF00/ai help|r - show thi --Templates for using in code (reference): --ZO_CreateStringId("SI_AUTO_INVITE_", ) --GetString(SI_AUTO_INVITE...) ---zo_strformat(GetString(SI_AUTO_INVITE_...), param1, param2)) \ No newline at end of file +--zo_strformat(GetString(SI_AUTO_INVITE_...), param1, param2)) diff --git a/lang/fr.lua b/lang/fr.lua index efe1dd7..65baff4 100644 --- a/lang/fr.lua +++ b/lang/fr.lua @@ -1,6 +1,6 @@ -- This file is part of AutoInvite -- --- (C) 2015 Scott Yeskie (Sasky) +-- (C) 2016 Scott Yeskie (Sasky) -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -73,4 +73,4 @@ ZO_CreateStringId("SI_AUTO_INVITE_SLASHCMD_HELP", "|CFFFF00/ai help|r - Afficher --Templates for using in code (reference): --ZO_CreateStringId("SI_AUTO_INVITE_", ) --GetString(SI_AUTO_INVITE...) ---zo_strformat(GetString(SI_AUTO_INVITE_...), param1, param2)) \ No newline at end of file +--zo_strformat(GetString(SI_AUTO_INVITE_...), param1, param2)) diff --git a/lua/cli.lua b/lua/cli.lua index 7fe87d6..33b414e 100644 --- a/lua/cli.lua +++ b/lua/cli.lua @@ -1,6 +1,6 @@ -- This file is part of AutoInvite -- --- (C) 2015 Scott Yeskie (Sasky) +-- (C) 2016 Scott Yeskie (Sasky) -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -22,7 +22,7 @@ AutoInvite = AutoInvite or {} local function b(v) if v then return "T" else return "F" end end local function nn(val) if val == nil then return "NIL" else return val end end local function dbg(msg) if AutoInvite.debug then d("|c999999" .. msg) end end -local function echo(msg) CHAT_SYSTEM.primaryContainer.currentBuffer:AddMessage("|CFFFF00"..msg) end +local function echo(msg) CHAT_SYSTEM.primaryContainer.currentBuffer:AddMessage("|CFFFF00" .. msg) end -- print command usage AutoInvite.help = function() diff --git a/lua/guild.lua b/lua/guild.lua index be696fe..2683cf5 100644 --- a/lua/guild.lua +++ b/lua/guild.lua @@ -1,6 +1,6 @@ -- This file is part of AutoInvite -- --- (C) 2015 Scott Yeskie (Sasky) +-- (C) 2016 Scott Yeskie (Sasky) -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -18,7 +18,7 @@ local function b(v) if v then return "T" else return "F" end end local function nn(val) if val == nil then return "NIL" else return val end end local function dbg(msg) if AutoInvite.debug then d("|c999999" .. msg) end end -local function echo(msg) CHAT_SYSTEM.primaryContainer.currentBuffer:AddMessage("|CFFFF00"..msg) end +local function echo(msg) CHAT_SYSTEM.primaryContainer.currentBuffer:AddMessage("|CFFFF00" .. msg) end AutoInvite = AutoInvite or {} @@ -44,16 +44,16 @@ end function AutoInvite.guildLookup(guildId, acctName) local aName - for i=1,GetNumGuildMembers(guildId) do - aName = GetGuildMemberInfo(guildId,i) + for i = 1, GetNumGuildMembers(guildId) do + aName = GetGuildMemberInfo(guildId, i) if aName == acctName then - return AutoInvite.executeNameLookup(GetGuildMemberCharacterInfo(guildId,i)) + return AutoInvite.executeNameLookup(GetGuildMemberCharacterInfo(guildId, i)) end end end function AutoInvite.friendLookup(acctName) - for i=1,GetNumFriends() do + for i = 1, GetNumFriends() do local aName = GetFriendInfo(i) if aName == acctName then return AutoInvite.executeNameLookup(GetFriendCharacterInfo(i)) @@ -77,7 +77,7 @@ function AutoInvite.accountNameLookup(channel, acctName) local charName = AutoInvite.friendLookup(acctName) if charName then return charName end - for i=1,5 do + for i = 1, 5 do guildId = GetGuildId(i) charName = AutoInvite.guildLookup(guildId, acctName) if charName then return charName end @@ -85,4 +85,4 @@ function AutoInvite.accountNameLookup(channel, acctName) echo(GetString(SI_AUTO_INVITE_ERROR_INVITE) .. channel) end -end \ No newline at end of file +end diff --git a/lua/kick.lua b/lua/kick.lua index fd883db..7dbf774 100644 --- a/lua/kick.lua +++ b/lua/kick.lua @@ -1,6 +1,6 @@ -- This file is part of AutoInvite -- --- (C) 2015 Scott Yeskie (Sasky) +-- (C) 2016 Scott Yeskie (Sasky) -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -19,12 +19,12 @@ AutoInvite = AutoInvite or {} local function b(v) if v then return "T" else return "F" end end local function nn(val) if val == nil then return "NIL" else return val end end local function dbg(msg) if AutoInvite.debug then d("|c999999" .. msg) end end -local function echo(msg) CHAT_SYSTEM.primaryContainer.currentBuffer:AddMessage("|CFFFF00"..msg) end +local function echo(msg) CHAT_SYSTEM.primaryContainer.currentBuffer:AddMessage("|CFFFF00" .. msg) end AutoInvite.kickTable = {} function AutoInvite.checkOffline() local now = GetTimeStamp() - for i=1,GetGroupSize() do + for i = 1, GetGroupSize() do local tag = GetGroupUnitTagByIndex(i) if not IsUnitOnline(tag) then AutoInvite.kickTable[GetUnitName(tag)] = now @@ -35,7 +35,7 @@ end --Since KickByName doesn't seem to be working function AutoInvite.kickByName(name) AutoInvite.kickTable[name] = nil - for i=1,GetGroupSize() do + for i = 1, GetGroupSize() do local tag = GetGroupUnitTagByIndex(i) if GetUnitName(tag) == name then GroupKick(tag) @@ -49,7 +49,7 @@ function AutoInvite.kickCheck() if not AutoInvite.cfg.autoKick then return end local now = GetTimeStamp() --d("Check kick") - for p,t in pairs(AutoInvite.kickTable) do + for p, t in pairs(AutoInvite.kickTable) do local offTime = GetDiffBetweenTimeStamps(now, t) if offTime > AutoInvite.cfg.kickDelay then echo(zo_strformat(GetString(SI_AUTO_INVITE_KICK), p, offTime)) @@ -58,4 +58,4 @@ function AutoInvite.kickCheck() dbg(p .. " offline for " .. offTime .. " / " .. AutoInvite.cfg.kickDelay) end end -end \ No newline at end of file +end diff --git a/lua/queue.lua b/lua/queue.lua index 245c6ef..87f135a 100644 --- a/lua/queue.lua +++ b/lua/queue.lua @@ -1,6 +1,6 @@ -- This file is part of AutoInvite -- --- (C) 2014 Scott Yeskie (Sasky) +-- (C) 2016 Scott Yeskie (Sasky) -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -19,7 +19,7 @@ AutoInvite = AutoInvite or {} local function b(v) if v then return "T" else return "F" end end local function nn(val) if val == nil then return "NIL" else return val end end local function dbg(msg) if AutoInvite.debug then d("|c999999" .. msg) end end -local function echo(msg) CHAT_SYSTEM.primaryContainer.currentBuffer:AddMessage("|CFFFF00"..msg) end +local function echo(msg) CHAT_SYSTEM.primaryContainer.currentBuffer:AddMessage("|CFFFF00" .. msg) end -- FIFO invite queue local queue = { @@ -64,7 +64,7 @@ AutoInvite.sentInvites = 0 function AutoInvite:processQueue() local sentCount = AutoInvite.sentInvites local now = GetTimeStamp() - for name,time in pairs(self.sentInvite) do + for name, time in pairs(self.sentInvite) do if GetDiffBetweenTimeStamps(now, time) > 30 then AutoInvite.sentInvite[name] = nil sentCount = sentCount - 1 @@ -72,8 +72,8 @@ function AutoInvite:processQueue() end local effectiveCount = GetGroupSize() + sentCount - local numInvites = math.min(queue:size(), self.cfg.maxSize - effectiveCount) - for _ = 1,numInvites do + local numInvites = math.min(queue:size(), self.cfg.maxSize - effectiveCount) + for _ = 1, numInvites do local name = queue:pop() sentCount = sentCount + 1 self.sentInvite[name] = now @@ -87,7 +87,7 @@ function AutoInvite:processQueue() end function AutoInvite:IsPlayerInSameGroup(name) - for i=1, GetGroupSize() do + for i = 1, GetGroupSize() do local tag = GetGroupUnitTagByIndex(i) if GetUnitName(tag) == name then return true @@ -104,7 +104,7 @@ function AutoInvite:checkSentInvites() local now = GetTimeStamp() local members = {} - for i=1,GetGroupSize() do + for i = 1, GetGroupSize() do local tag = GetGroupUnitTagByIndex(i) members[GetUnitName(tag)] = true end @@ -136,7 +136,7 @@ end function AutoInvite:resetGroup() self:resetQueues() - for i=1,GetGroupSize() do + for i = 1, GetGroupSize() do local tag = GetGroupUnitTagByIndex(i) local name = GetUnitName(tag) queue:push(name) diff --git a/ui/ai_enabled_fragment.lua b/ui/ai_enabled_fragment.lua index 26170a0..daf1378 100644 --- a/ui/ai_enabled_fragment.lua +++ b/ui/ai_enabled_fragment.lua @@ -1,6 +1,6 @@ -- This file is part of AutoInvite -- --- (C) 2014 Scott Yeskie (Sasky) +-- (C) 2016 Scott Yeskie (Sasky) -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -21,7 +21,7 @@ local ui = AutoInviteUI.fragmentEnabled local wm = WINDOW_MANAGER function AutoInviteUI:CreateEnabledFragment() - ui.main = wm:CreateControl("AutoInviteEnabled", AI_SmallGroupList, CT_CONTROL) --ui.main = wm:CreateTopLevelWindow("AutoInviteEnabledFragment") + ui.main = wm:CreateControl("AutoInviteEnabled", AI_SmallGroupList, CT_CONTROL) --ui.main = wm:CreateTopLevelWindow("AutoInviteEnabledFragment") ui.scroll = ui.main -- For using LAM controls --ui.main:SetHidden(true) -- LAMr18 bugfix diff --git a/ui/ai_options_fragment.lua b/ui/ai_options_fragment.lua index 972fe0a..8d49028 100644 --- a/ui/ai_options_fragment.lua +++ b/ui/ai_options_fragment.lua @@ -1,6 +1,6 @@ -- This file is part of AutoInvite -- --- (C) 2014 Scott Yeskie (Sasky) +-- (C) 2016 Scott Yeskie (Sasky) -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -48,7 +48,7 @@ function AutoInviteUI:CreateOptionFragment() name = GetString(SI_AUTO_INVITE_OPT_RESTART), tooltip = GetString(SI_AUTO_INVITE_TT_RESTART), getFunc = function() return AutoInvite.cfg.restart end, - setFunc = function(val) AutoInvite.cfg.restart = val end, + setFunc = function(val) AutoInvite.cfg.restart = val end, }) ui.restart.checkbox:SetAnchor(LEFT, ui.restart.container, RIGHT, -25, 0) ui.restart:SetAnchor(TOPLEFT, ui.max, BOTTOMLEFT, 0, 15) @@ -60,7 +60,7 @@ function AutoInviteUI:CreateOptionFragment() getFunc = function() return AutoInvite.cfg.cyrCheck end, setFunc = function(val) AutoInvite.cfg.cyrCheck = val end, }) - ui.cyr.checkbox:SetAnchor(LEFT, ui.cyr.container, RIGHT, -25, 0) + ui.cyr.checkbox:SetAnchor(LEFT, ui.cyr.container, RIGHT, -25, 0) ui.cyr:SetAnchor(TOPLEFT, ui.restart, BOTTOMLEFT, 0, 15) ui.kick = LAMCreateControl.checkbox(ui, { @@ -68,7 +68,7 @@ function AutoInviteUI:CreateOptionFragment() name = GetString(SI_AUTO_INVITE_OPT_KICK), tooltip = GetString(SI_AUTO_INVITE_TT_KICK), getFunc = function() return AutoInvite.cfg.autoKick end, - setFunc = function(val) AutoInvite.cfg.autoKick = val end, + setFunc = function(val) AutoInvite.cfg.autoKick = val end, }) ui.kick.checkbox:SetAnchor(LEFT, ui.kick.container, RIGHT, -25, 0) ui.kick:SetAnchor(TOPLEFT, ui.cyr, BOTTOMLEFT, 0, 15) @@ -106,7 +106,7 @@ function AutoInviteUI:CreateOptionFragment() text = slashcmds, }) ui.note:SetAnchor(BOTTOMRIGHT, ZO_GroupList, BOTTOMRIGHT, 0, -40) - ui.note.desc:SetColor(.7,.7,.7,1) + ui.note.desc:SetColor(.7, .7, .7, 1) --AUTO_INVITE_OPTIONS_FRAGMENT = ZO_FadeSceneFragment:New(ui.main) end diff --git a/ui/autoinvitescene.lua b/ui/autoinvitescene.lua index 155176e..34a4797 100644 --- a/ui/autoinvitescene.lua +++ b/ui/autoinvitescene.lua @@ -1,6 +1,6 @@ -- This file is part of AutoInvite -- --- (C) 2014 Scott Yeskie (Sasky) +-- (C) 2016 Scott Yeskie (Sasky) -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -90,8 +90,8 @@ function AutoInviteUI:CreateScene() --AUTO_INVITE_SCENE:AddFragment(AI_SMALL_GROUP_LIST_FRAGMENT) --AUTO_INVITE_SCENE:AddFragment(AUTO_INVITE_OPTIONS_FRAGMENT) --AUTO_INVITE_SCENE:AddFragment(AUTO_INVITE_ENABLED_FRAGMENT) - - local data = + + local data = { name = GetString(SI_AUTO_INVITE), categoryFragment = AI_SMALL_GROUP_LIST_FRAGMENT, diff --git a/ui/bindings.xml b/ui/bindings.xml index cceaaac..8e74879 100644 --- a/ui/bindings.xml +++ b/ui/bindings.xml @@ -1,12 +1,31 @@ +<!-- + ~ This file is part of AutoInvite + ~ + ~ (C) 2016 Scott Yeskie (Sasky) + ~ + ~ This program is free software; you can redistribute it and/or modify + ~ it under the terms of the GNU General Public License as published by + ~ the Free Software Foundation; either version 2 of the License, or + ~ (at your option) any later version. + ~ + ~ This program is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ~ GNU General Public License for more details. + ~ + ~ You should have received a copy of the GNU General Public License + ~ along with this program. If not, see <http://www.gnu.org/licenses/>. + --> + <Bindings> - <Layer name="SI_KEYBINDINGS_LAYER_GENERAL"> - <Category name="AutoInvite"> - <Action name="AUTOINVITE_REGROUP"> - <Down>AutoInvite:resetGroup()</Down> - </Action> - <Action name="AUTOINVITE_REINVITE"> - <Down>AutoInvite:inviteGroup()</Down> - </Action> - </Category> - </Layer> -</Bindings> \ No newline at end of file + <Layer name="SI_KEYBINDINGS_LAYER_GENERAL"> + <Category name="AutoInvite"> + <Action name="AUTOINVITE_REGROUP"> + <Down>AutoInvite:resetGroup()</Down> + </Action> + <Action name="AUTOINVITE_REINVITE"> + <Down>AutoInvite:inviteGroup()</Down> + </Action> + </Category> + </Layer> +</Bindings> diff --git a/ui/half_grouplist.lua b/ui/half_grouplist.lua index 5f84fc1..cdbc446 100644 --- a/ui/half_grouplist.lua +++ b/ui/half_grouplist.lua @@ -1,6 +1,6 @@ -- This file is part of AutoInvite -- --- (C) 2014 Scott Yeskie (Sasky) +-- (C) 2016 Scott Yeskie (Sasky) -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -15,7 +15,7 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see <http://www.gnu.org/licenses/>. local function dbg(msg) if AutoInvite.debug then d("|c999999" .. msg) end end -local function echo(msg) CHAT_SYSTEM.primaryContainer.currentBuffer:AddMessage("|CFFFF00"..msg) end +local function echo(msg) CHAT_SYSTEM.primaryContainer.currentBuffer:AddMessage("|CFFFF00" .. msg) end local AI_SmallGroupListing = ZO_SortFilterList:Subclass() local AI_GROUP_LIST_ENTRIES = {} @@ -85,7 +85,7 @@ function AI_SmallGroupListing:updateSingle(name) AI_GROUP_LIST_ENTRIES[name]:Update() elseif name then dbg("Name " .. name .. " not found.") - AI_GROUP_LIST_ENTRIES[name] = AI_SLG_Entry.New(name) + AI_GROUP_LIST_ENTRIES[name] = AI_SLG_Entry.New(name) end self:RefreshFilters() @@ -152,15 +152,15 @@ function AI_SmallGroupListing:BuildMasterList() dbg("Calling AI_SmallGroupListing:BuildMasterList()") AI_GROUP_LIST_ENTRIES = {} - for name,time in pairs(AutoInvite.sentInvite) do + for name, time in pairs(AutoInvite.sentInvite) do AI_GROUP_LIST_ENTRIES[name] = AI_SLG_Entry.NewDefined(name, STATUS_ORDERING.SENT, time) end - for _,name in pairs(AutoInvite.__getQueue()) do + for _, name in pairs(AutoInvite.__getQueue()) do AI_GROUP_LIST_ENTRIES[name] = AI_SLG_Entry.NewDefined(name, STATUS_ORDERING.QUEUE) end - for i=1,GetGroupSize() do + for i = 1, GetGroupSize() do local tag = GetGroupUnitTagByIndex(i) local name = GetUnitName(tag) AI_GROUP_LIST_ENTRIES[name] = AI_SLG_Entry.New(name, tag) @@ -179,14 +179,14 @@ function AI_SmallGroupListing:FilterScrollList() local scrollData = ZO_ScrollList_GetDataList(self.list) ZO_ClearNumericallyIndexedTable(scrollData) - for _,data in pairs(AI_GROUP_LIST_ENTRIES) do + for _, data in pairs(AI_GROUP_LIST_ENTRIES) do table.insert(scrollData, ZO_ScrollList_CreateDataEntry(AI_GROUP_DATA, data)) end end function AI_SmallGroupListing:SortScrollList() dbg("Calling AI_SmallGroupListing:SortScrollList()") - if(self.currentSortKey ~= nil and self.currentSortOrder ~= nil) then + if (self.currentSortKey ~= nil and self.currentSortOrder ~= nil) then local scrollData = ZO_ScrollList_GetDataList(self.list) table.sort(scrollData, self.CompareMembers) end diff --git a/ui/half_grouplist.xml b/ui/half_grouplist.xml index 9083166..9c0f1cb 100644 --- a/ui/half_grouplist.xml +++ b/ui/half_grouplist.xml @@ -1,7 +1,7 @@ <!-- ~ This file is part of AutoInvite ~ - ~ (C) 2014 Scott Yeskie (Sasky) + ~ (C) 2016 Scott Yeskie (Sasky) ~ ~ This program is free software; you can redistribute it and/or modify ~ it under the terms of the GNU General Public License as published by @@ -16,7 +16,6 @@ ~ You should have received a copy of the GNU General Public License ~ along with this program. If not, see <http://www.gnu.org/licenses/>. --> - <GuiXml> <Controls> <Label name="AI_SmallGroupListLabel" font="ZoFontGame" wrapMode="ELLIPSIS" virtual="true"/> @@ -78,7 +77,8 @@ <Controls> <Control name="$(parent)DisplayName" inherits="ZO_SortHeader"> <OnInitialized> - ZO_SortHeader_Initialize(self, GetString(SI_GROUP_LIST_PANEL_NAME_HEADER), "displayName", ZO_SORT_ORDER_UP, TEXT_ALIGN_LEFT, "ZoFontGameLargeBold") + ZO_SortHeader_Initialize(self, GetString(SI_GROUP_LIST_PANEL_NAME_HEADER), + "displayName", ZO_SORT_ORDER_UP, TEXT_ALIGN_LEFT, "ZoFontGameLargeBold") </OnInitialized> <Anchor point="TOPLEFT" offsetX="59"/> <Dimensions x="200" y="32"/> @@ -88,9 +88,10 @@ <Control name="$(parent)List" inherits="ZO_ScrollList"> <Anchor point="TOPLEFT" relativeTo="$(parent)Headers" relativePoint="BOTTOMLEFT" offsetY="3"/> - <Anchor point="BOTTOMRIGHT" relativeTo="$(parent)" relativePoint="BOTTOMLEFT" offsetX="600" offsetY="-32"/> + <Anchor point="BOTTOMRIGHT" relativeTo="$(parent)" relativePoint="BOTTOMLEFT" offsetX="600" + offsetY="-32"/> </Control> </Controls> </TopLevelControl> </Controls> -</GuiXml> \ No newline at end of file +</GuiXml>