diff --git a/Interface/AddOns/SVUI/SVUI.toc b/Interface/AddOns/SVUI/SVUI.toc index 8ce9471..af49487 100644 --- a/Interface/AddOns/SVUI/SVUI.toc +++ b/Interface/AddOns/SVUI/SVUI.toc @@ -1,6 +1,6 @@ ## Interface: 60000 ## Author: Munglunch -## Version: 5.3.21 +## Version: 5.3.9 ## Title: |cffFF9900SVUI|r ## Notes: Supervillain UI [|cff9911FFCore Framework|r]. ## SavedVariables: SVUI_Global, SVUI_Errors diff --git a/Interface/AddOns/SVUI/assets/artwork/Template/INSET.blp b/Interface/AddOns/SVUI/assets/artwork/Template/INSET.blp new file mode 100644 index 0000000..9f7e05f Binary files /dev/null and b/Interface/AddOns/SVUI/assets/artwork/Template/INSET.blp differ diff --git a/Interface/AddOns/SVUI/assets/artwork/Unitframe/FOLLOWER-RING.blp b/Interface/AddOns/SVUI/assets/artwork/Unitframe/FOLLOWER-RING.blp index cf0f302..9a7ade9 100644 Binary files a/Interface/AddOns/SVUI/assets/artwork/Unitframe/FOLLOWER-RING.blp and b/Interface/AddOns/SVUI/assets/artwork/Unitframe/FOLLOWER-RING.blp differ diff --git a/Interface/AddOns/SVUI/data/defaults.lua b/Interface/AddOns/SVUI/data/defaults.lua index 839533c..aa000fd 100644 --- a/Interface/AddOns/SVUI/data/defaults.lua +++ b/Interface/AddOns/SVUI/data/defaults.lua @@ -91,8 +91,8 @@ SV.defaults["media"] = { ["default"] = "SVUI System Font", ["name"] = NAMEFONT, ["number"] = "SVUI Number Font", - ["combat"] = "SVUI Combat Font", - ["giant"] = "SVUI Action Font", + ["combat"] = "SVUI Number Font", + ["giant"] = "SVUI System Font", ["size"] = 10, ["unicodeSize"] = 12, }, diff --git a/Interface/AddOns/SVUI/framework/api/api.xml b/Interface/AddOns/SVUI/framework/api/api.xml index 84610e1..09070e6 100644 --- a/Interface/AddOns/SVUI/framework/api/api.xml +++ b/Interface/AddOns/SVUI/framework/api/api.xml @@ -555,18 +555,62 @@ <Attributes> <Attribute name="panelID" type="string" value="inset" /> <Attribute name="panelPadding" type="number" value="1" /> - <Attribute name="panelColor" type="string" value="hinted" /> + <Attribute name="panelColor" type="string" value="transparent" /> <Attribute name="panelGradient" type="boolean" value="false" /> <Attribute name="panelTexUpdate" type="boolean" value="false" /> - <Attribute name="panelSkipUpdate" type="boolean" value="false" /> + <Attribute name="panelSkipUpdate" type="boolean" value="true" /> </Attributes> - <Backdrop bgFile="Interface\AddOns\SVUI\assets\artwork\Template\DEFAULT" tile="true" edgeFile="Interface\BUTTONS\WHITE8X8"> - <EdgeSize val="1" /> - <TileSize val="20" /> + <Backdrop bgFile="Interface\AddOns\SVUI\assets\artwork\Template\DEFAULT" edgeFile="Interface\AddOns\SVUI\assets\artwork\Template\INSET" tile="false"> + <EdgeSize val="6" /> + <TileSize val="0" /> <BackgroundInsets left="0" right="0" top="0" bottom="0" /> - <BorderColor r="0" g="0" b="0" a="1" /> - <Color r="0" g="0" b="0" a="0.35" /> + <Color r="0" g="0" b="0" a="0.5" /> + <BorderColor r="0" g="0" b="0" a="0.5" /> </Backdrop> + <Layers> + <Layer level="BORDER"> + <Texture parentKey="BorderLeft" file="Interface\BUTTONS\WHITE8X8"> + <Anchors> + <Anchor point="TOPLEFT" relativePoint="TOPLEFT" /> + <Anchor point="BOTTOMLEFT" relativePoint="BOTTOMLEFT" /> + </Anchors> + <Size> + <AbsDimension x="1" /> + </Size> + <Color r="0" g="0" b="0" a="1" /> + </Texture> + <Texture parentKey="BorderRight" file="Interface\BUTTONS\WHITE8X8"> + <Anchors> + <Anchor point="TOPRIGHT" relativePoint="TOPRIGHT" /> + <Anchor point="BOTTOMRIGHT" relativePoint="BOTTOMRIGHT" /> + </Anchors> + <Size> + <AbsDimension x="1" /> + </Size> + <Color r="0" g="0" b="0" a="1" /> + </Texture> + <Texture parentKey="BorderTop" file="Interface\BUTTONS\WHITE8X8"> + <Anchors> + <Anchor point="TOPLEFT" relativePoint="TOPLEFT" /> + <Anchor point="TOPRIGHT" relativePoint="TOPRIGHT" /> + </Anchors> + <Size> + <AbsDimension y="1" /> + </Size> + <Color r="0" g="0" b="0" a="1" /> + </Texture> + <Texture parentKey="BorderBottom" file="Interface\BUTTONS\WHITE8X8"> + <Anchors> + <Anchor point="BOTTOMLEFT" relativePoint="BOTTOMLEFT" /> + <Anchor point="BOTTOMRIGHT" relativePoint="BOTTOMRIGHT" /> + </Anchors> + <Size> + <AbsDimension y="1" /> + </Size> + <Color r="0" g="0" b="0" a="1" /> + </Texture> + </Layer> + </Layers> </Frame> <Frame name="SVUI_PanelTemplate_Comic" virtual="true"> diff --git a/Interface/AddOns/SVUI/framework/api/api_layout.lua b/Interface/AddOns/SVUI/framework/api/api_layout.lua index 74a5cbb..12ea3e5 100644 --- a/Interface/AddOns/SVUI/framework/api/api_layout.lua +++ b/Interface/AddOns/SVUI/framework/api/api_layout.lua @@ -126,9 +126,6 @@ local _purgatory = CreateFrame("Frame", nil) _purgatory:Hide() local function Die(self) - if(self.SetAtlas) then - self.SetAtlas = function() return end - end if(self.UnregisterAllEvents) then self:UnregisterAllEvents() self:SetParent(_purgatory) @@ -157,9 +154,6 @@ local function RemoveTextures(self, option) region.Show = region.Hide end region:Hide() - if(region.SetAtlas) then - region.SetAtlas = function() return end - end elseif(type(option) == "string" and ((layer == option) or (texture ~= option))) then region:SetTexture(0,0,0,0) end diff --git a/Interface/AddOns/SVUI/framework/movers/mover_dragger.lua b/Interface/AddOns/SVUI/framework/movers/mover_dragger.lua index c3dd21d..7a8af25 100644 --- a/Interface/AddOns/SVUI/framework/movers/mover_dragger.lua +++ b/Interface/AddOns/SVUI/framework/movers/mover_dragger.lua @@ -68,6 +68,7 @@ UIPanels["GuildBankFrame"] = { moving = false, snapped = false, canupdate = UIPanels["GuildRegistrarFrame"] = { moving = false, snapped = false, canupdate = false, cansetpoint = false, centered = false }; UIPanels["GarrisonLandingPage"] = { moving = false, snapped = false, canupdate = false, cansetpoint = false, centered = true }; UIPanels["GarrisonMissionFrame"] = { moving = false, snapped = false, canupdate = false, cansetpoint = false, centered = true }; +UIPanels["GarrisonBuildingFrame"] = { moving = false, snapped = false, canupdate = false, cansetpoint = false, centered = true }; UIPanels["GarrisonCapacitiveDisplayFrame"] = { moving = false, snapped = false, canupdate = false, cansetpoint = false, centered = false }; UIPanels["HelpFrame"] = { moving = false, snapped = false, canupdate = false, cansetpoint = false, centered = true }; UIPanels["InterfaceOptionsFrame"] = { moving = false, snapped = false, canupdate = false, cansetpoint = false, centered = true }; diff --git a/Interface/AddOns/SVUI/libs/oUF_Villain/Plugins/oUF_ActionPanel/oUF_ActionPanel.toc b/Interface/AddOns/SVUI/libs/oUF_Villain/Plugins/oUF_ActionPanel/oUF_ActionPanel.toc index 5bcbeba..5363e23 100644 --- a/Interface/AddOns/SVUI/libs/oUF_Villain/Plugins/oUF_ActionPanel/oUF_ActionPanel.toc +++ b/Interface/AddOns/SVUI/libs/oUF_Villain/Plugins/oUF_ActionPanel/oUF_ActionPanel.toc @@ -2,7 +2,7 @@ ## Title: oUF ActionPanel ## Notes: Adds a backing to all unit frames that provides many utilities. ## Author: Munglunch -## Version: 5.3.21 +## Version: 5.3.9 ## X-Category: oUF ## Dependencies: oUF diff --git a/Interface/AddOns/SVUI/libs/oUF_Villain/Plugins/oUF_Afflicted/oUF_Afflicted.toc b/Interface/AddOns/SVUI/libs/oUF_Villain/Plugins/oUF_Afflicted/oUF_Afflicted.toc index 6a1c85c..f4b00df 100644 --- a/Interface/AddOns/SVUI/libs/oUF_Villain/Plugins/oUF_Afflicted/oUF_Afflicted.toc +++ b/Interface/AddOns/SVUI/libs/oUF_Villain/Plugins/oUF_Afflicted/oUF_Afflicted.toc @@ -2,7 +2,7 @@ ## Title: oUF Afflicted ## Notes: Adds Custom Debuff Highlighting to oUF. ## Author: Munglunch -## Version: 5.3.21 +## Version: 5.3.9 ## X-Category: oUF ## Dependencies: oUF diff --git a/Interface/AddOns/SVUI/libs/oUF_Villain/Plugins/oUF_ArcaneCharge/oUF_ArcaneCharge.toc b/Interface/AddOns/SVUI/libs/oUF_Villain/Plugins/oUF_ArcaneCharge/oUF_ArcaneCharge.toc index 6e1c036..b0d4096 100644 --- a/Interface/AddOns/SVUI/libs/oUF_Villain/Plugins/oUF_ArcaneCharge/oUF_ArcaneCharge.toc +++ b/Interface/AddOns/SVUI/libs/oUF_Villain/Plugins/oUF_ArcaneCharge/oUF_ArcaneCharge.toc @@ -2,7 +2,7 @@ ## Title: oUF Arcane Charge ## Notes: Adds support for arcane charge indicators to oUF. ## Author: Munglunch -## Version: 5.3.21 +## Version: 5.3.9 ## Dependencies: oUF oUF_ArcaneCharge.lua \ No newline at end of file diff --git a/Interface/AddOns/SVUI/libs/oUF_Villain/Plugins/oUF_Combatant/oUF_Combatant.toc b/Interface/AddOns/SVUI/libs/oUF_Villain/Plugins/oUF_Combatant/oUF_Combatant.toc index 49c86e2..6068ea1 100644 --- a/Interface/AddOns/SVUI/libs/oUF_Villain/Plugins/oUF_Combatant/oUF_Combatant.toc +++ b/Interface/AddOns/SVUI/libs/oUF_Villain/Plugins/oUF_Combatant/oUF_Combatant.toc @@ -2,7 +2,7 @@ ## Title: oUF Combatant ## Notes: Adds PvP trinket status and spec icons to oUF frames. ## Author: Munglunch -## Version: 5.3.21 +## Version: 5.3.9 ## X-Category: oUF ## Dependencies: oUF diff --git a/Interface/AddOns/SVUI/packages/stats/stats/experience.lua b/Interface/AddOns/SVUI/packages/stats/stats/experience.lua index e184524..9e83014 100644 --- a/Interface/AddOns/SVUI/packages/stats/stats/experience.lua +++ b/Interface/AddOns/SVUI/packages/stats/stats/experience.lua @@ -19,7 +19,6 @@ STATS:Extend EXAMPLE USAGE: MOD:Extend(newStat,eventList,onEvents,update,click,f LOCALIZED LUA FUNCTIONS ########################################################## ]]-- -if (UnitLevel("player") == GetMaxPlayerLevel()) then return end; --[[ GLOBALS ]]-- local _G = _G; local unpack = _G.unpack; @@ -86,11 +85,11 @@ local function Experience_OnEvent(self, ...) end local function ExperienceBar_OnEvent(self, ...) - if (UnitLevel("player") == GetMaxPlayerLevel())then - self:Hide() - MOD:UnSet(self) - return - end + -- if (UnitLevel("player") == GetMaxPlayerLevel())then + -- self:Hide() + -- MOD:UnSet(self) + -- return + -- end if (not self.barframe:IsShown())then self.barframe:Show() self.barframe.icon.texture:SetTexture("Interface\\Addons\\SVUI\\assets\\artwork\\Icons\\STAT-XP") @@ -139,5 +138,5 @@ local function ExperienceBar_OnLoad(self) end end -MOD:Extend("Experience", StatEvents, Experience_OnEvent, nil, nil, Experience_OnEnter, nil, ExperienceBar_OnLoad) -MOD:Extend("Experience Bar", StatEvents, ExperienceBar_OnEvent, nil, nil, Experience_OnEnter, nil, ExperienceBar_OnLoad) \ No newline at end of file +MOD:Extend("Experience", StatEvents, Experience_OnEvent, nil, nil, Experience_OnEnter) +MOD:Extend("Experience Bar", StatEvents, ExperienceBar_OnEvent, nil, nil, Experience_OnEnter) \ No newline at end of file diff --git a/Interface/AddOns/SVUI/packages/tip/SVTip.lua b/Interface/AddOns/SVUI/packages/tip/SVTip.lua index e8863df..4d5338e 100644 --- a/Interface/AddOns/SVUI/packages/tip/SVTip.lua +++ b/Interface/AddOns/SVUI/packages/tip/SVTip.lua @@ -86,10 +86,12 @@ local tooltips = { WorldMapCompareTooltip3, DropDownList1MenuBackdrop, DropDownList2MenuBackdrop, DropDownList3MenuBackdrop, BNToastFrame, PetBattlePrimaryAbilityTooltip, PetBattlePrimaryUnitTooltip, - BattlePetTooltip, FloatingBattlePetTooltip, FloatingPetBattleAbilityTooltip, + BattlePetTooltip, FloatingBattlePetTooltip, FloatingPetBattleAbilityTooltip, FloatingGarrisonFollowerTooltip, GarrisonMissionMechanicTooltip, GarrisonFollowerTooltip, GarrisonMissionMechanicFollowerCounterTooltip, GarrisonFollowerAbilityTooltip, - BuildingLevelTooltip + --StoreTooltip, + BrowserSettingsTooltip, + QueueStatusFrame }; local classification = { diff --git a/Interface/AddOns/SVUI/packages/tools/components/questwatch.lua b/Interface/AddOns/SVUI/packages/tools/components/questwatch.lua index 7a0b791..6838c4f 100644 --- a/Interface/AddOns/SVUI/packages/tools/components/questwatch.lua +++ b/Interface/AddOns/SVUI/packages/tools/components/questwatch.lua @@ -77,6 +77,16 @@ local HideSubDocklet = function(self) if(ObjectiveTrackerFrame:IsShown()) then ObjectiveTrackerFrame:Hide() end end +local UpdateDocklet = function() + local cur = SVUI_QuestWatchFrameScrollBar:GetValue() + if(not InCombatLockdown()) then + ObjectiveTrackerFrame:ClearAllPoints() + ObjectiveTrackerFrame:SetAllPoints(SVUI_QuestWatchFrameScrollFrame) + end + SVUI_QuestWatchFrameScrollBar:SetValue(0) + SVUI_QuestWatchFrameScrollBar:SetValue(cur) +end + function MOD:LoadQuestWatch() if(not ObjectiveTrackerFrame) then return end if(not SV.db.general.questWatch) then @@ -157,9 +167,8 @@ function MOD:LoadQuestWatch() ObjectiveTrackerFrame:SetPoint("TOPRIGHT", listFrame, "TOPRIGHT", -2, 0) ObjectiveTrackerFrame:SetFrameLevel(listFrame:GetFrameLevel() + 1) - ObjectiveTrackerFrame:HookScript("OnEvent", function(self) - self:SetPoint("TOPRIGHT", SVUI_QuestWatchFrameScrollFrame, "TOPRIGHT", -2, 0) - end) + ObjectiveTrackerFrame:HookScript("OnEvent", UpdateDocklet) + hooksecurefunc(ObjectiveTrackerFrame, "SetPoint", UpdateDocklet) -- hooksecurefunc(ObjectiveTrackerFrame, "SetPoint", function(self, a1, p, a2, x, y) -- if(p ~= SVUI_QuestWatchFrameScrollFrame) then @@ -199,6 +208,6 @@ function MOD:LoadQuestWatch() self.QuestWatch:SetScript('OnHide', HideSubDocklet); listFrame:SetScrollChild(ObjectiveTrackerFrame) - SV.Timers:ExecuteTimer(function() SVUI_QuestWatchFrameScrollBar:SetValue(10) SVUI_QuestWatchFrameScrollBar:SetValue(0) end, 5) + SV.Timers:ExecuteTimer(UpdateDocklet, 3) end end \ No newline at end of file diff --git a/Interface/AddOns/SVUI/system/media.lua b/Interface/AddOns/SVUI/system/media.lua index 2dfb8e5..1f7f300 100644 --- a/Interface/AddOns/SVUI/system/media.lua +++ b/Interface/AddOns/SVUI/system/media.lua @@ -324,12 +324,12 @@ function SV:RefreshSystemFonts() SetFont("FriendsFont_Large", STANDARD_TEXT_FONT, fontsize) SetFont("FriendsFont_UserText", STANDARD_TEXT_FONT, fontsize) - SetFont("GameFont_Gigantic", GIANT_TEXT_FONT, 200, "THICKOUTLINE", 32) - SetFont("SystemFont_Shadow_Huge1", GIANT_TEXT_FONT, 200, "OUTLINE") - SetFont("SystemFont_OutlineThick_Huge2", GIANT_TEXT_FONT, 200, "THICKOUTLINE") + SetFont("GameFont_Gigantic", GIANT_TEXT_FONT, 32, "THICKOUTLINE", 32) + SetFont("SystemFont_Shadow_Huge1", GIANT_TEXT_FONT, 32, "OUTLINE") + SetFont("SystemFont_OutlineThick_Huge2", GIANT_TEXT_FONT, 32, "THICKOUTLINE") - SetFont("SystemFont_Shadow_Huge3", DAMAGE_TEXT_FONT, 200, "THICKOUTLINE") - SetFont("CombatTextFont", DAMAGE_TEXT_FONT, 200, "THICKOUTLINE") + SetFont("SystemFont_Shadow_Huge3", DAMAGE_TEXT_FONT, 32, "THICKOUTLINE") + SetFont("CombatTextFont", DAMAGE_TEXT_FONT, 32, "THICKOUTLINE") local UNICODE_FONT = self.Media.font.roboto; @@ -393,12 +393,12 @@ function SV:RefreshAllSystemMedia() SetFont("FriendsFont_Large", STANDARD_TEXT_FONT, fontsize) SetFont("FriendsFont_UserText", STANDARD_TEXT_FONT, fontsize) - SetFont("GameFont_Gigantic", GIANT_TEXT_FONT, 200, "THICKOUTLINE", 32) - SetFont("SystemFont_Shadow_Huge1", GIANT_TEXT_FONT, 200, "OUTLINE") - SetFont("SystemFont_OutlineThick_Huge2", GIANT_TEXT_FONT, 200, "THICKOUTLINE") + SetFont("GameFont_Gigantic", GIANT_TEXT_FONT, 32, "THICKOUTLINE", 32) + SetFont("SystemFont_Shadow_Huge1", GIANT_TEXT_FONT, 32, "OUTLINE") + SetFont("SystemFont_OutlineThick_Huge2", GIANT_TEXT_FONT, 32, "THICKOUTLINE") - SetFont("SystemFont_Shadow_Huge3", DAMAGE_TEXT_FONT, 200, "THICKOUTLINE") - SetFont("CombatTextFont", DAMAGE_TEXT_FONT, 200, "THICKOUTLINE") + SetFont("SystemFont_Shadow_Huge3", DAMAGE_TEXT_FONT, 32, "THICKOUTLINE") + SetFont("CombatTextFont", DAMAGE_TEXT_FONT, 32, "THICKOUTLINE") local UNICODE_FONT = self.Media.font.roboto; diff --git a/Interface/AddOns/SVUI_ChatOMatic/SVUI_ChatOMatic.toc b/Interface/AddOns/SVUI_ChatOMatic/SVUI_ChatOMatic.toc index 0cfc694..0f1028a 100644 --- a/Interface/AddOns/SVUI_ChatOMatic/SVUI_ChatOMatic.toc +++ b/Interface/AddOns/SVUI_ChatOMatic/SVUI_ChatOMatic.toc @@ -1,6 +1,6 @@ ## Interface: 60000 ## Author: Munglunch -## Version: 5.3.21 +## Version: 5.3.9 ## Title: |cffFF9900SVUI |r|cffFFEF00Chat-O-Matic|r ## Notes: Supervillain UI [|cff9911FFVarious Chat Gadgets|r] ## SavedVariables: ChatOMatic_Data diff --git a/Interface/AddOns/SVUI_ConfigOMatic/SVUI_ConfigOMatic.lua b/Interface/AddOns/SVUI_ConfigOMatic/SVUI_ConfigOMatic.lua index e491d63..0ccbc16 100644 --- a/Interface/AddOns/SVUI_ConfigOMatic/SVUI_ConfigOMatic.lua +++ b/Interface/AddOns/SVUI_ConfigOMatic/SVUI_ConfigOMatic.lua @@ -588,7 +588,7 @@ SV.Options.args.common = { desc = L["Set/Override the global UI font. |cff00FF00NOTE:|r |cff00FF99This WILL NOT affect configurable fonts.|r"], values = AceGUIWidgetLSMlists.font, get = function(j)return SV.db.media.fonts[j[#j]]end, - set = function(j,value)SV.db.media.fonts[j[#j]] = value;SV:RefreshSystemFonts()end + set = function(j,value)SV.db.media.fonts[j[#j]] = value;SV:RefreshSystemFonts();SV:StaticPopup_Show("RL_CLIENT")end }, name = { type = "select", @@ -598,7 +598,7 @@ SV.Options.args.common = { desc = L["Set/Override the global name font. |cff00FF00NOTE:|r |cff00FF99This WILL NOT affect styled nameplates or unitframes.|r"], values = AceGUIWidgetLSMlists.font, get = function(j)return SV.db.media.fonts[j[#j]]end, - set = function(j,value)SV.db.media.fonts[j[#j]] = value;SV:RefreshSystemFonts()end + set = function(j,value)SV.db.media.fonts[j[#j]] = value;SV:RefreshSystemFonts();SV:StaticPopup_Show("RL_CLIENT")end }, combat = { type = "select", @@ -608,7 +608,7 @@ SV.Options.args.common = { desc = L["Set/Override the font that combat text will use. |cffFF0000NOTE:|r |cffFF9900This requires a game restart or re-log for this change to take effect.|r"], values = AceGUIWidgetLSMlists.font, get = function(j)return SV.db.media.fonts[j[#j]]end, - set = function(j,value)SV.db.media.fonts[j[#j]] = value;SV:RefreshSystemFonts()SV:StaticPopup_Show("RL_CLIENT")end + set = function(j,value)SV.db.media.fonts[j[#j]] = value;SV:RefreshSystemFonts();SV:StaticPopup_Show("RL_CLIENT")end }, number = { type = "select", @@ -618,8 +618,18 @@ SV.Options.args.common = { desc = L["Set/Override the global font used for numbers. |cff00FF00NOTE:|r |cff00FF99This WILL NOT affect all numbers.|r"], values = AceGUIWidgetLSMlists.font, get = function(j)return SV.db.media.fonts[j[#j]]end, - set = function(j,value)SV.db.media.fonts[j[#j]] = value;SV:RefreshSystemFonts()end - }, + set = function(j,value)SV.db.media.fonts[j[#j]] = value;SV:RefreshSystemFonts();SV:StaticPopup_Show("RL_CLIENT")end + }, + giant = { + type = "select", + dialogControl = 'LSM30_Font', + order = 9, + name = L["Alert Font"], + desc = L["Set/Override the global font used for alerts and warnings."], + values = AceGUIWidgetLSMlists.font, + get = function(j)return SV.db.media.fonts[j[#j]]end, + set = function(j,value)SV.db.media.fonts[j[#j]] = value;SV:RefreshSystemFonts();SV:StaticPopup_Show("RL_CLIENT")end + }, } }, colors = { diff --git a/Interface/AddOns/SVUI_ConfigOMatic/SVUI_ConfigOMatic.toc b/Interface/AddOns/SVUI_ConfigOMatic/SVUI_ConfigOMatic.toc index 250fe68..97185a3 100644 --- a/Interface/AddOns/SVUI_ConfigOMatic/SVUI_ConfigOMatic.toc +++ b/Interface/AddOns/SVUI_ConfigOMatic/SVUI_ConfigOMatic.toc @@ -1,6 +1,6 @@ ## Interface: 60000 ## Author: Munglunch -## Version: 5.3.21 +## Version: 5.3.9 ## Title: |cffFF9900SVUI |r|cffFFEF00Config-O-Matic|r ## Notes: Supervillain UI [|cff9911FFConfig Options|r] ## RequiredDeps: SVUI diff --git a/Interface/AddOns/SVUI_CraftOMatic/SVUI_CraftOMatic.toc b/Interface/AddOns/SVUI_CraftOMatic/SVUI_CraftOMatic.toc index 646d483..e29e0f6 100644 --- a/Interface/AddOns/SVUI_CraftOMatic/SVUI_CraftOMatic.toc +++ b/Interface/AddOns/SVUI_CraftOMatic/SVUI_CraftOMatic.toc @@ -1,6 +1,6 @@ ## Interface: 60000 ## Author: Munglunch -## Version: 5.3.21 +## Version: 5.3.9 ## Title: |cffFF9900SVUI |r|cffFFEF00Craft-O-Matic|r ## Notes: Supervillain UI [|cff9911FFProfession Tools|r]. ## SavedVariablesPerCharacter: CraftOMatic_Profile, CraftOMatic_Cache diff --git a/Interface/AddOns/SVUI_FightOMatic/SVUI_FightOMatic.toc b/Interface/AddOns/SVUI_FightOMatic/SVUI_FightOMatic.toc index 35b1672..03e89e3 100644 --- a/Interface/AddOns/SVUI_FightOMatic/SVUI_FightOMatic.toc +++ b/Interface/AddOns/SVUI_FightOMatic/SVUI_FightOMatic.toc @@ -1,6 +1,6 @@ ## Interface: 60000 ## Author: Munglunch -## Version: 5.3.21 +## Version: 5.3.9 ## Title: |cffFF9900SVUI |r|cffFFEF00Fight-O-Matic|r ## Notes: Supervillain UI [|cff9911FFPvP Tools|r]. ## SavedVariablesPerCharacter: FightOMatic_Profile, FightOMatic_Cache diff --git a/Interface/AddOns/SVUI_LogOMatic/SVUI_LogOMatic.toc b/Interface/AddOns/SVUI_LogOMatic/SVUI_LogOMatic.toc index 47a901f..b4bfc5a 100644 --- a/Interface/AddOns/SVUI_LogOMatic/SVUI_LogOMatic.toc +++ b/Interface/AddOns/SVUI_LogOMatic/SVUI_LogOMatic.toc @@ -1,6 +1,6 @@ ## Interface: 60000 ## Author: Munglunch -## Version: 5.3.21 +## Version: 5.3.9 ## Title: |cffFF9900SVUI |r|cffFFEF00Log-O-Matic|r ## Notes: Supervillain UI [|cff9911FFData Logging|r]. ## SavedVariables: LogOMatic_Data diff --git a/Interface/AddOns/SVUI_StyleOMatic/Loader.lua b/Interface/AddOns/SVUI_StyleOMatic/Loader.lua index 0e4b78c..6388a76 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/Loader.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/Loader.lua @@ -89,7 +89,7 @@ AddonObject.defaults = { }, ["addons"] = { ["enable"] = true, - ['Ace3.lua'] = true, + ['AceGUI.lua'] = true, ['ACP.lua'] = true, ['AdiBags.lua'] = true, ['Altoholic.lua'] = true, @@ -149,13 +149,7 @@ SV.Options.args.plugins.args.pluginOptions.args[Schema].args["addons"] = { set = function(key,value) PLUGIN.db.addons[key[#key]] = value; SV:StaticPopup_Show("RL_CLIENT")end, disabled = function() return not PLUGIN.db.addons.enable end, guiInline = true, - args = { - ace3 = { - type = "toggle", - order = 1, - name = "Ace3" - }, - } + args = {} } SV.Options.args.plugins.args.pluginOptions.args[Schema].args["blizzard"] = { order = 300, diff --git a/Interface/AddOns/SVUI_StyleOMatic/SVUI_StyleOMatic.lua b/Interface/AddOns/SVUI_StyleOMatic/SVUI_StyleOMatic.lua index 5411f14..d1fe6d7 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/SVUI_StyleOMatic.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/SVUI_StyleOMatic.lua @@ -60,7 +60,7 @@ PLUGIN.CustomQueue = {}; PLUGIN.EventListeners = {}; PLUGIN.OnLoadAddons = {}; PLUGIN.StyledAddons = {}; -PLUGIN.Debugging = false +PLUGIN.Debugging = false; --[[ ########################################################## CORE FUNCTIONS @@ -221,7 +221,7 @@ function PLUGIN:PLAYER_ENTERING_WORLD(event, ...) set = function(key,value) PLUGIN:ChangeDBVar(value, key[#key], "addons"); SV:StaticPopup_Show("RL_CLIENT") end, disabled = function() if addonName then - return not IsAddOnLoaded(addonName) + return not PLUGIN.StyledAddons[addonName] else return false end diff --git a/Interface/AddOns/SVUI_StyleOMatic/SVUI_StyleOMatic.toc b/Interface/AddOns/SVUI_StyleOMatic/SVUI_StyleOMatic.toc index 3fca783..a8dfbfb 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/SVUI_StyleOMatic.toc +++ b/Interface/AddOns/SVUI_StyleOMatic/SVUI_StyleOMatic.toc @@ -1,6 +1,6 @@ ## Interface: 60000 ## Author: Munglunch, Azilroka, Sortokk -## Version: 5.3.21 +## Version: 5.3.9 ## Title: |cffFF9900SVUI |r|cffFFEF00Style-O-Matic|r ## Notes: Supervillain UI [|cff9911FFAddon Skins|r]. ## SavedVariables: StyleOMatic_Global diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/addons/Ace3.lua b/Interface/AddOns/SVUI_StyleOMatic/components/addons/Ace3.lua index d8b2710..b19bc80 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/addons/Ace3.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/addons/Ace3.lua @@ -268,4 +268,5 @@ end PLUGIN LOADING ########################################################## ]]-- -PLUGIN:SaveAddonStyle("SVUI_ConfigOMatic", StyleAceGUI, nil, true) \ No newline at end of file +--PLUGIN:SaveAddonStyle("SVUI_ConfigOMatic", StyleAceGUI, nil, true) +PLUGIN:SaveAddonStyle("AceGUI", StyleAceGUI, nil, true) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/addons/DBM.lua b/Interface/AddOns/SVUI_StyleOMatic/components/addons/DBM.lua index 9b8420c..40fb4f0 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/addons/DBM.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/addons/DBM.lua @@ -22,6 +22,7 @@ local unpack = _G.unpack; local select = _G.select; local pairs = _G.pairs; local string = _G.string; +local gsub = string.gsub; --[[ STRING METHODS ]]-- local format = string.format; --[[ @@ -50,62 +51,79 @@ local function StyleBars(self) local icon2 = _G[frame:GetName()..'BarIcon2'] local name = _G[frame:GetName()..'BarName'] local timer = _G[frame:GetName()..'BarTimer'] + if not icon1.overlay then icon1.overlay = CreateFrame('Frame', '$parentIcon1Overlay', tbar) - icon1.overlay:Size(22) + icon1.overlay:Size(28) icon1.overlay:SetPanelTemplate("Button") icon1.overlay:SetFrameLevel(0) - icon1.overlay:Point('BOTTOMRIGHT', frame, 'BOTTOMLEFT', -2, 0) + icon1.overlay:Point('BOTTOMRIGHT', frame, 'BOTTOMLEFT', -4, 0) end + if not icon2.overlay then icon2.overlay = CreateFrame('Frame', '$parentIcon2Overlay', tbar) - icon2.overlay:Size(22) + icon2.overlay:Size(28) icon2.overlay:SetPanelTemplate("Button") icon2.overlay:SetFrameLevel(0) - icon2.overlay:Point('BOTTOMLEFT', frame, 'BOTTOMRIGHT', 2, 0) + icon2.overlay:Point('BOTTOMLEFT', frame, 'BOTTOMRIGHT', 4, 0) end + if bar.color then tbar:SetStatusBarColor(bar.color.r, bar.color.g, bar.color.b) else tbar:SetStatusBarColor(bar.owner.options.StartColorR, bar.owner.options.StartColorG, bar.owner.options.StartColorB) end + + local sharedWidth = bar.owner.options.Width + local sharedScale = bar.owner.options.Scale if bar.enlarged then - frame:SetWidth(bar.owner.options.HugeWidth) - tbar:SetWidth(bar.owner.options.HugeWidth) - frame:SetScale(bar.owner.options.HugeScale) - else - frame:SetWidth(bar.owner.options.Width) - tbar:SetWidth(bar.owner.options.Width) - frame:SetScale(bar.owner.options.Scale) + sharedWidth = bar.owner.options.HugeWidth + sharedScale = bar.owner.options.HugeScale end + + frame:SetWidth(sharedWidth) + frame:SetHeight(28) + frame:SetScale(sharedScale) + spark:SetAlpha(0) spark:SetTexture(0,0,0,0) + icon1:SetTexCoord(0.1,0.9,0.1,0.9) icon1:ClearAllPoints() icon1:SetAllPoints(icon1.overlay) + icon2:SetTexCoord(0.1,0.9,0.1,0.9) icon2:ClearAllPoints() icon2:SetAllPoints(icon2.overlay) + texture:SetTexture([[Interface\AddOns\SVUI\assets\artwork\Template\DEFAULT]]) - tbar:SetAllPoints(frame) - frame:SetPanelTemplate("Bar") + tbar:SetWidth(sharedWidth) + tbar:SetHeight(10) + tbar:Point('BOTTOMLEFT', frame, 'BOTTOMLEFT', 0, 0) + tbar:SetPanelTemplate("Bar") + name:ClearAllPoints() - name:SetWidth(165) name:SetHeight(8) + name:SetWidth(sharedWidth) name:SetJustifyH('LEFT') name:SetShadowColor(0, 0, 0, 0) + name:Point('TOPLEFT', frame, 'TOPLEFT', 0, 0) + name:SetFont(SV.Media.font.roboto, 12, 'OUTLINE') + name:SetTextColor(bar.owner.options.TextColorR, bar.owner.options.TextColorG, bar.owner.options.TextColorB) + timer:ClearAllPoints() timer:SetJustifyH('RIGHT') timer:SetShadowColor(0, 0, 0, 0) - frame:SetHeight(22) - name:Point('LEFT', frame, 'LEFT', 4, 0) - timer:Point('RIGHT', frame, 'RIGHT', -4, 0) - name:FontManager(SV.Media.font.default, 12, 'OUTLINE') - timer:FontManager(SV.Media.font.default, 12, 'OUTLINE') - name:SetTextColor(bar.owner.options.TextColorR, bar.owner.options.TextColorG, bar.owner.options.TextColorB) + timer:Point('TOPRIGHT', frame, 'TOPRIGHT', 0, 0) + timer:SetFont(SV.Media.font.roboto, 12, 'OUTLINE') timer:SetTextColor(bar.owner.options.TextColorR, bar.owner.options.TextColorG, bar.owner.options.TextColorB) + if bar.owner.options.IconLeft then icon1:Show() icon1.overlay:Show() else icon1:Hide() icon1.overlay:Hide() end if bar.owner.options.IconRight then icon2:Show() icon2.overlay:Show() else icon2:Hide() icon2.overlay:Hide() end + + bar.owner.options.BarYOffset = 8 + bar.owner.options.HugeBarYOffset = 8 + tbar:SetAlpha(1) frame:SetAlpha(1) texture:SetAlpha(1) @@ -177,36 +195,49 @@ local StyleBoss = function() end end +local RangeSet, InfoSet, HooksSet, NoticeSet; local function StyleDBM(event, addon) assert(DBM, "AddOn Not Loaded") - hooksecurefunc(DBT, 'CreateBar', StyleBars) - hooksecurefunc(DBM.BossHealth, 'Show', StyleBossTitle) - hooksecurefunc(DBM.BossHealth, 'AddBoss', StyleBoss) - hooksecurefunc(DBM.BossHealth, 'UpdateSettings', StyleBoss) + if(DBT and (DBM.BossHealth) and (not HooksSet)) then + hooksecurefunc(DBT, 'CreateBar', StyleBars) + hooksecurefunc(DBM.BossHealth, 'Show', StyleBossTitle) + hooksecurefunc(DBM.BossHealth, 'AddBoss', StyleBoss) + hooksecurefunc(DBM.BossHealth, 'UpdateSettings', StyleBoss) + HooksSet = true + end - if not DBM_SavedOptions['DontShowRangeFrame'] then + if((not RangeSet) and DBMRangeCheck and (not DBM_SavedOptions['DontShowRangeFrame'])) then DBM.RangeCheck:Show() DBM.RangeCheck:Hide() DBMRangeCheck:HookScript('OnShow', function(self) self:SetFixedPanelTemplate('Transparent') end) DBMRangeCheckRadar:SetFixedPanelTemplate('Transparent') + RangeSet = true end - if not DBM_SavedOptions['DontShowInfoFrame'] then + if((not InfoSet) and DBMInfoFrame and (not DBM_SavedOptions['DontShowInfoFrame'])) then DBM.InfoFrame:Show(5, 'test') DBM.InfoFrame:Hide() DBMInfoFrame:HookScript('OnShow', function(self) self:SetFixedPanelTemplate('Transparent') end) + InfoSet = true end - local RaidNotice_AddMessage_ = RaidNotice_AddMessage - RaidNotice_AddMessage = function(noticeFrame, textString, colorInfo) - if textString:find(' |T') then - textString = gsub(textString,'(:12:12)',':18:18:0:0:64:64:5:59:5:59') + if(RaidNotice_AddMessage and (not NoticeSet)) then + local RaidNotice_AddMessage_ = RaidNotice_AddMessage + RaidNotice_AddMessage = function(noticeFrame, textString, colorInfo) + if textString:find(' |T') then + textString = gsub(textString,'(:12:12)',':18:18:0:0:64:64:5:59:5:59') + end + return RaidNotice_AddMessage_(noticeFrame, textString, colorInfo) end - return RaidNotice_AddMessage_(noticeFrame, textString, colorInfo) + NoticeSet = true end - PLUGIN:SafeEventRemoval("DBM", event) + if(RangeSet and InfoSet and HooksSet and NoticeSet) then + PLUGIN:SafeEventRemoval("DBM", event) + PLUGIN:SafeEventRemoval("DBM-GUI", event) + end end -PLUGIN:SaveAddonStyle("DBM", StyleDBM, false, true) \ No newline at end of file +PLUGIN:SaveAddonStyle("DBM", StyleDBM, false, true) +--PLUGIN:SaveAddonStyle("DBM-GUI", StyleDBM, false, true) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/addons/Omen.lua b/Interface/AddOns/SVUI_StyleOMatic/components/addons/Omen.lua index db46b4c..0b746db 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/addons/Omen.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/addons/Omen.lua @@ -122,8 +122,8 @@ function PLUGIN:Docklet_Omen(parent) Omen:OnProfileChanged(nil,db) OmenTitle:RemoveTextures() OmenTitle.Panel = nil - OmenTitle:SetPanelTemplate("Default") - OmenTitle:SetPanelColor("class") + OmenTitle:SetPanelTemplate("Transparent") + --OmenTitle:SetPanelColor("class") --OmenTitle:GetFontString():SetFont(SVUI.Media.font.roboto, 12, "OUTLINE") OmenBarList:RemoveTextures() OmenAnchor:SetFixedPanelTemplate('Transparent') diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/addons/Recount.lua b/Interface/AddOns/SVUI_StyleOMatic/components/addons/Recount.lua index f3e6be5..3ffdcc8 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/addons/Recount.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/addons/Recount.lua @@ -60,8 +60,8 @@ local function StyleFrame(frame) frame:SetBackdrop(nil) frame.TitleBackground = CreateFrame('Frame', nil, frame) - frame.TitleBackground:SetFixedPanelTemplate("Default") - frame.TitleBackground:SetPanelColor("class") + frame.TitleBackground:SetFixedPanelTemplate("Transparent") + --frame.TitleBackground:SetPanelColor("class") frame.TitleBackground:SetPoint('TOP', frame, 'TOP', 0, -8) frame.TitleBackground.timeLapse = 0 frame.TitleBackground:SetScript('OnUpdate', function(self,elapsed) diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/addons/Skada.lua b/Interface/AddOns/SVUI_StyleOMatic/components/addons/Skada.lua index b7392dd..8d1c6e4 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/addons/Skada.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/addons/Skada.lua @@ -112,8 +112,9 @@ local function StyleSkada() if(window.db.enabletitle) then panelAnchor = skada.button skada.button:Height(22) - skada.button:SetPanelTemplate("Default") - skada.button:SetPanelColor("class") + skada.button:RemoveTextures() + skada.button:SetPanelTemplate("Transparent") + --skada.button:SetPanelColor("class") local titleFont = skada.button:GetFontString() titleFont:SetFont(SVUI.Media.font.names, 13, "NONE") titleFont:SetShadowColor(0, 0, 0, 1) diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/achievement.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/achievement.lua index a7ecacb..73a0e9b 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/achievement.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/achievement.lua @@ -176,7 +176,7 @@ local function AchievementStyle() PLUGIN:ApplyWindowStyle(AchievementFrame) AchievementFrameSummaryAchievements:RemoveTextures(true) - AchievementFrameSummaryAchievements:SetBasicPanel() + AchievementFrameSummaryAchievements:SetPanelTemplate('Inset') AchievementFrameHeaderTitle:ClearAllPoints() AchievementFrameHeaderTitle:Point("TOPLEFT", AchievementFrame.Panel, "TOPLEFT", -30, -8) AchievementFrameHeaderPoints:ClearAllPoints() diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/character.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/character.lua index 118cd08..b3afcc0 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/character.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/character.lua @@ -233,7 +233,7 @@ local function PaperDollEquipmentManagerPane_OnShow() GearManagerDialogPopup:Point("LEFT", PaperDollFrame, "RIGHT", 4, 0) GearManagerDialogPopupScrollFrame:RemoveTextures() GearManagerDialogPopupEditBox:RemoveTextures() - GearManagerDialogPopupEditBox:SetBasicPanel() + GearManagerDialogPopupEditBox:SetPanelTemplate('Inset') GearManagerDialogPopupOkay:SetButtonTemplate() GearManagerDialogPopupCancel:SetButtonTemplate() @@ -313,6 +313,15 @@ local function CharacterFrameStyle() if(_G[gName]) then _G[gName]:RemoveTextures(true) end end + CharacterFrameInsetRight:SetPanelTemplate('Inset') + + for i=1, 6 do + local pane = _G["CharacterStatsPaneCategory"..i] + if(pane) then + pane:RemoveTextures() + end + end + CharacterModelFrameBackgroundTopLeft:SetTexture(0,0,0,0) CharacterModelFrameBackgroundTopRight:SetTexture(0,0,0,0) CharacterModelFrameBackgroundBotLeft:SetTexture(0,0,0,0) @@ -321,11 +330,11 @@ local function CharacterFrameStyle() CharacterModelFrame:SetFixedPanelTemplate("Model") CharacterFrameExpandButton:SetFrameLevel(CharacterModelFrame:GetFrameLevel() + 5) - PaperDollTitlesPane:SetBasicPanel() + PaperDollTitlesPane:SetPanelTemplate('Inset') PaperDollTitlesPane:HookScript("OnShow", PaperDollTitlesPane_OnShow) - PaperDollEquipmentManagerPane:SetBasicPanel() + PaperDollEquipmentManagerPane:SetPanelTemplate('Inset') PaperDollEquipmentManagerPaneEquipSet:SetButtonTemplate() PaperDollEquipmentManagerPaneSaveSet:SetButtonTemplate() PaperDollEquipmentManagerPaneEquipSet:Width(PaperDollEquipmentManagerPaneEquipSet:GetWidth()-8) @@ -344,13 +353,14 @@ local function CharacterFrameStyle() ReputationFrame:RemoveTextures(true) ReputationListScrollFrame:RemoveTextures() + ReputationListScrollFrame:SetPanelTemplate("Inset") ReputationDetailFrame:RemoveTextures() ReputationDetailFrame:SetPanelTemplate("Inset", true) ReputationDetailFrame:Point("TOPLEFT", ReputationFrame, "TOPRIGHT", 4, -28) ReputationFrame:HookScript("OnShow", Reputation_OnShow) hooksecurefunc("ExpandFactionHeader", Reputation_OnShow) hooksecurefunc("CollapseFactionHeader", Reputation_OnShow) - TokenFrameContainer:SetBasicPanel() + TokenFrameContainer:SetPanelTemplate('Inset') TokenFrame:HookScript("OnShow", function() for i = 1, GetCurrencyListSize() do diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/friends.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/friends.lua index 741a0a4..aed0623 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/friends.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/friends.lua @@ -140,15 +140,16 @@ local function FriendsFrameStyle() PLUGIN:ApplyEditBoxStyle(WhoFrameEditBoxInset) ChannelFrameRightInset:RemoveTextures() ChannelFrameLeftInset:RemoveTextures() - ChannelFrameRightInset:SetFixedPanelTemplate("Inset", true) - ChannelFrameLeftInset:SetFixedPanelTemplate("Inset", true) + ChannelFrameRightInset:SetFixedPanelTemplate("ModelBorder") + ChannelFrameLeftInset:SetFixedPanelTemplate("ModelBorder") LFRQueueFrameListInset:RemoveTextures() LFRQueueFrameRoleInset:RemoveTextures() LFRQueueFrameCommentInset:RemoveTextures() - LFRQueueFrameListInset:SetFixedPanelTemplate("Inset", true) - FriendsFrameFriendsScrollFrame:SetBasicPanel() - FriendsFrameFriendsScrollFrame.Panel:Point("TOPRIGHT", -4, 0) - WhoFrameListInset:SetBasicPanel() + LFRQueueFrameListInset:SetFixedPanelTemplate("Inset") + FriendsFrameInset:SetPanelTemplate("Inset", true, 6) + FriendsFrameFriendsScrollFrame:SetFixedPanelTemplate("Model") + WhoFrameListInset:SetFixedPanelTemplate("ModelBorder") + RaidFrame:SetFixedPanelTemplate("ModelBorder") for c, e in pairs(FriendsFrameButtons)do _G[e]:SetButtonTemplate() @@ -218,7 +219,7 @@ local function FriendsFrameStyle() WhoListScrollFrame:RemoveTextures() end) - ChannelFrameDaughterFrame:SetBasicPanel() + ChannelFrameDaughterFrame:SetPanelTemplate('Inset') PLUGIN:ApplyCloseButtonStyle(ChannelFrameDaughterFrameDetailCloseButton, ChannelFrameDaughterFrame) PLUGIN:ApplyCloseButtonStyle(FriendsFrameCloseButton, FriendsFrame.Panel) PLUGIN:ApplyDropdownStyle(WhoFrameDropDown, 150) @@ -232,7 +233,7 @@ local function FriendsFrameStyle() end hooksecurefunc("ChannelList_Update", ChannelList_OnUpdate) - FriendsFriendsFrame:SetBasicPanel() + FriendsFriendsFrame:SetPanelTemplate('Inset') _G["FriendsFriendsFrame"]:RemoveTextures() _G["FriendsFriendsList"]:RemoveTextures() diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/garrison.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/garrison.lua index c203ab4..b855270 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/garrison.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/garrison.lua @@ -31,6 +31,7 @@ HELPERS ]]-- local RING_TEXTURE = [[Interface\AddOns\SVUI\assets\artwork\Unitframe\FOLLOWER-RING]] local LVL_TEXTURE = [[Interface\AddOns\SVUI\assets\artwork\Unitframe\FOLLOWER-LEVEL]] +local DEFAULT_COLOR = {r = 0.25, g = 0.25, b = 0.25}; --[[ ########################################################## STYLE @@ -44,7 +45,39 @@ local function AddFadeBanner(frame) bg:SetGradientAlpha("VERTICAL", 0, 0, 0, 0, 0, 0, 0, 0.9) end -local function StyleFollowerPortrait(frame) +local function StyleItemIcon(item) + if((not item) or (not item.Icon)) then return end + item.Icon:SetTexCoord(0.1, 0.9, 0.1, 0.9) + if(not item.IconSlot) then + item.IconSlot = CreateFrame("Frame", nil, item) + item.IconSlot:WrapOuter(item.Icon) + item.IconSlot:SetSlotTemplate() + item.Icon:SetParent(item.IconSlot) + end +end + +local function StyleListItem(item) + if(not item) then return; end + if(item.Icon and (not item.Panel)) then + local size = item:GetHeight() - 8 + local texture = item.Icon:GetTexture() + item:RemoveTextures() + item:SetSlotTemplate() + item.Icon:SetTexture(texture) + item.Icon:ClearAllPoints() + item.Icon:SetPoint("TOPLEFT", item, "TOPLEFT", 4, -4) + item.Icon:SetSize(size, size) + item.Icon:SetTexCoord(0.1, 0.9, 0.1, 0.9) + if(not item.IconSlot) then + item.IconSlot = CreateFrame("Frame", nil, item) + item.IconSlot:WrapOuter(item.Icon) + item.IconSlot:SetSlotTemplate() + item.Icon:SetParent(item.IconSlot) + end + end +end + +local function StyleFollowerPortrait(frame, color) frame.PortraitRing:SetTexture(RING_TEXTURE) frame.PortraitRingQuality:SetTexture('') frame.LevelBorder:SetTexture('') @@ -54,6 +87,9 @@ local function StyleFollowerPortrait(frame) frame.LevelCallout:SetTexture(LVL_TEXTURE) frame.LevelBorder:SetDrawLayer('OVERLAY') end + if(color) then + frame.PortraitRing:SetVertexColor(color.r, color.g, color.b) + end end local _hook_ReagentUpdate = function(self) @@ -69,6 +105,18 @@ local _hook_ReagentUpdate = function(self) end end +local _hook_GarrisonBuildingListUpdate = function() + local list = GarrisonBuildingFrame.BuildingList; + for i=1, GARRISON_NUM_BUILDING_SIZES do + local tab = list["Tab"..i]; + if(tab and tab.buildings) then + for i=1, #tab.buildings do + StyleListItem(list.Buttons[i]) + end + end + end +end + local _hook_GarrisonFollowerListUpdate = function(self) local buttons = self.FollowerList.listScroll.buttons; local followers = self.FollowerList.followers; @@ -86,30 +134,37 @@ local _hook_GarrisonFollowerListUpdate = function(self) if(not button.Panel) then button:RemoveTextures() button:SetPanelTemplate('Blackout', true, 1, 0, 0) - if(button.PortraitFrame) then - StyleFollowerPortrait(button.PortraitFrame) - end if(button.XPBar) then button.XPBar:SetTexture([[Interface\AddOns\SVUI\assets\artwork\Bars\DEFAULT]]) button.XPBar:SetGradient('HORIZONTAL', 0.5, 0, 1, 1, 0, 1) end end if(button.PortraitFrame) then - if (follower.isCollected) then - local color = ITEM_QUALITY_COLORS[follower.quality]; - button.PortraitFrame.PortraitRing:SetVertexColor(color.r, color.g, color.b) - else - button.PortraitFrame.PortraitRing:SetVertexColor(0.25, 0.25, 0.25) + local color + if(follower.isCollected) then + color = ITEM_QUALITY_COLORS[follower.quality] + else + color = DEFAULT_COLOR end + StyleFollowerPortrait(button.PortraitFrame, color) end end end end -local _hook_GarrisonMissionFrame_SetFollowerPortrait = function(portraitFrame, followerInfo) +local _hook_GarrisonFollowerTooltipTemplate_SetGarrisonFollower = function(tooltip, data) + local color = ITEM_QUALITY_COLORS[data.quality]; + StyleFollowerPortrait(tooltip.Portrait, color) +end + +local _hook_GarrisonBuildingInfoBoxFollowerPortrait = function(owned, hasFollowerSlot, infoBox, isBuilding, canActivate, ID) + local portraitFrame = infoBox.FollowerPortrait; StyleFollowerPortrait(portraitFrame) +end + +local _hook_GarrisonMissionFrame_SetFollowerPortrait = function(portraitFrame, followerInfo) local color = ITEM_QUALITY_COLORS[followerInfo.quality]; - portraitFrame.PortraitRing:SetVertexColor(color.r, color.g, color.b) + StyleFollowerPortrait(portraitFrame, color) end local _hook_GarrisonMissionComplete_SetFollowerLevel = function(followerFrame, level, quality) @@ -134,24 +189,10 @@ local _hook_GarrisonFollowerPage_ShowFollower = function(self, followerID) end end -local _hook_GarrisonMissionFrame_SetItemRewardDetails = function(self) - if(self.Icon and (not self.Panel)) then - local size = self:GetHeight() - 4 - local texture = self.Icon:GetTexture() - self:RemoveTextures() - self:SetSlotTemplate(true, 2, 0, 0, 0.5) - self.Icon:SetTexture(texture) - self.Icon:SetTexCoord(0.1, 0.9, 0.1, 0.9) - self.Icon:ClearAllPoints() - self.Icon:SetPoint("TOPLEFT", self, "TOPLEFT", 2, -2) - self.Icon:SetSize(size, size) - end -end - local function StyleRewardButtons(rewardButtons) for i = 1, #rewardButtons do local frame = rewardButtons[i]; - _hook_GarrisonMissionFrame_SetItemRewardDetails(frame); + StyleListItem(frame); end end @@ -188,14 +229,39 @@ local function LoadGarrisonStyle() end PLUGIN:ApplyWindowStyle(GarrisonMissionFrame, true) + PLUGIN:ApplyWindowStyle(GarrisonBuildingFrame, true) + PLUGIN:ApplyWindowStyle(GarrisonLandingPage, true) + PLUGIN:ApplyTabStyle(GarrisonMissionFrameTab1) PLUGIN:ApplyTabStyle(GarrisonMissionFrameTab2) - StyleUpdateRewards(GarrisonMissionFrame) + GarrisonBuildingFrameFollowers:RemoveTextures() + GarrisonBuildingFrameFollowers:SetPanelTemplate('Inset', true, 1, -5, -5) + GarrisonBuildingFrameFollowers:ClearAllPoints() + GarrisonBuildingFrameFollowers:SetPoint("LEFT", GarrisonBuildingFrame, "LEFT", 10, 0) + GarrisonBuildingFrame.BuildingList:RemoveTextures() + GarrisonBuildingFrame.BuildingList:SetFixedPanelTemplate('Inset') + GarrisonBuildingFrame.TownHallBox:RemoveTextures() + GarrisonBuildingFrame.TownHallBox:SetFixedPanelTemplate('Inset') + GarrisonBuildingFrame.InfoBox:RemoveTextures() + GarrisonBuildingFrame.InfoBox:SetFixedPanelTemplate('Inset') + --PLUGIN:ApplyTabStyle(GarrisonBuildingFrame.BuildingList.Tab1) + GarrisonBuildingFrame.BuildingList.Tab1:GetNormalTexture().SetAtlas = function() return end + GarrisonBuildingFrame.BuildingList.Tab1:RemoveTextures(true) + GarrisonBuildingFrame.BuildingList.Tab1:SetButtonTemplate(false, 1, -4, -10) + --PLUGIN:ApplyTabStyle(GarrisonBuildingFrame.BuildingList.Tab2) + GarrisonBuildingFrame.BuildingList.Tab2:GetNormalTexture().SetAtlas = function() return end + GarrisonBuildingFrame.BuildingList.Tab2:RemoveTextures(true) + GarrisonBuildingFrame.BuildingList.Tab2:SetButtonTemplate(false, 1, -4, -10) + --PLUGIN:ApplyTabStyle(GarrisonBuildingFrame.BuildingList.Tab3) + GarrisonBuildingFrame.BuildingList.Tab3:GetNormalTexture().SetAtlas = function() return end + GarrisonBuildingFrame.BuildingList.Tab3:RemoveTextures(true) + GarrisonBuildingFrame.BuildingList.Tab3:SetButtonTemplate(false, 1, -4, -10) + GarrisonBuildingFrame.BuildingList.MaterialFrame:RemoveTextures() + GarrisonBuildingFrame.BuildingList.MaterialFrame:SetPanelTemplate("Inset", true, 1, -5, -7) + GarrisonBuildingFrameTutorialButton:Die() - GarrisonLandingPage:RemoveTextures() - GarrisonLandingPage:SetPanelTemplate("Paper") - GarrisonLandingPage:SetPanelColor("tan") + StyleUpdateRewards(GarrisonMissionFrame) GarrisonLandingPage.FollowerTab:RemoveTextures() GarrisonLandingPage.FollowerTab.AbilitiesFrame:RemoveTextures() @@ -210,6 +276,7 @@ local function LoadGarrisonStyle() PLUGIN:ApplyTabStyle(GarrisonLandingPageTab1, nil, 10, 4) PLUGIN:ApplyTabStyle(GarrisonLandingPageTab2, nil, 10, 4) + local a1, p, a2, x, y = GarrisonLandingPageTab1:GetPoint() GarrisonLandingPageTab1:SetPoint(a1, p, a2, x, (y - 15)) @@ -247,6 +314,11 @@ local function LoadGarrisonStyle() GarrisonMissionFrame.FollowerTab:RemoveTextures() GarrisonMissionFrame.FollowerTab:SetFixedPanelTemplate("ModelBorder") + GarrisonMissionFrame.FollowerTab.ItemWeapon:RemoveTextures() + StyleListItem(GarrisonMissionFrame.FollowerTab.ItemWeapon) + GarrisonMissionFrame.FollowerTab.ItemArmor:RemoveTextures() + StyleListItem(GarrisonMissionFrame.FollowerTab.ItemArmor) + GarrisonMissionFrame.MissionTab:RemoveTextures() GarrisonMissionFrame.MissionTab.MissionPage:RemoveTextures() GarrisonMissionFrame.MissionTab.MissionPage:SetPanelTemplate('Paper', false, 4, 0, 0) @@ -324,7 +396,11 @@ local function LoadGarrisonStyle() hooksecurefunc("GarrisonMissionFrame_SetFollowerPortrait", _hook_GarrisonMissionFrame_SetFollowerPortrait) hooksecurefunc("GarrisonMissionComplete_SetFollowerLevel", _hook_GarrisonMissionComplete_SetFollowerLevel) hooksecurefunc("GarrisonFollowerPage_ShowFollower", _hook_GarrisonFollowerPage_ShowFollower) - hooksecurefunc("GarrisonMissionFrame_SetItemRewardDetails", _hook_GarrisonMissionFrame_SetItemRewardDetails) + hooksecurefunc("GarrisonMissionFrame_SetItemRewardDetails", StyleListItem) + hooksecurefunc("GarrisonBuildingTab_Select", _hook_GarrisonBuildingListUpdate) + hooksecurefunc("GarrisonBuildingList_SelectTab", _hook_GarrisonBuildingListUpdate) + hooksecurefunc("GarrisonBuildingInfoBox_ShowFollowerPortrait", _hook_GarrisonBuildingInfoBoxFollowerPortrait) + hooksecurefunc("GarrisonFollowerTooltipTemplate_SetGarrisonFollower", _hook_GarrisonFollowerTooltipTemplate_SetGarrisonFollower) --print("Test") if(GarrisonCapacitiveDisplayFrame.StartWorkOrderButton) then diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/guild.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/guild.lua index bca79a1..bf77ac8 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/guild.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/guild.lua @@ -566,9 +566,8 @@ local function GuildFrameStyle() GuildMemberNoteBackground:SetBasicPanel() GuildMemberOfficerNoteBackground:SetBasicPanel() - GuildMemberRankDropdown:SetFrameLevel(GuildMemberRankDropdown:GetFrameLevel()+5) PLUGIN:ApplyDropdownStyle(GuildMemberRankDropdown, 182) - GuildMemberRankDropdown.Panel:SetBackdropColor(0,0,0,1) + GuildMemberDetailRankText:Hide() GuildNewsFrame:RemoveTextures() GuildNewsContainer:SetBasicPanel(-2, 2, 0, -2) diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/spellbook.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/spellbook.lua index dae16ab..560e424 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/spellbook.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/spellbook.lua @@ -210,13 +210,18 @@ local function SpellBookStyle() if(SpellBookFrameInset) then SpellBookFrameInset:RemoveTextures() - SpellBookFrameInset:SetFixedPanelTemplate("Blackout") + SpellBookFrameInset:SetFixedPanelTemplate("Inset", true, 6) end if(SpellBookSpellIconsFrame) then SpellBookSpellIconsFrame:RemoveTextures() end if(SpellBookSideTabsFrame) then SpellBookSideTabsFrame:RemoveTextures() end if(SpellBookPageNavigationFrame) then SpellBookPageNavigationFrame:RemoveTextures() end - if(SpellBookPage1) then SpellBookPage1:SetDrawLayer('BORDER', 3) end - if(SpellBookPage2) then SpellBookPage2:SetDrawLayer('BORDER', 3) end + + for i = 1, 3 do + local page = _G["SpellBookPage" .. i] + if(page) then + page:SetDrawLayer('BACKGROUND') + end + end SpellBookFrameTutorialButton:Die() @@ -246,7 +251,7 @@ local function SpellBookStyle() _G[gName .. "Missing"]:SetTextColor(1, 1, 0) end if(frame.missingText) then - frame.missingText:SetTextColor(0, 0, 0) + frame.missingText:SetTextColor(1, 0, 0) end if(frame.missingHeader) then frame.missingHeader:SetFontObject(NumberFont_Outline_Large) diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/talents.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/talents.lua index d7fcee7..3f4e598 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/talents.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/talents.lua @@ -225,13 +225,13 @@ local function TalentFrameStyle() local C = _G["PlayerTalentFrameSpecializationSpellScrollFrameScrollChild"] C.ring:Hide() - C:SetFixedPanelTemplate("Transparent") + C:SetFixedPanelTemplate("Inset") C.Panel:WrapOuter(C.specIcon) C.specIcon:SetTexCoord(0.1, 0.9, 0.1, 0.9) local D = _G["PlayerTalentFramePetSpecializationSpellScrollFrameScrollChild"] D.ring:Hide() - D:SetFixedPanelTemplate("Transparent") + D:SetFixedPanelTemplate("Inset") D.Panel:WrapOuter(D.specIcon) D.specIcon:SetTexCoord(0.1, 0.9, 0.1, 0.9) @@ -255,7 +255,7 @@ local function TalentFrameStyle() if not L.restyled then L.restyled = true;L:Size(30, 30) L.ring:Hide() - L:SetFixedPanelTemplate("Transparent") + L:SetFixedPanelTemplate("Inset") L.icon:SetTexCoord(0.1, 0.9, 0.1, 0.9) L.icon:FillInner() end diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/style_methods.lua b/Interface/AddOns/SVUI_StyleOMatic/components/style_methods.lua index 2617225..f7143ed 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/style_methods.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/style_methods.lua @@ -589,8 +589,8 @@ function PLUGIN:ApplyDropdownStyle(this, width) local bg = CreateFrame("Frame", nil, this) bg:Point("TOPLEFT", this, "TOPLEFT", 18, -2) bg:Point("BOTTOMRIGHT", ddButton, "BOTTOMRIGHT", 2, -2) - bg:SetBasicPanel() - bg:SetBackdropBorderColor(0.2,0.2,0.2) + bg:SetPanelTemplate("Blackout") + bg:SetBackdropBorderColor(0,0,0) this.Panel = bg end diff --git a/Interface/AddOns/SVUI_TrackOMatic/SVUI_TrackOMatic.toc b/Interface/AddOns/SVUI_TrackOMatic/SVUI_TrackOMatic.toc index 8abb6bd..9fa33d9 100644 --- a/Interface/AddOns/SVUI_TrackOMatic/SVUI_TrackOMatic.toc +++ b/Interface/AddOns/SVUI_TrackOMatic/SVUI_TrackOMatic.toc @@ -1,6 +1,6 @@ ## Interface: 60000 ## Author: Munglunch -## Version: 5.3.21 +## Version: 5.3.9 ## Title: |cffFF9900SVUI |r|cffFFEF00Track-O-Matic|r ## Notes: Supervillain UI [|cff9911FFRaid & Party Member Tracking|r]. ## SavedVariables: TrackOMatic_Global diff --git a/Interface/Reforging/Valor-Flare.blp b/Interface/Reforging/Valor-Flare.blp new file mode 100644 index 0000000..1d97bb8 Binary files /dev/null and b/Interface/Reforging/Valor-Flare.blp differ