@@ -155,7 +155,7 @@ end ---------------------------------------------------------------------------]] local major = "Dongle-1.0" -local minor = tonumber(string.match("$Revision: 612 $", "(%d+)") or 1) + 500 +local minor = tonumber(string.match("$Revision: 646 $", "(%d+)") or 1) + 500 -- ** IMPORTANT NOTE ** -- Due to some issues we had previously with Dongle revision numbers -- we need to artificially inflate the minor revision number, to ensure @@ -884,17 +884,30 @@ function Dongle.SetProfile(db, name) Dongle:TriggerMessage("DONGLE_PROFILE_CHANGED", db, db.parent, db.sv_name, db.keys.profile) end -function Dongle.GetProfiles(db, t) +function Dongle.GetProfiles(db, tbl) assert(3, databases[db], string.format(L["MUST_CALLFROM_DBOBJECT"], "GetProfiles")) argcheck(t, 2, "table", "nil") - t = t or {} - local i = 1 - for profileKey in pairs(db.sv.profiles) do - t[i] = profileKey + -- Clear the container table + if tbl then + for k,v in pairs(tbl) do tbl[k] = nil end + else + tbl = {} + end + + local i = 0 + for profileKey in pairs(db.profiles) do + i = i + 1 + tbl[i] = profileKey + end + + -- Add the current profile, if it hasn't been created yet + if rawget(db, "profile") == nil then i = i + 1 + tbl[i] = db.keys.profile end - return t, i - 1 + + return tbl, i end function Dongle.GetCurrentProfile(db) @@ -966,8 +979,8 @@ end function Dongle.RegisterNamespace(db, name, defaults) assert(3, databases[db], string.format(L["MUST_CALLFROM_DBOBJECT"], "RegisterNamespace")) - argcheck(name, 2, "string") - argcheck(defaults, 3, "nil", "string") + argcheck(name, 2, "string") + argcheck(defaults, 3, "nil", "table") local sv = db.sv if not sv.namespaces then sv.namespaces = {} end @@ -1147,44 +1160,41 @@ local function PLAYER_LOGOUT(event) end end -local function PLAYER_LOGIN() - Dongle.initialized = true - for i=1, #loadorder do - local obj = loadorder[i] - if type(obj.Enable) == "function" then - safecall(obj.Enable, obj) +local PLAYER_LOGIN +do + local lockPlayerLogin = false + + function PLAYER_LOGIN() + if lockPlayerLogin then return end + + lockPlayerLogin = true + + local obj = table.remove(loadorder, 1) + while obj do + if type(obj.Enable) == "function" then + safecall(obj.Enable, obj) + end + obj = table.remove(loadorder, 1) end - loadorder[i] = nil + + lockPlayerLogin = false end end local function ADDON_LOADED(event, ...) - for i=1, #loadqueue do - local obj = loadqueue[i] + local obj = table.remove(loadqueue, 1) + while obj do table.insert(loadorder, obj) - + if type(obj.Initialize) == "function" then safecall(obj.Initialize, obj) end - loadqueue[i] = nil - end - if not Dongle.initialized then - if type(IsLoggedIn) == "function" then - Dongle.initialized = IsLoggedIn() - else - Dongle.initialized = ChatFrame1.defaultLanguage - end + obj = table.remove(loadqueue, 1) end - if Dongle.initialized then - for i=1, #loadorder do - local obj = loadorder[i] - if type(obj.Enable) == "function" then - safecall(obj.Enable, obj) - end - loadorder[i] = nil - end + if IsLoggedIn() then + PLAYER_LOGIN() end end Dongle.lua @@ -1,14 +1,15 @@ -local lib, oldminor = LibStub:NewLibrary("tekKonfig-AboutPanel", 1) +local lib, oldminor = LibStub:NewLibrary("tekKonfig-AboutPanel", 4) if not lib then return end function lib.new(parent, addonname) local frame = CreateFrame("Frame", nil, UIParent) - frame.name, frame.parent, frame.addonname = "About", parent, addonname + frame.name, frame.parent, frame.addonname = parent and "About" or addonname, parent, addonname frame:Hide() frame:SetScript("OnShow", lib.OnShow) InterfaceOptions_AddCategory(frame) + return frame end @@ -69,7 +70,7 @@ function lib.OnShow(frame) local title = frame:CreateFontString(nil, "ARTWORK", "GameFontNormalLarge") title:SetPoint("TOPLEFT", 16, -16) - title:SetText(frame.parent.." - About") + title:SetText((frame.parent or frame.addonname).." - About") local subtitle = frame:CreateFontString(nil, "ARTWORK", "GameFontHighlightSmall") subtitle:SetHeight(32) @@ -110,23 +111,5 @@ function lib.OnShow(frame) end end - frame:SetScript("OnShow", lib.FadeIn) - lib.FadeIn(frame) -end - - -local elapsed = 0 -local starttimes, endtimes = {}, {} -local function OnUpdate(frame, elap) - elapsed = elapsed + elap - if elapsed > 0.5 then - frame:SetScript("OnUpdate", nil) - frame:SetAlpha(1) - else frame:SetAlpha(elapsed/0.5) end -end - -function lib.FadeIn(frame) - elapsed = 0 - frame:SetAlpha(0) - frame:SetScript("OnUpdate", OnUpdate) + frame:SetScript("OnShow", nil) end tekKonfig/tekKonfigAboutPanel.lua 4f65173906fbb40789fccfde9036d82172fd64b5 Tekkub tekkub@gmail.com http://github.com/tekkub/mountme/commit/6f3c42b76816e26bdfc58abaa188e25db36e2494 6f3c42b76816e26bdfc58abaa188e25db36e2494 2008-08-23T11:39:42-07:00 2008-08-23T11:39:42-07:00 Embeds update d10cccd9779c41e9824f4bd7701e55199ec5e749 Tekkub tekkub@gmail.com