Build 13698

tekkub · Mar 2, 2011 · 608fece · 608fece
1 parent a1d03e4
commit 608fece
Show file tree

Hide file tree

Showing 29 changed files with 1,656 additions and 413 deletions.
diff --git a/AddOns/Blizzard_GuildBankUI/Blizzard_GuildBankUI.lua b/AddOns/Blizzard_GuildBankUI/Blizzard_GuildBankUI.lua
@@ -109,7 +109,6 @@ function GuildBankFrame_OnLoad(self)
 	GuildBankFrame.numTabs = 4;
 	GuildBankFrame_UpdateTabs();
 	GuildBankFrame_UpdateTabard();
-
 end
 
 function GuildBankFrame_OnEvent(self, event, ...)
@@ -491,11 +490,33 @@ function GuildBankFrame_UpdateTabs()
 		GuildBankTabLimitBackground:Show();
 		GuildBankTabLimitBackgroundLeft:Show();
 		GuildBankTabLimitBackgroundRight:Show();
+		GuildBankCashFlowLabel:Hide();
+		GuildBankCashFlowMoneyFrame:Hide();
+	elseif ( GuildBankFrame.mode == "moneylog" and GetSpellInfo("Cash Flow") ) then
+		MoneyFrame_Update("GuildBankCashFlowMoneyFrame", GetGuildBankBonusDepositMoney());
+		local width = GuildBankCashFlowLabel:GetWidth() + GuildBankCashFlowMoneyFrame:GetWidth() + 10;
+		GuildBankTabLimitBackground:SetWidth(width);
+		if ( width > 310 ) then
+			GuildBankTabLimitBackground:ClearAllPoints();
+			GuildBankTabLimitBackground:SetPoint("RIGHT", GuildBankFrameWithdrawButton, "LEFT", -14, -1);
+		else
+			GuildBankTabLimitBackground:ClearAllPoints();
+			GuildBankTabLimitBackground:SetPoint("TOP", "GuildBankFrame", "TOP", 6, -388);
+		end
+
+		GuildBankTabLimitBackground:Show();
+		GuildBankTabLimitBackgroundLeft:Show();
+		GuildBankTabLimitBackgroundRight:Show();
+		GuildBankLimitLabel:Hide();
+		GuildBankCashFlowLabel:Show();
+		GuildBankCashFlowMoneyFrame:Show();
 	else
 		GuildBankLimitLabel:Hide();
 		GuildBankTabLimitBackground:Hide();
 		GuildBankTabLimitBackgroundLeft:Hide();
 		GuildBankTabLimitBackgroundRight:Hide();
+		GuildBankCashFlowLabel:Hide();
+		GuildBankCashFlowMoneyFrame:Hide();
 	end
 end
 

diff --git a/AddOns/Blizzard_GuildBankUI/Blizzard_GuildBankUI.xml b/AddOns/Blizzard_GuildBankUI/Blizzard_GuildBankUI.xml
@@ -350,6 +350,13 @@
 						</Anchor>
 					</Anchors>
 				</FontString>
+				<FontString name="GuildBankCashFlowLabel" inherits="GameFontNormalSmall" text="GUILDBANK_CASHFLOW">
+					<Anchors>
+						<Anchor point="LEFT" relativeTo="GuildBankTabLimitBackground">
+							<Offset x="4" y="1"/>
+						</Anchor>
+					</Anchors>
+				</FontString>
 				<FontString name="GuildBankMoneyLimitLabel" inherits="GameFontNormalSmall" text="GUILDBANK_AVAILABLE_MONEY">
 					<Size x="0" y="13"/>
 					<Anchors>
@@ -643,6 +650,16 @@
 					</OnLoad>
 				</Scripts>
 			</Frame>
+			<Frame name="GuildBankCashFlowMoneyFrame" inherits="SmallMoneyFrameTemplate">
+				<Anchors>
+					<Anchor point="RIGHT" relativeTo="GuildBankTabLimitBackground" x="10" y="0"/>
+				</Anchors>
+				<Scripts>
+					<OnLoad>
+						SmallMoneyFrame_OnLoad(self, "GUILDBANKCASHFLOW");
+					</OnLoad>
+				</Scripts>
+			</Frame>
 			<Frame name="GuildBankWithdrawMoneyFrame" inherits="SmallMoneyFrameTemplate">
 				<Anchors>
 					<Anchor point="LEFT" relativeTo="GuildBankMoneyLimitLabel" relativePoint="RIGHT">

diff --git a/AddOns/Blizzard_GuildControlUI/Blizzard_GuildControlUI.lua b/AddOns/Blizzard_GuildControlUI/Blizzard_GuildControlUI.lua
@@ -1,7 +1,7 @@
 
 BANK_TAB_OFFSET = 4;
 BANK_TAB_HEIGHT = BANK_TAB_OFFSET + 73;
-NUM_RANK_FLAGS = 19;
+NUM_RANK_FLAGS = 20;
 MAX_GUILDRANKS = 10;
 
 function GuildControlUI_OnLoad(self)
@@ -223,13 +223,13 @@ function GuildControlUI_RankPermissions_Update(self)
 		self.goldBox:SetTextColor(GRAY_FONT_COLOR.r, GRAY_FONT_COLOR.g, GRAY_FONT_COLOR.b);
 	end
 
-	-- disable the Authenticate checkbox for the last rank or if a rank has members
+	-- disable the Authenticate checkbox for the last rank ,or if a rank has members and the option is unchecked
 	checkbox = _G[prefix.."18"];
 	if ( currentRank == GuildControlGetNumRanks() ) then
 		checkbox.text:SetFontObject("GameFontDisableSmall");
 		checkbox:Disable();
 		checkbox.tooltipFrame.tooltip = AUTHENTICATOR_GUILD_RANK_LAST;
-	elseif ( GetNumMembersInRank(currentRank ) > 0 ) then
+	elseif ( GetNumMembersInRank(currentRank ) > 0 and not checkbox:GetChecked() ) then
 		checkbox.text:SetFontObject("GameFontDisableSmall");
 		checkbox:Disable();
 		checkbox.tooltipFrame.tooltip = AUTHENTICATOR_GUILD_RANK_IN_USE;

diff --git a/AddOns/Blizzard_GuildControlUI/Blizzard_GuildControlUI.xml b/AddOns/Blizzard_GuildControlUI/Blizzard_GuildControlUI.xml
@@ -335,8 +335,9 @@
 
 
 	<Frame name="GuildControlUI" inherits="TranslucentFrameTemplate" parent="UIParent" movable="true" enableMouse="true" hidden="true">
+		<Size x="338" y="444"/>
 		<Anchors>
-			<Anchor point="TOPLEFT" relativeTo="GuildFrame" relativePoint="TOPRIGHT" x="20" y="-6"/>
+			<Anchor point="TOPLEFT" relativeTo="GuildFrame" relativePoint="TOPRIGHT" x="20" y="0"/>
  		</Anchors>
 		<Layers>
 			<Layer level="BACKGROUND" textureSubLevel="1">
@@ -450,7 +451,7 @@
 						</Scripts>
 					</Frame>
 					<Frame name="$parentInset" inherits="InsetFrameTemplate2" parentKey="inset">
-						<Size x="290" y="290"/>
+						<Size x="290" y="310"/>
 						<Anchors>
 							<Anchor point="TOP" x="0" y="-45"/>
 						</Anchors>
@@ -495,7 +496,7 @@
 							<Color r="0.95" g="0.95" b="1" a="0.09"/>
 						</Texture>
 						<Texture name="$parentInfoBg" >
-							<Size x="290" y="80"/>
+							<Size x="290" y="100"/>
 							<Anchors>
 								<Anchor point="TOP" relativeTo="$parentRosterBg" relativePoint="BOTTOM" x="0" y="-6"/>
 							</Anchors>
@@ -611,11 +612,6 @@
 							<Anchor point="TOPLEFT" relativeTo="$parentCheckbox9" relativePoint="BOTTOMLEFT" x="0" y="1"/>
 						</Anchors>
 					</CheckButton>
-					<CheckButton name="$parentCheckbox13" inherits="GuildPermissionCheckBoxTemplate" id="13">
-						<Anchors>
-							<Anchor point="TOPLEFT" relativeTo="$parentCheckbox11" relativePoint="BOTTOMLEFT" x="0" y="1"/>
-						</Anchors>
-					</CheckButton>
 					<CheckButton name="$parentCheckbox10" inherits="GuildPermissionCheckBoxTemplate" id="10">
 						<Anchors>
 							<Anchor point="LEFT" relativeTo="$parentCheckbox9" relativePoint="RIGHT" x="128" y="0"/>
@@ -627,11 +623,20 @@
 						</Anchors>
 					</CheckButton>
 					<CheckButton name="$parentCheckbox17" inherits="GuildPermissionCheckBoxTemplate" id="17">
+						<Anchors>
+							<Anchor point="TOPLEFT" relativeTo="$parentCheckbox11" relativePoint="BOTTOMLEFT" x="0" y="1"/>
+						</Anchors>
+					</CheckButton>
+					<CheckButton name="$parentCheckbox20" inherits="GuildPermissionCheckBoxTemplate" id="20">
 						<Anchors>
 							<Anchor point="TOPLEFT" relativeTo="$parentCheckbox12" relativePoint="BOTTOMLEFT" x="0" y="1"/>
 						</Anchors>
 					</CheckButton>
-
+					<CheckButton name="$parentCheckbox13" inherits="GuildPermissionCheckBoxTemplate" id="13">
+						<Anchors>
+							<Anchor point="TOPLEFT" relativeTo="$parentCheckbox17" relativePoint="BOTTOMLEFT" x="0" y="1"/>
+						</Anchors>
+					</CheckButton>
 					<CheckButton name="$parentCheckbox15" inherits="GuildPermissionCheckBoxTemplate" id="15">
 						<Anchors>
 							<Anchor point="TOPLEFT" relativeTo="$parentBankLabel" relativePoint="BOTTOMLEFT" x="0" y="-3"/>