- 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

@ -160,13 +160,13 @@ function IceCustomBar.prototype:GetOptions()
}
opts["name"] = {
type = 'text',
type = 'input',
name = 'Bar name',
desc = 'The name of this bar (must be unique!).\n\nRemember to press ENTER after filling out this box with the name you want or it will not save.',
get = function()
return self.elementName
end,
set = function(v)
set = function(info, v)
if v~= "" then
IceHUD.IceCore:RenameDynamicModule(self, v)
end
@ -179,20 +179,20 @@ function IceCustomBar.prototype:GetOptions()
}
opts["unitToTrack"] = {
type = 'text',
validate = validUnits,
type = 'select',
values = validUnits,
name = 'Unit to track',
desc = 'Select which unit that this bar should be looking for buffs/debuffs on',
get = function()
return self.moduleSettings.myUnit
get = function(info)
return IceHUD:GetSelectValue(info, self.moduleSettings.myUnit)
end,
set = function(v)
self.moduleSettings.myUnit = v
self.unit = v
set = function(info, v)
self.moduleSettings.myUnit = info.option.values[v]
self.unit = info.option.values[v]
self:CheckShouldSubscribe()
self:Redraw()
self:UpdateCustomBar(self.unit)
AceLibrary("Waterfall-1.0"):Refresh("IceHUD")
IceHUD:NotifyOptionsChange()
end,
disabled = function()
return not self.moduleSettings.enabled
@ -201,15 +201,15 @@ function IceCustomBar.prototype:GetOptions()
}
opts["buffOrDebuff"] = {
type = 'text',
validate = buffOrDebuff,
type = 'select',
values = buffOrDebuff,
name = 'Buff or debuff?',
desc = 'Whether we are tracking a buff or debuff',
get = function()
return self.moduleSettings.buffOrDebuff
get = function(info)
return IceHUD:GetSelectValue(info, self.moduleSettings.buffOrDebuff)
end,
set = function(v)
self.moduleSettings.buffOrDebuff = v
set = function(info, v)
self.moduleSettings.buffOrDebuff = info.option.values[v]
self:Redraw()
self:UpdateCustomBar(self.unit)
end,
@ -220,13 +220,13 @@ function IceCustomBar.prototype:GetOptions()
}
opts["buffToTrack"] = {
type = 'text',
type = 'input',
name = "Aura to track",
desc = "Which buff/debuff this bar will be tracking.\n\nRemember to press ENTER after filling out this box with the name you want or it will not save.",
get = function()
return self.moduleSettings.buffToTrack
end,
set = function(v)
set = function(info, v)
if self.moduleSettings.buffToTrack == self.moduleSettings.upperText then
self.moduleSettings.upperText = v
end
@ -248,7 +248,7 @@ function IceCustomBar.prototype:GetOptions()
get = function()
return self.moduleSettings.exactMatch
end,
set = function(v)
set = function(info, v)
self.moduleSettings.exactMatch = v
self:Redraw()
self:UpdateCustomBar(self.unit)
@ -266,7 +266,7 @@ function IceCustomBar.prototype:GetOptions()
get = function()
return self.moduleSettings.trackOnlyMine
end,
set = function(v)
set = function(info, v)
self.moduleSettings.trackOnlyMine = v
self:Redraw()
self:UpdateCustomBar(self.unit)
@ -284,7 +284,7 @@ function IceCustomBar.prototype:GetOptions()
get = function()
return self:GetBarColor()
end,
set = function(r,g,b)
set = function(info, r,g,b)
self.moduleSettings.barColor.r = r
self.moduleSettings.barColor.g = g
self.moduleSettings.barColor.b = b
@ -303,7 +303,7 @@ function IceCustomBar.prototype:GetOptions()
get = function()
return self.moduleSettings.displayWhenEmpty
end,
set = function(v)
set = function(info, v)
self.moduleSettings.displayWhenEmpty = v
self:UpdateCustomBar()
end,
@ -314,31 +314,31 @@ function IceCustomBar.prototype:GetOptions()
}
opts["buffTimerDisplay"] = {
type = 'text',
type = 'select',
name = 'Buff timer display',
desc = 'How to display the buff timer next to the name of the buff on the bar',
get = function()
return self.moduleSettings.buffTimerDisplay
get = function(info)
return IceHUD:GetSelectValue(info, self.moduleSettings.buffTimerDisplay)
end,
set = function(v)
self.moduleSettings.buffTimerDisplay = v
set = function(info, v)
self.moduleSettings.buffTimerDisplay = info.option.values[v]
self:UpdateCustomBar()
end,
disabled = function()
return not self.moduleSettings.enabled
end,
validate = validBuffTimers,
values = validBuffTimers,
order = 21
}
opts["maxDuration"] = {
type = 'text',
type = 'input',
name = "Maximum duration",
desc = "Maximum Duration for the bar (the bar will remained full if it has longer than maximum remaining). Leave 0 for spell duration.\n\nRemember to press ENTER after filling out this box with the name you want or it will not save.",
get = function()
return self.moduleSettings.maxDuration
end,
set = function(v)
set = function(info, v)
if not v or not tonumber(v) then
v = 0
end
@ -365,7 +365,7 @@ function IceCustomBar.prototype:GetOptions()
get = function()
return self.moduleSettings.displayAuraIcon
end,
set = function(v)
set = function(info, v)
self.moduleSettings.displayAuraIcon = v
if self.barFrame.icon then
if v then
@ -378,7 +378,6 @@ function IceCustomBar.prototype:GetOptions()
disabled = function()
return not self.moduleSettings.enabled
end,
usage = "<whether or not to display an icon for this bar's tracked spell>",
order = 40.1,
}
@ -392,14 +391,13 @@ function IceCustomBar.prototype:GetOptions()
get = function()
return self.moduleSettings.auraIconXOffset
end,
set = function(v)
set = function(info, v)
self.moduleSettings.auraIconXOffset = v
self:PositionIcons()
end,
disabled = function()
return not self.moduleSettings.enabled or not self.moduleSettings.displayAuraIcon
end,
usage = "<adjusts the spell icon's horizontal position>",
order = 40.2,
}
@ -413,14 +411,13 @@ function IceCustomBar.prototype:GetOptions()
get = function()
return self.moduleSettings.auraIconYOffset
end,
set = function(v)
set = function(info, v)
self.moduleSettings.auraIconYOffset = v
self:PositionIcons()
end,
disabled = function()
return not self.moduleSettings.enabled or not self.moduleSettings.displayAuraIcon
end,
usage = "<adjusts the spell icon's vertical position>",
order = 40.3,
}
@ -434,14 +431,13 @@ function IceCustomBar.prototype:GetOptions()
get = function()
return self.moduleSettings.auraIconScale
end,
set = function(v)
set = function(info, v)
self.moduleSettings.auraIconScale = v
self:PositionIcons()
end,
disabled = function()
return not self.moduleSettings.enabled or not self.moduleSettings.displayAuraIcon
end,
usage = "<adjusts the spell icon's size>",
order = 40.4,
}