Moved Hotkey and MacroText handling to the ButtonBar prototype and show the Hotkey on Pet and Stance Bar (default off)

Options/ButtonBar.lua

@@ -17,6 +17,8 @@ do
 		rows = "Rows",
 		padding = "Padding",
 		zoom = "Zoom",
+		macrotext = "HideMacroText",
+		hotkey = "HideHotkey",
 	}
 	
 	-- retrieves a valid bar object from the barregistry table
@@ -78,6 +80,27 @@ function ButtonBar:GetOptionObject()
 			set = optSetter,
 			get = optGetter,
 		},
+		hidedesc = {
+			order = 80,
+			name = L["Button Look"],
+			type = "header",
+		},
+		macrotext = {
+			order = 81,
+			type = "toggle",
+			name = L["Hide Macro Text"],
+			desc = L["Hide the Macro Text on the buttons of this bar."],
+			set = optSetter,
+			get = optGetter,
+		},
+		hotkey = {
+			order = 82,
+			type = "toggle",
+			name = L["Hide Hotkey"],
+			desc = L["Hide the Hotkey on the buttons of this bar."],
+			set = optSetter,
+			get = optGetter,
+		},
 	}
 	obj:AddElementGroup("general", otbl_general)
 	return obj