diff --git a/Bagnon/Bagnon.toc b/Bagnon/Bagnon.toc index be4a1ef..744f118 100644 --- a/Bagnon/Bagnon.toc +++ b/Bagnon/Bagnon.toc @@ -1,4 +1,4 @@ -## Interface: 20400 +## Interface: 30300 ## Title: Bagnon ## Author: Tuller ## Notes: Single window displays for your inventory, bank, and keys diff --git a/Bagnon/components/bag.lua b/Bagnon/components/bag.lua index 69233b2..5c86c1b 100644 --- a/Bagnon/components/bag.lua +++ b/Bagnon/components/bag.lua @@ -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, diff --git a/Bagnon/components/brokerDisplay.lua b/Bagnon/components/brokerDisplay.lua index 5508e34..aa8382b 100644 --- a/Bagnon/components/brokerDisplay.lua +++ b/Bagnon/components/brokerDisplay.lua @@ -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) diff --git a/Bagnon/components/item.lua b/Bagnon/components/item.lua index f43a4b6..8bcf3e0 100644 --- a/Bagnon/components/item.lua +++ b/Bagnon/components/item.lua @@ -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() diff --git a/Bagnon/components/titleFrame.lua b/Bagnon/components/titleFrame.lua index 99a8588..83cc822 100644 --- a/Bagnon/components/titleFrame.lua +++ b/Bagnon/components/titleFrame.lua @@ -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) diff --git a/Bagnon/main.lua b/Bagnon/main.lua index 235c3a0..d5d9249 100644 --- a/Bagnon/main.lua +++ b/Bagnon/main.lua @@ -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 diff --git a/Bagnon/utility/itemEvents.lua b/Bagnon/utility/itemEvents.lua index 7d74b86..5f71fcd 100644 --- a/Bagnon/utility/itemEvents.lua +++ b/Bagnon/utility/itemEvents.lua @@ -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) diff --git a/Bagnon/utility/itemSlotInfo.lua b/Bagnon/utility/itemSlotInfo.lua index 48eb082..3d0a997 100644 --- a/Bagnon/utility/itemSlotInfo.lua +++ b/Bagnon/utility/itemSlotInfo.lua @@ -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) diff --git a/Bagnon_Config/Bagnon_Config.toc b/Bagnon_Config/Bagnon_Config.toc index 11fb4a1..082a76c 100644 --- a/Bagnon_Config/Bagnon_Config.toc +++ b/Bagnon_Config/Bagnon_Config.toc @@ -1,4 +1,4 @@ -## Interface: 20400 +## Interface: 30300 ## Title: Bagnon Config ## Notes: GUI based configuration for Bagnon ## Author: Tuller diff --git a/Bagnon_Config/panels/frameOptions.lua b/Bagnon_Config/panels/frameOptions.lua index fd83a6d..f70fbe2 100644 --- a/Bagnon_Config/panels/frameOptions.lua +++ b/Bagnon_Config/panels/frameOptions.lua @@ -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 diff --git a/Bagnon_Config/panels/general.lua b/Bagnon_Config/panels/general.lua index a7ec75b..4891b67 100644 --- a/Bagnon_Config/panels/general.lua +++ b/Bagnon_Config/panels/general.lua @@ -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) diff --git a/Bagnon_Config/widgets/dropdown.lua b/Bagnon_Config/widgets/dropdown.lua index 2108125..e70ce02 100644 --- a/Bagnon_Config/widgets/dropdown.lua +++ b/Bagnon_Config/widgets/dropdown.lua @@ -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) diff --git a/Bagnon_Config/widgets/slider.lua b/Bagnon_Config/widgets/slider.lua index 803cddf..c68bc75 100644 --- a/Bagnon_Config/widgets/slider.lua +++ b/Bagnon_Config/widgets/slider.lua @@ -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') diff --git a/Bagnon_Forever/Bagnon_Forever.toc b/Bagnon_Forever/Bagnon_Forever.toc index bb1e98a..74fd28f 100644 --- a/Bagnon_Forever/Bagnon_Forever.toc +++ b/Bagnon_Forever/Bagnon_Forever.toc @@ -1,4 +1,4 @@ -## Interface: 20400 +## Interface: 30300 ## Title: Bagnon Forever ## Notes: Stores inventory information about your characters ## Notes-zhTW: 儲存角色背包和銀行的物品資訊 diff --git a/Bagnon_Forever/ui.lua b/Bagnon_Forever/ui.lua index 2728437..9b56f33 100644 --- a/Bagnon_Forever/ui.lua +++ b/Bagnon_Forever/ui.lua @@ -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 diff --git a/Bagnon_GuildBank/Bagnon_GuildBank.toc b/Bagnon_GuildBank/Bagnon_GuildBank.toc index d013fab..bb9aee9 100644 --- a/Bagnon_GuildBank/Bagnon_GuildBank.toc +++ b/Bagnon_GuildBank/Bagnon_GuildBank.toc @@ -1,4 +1,4 @@ -## Interface: 20400 +## Interface: 30300 ## Title: Bagnon Guild Bank ## Author: Tuller ## Notes: Single window display for your guild bank diff --git a/Bagnon_GuildBank/components/item.lua b/Bagnon_GuildBank/components/item.lua index 94c5776..a00de94 100644 --- a/Bagnon_GuildBank/components/item.lua +++ b/Bagnon_GuildBank/components/item.lua @@ -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 diff --git a/Bagnon_Tooltips/Bagnon_Tooltips.toc b/Bagnon_Tooltips/Bagnon_Tooltips.toc index 0a90d08..becf798 100644 --- a/Bagnon_Tooltips/Bagnon_Tooltips.toc +++ b/Bagnon_Tooltips/Bagnon_Tooltips.toc @@ -1,4 +1,4 @@ -## Interface: 20400 +## Interface: 30300 ## Title: Bagnon Tooltips ## Author: Tuller ## Notes: Tooltips for telling who has what diff --git a/Bagnon_VoidStorage/Bagnon_VoidStorage.toc b/Bagnon_VoidStorage/Bagnon_VoidStorage.toc index 8657034..1abd592 100644 --- a/Bagnon_VoidStorage/Bagnon_VoidStorage.toc +++ b/Bagnon_VoidStorage/Bagnon_VoidStorage.toc @@ -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