From a1d89c343d36cbab4ade5b320aa9c262106e678f Mon Sep 17 00:00:00 2001 From: shirsig Date: Mon, 13 Nov 2017 21:17:46 +0100 Subject: [PATCH] thirdparty: rename cleanup to sortbags --- README.md | 2 +- api/config.lua | 2 +- env/translations_deDE.lua | 2 +- env/translations_enUS.lua | 2 +- env/translations_esES.lua | 2 +- env/translations_frFR.lua | 2 +- env/translations_koKR.lua | 2 +- env/translations_ruRU.lua | 2 +- env/translations_zhCN.lua | 2 +- env/translations_zhTW.lua | 2 +- modules/gui.lua | 2 +- modules/thirdparty.lua | 38 +++++++++++++++++++------------------- 12 files changed, 30 insertions(+), 30 deletions(-) diff --git a/README.md b/README.md index c9c54d2c..1e5023a3 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ pfUI supports and contains language specific code for the following gameclients. * [DPSMate](https://github.com/Geigerkind/DPSMate) An advanced combat analyzation tool * [DebuffTimers](https://github.com/shagu/DebuffTimers) Timer Overlays for enemy debuffs * [Clique](https://github.com/shagu/Clique) Simply powerful click-casting interface -* [Clean_Up](https://github.com/shirsig/Clean_Up) Automatically stacks and sorts your items. +* [SortBags](https://github.com/shirsig/SortBags) Automatically stacks and sorts your items. ## FAQ **What does "pfUI" stand for?** diff --git a/api/config.lua b/api/config.lua index aff53c73..77a6b414 100644 --- a/api/config.lua +++ b/api/config.lua @@ -520,7 +520,7 @@ function pfUI:LoadConfig() pfUI:UpdateConfig("thirdparty", "ktm", "dock", "0") pfUI:UpdateConfig("thirdparty", "wim", "enable", "1") pfUI:UpdateConfig("thirdparty", "healcomm", "enable", "1") - pfUI:UpdateConfig("thirdparty", "cleanup", "enable", "1") + pfUI:UpdateConfig("thirdparty", "sortbags", "enable", "1") pfUI:UpdateConfig("thirdparty", "flightmap", "enable", "1") pfUI:UpdateConfig("position", nil, nil, nil) pfUI:UpdateConfig("disabled", nil, nil, nil) diff --git a/env/translations_deDE.lua b/env/translations_deDE.lua index 380591f1..552c47a9 100644 --- a/env/translations_deDE.lua +++ b/env/translations_deDE.lua @@ -50,7 +50,7 @@ pfUI_translation["deDE"] = { ["Chat Border Size"] = nil, ["Chat"] = nil, ["Class"] = nil, - ["CleanUp"] = nil, + ["SortBags"] = nil, ["Clear Rolls"] = nil, ["Click Action"] = nil, ["Clickcast Spells"] = nil, diff --git a/env/translations_enUS.lua b/env/translations_enUS.lua index 39768549..671fce6b 100644 --- a/env/translations_enUS.lua +++ b/env/translations_enUS.lua @@ -50,7 +50,7 @@ pfUI_translation["enUS"] = { ["Chat Border Size"] = nil, ["Chat"] = nil, ["Class"] = nil, - ["CleanUp"] = nil, + ["SortBags"] = nil, ["Clear Rolls"] = nil, ["Click Action"] = nil, ["Clickcast Spells"] = nil, diff --git a/env/translations_esES.lua b/env/translations_esES.lua index aeb012ac..d056f5c4 100644 --- a/env/translations_esES.lua +++ b/env/translations_esES.lua @@ -51,7 +51,7 @@ pfUI_translation["esES"] = { ["Chat Border Size"] = "Tamaño del Borde de Chat", ["Chat"] = "Chat", ["Class"] = "Clase", - ["CleanUp"] = "CleanUp", + ["SortBags"] = "SortBags", ["Clear Rolls"] = "Borrar los dados", ["Click Action"] = "Acción en Hacer Clic", ["Clickcast Spells"] = "Hechizos de Lanzamiento en Hacer Clic", diff --git a/env/translations_frFR.lua b/env/translations_frFR.lua index d8135c7b..a03b2176 100644 --- a/env/translations_frFR.lua +++ b/env/translations_frFR.lua @@ -50,7 +50,7 @@ pfUI_translation["frFR"] = { ["Chat Border Size"] = "Taille de la bordure du chat", ["Chat"] = "Chat", ["Class"] = "Classe", - ["CleanUp"] = "CleanUp", + ["SortBags"] = "SortBags", ["Clear Rolls"] = nil, ["Click Action"] = "Action au clic", ["Clickcast Spells"] = "Sorts à lancer au clic", diff --git a/env/translations_koKR.lua b/env/translations_koKR.lua index eeec2e0e..d4a1c180 100644 --- a/env/translations_koKR.lua +++ b/env/translations_koKR.lua @@ -50,7 +50,7 @@ pfUI_translation["koKR"] = { ["Chat Border Color"] = "채팅 테두리 색상", ["Chat Border Size"] = "채팅 테두리 크기", ["Class"] = "클래스(직업)", - ["CleanUp"] = "CleanUp(가방&은행 자동정렬)", + ["SortBags"] = "SortBags(가방&은행 자동정렬)", ["Clear Rolls"] = nil, ["Click Action"] = "클릭 액션", ["Clickcast Spells"] = "스펠 클릭캐스트", diff --git a/env/translations_ruRU.lua b/env/translations_ruRU.lua index 7bf1cbce..c7618a7c 100644 --- a/env/translations_ruRU.lua +++ b/env/translations_ruRU.lua @@ -50,7 +50,7 @@ pfUI_translation["ruRU"] = { ["Chat Border Size"] = "Размер бордюра чата", ["Chat"] = "Чат", ["Class"] = "Класс", - ["CleanUp"] = nil, -- название аддона + ["SortBags"] = nil, -- название аддона ["Clear Rolls"] = "Очистить броски", ["Click Action"] = "Действие при нажатии", ["Clickcast Spells"] = "Произнесение заклинаний по нажатию", diff --git a/env/translations_zhCN.lua b/env/translations_zhCN.lua index 7c9e1c16..e8789430 100644 --- a/env/translations_zhCN.lua +++ b/env/translations_zhCN.lua @@ -50,7 +50,7 @@ pfUI_translation["zhCN"] = { ["Chat Border Size"] = "聊天窗口边框大小", ["Chat"] = "聊天窗口", ["Class"] = "职业", - ["CleanUp"] = "CleanUp", + ["SortBags"] = "SortBags", ["Clear Rolls"] = "清除Roll点", ["Click Action"] = "点击操作", ["Clickcast Spells"] = "点击施法", diff --git a/env/translations_zhTW.lua b/env/translations_zhTW.lua index 865239bd..fedb105c 100644 --- a/env/translations_zhTW.lua +++ b/env/translations_zhTW.lua @@ -50,7 +50,7 @@ pfUI_translation["zhTW"] = { ["Chat Border Size"] = "聊天窗口邊框大小", ["Chat"] = "聊天窗口", ["Class"] = "職業", - ["CleanUp"] = "CleanUp", + ["SortBags"] = "SortBags", ["Clear Rolls"] = "清除Roll點", ["Click Action"] = "點擊操作", ["Clickcast Spells"] = "點擊施法", diff --git a/modules/gui.lua b/modules/gui.lua index 591f0ce6..d63a0823 100644 --- a/modules/gui.lua +++ b/modules/gui.lua @@ -1357,7 +1357,7 @@ pfUI:RegisterModule("gui", function () CreateConfig(this, T["KLH Threat Meter (Dock)"], C.thirdparty.ktm, "dock", "checkbox") CreateConfig(this, T["WIM"], C.thirdparty.wim, "enable", "checkbox") CreateConfig(this, T["HealComm"], C.thirdparty.healcomm, "enable", "checkbox") - CreateConfig(this, T["CleanUp"], C.thirdparty.cleanup, "enable", "checkbox") + CreateConfig(this, T["SortBags"], C.thirdparty.sortbags, "enable", "checkbox") CreateConfig(this, T["FlightMap"], C.thirdparty.flightmap, "enable", "checkbox") this.setup = true end diff --git a/modules/thirdparty.lua b/modules/thirdparty.lua index eb22dbb1..783a8338 100644 --- a/modules/thirdparty.lua +++ b/modules/thirdparty.lua @@ -683,16 +683,16 @@ pfUI:RegisterModule("thirdparty", function () end) end - do -- CleanUp Integration - -- Integrate CleanUp bag sorting into pfUI - local function pfSetupClean_Up() - pfUI.thirdparty.cleanup = CreateFrame("Frame", nil) - pfUI.thirdparty.cleanup:RegisterEvent("BAG_UPDATE") - pfUI.thirdparty.cleanup:RegisterEvent("PLAYER_ENTERING_WORLD") - pfUI.thirdparty.cleanup:SetScript("OnEvent", function() + do -- SortBags Integration + -- Integrate SortBags bag sorting into pfUI + local function pfSetupSortBags() + pfUI.thirdparty.sortbags = CreateFrame("Frame", nil) + pfUI.thirdparty.sortbags:RegisterEvent("BAG_UPDATE") + pfUI.thirdparty.sortbags:RegisterEvent("PLAYER_ENTERING_WORLD") + pfUI.thirdparty.sortbags:SetScript("OnEvent", function() -- make sure bagframe was already created if not pfUI.bag or not pfUI.bag.right then return end - pfUI.thirdparty.cleanup:UnregisterAllEvents() + pfUI.thirdparty.sortbags:UnregisterAllEvents() -- draw the button if not pfUI.bag.right.sort then @@ -724,7 +724,7 @@ pfUI:RegisterModule("thirdparty", function () end) pfUI.bag.right.sort:SetScript("OnClick", function() - Clean_Up("bags") + SortBags() end) pfUI.bag.right.search:ClearAllPoints() @@ -762,22 +762,22 @@ pfUI:RegisterModule("thirdparty", function () end) pfUI.bag.left.sort:SetScript("OnClick", function() - Clean_Up("bank") + SortBankBags() end) end end) end - if C.thirdparty.cleanup.enable == "1" then - if Clean_Up then - pfSetupClean_Up() + if C.thirdparty.sortbags.enable == "1" then + if IsAddOnLoaded("SortBags") then + pfSetupSortBags() else - local pfHookClean_Up = CreateFrame("Frame", nil) - pfHookClean_Up:RegisterEvent("VARIABLES_LOADED") - pfHookClean_Up:SetScript("OnEvent",function() - if Clean_Up then - pfHookClean_Up:UnregisterEvent("VARIABLES_LOADED") - pfSetupClean_Up() + local pfHookSortBags = CreateFrame("Frame", nil) + pfHookSortBags:RegisterEvent("VARIABLES_LOADED") + pfHookSortBags:SetScript("OnEvent",function() + if IsAddOnLoaded("SortBags") then + pfHookSortBags:UnregisterEvent("VARIABLES_LOADED") + pfSetupSortBags() end end) end