Build 14107

Ambalus · May 15, 2011 · 9a21b31 · 9a21b31
1 parent a8d9ae6
commit 9a21b31
Show file tree

Hide file tree

Showing 67 changed files with 1,744 additions and 807 deletions.
diff --git a/AddOns/Blizzard_CUFProfiles/Blizzard_CUFProfiles.toc b/AddOns/Blizzard_CUFProfiles/Blizzard_CUFProfiles.toc
@@ -0,0 +1,6 @@
+## Interface: 40200
+## Title: Blizzard_CUFProfiles
+## Secure: 1
+## LoadOnDemand: 0
+
+Blizzard_CompactUnitFrameProfiles.xml
diff --git a/...les/Blizzard_CompactUnitFrameProfiles.lua → ...les/Blizzard_CompactUnitFrameProfiles.lua b/...les/Blizzard_CompactUnitFrameProfiles.lua → ...les/Blizzard_CompactUnitFrameProfiles.lua
@@ -268,7 +268,7 @@ function CompactUnitFrameProfiles_GetAutoActivationState()
 		if ( numRaidMembers > 0 ) then
 			return countMap[GetNumRaidMembers()], "world", "PvE";
 		else
-			return countMap[GetNumPartyMembers() + 1], "world", "PvE";
+			return 5, "world", "PvE";
 		end
 	end
 end

diff --git a/...les/Blizzard_CompactUnitFrameProfiles.xml → ...les/Blizzard_CompactUnitFrameProfiles.xml b/...les/Blizzard_CompactUnitFrameProfiles.xml → ...les/Blizzard_CompactUnitFrameProfiles.xml
diff --git a/AddOns/Blizzard_CompactRaidFrames/Blizzard_CompactRaidFrameContainer.lua b/AddOns/Blizzard_CompactRaidFrames/Blizzard_CompactRaidFrameContainer.lua
@@ -28,11 +28,14 @@ function CompactRaidFrameContainer_OnLoad(self)
 	self:RegisterEvent("PARTY_MEMBERS_CHANGED");
 	self:RegisterEvent("UNIT_PET");
 	
+	local unitFrameReleaseFunc = function(frame)
+													CompactUnitFrame_SetUnit(frame, nil);
+												end;
 	self.frameReservations = {
-		raid		= CompactRaidFrameReservation_NewManager();
-		pet		= CompactRaidFrameReservation_NewManager();
-		flagged	= CompactRaidFrameReservation_NewManager();	--For Main Tank/Assist units
-		target	= CompactRaidFrameReservation_NewManager();	--Target of target for Main Tank/Main Assist
+		raid		= CompactRaidFrameReservation_NewManager(unitFrameReleaseFunc);
+		pet		= CompactRaidFrameReservation_NewManager(unitFrameReleaseFunc);
+		flagged	= CompactRaidFrameReservation_NewManager(unitFrameReleaseFunc);	--For Main Tank/Assist units
+		target	= CompactRaidFrameReservation_NewManager(unitFrameReleaseFunc);	--Target of target for Main Tank/Main Assist
 	}
 	
 	self.frameUpdateList = {
@@ -42,7 +45,6 @@ function CompactRaidFrameContainer_OnLoad(self)
 	}
 
 	self.unitFrameUnusedFunc = function(frame)
-													CompactUnitFrame_SetUnit(frame, nil);
 													frame.inUse = false;
 												end;
 												
@@ -153,7 +155,7 @@ function CompactRaidFrameContainer_UpdateDisplayedUnits(self)
 end
 
 function CompactRaidFrameContainer_LayoutFrames(self)
-	--First, hide everything we currently use.
+	--First, mark everything we currently use as unused. We'll hide all the ones that are still unused at the end of this function. (On release)
 	for i=1, #self.flowFrames do
 		if ( type(self.flowFrames[i]) == "table" and self.flowFrames[i].unusedFunc ) then
 			self.flowFrames[i]:unusedFunc();
@@ -310,7 +312,7 @@ end
 
 --Utility Functions
 function CompactRaidFrameContainer_AddUnitFrame(self, unit, frameType)
-	local frame =CompactRaidFrameContainer_GetUnitFrame(self, unit, frameType);
+	local frame = CompactRaidFrameContainer_GetUnitFrame(self, unit, frameType);
 	CompactUnitFrame_SetUnit(frame, unit);
 	FlowContainer_AddObject(self, frame);
 	

diff --git a/AddOns/Blizzard_CompactRaidFrames/Blizzard_CompactRaidFrameReservationManager.lua b/AddOns/Blizzard_CompactRaidFrames/Blizzard_CompactRaidFrameReservationManager.lua
@@ -1,7 +1,7 @@
 
 
-function CompactRaidFrameReservation_NewManager()
-	return { unusedFrames = {}, reservations = {} };
+function CompactRaidFrameReservation_NewManager(releaseFunc)
+	return { unusedFrames = {}, reservations = {}, releaseFunc = releaseFunc };
 end
 
 function CompactRaidFrameReservation_GetFrame(self, key)
@@ -23,6 +23,9 @@ end
 function CompactRaidFrameReservation_ReleaseUnusedReservations(self)
 	for key, frame in pairs(self.reservations) do
 		if ( frame and not frame.inUse ) then
+			if ( self.releaseFunc ) then
+				self.releaseFunc(frame);
+			end
 			self.reservations[key] = false;
 			tinsert(self.unusedFrames, frame);
 		end

diff --git a/AddOns/Blizzard_CompactUnitFrameProfiles/Blizzard_CompactUnitFrameProfiles.toc b/AddOns/Blizzard_CompactUnitFrameProfiles/Blizzard_CompactUnitFrameProfiles.toc
diff --git a/AddOns/Blizzard_GuildUI/Blizzard_GuildInfo.lua b/AddOns/Blizzard_GuildUI/Blizzard_GuildInfo.lua
@@ -34,7 +34,7 @@ end
 
 function GuildInfoFrame_OnEvent(self, event, arg1)
 	if ( event == "GUILD_MOTD" ) then
-		GuildInfoMOTD:SetText(arg1);
+		GuildInfoMOTD:SetText(arg1, true);	--Ignores markup.
 	elseif ( event == "GUILD_ROSTER_UPDATE" ) then
 		GuildInfoFrame_UpdatePermissions();
 		GuildInfoFrame_UpdateText();
@@ -187,7 +187,7 @@ function GuildInfoFrame_UpdatePermissions()
 end
 
 function GuildInfoFrame_UpdateText(infoText)
-	GuildInfoMOTD:SetText(GetGuildRosterMOTD());
+	GuildInfoMOTD:SetText(GetGuildRosterMOTD(), true); --Extra argument ignores markup.
 	if ( infoText ) then
 		GuildInfoFrame.cachedInfoText = infoText;
 		GuildInfoFrame.cacheExpiry = GetTime() + 10;
@@ -577,6 +577,13 @@ function GuildRecruitmentApplicant_OnClick(self, button)
 			HybridScrollFrame_CollapseButton(GuildInfoFrameApplicantsContainer);
 		end
 		GuildInfoFrameApplicants_Update();
+	elseif ( button == "RightButton" ) then
+		local dropDown = GuildRecruitmentDropDown;
+		if ( dropDown.index ~= self.index ) then
+			CloseDropDownMenus();
+		end
+		dropDown.index = self.index;
+		ToggleDropDownMenu(1, nil, dropDown, "cursor", 1, -1);
 	end
 end
 
@@ -601,6 +608,59 @@ function GuildRecruitmentApplicant_ShowTooltip(self)
 	GameTooltip:Show();
 end
 
+function GuildRecruitmentDropDown_OnLoad(self)
+	UIDropDownMenu_Initialize(self, GuildRecruitmentDropDown_Initialize, "MENU");
+end
+
+function GuildRecruitmentDropDown_Initialize(self)
+	local info = UIDropDownMenu_CreateInfo();
+	local name = GetGuildApplicantInfo(GuildRecruitmentDropDown.index) or UNKNOWN;
+	info.text = name;
+	info.isTitle = 1;
+	info.notCheckable = 1;
+	UIDropDownMenu_AddButton(info, UIDROPDOWN_MENU_LEVEL);
+
+	info = UIDropDownMenu_CreateInfo();
+	info.notCheckable = 1;
+	info.func = GuildRecruitmentDropDown_OnClick;
+
+	info.text = INVITE;
+	info.arg1 = "invite";
+	UIDropDownMenu_AddButton(info, UIDROPDOWN_MENU_LEVEL);
+
+	info.text = WHISPER;
+	info.arg1 = "whisper";
+	UIDropDownMenu_AddButton(info, UIDROPDOWN_MENU_LEVEL);
+
+	info.text = ADD_FRIEND;
+	info.arg1 = "addfriend";
+	if ( GetFriendInfo(name) ) then
+		info.disabled = 1;
+	end
+	UIDropDownMenu_AddButton(info, UIDROPDOWN_MENU_LEVEL);
+
+	info.text = DECLINE;
+	info.arg1 = "decline";
+	info.disabled = nil;
+	UIDropDownMenu_AddButton(info, UIDROPDOWN_MENU_LEVEL);
+end
+
+function GuildRecruitmentDropDown_OnClick(button, action)
+	local name = GetGuildApplicantInfo(GuildRecruitmentDropDown.index);
+	if ( not name ) then
+		return;
+	end
+	if ( action == "invite" ) then
+		GuildInvite(name);
+	elseif ( action == "whisper" ) then
+		ChatFrame_SendTell(name);
+	elseif ( action == "addfriend" ) then
+		AddOrRemoveFriend(name);
+	elseif ( action == "decline" ) then
+		DeclineGuildApplicant(GuildRecruitmentDropDown.index);
+	end
+end
+
 --*******************************************************************************
 --   Popups
 --*******************************************************************************

diff --git a/AddOns/Blizzard_GuildUI/Blizzard_GuildInfo.xml b/AddOns/Blizzard_GuildUI/Blizzard_GuildInfo.xml
@@ -263,6 +263,7 @@
 		<Scripts>
 			<OnLoad>
 				self:SetBackdropColor(1, 1, 1, 0.3);
+				self:RegisterForClicks("LeftButtonUp", "RightButtonUp");
 			</OnLoad>
 			<OnClick function="GuildRecruitmentApplicant_OnClick"/>
 			<OnEnter function="GuildRecruitmentApplicant_ShowTooltip"/>
@@ -513,15 +514,6 @@
 						<Anchor point="LEFT" relativeTo="$parentHeader2" x="10" y="0"/>
 					</Anchors>
 				</FontString>
-				<FontString name="GuildInfoMOTD" inherits="GameFontNormalSmall" justifyH="LEFT" justifyV="TOP" spacing="2">
-					<Size>
-						<AbsDimension x="291" y="38"/>
-					</Size>
-					<Anchors>
-						<Anchor point="TOPLEFT" relativeTo="$parentHeader2" relativePoint="BOTTOMLEFT" x="14" y="-5"/>
-					</Anchors>
-					<Color r="1" g="1" b="1"/>
-				</FontString>
 				<FontString	inherits="GameFontNormal" text="GUILD_INFORMATION">
 					<Size>
 						<AbsDimension x="0" y="0"/>
@@ -533,6 +525,22 @@
 			</Layer>
 		</Layers>
 		<Frames>
+			<SimpleHTML name="GuildInfoMOTD" disallowFormatting="true">
+				<Size>
+					<AbsDimension x="291" y="38"/>
+				</Size>
+				<Anchors>
+					<Anchor point="TOPLEFT" relativeTo="$parentHeader2" relativePoint="BOTTOMLEFT" x="14" y="-5"/>
+				</Anchors>
+				<Scripts>
+					<OnHyperlinkClick>
+						SetItemRef(link, text, button, self);
+					</OnHyperlinkClick>
+				</Scripts>
+				<FontString inherits="GameFontNormalSmall" justifyH="LEFT" justifyV="TOP" spacing="2">
+					<Color r="1" g="1" b="1"/>
+				</FontString>
+			</SimpleHTML>
 			<Frame name="GuildInfoChallenges">
 				<Size x="319" y="108"/>
 				<Anchors>
@@ -1258,6 +1266,14 @@
 					</OnClick>
 				</Scripts>
 			</Button>
+			<Frame name="GuildRecruitmentDropDown" inherits="UIDropDownMenuTemplate" hidden="true">
+				<Size>
+					<AbsDimension x="10" y="10"/>
+				</Size>
+				<Scripts>
+					<OnLoad function="GuildRecruitmentDropDown_OnLoad"/>
+				</Scripts>
+			</Frame>
 		</Frames>
 		<Scripts>
 			<OnLoad function="GuildInfoFrameApplicants_OnLoad"/>

diff --git a/AddOns/Blizzard_MacroUI/Blizzard_MacroUI.lua b/AddOns/Blizzard_MacroUI/Blizzard_MacroUI.lua
@@ -6,7 +6,7 @@ NUM_ICONS_PER_ROW = 5;
 NUM_ICON_ROWS = 4;
 MACRO_ICON_ROW_HEIGHT = 36;
 
-UIPanelWindows["MacroFrame"] = { area = "left", pushable = 5, whileDead = 1, 	xoffset = -16, 		yoffset = 12 };
+UIPanelWindows["MacroFrame"] = { area = "left", pushable = 1, whileDead = 1, xoffset = -16, yoffset = 12, width = PANEL_DEFAULT_WIDTH };
 
 function MacroFrame_Show()
 	ShowUIPanel(MacroFrame);
@@ -147,6 +147,19 @@ function MacroButton_OnClick(self, button)
 	MacroFrameText:ClearFocus();
 end
 
+function MacroFrameSaveButton_OnClick()
+	MacroFrame_SaveMacro();
+	MacroFrame_Update();
+	MacroPopupFrame:Hide();
+	MacroFrameText:ClearFocus();
+end
+
+function MacroFrameCancelButton_OnClick()
+	MacroFrame_Update();
+	MacroPopupFrame:Hide();
+	MacroFrameText:ClearFocus();
+end
+
 function MacroFrame_SelectMacro(id)
 	MacroFrame.selectedMacro = id;
 end

diff --git a/AddOns/Blizzard_MacroUI/Blizzard_MacroUI.xml b/AddOns/Blizzard_MacroUI/Blizzard_MacroUI.xml
@@ -162,7 +162,7 @@
 					<Anchors>
 						<Anchor point="TOPLEFT" relativeTo="MacroFrameSelectedMacroBackground" relativePoint="BOTTOMLEFT">
 							<Offset>
-								<AbsDimension x="8" y="0"/>
+								<AbsDimension x="8" y="3"/>
 							</Offset>
 						</Anchor>
 					</Anchors>
@@ -259,14 +259,14 @@
 					</Frame>
 				</ScrollChild>
 			</ScrollFrame>
-			<Button name="MacroEditButton" frameStrata="HIGH" inherits="UIPanelButtonTemplate" text="CHANGE_MACRO_NAME_ICON">
+			<Button name="MacroEditButton" frameStrata="HIGH" inherits="UIPanelButtonTemplate2" text="CHANGE_MACRO_NAME_ICON">
 				<Size>
 					<AbsDimension x="170" y="22"/>
 				</Size>
 				<Anchors>
 					<Anchor point="TOPLEFT" relativeTo="MacroFrameSelectedMacroBackground">
 						<Offset>
-							<AbsDimension x="51" y="-30"/>
+							<AbsDimension x="55" y="-30"/>
 						</Offset>
 					</Anchor>
 				</Anchors>
@@ -281,7 +281,7 @@
 				<Anchors>
 					<Anchor point="TOPLEFT" relativeTo="MacroFrameSelectedMacroBackground" relativePoint="BOTTOMLEFT">
 						<Offset>
-							<AbsDimension x="11" y="-18"/>
+							<AbsDimension x="11" y="-13"/>
 						</Offset>
 					</Anchor>
 				</Anchors>
@@ -323,14 +323,44 @@
 					</OnClick>
 				</Scripts>
 			</Button>
+			<Button name="MacroCancelButton" frameStrata="HIGH" inherits="UIPanelButtonTemplate2" text="CANCEL">
+				<Size>
+					<AbsDimension x="80" y="22"/>
+				</Size>
+				<Anchors>
+					<Anchor point="BOTTOMRIGHT" relativeTo="MacroFrameText" relativePoint="TOPRIGHT">
+						<Offset>
+							<AbsDimension x="25" y="10"/>
+						</Offset>
+					</Anchor>
+				</Anchors>
+				<Scripts>
+					<OnClick function="MacroFrameCancelButton_OnClick"/>
+				</Scripts>
+			</Button>
+			<Button name="MacroSaveButton" frameStrata="HIGH" inherits="UIPanelButtonTemplate2" text="SAVE">
+				<Size>
+					<AbsDimension x="80" y="22"/>
+				</Size>
+				<Anchors>
+					<Anchor point="BOTTOM" relativeTo="MacroCancelButton" relativePoint="TOP">
+						<Offset>
+							<AbsDimension x="0" y="15"/>
+						</Offset>
+					</Anchor>
+				</Anchors>
+				<Scripts>
+					<OnClick function="MacroFrameSaveButton_OnClick"/>
+				</Scripts>
+			</Button>
 			<Frame name="MacroFrameTextBackground">
 				<Size>
 					<AbsDimension x="322" y="95"/>
 				</Size>
 				<Anchors>
 					<Anchor point="TOPLEFT" relativeTo="MacroFrame">
 						<Offset>
-							<AbsDimension x="18" y="-305"/>
+							<AbsDimension x="18" y="-300"/>
 						</Offset>
 					</Anchor>
 				</Anchors>

diff --git a/AddOns/Blizzard_MovePad/Blizzard_MovePad.xml b/AddOns/Blizzard_MovePad/Blizzard_MovePad.xml
@@ -42,10 +42,10 @@
 						end
 					</OnClick>
 				</Scripts>
-				<NormalTexture file="LockButton-Locked-Up"/>
-				<PushedTexture file="LockButton-Unlocked-Down"/>
+				<NormalTexture file="Interface\Buttons\LockButton-Locked-Up"/>
+				<PushedTexture file="Interface\Buttons\LockButton-Unlocked-Down"/>
 				<HighlightTexture file="Interface\Buttons\UI-Panel-MinimizeButton-Highlight" alphaMode="ADD"/>
-				<CheckedTexture file="LockButton-Unlocked-Up"/>
+				<CheckedTexture file="Interface\Buttons\LockButton-Unlocked-Up"/>
 			</CheckButton>
 			<CheckButton name="MovePadForward" inherits="MovePadCheckboxTemplate">
 				<Anchors>

diff --git a/FrameXML/Bindings.xml b/FrameXML/Bindings.xml
@@ -738,6 +738,9 @@
 	<Binding name="TOGGLECURRENCY">
 		ToggleCharacter("TokenFrame");
 	</Binding>
+	<Binding name="TOGGLEENCOUNTERJOURNAL">
+		ToggleFrame(EncounterJournal);
+	</Binding>
 
 	<!-- Misc -->
 	<Binding name="STOPCASTING" header="MISC">

diff --git a/FrameXML/BonusActionBarFrame.lua b/FrameXML/BonusActionBarFrame.lua
@@ -292,16 +292,8 @@ function ActionBar_AnimTransitionFinished(self)
 					MainMenuExpBar:SetPoint("TOP", self.nextAnimBar, 0, 0);
 				end
 				if self.nextAnimBar.microBarX then
-					CharacterMicroButton:ClearAllPoints();
 					UpdateMicroButtonsParent(self.nextAnimBar.microBarParent);
-					CharacterMicroButton:SetPoint("BOTTOMLEFT", self.nextAnimBar.microBarX, self.nextAnimBar.microBarY);
-					GuildMicroButton:ClearAllPoints();
-					if self.nextAnimBar.microTwoRows then
-						GuildMicroButton:SetPoint("TOPLEFT", CharacterMicroButton, "BOTTOMLEFT", 0, 22);
-					else
-						GuildMicroButton:SetPoint("BOTTOMLEFT", QuestLogMicroButton, "BOTTOMRIGHT", -3, 0);
-					end
-					UpdateMicroButtons();
+					MoveMicroButtons("BOTTOMLEFT", self.nextAnimBar.microBarParent, "BOTTOMLEFT", self.nextAnimBar.microBarX, self.nextAnimBar.microBarY, self.nextAnimBar.microTwoRows);
 				end
 			end