Reverts for 3.3.5
This commit is contained in:
parent
37d072dcc4
commit
27a08f8981
19 changed files with 29 additions and 38 deletions
|
|
@ -1,4 +1,4 @@
|
|||
## Interface: 20400
|
||||
## Interface: 30300
|
||||
## Title: Bagnon
|
||||
## Author: Tuller
|
||||
## Notes: Single window displays for your inventory, bank, and keys
|
||||
|
|
|
|||
|
|
@ -390,7 +390,7 @@ function Bag:PurchaseSlot()
|
|||
end,
|
||||
|
||||
OnShow = function(self)
|
||||
MoneyFrame_Update(this:GetName() .. 'MoneyFrame', GetBankSlotCost(GetNumBankSlots()))
|
||||
MoneyFrame_Update(self:GetName() .. 'MoneyFrame', GetBankSlotCost(GetNumBankSlots()))
|
||||
end,
|
||||
|
||||
hasMoneyFrame = 1,
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ end
|
|||
|
||||
function BrokerDisplay:AddText()
|
||||
local text = self:CreateFontString()
|
||||
text:SetFontObject('GameFontNormal')
|
||||
text:SetFontObject('GameFontNormalRight')
|
||||
text:SetJustifyH('LEFT')
|
||||
|
||||
return text
|
||||
|
|
@ -69,7 +69,7 @@ end
|
|||
function BrokerDisplay:CreateLeftButton()
|
||||
local b = CreateFrame('Button', nil, self)
|
||||
|
||||
b:SetTextFontObject('GameFontNormal')
|
||||
b:SetNormalFontObject('GameFontNormal')
|
||||
b:SetHighlightFontObject('GameFontHighlight')
|
||||
b:SetText('<')
|
||||
b:SetWidth(b:GetTextWidth() + 4)
|
||||
|
|
@ -85,7 +85,7 @@ function BrokerDisplay:CreateRightButton()
|
|||
b:SetWidth(ICON_SIZE)
|
||||
b:SetHeight(ICON_SIZE)
|
||||
|
||||
b:SetTextFontObject('GameFontNormal')
|
||||
b:SetNormalFontObject('GameFontNormal')
|
||||
b:SetHighlightFontObject('GameFontHighlight')
|
||||
b:SetText('>')
|
||||
b:SetWidth(b:GetTextWidth() + 2)
|
||||
|
|
|
|||
|
|
@ -559,7 +559,7 @@ end
|
|||
|
||||
--returns true if the item is a quest item or not
|
||||
--in 3.3, includes a second return to determine if the item is a quest starter for a quest the player lacks
|
||||
local QUEST_ITEM_SEARCH = string.format('t:%s|%s', select(11, GetAuctionItemClasses()), 'quest')
|
||||
local QUEST_ITEM_SEARCH = string.format('t:%s|%s', select(12, GetAuctionItemClasses()), 'quest')
|
||||
|
||||
if hasBlizzQuestHighlight() then
|
||||
function ItemSlot:IsQuestItem()
|
||||
|
|
|
|||
|
|
@ -18,8 +18,8 @@ function TitleFrame:New(frameID, parent)
|
|||
local b = self:Bind(CreateFrame('Button', nil, parent))
|
||||
b:SetToplevel(true)
|
||||
|
||||
b:SetTextFontObject('GameFontNormal')
|
||||
b:SetHighlightFontObject('GameFontHighlight')
|
||||
b:SetNormalFontObject('GameFontNormalLeft')
|
||||
b:SetHighlightFontObject('GameFontHighlightLeft')
|
||||
b:RegisterForClicks('anyUp')
|
||||
|
||||
b:SetScript('OnShow', b.OnShow)
|
||||
|
|
|
|||
|
|
@ -209,15 +209,11 @@ function Bagnon:HookBagClickEvents()
|
|||
local oOpenAllBags = OpenAllBags
|
||||
OpenAllBags = function(force)
|
||||
local opened = false
|
||||
-- force does not exist?
|
||||
--[[
|
||||
if force then
|
||||
opened = self:FrameControlsBag('inventory', BACKPACK_CONTAINER) and self:ShowFrame('inventory')
|
||||
else
|
||||
opened = self:FrameControlsBag('inventory', BACKPACK_CONTAINER) and self:ToggleFrame('inventory')
|
||||
end
|
||||
]]
|
||||
opened = self:FrameControlsBag('inventory', BACKPACK_CONTAINER) and self:ShowFrame('inventory')
|
||||
|
||||
if not opened then
|
||||
oOpenAllBags(force)
|
||||
|
|
@ -405,7 +401,7 @@ end
|
|||
|
||||
function Bagnon:ShowOptions()
|
||||
if LoadAddOn('Bagnon_Config') then
|
||||
InterfaceOptionsFrame_OpenToFrame(self.GeneralOptions)
|
||||
InterfaceOptionsFrame_OpenToCategory(self.GeneralOptions)
|
||||
return true
|
||||
end
|
||||
return false
|
||||
|
|
|
|||
|
|
@ -116,7 +116,6 @@ function BagEvents:UpdateItem(bag, slot)
|
|||
local prevCount = data[2]
|
||||
|
||||
local texture, count, locked, quality, readable, lootable, link = GetContainerItemInfo(bag, slot)
|
||||
link = GetContainerItemLink(bag, slot)
|
||||
local start, duration, enable = GetContainerItemCooldown(bag, slot)
|
||||
local onCooldown = (start > 0 and duration > 0 and enable > 0)
|
||||
|
||||
|
|
|
|||
|
|
@ -30,11 +30,7 @@ function ItemSlotInfo:IsLocked(player, bag, slot)
|
|||
if self:IsCached(player, bag, slot) then
|
||||
return false
|
||||
end
|
||||
|
||||
local texture, count, locked, quality, readable, lootable, link = GetContainerItemInfo(bag, slot)
|
||||
link = GetContainerItemLink(bag, slot)
|
||||
--return (select(3, GetContainerItemInfo(bag, slot)))
|
||||
return locked, quality, readable, lootable, link
|
||||
return (select(3, GetContainerItemInfo(bag, slot)))
|
||||
end
|
||||
|
||||
function ItemSlotInfo:IsCached(player, bag, slot)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
## Interface: 20400
|
||||
## Interface: 30300
|
||||
## Title: Bagnon Config
|
||||
## Notes: GUI based configuration for Bagnon
|
||||
## Author: Tuller
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ end
|
|||
|
||||
function FrameOptions:ShowFrame(frameID)
|
||||
self:SetFrameID(frameID)
|
||||
InterfaceOptionsFrame_OpenToFrame(self)
|
||||
InterfaceOptionsFrame_OpenToCategory(self)
|
||||
end
|
||||
|
||||
|
||||
|
|
@ -278,12 +278,12 @@ function FrameOptions:CreateFrameSelector()
|
|||
dropdown.titleText:Hide()
|
||||
|
||||
dropdown.Initialize = function(self)
|
||||
dropdown:AddItem(L.Inventory, 'inventory')
|
||||
dropdown:AddItem(L.Bank, 'bank')
|
||||
dropdown:AddItem(L.KeyRing, 'keys')
|
||||
self:AddItem(L.Inventory, 'inventory')
|
||||
self:AddItem(L.Bank, 'bank')
|
||||
self:AddItem(L.KeyRing, 'keys')
|
||||
|
||||
if IsAddOnLoaded('Bagnon_GuildBank') then
|
||||
dropdown:AddItem(L.GuildBank, 'guildbank')
|
||||
self:AddItem(L.GuildBank, 'guildbank')
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ local L = LibStub('AceLocale-3.0'):GetLocale('Bagnon-Config')
|
|||
--a hack panel, this is designed to force open to the general options panel when clicked
|
||||
local BagnonOptions = Bagnon.OptionsPanel:New('Bagnon', nil, 'Bagnon')
|
||||
BagnonOptions:SetScript('OnShow', function(self)
|
||||
InterfaceOptionsFrame_OpenToFrame(Bagnon.GeneralOptions)
|
||||
InterfaceOptionsFrame_OpenToCategory(Bagnon.GeneralOptions)
|
||||
self:Hide()
|
||||
end)
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ end
|
|||
--[[ Frame Evnets ]]--
|
||||
|
||||
function OptionsDropdown:OnShow()
|
||||
UIDropDownMenu_SetWidth(self.width, self)
|
||||
UIDropDownMenu_SetWidth(self, self.width)
|
||||
UIDropDownMenu_Initialize(self, self.Initialize)
|
||||
UIDropDownMenu_SetSelectedValue(self, self:GetSavedValue())
|
||||
end
|
||||
|
|
@ -46,9 +46,9 @@ end
|
|||
|
||||
--[[ Item Adding ]]--
|
||||
|
||||
local function item_OnClick(self)
|
||||
self:SetSavedValue(this.value)
|
||||
UIDropDownMenu_SetSelectedValue(self, this.value)
|
||||
local function item_OnClick(self, dropdown)
|
||||
dropdown:SetSavedValue(self.value)
|
||||
UIDropDownMenu_SetSelectedValue(dropdown, self.value)
|
||||
end
|
||||
|
||||
function OptionsDropdown:AddItem(name, value)
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ function OptionsSlider:New(name, parent, low, high, step)
|
|||
f:EnableMouseWheel(true)
|
||||
|
||||
_G[f:GetName() .. 'Text']:SetText(name)
|
||||
_G[f:GetName() .. 'Text']:SetFontObject('GameFontNormal')
|
||||
_G[f:GetName() .. 'Text']:SetFontObject('GameFontNormalLeft')
|
||||
_G[f:GetName() .. 'Text']:ClearAllPoints()
|
||||
_G[f:GetName() .. 'Text']:SetPoint('BOTTOMLEFT', f, 'TOPLEFT')
|
||||
-- _G[f:GetName() .. 'Text']:SetJustifyH('LEFT')
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
## Interface: 20400
|
||||
## Interface: 30300
|
||||
## Title: Bagnon Forever
|
||||
## Notes: Stores inventory information about your characters
|
||||
## Notes-zhTW: 儲存角色背包和銀行的物品資訊
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ local function AddItem(text, value, func, level, arg1, arg2)
|
|||
UIDropDownMenu_AddButton(info, level)
|
||||
end
|
||||
|
||||
local function CharSelect_OnClick(player, delete)
|
||||
local function CharSelect_OnClick(self, player, delete)
|
||||
local newPlayer
|
||||
if delete then
|
||||
--remove the selected player
|
||||
|
|
@ -59,7 +59,7 @@ local function CharSelect_OnClick(player, delete)
|
|||
end
|
||||
|
||||
--populate the list, add a delete button to all characters that aren't the current player
|
||||
local function CharSelect_Initialize(level)
|
||||
local function CharSelect_Initialize(self, level)
|
||||
local playerList = BagnonDB:GetPlayerList()
|
||||
local level = level or 1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
## Interface: 20400
|
||||
## Interface: 30300
|
||||
## Title: Bagnon Guild Bank
|
||||
## Author: Tuller
|
||||
## Notes: Single window display for your guild bank
|
||||
|
|
|
|||
|
|
@ -426,7 +426,7 @@ function ItemSlot:GetHighlightAlpha()
|
|||
return Bagnon.Settings:GetHighlightOpacity()
|
||||
end
|
||||
|
||||
local QUEST_ITEM_SEARCH = string.format('t:%s|%s', select(11, GetAuctionItemClasses()), 'quest')
|
||||
local QUEST_ITEM_SEARCH = string.format('t:%s|%s', select(12, GetAuctionItemClasses()), 'quest')
|
||||
function ItemSlot:IsQuestItem()
|
||||
local itemLink = self:GetItem()
|
||||
if not itemLink then
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
## Interface: 20400
|
||||
## Interface: 30300
|
||||
## Title: Bagnon Tooltips
|
||||
## Author: Tuller
|
||||
## Notes: Tooltips for telling who has what
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
## Interface: 20400
|
||||
## Interface: 30300
|
||||
## Title: Bagnon Void Storage
|
||||
## Author: Jaliborc (João Cardoso)
|
||||
## Notes: Single window display for your void storage
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue