From ce512617d733bc9439fc4d4f920cb1d01bc193d7 Mon Sep 17 00:00:00 2001 From: Wetxius Date: Thu, 21 May 2020 18:51:49 +0300 Subject: [PATCH] Removed OneClickBuyOut, can't work with new AH frame. --- ShestakUI/Locales/Chinese.lua | 3 - ShestakUI/Locales/English.lua | 3 - ShestakUI/Locales/French.lua | 3 - ShestakUI/Locales/German.lua | 3 - ShestakUI/Locales/Italian.lua | 3 - ShestakUI/Locales/Russian.lua | 3 - ShestakUI/Locales/Spanish.lua | 3 - ShestakUI/Locales/Taiwan.lua | 3 - ShestakUI/Modules/Misc/OneClickBuyOut.lua | 108 ---------------------- ShestakUI/ShestakUI.xml | 1 - 10 files changed, 133 deletions(-) delete mode 100644 ShestakUI/Modules/Misc/OneClickBuyOut.lua diff --git a/ShestakUI/Locales/Chinese.lua b/ShestakUI/Locales/Chinese.lua index 32c76f1fc5..a0dc0d083c 100644 --- a/ShestakUI/Locales/Chinese.lua +++ b/ShestakUI/Locales/Chinese.lua @@ -47,9 +47,6 @@ L_TOOLTIP_INSPECT_OPEN = "检查框体已开启" L_MISC_UNDRESS = "无装备" L_MISC_DRINKING = " 进食中..." L_MISC_BUY_STACK = "Alt+右键批量购买" -L_MISC_ONECLICK_BUYOUT = "Shift+右键 不弹出确认框体直接购买" -L_MISC_ONECLICK_BID = "Shift+右鍵 不弹出确认框体直接竞标" -L_MISC_ONECLICK_CANCEL = "Shift+右键 不弹出确认框体直接取消选择的物品" L_MISC_UI_OUTDATED = "ShestakUI 版本已过期，请至 www.shestak.org 下载最新版。" L_MISC_HEADER_MARK = "鼠标悬停显示团队图标" L_MISC_BINDER_OPEN = "鼠标绑定" diff --git a/ShestakUI/Locales/English.lua b/ShestakUI/Locales/English.lua index db91ab9049..2121f9f4a7 100644 --- a/ShestakUI/Locales/English.lua +++ b/ShestakUI/Locales/English.lua @@ -43,9 +43,6 @@ L_TOOLTIP_INSPECT_OPEN = "Inspect Frame is open" L_MISC_UNDRESS = "Undress" L_MISC_DRINKING = " is drinking." L_MISC_BUY_STACK = "Alt-Click to buy a stack" -L_MISC_ONECLICK_BUYOUT = "Shift-Right-Click to buyout the selected item without confirmation" -L_MISC_ONECLICK_BID = "Shift-Right-Click to bid on the selected item without confirmation" -L_MISC_ONECLICK_CANCEL = "Shift-Right-Click to cancel on the selected item without confirmation" L_MISC_UI_OUTDATED = "Your version of ShestakUI is out of date. You can download the latest version from www.shestak.org" L_MISC_HEADER_MARK = "Mouseover Raid Icons" L_MISC_BINDER_OPEN = "Mouse Bindings" diff --git a/ShestakUI/Locales/French.lua b/ShestakUI/Locales/French.lua index ea97c9d342..e8b1cb913a 100644 --- a/ShestakUI/Locales/French.lua +++ b/ShestakUI/Locales/French.lua @@ -47,9 +47,6 @@ L_TOOLTIP_INSPECT_OPEN = "La fenêtre d'inspection est ouverte" L_MISC_UNDRESS = "Déshabillé" L_MISC_DRINKING = " est entrain de boire." L_MISC_BUY_STACK = "Alt-Clic pour acheter une pile d'objet" -L_MISC_ONECLICK_BUYOUT = "Maj-Clic-Droit pour acheter l'objet sélectionné sans confirmation" -L_MISC_ONECLICK_BID = "Maj-Clic-Droit pour enchérir sur l'objet sélectionné sans confirmation" -L_MISC_ONECLICK_CANCEL = "Maj-Clic-Droit pour annuler l'objet sélectionné sans confirmation" L_MISC_UI_OUTDATED = "Une version plus récente de ShestakUI est disponible. Vous pouvez la télécharger sur www.shestak.org" L_MISC_HEADER_MARK = "Icône de raid au survol de la souris" L_MISC_BINDER_OPEN = "Assignations des boutons de la souris" diff --git a/ShestakUI/Locales/German.lua b/ShestakUI/Locales/German.lua index e2cc9d7873..d24040fe76 100644 --- a/ShestakUI/Locales/German.lua +++ b/ShestakUI/Locales/German.lua @@ -47,9 +47,6 @@ L_TOOLTIP_INSPECT_OPEN = "Betrachtungsfenster offen" L_MISC_UNDRESS = "Ausziehen" L_MISC_DRINKING = " trinkt." L_MISC_BUY_STACK = "Alt-Klick um einen Stapel zu kaufen" -L_MISC_ONECLICK_BUYOUT = "Shift-Right-Click um den ausgewählten Gegenstand ohne Bestätigung zu kaufen" -L_MISC_ONECLICK_BID = "Shift-Right-Click um auf den ausgewählten Gegenstand ohne Bestätigung zu bieten" -L_MISC_ONECLICK_CANCEL = "Shift-Right-Click um den ausgewählten Gegenstand ohne Bestätigung abzubrechen" L_MISC_UI_OUTDATED = "Deine Version von ShestakUI ist veraltet. Du kannst die aktuelle Version von www.shestak.org laden" L_MISC_HEADER_MARK = "Mausdrüber Raid Icon" L_MISC_BINDER_OPEN = "Maus gebunden" diff --git a/ShestakUI/Locales/Italian.lua b/ShestakUI/Locales/Italian.lua index ca07406633..197238b912 100644 --- a/ShestakUI/Locales/Italian.lua +++ b/ShestakUI/Locales/Italian.lua @@ -47,9 +47,6 @@ L_TOOLTIP_INSPECT_OPEN = "Il riquadro 'Ispeziona' è aperto" L_MISC_UNDRESS = "Senza vestiti" L_MISC_DRINKING = " sta bevendo." L_MISC_BUY_STACK = "Alt + click per comprarne una pila" -L_MISC_ONECLICK_BUYOUT = "Shift + click sul destro per comprare direttamente l'oggetto selezionato senza conferma" -L_MISC_ONECLICK_BID = "Shift + click sul destro per fare una puntata sull'oggetto selezionato senza conferma" -L_MISC_ONECLICK_CANCEL = "Shift + click sul destro per cancellare l'oggetto selezionato senza conferma" L_MISC_UI_OUTDATED = "La tua versione della ShestakUI non è aggiornata: puoi scaricare la nuova versione da www.shestak.org." L_MISC_HEADER_MARK = "Marchi d'incursione al passaggio del mouse" L_MISC_BINDER_OPEN = "Assegnazione pulsanti mouse" diff --git a/ShestakUI/Locales/Russian.lua b/ShestakUI/Locales/Russian.lua index a97e96fb2b..909bb393b0 100644 --- a/ShestakUI/Locales/Russian.lua +++ b/ShestakUI/Locales/Russian.lua @@ -47,9 +47,6 @@ L_TOOLTIP_INSPECT_OPEN = "Открыто окно осмотра" L_MISC_UNDRESS = "Раздеть" L_MISC_DRINKING = " пьёт." L_MISC_BUY_STACK = "Зажмите Alt и щелкните мышью, чтобы купить связку" -L_MISC_ONECLICK_BUYOUT = "Зажмите Shift и щелкните правой кнопкой мыши, чтобы выкупить выбранный предмет без подтверждения" -L_MISC_ONECLICK_BID = "Зажмите Shift и щелкните правой кнопкой мыши, чтобы сделать ставку на выбранном предмете без подтверждения" -L_MISC_ONECLICK_CANCEL = "Зажмите Shift и щелкните правой кнопкой мыши, чтобы отменить аукцион выбранного предмета без подтверждения" L_MISC_UI_OUTDATED = "Ваша версия ShestakUI устарела. Вы можете скачать последнюю версию с www.shestak.org" L_MISC_HEADER_MARK = "Метки по наведению курсора" L_MISC_BINDER_OPEN = "Назначения мыши" diff --git a/ShestakUI/Locales/Spanish.lua b/ShestakUI/Locales/Spanish.lua index f24a79fedc..b3f43080e5 100644 --- a/ShestakUI/Locales/Spanish.lua +++ b/ShestakUI/Locales/Spanish.lua @@ -47,9 +47,6 @@ L_TOOLTIP_INSPECT_OPEN = "Inspect Frame is open" -- Needs review L_MISC_UNDRESS = "Desvestir" L_MISC_DRINKING = " esta bebiendo." L_MISC_BUY_STACK = "Alt-Click para comprar un lote" -L_MISC_ONECLICK_BUYOUT = "Shift-Right-Click para comprar el objeto seleccionado sin confirmacion" -- Needs review -L_MISC_ONECLICK_BID = "Shift-Right-Click para pujar por el objeto seleccionado sin confirmacion" -- Needs review -L_MISC_ONECLICK_CANCEL = "Shift-Right-Click to cancel on the selected item without confirmation" -- Needs review L_MISC_UI_OUTDATED = "Tu versión de ShestakUI no está actualizada. Puedes descargar la última versión de www.shestak.org" L_MISC_HEADER_MARK = "Mouseover Raid Icons" -- Needs review L_MISC_BINDER_OPEN = "Mouse Bindings" -- Needs review diff --git a/ShestakUI/Locales/Taiwan.lua b/ShestakUI/Locales/Taiwan.lua index ef8d9cf19a..224209f79b 100644 --- a/ShestakUI/Locales/Taiwan.lua +++ b/ShestakUI/Locales/Taiwan.lua @@ -47,9 +47,6 @@ L_TOOLTIP_INSPECT_OPEN = "檢查框體已開啟" L_MISC_UNDRESS = "無裝備" L_MISC_DRINKING = " 進食中..." L_MISC_BUY_STACK = "Alt+右鍵批量購買" -L_MISC_ONECLICK_BUYOUT = "Shift+右鍵 不彈出確認窗口直接購買" -L_MISC_ONECLICK_BID = "Shift+右鍵 不彈出確認窗口直接競標" -L_MISC_ONECLICK_CANCEL = "Shift+右鍵 不彈出確認窗口直接取消選擇的物品" L_MISC_UI_OUTDATED = "ShestakUI 版本已過期，請至 www.shestak.org 下載最新版。" L_MISC_HEADER_MARK = "滑鼠懸停顯示團隊圖標" L_MISC_BINDER_OPEN = "滑鼠綁定" diff --git a/ShestakUI/Modules/Misc/OneClickBuyOut.lua b/ShestakUI/Modules/Misc/OneClickBuyOut.lua deleted file mode 100644 index 3283c76c1a..0000000000 --- a/ShestakUI/Modules/Misc/OneClickBuyOut.lua +++ /dev/null @@ -1,108 +0,0 @@ -local T, C, L, _ = unpack(select(2, ...)) - ----------------------------------------------------------------------------------------- --- Shift+Click to cancel/bid/buyout items in auction(OneClickBuyOut by Egingell) ----------------------------------------------------------------------------------------- -local LoadOCBO = CreateFrame("Frame") -LoadOCBO:RegisterEvent("ADDON_LOADED") -LoadOCBO:SetScript("OnEvent", function(_, _, addon) - if addon ~= "Blizzard_AuctionUI" or addon == "OneClickBuyOut" then return end - local f, buyoutPrice, index, minBid, minIncrement, bidAmount, bid, name - local gt, buttonNames = GameTooltip, {"BrowseButton"} - - local function DoBid(index, minBid, minIncrement, buyoutPrice, bidAmount) - if buyoutPrice > 0 then - bid = buyoutPrice - else - bid = math.max(minBid, bidAmount + minIncrement) - if bid == 0 then - bid = buyoutPrice - end - end - PlaceAuctionBid("list", index, bid) - end - - for _, buttonName in pairs(buttonNames) do - for i = 1, 20 do - f = _G[buttonName..i] - if f then - f:RegisterForClicks("LeftButtonUp", "RightButtonUp") - f:HookScript("OnClick", function(self, button) - if button == "RightButton" and IsShiftKeyDown() then - index = self:GetID() + FauxScrollFrame_GetOffset(BrowseScrollFrame) - name, _, _, _, _, _, _, minBid, minIncrement, buyoutPrice, bidAmount = GetAuctionItemInfo("list", index) - if name then - DoBid(index, minBid, minIncrement, buyoutPrice, bidAmount) - end - end - end) - end - end - end - - for i = 1, 20 do - f = _G["AuctionsButton"..i] - if f then - f:RegisterForClicks("LeftButtonUp", "RightButtonUp") - f:HookScript("OnClick", function(self, button) - index = self:GetID() + FauxScrollFrame_GetOffset(AuctionsScrollFrame) - if button == "RightButton" and IsShiftKeyDown() then - name = GetAuctionItemInfo("owner", index) - if name then - CancelAuction(index) - end - end - end) - end - end - - BrowseBuyoutButton:RegisterForClicks("LeftButtonUp", "RightButtonUp") - BrowseBuyoutButton:SetScript("OnClick", function(self, button) - if button and IsShiftKeyDown() then - PlaceAuctionBid(AuctionFrame.type, GetSelectedAuctionItem(AuctionFrame.type), AuctionFrame.buyoutPrice) - else - StaticPopup_Show("BUYOUT_AUCTION") - end - self:Disable() - end) - - BrowseBuyoutButton:HookScript("OnEnter", function(self) - gt:SetOwner(self) - gt:AddLine(L_MISC_ONECLICK_BUYOUT, nil, nil, nil, 1) - gt:Show() - end) - - BrowseBuyoutButton:HookScript("OnLeave", function() - gt:Hide() - end) - - BrowseBidButton:RegisterForClicks("LeftButtonUp", "RightButtonUp") - BrowseBidButton:SetScript("OnClick", function(self, button) - if button and IsShiftKeyDown() then - PlaceAuctionBid("list", GetSelectedAuctionItem("list"), MoneyInputFrame_GetCopper(BrowseBidPrice)) - else - StaticPopup_Show("BID_AUCTION") - end - self:Disable() - end) - - BrowseBidButton:HookScript("OnEnter", function(self) - gt:SetOwner(self) - gt:AddLine(L_MISC_ONECLICK_BID, nil, nil, nil, 1) - gt:Show() - end) - - BrowseBidButton:HookScript("OnLeave", function() - gt:Hide() - end) - - AuctionsCancelAuctionButton:HookScript("OnEnter", function(self) - gt:SetOwner(self) - gt:AddLine(L_MISC_ONECLICK_CANCEL, nil, nil, nil, 1) - gt:Show() - end) - - AuctionsCancelAuctionButton:HookScript("OnLeave", function() - gt:Hide() - end) -end) \ No newline at end of file diff --git a/ShestakUI/ShestakUI.xml b/ShestakUI/ShestakUI.xml index d6a13897bb..1d7590c12b 100644 --- a/ShestakUI/ShestakUI.xml +++ b/ShestakUI/ShestakUI.xml @@ -71,7 +71,6 @@