# HG changeset patch # User Bryan McLemore # Date 1306777693 18000 # Node ID 380285db8fedc922ebc394f2fb44af4ce6698833 # Parent 2d6036e12b772940930c9da18a579b6cf760a158 Updating for 4.1 diff -r 2d6036e12b77 -r 380285db8fed .pkgmeta --- a/.pkgmeta Mon Feb 14 00:19:11 2011 -0600 +++ b/.pkgmeta Mon May 30 12:48:13 2011 -0500 @@ -8,7 +8,7 @@ libs/AceHook-3.0: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceHook-3.0 libs/AceDB-3.0: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceDB-3.0 libs/AceDBOptions-3.0: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceDBOptions-3.0 - libs/AceLocale-3.1: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceLocale-3.1 + libs/AceLocale-3.0: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceLocale-3.0 libs/AceConsole-3.0: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceConsole-3.0 libs/AceGUI-3.0: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceGUI-3.0 libs/AceConfig-3.0: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceConfig-3.0 diff -r 2d6036e12b77 -r 380285db8fed OneRing3.lua --- a/OneRing3.lua Mon Feb 14 00:19:11 2011 -0600 +++ b/OneRing3.lua Mon May 30 12:48:13 2011 -0500 @@ -1,68 +1,68 @@ local OneBag3 = LibStub('AceAddon-3.0'):GetAddon('OneBag3') -local OneRing3 = LibStub('AceAddon-3.0'):NewAddon('OneRing3', 'OneCore-1.0', 'OneFrame-1.0', 'OneConfig-1.0', 'OnePlugin-1.0', 'AceHook-3.0', 'AceEvent-3.0', 'AceConsole-3.0') +local OneRing3 = LibStub('AceAddon-3.0'):NewAddon('OneRing3', 'OneCore-1.0', 'OneFrame-1.0', 'OneConfig-1.0', 'OnePlugin-1.0', 'AceHook-3.0', 'AceEvent-3.0', 'AceConsole-3.0') local AceDB3 = LibStub('AceDB-3.0') -local L = LibStub("AceLocale-3.1"):GetLocale("OneRing3") +local L = LibStub("AceLocale-3.0"):GetLocale("OneRing3") -OneRing3:InitializePluginSystem() - +OneRing3:InitializePluginSystem() + --- Handles the do once configuration, including db, frames and configuration -function OneRing3:OnInitialize() +function OneRing3:OnInitialize() self.db = OneBag3.db self.displayName = "OneRing3" - + self.bagIndexes = {-2} self.forcedCols = 4 self.bottomBorder = 5 self.topBorder = -5 - + self.frame = self:CreateMainFrame("OneRingFrame") self.frame.handler = self - + table.insert(OneBag3.frame.childrenFrames, self.frame) - + self.frame:SetPosition(self.db.profile.position) self.frame:CustomizeFrame(self.db.profile) - + self.frame.moneyframe:Hide() self.frame.sidebarButton:Hide() - self.frame.configButton:Hide() - + self.frame.configButton:Hide() + self.frame.name:ClearAllPoints() self.frame.name:SetPoint("TOPLEFT", "OneRingFrame", "TOPLEFT", 10, -15) - + self.frame:SetScript("OnShow", function() if not self.frame.slots then self.frame.slots = {} end - + self:BuildFrame() self:OrganizeFrame() self:UpdateFrame() - - local UpdateBag = function(event, bag) + + local UpdateBag = function(event, bag) self:UpdateBag(bag) end self:RegisterEvent("BAG_UPDATE", UpdateBag) self:RegisterEvent("BAG_UPDATE_COOLDOWN", UpdateBag) - self:RegisterEvent("UPDATE_INVENTORY_ALERTS", "UpdateFrame") + self:RegisterEvent("UPDATE_INVENTORY_ALERTS", "UpdateFrame") self:RegisterEvent("ITEM_LOCK_CHANGED", "UpdateItemLock") - - self.frame.name:SetText(L["%s's KeyRing"]:format(UnitName("player"))) - self.frame:ClearAllPoints() - if not OneBag3.frame:IsVisible() then - self.frame:SetPoint("CENTER", UIParent, "CENTER", 0, 0) - else - self.frame:SetPoint("BOTTOMLEFT", OneBag3.frame, "TOPLEFT", 0, 8) + self.frame.name:SetText(L["%s's KeyRing"]:format(UnitName("player"))) + + self.frame:ClearAllPoints() + if not OneBag3.frame:IsVisible() then + self.frame:SetPoint("CENTER", UIParent, "CENTER", 0, 0) + else + self.frame:SetPoint("BOTTOMLEFT", OneBag3.frame, "TOPLEFT", 0, 8) end end) - + self.frame:SetScript("OnHide", function() self:UnregisterEvent("BAG_UPDATE") self:UnregisterEvent("BAG_UPDATE_COOLDOWN") - self:UnregisterEvent("UPDATE_INVENTORY_ALERTS") + self:UnregisterEvent("UPDATE_INVENTORY_ALERTS") self:UnregisterEvent("ITEM_LOCK_CHANGED") end) end @@ -75,7 +75,7 @@ else self.frame:Show() end - + local shownContainerID = IsBagOpen(KEYRING_CONTAINER) if ( shownContainerID ) then local frame = getglobal("ContainerFrame"..shownContainerID) @@ -83,4 +83,3 @@ end end) end - \ No newline at end of file diff -r 2d6036e12b77 -r 380285db8fed OneRing3.toc --- a/OneRing3.toc Mon Feb 14 00:19:11 2011 -0600 +++ b/OneRing3.toc Mon May 30 12:48:13 2011 -0500 @@ -1,1 +1,1 @@ -## Interface: 40000 ## Title: OneRing3 ## Notes: A plugin for OneBag to make your keyring the same texture as OneBag/Bank. ## Notes-zhCN: 整合背包插件，以整合方式显示你的银行。 ## Notes-zhTW: 把鑰匙圈換成 OneBag 風格。 ## Notes-deDE: Eine Tasche um sie alle zu beherrschen, und in der Dunkelheit zu binden. ## Author: Kaelten ## X-eMail: kaelten@gmail.com ## X-Category: Bags & Inventory ## X-Website: http://www.wowace.com/projects/OneRing3/ ## X-Date: @project-timestamp@ ## Version: @project-version@ ## Deps: OneBag3 ## OptionalDeps: Ace3, OneCore OneRing3.xml \ No newline at end of file +## Interface: 41000 ## Title: OneRing3 ## Notes: A plugin for OneBag to make your keyring the same texture as OneBag/Bank. ## Notes-zhCN: 整合背包插件，以整合方式显示你的银行。 ## Notes-zhTW: 把鑰匙圈換成 OneBag 風格。 ## Notes-deDE: Eine Tasche um sie alle zu beherrschen, und in der Dunkelheit zu binden. ## Author: Kaelten ## X-eMail: kaelten@gmail.com ## X-Category: Bags & Inventory ## X-Website: http://www.wowace.com/projects/OneRing3/ ## X-Date: @project-timestamp@ ## Version: @project-version@ ## Deps: OneBag3 ## OptionalDeps: Ace3, OneCore OneRing3.xml \ No newline at end of file diff -r 2d6036e12b77 -r 380285db8fed OneRing3.xml --- a/OneRing3.xml Mon Feb 14 00:19:11 2011 -0600 +++ b/OneRing3.xml Mon May 30 12:48:13 2011 -0500 @@ -1,5 +1,5 @@ - - + +