From 5d2bb1578a59f3e70c9f57d7e1e3d1453836e2b1 Mon Sep 17 00:00:00 2001 From: James Whitehead II Date: Tue, 2 Jan 2007 16:00:28 +0000 Subject: [PATCH] * Fixed a typo --- PerfectRaid.lua | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/PerfectRaid.lua b/PerfectRaid.lua index 91a70dd..df94ed1 100644 --- a/PerfectRaid.lua +++ b/PerfectRaid.lua @@ -74,6 +74,7 @@ function PerfectRaid:Enable() self:RegisterEvent("UNIT_MAXFOCUS", "UNIT_MAXMANA") --TODO: Make this so we can actually instantiate frames as the users wants +--[[ for i=1,8 do local name = "PRHeader"..i self.db.profile.headers[name] = setmetatable({}, {__index=self.headerDefaults}) @@ -89,8 +90,14 @@ function PerfectRaid:Enable() PRHeader6:SetPoint("TOP", PRHeader5, "BOTTOM", 0, -20) PRHeader7:SetPoint("TOP", PRHeader6, "BOTTOM", 0, -20) PRHeader8:SetPoint("TOP", PRHeader7, "BOTTOM", 0, -20) +<<<<<<< .mine +--]] + local header = self:CreateRaidFrame("PRHeader1", "1,2,3,4,5,6,7,8", nil, nil, "CLASS", "WARRIOR,PRIEST,PALADIN,DRUID,SHAMAN,ROGUE,MAGE,WARLOCK,HUNTER", 2, 10, "LEFT") + self:RestorePosition("PRHeader1") +======= --local header = self:CreateRaidFrame("PRHeader1", "1,2,3,4,5,6,7,8", nil, nil, "CLASS", "WARRIOR,PRIEST,PALADIN,DRUID,SHAMAN,ROGUE,MAGE,WARLOCK,HUNTER", 2, 10, "LEFT") --self:RestorePosition("PRHeader1") +>>>>>>> .r35 end function PerfectRaid:SavePosition(name) @@ -161,19 +168,11 @@ function PerfectRaid:CreateRaidFrame(name, title, filter, strict, dragparent, gr frame:SetAttribute("yOffset", -2) frame:SetAttribute("sortMethod", "NAME") frame:SetAttribute("strictFiltering", strict) -<<<<<<< .mine - frame:SetAttribute("groupBy", group) - frame:SetAttribute("grouppingOrder", order) - frame:SetAttribute("maxColumns", columns) - frame:SetAttribute("columnSpacing", coloffset) - frame:SetAttribute("columnAnchorPoint", colanchor) -======= frame:SetAttribute("groupBy", group) frame:SetAttribute("groupingOrder", order) frame:SetAttribute("maxColumns", columns) frame:SetAttribute("columnSpacing", coloffset) frame:SetAttribute("columnAnchorPoint", colanchor) ->>>>>>> .r34 frame.dragparent = dragparent or frame frame.initialConfigFunction = PerfectRaid.ConfigureButton frame:SetMovable(true) -- 1.7.9.5