Bump interface version

- Add MyBank sorting
- Fix some tainting issue

Bindings.xml

@@ -1,11 +1,11 @@
 <Bindings>
-	<Binding name="MYINVENTORY" header="MYBAGSHEADER">
+	<Binding name="MYINVENTORY" header="MYBAGSHEADER" category="ADDONS">
 		if MyInventory then MyInventory:Toggle() end
 	</Binding>
-	<Binding name="MYBANK">
+	<Binding name="MYBANK" header="MYBAGSHEADER" category="ADDONS">
 		if MyBank then MyBank:Toggle() end
 	</Binding>
-	<Binding name="MYEQUIPMENT">
+	<Binding name="MYEQUIPMENT" header="MYBAGSHEADER" category="ADDONS">
 		if MyEquipment then MyEquipment:Toggle() end
 	</Binding>
 </Bindings>

Locals/enUS.lua

@@ -1,18 +1,21 @@
 local L = LibStub("AceLocale-3.0"):NewLocale("MyBags", "enUS", true)
 
-if not L then return end
+if not L then
+  return
+end
 
 -- Global locales
 L["ACE_TEXT_OF"] = "of";
 L["CHARACTER_DELIMITOR"] = " of ";
 L["SplitString must be passed a string as the first argument"] = "SplitString must be passed a string as the first argument";
 
---KEYBINDINGS
+-- KEYBINDINGS
 L["BINDING_HEADER_MYBAGSHEADER"] = "My Bags"
 L["BINDING_NAME_MYINVENTORY"]	= "Toggle MyInventory"
 L["BINDING_NAME_MYBANK"] = "Toggle MyBank"
 L["BINDING_NAME_MYEQUIPMENT"] = "Toggle MyEquipment"
 
+-- Bag types
 L["ACEG_TEXT_AMMO"] = "Ammo";
 L["ACEG_TEXT_QUIVER"] = "Quiver";
 L["ACEG_TEXT_SOUL"] = "Soul Bag";
@@ -21,6 +24,7 @@ L["ACEG_TEXT_ENGINEER"] = "Engineering Bag";
 L["ACEG_TEXT_GEM"] = "Gem Bag";
 L["ACEG_TEXT_HERB"] = "Herb Bag";
 L["ACEG_TEXT_MINING"] = "Mining Bag";
+
 L["ACEG_TEXT_NOW_SET_TO"] = "is now set to";
 L["ACEG_TEXT_DEFAULT"] = "default";
 L["ACEG_DISPLAY_OPTION"] = "[|cfff5f530%s|r]";
@@ -32,6 +36,12 @@ L["MYBAGS_TITLE0"] = ""
 L["MYBAGS_TITLE1"] = "%s's "
 L["MYBAGS_TITLE2"] = "%s of %s's "
 
+-- MYBANK_NAME = "MyBank"
+-- MYBANK_DESCRIPTION = "All in one bank mod"
+L["MYBANKFRAME_TITLE"] = "Bank"
+L["MYINVENTORYFRAME_TITLE"] = "Inventory"
+L["MYEQUIPMENTFRAME_TITLE"] = "Equipment"
+
 L["MYBAGS_SLOTS_FREE"]  = "%d/%d Slots Free";
 L["MYBAGS_SLOTS_USED"]  = "%d/%d Slots Used";
 

MyBags.toc

@@ -1,9 +1,8 @@
-## Interface: 50400
+## Interface: 70000
 ## Author: Ramble (modified by Isharra) (updated by thegabbert) (converted to Ace3 by Takika)
-## Version: 51
 ## Title: MyBags |cff007FFF -Ace3-|r
 ## Notes: Complete Replacement for Inventory and Bank Bags.
-## OptionalDeps: MyBagsCache, DataStore_Containers
+## OptionalDeps: MyBagsCache, DataStore, DataStore_Containers, DataStore_Characters
 ## SavedVariables: MyInventoryDB, MyBankDB, MyEquipmentDB
 
 Embeds.xml
@@ -14,4 +13,3 @@ MyBagsCore\MyBags.xml
 MyInventory\MyInventory.xml
 MyBank\MyBank.xml
 MyEquipment\MyEquipment.xml
-

MyBagsCore/Locals/Locals.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Ui xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.blizzard.com/wow/ui/" xsi:schemaLocation="http://www.blizzard.com/wow/ui/FrameXML\UI.xsd">
-<Include file="enUS.lua"/>
-</Ui>

MyBagsCore/Locals/enUS.lua

@@ -1,36 +0,0 @@
-local L = LibStub("AceLocale-3.0"):NewLocale("MyBagsCore", "enUS", true)
-
-if not L then 
-	return
-end
-
-L["ACE_TEXT_OF"] = "of";
-L["CHARACTER_DELIMITOR"] = " of ";
-L["ACEG_TEXT_AMMO"] = "Ammo";
-L["ACEG_TEXT_QUIVER"] = "Quiver";
-L["ACEG_TEXT_SOUL"] = "Soul Bag";
-L["ACEG_TEXT_ENCHANT"] = "Enchanting Bag";
-L["ACEG_TEXT_ENGINEER"] = "Engineering Bag";
-L["ACEG_TEXT_GEM"] = "Gem Bag";
-L["ACEG_TEXT_HERB"] = "Herb Bag";
-L["ACEG_TEXT_MINING"] = "Mining Bag";
-L["ACEG_TEXT_NOW_SET_TO"] = "is now set to";
-L["ACEG_TEXT_DEFAULT"] = "default";
-L["ACEG_DISPLAY_OPTION"] = "[|cfff5f530%s|r]";
-L["ACE_CMD_REPORT_NO_VAL"] = "|cffc7c7c7no value|r"
-L["ACE_CMD_RESULT"]	= "|cffffff78%s:|r %s"
-
---MyInventory Title
-L["MYBAGS_TITLE0"] = ""
-L["MYBAGS_TITLE1"] = "%s's "
-L["MYBAGS_TITLE2"] = "%s of %s's "
-
-L["MYBAGS_SLOTS_FREE"]  = "%d/%d Slots Free";
-L["MYBAGS_SLOTS_USED"]  = "%d/%d Slots Used";
--- SLASHCOMMANDS
-
---KEYBINDINGS
-L["BINDING_HEADER_MYBAGSHEADER"] = "My Bags"
-L["BINDING_NAME_MYINVENTORY"]	= "My Inventory Toggle"
-L["BINDING_NAME_MYBANK"] = "My Bank Toggle"
-L["BINDING_NAME_MYEQUIPMENT"] = "My Equipment Toggle"

MyBagsCore/MyBags.xml

@@ -2,7 +2,7 @@
 	 xsi:schemaLocation="http://www.blizzard.com/wow/ui/FrameXML/UI.xsd">
 	<Script file="MyBags.lua"/>
 	<!-- Templates -->
-	<Button name="MyBagsItemButtonTemplate" inherits="ContainerFrameItemButtonTemplate" virtual="true">
+	<Button name="MyBagsItemButtonTemplate" inherits="ContainerFrameItemButtonTemplate" virtual="true" hidden="true">
 		<Frames>
 			<Cooldown name="$parentCooldown" inherits="CooldownFrameTemplate"/>
 		</Frames>
@@ -366,6 +366,22 @@
 			<Frame name="$parentBag4" inherits="MyBagsContainerTemplate" id="4"/>
 			<Frame name="$parentButtons" inherits="MyBagsButtonBarTemplate"/>
 			<Frame name="$parentCharSelect" inherits="MyBagsCharSelectTemplate"/>
+			<Button name="$parentSortButton">
+                <Size x="28" y="26"/>
+                <NormalTexture atlas="bags-button-autosort-up"/>
+                <PushedTexture atlas="bags-button-autosort-down"/>
+                <HighlightTexture file="Interface\Buttons\ButtonHilight-Square" alphaMode="ADD">
+                    <Size x="24" y="23"/>
+                    <Anchors>
+                        <Anchor point="CENTER" x="0" y="0"/>
+                    </Anchors>
+                </HighlightTexture>
+                <Scripts>
+                    <OnEnter/>
+                    <OnLeave/>
+                    <OnClick/>
+                </Scripts>
+			</Button>
 			<Frame name="$parentTokenFrame">
 				<Size>
 					<AbsDimension x="183" y="32"/>

MyBank/Locals/Locals.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Ui xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.blizzard.com/wow/ui/" xsi:schemaLocation="http://www.blizzard.com/wow/ui/FrameXML\UI.xsd">
-<Include file="enUS.lua"/>
-</Ui>

MyBank/Locals/enUS.lua

@@ -1,34 +0,0 @@
--- Version : English - Ramble 
-
-MYBANK_NAME = "MyBank"
-MYBANK_DESCRIPTION = "All in one bank mod"
-
-MYBANKFRAME_TITLE = "Bank"
-
--- SLASHCOMMANDS
--- MYBANK_COMMANDS    = {"/mybank", "/mb"}
---[[ MYBANK_CMD_OPTIONS = {
-	MYBAGS_CMD_OPT_REPLACE,			-- done
-	MYBAGS_CMD_OPT_FREEZE,			-- done
-	MYBAGS_CMD_OPT_LOCK,				-- done
-	MYBAGS_CMD_OPT_COLUMNS,			-- done
-	MYBAGS_CMD_OPT_BAG,					-- done
-	MYBAGS_CMD_OPT_HIGHLIGHT,		-- done
-	MYBAGS_CMD_OPT_NOESC,				-- done
-	MYBAGS_CMD_OPT_TITLE,				-- done
-	MYBAGS_CMD_OPT_CASH,				-- done
-	MYBAGS_CMD_OPT_BUTTONS,			-- done
-	MYBAGS_CMD_OPT_AIOI,				-- done
-	MYBAGS_CMD_OPT_REVERSE,			-- done
-	MYBAGS_CMD_OPT_BORDER,			-- done
-	MYBAGS_CMD_OPT_PLAYERSEL,		-- done
-	MYBAGS_CMD_OPT_COUNT,				-- done
-	MYBAGS_CMD_OPT_SCALE,				-- done
-	MYBAGS_CMD_OPT_STRATA,			-- done
-	MYBAGS_CMD_OPT_ANCHOR,			-- done
-	MYBAGS_CMD_OPT_TOGGLE,			-- done
-	MYBAGS_CMD_RESET,						-- done
-	MYBAGS_CMD_OPT_GRAPHICS,		-- skip
-	MYBAGS_CMD_OPT_SLOTCOLOR,		-- skip
-}
-]]

MyBank/MyBank.lua

@@ -2,10 +2,11 @@ local MYBANK_DEFAULT_OPTIONS = {
 	["Columns"]       = 14,
 	["Replace"]       = true,
 	["Bag"]           = "bar",
+	["BagSort"]       = true,
 	["Graphics"]      = "art",
 	["Count"]         = "free",
 	["HlItems"]       = true,
-	["Sort"]					= "realm",
+	["Sort"]          = "realm",
 	["Search"]				= true,
 	["HlBags"]        = true,
 	["Freeze"]        = "sticky",
@@ -136,6 +137,17 @@ function MyBank:OnInitialize()
 					MyBank:SetBagDisplay(val)
 				end,
 			},
+			bagsort = {
+			    type = "toggle",
+			    name = "BagSort",
+			    desc = "Toggle bag sort button",
+			    get = function(info)
+			        return MyBank.IsSet("BagSort")
+			    end,
+			    set = function(info, val)
+			        MyBank:SetBagSort()
+			    end,
+			},
 			back = {
 				type = "select",
 				name = "Background",
@@ -389,7 +401,7 @@ function MyBank:OnInitialize()
 end
 
 function MyBank:OnEnable()
---	MyBagsCore:Enable(self);
+--    MyBagsCore:Enable(self);
 	MyBankFrameBank.maxIndex = 28
 	MyBankFrameBank:SetID(BANK_CONTAINER)
 	MyBankFrameBag0:SetID(5)
@@ -399,25 +411,29 @@ function MyBank:OnEnable()
 	MyBankFrameBag4:SetID(9)
 	MyBankFrameBag5:SetID(10)
 	MyBankFrameBag6:SetID(11)
+
 	if self.GetOpt("Replace") then
 		BankFrame:UnregisterEvent("BANKFRAME_OPENED")
 		BankFrame:UnregisterEvent("BANKFRAME_CLOSED")
-		_G["BankFrame"] = self.frame
 	end
+
+    self:RegisterEvent("BANKFRAME_OPENED")
+
 	MyBankFramePortrait:SetTexture("Interface\\Addons\\MyBags\\Skin\\MyBankPortrait")
 	StaticPopupDialogs["PURCHASE_BANKBAG"] = {
+		preferredIndex = STATICPOPUPS_NUMDIALOGS,
 		text = TEXT(CONFIRM_BUY_BANK_SLOT),
 		button1 = TEXT(YES),
 		button2 = TEXT(NO),
-		OnAccept = function()
+		OnAccept = function(self)
 			if CT_oldPurchaseSlot then
 				CT_oldPurchaseSlot()
 			else
 				PurchaseSlot()
 			end;
 		end,
-		OnShow = function()
+		OnShow = function(self)
-			MoneyFrame_Update(this:GetName().."MoneyFrame", GetBankSlotCost());
+			MoneyFrame_Update(self:GetName() .. "MoneyFrame", GetBankSlotCost());
 		end,
 		showAlert = 1,
 		hasMoneyFrame = 1,
@@ -488,10 +504,14 @@ end
 
 function MyBank:RegisterEvents()
 	MB_Core:RegisterEvents(self)
-	self:RegisterEvent("BANKFRAME_OPENED")
-	self:RegisterEvent("BANKFRAME_CLOSED")
 	self:RegisterEvent("PLAYERBANKSLOTS_CHANGED",   "LayoutFrameOnEvent")
 	self:RegisterEvent("PLAYERBANKBAGSLOTS_CHANGED","LayoutFrameOnEvent")
+    self:RegisterEvent("BANKFRAME_CLOSED")
+end
+
+function MyBank:UnregisterEvents()
+    MB_Core:UnregisterEvents(self)
+    self:RegisterEvent("BANKFRAME_OPENED")
 end
 
 function MyBank:HookFunctions()
@@ -547,6 +567,7 @@ function MyBank:BAG_UPDATE(event, bag)
 end
 
 function MyBank:BANKFRAME_OPENED()
+    self:RegisterEvents()
 	MyBank.atBank = true
 	SetPortraitTexture(MyBankFramePortrait, "npc")
 	if self.Freeze == "always" or (self.Freeze == "sticky" and self.frame:IsVisible()) then
@@ -572,6 +593,7 @@ function MyBank:BANKFRAME_CLOSED()
 		self.holdOpen = false
 		if self.isLive then self:LayoutFrame() end
 	end
+    self:UnregisterEvents()
 end
 
 function MyBank:GetInfoFunc()
@@ -701,3 +723,8 @@ function MyBank:SetReplace()
 		BankFrame:RegisterEvent("BANKFRAME_CLOSED")
 	end
 end
+
+function MyBank:SortBags()
+  PlaySound("UI_BagSorting_01")
+  SortBankBags()
+end

MyBank/MyBank.xml

@@ -1,7 +1,6 @@
 <Ui xmlns="http://www.blizzard.com/wow/ui/"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.blizzard.com/wow/ui/FrameXML/UI.xsd">
-	<Include file="Locals\Locals.xml"/>
 	<Script file="MyBank.lua"/>
 	<Frame name="MyBagsBankContainerTemplate" inherits="MyBagsContainerTemplate" ID="BANK_CONTAINER" virtual="true">
 	</Frame>

MyEquipment/MyEquipment.lua

@@ -552,7 +552,7 @@ function MyEquipment:LayoutEquipmentFrame(self)
 		if self.isLive then
 			local start,duration, enable = GetInventoryItemCooldown("player", slot)
 			local cooldown = _G[itemButton:GetName() .. "Cooldown"]
-			CooldownFrame_SetTimer(cooldown,start,duration,enable)
+			CooldownFrame_Set(cooldown,start,duration,enable)
 			if duration>0 and enable==0 then
 				SetItemButtonTextureVertexColor(itemButton, 0.4,0.4,0.4)
 			end

MyEquipment/MyEquipment.xml

@@ -1,7 +1,6 @@
 <Ui xmlns="http://www.blizzard.com/wow/ui/"
 	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	 xsi:schemaLocation="http://www.blizzard.com/wow/ui/FrameXML/UI.xsd">
-	<Script file="locals.lua" />
 	<Script file="MyEquipment.lua" />
 
 	<!-- Templates -->

MyEquipment/locals.lua

@@ -1,29 +0,0 @@
--- Version : English - Isharra
-
-MYEQUIPMENT_NAME = "MyEquipment"
-MYEQUIPMENT_DESCRIPTION = "Equipped items display"
-
-MYEQUIPMENTFRAME_TITLE = "Equipment"
-
--- SLASHCOMMANDS
--- /me already taken by emote commands
--- MYEQUIPMENT_COMMANDS    = {"/myequipment", "/myequip", "/mq"}
---[[ MYEQUIPMENT_CMD_OPTIONS = {
-	MYBAGS_CMD_OPT_LOCK,				-- done
-	MYBAGS_CMD_OPT_COLUMNS,			-- done
-	MYBAGS_CMD_OPT_NOESC,				-- done
-	MYBAGS_CMD_OPT_TITLE,				-- done
-	MYBAGS_CMD_OPT_CASH,				-- done
-	MYBAGS_CMD_OPT_BUTTONS,			-- done
-	MYBAGS_CMD_OPT_AIOI,				-- done
-	MYBAGS_CMD_OPT_BORDER,			-- done
-	MYBAGS_CMD_OPT_PLAYERSEL,		-- done
-	MYBAGS_CMD_OPT_SCALE,				-- done
-	MYBAGS_CMD_OPT_STRATA,			-- done
-	MYBAGS_CMD_OPT_ANCHOR,			-- done
-	MYBAGS_CMD_OPT_TOGGLE,			-- done
-	MYBAGS_CMD_RESET,						-- done
-	MYBAGS_CMD_OPT_GRAPHICS,		-- skip
-	MYBAGS_CMD_OPT_SLOTCOLOR,		-- skip
-}
-]]

MyInventory/MyInventory.lua

@@ -2,12 +2,13 @@ local MYINVENTORY_DEFAULT_OPTIONS = {
 	["Columns"]       = 12,
 	["Replace"]       = true,
 	["Bag"]           = "bar",
+	["BagSort"]       = true,
 	["Graphics"]      = "art",
 	["Count"]         = "free",
 	["HlItems"]       = true,
-	["Sort"]					= "realm",
+	["Sort"]          = "realm",
-	["Search"]				= true,
+	["Search"]        = true,
-	["Token"]					= true,
+	["Token"]         = true,
 	["HlBags"]        = true,
 	["Freeze"]        = "sticky",
 	["NoEsc"]         = false,
@@ -55,6 +56,7 @@ function MyInventory:OnInitialize()
 	self.anchorOffsetX = -5
 	self.anchorOffsetY = 100
 	self.isBank = false
+	self.version = MB_Core:GetCoreVersion()
 	self.db = LibStub("AceDB-3.0"):New("MyInventoryDB")
 	local prof = self.db:GetCurrentProfile()
 	if self.db.profiles[prof] and self.db.profiles[prof]["Columns"] and self.db.profiles[prof]["Columns"] > 0 then
@@ -136,6 +138,17 @@ function MyInventory:OnInitialize()
 					MyInventory:SetBagDisplay(val)
 				end
 			},
+			bagsort = {
+			    type = "toggle",
+			    name = "BagSort",
+			    desc = "Toggle bag sort button",
+			    get = function(info)
+			        return MyInventory.IsSet("BagSort")
+			    end,
+			    set = function(info, val)
+			        MyInventory:SetBagSort()
+			    end,
+			},
 			back = {
 				type = "select",
 				name = "Background",
@@ -433,7 +446,7 @@ function MyInventory:LoadDropDown()
 	_G["this"] = dropDownButton
 	UIDropDownMenu_Initialize(dropDown, self.UserDropDown_Initialize)
 	UIDropDownMenu_SetSelectedValue(dropDown, self:GetCurrentPlayer())
---	UIDropDownMenu_SetSelectedValue(dropDown, self.Player)
+--    UIDropDownMenu_SetSelectedValue(dropDown, self.Player)
 	UIDropDownMenu_SetWidth(dropDown, 140)
 	_G["this"] = last_this
 end

MyInventory/MyInventory.xml

@@ -1,7 +1,6 @@
 <Ui xmlns="http://www.blizzard.com/wow/ui/"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.blizzard.com/wow/ui/FrameXML/UI.xsd">
-	<Script file="locals.lua"/>
 	<Script file="MyInventory.lua"/>
 	<Frame name="MyInventoryAnchorFrame" hidden="false" movable="true" parent="UIParent">
 		<Size>

MyInventory/locals.lua

@@ -1,36 +0,0 @@
--- Version : English - Ramble 
-
-MYINVENTORY_NAME = "MyInventory"
-MYINVENTORY_DESCRIPTION = "All in one inventory mod"
-
-MYINVENTORYFRAME_TITLE = "Inventory"
-
--- SLASHCOMMANDS
---[[
-MYINVENTORY_COMMANDS    = {"/myinventory", "/mi"}
-MYINVENTORY_CMD_OPTIONS = {
-	MYBAGS_CMD_OPT_TOGGLE,			-- done
-	MYBAGS_CMD_OPT_FREEZE,			-- done
-	MYBAGS_CMD_OPT_NOESC,				-- done
-	MYBAGS_CMD_OPT_COLUMNS,			-- done
-	MYBAGS_CMD_OPT_REPLACE,			-- done
-	MYBAGS_CMD_OPT_BAG,					-- done
-	MYBAGS_CMD_OPT_GRAPHICS,		-- ????
-	MYBAGS_CMD_OPT_HIGHLIGHT,		-- done
-	MYBAGS_CMD_OPT_LOCK,				-- done
-	MYBAGS_CMD_OPT_TITLE,				-- done
-	MYBAGS_CMD_OPT_CASH,				-- done
-	MYBAGS_CMD_OPT_BUTTONS,			-- done
-	MYBAGS_CMD_OPT_AIOI,				-- done
-	MYBAGS_CMD_OPT_REVERSE,			-- done
-	MYBAGS_CMD_OPT_BORDER,			-- done
-	MYBAGS_CMD_OPT_PLAYERSEL,		-- done
-	MYBAGS_CMD_OPT_COUNT,
-	MYBAGS_CMD_OPT_SCALE,
-	MYBAGS_CMD_OPT_STRATA,
-	MYBAGS_CMD_OPT_ANCHOR,
-	MYBAGS_CMD_RESET,
-	MYBAGS_CMD_OPT_SLOTCOLOR,
-	MYBAGS_CMD_OPT_COMPANION,
-}
-]]