From a242f50cb41385fe74b1d3a5b9ba33a8324a7d1b Mon Sep 17 00:00:00 2001
From: Parnic <parnic@parnic.com>
Date: Sun, 19 Sep 2010 06:39:59 +0000
Subject: [PATCH] - moved all "icons" settings from being under a header to
 being in their own group. this should unify the "icon settings" features of
 all modules

---
 IceCastBar.lua          | 178 ++++++++++++++++++-------------------
 modules/CustomBar.lua   | 168 +++++++++++++++++------------------
 modules/CustomCDBar.lua | 156 ++++++++++++++++-----------------
 modules/FocusHealth.lua | 188 ++++++++++++++++++++--------------------
 4 files changed, 345 insertions(+), 345 deletions(-)

diff --git a/IceCastBar.lua b/IceCastBar.lua
index 0762643..545f04c 100644
--- a/IceCastBar.lua
+++ b/IceCastBar.lua
@@ -101,97 +101,97 @@ function IceCastBar.prototype:GetOptions()
 		order = 39.999
 	}
 
-	opts["headerIcons"] = {
-		type = 'header',
-		name = 'Icons',
-		order = 50
+	opts["iconSettings"] = {
+		type = 'group',
+		name = '|c'..self.configColor..'Icon Settings|r',
+		args = {
+			displayAuraIcon = {
+				type = 'toggle',
+				name = "Display aura icon",
+				desc = "Whether or not to display an icon for the aura that this bar is tracking",
+				get = function()
+					return self.moduleSettings.displayAuraIcon
+				end,
+				set = function(info, v)
+					self.moduleSettings.displayAuraIcon = v
+					if self.barFrame.icon then
+						if v then
+							self.barFrame.icon:Show()
+						else
+							self.barFrame.icon:Hide()
+						end
+					end
+				end,
+				disabled = function()
+					return not self.moduleSettings.enabled
+				end,
+				order = 51,
+			},
+
+			auraIconXOffset = {
+				type = 'range',
+				min = -250,
+				max = 250,
+				step = 1,
+				name = "Aura icon horizontal offset",
+				desc = "Adjust the horizontal position of the aura icon",
+				get = function()
+					return self.moduleSettings.auraIconXOffset
+				end,
+				set = function(info, v)
+					self.moduleSettings.auraIconXOffset = v
+					self:PositionIcons()
+				end,
+				disabled = function()
+					return not self.moduleSettings.enabled or not self.moduleSettings.displayAuraIcon
+				end,
+				order = 52,
+			},
+
+			auraIconYOffset = {
+				type = 'range',
+				min = -250,
+				max = 250,
+				step = 1,
+				name = "Aura icon vertical offset",
+				desc = "Adjust the vertical position of the aura icon",
+				get = function()
+					return self.moduleSettings.auraIconYOffset
+				end,
+				set = function(info, v)
+					self.moduleSettings.auraIconYOffset = v
+					self:PositionIcons()
+				end,
+				disabled = function()
+					return not self.moduleSettings.enabled or not self.moduleSettings.displayAuraIcon
+				end,
+				order = 53,
+			},
+
+			auraIconScale = {
+				type = 'range',
+				min = 0.1,
+				max = 3.0,
+				step = 0.05,
+				name = 'Aura icon scale',
+				desc = 'Adjusts the size of the aura icon for this bar',
+				get = function()
+					return self.moduleSettings.auraIconScale
+				end,
+				set = function(info, v)
+					self.moduleSettings.auraIconScale = v
+					self:PositionIcons()
+				end,
+				disabled = function()
+					return not self.moduleSettings.enabled or not self.moduleSettings.displayAuraIcon
+				end,
+				order = 54,
+			},
+		},
 	}
 
-	opts["displayAuraIcon"] = {
+	opts["reverseChannel"] = {
 		type = 'toggle',
-		name = "Display aura icon",
-		desc = "Whether or not to display an icon for the aura that this bar is tracking",
-		get = function()
-			return self.moduleSettings.displayAuraIcon
-		end,
-		set = function(info, v)
-			self.moduleSettings.displayAuraIcon = v
-			if self.barFrame.icon then
-				if v then
-					self.barFrame.icon:Show()
-				else
-					self.barFrame.icon:Hide()
-				end
-			end
-		end,
-		disabled = function()
-			return not self.moduleSettings.enabled
-		end,
-		order = 51,
-	}
-
-	opts["auraIconXOffset"] = {
-		type = 'range',
-		min = -250,
-		max = 250,
-		step = 1,
-		name = "Aura icon horizontal offset",
-		desc = "Adjust the horizontal position of the aura icon",
-		get = function()
-			return self.moduleSettings.auraIconXOffset
-		end,
-		set = function(info, v)
-			self.moduleSettings.auraIconXOffset = v
-			self:PositionIcons()
-		end,
-		disabled = function()
-			return not self.moduleSettings.enabled or not self.moduleSettings.displayAuraIcon
-		end,
-		order = 52,
-	}
-
-	opts["auraIconYOffset"] = {
-		type = 'range',
-		min = -250,
-		max = 250,
-		step = 1,
-		name = "Aura icon vertical offset",
-		desc = "Adjust the vertical position of the aura icon",
-		get = function()
-			return self.moduleSettings.auraIconYOffset
-		end,
-		set = function(info, v)
-			self.moduleSettings.auraIconYOffset = v
-			self:PositionIcons()
-		end,
-		disabled = function()
-			return not self.moduleSettings.enabled or not self.moduleSettings.displayAuraIcon
-		end,
-		order = 53,
-	}
-
-	opts["auraIconScale"] = {
-		type = 'range',
-		min = 0.1,
-		max = 3.0,
-		step = 0.05,
-		name = 'Aura icon scale',
-		desc = 'Adjusts the size of the aura icon for this bar',
-		get = function()
-			return self.moduleSettings.auraIconScale
-		end,
-		set = function(info, v)
-			self.moduleSettings.auraIconScale = v
-			self:PositionIcons()
-		end,
-		disabled = function()
-			return not self.moduleSettings.enabled or not self.moduleSettings.displayAuraIcon
-		end,
-		order = 54,
-	}
-
-    opts["reverseChannel"] = {
-        type = 'toggle',
 		name = "Reverse channeling",
 		desc = "Whether or not to reverse the direction of the cast bar when a spell is being channeled. For example, if a normal cast causes this bar to fill up, then checking this option will cause a channeled spell to empty the bar instead.",
 		get = function()
@@ -204,7 +204,7 @@ function IceCastBar.prototype:GetOptions()
 			return not self.moduleSettings.enabled
 		end,
 		order = 32.5,
-    }
+	}
 
 	return opts
 end
diff --git a/modules/CustomBar.lua b/modules/CustomBar.lua
index 53e928b..93c82a5 100644
--- a/modules/CustomBar.lua
+++ b/modules/CustomBar.lua
@@ -348,93 +348,93 @@ function IceCustomBar.prototype:GetOptions()
 		order = 31.1,
 	}
 
-	opts["headerIcons"] = {
-		type = 'header',
-		name = 'Icons',
-		order = 40
-	}
+	opts["iconSettings"] = {
+		type = 'group',
+		name = '|c'..self.configColor..'Icon Settings|r',
+		args = {
+			displayAuraIcon = {
+				type = 'toggle',
+				name = "Display aura icon",
+				desc = "Whether or not to display an icon for the aura that this bar is tracking",
+				get = function()
+					return self.moduleSettings.displayAuraIcon
+				end,
+				set = function(info, v)
+					self.moduleSettings.displayAuraIcon = v
+					if self.barFrame.icon then
+						if v then
+							self.barFrame.icon:Show()
+						else
+							self.barFrame.icon:Hide()
+						end
+					end
+				end,
+				disabled = function()
+					return not self.moduleSettings.enabled
+				end,
+				order = 40.1,
+			},
 
-	opts["displayAuraIcon"] = {
-		type = 'toggle',
-		name = "Display aura icon",
-		desc = "Whether or not to display an icon for the aura that this bar is tracking",
-		get = function()
-			return self.moduleSettings.displayAuraIcon
-		end,
-		set = function(info, v)
-			self.moduleSettings.displayAuraIcon = v
-			if self.barFrame.icon then
-				if v then
-					self.barFrame.icon:Show()
-				else
-					self.barFrame.icon:Hide()
-				end
-			end
-		end,
-		disabled = function()
-			return not self.moduleSettings.enabled
-		end,
-		order = 40.1,
-	}
+			auraIconXOffset = {
+				type = 'range',
+				min = -250,
+				max = 250,
+				step = 1,
+				name = "Aura icon horizontal offset",
+				desc = "Adjust the horizontal position of the aura icon",
+				get = function()
+					return self.moduleSettings.auraIconXOffset
+				end,
+				set = function(info, v)
+					self.moduleSettings.auraIconXOffset = v
+					self:PositionIcons()
+				end,
+				disabled = function()
+					return not self.moduleSettings.enabled or not self.moduleSettings.displayAuraIcon
+				end,
+				order = 40.2,
+			},
 
-	opts["auraIconXOffset"] = {
-		type = 'range',
-		min = -250,
-		max = 250,
-		step = 1,
-		name = "Aura icon horizontal offset",
-		desc = "Adjust the horizontal position of the aura icon",
-		get = function()
-			return self.moduleSettings.auraIconXOffset
-		end,
-		set = function(info, v)
-			self.moduleSettings.auraIconXOffset = v
-			self:PositionIcons()
-		end,
-		disabled = function()
-			return not self.moduleSettings.enabled or not self.moduleSettings.displayAuraIcon
-		end,
-		order = 40.2,
-	}
+			auraIconYOffset = {
+				type = 'range',
+				min = -250,
+				max = 250,
+				step = 1,
+				name = "Aura icon vertical offset",
+				desc = "Adjust the vertical position of the aura icon",
+				get = function()
+					return self.moduleSettings.auraIconYOffset
+				end,
+				set = function(info, v)
+					self.moduleSettings.auraIconYOffset = v
+					self:PositionIcons()
+				end,
+				disabled = function()
+					return not self.moduleSettings.enabled or not self.moduleSettings.displayAuraIcon
+				end,
+				order = 40.3,
+			},
 
-	opts["auraIconYOffset"] = {
-		type = 'range',
-		min = -250,
-		max = 250,
-		step = 1,
-		name = "Aura icon vertical offset",
-		desc = "Adjust the vertical position of the aura icon",
-		get = function()
-			return self.moduleSettings.auraIconYOffset
-		end,
-		set = function(info, v)
-			self.moduleSettings.auraIconYOffset = v
-			self:PositionIcons()
-		end,
-		disabled = function()
-			return not self.moduleSettings.enabled or not self.moduleSettings.displayAuraIcon
-		end,
-		order = 40.3,
-	}
-
-	opts["auraIconScale"] = {
-		type = 'range',
-		min = 0.1,
-		max = 3.0,
-		step = 0.05,
-		name = 'Aura icon scale',
-		desc = 'Adjusts the size of the aura icon for this bar',
-		get = function()
-			return self.moduleSettings.auraIconScale
-		end,
-		set = function(info, v)
-			self.moduleSettings.auraIconScale = v
-			self:PositionIcons()
-		end,
-		disabled = function()
-			return not self.moduleSettings.enabled or not self.moduleSettings.displayAuraIcon
-		end,
-		order = 40.4,
+			auraIconScale = {
+				type = 'range',
+				min = 0.1,
+				max = 3.0,
+				step = 0.05,
+				name = 'Aura icon scale',
+				desc = 'Adjusts the size of the aura icon for this bar',
+				get = function()
+					return self.moduleSettings.auraIconScale
+				end,
+				set = function(info, v)
+					self.moduleSettings.auraIconScale = v
+					self:PositionIcons()
+				end,
+				disabled = function()
+					return not self.moduleSettings.enabled or not self.moduleSettings.displayAuraIcon
+				end,
+				order = 40.4,
+			},
+		},
 	}
 
 	return opts
diff --git a/modules/CustomCDBar.lua b/modules/CustomCDBar.lua
index 84390e6..3388ee8 100644
--- a/modules/CustomCDBar.lua
+++ b/modules/CustomCDBar.lua
@@ -264,87 +264,87 @@ function IceCustomCDBar.prototype:GetOptions()
 		order = 31.1,
 	}
 
-	opts["headerIcons"] = {
-		type = 'header',
-		name = 'Icons',
-		order = 40
-	}
+	opts["iconSettings"] = {
+		type = 'group',
+		name = '|c'..self.configColor..'Icon Settings|r',
+		args = {
+			displayAuraIcon = {
+				type = 'toggle',
+				name = "Display aura icon",
+				desc = "Whether or not to display an icon for the aura that this bar is tracking",
+				get = function()
+					return self.moduleSettings.displayAuraIcon
+				end,
+				set = function(info, v)
+					self.moduleSettings.displayAuraIcon = v
+					self:UpdateIcon()
+				end,
+				disabled = function()
+					return not self.moduleSettings.enabled
+				end,
+				order = 40.1,
+			},
 
-	opts["displayAuraIcon"] = {
-		type = 'toggle',
-		name = "Display aura icon",
-		desc = "Whether or not to display an icon for the aura that this bar is tracking",
-		get = function()
-			return self.moduleSettings.displayAuraIcon
-		end,
-		set = function(info, v)
-			self.moduleSettings.displayAuraIcon = v
-			self:UpdateIcon()
-		end,
-		disabled = function()
-			return not self.moduleSettings.enabled
-		end,
-		order = 40.1,
-	}
+			auraIconXOffset = {
+				type = 'range',
+				min = -250,
+				max = 250,
+				step = 1,
+				name = "Aura icon horizontal offset",
+				desc = "Adjust the horizontal position of the aura icon",
+				get = function()
+					return self.moduleSettings.auraIconXOffset
+				end,
+				set = function(info, v)
+					self.moduleSettings.auraIconXOffset = v
+					self:PositionIcons()
+				end,
+				disabled = function()
+					return not self.moduleSettings.enabled or not self.moduleSettings.displayAuraIcon
+				end,
+				order = 40.2,
+			},
 
-	opts["auraIconXOffset"] = {
-		type = 'range',
-		min = -250,
-		max = 250,
-		step = 1,
-		name = "Aura icon horizontal offset",
-		desc = "Adjust the horizontal position of the aura icon",
-		get = function()
-			return self.moduleSettings.auraIconXOffset
-		end,
-		set = function(info, v)
-			self.moduleSettings.auraIconXOffset = v
-			self:PositionIcons()
-		end,
-		disabled = function()
-			return not self.moduleSettings.enabled or not self.moduleSettings.displayAuraIcon
-		end,
-		order = 40.2,
-	}
+			auraIconYOffset = {
+				type = 'range',
+				min = -250,
+				max = 250,
+				step = 1,
+				name = "Aura icon vertical offset",
+				desc = "Adjust the vertical position of the aura icon",
+				get = function()
+					return self.moduleSettings.auraIconYOffset
+				end,
+				set = function(info, v)
+					self.moduleSettings.auraIconYOffset = v
+					self:PositionIcons()
+				end,
+				disabled = function()
+					return not self.moduleSettings.enabled or not self.moduleSettings.displayAuraIcon
+				end,
+				order = 40.3,
+			},
 
-	opts["auraIconYOffset"] = {
-		type = 'range',
-		min = -250,
-		max = 250,
-		step = 1,
-		name = "Aura icon vertical offset",
-		desc = "Adjust the vertical position of the aura icon",
-		get = function()
-			return self.moduleSettings.auraIconYOffset
-		end,
-		set = function(info, v)
-			self.moduleSettings.auraIconYOffset = v
-			self:PositionIcons()
-		end,
-		disabled = function()
-			return not self.moduleSettings.enabled or not self.moduleSettings.displayAuraIcon
-		end,
-		order = 40.3,
-	}
-
-	opts["auraIconScale"] = {
-		type = 'range',
-		min = 0.1,
-		max = 3.0,
-		step = 0.05,
-		name = 'Aura icon scale',
-		desc = 'Adjusts the size of the aura icon for this bar',
-		get = function()
-			return self.moduleSettings.auraIconScale
-		end,
-		set = function(info, v)
-			self.moduleSettings.auraIconScale = v
-			self:PositionIcons()
-		end,
-		disabled = function()
-			return not self.moduleSettings.enabled or not self.moduleSettings.displayAuraIcon
-		end,
-		order = 40.4,
+			auraIconScale = {
+				type = 'range',
+				min = 0.1,
+				max = 3.0,
+				step = 0.05,
+				name = 'Aura icon scale',
+				desc = 'Adjusts the size of the aura icon for this bar',
+				get = function()
+					return self.moduleSettings.auraIconScale
+				end,
+				set = function(info, v)
+					self.moduleSettings.auraIconScale = v
+					self:PositionIcons()
+				end,
+				disabled = function()
+					return not self.moduleSettings.enabled or not self.moduleSettings.displayAuraIcon
+				end,
+				order = 40.4,
+			},
+		},
 	}
 
 	return opts
diff --git a/modules/FocusHealth.lua b/modules/FocusHealth.lua
index 4805e0a..6c8b7b0 100644
--- a/modules/FocusHealth.lua
+++ b/modules/FocusHealth.lua
@@ -96,104 +96,104 @@ function FocusHealth.prototype:GetOptions()
 		order = 43
 	}
 
-	opts["headerIcons"] = {
-		type = 'header',
-		name = 'Icons',
-		order = 50
-	}
+	opts["iconSettings"] = {
+		type = 'group',
+		name = '|c'..self.configColor..'Icon Settings|r',
+		args = {
+			showRaidIcon = {
+				type = "toggle",
+				name = "Show Raid Icon",
+				desc = "Whether or not to show the raid icon above this bar",
+				get = function()
+					return self.moduleSettings.showRaidIcon
+				end,
+				set = function(info, value)
+					self.moduleSettings.showRaidIcon = value
+					self:UpdateRaidFocusIcon()
+				end,
+				disabled = function()
+					return not self.moduleSettings.enabled
+				end,
+				order = 50.1
+			},
 
-	opts["showRaidIcon"] = {
-		type = "toggle",
-		name = "Show Raid Icon",
-		desc = "Whether or not to show the raid icon above this bar",
-		get = function()
-			return self.moduleSettings.showRaidIcon
-		end,
-		set = function(info, value)
-			self.moduleSettings.showRaidIcon = value
-			self:UpdateRaidFocusIcon()
-		end,
-		disabled = function()
-			return not self.moduleSettings.enabled
-		end,
-		order = 50.1
-	}
+			lockIconAlpha = {
+				type = "toggle",
+				name = "Lock raid icon to 100% alpha",
+				desc = "With this enabled, the raid icon is always 100% alpha, regardless of the bar's alpha. Otherwise, it assumes the bar's alpha level.",
+				width = 'double',
+				get = function()
+					return self.moduleSettings.lockIconAlpha
+				end,
+				set = function(info, value)
+					self.moduleSettings.lockIconAlpha = value
+					self:Redraw()
+				end,
+				disabled = function()
+					return not self.moduleSettings.enabled
+				end,
+				order = 51
+			},
 
-	opts["lockIconAlpha"] = {
-		type = "toggle",
-		name = "Lock raid icon to 100% alpha",
-		desc = "With this enabled, the raid icon is always 100% alpha, regardless of the bar's alpha. Otherwise, it assumes the bar's alpha level.",
-		width = 'double',
-		get = function()
-			return self.moduleSettings.lockIconAlpha
-		end,
-		set = function(info, value)
-			self.moduleSettings.lockIconAlpha = value
-			self:Redraw()
-		end,
-		disabled = function()
-			return not self.moduleSettings.enabled
-		end,
-		order = 51
-	}
+			raidIconOnTop = {
+				type = "toggle",
+				name = "Draw Raid Icon On Top",
+				desc = "Whether to draw the raid icon in front of or behind this bar",
+				get = function()
+					return self.moduleSettings.raidIconOnTop
+				end,
+				set = function(info, value)
+					self.moduleSettings.raidIconOnTop = value
+					self:UpdateRaidFocusIcon()
+				end,
+				disabled = function()
+					return not self.moduleSettings.enabled or not self.moduleSettings.showRaidIcon
+				end,
+				order = 52
+			},
 
-	opts["raidIconOnTop"] = {
-		type = "toggle",
-		name = "Draw Raid Icon On Top",
-		desc = "Whether to draw the raid icon in front of or behind this bar",
-		get = function()
-			return self.moduleSettings.raidIconOnTop
-		end,
-		set = function(info, value)
-			self.moduleSettings.raidIconOnTop = value
-			self:UpdateRaidFocusIcon()
-		end,
-		disabled = function()
-			return not self.moduleSettings.enabled or not self.moduleSettings.showRaidIcon
-		end,
-		order = 52
-	}
+			raidIconXOffset = {
+				type = "range",
+				name = "Raid Icon X Offset",
+				desc = "How far to push the raid icon right or left",
+				min = -300,
+				max = 300,
+				step = 1,
+				get = function()
+					return self.moduleSettings.raidIconXOffset
+				end,
+				set = function(info, value)
+					self.moduleSettings.raidIconXOffset = value
+					self:SetRaidIconPlacement()
+					self:Redraw()
+				end,
+				disabled = function()
+					return not self.moduleSettings.enabled
+				end,
+				order = 53
+			},
 
-	opts["raidIconXOffset"] = {
-		type = "range",
-		name = "Raid Icon X Offset",
-		desc = "How far to push the raid icon right or left",
-		min = -300,
-		max = 300,
-		step = 1,
-		get = function()
-			return self.moduleSettings.raidIconXOffset
-		end,
-		set = function(info, value)
-			self.moduleSettings.raidIconXOffset = value
-			self:SetRaidIconPlacement()
-			self:Redraw()
-		end,
-		disabled = function()
-			return not self.moduleSettings.enabled
-		end,
-		order = 53
-	}
-
-	opts["raidIconYOffset"] = {
-		type = "range",
-		name = "Raid Icon Y Offset",
-		desc = "How far to push the raid icon up or down",
-		min = -300,
-		max = 300,
-		step = 1,
-		get = function()
-			return self.moduleSettings.raidIconYOffset
-		end,
-		set = function(info, value)
-			self.moduleSettings.raidIconYOffset = value
-			self:SetRaidIconPlacement()
-			self:Redraw()
-		end,
-		disabled = function()
-			return not self.moduleSettings.enabled
-		end,
-		order = 54
+			raidIconYOffset = {
+				type = "range",
+				name = "Raid Icon Y Offset",
+				desc = "How far to push the raid icon up or down",
+				min = -300,
+				max = 300,
+				step = 1,
+				get = function()
+					return self.moduleSettings.raidIconYOffset
+				end,
+				set = function(info, value)
+					self.moduleSettings.raidIconYOffset = value
+					self:SetRaidIconPlacement()
+					self:Redraw()
+				end,
+				disabled = function()
+					return not self.moduleSettings.enabled
+				end,
+				order = 54
+			},
+		},
 	}
 
 	opts["shortenHealth"] = {