对插件进行跟随作者版本更新，合并dbm语音版，现在dbm是语音版模式by 夏一可

AddOns/!MoncaiCompare/!MoncaiCompare.lua

@@ -1,6 +1,6 @@
 -- --------------------------------------------------------------------------------
 -- Moncai Compare
--- Copyright (C) 2009-2013 Moncai
+-- Copyright (C) 2009-2014 Moncai
 -- Main module
 -- --------------------------------------------------------------------------------
 
@@ -9,21 +9,21 @@
 local ItemRefTooltip = ItemRefTooltip
 
 ItemRefTooltip.UpdateTooltip = function(self)
-	if ( not self.comparing) then
+	if ( not self.comparing and not IsModifiedClick("COMPAREITEMS")) then
 		GameTooltip_ShowCompareItem(self);
 		self.comparing = true;
---~ 	elseif ( self.comparing and false) then
---~ 		for _, frame in pairs(self.shoppingTooltips) do
---~ 			frame:Hide();
---~ 		end
---~ 		self.comparing = false;
+	elseif ( self.comparing and IsModifiedClick("COMPAREITEMS")) then
+		for _, frame in pairs(self.shoppingTooltips) do
+			frame:Hide();
+		end
+
+		self.needsReset = true;
+		self.comparing = false;
 	end
 end
 
 ItemRefTooltip:SetScript("OnTooltipSetItem", function(self)
-
-
-	if (self:IsMouseOver()) then
+	if (not IsModifiedClick("COMPAREITEMS") and self:IsMouseOver()) then
 		GameTooltip_ShowCompareItem(self, 1);
 		self.comparing = true;
 	end
@@ -33,20 +33,25 @@ end
 ItemRefTooltip:SetScript("OnDragStop", function(self)
 	self:StopMovingOrSizing();
 	ValidateFramePosition(self);
---~ 	if ( true ) then --We do this to choose where the comparison is shown
-		GameTooltip_ShowCompareItem(self, 1);
+	if (not IsModifiedClick("COMPAREITEMS") ) then --We do this to choose where the comparison is shown
+		GameTooltip_ShowCompareItem(self, true);
 		self.comparing = true;
---~ 	end
+	end
 end
 )
 
 GameTooltip:SetScript("OnTooltipSetItem", function(self)
 	if ( not IsModifiedClick("COMPAREITEMS") and not self:IsEquippedItem() ) then
-		GameTooltip_ShowCompareItem(self, 1);
+		GameTooltip_ShowCompareItem(self, true);
+	else
+		local shoppingTooltip1, shoppingTooltip2 = unpack(self.shoppingTooltips);
+		shoppingTooltip1:Hide();
+		shoppingTooltip2:Hide();
 	end
 	if (BattlePetTooltip) then
 		BattlePetTooltip:Hide();
 	end
+
 --~ 	print("tipset")
 end
 )

AddOns/!MoncaiCompare/!MoncaiCompare.toc

@@ -2,12 +2,12 @@
 ## Title: Moncaí's |cff00ff00Equipment Compare|r
 ## Notes: Replacement for Equip Compare, by Moncaí
 ## Author: Moncaí
-## Version: 6.0.0
+## Version: 6.0.2
 ## X-Website: http://wow.curse.com/downloads/wow-addons/details/moncaicompare.aspx
 ## URL: http://wow.curse.com/downloads/wow-addons/details/moncaicompare.aspx
 ## RequiredDeps:
 ## OptionalDeps: 
-## X-Curse-Packaged-Version: v6.0.0
+## X-Curse-Packaged-Version: v6.0.2
 ## X-Curse-Project-Name: Moncai Compare
 ## X-Curse-Project-ID: moncaicompare
 ## X-Curse-Repository-ID: wow/moncaicompare/mainline

AddOns/!MoncaiCompare/Changelog-!MoncaiCompare-v6.0.2.txt

@@ -0,0 +1,28 @@
+------------------------------------------------------------------------
+r40 | moncai | 2014-10-30 21:21:10 +0000 (Thu, 30 Oct 2014) | 1 line
+Changed paths:
+   A /tags/v6.0.2 (from /trunk:39)
+
+Tagging as v6.0.2
+------------------------------------------------------------------------
+r39 | moncai | 2014-10-30 21:20:37 +0000 (Thu, 30 Oct 2014) | 1 line
+Changed paths:
+   M /trunk/!MoncaiCompare.toc
+   M /trunk/EncounterJournal.lua
+
+Dungeon Journal Tooltip fix
+------------------------------------------------------------------------
+r37 | moncai | 2014-10-17 15:23:53 +0000 (Fri, 17 Oct 2014) | 1 line
+Changed paths:
+   M /trunk/!MoncaiCompare.lua
+   M /trunk/!MoncaiCompare.toc
+   M /trunk/EncounterJournal.lua
+
+Dungeon Journal fix
+------------------------------------------------------------------------
+r35 | moncai | 2014-10-15 20:39:18 +0000 (Wed, 15 Oct 2014) | 1 line
+Changed paths:
+   M /trunk/!MoncaiCompare.toc
+
+Version update for WoD
+------------------------------------------------------------------------

AddOns/!MoncaiCompare/EncounterJournal.lua

@@ -1,16 +1,18 @@
 -- --------------------------------------------------------------------------------
 -- Moncai Compare
--- Copyright (C) 2009-2013 Moncai
+-- Copyright (C) 2009-2014 Moncai
 -- Module for Encounter (Dungeon) Journal
 -- --------------------------------------------------------------------------------
 
 local fEncounterJournal_Loot_OnUpdate;
 
 local function JournalHook()
+--~ 	print("Journalhook");
 
 	fEncounterJournal_Loot_OnUpdate = EncounterJournal_Loot_OnUpdate;
 	EncounterJournal_Loot_OnUpdate = function(self, elapsed)
 		if GameTooltip:IsOwned(self) then
+--~ 			print("LootOnUpdate");
 			-- Show tooltips left always
 			GameTooltip:ClearAllPoints()
 			GameTooltip:SetPoint("BOTTOMRIGHT", self, "TOPLEFT")
@@ -24,7 +26,7 @@ local function JournalHook()
 --~ 				self.comparing = nil
 				ShoppingTooltip1:Hide();
 				ShoppingTooltip2:Hide();
-				ShoppingTooltip3:Hide();
+				--ShoppingTooltip3:Hide(); --602 removed?
 			end
 
 			if IsModifiedClick("DRESSUP") then
@@ -38,15 +40,22 @@ local function JournalHook()
 	for i = 1, 8, 1 do
 		local eb = _G["EncounterJournalEncounterFrameInfoLootScrollFrameButton"..i]
 		if eb then
-			eb:SetScript("OnEnter", function(self) --EncounterItemTemplate Blizzard_EncounterJournal.xml:1094
---~ 				print("enter button "..i); 
+			eb:SetScript("OnEnter", function(self) --EncounterItemTemplate Blizzard_EncounterJournal.xml: old: 1094 -> 6.0.2: 1136
+--~ 				print("enter button "..i); --MOD
 				-- Show tooltips left always
-				GameTooltip.overrideside = "left"
-				
+				GameTooltip.overrideside = "left" --EMOD
+
 				GameTooltip:SetOwner(self, "ANCHOR_LEFT");
-				GameTooltip:SetHyperlink(self.link);
+				EncounterJournal_SetTooltip(self.link);
 				self.showingTooltip = true;
-				self:SetScript("OnUpdate", EncounterJournal_Loot_OnUpdate);
+
+--~ 				if self.itemID then
+--~ 					GameTooltip:SetOwner(self, "ANCHOR_LEFT");
+--~ 					GameTooltip:SetItemByID(self.itemID);
+--~ 					self.showingTooltip = true;
+--~ 				end
+
+				self:SetScript("OnUpdate", EncounterJournal_Loot_OnUpdate); -- MOD 602 still needed
 			end)
 			eb:HookScript("OnLeave", function(self) GameTooltip.overrideside = "" end)		
 		end
@@ -55,30 +64,24 @@ end
 
 --local fGameTooltip_ShowCompareItem = GameTooltip_ShowCompareItem
 function Journal_GameTooltip_ShowCompareItem(self, shift)
+--~ 	print("Journal Compare");
+
 	if ( not self ) then
 		self = GameTooltip;
 	end
-	local item, link = self:GetItem();
-	if ( not link ) then
-		return;
+
+	if ( self.needsReset ) then
+		self:ResetSecondaryCompareItem();
+		GameTooltip_AdvanceSecondaryCompareItem(self);
+		self.needsReset = false;
 	end
 
-	local shoppingTooltip1, shoppingTooltip2, shoppingTooltip3 = unpack(self.shoppingTooltips);
+	local shoppingTooltip1, shoppingTooltip2 = unpack(self.shoppingTooltips);
 
-	local item1 = nil;
-	local item2 = nil;
-	local item3 = nil;
-	local side = "left";
-	if ( shoppingTooltip1:SetHyperlinkCompareItem(link, 1, shift, self) ) then
-		item1 = true;
-	end
-	if ( shoppingTooltip2:SetHyperlinkCompareItem(link, 2, shift, self) ) then
-		item2 = true;
-	end
-	if ( shoppingTooltip3:SetHyperlinkCompareItem(link, 3, shift, self) ) then
-		item3 = true;
-	end
+	local primaryItemShown, secondaryItemShown = shoppingTooltip1:SetCompareItem(shoppingTooltip2, self);
 
+	local side = "left";
+
 	-- find correct side
 	local rightDist = 0;
 	local leftPos = self:GetLeft();
@@ -98,30 +101,21 @@ function Journal_GameTooltip_ShowCompareItem(self, shift)
 		side = "right";
 	end
 
-	if self.overrideside then 
+	if self.overrideside then --MOD
 --~ 		print("force side " .. self.overrideside)
 		side = self.overrideside
 --~ 	else
 --~ 		print("standard side")
-	end
+	end --EMOD
 
 	-- see if we should slide the tooltip
 	if ( self:GetAnchorType() and self:GetAnchorType() ~= "ANCHOR_PRESERVE" ) then
 		local totalWidth = 0;
-		if ( item1  ) then
-			shoppingTooltip1:Show() -- need to show to get correct width...
+		if ( primaryItemShown  ) then
 			totalWidth = totalWidth + shoppingTooltip1:GetWidth();
---~ 			print("tip 1 width " .. shoppingTooltip1:GetWidth())
 		end
-		if ( item2  ) then
-			shoppingTooltip2:Show()
+		if ( secondaryItemShown  ) then
 			totalWidth = totalWidth + shoppingTooltip2:GetWidth();
---~ 			print("tip 2 width " .. shoppingTooltip2:GetWidth())
-		end
-		if ( item3  ) then
-			shoppingTooltip3:Show()
-			totalWidth = totalWidth + shoppingTooltip3:GetWidth();
---~ 			print("tip 3 width " .. shoppingTooltip3:GetWidth())
 		end
 
 		if ( (side == "left") and (totalWidth > leftPos) ) then
@@ -130,55 +124,40 @@ function Journal_GameTooltip_ShowCompareItem(self, shift)
 			self:SetAnchorType(self:GetAnchorType(), -((rightPos + totalWidth) - GetScreenWidth()), 0);
 		end
 	end
-
-	-- anchor the compare tooltips
-	if ( item3 ) then
-		shoppingTooltip3:SetOwner(self, "ANCHOR_NONE");
-		shoppingTooltip3:ClearAllPoints();
+
+	if ( secondaryItemShown ) then
+		shoppingTooltip2:SetOwner(self, "ANCHOR_NONE");
+		shoppingTooltip2:ClearAllPoints();
 		if ( side and side == "left" ) then
-			shoppingTooltip3:SetPoint("TOPRIGHT", self, "TOPLEFT", 0, -10);
+			shoppingTooltip2:SetPoint("TOPRIGHT", self, "TOPLEFT", 0, -10);
 		else
-			shoppingTooltip3:SetPoint("TOPLEFT", self, "TOPRIGHT", 0, -10);
+			shoppingTooltip2:SetPoint("TOPLEFT", self, "TOPRIGHT", 0, -10);
 		end
-		shoppingTooltip3:SetHyperlinkCompareItem(link, 3, shift, self);
-		shoppingTooltip3:Show();
-	end
-
-	if ( item1 ) then
-		if( item3 ) then
-			shoppingTooltip1:SetOwner(shoppingTooltip3, "ANCHOR_NONE");
+
+		shoppingTooltip1:SetOwner(self, "ANCHOR_NONE");
+		shoppingTooltip1:ClearAllPoints();
+
+		if ( side and side == "left" ) then
+			shoppingTooltip1:SetPoint("TOPRIGHT", shoppingTooltip2, "TOPLEFT");
 		else
-			shoppingTooltip1:SetOwner(self, "ANCHOR_NONE");
+			shoppingTooltip1:SetPoint("TOPLEFT", shoppingTooltip2, "TOPRIGHT");
 		end
+	else
+		shoppingTooltip1:SetOwner(self, "ANCHOR_NONE");
 		shoppingTooltip1:ClearAllPoints();
+
 		if ( side and side == "left" ) then
-			if( item3 ) then
-				shoppingTooltip1:SetPoint("TOPRIGHT", shoppingTooltip3, "TOPLEFT", 0, 0);
-			else
-				shoppingTooltip1:SetPoint("TOPRIGHT", self, "TOPLEFT", 0, -10);
-			end
+			shoppingTooltip1:SetPoint("TOPRIGHT", self, "TOPLEFT", 0, -10);
 		else
-			if( item3 ) then
-				shoppingTooltip1:SetPoint("TOPLEFT", shoppingTooltip3, "TOPRIGHT", 0, 0);
-			else
-				shoppingTooltip1:SetPoint("TOPLEFT", self, "TOPRIGHT", 0, -10);
-			end
+			shoppingTooltip1:SetPoint("TOPLEFT", self, "TOPRIGHT", 0, -10);
 		end
-		shoppingTooltip1:SetHyperlinkCompareItem(link, 1, shift, self);
-		shoppingTooltip1:Show();
 
-		if ( item2 ) then
-			shoppingTooltip2:SetOwner(shoppingTooltip1, "ANCHOR_NONE");
-			shoppingTooltip2:ClearAllPoints();
-			if ( side and side == "left" ) then
-				shoppingTooltip2:SetPoint("TOPRIGHT", shoppingTooltip1, "TOPLEFT", 0, 0);
-			else
-				shoppingTooltip2:SetPoint("TOPLEFT", shoppingTooltip1, "TOPRIGHT", 0, 0);
-			end
-			shoppingTooltip2:SetHyperlinkCompareItem(link, 2, shift, self);
-			shoppingTooltip2:Show();
-		end
+		shoppingTooltip2:Hide();
 	end
+
+	-- We have to call this again because :SetOwner clears the tooltip.
+	shoppingTooltip1:SetCompareItem(shoppingTooltip2, self);
+	shoppingTooltip1:Show();
 end
 
 hooksecurefunc("EncounterJournal_LoadUI", JournalHook)

AddOns/AdiBags/AdiBags.toc

@@ -1,15 +1,15 @@
 ## Interface: 60000
-## X-Curse-Packaged-Version: v1.7.4
+## X-Curse-Packaged-Version: v1.7.10
 ## X-Curse-Project-Name: AdiBags
 ## X-Curse-Project-ID: adibags
 ## X-Curse-Repository-ID: wow/adibags/mainline
 
 ## Title: AdiBags
 ## Notes: Adirelle's bag addon.
 ## Author: Adirelle
-## Version: v1.7.4
+## Version: v1.7.10
 ## SavedVariables: AdiBagsDB
-## X-Date: 2014-10-18T17:31:49Z
+## X-Date: 2014-11-10T13:55:41Z
 ## OptionalDeps: LibStub, CallbackHandler-1.0, Ace3, LibBabble-Inventory-3.0, LibSharedMedia-3.0, LibItemUpgradeInfo-1.0, Scrap, BrainDead, !BugGrabber, SyLevel
 #@alpha@
 # ## OptionalDeps: AdiDebug, BugSack, Swatter
@@ -61,6 +61,7 @@ modules\CurrencyFrame.lua
 modules\TooltipInfo.lua
 modules\SectionVisibilityDropdown.lua
 modules\BankSwitcher.lua
+modules\ChangeHighlight.lua
 
 core\DefaultFilters.lua
 

AddOns/AdiBags/Changelog-AdiBags-v1.7.10.txt

@@ -0,0 +1,14 @@
+tag v1.7.10
+6779dbaaad029012d1bfef6a20054e8fd6815f97
+Adirelle <[email protected]>
+2014-11-10 14:57:00 +0100
+
+Bugfixes.
+
+
+--------------------
+
+Adirelle:
+	- Hooks OpenBag and CloseBag.
+	Should fix #217.
+	- Fixes #214.