From 262cbe0d67f192a1040e64dc11c99f5787fdf127 Mon Sep 17 00:00:00 2001 From: Steven Jackson Date: Sat, 26 Jul 2014 15:33:09 -0500 Subject: [PATCH] many new fixes, added bag positions --- Interface/AddOns/SVUI/SVUI.lua | 134 ++-- Interface/AddOns/SVUI/SVUI.toc | 2 +- Interface/AddOns/SVUI/SVUI.xml | 1 - Interface/AddOns/SVUI/language/chinese_ui.lua | 5 +- Interface/AddOns/SVUI/language/english_ui.lua | 5 +- Interface/AddOns/SVUI/language/french_ui.lua | 5 +- Interface/AddOns/SVUI/language/german_ui.lua | 5 +- Interface/AddOns/SVUI/language/italian_ui.lua | 5 +- Interface/AddOns/SVUI/language/korean_ui.lua | 5 +- Interface/AddOns/SVUI/language/portuguese_ui.lua | 5 +- Interface/AddOns/SVUI/language/russian_ui.lua | 5 +- Interface/AddOns/SVUI/language/spanish_ui.lua | 8 +- Interface/AddOns/SVUI/language/taiwanese_ui.lua | 5 +- Interface/AddOns/SVUI/packages/bag/SVBag.lua | 88 +-- Interface/AddOns/SVUI/packages/chat/SVChat.lua | 2 +- Interface/AddOns/SVUI/packages/dock/SVDock.lua | 21 +- Interface/AddOns/SVUI/packages/tip/SVTip.lua | 10 +- Interface/AddOns/SVUI/packages/unit/SVUnit.lua | 25 +- .../AddOns/SVUI/packages/unit/elements/auras.lua | 4 +- Interface/AddOns/SVUI/scripts/pvp.lua | 5 +- Interface/AddOns/SVUI/scripts/questwatch.lua | 32 +- Interface/AddOns/SVUI/system/_load.xml | 18 - Interface/AddOns/SVUI/system/alerts.lua | 10 +- Interface/AddOns/SVUI/system/database.lua | 113 ++- Interface/AddOns/SVUI/system/filters.lua | 716 -------------------- Interface/AddOns/SVUI/system/system.lua | 56 +- Interface/AddOns/SVUI/system/templates.lua | 2 +- .../AddOns/SVUI_ConfigOMatic/SVUI_ConfigOMatic.toc | 2 +- Interface/AddOns/SVUI_ConfigOMatic/modules/bag.lua | 161 +++-- .../AddOns/SVUI_StyleOMatic/SVUI_StyleOMatic.lua | 104 +-- .../AddOns/SVUI_StyleOMatic/SVUI_StyleOMatic.toc | 2 +- Interface/AddOns/SVUI_StyleOMatic/addons/pvp.lua | 2 +- .../AddOns/SVUI_StyleOMatic/addons/timemanager.lua | 6 +- Interface/BUTTONS/Thumbs.db | Bin 0 -> 3072 bytes Interface/GLUES/COMMON/Thumbs.db | Bin 0 -> 12800 bytes Interface/TAXIFRAME/Thumbs.db | Bin 0 -> 156160 bytes Interface/Tooltips/Thumbs.db | Bin 0 -> 4096 bytes 37 files changed, 444 insertions(+), 1125 deletions(-) delete mode 100644 Interface/AddOns/SVUI/system/_load.xml delete mode 100644 Interface/AddOns/SVUI/system/filters.lua create mode 100644 Interface/BUTTONS/Thumbs.db create mode 100644 Interface/GLUES/COMMON/Thumbs.db create mode 100644 Interface/TAXIFRAME/Thumbs.db create mode 100644 Interface/Tooltips/Thumbs.db diff --git a/Interface/AddOns/SVUI/SVUI.lua b/Interface/AddOns/SVUI/SVUI.lua index ea2bf14..3abcc5a 100644 --- a/Interface/AddOns/SVUI/SVUI.lua +++ b/Interface/AddOns/SVUI/SVUI.lua @@ -38,10 +38,11 @@ local floor = math.floor local tsort, tconcat = table.sort, table.concat; --[[ ########################################################## -GET ADDON DATA +ADDON DATA ########################################################## ]]-- local SVUINameSpace, SVUICore = ...; +local version = GetAddOnMetadata(..., "Version"); --[[ ########################################################## CONSTANTS @@ -56,13 +57,6 @@ SlashCmdList.RELOADUI=ReloadUI LOCALS ########################################################## ]]-- -local bld = select(2,GetBuildInfo()); -local toonClass = select(2,UnitClass("player")); -local rez = GetCVar("gxResolution"); -local gxHeight = tonumber(match(rez,"%d+x(%d+)")); -local gxWidth = tonumber(match(rez,"(%d+)x%d+")); -local NewHook = hooksecurefunc; -local version = GetAddOnMetadata(..., "Version"); local callbacks = {}; local numCallbacks = 0; --[[ @@ -318,7 +312,7 @@ local addonEvent = function(self, event, addon) end end -local function SetPrototype(obj, name, parent) +local function SetNewPackage(obj, name, parent) local addonmeta = {} local oldmeta = getmetatable(obj) if oldmeta then @@ -356,7 +350,7 @@ local Registry_NewPackage = function(self, obj, name, priority) InitQueue[#InitQueue+1] = name end self.Packages[#self.Packages+1] = name - self.__owner[name] = SetPrototype(obj, name, self.__owner) + self.__owner[name] = SetNewPackage(obj, name, self.__owner) if(self.__owner.AddonLaunched) then if(self.__owner[name].Load) then @@ -484,7 +478,7 @@ local Registry_Load = function(self) PostLoadQueue = nil end -local AppendRegistry = function(obj, major, minor) +local function AppendRegistry(obj, major, minor) local methods = { __owner = obj, Packages = {}, @@ -506,32 +500,14 @@ local AppendRegistry = function(obj, major, minor) Update = Registry_Update, UpdateAll = Registry_UpdateAll, PreLoadPackages = Registry_PreLoad, - LoadPackages = Registry_Load + LoadPackages = Registry_Load, + Prototype = Registry_Prototype, } local mt = {__tostring = rootstring} setmetatable(methods, mt) return methods end -local function SetAddonObject(major, minor, obj) - obj = obj or {} - obj.__namekey = major - obj.version = minor - local mt = {} - local old = getmetatable(obj) - if old then - for k, v in pairs(old) do mt[k] = v end - end - mt.__tostring = rootstring - setmetatable(obj, mt) - obj.Registry = AppendRegistry(obj, major, minor) - return obj -end ---[[ -########################################################## -BUILD ADDON OBJECTS, CREATE GLOBAL NAMESPACE -########################################################## -]]-- local failsafe = function() assert(false) end local metaread = { @@ -541,52 +517,76 @@ local metaread = { end } -local localized = setmetatable({}, metaread) +local activeLocale -local core = { - db = {}, - snaps = {}, - Media = {}, - DisplayAudit = {}, - DynamicOptions = {}, - Dispellable = {}, -} - -core.fubar = function() return end -core.Options = { type = "group", name = "|cff339fffConfig-O-Matic|r", args = {} }; - -core.class = toonClass; -core.mult = 1; -core.ClassRole = ""; -core.name = UnitName("player"); -core.realm = GetRealmName(); -core.build = tonumber(bld); -core.guid = UnitGUID('player'); -core.ConfigurationMode = false; - -core.snaps[#core.snaps + 1] = core.UIParent; -core.UIParent = CreateFrame("Frame", "SVUIParent", UIParent); -core.UIParent:SetFrameLevel(UIParent:GetFrameLevel()); -core.UIParent:SetPoint("CENTER", UIParent, "CENTER"); -core.UIParent:SetSize(UIParent:GetSize()); -core.Cloaked = CreateFrame("Frame", nil, UIParent); -core.Cloaked:Hide(); - -SVUICore[1] = SetAddonObject(SVUINameSpace, version, core, true) - -SVUICore[2] = setmetatable({}, { +local defaultwrite = setmetatable({}, { __newindex = function(self, key, value) - if not rawget(localized, key) then - rawset(localized, key, value == true and key or value) + if not rawget(activeLocale, key) then + rawset(activeLocale, key, value == true and key or value) end end, __index = failsafe }) -SVUICore[3] = { +local metawrite = setmetatable({}, { + __newindex = function(self, key, value) + rawset(activeLocale, key, value == true and key or value) + end, + __index = failsafe +}) + +--[[ +########################################################## +BUILD ADDON OBJECTS, CREATE GLOBAL NAMESPACE +########################################################## +]]-- +local function SetPrototype() + local obj = {} + local mt = {} + local old = getmetatable(obj) + if old then + for k, v in pairs(old) do mt[k] = v end + end + mt.__tostring = rootstring + setmetatable(obj, mt) + return obj +end + +local SuperVillain = SetPrototype() + +SuperVillain.__namekey = SVUINameSpace +SuperVillain.version = version +SuperVillain.Localization = setmetatable({}, metaread) +SuperVillain.Global = { Accountant = {}, profiles = {}, profileKeys = {}, } +SuperVillain.Registry = AppendRegistry(SuperVillain, SVUINameSpace, version) + +function SuperVillain:SetLocaleStrings(locale, isDefault) + local gameLocale = GetLocale() + if gameLocale == "enGB" then gameLocale = "enUS" end + + activeLocale = self.Localization + + if isDefault then + return defaultwrite + elseif(locale == GAME_LOCALE or locale == gameLocale) then + return metawrite + end +end + +function SuperVillain:Prototype(n, v) + local obj = SetPrototype() + obj.__namekey = n + obj.version = v + return obj +end + +SVUICore[1] = SuperVillain +SVUICore[2] = SuperVillain.Localization +SVUICore[3] = SuperVillain.Global + _G[SVUINameSpace] = SVUICore; \ No newline at end of file diff --git a/Interface/AddOns/SVUI/SVUI.toc b/Interface/AddOns/SVUI/SVUI.toc index 7407852..08a5357 100644 --- a/Interface/AddOns/SVUI/SVUI.toc +++ b/Interface/AddOns/SVUI/SVUI.toc @@ -1,6 +1,6 @@ ## Interface: 50400 ## Author: Munglunch -## Version: 4.074 +## Version: 4.076 ## Title: |cffFF9900SVUI|r ## Notes: Supervillain UI [|cff9911FFCore Framework|r]. ## SavedVariables: SVUI_Global diff --git a/Interface/AddOns/SVUI/SVUI.xml b/Interface/AddOns/SVUI/SVUI.xml index 8859dfe..5292260 100644 --- a/Interface/AddOns/SVUI/SVUI.xml +++ b/Interface/AddOns/SVUI/SVUI.xml @@ -217,7 +217,6 @@