diff --git a/ElvUI/ElvUI.toc b/ElvUI/ElvUI.toc index 1ffc854..f806de6 100644 --- a/ElvUI/ElvUI.toc +++ b/ElvUI/ElvUI.toc @@ -1,6 +1,6 @@ ## Interface: 30300 ## Author: Elv, Bunny -## Version: 7.3 +## Version: 7.4 ## Title: |cff1784d1E|r|cffe5e3e3lvUI|r ## Notes: User Interface replacement AddOn for World of Warcraft. ## SavedVariables: ElvDB, ElvPrivateDB diff --git a/ElvUI_Enhanced/Config/Config.lua b/ElvUI_Enhanced/Config/Config.lua index 0226e59..24567a7 100644 --- a/ElvUI_Enhanced/Config/Config.lua +++ b/ElvUI_Enhanced/Config/Config.lua @@ -195,7 +195,6 @@ local function BlizzardOptions() local B = E:GetModule("Enhanced_Blizzard") local WF = E:GetModule("Enhanced_WatchFrame") local TAM = E:GetModule("Enhanced_TakeAllMail") - local CHAR = E:GetModule("Enhanced_CharacterFrame") local choices = { ["NONE"] = L["NONE"], @@ -254,149 +253,6 @@ local function BlizzardOptions() } } }, - characterFrame = { - order = 3, - type = "group", - name = L["Character Frame"], - get = function(info) return E.private.enhanced.character[info[#info]] end, - set = function(info, value) - E.private.enhanced.character[info[#info]] = value - E:StaticPopup_Show("PRIVATE_RL") - end, - args = { - header = { - order = 1, - type = "header", - name = L["Character Frame"] - }, - enable = { - order = 2, - type = "toggle", - name = L["Enhanced Character Frame"] - }, - modelFrames = { - order = 3, - type = "toggle", - name = L["Enhanced Model Frames"] - }, - animations = { - order = 4, - type = "toggle", - name = L["Smooth Animations"], - get = function(info) return E.db.enhanced.character.animations end, - set = function(info, value) - E.db.enhanced.character.animations = value - E:StaticPopup_Show("PRIVATE_RL") - end, - disabled = function() return not E.private.enhanced.character.enable end - }, - paperdollBackgrounds = { - order = 5, - type = "group", - name = L["Paperdoll Backgrounds"], - guiInline = true, - get = function(info) return E.db.enhanced.character[info[#info]] end, - disabled = function() return not E.private.enhanced.character.enable end, - args = { - characterBackground = { - order = 1, - type = "toggle", - name = L["Character Background"], - set = function(info, value) - E.db.enhanced.character.characterBackground = value - CHAR:UpdateCharacterModelFrame() - end - }, - desaturateCharacter = { - order = 2, - type = "toggle", - name = L["Desaturate"], - get = function(info) return E.db.enhanced.character.desaturateCharacter end, - set = function(info, value) - E.db.enhanced.character.desaturateCharacter = value - CHAR:UpdateCharacterModelFrame() - end, - disabled = function() return not E.private.enhanced.character.enable or not E.db.enhanced.character.characterBackground end - }, - spacer = { - order = 3, - type = "description", - name = " " - }, - petBackground = { - order = 4, - type = "toggle", - name = L["Pet Background"], - set = function(info, value) - E.db.enhanced.character.petBackground = value - CHAR:UpdatePetModelFrame() - end - }, - desaturatePet = { - order = 5, - type = "toggle", - name = L["Desaturate"], - get = function(info) return E.db.enhanced.character.desaturatePet end, - set = function(info, value) - E.db.enhanced.character.desaturatePet = value - CHAR:UpdatePetModelFrame() - end, - disabled = function() return not E.private.enhanced.character.enable or not E.db.enhanced.character.petBackground end - }, - spacer2 = { - order = 6, - type = "description", - name = " " - }, - inspectBackground = { - order = 6, - type = "toggle", - name = L["Inspect Background"], - set = function(info, value) - E.db.enhanced.character.inspectBackground = value - CHAR:UpdateInspectModelFrame() - end - }, - desaturateInspect = { - order = 8, - type = "toggle", - name = L["Desaturate"], - get = function(info) return E.db.enhanced.character.desaturateInspect end, - set = function(info, value) - E.db.enhanced.character.desaturateInspect = value - CHAR:UpdateInspectModelFrame() - end, - disabled = function() return not E.private.enhanced.character.enable or not E.db.enhanced.character.inspectBackground end - }, - spacer3 = { - order = 9, - type = "description", - name = " " - }, - companionBackground = { - order = 10, - type = "toggle", - name = L["Companion Background"], - set = function(info, value) - E.db.enhanced.character.companionBackground = value - CHAR:UpdateCompanionModelFrame() - end - }, - desaturateCompanion = { - order = 11, - type = "toggle", - name = L["Desaturate"], - get = function(info) return E.db.enhanced.character.desaturateCompanion end, - set = function(info, value) - E.db.enhanced.character.desaturateCompanion = value - CHAR:UpdateCompanionModelFrame() - end, - disabled = function() return not E.private.enhanced.character.enable or not E.db.enhanced.character.companionBackground end - } - } - } - } - }, dressingRoom = { order = 4, type = "group", diff --git a/ElvUI_Enhanced/ElvUI_Enhanced.lua b/ElvUI_Enhanced/ElvUI_Enhanced.lua index 8b65248..680b63c 100644 --- a/ElvUI_Enhanced/ElvUI_Enhanced.lua +++ b/ElvUI_Enhanced/ElvUI_Enhanced.lua @@ -75,11 +75,6 @@ function addon:DBConversions() E.private.enhanced.blizzard.deathRecap = nil end - if E.private.enhanced.character.model and E.private.enhanced.character.model.enable ~= nil then - E.private.enhanced.character.modelFrames = E.private.enhanced.character.model.enable - E.private.enhanced.character.model.enable = nil - end - if P.unitframe.units.player.portrait.detachFromFrame ~= nil then E.db.enhanced.unitframe.detachPortrait.player.enable = P.unitframe.units.player.portrait.detachFromFrame E.db.enhanced.unitframe.detachPortrait.player.width = P.unitframe.units.player.portrait.detachedWidth diff --git a/ElvUI_Enhanced/Modules/Blizzard/Load_Blizzard.xml b/ElvUI_Enhanced/Modules/Blizzard/Load_Blizzard.xml index 9686b7d..55659ce 100644 --- a/ElvUI_Enhanced/Modules/Blizzard/Load_Blizzard.xml +++ b/ElvUI_Enhanced/Modules/Blizzard/Load_Blizzard.xml @@ -12,7 +12,4 @@