- 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

@@ -101,13 +101,11 @@ function IceCastBar.prototype:GetOptions()
 		order = 39.999
 	}
 
-	opts["headerIcons"] = {
+	opts["iconSettings"] = {
-		type = 'header',
+		type = 'group',
-		name = 'Icons',
+		name = '|c'..self.configColor..'Icon Settings|r',
-		order = 50
+		args = {
-	}
+			displayAuraIcon = {
-
-	opts["displayAuraIcon"] = {
 				type = 'toggle',
 				name = "Display aura icon",
 				desc = "Whether or not to display an icon for the aura that this bar is tracking",
@@ -128,9 +126,9 @@ function IceCastBar.prototype:GetOptions()
 					return not self.moduleSettings.enabled
 				end,
 				order = 51,
-	}
+			},
 
-	opts["auraIconXOffset"] = {
+			auraIconXOffset = {
 				type = 'range',
 				min = -250,
 				max = 250,
@@ -148,9 +146,9 @@ function IceCastBar.prototype:GetOptions()
 					return not self.moduleSettings.enabled or not self.moduleSettings.displayAuraIcon
 				end,
 				order = 52,
-	}
+			},
 
-	opts["auraIconYOffset"] = {
+			auraIconYOffset = {
 				type = 'range',
 				min = -250,
 				max = 250,
@@ -168,9 +166,9 @@ function IceCastBar.prototype:GetOptions()
 					return not self.moduleSettings.enabled or not self.moduleSettings.displayAuraIcon
 				end,
 				order = 53,
-	}
+			},
 
-	opts["auraIconScale"] = {
+			auraIconScale = {
 				type = 'range',
 				min = 0.1,
 				max = 3.0,
@@ -188,6 +186,8 @@ function IceCastBar.prototype:GetOptions()
 					return not self.moduleSettings.enabled or not self.moduleSettings.displayAuraIcon
 				end,
 				order = 54,
+			},
+		},
 	}
 
 	opts["reverseChannel"] = {

modules/CustomBar.lua

@@ -348,13 +348,11 @@ function IceCustomBar.prototype:GetOptions()
 		order = 31.1,
 	}
 
-	opts["headerIcons"] = {
+	opts["iconSettings"] = {
-		type = 'header',
+		type = 'group',
-		name = 'Icons',
+		name = '|c'..self.configColor..'Icon Settings|r',
-		order = 40
+		args = {
-	}
+			displayAuraIcon = {
-
-	opts["displayAuraIcon"] = {
 				type = 'toggle',
 				name = "Display aura icon",
 				desc = "Whether or not to display an icon for the aura that this bar is tracking",
@@ -375,9 +373,9 @@ function IceCustomBar.prototype:GetOptions()
 					return not self.moduleSettings.enabled
 				end,
 				order = 40.1,
-	}
+			},
 
-	opts["auraIconXOffset"] = {
+			auraIconXOffset = {
 				type = 'range',
 				min = -250,
 				max = 250,
@@ -395,9 +393,9 @@ function IceCustomBar.prototype:GetOptions()
 					return not self.moduleSettings.enabled or not self.moduleSettings.displayAuraIcon
 				end,
 				order = 40.2,
-	}
+			},
 
-	opts["auraIconYOffset"] = {
+			auraIconYOffset = {
 				type = 'range',
 				min = -250,
 				max = 250,
@@ -415,9 +413,9 @@ function IceCustomBar.prototype:GetOptions()
 					return not self.moduleSettings.enabled or not self.moduleSettings.displayAuraIcon
 				end,
 				order = 40.3,
-	}
+			},
 
-	opts["auraIconScale"] = {
+			auraIconScale = {
 				type = 'range',
 				min = 0.1,
 				max = 3.0,
@@ -435,6 +433,8 @@ function IceCustomBar.prototype:GetOptions()
 					return not self.moduleSettings.enabled or not self.moduleSettings.displayAuraIcon
 				end,
 				order = 40.4,
+			},
+		},
 	}
 
 	return opts

modules/CustomCDBar.lua

@@ -264,13 +264,11 @@ function IceCustomCDBar.prototype:GetOptions()
 		order = 31.1,
 	}
 
-	opts["headerIcons"] = {
+	opts["iconSettings"] = {
-		type = 'header',
+		type = 'group',
-		name = 'Icons',
+		name = '|c'..self.configColor..'Icon Settings|r',
-		order = 40
+		args = {
-	}
+			displayAuraIcon = {
-
-	opts["displayAuraIcon"] = {
 				type = 'toggle',
 				name = "Display aura icon",
 				desc = "Whether or not to display an icon for the aura that this bar is tracking",
@@ -285,9 +283,9 @@ function IceCustomCDBar.prototype:GetOptions()
 					return not self.moduleSettings.enabled
 				end,
 				order = 40.1,
-	}
+			},
 
-	opts["auraIconXOffset"] = {
+			auraIconXOffset = {
 				type = 'range',
 				min = -250,
 				max = 250,
@@ -305,9 +303,9 @@ function IceCustomCDBar.prototype:GetOptions()
 					return not self.moduleSettings.enabled or not self.moduleSettings.displayAuraIcon
 				end,
 				order = 40.2,
-	}
+			},
 
-	opts["auraIconYOffset"] = {
+			auraIconYOffset = {
 				type = 'range',
 				min = -250,
 				max = 250,
@@ -325,9 +323,9 @@ function IceCustomCDBar.prototype:GetOptions()
 					return not self.moduleSettings.enabled or not self.moduleSettings.displayAuraIcon
 				end,
 				order = 40.3,
-	}
+			},
 
-	opts["auraIconScale"] = {
+			auraIconScale = {
 				type = 'range',
 				min = 0.1,
 				max = 3.0,
@@ -345,6 +343,8 @@ function IceCustomCDBar.prototype:GetOptions()
 					return not self.moduleSettings.enabled or not self.moduleSettings.displayAuraIcon
 				end,
 				order = 40.4,
+			},
+		},
 	}
 
 	return opts

modules/FocusHealth.lua

@@ -96,13 +96,11 @@ function FocusHealth.prototype:GetOptions()
 		order = 43
 	}
 
-	opts["headerIcons"] = {
+	opts["iconSettings"] = {
-		type = 'header',
+		type = 'group',
-		name = 'Icons',
+		name = '|c'..self.configColor..'Icon Settings|r',
-		order = 50
+		args = {
-	}
+			showRaidIcon = {
-
-	opts["showRaidIcon"] = {
 				type = "toggle",
 				name = "Show Raid Icon",
 				desc = "Whether or not to show the raid icon above this bar",
@@ -117,9 +115,9 @@ function FocusHealth.prototype:GetOptions()
 					return not self.moduleSettings.enabled
 				end,
 				order = 50.1
-	}
+			},
 
-	opts["lockIconAlpha"] = {
+			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.",
@@ -135,9 +133,9 @@ function FocusHealth.prototype:GetOptions()
 					return not self.moduleSettings.enabled
 				end,
 				order = 51
-	}
+			},
 
-	opts["raidIconOnTop"] = {
+			raidIconOnTop = {
 				type = "toggle",
 				name = "Draw Raid Icon On Top",
 				desc = "Whether to draw the raid icon in front of or behind this bar",
@@ -152,9 +150,9 @@ function FocusHealth.prototype:GetOptions()
 					return not self.moduleSettings.enabled or not self.moduleSettings.showRaidIcon
 				end,
 				order = 52
-	}
+			},
 
-	opts["raidIconXOffset"] = {
+			raidIconXOffset = {
 				type = "range",
 				name = "Raid Icon X Offset",
 				desc = "How far to push the raid icon right or left",
@@ -173,9 +171,9 @@ function FocusHealth.prototype:GetOptions()
 					return not self.moduleSettings.enabled
 				end,
 				order = 53
-	}
+			},
 
-	opts["raidIconYOffset"] = {
+			raidIconYOffset = {
 				type = "range",
 				name = "Raid Icon Y Offset",
 				desc = "How far to push the raid icon up or down",
@@ -194,6 +192,8 @@ function FocusHealth.prototype:GetOptions()
 					return not self.moduleSettings.enabled
 				end,
 				order = 54
+			},
+		},
 	}
 
 	opts["shortenHealth"] = {