From 523a9f03ac7b74ef487818d67f03acf1d8b1df67 Mon Sep 17 00:00:00 2001
From: Taracque <taracque@taracque.hu>
Date: Wed, 19 Jun 2013 10:07:14 +0200
Subject: [PATCH] Added some work on Masque usage

---
 Ele_GUI.lua      |   14 ++++++++++++++
 Elementarist.lua |   22 +++++++++++++++++-----
 Elementarist.toc |    4 ++--
 3 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/Ele_GUI.lua b/Ele_GUI.lua
index 8a1227f..4f7ad49 100755
--- a/Ele_GUI.lua
+++ b/Ele_GUI.lua
@@ -634,6 +634,14 @@ function Elementarist:CreateGUI()
 	Elementarist.displayFrame_dps =  displayFrame_dps
 	Elementarist.cooldownFrame = cooldownFrame
 	
+	if (Elementarist.Masque) then
+		Elementarist.MasqueGroup:AddButton(Elementarist.displayFrame_next);
+		Elementarist.MasqueGroup:AddButton(Elementarist.displayFrame_next1);
+		Elementarist.MasqueGroup:AddButton(Elementarist.displayFrame_next2);
+		Elementarist.MasqueGroup:AddButton(Elementarist.displayFrame_misc);
+		Elementarist.MasqueGroup:AddButton(Elementarist.displayFrame_int);
+	end
+	
 	local debuffTracker = CreateFrame("Frame","ElementaristDebuffTrackerFrame",UIParent)
 	debuffTracker:SetFrameStrata("BACKGROUND")
 	debuffTracker:SetWidth(175)
@@ -671,6 +679,9 @@ function Elementarist:CreateGUI()
 	auraCooldownFrame:ClearAllPoints()
 	auraCooldownFrame:SetPoint("TOPLEFT", Elementarist.debuffTracker, "TOPLEFT", 0, 0)
 	Elementarist.auraCooldownFrame["main"] = auraCooldownFrame
+	if (Elementarist.Masque) then
+		Elementarist.MasqueGroup:AddButton( Elementarist.auraCooldownFrame["main"] );
+	end
 
 	for i=1,10,1 do
 		local debuffTracker_cd = CreateFrame("Frame","$parent_debuff_" .. tostring(i), ElementaristDebuffTrackerFrame)
@@ -690,6 +701,9 @@ function Elementarist:CreateGUI()
 		auraCooldownFrame:ClearAllPoints()
 		auraCooldownFrame:SetPoint("TOPLEFT", 50 + ( 25 * ( math.floor( (i - 1) / 2) ) ), - (25 * ( (i - 1) % 2) ) )
 		Elementarist.auraCooldownFrame["mini_" .. tostring(i)] = auraCooldownFrame
+		if (Elementarist.Masque) then
+			Elementarist.MasqueGroup:AddButton( Elementarist.auraCooldownFrame["mini_" .. tostring(i)] );
+		end
 	end
 
 	local shieldTracker = CreateFrame("Frame","ElementaristShieldTrackerFrame",UIParent)
diff --git a/Elementarist.lua b/Elementarist.lua
index 2207357..ce301c8 100755
--- a/Elementarist.lua
+++ b/Elementarist.lua
@@ -1,5 +1,5 @@
 -------------------------------------------------------------------------------
--- Elementarist 3.2.1
+-- Elementarist 3.2.2
 --
 -- Shows the advised spell for an elemental shaman for optimal DPS output.
 -------------------------------------------------------------------------------
@@ -8,7 +8,7 @@ Elementarist = {Locals = {}}
 
 local L = Elementarist.Locals
 
-Elementarist.versionNumber = '3.2.1';
+Elementarist.versionNumber = '3.2.2';
 Elementarist.enabled = true;
 Elementarist.playerName = UnitName("player")
 Elementarist.playerGUID = UnitGUID("player")
@@ -35,7 +35,9 @@ Elementarist.DebugMode = false
 Elementarist.DebugChat = DEFAULT_CHAT_FRAME
 Elementarist.inParty = 0
 Elementarist.OmniCC = _G['OmniCC']
-Elementarist.SpellFlash = _G['SpellFlashAddon']
+Elementarist.SpellFlash = _G['SpellFlashAddon'];
+Elementarist.Masque = _G['Masque'];
+Elementarist.MasqueGroup = nil;
 Elementarist.SFHistory = {
 	["spell"] = nil,
 	["misc"] = nil,
@@ -198,6 +200,9 @@ function Elementarist.events.ADDON_LOADED(addon)
 	if addon == "SpellFlash" then
 		Elementarist.SpellFlash = _G['SpellFlashAddon']
 	end
+	if addon == "Masque" then
+		Elementarist.Masque = _G['Masque']
+	end
 	if addon ~= "Elementarist" then return end
 
 	-- load defaults, if first start
@@ -222,11 +227,18 @@ function Elementarist.events.ADDON_LOADED(addon)
 	Elementarist.EleLayout["1"] = L.LAYOUT_GROW
 	Elementarist.EleLayout["2"] = L.LAYOUT_RIGHTTOLEFT
 	
+	-- Coop with other addons
+	Elementarist.OmniCC = _G['OmniCC']
+	Elementarist.SpellFlash = _G['SpellFlashAddon']
+	Elementarist.Masque = _G['Masque']
+	
+	if (Elementarist.Masque) then
+		Elementarist.MasqueGroup = Elementarist.Masque:Group("Elementarist", "MainGroup");
+	end
+
 	-- Create GUI
 	Elementarist:CreateGUI()
 	Elementarist.displayFrame:SetScale(ElementaristDB.scale)
-	Elementarist.OmniCC = _G['OmniCC']
-	Elementarist.SpellFlash = _G['SpellFlashAddon']
 
 	-- Register for Function Events
 	Elementarist.eventFrame:RegisterEvent("COMBAT_LOG_EVENT_UNFILTERED")
diff --git a/Elementarist.toc b/Elementarist.toc
index c3043f8..a18d42f 100755
--- a/Elementarist.toc
+++ b/Elementarist.toc
@@ -2,9 +2,9 @@
 ## Title: Elementarist
 ## Notes: Elemental shaman spell rotation helper
 ## Author: Taracque, Felmosórongy of Arathor
-## Version: 3.2.1
+## Version: 3.2.2
 ## SavedVariables: ElementaristDB
-## OptionalDeps: OmniCC, SpellFlash
+## OptionalDeps: OmniCC, SpellFlash, Masque
 ## Dependencies: 
 
 Elementarist.lua
-- 
1.7.9.5