From d559ed35eafc864f67353a478b4027cdbb6acdf4 Mon Sep 17 00:00:00 2001 From: Steven Jackson Date: Sat, 19 Jul 2014 12:29:12 -0500 Subject: [PATCH] major changes to styleomatic and config --- .../AddOns/SVUI/assets/artwork/Icons/DOCK-PVP.blp | Bin 0 -> 6676 bytes .../SVUI/assets/artwork/Icons/PVP-INCOMING.blp | Bin 0 -> 2580 bytes .../AddOns/SVUI/assets/artwork/Icons/PVP-SAFE.blp | Bin 0 -> 2580 bytes .../assets/artwork/Template/Tooltip/TT-TOP.blp | Bin 6676 -> 6676 bytes .../oUF_ActionPanel/oUF_ActionPanel.lua | 78 +++---- .../AddOns/SVUI/packages/dock/common/docklets.lua | 120 ++++++----- .../AddOns/SVUI/packages/dock/common/toolbar.lua | 44 ++-- Interface/AddOns/SVUI/packages/map/SVMap.lua | 1 + .../AddOns/SVUI/packages/stats/common/_load.xml | 2 + .../AddOns/SVUI/packages/stats/common/dps.lua | 141 +++++++++++++ .../AddOns/SVUI/packages/stats/common/hps.lua | 139 +++++++++++++ Interface/AddOns/SVUI/packages/tip/SVTip.lua | 130 ++++++------ Interface/AddOns/SVUI/packages/unit/SVUnit.lua | 7 +- .../AddOns/SVUI/packages/unit/frames/groups.lua | 17 +- Interface/AddOns/SVUI/scripts/pvp.lua | 126 +++++++----- Interface/AddOns/SVUI/system/classes/Database.lua | 3 +- Interface/AddOns/SVUI/system/installer.lua | 11 +- .../AddOns/SVUI_StyleOMatic/SVUI_StyleOMatic.lua | 162 ++++++++------- .../AddOns/SVUI_StyleOMatic/addons/achievement.lua | 22 +- Interface/AddOns/SVUI_StyleOMatic/addons/alert.lua | 6 +- .../AddOns/SVUI_StyleOMatic/addons/archeology.lua | 12 +- .../SVUI_StyleOMatic/addons/auctionhouse.lua | 30 +-- .../AddOns/SVUI_StyleOMatic/addons/barbershop.lua | 8 +- .../AddOns/SVUI_StyleOMatic/addons/battlefield.lua | 6 +- .../AddOns/SVUI_StyleOMatic/addons/blackmarket.lua | 12 +- .../AddOns/SVUI_StyleOMatic/addons/calendar.lua | 46 ++--- .../AddOns/SVUI_StyleOMatic/addons/challenges.lua | 4 +- .../AddOns/SVUI_StyleOMatic/addons/character.lua | 26 +-- .../AddOns/SVUI_StyleOMatic/addons/dressup.lua | 6 +- .../SVUI_StyleOMatic/addons/encounterjournal.lua | 214 +++++++++++++++++++- .../AddOns/SVUI_StyleOMatic/addons/friends.lua | 30 +-- .../AddOns/SVUI_StyleOMatic/addons/gossip.lua | 18 +- Interface/AddOns/SVUI_StyleOMatic/addons/guild.lua | 68 +++---- Interface/AddOns/SVUI_StyleOMatic/addons/help.lua | 18 +- .../AddOns/SVUI_StyleOMatic/addons/inspect.lua | 8 +- .../SVUI_StyleOMatic/addons/itemsocketing.lua | 8 +- .../AddOns/SVUI_StyleOMatic/addons/itemupgrade.lua | 6 +- .../AddOns/SVUI_StyleOMatic/addons/keybinding.lua | 6 +- Interface/AddOns/SVUI_StyleOMatic/addons/lfd.lua | 36 ++-- .../AddOns/SVUI_StyleOMatic/addons/loothistory.lua | 18 +- .../SVUI_StyleOMatic/addons/lossofcontrol.lua | 4 +- Interface/AddOns/SVUI_StyleOMatic/addons/macro.lua | 14 +- .../AddOns/SVUI_StyleOMatic/addons/mailbox.lua | 20 +- .../AddOns/SVUI_StyleOMatic/addons/merchant.lua | 14 +- .../AddOns/SVUI_StyleOMatic/addons/petbattle.lua | 6 +- .../AddOns/SVUI_StyleOMatic/addons/petition.lua | 6 +- .../AddOns/SVUI_StyleOMatic/addons/petjournal.lua | 26 +-- .../AddOns/SVUI_StyleOMatic/addons/petstable.lua | 14 +- Interface/AddOns/SVUI_StyleOMatic/addons/pvp.lua | 18 +- Interface/AddOns/SVUI_StyleOMatic/addons/quest.lua | 26 +-- Interface/AddOns/SVUI_StyleOMatic/addons/raid.lua | 10 +- .../AddOns/SVUI_StyleOMatic/addons/reforging.lua | 6 +- .../AddOns/SVUI_StyleOMatic/addons/spellbook.lua | 12 +- .../SVUI_StyleOMatic/addons/supervillain.lua | 6 +- .../AddOns/SVUI_StyleOMatic/addons/system.lua | 73 +++++-- .../AddOns/SVUI_StyleOMatic/addons/tabard.lua | 10 +- .../AddOns/SVUI_StyleOMatic/addons/talents.lua | 16 +- Interface/AddOns/SVUI_StyleOMatic/addons/taxi.lua | 6 +- .../SVUI_StyleOMatic/addons/thirdparty/ACP.lua | 14 +- .../SVUI_StyleOMatic/addons/thirdparty/Ace3.lua | 10 +- .../addons/thirdparty/AtlasLoot.lua | 46 ++--- .../SVUI_StyleOMatic/addons/thirdparty/BigWigs.lua | 8 +- .../SVUI_StyleOMatic/addons/thirdparty/Clique.lua | 10 +- .../SVUI_StyleOMatic/addons/thirdparty/Cooline.lua | 8 +- .../SVUI_StyleOMatic/addons/thirdparty/DBM.lua | 20 +- .../SVUI_StyleOMatic/addons/thirdparty/DXE.lua | 4 +- .../addons/thirdparty/LightHeaded.lua | 20 +- .../SVUI_StyleOMatic/addons/thirdparty/Mogit.lua | 24 +-- .../SVUI_StyleOMatic/addons/thirdparty/Omen.lua | 8 +- .../addons/thirdparty/Outfitter.lua | 22 +- .../SVUI_StyleOMatic/addons/thirdparty/Postal.lua | 10 +- .../SVUI_StyleOMatic/addons/thirdparty/Quartz.lua | 10 +- .../SVUI_StyleOMatic/addons/thirdparty/Recount.lua | 18 +- .../addons/thirdparty/SexyCooldown.lua | 12 +- .../SVUI_StyleOMatic/addons/thirdparty/Skada.lua | 16 +- .../SVUI_StyleOMatic/addons/thirdparty/TinyDPS.lua | 8 +- .../SVUI_StyleOMatic/addons/thirdparty/TomTom.lua | 6 +- .../addons/thirdparty/TradeSkillDW.lua | 28 +-- .../SVUI_StyleOMatic/addons/thirdparty/VEM.lua | 24 +-- .../addons/thirdparty/WeakAuras.lua | 6 +- .../addons/thirdparty/alDamageMeter.lua | 8 +- .../AddOns/SVUI_StyleOMatic/addons/timemanager.lua | 18 +- Interface/AddOns/SVUI_StyleOMatic/addons/trade.lua | 6 +- .../AddOns/SVUI_StyleOMatic/addons/tradeskill.lua | 16 +- .../AddOns/SVUI_StyleOMatic/addons/trainer.lua | 10 +- .../AddOns/SVUI_StyleOMatic/addons/transmog.lua | 10 +- .../AddOns/SVUI_StyleOMatic/addons/voidstorage.lua | 6 +- .../AddOns/SVUI_StyleOMatic/addons/worldmap.lua | 26 +-- .../AddOns/SVUI_StyleOMatic/addons/worldstate.lua | 10 +- .../AddOns/SVUI_StyleOMatic/common/methods.lua | 28 +-- Interface/HelpFrame/CS_HELPTEXTURES.blp | Bin 0 -> 88596 bytes 91 files changed, 1445 insertions(+), 901 deletions(-) create mode 100644 Interface/AddOns/SVUI/assets/artwork/Icons/DOCK-PVP.blp create mode 100644 Interface/AddOns/SVUI/assets/artwork/Icons/PVP-INCOMING.blp create mode 100644 Interface/AddOns/SVUI/assets/artwork/Icons/PVP-SAFE.blp create mode 100644 Interface/AddOns/SVUI/packages/stats/common/dps.lua create mode 100644 Interface/AddOns/SVUI/packages/stats/common/hps.lua create mode 100644 Interface/HelpFrame/CS_HELPTEXTURES.blp diff --git a/Interface/AddOns/SVUI/assets/artwork/Icons/DOCK-PVP.blp b/Interface/AddOns/SVUI/assets/artwork/Icons/DOCK-PVP.blp new file mode 100644 index 0000000000000000000000000000000000000000..a51de9a53f813f39da2ab2c36894ed2582530087 GIT binary patch literal 6676 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 KoSdAjjsFt~pmliw literal 0 HcmV?d00001 diff --git a/Interface/AddOns/SVUI/assets/artwork/Icons/PVP-SAFE.blp b/Interface/AddOns/SVUI/assets/artwork/Icons/PVP-SAFE.blp new file mode 100644 index 0000000000000000000000000000000000000000..4c84f3edd0cddaaa300e847a6728b45e80948a5b GIT binary patch literal 2580 zcmeHJUr19?82|1c@7>hph$)nbv(z=Sw2(anac2+0K$<&B?U?floa^20%fMH zf6OWPmKsBcTb(ih30$}&Sd3`Kuw{0t`ptS8nwfvJHYH&^LSmh1Bwg=l7Qd6Enu8_C zKD3WbwKPn0jZ<7M1z@U$*XSXDl-8y&{&3}5_y$b&Dd$ETRjem~1yXR22scOU%-`*9 ziqAZuUzmTo3dE4AfsoUBp>37wr~?^G9JS}9`Ayu{Wu40>D*(!vHM3Xw3ed9D0pg3h zN#%Ks3i?1ecph}W3-jqbKoIkB(k#4VGTA~l=w_&PE zAXsf>O>dV9?bS05cwUyZ>+9Y3+Bq-Qi*l0Fkezq=M;rfiURdA7i+_s4@bStSucX59 z>3p7wTIJW(WtWQmVSD5xti1l4`ONu`f$#RB?`J=P>p<&5(RrEe_sZo-HqUhnI;xBE z2W$#*&ybkH(IRB-^DJO7e!f{N><7bkw%;{Yxy7eH?KS`Z_P08WsDv%)_|HY25h4s4 zy&`fa-WT$c;Jg=42fmxQ)ZvK~?i1S2p@0YL+f|ebG{mELB4OK)FSt|$ySHZl@8F^k Aq5uE@ literal 0 HcmV?d00001 diff --git a/Interface/AddOns/SVUI/assets/artwork/Template/Tooltip/TT-TOP.blp b/Interface/AddOns/SVUI/assets/artwork/Template/Tooltip/TT-TOP.blp index d1cc8c50917059096acdbf2bae4938767e51633d..290449e583e2f0e2c84e5695c93863d320dab2a6 100644 GIT binary patch literal 6676 zcmeHLUuY9)5T8wU(=2Uc(M0@LiLhAZ&a;Z3Rgt8Mx@u*GtS6^;)LyCh5Kuu7L8uW6 zc~Fv?wpJ_nU+jx*mAq-A7O_t!a;2?(XtQQpUykG8{PQ5LGv79$NjN!Ld-;)~k})ParVa{Y>|Iv%*Mr z!kp6U>M!TyAL0XRzUK%cQO70xF);5saEeE$c@s`nl&b0 z$`|uxDXELcSGVmAM(s^;PS)0KGe;o`q~*!6zDKNla@ z>TEu3O_=P|`2HQp-@i5JZ7S)EaFh?no$J%&3)kglo_t!hur(xYv-mgB07yYgn}2D< z&hX(lZp8@Vd-~EN#z)}udJs3o_wS7#WY1R*F6}0#nDb^t$vte(>6xnpJc??cc6})1?E^(n0bST<#|*zW9M3Sic^R zpjC0@RGEBQ&ow#5%dy(DFKz1lb?C0CN1A`mk*i;vhua%jJyrGR^_#2D@7>oS94QG$ z_YpnyJz=WDGTTR`U{{em`T_hs?VgZ(Ku*#5ixPPb8T81>R2 zkL$(leswFlS&Z;9@xMEusy(ptk+dyTM){B)MT4aguArRp$$kvp8H&7Vf99@^;-QXWRv+`bb?9xKG26@X3zT0Aw4@z$ z`D#FcF$hQ9;y*LUNBJQBcs)Fer_UeJFP0ZK#xifKIInO!M@#JXCD^55+1&3S> z140qSOYlcJy?+o1ApKwyxKj2#XK$PrMAA#RckqP%;G`sm_)Hw@OB3tsE#UG(Q6{d7 z@?jhMJ}_(?N4+ISLtZ~TYfk6?8xr<43Hy5TiT|%X-{yW7eEjx4y`QMTuU#)Uzm2^g z1$(|#{oH;m-_&{Lul0VKfr9-rP4K8&f%Crizu$*H7teq)Me$ft32>AinB)EVod8X0 Rdwbf??ca+Z{M?=&{|M@_AvOR2 literal 6676 zcmeHLZ)g)|7=P|^m-J>0X_i1;t3*7bVCQhSjIt`1QioTqM0Rhx4=ZHR)jt@}kCP2b z7=?ba#iqPP!L+U9|m z9g4R9z^{GwZEkQU88MM z-jkAvZ!!Z;^5H&L17U0j3;F>+peO4hUH17A6h-g*FRquZ=k?^z;fLdvp3!L3nP2^S z^v964-YjUqm9w|R&2hpUz60?dnqNJ8KC%COK8=E!mV4`N+wsL^Urz?*d*V#W&Ns?o zf1Ssl+@c@2t{<}aru%==XidqjnP>X90UyUYAb+yJPe}gNwSQRgG%eA$jNPnX5gWcpx^NqyEx#t>ZVR{`W!s<`b!A75QU1amGd9&sqJ* z-d}3D{C0NKem>FAoc>O{ZJO%y=yvORgCduQ!L1F7tBEiu3+vhGztpi}v?t^b6PBJF znh9T|c63)Ols}&C;NP!*TBp~{=^rpJ2{CZ{N_yuC{t#A>YVn1XHO~wUk4eKVw!Z>O zE|S>tZ{i)oq`v`*s{y=m!pJU+gZkZ9YJWXpEHClFr89hQIwX<)13|_-CrHnlZ)slB z0)hL&`Z(vJdb?NrxU-!ZGvMwn)Bg^%W#rb>CVRaWbL!KWo3Hl=`NNYkCP3@SOo;K} z;}K97$dDoqZ>c7C!GjZV1m*(%;OfpN)4>sR&Tp=w>W&6*-@l-gTdP?y~J`?-fc<(=N5N1IU%$+qMiZi!= z;Rp0jyF+t$5O!zeeMXTmwU0IHtbS;%XZX0e+_1BrXV2HE$2aJCihb^!Uu-OFC%zw! zy{`QiJHJYNy8Ftk^8Y~@8TfUH@!_e~leh7f?b?R@!d&=1&ac*!^ho}^`K6YxAobAu jM|N{FKqodx&K)_HMcJZN0H3juk>}+T!ZjTu3+Mj>gEJwY diff --git a/Interface/AddOns/SVUI/libs/oUF_Plugins/oUF_ActionPanel/oUF_ActionPanel.lua b/Interface/AddOns/SVUI/libs/oUF_Plugins/oUF_ActionPanel/oUF_ActionPanel.lua index 6b436cd..5fd290f 100644 --- a/Interface/AddOns/SVUI/libs/oUF_Plugins/oUF_ActionPanel/oUF_ActionPanel.lua +++ b/Interface/AddOns/SVUI/libs/oUF_Plugins/oUF_ActionPanel/oUF_ActionPanel.lua @@ -1,7 +1,7 @@ local parent, ns = ... local oUF = ns.oUF -local ActionUpdate = function(self, event, unit) +local Update = function(self, event, unit) if(self.unit ~= unit) or not unit then return end local action = self.ActionPanel local border = action.border @@ -9,6 +9,7 @@ local ActionUpdate = function(self, event, unit) local showSpecial = false local r,g,b = 0,0,0; local category = UnitClassification(unit) + if(category == "elite") then r,g,b = 1,0.75,0,0.7; showSpecial = true @@ -33,68 +34,36 @@ local ActionUpdate = function(self, event, unit) special:Hide() end end -end -local StatusUpdate = function(self, event, unit) - if(self.unit ~= unit) or not unit then return end - local action = self.ActionPanel - local border = action.border - local special = action.special - local showSpecial = false - local r,g,b = 0,0,0; - local category = UnitClassification(unit) local status = self.StatusPanel - local texture = status.texture - local media = status.media + if(status) then + local texture = status.texture + local media = status.media - if(category == "elite") then - r,g,b = 1,0.75,0,0.7; - showSpecial = true - elseif(category == "rare" or category == "rareelite") then - r,g,b = 0.59,0.79,1,0.7; - showSpecial = true - end - if(UnitIsDeadOrGhost(unit)) then - r,g,b = 0,0,0 - end - border[1]:SetTexture(r,g,b) - border[2]:SetTexture(r,g,b) - border[3]:SetTexture(r,g,b) - border[4]:SetTexture(r,g,b) - if(special) then - if(showSpecial) then - special[1]:SetVertexColor(r,g,b) - special[2]:SetVertexColor(r,g,b) - special[3]:SetVertexColor(r,g,b) - special:Show() + if(not UnitIsConnected(unit)) then + texture:SetAlpha(1) + texture:SetTexture(media[1]) + texture:SetGradient("VERTICAL",0,1,1,1,1,0) + elseif(UnitIsDeadOrGhost(unit)) then + texture:SetAlpha(1) + texture:SetTexture(media[2]) + texture:SetGradient("VERTICAL",0,0,1,0,1,0) + elseif(UnitIsTapped(unit) and (not UnitIsTappedByPlayer(unit))) then + texture:SetAlpha(1) + texture:SetTexture(media[3]) + texture:SetGradient("VERTICAL",1,1,0,1,0,0) else - special:Hide() + texture:SetAlpha(0) end end - - if(not UnitIsConnected(unit)) then - texture:SetAlpha(1) - texture:SetTexture(media[1]) - texture:SetGradient("VERTICAL",0,1,1,1,1,0) - elseif(UnitIsDeadOrGhost(unit)) then - texture:SetAlpha(1) - texture:SetTexture(media[2]) - texture:SetGradient("VERTICAL",0,0,1,0,1,0) - elseif(UnitIsTapped(unit) and (not UnitIsTappedByPlayer(unit))) then - texture:SetAlpha(1) - texture:SetTexture(media[3]) - texture:SetGradient("VERTICAL",1,1,0,1,0,0) - else - texture:SetAlpha(0) - end end local Path = function(self, ...) - return (self.ActionPanel.Override or ActionUpdate) (self, ...) + return (self.ActionPanel.Override or Update) (self, ...) end local ForceUpdate = function(element) - return Path(element.__owner, 'ForceUpdate') + return Path(element.__owner, 'ForceUpdate', element.__owner.unit) end local Enable = function(self, unit) @@ -104,8 +73,7 @@ local Enable = function(self, unit) action.ForceUpdate = ForceUpdate local status = self.StatusPanel if(status and status.texture) then - action.Override = StatusUpdate - self:RegisterEvent('UNIT_FACTION', Path) + self:RegisterEvent('UNIT_FLAGS', Path) end self:RegisterEvent("UNIT_TARGET", Path, true) self:RegisterEvent("PLAYER_TARGET_CHANGED", Path, true) @@ -118,8 +86,8 @@ local Disable = function(self) if(action) then local status = self.StatusPanel if(status) then - if(self:IsEventRegistered("UNIT_FACTION")) then - self:UnregisterEvent("UNIT_FACTION", Path) + if(self:IsEventRegistered("UNIT_FLAGS")) then + self:UnregisterEvent("UNIT_FLAGS", Path) end end if(self:IsEventRegistered("PLAYER_TARGET_CHANGED")) then diff --git a/Interface/AddOns/SVUI/packages/dock/common/docklets.lua b/Interface/AddOns/SVUI/packages/dock/common/docklets.lua index a8f9b35..99342a7 100644 --- a/Interface/AddOns/SVUI/packages/dock/common/docklets.lua +++ b/Interface/AddOns/SVUI/packages/dock/common/docklets.lua @@ -44,7 +44,7 @@ local MOD = SuperVillain.Registry:Expose('SVDock'); LOCAL VARS ########################################################## ]]-- -local ToggleButton = CreateFrame("Button","ToolBarDockletButton",UIParent); +local AddOnButton = CreateFrame("Button","ToolBarDockletButton",UIParent); local DOCK_HEIGHT,DOCK_WIDTH; local SuperDockletMain = CreateFrame('Frame', 'SuperDockletMain', UIParent); local SuperDockletExtra = CreateFrame('Frame', 'SuperDockletExtra', UIParent); @@ -63,7 +63,7 @@ MOD.CurrentlyDocked = {}; local resizeHook = function() MOD:ReloadDocklets() -end; +end local rightDockSizeHook = function(self,width,height) SuperDockWindowRight:Width(width) @@ -76,7 +76,7 @@ local DockletFrame_OnShow = function(self) if (frameName and _G[frameName]) then _G[frameName]:Show() end -end; +end local Addon_OnEnter=function(b) if not b.IsOpen then @@ -87,7 +87,7 @@ local Addon_OnEnter=function(b) GameTooltip:ClearLines() GameTooltip:AddLine(b.TText,1,1,1) GameTooltip:Show() -end; +end local Addon_OnLeave=function(b) if not b.IsOpen then @@ -95,7 +95,7 @@ local Addon_OnLeave=function(b) b.icon:SetGradient("VERTICAL", 0.5, 0.53, 0.55, 0.8, 0.8, 1) end GameTooltip:Hide() -end; +end local Addon_OnClick=function(b) if SuperDockletMain.FrameName and _G[SuperDockletMain.FrameName] then @@ -117,7 +117,7 @@ local Addon_OnClick=function(b) end else SuperDockletMain.FrameName="None" - if InCombatLockdown()then return end; + if InCombatLockdown()then return end if SuperDockletMain:IsShown()then SuperDockletMain:Hide() else @@ -125,7 +125,7 @@ local Addon_OnClick=function(b) end b:SetPanelColor("special") b.icon:SetGradient("VERTICAL", 0.5, 0.53, 0.55, 0.8, 0.8, 1) - end; + end if SuperVillain.db.SVDock.docklets.enableExtra and SuperDockletExtra.FrameName and _G[SuperDockletExtra.FrameName] then if not _G[SuperDockletExtra.FrameName]:IsShown() then if not InCombatLockdown() and not SuperDockletExtra:IsShown()then @@ -156,7 +156,7 @@ local Addon_OnClick=function(b) else SuperDockletExtra.FrameName="None" end -end; +end --[[ ########################################################## CORE FUNCTIONS @@ -171,10 +171,10 @@ function MOD:DockletShow() if(InCombatLockdown() and (_G[SuperDockWindowRight.SecondName].IsProtected and _G[SuperDockWindowRight.SecondName]:IsProtected())) then return end _G[SuperDockWindowRight.SecondName]:Show() end -end; +end function MOD:DockletHide() - --if InCombatLockdown()then SuperVillain:AddonMessage("Cant close any windows in combat. Try again after combat ends...")return end; + --if InCombatLockdown()then SuperVillain:AddonMessage("Cant close any windows in combat. Try again after combat ends...")return end for i=1, #MOD.DockletList do local f = MOD.DockletList[i] if(not InCombatLockdown() or (InCombatLockdown() and (f.IsProtected and not f:IsProtected()))) then @@ -188,15 +188,15 @@ function MOD:DockletHide() end end -- SuperDockWindowRight:Show() -end; +end function MOD:DockWindowResize() - if InCombatLockdown()then return end; + if InCombatLockdown()then return end local width=RightSuperDock:GetWidth(); local height=RightSuperDock:GetHeight() - 22 SuperDockWindowRight:Size(width,height) SuperDockWindowRight:SetPoint("BOTTOMLEFT", SuperDockAlertRight, "TOPLEFT", 0, 0) -end; +end function MOD:RegisterDocklet(name,tooltip,texture,onclick,isdefault) local frame=_G[name]; @@ -209,14 +209,14 @@ function MOD:RegisterDocklet(name,tooltip,texture,onclick,isdefault) frame.listIndex=#MOD.DockletList; MOD:CreateBasicToolButton(tooltip,texture,onclick,name,isdefault) end -end; +end function MOD:UnregisterDocklet(name) local frame=_G[name]; - if not frame or not frame.listIndex then return end; + if not frame or not frame.listIndex then return end local i=frame.listIndex; tremove(MOD.DockletList,i) -end; +end function MOD:CreateDockWindow() DOCK_HEIGHT,DOCK_WIDTH = SuperVillain.db.SVDock.dockRightHeight, SuperVillain.db.SVDock.dockRightWidth; @@ -225,24 +225,24 @@ function MOD:CreateDockWindow() SuperDockWindowRight:SetScript('OnHide',MOD.DockletHide) if not InCombatLockdown()then MOD:DockletHide() - end; + end hooksecurefunc(RightSuperDock,'SetSize', rightDockSizeHook) -end; +end function MOD:IsDockletReady(arg) local addon = arg; if arg == "DockletMain" or arg == "DockletExtra" then addon = SuperVillain.db.SVDock.docklets[arg] end - if find(addon, "Skada") then addon = "Skada" end; + if find(addon, "Skada") then addon = "Skada" end if addon == nil or addon == 'None' or not IsAddOnLoaded(addon) then return false - end; + end return true -end; +end function MOD:ResizeDocklets() - if InCombatLockdown()then return end; + if InCombatLockdown()then return end local width = SuperVillain.db.SVDock.dockRightWidth or 350; local height = (SuperVillain.db.SVDock.dockRightHeight or 180) - 22 if MOD:IsDockletReady('DockletMain') then @@ -256,15 +256,14 @@ function MOD:ResizeDocklets() SuperDockletExtra:Size(width,height) SuperDockletExtra:Point('BOTTOMLEFT',SuperDockletMain,'BOTTOMRIGHT',0,0) end -end; +end function MOD:UnsetDockletButton() - MOD:RemoveTool(ToggleButton) - ToggleButton.TText=""; - ToggleButton.IsOpen=false; - ToggleButton.IsRegistered=false; - ToggleButton:Hide() -end; + MOD.RemoveTool(AddOnButton) + AddOnButton.TText=""; + AddOnButton.IsOpen=false; + AddOnButton.IsRegistered=false; +end function MOD:RegisterMainDocklet(name) local frame = _G[name]; @@ -277,14 +276,13 @@ function MOD:RegisterMainDocklet(name) frame.ToggleName="ToolBarDockletButton"; tinsert(MOD.DockletList,frame); frame.listIndex=#MOD.DockletList; - MOD:AddTool(ToggleButton) - ToggleButton.TText="Open "..MOD.MainToolTip; - ToggleButton.IsRegistered = true; - MOD.CurrentlyDocked[name] = true; - if not ToggleButton:IsShown() then ToggleButton:Show()end; - if not InCombatLockdown() and frame:IsShown() then frame:Hide() end; + MOD.AddTool(AddOnButton) + AddOnButton.TText="Open "..MOD.MainToolTip; + AddOnButton.IsRegistered = true + MOD.CurrentlyDocked[name] = true + if not InCombatLockdown() and frame:IsShown() then frame:Hide() end end -end; +end function MOD:RegisterExtraDocklet(name) local frame = _G[name]; @@ -297,11 +295,11 @@ function MOD:RegisterExtraDocklet(name) frame.ToggleName="ToolBarDockletButton"; tinsert(MOD.DockletList,frame); frame.listIndex=#MOD.DockletList; - ToggleButton.TText = MOD.MainToolTip.." and "..MOD.ExtraToolTip; + AddOnButton.TText = MOD.MainToolTip.." and "..MOD.ExtraToolTip; MOD.CurrentlyDocked[name] = true; - if not InCombatLockdown() and frame:IsShown() then frame:Hide() end; + if not InCombatLockdown() and frame:IsShown() then frame:Hide() end end -end; +end function MOD:UnregisterDocklets() local frame,i; @@ -312,7 +310,7 @@ function MOD:UnregisterDocklets() MOD:UnregisterDocklet(frame) SuperVillain.db.SVDock.docklets.MainWindow="None" end - elseif ToggleButton.IsRegistered then + elseif AddOnButton.IsRegistered then MOD:UnsetDockletButton() end if MOD:IsDockletReady('DockletExtra') then @@ -324,14 +322,14 @@ function MOD:UnregisterDocklets() end SuperDockletMain.FrameName="None" SuperDockletExtra.FrameName="None" -end; +end function MOD:ReloadDocklets(alert) MOD:UnregisterDocklets() MOD:ResizeDocklets() MOD.MainToolTip = ""; MOD.ExtraToolTip = ""; -end; +end function MOD:DockletEnterCombat(D) MOD.CombatLocked = true; @@ -339,41 +337,41 @@ function MOD:DockletEnterCombat(D) SuperDockletMain:Show() SuperDockletExtra:Show() end -end; +end local timeOutFunc = function() if not MOD.CombatLocked then SuperDockletMain:Hide() SuperDockletExtra:Hide() end -end; +end function MOD:DockletExitCombat(D) MOD.CombatLocked = false; if SuperVillain.db.SVDock.docklets.DockletCombatFade then SuperVillain:ExecuteTimer(timeOutFunc, 10) end -end; +end function MOD:CreateDockletButton() SuperDockletMain:SetFrameLevel(SuperDockWindowRight:GetFrameLevel() + 50) SuperDockletExtra:SetFrameLevel(SuperDockWindowRight:GetFrameLevel() + 50) local size = SuperDockToolBarRight.currentSize; - ToggleButton:SetParent(SuperDockToolBarRight) - ToggleButton:Size(size,size) - ToggleButton:SetFramedButtonTemplate() - ToggleButton.icon=ToggleButton:CreateTexture(nil,"OVERLAY") - ToggleButton.icon:FillInner() - ToggleButton.icon:SetTexture([[Interface\AddOns\SVUI\assets\artwork\Icons\DOCK-ADDON]]) - ToggleButton.icon:SetGradient("VERTICAL", 0.5, 0.53, 0.55, 0.8, 0.8, 1) - ToggleButton.TText=""; - ToggleButton.IsOpen=false; - ToggleButton.IsRegistered=false; - ToggleButton:SetScript("OnEnter",Addon_OnEnter) - ToggleButton:SetScript("OnLeave",Addon_OnLeave) - ToggleButton:SetScript("OnClick",Addon_OnClick) - ToggleButton:Hide() -end; + AddOnButton:SetParent(SuperDockToolBarRight) + AddOnButton:Size(size,size) + AddOnButton:SetFramedButtonTemplate() + AddOnButton.icon=AddOnButton:CreateTexture(nil,"OVERLAY") + AddOnButton.icon:FillInner() + AddOnButton.icon:SetTexture([[Interface\AddOns\SVUI\assets\artwork\Icons\DOCK-ADDON]]) + AddOnButton.icon:SetGradient("VERTICAL", 0.5, 0.53, 0.55, 0.8, 0.8, 1) + AddOnButton.TText=""; + AddOnButton.IsOpen=false; + AddOnButton.IsRegistered=false; + AddOnButton:SetScript("OnEnter",Addon_OnEnter) + AddOnButton:SetScript("OnLeave",Addon_OnLeave) + AddOnButton:SetScript("OnClick",Addon_OnClick) + AddOnButton:Hide() +end function MOD:DockletInit() MOD:CreateDockletButton() @@ -381,4 +379,4 @@ function MOD:DockletInit() SuperDockletMain:SetScript('OnShow', DockletFrame_OnShow) SuperDockletExtra:SetScript('OnShow', DockletFrame_OnShow) hooksecurefunc(MOD,'DockWindowResize', resizeHook) -end; \ No newline at end of file +end \ No newline at end of file diff --git a/Interface/AddOns/SVUI/packages/dock/common/toolbar.lua b/Interface/AddOns/SVUI/packages/dock/common/toolbar.lua index da4d3b2..94bcd91 100644 --- a/Interface/AddOns/SVUI/packages/dock/common/toolbar.lua +++ b/Interface/AddOns/SVUI/packages/dock/common/toolbar.lua @@ -130,36 +130,38 @@ MOD.LastAddedTool = false; CORE FUNCTIONS ########################################################## ]]-- -function MOD:RemoveTool(frame) - if not frame or not frame.listIndex then return end - local name = frame:GetName(); +function MOD:RemoveTool() + if not self or not self.listIndex then return end + local name = self:GetName(); if not MOD.ToolsSafty[name] then return end MOD.ToolsSafty[name] = false; - local i = frame.listIndex; + local i = self.listIndex; tremove(MOD.ToolsList, i) local width; local height = SuperDockToolBarRight.currentSize; MOD.LastAddedTool = MOD.ToolsList[#MOD.ToolsList] width = #MOD.ToolsList * (height + 6) SuperDockToolBarRight:Size(width, height) + self:Hide() end -function MOD:AddTool(frame) - local name = frame:GetName(); +function MOD:AddTool() + local name = self:GetName(); if MOD.ToolsSafty[name] then return end MOD.ToolsSafty[name] = true; local width; local height = SuperDockToolBarRight.currentSize; - if not MOD.LastAddedTool or MOD.LastAddedTool == frame then - frame:Point("RIGHT", SuperDockToolBarRight, "RIGHT", -6, 0); + if not MOD.LastAddedTool or MOD.LastAddedTool == self then + self:Point("RIGHT", SuperDockToolBarRight, "RIGHT", -6, 0); else - frame:Point("RIGHT", MOD.LastAddedTool, "LEFT", -6, 0); + self:Point("RIGHT", MOD.LastAddedTool, "LEFT", -6, 0); end - tinsert(MOD.ToolsList, frame) - frame.listIndex = #MOD.ToolsList; - MOD.LastAddedTool = frame; + tinsert(MOD.ToolsList, self) + self.listIndex = #MOD.ToolsList; + MOD.LastAddedTool = self; width = #MOD.ToolsList * (height + 6) SuperDockToolBarRight:Size(width, height) + self:Show() end function MOD:CreateBasicToolButton(name,texture,onclick,frameName,isdefault) @@ -168,7 +170,7 @@ function MOD:CreateBasicToolButton(name,texture,onclick,frameName,isdefault) local clickFunction = (type(onclick)=="function") and onclick or Button_OnClick; local size = SuperDockToolBarRight.currentSize; local button = _G[fName .. "_ToolBarButton"] or CreateFrame("Button",("%s_ToolBarButton"):format(fName),SuperDockToolBarRight) - MOD:AddTool(button) + MOD.AddTool(button) button:Size(size,size) button:SetFramedButtonTemplate() button.icon = button:CreateTexture(nil,"OVERLAY") @@ -310,24 +312,24 @@ do hearth:SetScript("OnLeave", Hearth_OnLeave) hearth:RegisterForClicks("AnyUp") - hearth:SetAttribute("type","item") - hearth:SetAttribute("item","Hearthstone") + hearth:SetAttribute("type", "item") + hearth:SetAttribute("item", "Hearthstone") if(SuperVillain.class == "SHAMAN") then - hearth:SetAttribute("type2","spell") - hearth:SetAttribute("spell","Astral Recall") + hearth:SetAttribute("type2", "spell") + hearth:SetAttribute("spell", "Astral Recall") hearth.ExtraSpell = "Astral Recall" elseif(SuperVillain.class == "DEATHKNIGHT") then hearth:SetAttribute("type2","spell") hearth:SetAttribute("spell","Death Gate") hearth.ExtraSpell = "Death Gate" elseif(SuperVillain.class == "DRUID") then - hearth:SetAttribute("type2","spell") - hearth:SetAttribute("spell","Teleport: Moonglade") + hearth:SetAttribute("type2", "spell") + hearth:SetAttribute("spell", "Teleport: Moonglade") hearth.ExtraSpell = "Teleport: Moonglade" elseif(SuperVillain.class == "MONK") then - hearth:SetAttribute("type2","spell") - hearth:SetAttribute("spell","Zen Pilgrimage") + hearth:SetAttribute("type2", "spell") + hearth:SetAttribute("spell", "Zen Pilgrimage") hearth.ExtraSpell = "Zen Pilgrimage" end diff --git a/Interface/AddOns/SVUI/packages/map/SVMap.lua b/Interface/AddOns/SVUI/packages/map/SVMap.lua index f6e5c1e..1e6d0cc 100644 --- a/Interface/AddOns/SVUI/packages/map/SVMap.lua +++ b/Interface/AddOns/SVUI/packages/map/SVMap.lua @@ -110,6 +110,7 @@ end; function MOD:RefreshMiniMap() MOD:UpdateSizing() if(SVUI_MinimapFrame and SVUI_MinimapFrame:IsShown()) then + --local minimapRotationEnabled = GetCVar("rotateMinimap") ~= "0" SVUI_MinimapFrame:Size(MM_WIDTH, MM_HEIGHT) SVUI_MinimapFrame.backdrop:SetGradient(unpack(MM_COLOR)) Minimap:Size(MM_SIZE,MM_SIZE) diff --git a/Interface/AddOns/SVUI/packages/stats/common/_load.xml b/Interface/AddOns/SVUI/packages/stats/common/_load.xml index 3b23e75..2d7215c 100644 --- a/Interface/AddOns/SVUI/packages/stats/common/_load.xml +++ b/Interface/AddOns/SVUI/packages/stats/common/_load.xml @@ -10,4 +10,6 @@