Skip to content

Commit 4a153ca

Browse files
qyh214qyh214
committed
对插件进行跟随作者版本更新，合并dbm语音版，现在dbm是语音版模式by 夏一可
1 parent c9207a5 commit 4a153ca

File tree

2,594 files changed

+165277
-100759
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,594 files changed

+165277
-100759
lines changed

‎AddOns/!MoncaiCompare/!MoncaiCompare.lua

+19-14
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
-- --------------------------------------------------------------------------------
22
-- Moncai Compare
3-
-- Copyright (C) 2009-2013 Moncai
3+
-- Copyright (C) 2009-2014 Moncai
44
-- Main module
55
-- --------------------------------------------------------------------------------
66

@@ -9,21 +9,21 @@
99
local ItemRefTooltip = ItemRefTooltip
1010

1111
ItemRefTooltip.UpdateTooltip = function(self)
12-
if ( not self.comparing) then
12+
if ( not self.comparing and not IsModifiedClick("COMPAREITEMS")) then
1313
GameTooltip_ShowCompareItem(self);
1414
self.comparing = true;
15-
--~ elseif ( self.comparing and false) then
16-
--~ for _, frame in pairs(self.shoppingTooltips) do
17-
--~ frame:Hide();
18-
--~ end
19-
--~ self.comparing = false;
15+
elseif ( self.comparing and IsModifiedClick("COMPAREITEMS")) then
16+
for _, frame in pairs(self.shoppingTooltips) do
17+
frame:Hide();
18+
end
19+
20+
self.needsReset = true;
21+
self.comparing = false;
2022
end
2123
end
2224

2325
ItemRefTooltip:SetScript("OnTooltipSetItem", function(self)
24-
25-
26-
if (self:IsMouseOver()) then
26+
if (not IsModifiedClick("COMPAREITEMS") and self:IsMouseOver()) then
2727
GameTooltip_ShowCompareItem(self, 1);
2828
self.comparing = true;
2929
end
@@ -33,20 +33,25 @@ end
3333
ItemRefTooltip:SetScript("OnDragStop", function(self)
3434
self:StopMovingOrSizing();
3535
ValidateFramePosition(self);
36-
--~ if ( true ) then --We do this to choose where the comparison is shown
37-
GameTooltip_ShowCompareItem(self, 1);
36+
if (not IsModifiedClick("COMPAREITEMS") ) then --We do this to choose where the comparison is shown
37+
GameTooltip_ShowCompareItem(self, true);
3838
self.comparing = true;
39-
--~ end
39+
end
4040
end
4141
)
4242

4343
GameTooltip:SetScript("OnTooltipSetItem", function(self)
4444
if ( not IsModifiedClick("COMPAREITEMS") and not self:IsEquippedItem() ) then
45-
GameTooltip_ShowCompareItem(self, 1);
45+
GameTooltip_ShowCompareItem(self, true);
46+
else
47+
local shoppingTooltip1, shoppingTooltip2 = unpack(self.shoppingTooltips);
48+
shoppingTooltip1:Hide();
49+
shoppingTooltip2:Hide();
4650
end
4751
if (BattlePetTooltip) then
4852
BattlePetTooltip:Hide();
4953
end
54+
5055
--~ print("tipset")
5156
end
5257
)

‎AddOns/!MoncaiCompare/!MoncaiCompare.toc

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
## Title: Moncaí's |cff00ff00Equipment Compare|r
33
## Notes: Replacement for Equip Compare, by Moncaí
44
## Author: Moncaí
5-
## Version: 6.0.0
5+
## Version: 6.0.2
66
## X-Website: http://wow.curse.com/downloads/wow-addons/details/moncaicompare.aspx
77
## URL: http://wow.curse.com/downloads/wow-addons/details/moncaicompare.aspx
88
## RequiredDeps:
99
## OptionalDeps:
10-
## X-Curse-Packaged-Version: v6.0.0
10+
## X-Curse-Packaged-Version: v6.0.2
1111
## X-Curse-Project-Name: Moncai Compare
1212
## X-Curse-Project-ID: moncaicompare
1313
## X-Curse-Repository-ID: wow/moncaicompare/mainline

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

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
------------------------------------------------------------------------
2+
r40 | moncai | 2014-10-30 21:21:10 +0000 (Thu, 30 Oct 2014) | 1 line
3+
Changed paths:
4+
A /tags/v6.0.2 (from /trunk:39)
5+
6+
Tagging as v6.0.2
7+
------------------------------------------------------------------------
8+
r39 | moncai | 2014-10-30 21:20:37 +0000 (Thu, 30 Oct 2014) | 1 line
9+
Changed paths:
10+
M /trunk/!MoncaiCompare.toc
11+
M /trunk/EncounterJournal.lua
12+
13+
Dungeon Journal Tooltip fix
14+
------------------------------------------------------------------------
15+
r37 | moncai | 2014-10-17 15:23:53 +0000 (Fri, 17 Oct 2014) | 1 line
16+
Changed paths:
17+
M /trunk/!MoncaiCompare.lua
18+
M /trunk/!MoncaiCompare.toc
19+
M /trunk/EncounterJournal.lua
20+
21+
Dungeon Journal fix
22+
------------------------------------------------------------------------
23+
r35 | moncai | 2014-10-15 20:39:18 +0000 (Wed, 15 Oct 2014) | 1 line
24+
Changed paths:
25+
M /trunk/!MoncaiCompare.toc
26+
27+
Version update for WoD
28+
------------------------------------------------------------------------

‎AddOns/!MoncaiCompare/EncounterJournal.lua

+55-76
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
-- --------------------------------------------------------------------------------
22
-- Moncai Compare
3-
-- Copyright (C) 2009-2013 Moncai
3+
-- Copyright (C) 2009-2014 Moncai
44
-- Module for Encounter (Dungeon) Journal
55
-- --------------------------------------------------------------------------------
66

77
local fEncounterJournal_Loot_OnUpdate;
88

99
local function JournalHook()
10+
--~ print("Journalhook");
1011

1112
fEncounterJournal_Loot_OnUpdate = EncounterJournal_Loot_OnUpdate;
1213
EncounterJournal_Loot_OnUpdate = function(self, elapsed)
1314
if GameTooltip:IsOwned(self) then
15+
--~ print("LootOnUpdate");
1416
-- Show tooltips left always
1517
GameTooltip:ClearAllPoints()
1618
GameTooltip:SetPoint("BOTTOMRIGHT", self, "TOPLEFT")
@@ -24,7 +26,7 @@ local function JournalHook()
2426
--~ self.comparing = nil
2527
ShoppingTooltip1:Hide();
2628
ShoppingTooltip2:Hide();
27-
ShoppingTooltip3:Hide();
29+
--ShoppingTooltip3:Hide(); --602 removed?
2830
end
2931

3032
if IsModifiedClick("DRESSUP") then
@@ -38,15 +40,22 @@ local function JournalHook()
3840
for i = 1, 8, 1 do
3941
local eb = _G["EncounterJournalEncounterFrameInfoLootScrollFrameButton"..i]
4042
if eb then
41-
eb:SetScript("OnEnter", function(self) --EncounterItemTemplate Blizzard_EncounterJournal.xml:1094
42-
--~ print("enter button "..i);
43+
eb:SetScript("OnEnter", function(self) --EncounterItemTemplate Blizzard_EncounterJournal.xml: old: 1094 -> 6.0.2: 1136
44+
--~ print("enter button "..i); --MOD
4345
-- Show tooltips left always
44-
GameTooltip.overrideside = "left"
45-
46+
GameTooltip.overrideside = "left" --EMOD
47+
4648
GameTooltip:SetOwner(self, "ANCHOR_LEFT");
47-
GameTooltip:SetHyperlink(self.link);
49+
EncounterJournal_SetTooltip(self.link);
4850
self.showingTooltip = true;
49-
self:SetScript("OnUpdate", EncounterJournal_Loot_OnUpdate);
51+
52+
--~ if self.itemID then
53+
--~ GameTooltip:SetOwner(self, "ANCHOR_LEFT");
54+
--~ GameTooltip:SetItemByID(self.itemID);
55+
--~ self.showingTooltip = true;
56+
--~ end
57+
58+
self:SetScript("OnUpdate", EncounterJournal_Loot_OnUpdate); -- MOD 602 still needed
5059
end)
5160
eb:HookScript("OnLeave", function(self) GameTooltip.overrideside = "" end)
5261
end
@@ -55,30 +64,24 @@ end
5564

5665
--local fGameTooltip_ShowCompareItem = GameTooltip_ShowCompareItem
5766
function Journal_GameTooltip_ShowCompareItem(self, shift)
67+
--~ print("Journal Compare");
68+
5869
if ( not self ) then
5970
self = GameTooltip;
6071
end
61-
local item, link = self:GetItem();
62-
if ( not link ) then
63-
return;
72+
73+
if ( self.needsReset ) then
74+
self:ResetSecondaryCompareItem();
75+
GameTooltip_AdvanceSecondaryCompareItem(self);
76+
self.needsReset = false;
6477
end
6578

66-
local shoppingTooltip1, shoppingTooltip2, shoppingTooltip3 = unpack(self.shoppingTooltips);
79+
local shoppingTooltip1, shoppingTooltip2 = unpack(self.shoppingTooltips);
6780

68-
local item1 = nil;
69-
local item2 = nil;
70-
local item3 = nil;
71-
local side = "left";
72-
if ( shoppingTooltip1:SetHyperlinkCompareItem(link, 1, shift, self) ) then
73-
item1 = true;
74-
end
75-
if ( shoppingTooltip2:SetHyperlinkCompareItem(link, 2, shift, self) ) then
76-
item2 = true;
77-
end
78-
if ( shoppingTooltip3:SetHyperlinkCompareItem(link, 3, shift, self) ) then
79-
item3 = true;
80-
end
81+
local primaryItemShown, secondaryItemShown = shoppingTooltip1:SetCompareItem(shoppingTooltip2, self);
8182

83+
local side = "left";
84+
8285
-- find correct side
8386
local rightDist = 0;
8487
local leftPos = self:GetLeft();
@@ -98,30 +101,21 @@ function Journal_GameTooltip_ShowCompareItem(self, shift)
98101
side = "right";
99102
end
100103

101-
if self.overrideside then
104+
if self.overrideside then --MOD
102105
--~ print("force side " .. self.overrideside)
103106
side = self.overrideside
104107
--~ else
105108
--~ print("standard side")
106-
end
109+
end --EMOD
107110

108111
-- see if we should slide the tooltip
109112
if ( self:GetAnchorType() and self:GetAnchorType() ~= "ANCHOR_PRESERVE" ) then
110113
local totalWidth = 0;
111-
if ( item1 ) then
112-
shoppingTooltip1:Show() -- need to show to get correct width...
114+
if ( primaryItemShown ) then
113115
totalWidth = totalWidth + shoppingTooltip1:GetWidth();
114-
--~ print("tip 1 width " .. shoppingTooltip1:GetWidth())
115116
end
116-
if ( item2 ) then
117-
shoppingTooltip2:Show()
117+
if ( secondaryItemShown ) then
118118
totalWidth = totalWidth + shoppingTooltip2:GetWidth();
119-
--~ print("tip 2 width " .. shoppingTooltip2:GetWidth())
120-
end
121-
if ( item3 ) then
122-
shoppingTooltip3:Show()
123-
totalWidth = totalWidth + shoppingTooltip3:GetWidth();
124-
--~ print("tip 3 width " .. shoppingTooltip3:GetWidth())
125119
end
126120

127121
if ( (side == "left") and (totalWidth > leftPos) ) then
@@ -130,55 +124,40 @@ function Journal_GameTooltip_ShowCompareItem(self, shift)
130124
self:SetAnchorType(self:GetAnchorType(), -((rightPos + totalWidth) - GetScreenWidth()), 0);
131125
end
132126
end
133-
134-
-- anchor the compare tooltips
135-
if ( item3 ) then
136-
shoppingTooltip3:SetOwner(self, "ANCHOR_NONE");
137-
shoppingTooltip3:ClearAllPoints();
127+
128+
if ( secondaryItemShown ) then
129+
shoppingTooltip2:SetOwner(self, "ANCHOR_NONE");
130+
shoppingTooltip2:ClearAllPoints();
138131
if ( side and side == "left" ) then
139-
shoppingTooltip3:SetPoint("TOPRIGHT", self, "TOPLEFT", 0, -10);
132+
shoppingTooltip2:SetPoint("TOPRIGHT", self, "TOPLEFT", 0, -10);
140133
else
141-
shoppingTooltip3:SetPoint("TOPLEFT", self, "TOPRIGHT", 0, -10);
134+
shoppingTooltip2:SetPoint("TOPLEFT", self, "TOPRIGHT", 0, -10);
142135
end
143-
shoppingTooltip3:SetHyperlinkCompareItem(link, 3, shift, self);
144-
shoppingTooltip3:Show();
145-
end
146-
147-
if ( item1 ) then
148-
if( item3 ) then
149-
shoppingTooltip1:SetOwner(shoppingTooltip3, "ANCHOR_NONE");
136+
137+
shoppingTooltip1:SetOwner(self, "ANCHOR_NONE");
138+
shoppingTooltip1:ClearAllPoints();
139+
140+
if ( side and side == "left" ) then
141+
shoppingTooltip1:SetPoint("TOPRIGHT", shoppingTooltip2, "TOPLEFT");
150142
else
151-
shoppingTooltip1:SetOwner(self, "ANCHOR_NONE");
143+
shoppingTooltip1:SetPoint("TOPLEFT", shoppingTooltip2, "TOPRIGHT");
152144
end
145+
else
146+
shoppingTooltip1:SetOwner(self, "ANCHOR_NONE");
153147
shoppingTooltip1:ClearAllPoints();
148+
154149
if ( side and side == "left" ) then
155-
if( item3 ) then
156-
shoppingTooltip1:SetPoint("TOPRIGHT", shoppingTooltip3, "TOPLEFT", 0, 0);
157-
else
158-
shoppingTooltip1:SetPoint("TOPRIGHT", self, "TOPLEFT", 0, -10);
159-
end
150+
shoppingTooltip1:SetPoint("TOPRIGHT", self, "TOPLEFT", 0, -10);
160151
else
161-
if( item3 ) then
162-
shoppingTooltip1:SetPoint("TOPLEFT", shoppingTooltip3, "TOPRIGHT", 0, 0);
163-
else
164-
shoppingTooltip1:SetPoint("TOPLEFT", self, "TOPRIGHT", 0, -10);
165-
end
152+
shoppingTooltip1:SetPoint("TOPLEFT", self, "TOPRIGHT", 0, -10);
166153
end
167-
shoppingTooltip1:SetHyperlinkCompareItem(link, 1, shift, self);
168-
shoppingTooltip1:Show();
169154

170-
if ( item2 ) then
171-
shoppingTooltip2:SetOwner(shoppingTooltip1, "ANCHOR_NONE");
172-
shoppingTooltip2:ClearAllPoints();
173-
if ( side and side == "left" ) then
174-
shoppingTooltip2:SetPoint("TOPRIGHT", shoppingTooltip1, "TOPLEFT", 0, 0);
175-
else
176-
shoppingTooltip2:SetPoint("TOPLEFT", shoppingTooltip1, "TOPRIGHT", 0, 0);
177-
end
178-
shoppingTooltip2:SetHyperlinkCompareItem(link, 2, shift, self);
179-
shoppingTooltip2:Show();
180-
end
155+
shoppingTooltip2:Hide();
181156
end
157+
158+
-- We have to call this again because :SetOwner clears the tooltip.
159+
shoppingTooltip1:SetCompareItem(shoppingTooltip2, self);
160+
shoppingTooltip1:Show();
182161
end
183162

184163
hooksecurefunc("EncounterJournal_LoadUI", JournalHook)

‎AddOns/AdiBags/AdiBags.toc

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
## Interface: 60000
2-
## X-Curse-Packaged-Version: v1.7.4
2+
## X-Curse-Packaged-Version: v1.7.10
33
## X-Curse-Project-Name: AdiBags
44
## X-Curse-Project-ID: adibags
55
## X-Curse-Repository-ID: wow/adibags/mainline
66

77
## Title: AdiBags
88
## Notes: Adirelle's bag addon.
99
## Author: Adirelle
10-
## Version: v1.7.4
10+
## Version: v1.7.10
1111
## SavedVariables: AdiBagsDB
12-
## X-Date: 2014-10-18T17:31:49Z
12+
## X-Date: 2014-11-10T13:55:41Z
1313
## OptionalDeps: LibStub, CallbackHandler-1.0, Ace3, LibBabble-Inventory-3.0, LibSharedMedia-3.0, LibItemUpgradeInfo-1.0, Scrap, BrainDead, !BugGrabber, SyLevel
1414
#@alpha@
1515
# ## OptionalDeps: AdiDebug, BugSack, Swatter
@@ -61,6 +61,7 @@ modules\CurrencyFrame.lua
6161
modules\TooltipInfo.lua
6262
modules\SectionVisibilityDropdown.lua
6363
modules\BankSwitcher.lua
64+
modules\ChangeHighlight.lua
6465

6566
core\DefaultFilters.lua
6667

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

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
tag v1.7.10
2+
6779dbaaad029012d1bfef6a20054e8fd6815f97
3+
Adirelle <[email protected]>
4+
2014-11-10 14:57:00 +0100
5+
6+
Bugfixes.
7+
8+
9+
--------------------
10+
11+
Adirelle:
12+
- Hooks OpenBag and CloseBag.
13+
Should fix #217.
14+
- Fixes #214.

0 commit comments

Comments
 (0)