ic
/
TradeSkillMaster
6
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

add click targets and scan guards

Jørgen Lien Sellæg 4 months ago
parent
3fc255bfbe
commit
5c2fe75718
5 changed files with 27 additions and 11 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      TradeSkillMaster/Auction/AuctionFrame.lua
  2. 2
      TradeSkillMaster/TradeSkillMaster.toc
  3. 4
      TradeSkillMaster_AuctionDB/TradeSkillMaster_AuctionDB.toc
  4. 19
      TradeSkillMaster_Auctioning/modules/GUI.lua
  5. 10
      TradeSkillMaster_Mailing/Modules/Inbox.lua

1
TradeSkillMaster/Auction/AuctionFrame.lua
Unescape View File

@ -43,6 +43,7 @@ function private:CreateTSMAHTab(moduleName, callbackShow, callbackHide)
tab:SetText(TSMAPI.Design:GetInlineColor("link2")..moduleName.."|r") tab:SetText(TSMAPI.Design:GetInlineColor("link2")..moduleName.."|r")
tab:SetNormalFontObject(GameFontHighlightSmall) tab:SetNormalFontObject(GameFontHighlightSmall)
tab.isTSMTab = moduleName tab.isTSMTab = moduleName
_G["TSM"..moduleName.."TabButton"] = tab
tab:SetPoint("LEFT", _G["AuctionFrameTab"..n-1], "RIGHT", -8, 0) tab:SetPoint("LEFT", _G["AuctionFrameTab"..n-1], "RIGHT", -8, 0)
tab:Show() tab:Show()
PanelTemplates_SetNumTabs(AuctionFrame, n) PanelTemplates_SetNumTabs(AuctionFrame, n)

2
TradeSkillMaster/TradeSkillMaster.toc
Unescape View File

@ -2,7 +2,7 @@
## Title: |cff00fe00TradeSkillMaster: Revived|r ## Title: |cff00fe00TradeSkillMaster: Revived|r
## Notes: Core addon for the TradeSkillMaster suite, revived for Wrath of the Lich King. Does nothing without modules installed. ## Notes: Core addon for the TradeSkillMaster suite, revived for Wrath of the Lich King. Does nothing without modules installed.
## Author: Sapu94, Bart39, Gnomezilla [Warmane-Icecrown(A)], BlueAo [Warmane], andrew6180, Yoshiyuka, DimaSheiko, and other contributors... ## Author: Sapu94, Bart39, Gnomezilla [Warmane-Icecrown(A)], BlueAo [Warmane], andrew6180, Yoshiyuka, DimaSheiko, and other contributors...
## Version: 2.3.34 ## Version: 2.3.39
## SavedVariables: TradeSkillMasterAppDB, AscensionTSMDB ## SavedVariables: TradeSkillMasterAppDB, AscensionTSMDB
## OptionalDeps: AccurateTime, Ace3, LibDataBroker-1.1, LibDBIcon-1.0, LibExtraTip, TipHelper, LibParse, LibCompress, LibGraph-2.0, SharedMedia, TheUndermineJournal, TheUndermineJournalGE ## OptionalDeps: AccurateTime, Ace3, LibDataBroker-1.1, LibDBIcon-1.0, LibExtraTip, TipHelper, LibParse, LibCompress, LibGraph-2.0, SharedMedia, TheUndermineJournal, TheUndermineJournalGE
## X-Embeds: AccurateTime, Ace3, LibDataBroker-1.1, LibDBIcon-1.0, LibExtraTip, TipHelper, LibParse, LibCompress, LibGraph-2.0 ## X-Embeds: AccurateTime, Ace3, LibDataBroker-1.1, LibDBIcon-1.0, LibExtraTip, TipHelper, LibParse, LibCompress, LibGraph-2.0

4
TradeSkillMaster_AuctionDB/TradeSkillMaster_AuctionDB.toc
Unescape View File

@ -2,10 +2,10 @@
## Title: |cff00ff00TradeSkillMaster_AuctionDB|r ## Title: |cff00ff00TradeSkillMaster_AuctionDB|r
## Notes: Stores auction house data and calculates market prices. ## Notes: Stores auction house data and calculates market prices.
## Author: Sapu94, Bart39 ## Author: Sapu94, Bart39
## Version: 2.3.34 ## Version: 2.3.39
## SavedVariables: AscensionTSM_AuctionDB ## SavedVariables: AscensionTSM_AuctionDB
## Dependency: TradeSkillMaster ## Dependency: TradeSkillMaster
## X-Curse-Packaged-Version: 2.3.34 ## X-Curse-Packaged-Version: 2.3.39
## X-Curse-Project-Name: TradeSkillMaster_AuctionDB ## X-Curse-Project-Name: TradeSkillMaster_AuctionDB
## X-Curse-Project-ID: tradeskillmaster_auctiondb ## X-Curse-Project-ID: tradeskillmaster_auctiondb
## X-Curse-Repository-ID: wow/tradeskillmaster_auctiondb/mainline ## X-Curse-Repository-ID: wow/tradeskillmaster_auctiondb/mainline

19
TradeSkillMaster_Auctioning/modules/GUI.lua
Unescape View File

@ -12,6 +12,17 @@ local GUI = TSM:NewModule("GUI", "AceEvent-3.0", "AceHook-3.0")
local AceGUI = LibStub("AceGUI-3.0") local AceGUI = LibStub("AceGUI-3.0")
local private = {} local private = {}
function private:SetSelectionButtonsEnabled(enabled)
if not private.selectionFrame then return end
local action = enabled and "Enable" or "Disable"
if private.selectionFrame.postBtn then
private.selectionFrame.postBtn[action](private.selectionFrame.postBtn)
end
if private.selectionFrame.cancelBtn then
private.selectionFrame.cancelBtn[action](private.selectionFrame.cancelBtn)
end
end
function private:CreateButtons(parent) function private:CreateButtons(parent)
local height = 24 local height = 24
local frame = CreateFrame("Frame", nil, parent) local frame = CreateFrame("Frame", nil, parent)
@ -62,6 +73,7 @@ function private:CreateButtons(parent)
if self.which == "stop" and self.isDone then if self.which == "stop" and self.isDone then
GUI:HideSelectionFrame() GUI:HideSelectionFrame()
private.selectionFrame:Show() private.selectionFrame:Show()
private:SetSelectionButtonsEnabled(true)
elseif frame:IsVisible() and private.OnAction then elseif frame:IsVisible() and private.OnAction then
private:OnAction(self.which) private:OnAction(self.which)
end end
@ -93,6 +105,7 @@ function private:CreateButtons(parent)
button:SetText(L["Skip"]) button:SetText(L["Skip"])
button.which = "skip" button.which = "skip"
button:SetScript("OnClick", OnClick) button:SetScript("OnClick", OnClick)
_G["TSMAuctioningCancelSkipButton"] = button
frame.skip = button frame.skip = button
local button = TSMAPI.GUI:CreateButton(frame, 18) local button = TSMAPI.GUI:CreateButton(frame, 18)
@ -752,7 +765,7 @@ function GUI:CreateSelectionFrame(parent)
frame.helpText = helpText frame.helpText = helpText
local btnWidth = floor((stContainer:GetWidth() - 10)/3) local btnWidth = floor((stContainer:GetWidth() - 10)/3)
local postBtn = TSMAPI.GUI:CreateButton(frame, 16) local postBtn = TSMAPI.GUI:CreateButton(frame, 16, "TSMAuctioningPostScanButton")
postBtn:SetPoint("BOTTOMLEFT", 5, 5) postBtn:SetPoint("BOTTOMLEFT", 5, 5)
postBtn:SetHeight(20) postBtn:SetHeight(20)
postBtn:SetWidth(btnWidth) postBtn:SetWidth(btnWidth)
@ -764,7 +777,7 @@ function GUI:CreateSelectionFrame(parent)
end) end)
frame.postBtn = postBtn frame.postBtn = postBtn
local cancelBtn = TSMAPI.GUI:CreateButton(frame, 16) local cancelBtn = TSMAPI.GUI:CreateButton(frame, 16, "TSMAuctioningCancelScanButton")
cancelBtn:SetPoint("BOTTOMLEFT", postBtn, "BOTTOMRIGHT", 5, 0) cancelBtn:SetPoint("BOTTOMLEFT", postBtn, "BOTTOMRIGHT", 5, 0)
cancelBtn:SetHeight(20) cancelBtn:SetHeight(20)
cancelBtn:SetWidth(btnWidth) cancelBtn:SetWidth(btnWidth)
@ -908,6 +921,7 @@ function GUI:CreateScanFrame(parent)
end end
function GUI:StartScan(frame) function GUI:StartScan(frame)
private:SetSelectionButtonsEnabled(false)
private.selectionFrame:Hide() private.selectionFrame:Hide()
private.scanFrame = private.scanFrame or GUI:CreateScanFrame(frame) private.scanFrame = private.scanFrame or GUI:CreateScanFrame(frame)
private.scanFrame:Show() private.scanFrame:Show()
@ -967,6 +981,7 @@ function GUI:ShowSelectionFrame(frame)
if private.scanFrame then private.scanFrame:Hide() end if private.scanFrame then private.scanFrame:Hide() end
private.selectionFrame = private.selectionFrame or GUI:CreateSelectionFrame(frame) private.selectionFrame = private.selectionFrame or GUI:CreateSelectionFrame(frame)
private.selectionFrame:Show() private.selectionFrame:Show()
private:SetSelectionButtonsEnabled(true)
TSMAPI.AuctionScan:StopScan(false) TSMAPI.AuctionScan:StopScan(false)
end end

10
TradeSkillMaster_Mailing/Modules/Inbox.lua
Unescape View File

@ -74,7 +74,7 @@ function Inbox:CreateTab(parent)
st:SetData({}) st:SetData({})
frame.st = st frame.st = st
local btn = TSMAPI.GUI:CreateButton(frame, 18, "TSMMailingSalesButton") local btn = TSMAPI.GUI:CreateButton(frame, 18, "TSMMailingOpenAllButton")
btn:SetPoint("BOTTOMLEFT", 5, 30) btn:SetPoint("BOTTOMLEFT", 5, 30)
btn:SetPoint("BOTTOMRIGHT", -5, 30) btn:SetPoint("BOTTOMRIGHT", -5, 30)
btn:SetHeight(20) btn:SetHeight(20)
@ -91,7 +91,7 @@ function Inbox:CreateTab(parent)
local btnWidth = (frame:GetWidth() - label:GetWidth() - 25) / 5 local btnWidth = (frame:GetWidth() - label:GetWidth() - 25) / 5
local btn = TSMAPI.GUI:CreateButton(frame, 18, "TSMMailingBuysButton") local btn = TSMAPI.GUI:CreateButton(frame, 18, "TSMMailingSalesButton")
btn:SetPoint("BOTTOMLEFT", label, "BOTTOMRIGHT", 5, 0) btn:SetPoint("BOTTOMLEFT", label, "BOTTOMRIGHT", 5, 0)
btn:SetWidth(btnWidth) btn:SetWidth(btnWidth)
btn:SetHeight(20) btn:SetHeight(20)
@ -99,7 +99,7 @@ function Inbox:CreateTab(parent)
btn:SetScript("OnClick", function() private:StartAutoLooting("sales") end) btn:SetScript("OnClick", function() private:StartAutoLooting("sales") end)
frame.salesBtn = btn frame.salesBtn = btn
local btn = TSMAPI.GUI:CreateButton(frame, 18, "TSMMailingCancelsButton") local btn = TSMAPI.GUI:CreateButton(frame, 18, "TSMMailingBuysButton")
btn:SetPoint("BOTTOMLEFT", frame.salesBtn, "BOTTOMRIGHT", 5, 0) btn:SetPoint("BOTTOMLEFT", frame.salesBtn, "BOTTOMRIGHT", 5, 0)
btn:SetWidth(btnWidth) btn:SetWidth(btnWidth)
btn:SetHeight(20) btn:SetHeight(20)
@ -107,7 +107,7 @@ function Inbox:CreateTab(parent)
btn:SetScript("OnClick", function() private:StartAutoLooting("buys") end) btn:SetScript("OnClick", function() private:StartAutoLooting("buys") end)
frame.buysBtn = btn frame.buysBtn = btn
local btn = TSMAPI.GUI:CreateButton(frame, 18, "TSMMailingExpiresButton") local btn = TSMAPI.GUI:CreateButton(frame, 18, "TSMMailingCancelsButton")
btn:SetPoint("BOTTOMLEFT", frame.buysBtn, "BOTTOMRIGHT", 5, 0) btn:SetPoint("BOTTOMLEFT", frame.buysBtn, "BOTTOMRIGHT", 5, 0)
btn:SetWidth(btnWidth) btn:SetWidth(btnWidth)
btn:SetHeight(20) btn:SetHeight(20)
@ -115,7 +115,7 @@ function Inbox:CreateTab(parent)
btn:SetScript("OnClick", function() private:StartAutoLooting("cancels") end) btn:SetScript("OnClick", function() private:StartAutoLooting("cancels") end)
frame.cancelsBtn = btn frame.cancelsBtn = btn
local btn = TSMAPI.GUI:CreateButton(frame, 18) local btn = TSMAPI.GUI:CreateButton(frame, 18, "TSMMailingExpiresButton")
btn:SetPoint("BOTTOMLEFT", frame.cancelsBtn, "BOTTOMRIGHT", 5, 0) btn:SetPoint("BOTTOMLEFT", frame.cancelsBtn, "BOTTOMRIGHT", 5, 0)
btn:SetWidth(btnWidth) btn:SetWidth(btnWidth)
btn:SetHeight(20) btn:SetHeight(20)

Write Preview
Loading…
Cancel
Save