Quantcast

preparing for 1.2.6

failcoder [08-19-15 - 04:54]
preparing for 1.2.6
Filename
SVUI_ActionBars/SVUI_ActionBars.lua
SVUI_Skins/components/blizzard/lfd.lua
SVUI_Skins/components/blizzard/pvp.lua
diff --git a/SVUI_ActionBars/SVUI_ActionBars.lua b/SVUI_ActionBars/SVUI_ActionBars.lua
index a5c8f5f..81af869 100644
--- a/SVUI_ActionBars/SVUI_ActionBars.lua
+++ b/SVUI_ActionBars/SVUI_ActionBars.lua
@@ -56,6 +56,7 @@ local NewFrame = CreateFrame
 local NewHook = hooksecurefunc
 local NUM_ACTIONBAR_BUTTONS = NUM_ACTIONBAR_BUTTONS;
 local SEQUENCE_PATTERN = '%s [bar:%d] %d;';
+local BASE_PAGING = '[vehicleui,mod:alt,mod:ctrl] %d; [possessbar] %d; [overridebar] %d; [form,noform] 0; [shapeshift] 13;';
 --[[
 	Quick explaination of what Im doing with all of these locals...
 	What I have done is set local variables for every database value
@@ -496,23 +497,20 @@ function MOD:SetBarConfigData(bar)
 end

 function MOD:UpdateBarPagingDefaults()
-	local custom;
-	local parse = "[vehicleui,mod:alt,mod:ctrl] %d; [possessbar] %d; [overridebar] %d; [form,noform] 0; [shapeshift] 13; [bar:2] 2; [bar:3] 3; [bar:4] 4;";
-	for i=5, TOTAL_BARS do
-		parse = SEQUENCE_PATTERN:format(parse, i, i)
-	end
+	local core_paging = BASE_PAGING:format(GetVehicleBarIndex(), GetVehicleBarIndex(), GetOverrideBarIndex());
+	local mainbar = _G["SVUI_ActionBar1"];
+	if(mainbar) then
+		local parse = core_paging .. " ";

-	parse = parse .. " %s";
+		for i=2, TOTAL_BARS do
+			parse = SEQUENCE_PATTERN:format(parse, i, i)
+		end

-	local mainbar = _G["SVUI_ActionBar1"]
-	if(mainbar) then
 		if SV.db.ActionBars.Bar1.useCustomPaging then
-			custom = SV.db.ActionBars.Bar1.customPaging[SV.class];
-		else
-			custom = ""
+			parse = parse .. " " .. SV.db.ActionBars.Bar1.customPaging[SV.class];
 		end
-
-		mainbar.conditions = parse:format(GetVehicleBarIndex(), GetVehicleBarIndex(), GetOverrideBarIndex(), custom);
+		--print(parse)
+		mainbar.conditions = parse;
 	end

 	for i=2, TOTAL_BARS do
@@ -520,6 +518,7 @@ function MOD:UpdateBarPagingDefaults()
 		local bar = _G["SVUI_Action" .. id]
 		if(bar and SV.db.ActionBars[id].useCustomPaging) then
 			bar.conditions = SV.db.ActionBars[id].customPaging[SV.class];
+			--print('Bar '..i..': '..bar.conditions);
 		end
 	end

diff --git a/SVUI_Skins/components/blizzard/lfd.lua b/SVUI_Skins/components/blizzard/lfd.lua
index 827cc2b..8a861e9 100644
--- a/SVUI_Skins/components/blizzard/lfd.lua
+++ b/SVUI_Skins/components/blizzard/lfd.lua
@@ -186,6 +186,7 @@ local function LFDFrameStyle()
   PVEFrameTopBorder:Hide()
   PVEFrameLeftInsetBg:Hide()
   PVEFrame.shadows:Hide()
+  PVEFrame:EnableMouse(false)

   LFDQueueFramePartyBackfillBackfillButton:SetStyle("Button")
   LFDQueueFramePartyBackfillNoBackfillButton:SetStyle("Button")
diff --git a/SVUI_Skins/components/blizzard/pvp.lua b/SVUI_Skins/components/blizzard/pvp.lua
index cc55c9d..db34a0a 100644
--- a/SVUI_Skins/components/blizzard/pvp.lua
+++ b/SVUI_Skins/components/blizzard/pvp.lua
@@ -35,13 +35,6 @@ local function PVPFrameStyle()
 	local WarGamesFrame = _G.WarGamesFrame;
 	local PVPReadyDialog = _G.PVPReadyDialog;

-	SV.API:Set("Window", PVPUIFrame, true)
-
-	SV.API:Set("CloseButton", PVPUIFrameCloseButton)
-
-	for g = 1, 2 do
-		SV.API:Set("Tab", _G["PVPUIFrameTab"..g])
-	end

 	for i = 1, 4 do
 		local btn = _G["PVPQueueFrameCategoryButton"..i]