- converted most of the mod to ace3. the only ace2 remaining is AceEvent-2 (probably easy to get away from) and AceOO-2 (not so easy)

- the ace3 conversion also broke the dependence on Waterfall and gave a much better configuration screen through AceConfigDialog; plus Waterfall is very broken in Cataclysm and it's unclear whether anyone will bother to fix it or not
- fixed a bug with the custom CD bar when changing profiles where it would generate endless errors until a reloadui
- removed DewDrop library as it was no longer in use
- temporarily removed FuBar plugin as it doesn't work as a mixin with AceAddon-3. i will eventually be bringing this back in some form (before the next full release version)
- removed an unused 'about' button on the config page and some empty headers...not sure why they were ever there
This commit is contained in:
Parnic
2010-09-05 20:11:33 +00:00
parent 5a7f8ffa38
commit 59344a134a
45 changed files with 676 additions and 749 deletions

View File

@ -1,6 +1,6 @@
local AceOO = AceLibrary("AceOO-2.0")
IceCore = AceOO.Class("AceEvent-2.0", "AceDB-2.0")
IceCore = AceOO.Class("AceEvent-2.0")
IceCore.Side = { Left = "LEFT", Right = "RIGHT" }
@ -25,8 +25,6 @@ IceCore.prototype.presets = {}
IceCore.prototype.settingsHash = nil
IceCore.prototype.bConfigMode = false
local waterfall = AceLibrary("Waterfall-1.0")
-- Constructor --
function IceCore.prototype:init()
IceCore.super.prototype.init(self)
@ -47,50 +45,52 @@ function IceCore.prototype:SetupDefaults()
-- DEFAULT SETTINGS
local defaultPreset = "RoundBar"
self.defaults = {
gap = 150,
verticalPos = -110,
horizontalPos = 0,
scale = 0.9,
alphaooc = 0.3,
alphaic = 0.6,
alphaTarget = 0.4,
alphaNotFull = 0.4,
profile = {
gap = 150,
verticalPos = -110,
horizontalPos = 0,
scale = 0.9,
alphaooc = 0.3,
alphaic = 0.6,
alphaTarget = 0.4,
alphaNotFull = 0.4,
alphaoocbg = 0.2,
alphaicbg = 0.3,
alphaTargetbg = 0.25,
alphaNotFullbg = 0.25,
backgroundToggle = false,
backgroundColor = {r = 0.5, g = 0.5, b = 0.5},
barTexture = "Bar",
barPreset = defaultPreset,
fontFamily = "Arial Narrow",
debug = false,
alphaoocbg = 0.2,
alphaicbg = 0.3,
alphaTargetbg = 0.25,
alphaNotFullbg = 0.25,
backgroundToggle = false,
backgroundColor = {r = 0.5, g = 0.5, b = 0.5},
barTexture = "Bar",
barPreset = defaultPreset,
fontFamily = "Arial Narrow",
debug = false,
barBlendMode = "BLEND",
barBgBlendMode = "BLEND",
barBlendMode = "BLEND",
barBgBlendMode = "BLEND",
bShouldUseDogTags = true,
bShouldUseDogTags = true,
updatePeriod = 0.1
updatePeriod = 0.1
}
}
self:LoadPresets()
for k, v in pairs(self.presets[defaultPreset]) do
self.defaults[k] = v
self.defaults.profile[k] = v
end
-- get default settings from the modules
self.defaults.modules = {}
self.defaults.profile.modules = {}
for i = 1, table.getn(self.elements) do
local name = self.elements[i]:GetElementName()
self.defaults.modules[name] = self.elements[i]:GetDefaultSettings()
self.defaults.profile.modules[name] = self.elements[i]:GetDefaultSettings()
end
if (table.getn(self.elements) > 0) then
self.defaults.colors = self.elements[1].defaultColors
self.defaults.profile.colors = self.elements[1].defaultColors
end
end
@ -256,6 +256,7 @@ function IceCore.prototype:Disable()
end
self.IceHUDFrame:Hide()
self:EmptyUpdates()
self.enabled = false
end
@ -315,7 +316,7 @@ function IceCore.prototype:GetColorOptions()
get = function()
return IceHUD.IceCore:GetColor(kk)
end,
set = function(r, g, b)
set = function(info, r, g, b)
local color = k
IceHUD.IceCore:SetColor(kk, r, g, b)
end
@ -529,7 +530,7 @@ function IceCore.prototype:ChangePreset(value)
self:SetBarBlendMode(self.presets[value].barBlendMode)
self:SetBarBgBlendMode(self.presets[value].barBgBlendMode)
waterfall:Refresh("IceHUD")
IceHUD:NotifyOptionsChange()
end
@ -655,6 +656,12 @@ function IceCore.prototype:IsUpdateSubscribed(frame)
return self.updatees[frame] ~= nil
end
function IceCore.prototype:EmptyUpdates()
self.IceHUDFrame:SetScript("OnUpdate", nil)
self.updatees = {}
self.updatee_count = 0
end
-------------------------------------------------------------------------------
-- Presets --
-------------------------------------------------------------------------------