diff --git a/Interface/AddOns/SVUI/packages/override/SVOverride.lua b/Interface/AddOns/SVUI/packages/override/SVOverride.lua index adf2242..a15691b 100644 --- a/Interface/AddOns/SVUI/packages/override/SVOverride.lua +++ b/Interface/AddOns/SVUI/packages/override/SVOverride.lua @@ -130,7 +130,7 @@ LOAD / UPDATE ########################################################## ]]-- function MOD:Load() - CompanionsMicroButtonAlert:Die() + if(CompanionsMicroButtonAlert) then CompanionsMicroButtonAlert:Die() end DurabilityFrame:SetFrameStrata("HIGH") NewHook(DurabilityFrame, "SetPoint", Dura_OnSetPoint) diff --git a/Interface/AddOns/SVUI/scripts/mounts.lua b/Interface/AddOns/SVUI/scripts/mounts.lua index bdeefc0..9186512 100644 --- a/Interface/AddOns/SVUI/scripts/mounts.lua +++ b/Interface/AddOns/SVUI/scripts/mounts.lua @@ -260,7 +260,11 @@ ADDING CHECKBOXES TO JOURNAL ########################################################## ]]-- local function SetMountCheckButtons() - LoadAddOn("Blizzard_PetJournal") + if(SV.GameVersion > 60000) then + LoadAddOn("Blizzard_Collections") + else + LoadAddOn("Blizzard_PetJournal") + end SV.cache.Mounts = SV.cache.Mounts or {} if not SV.cache.Mounts.types then diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/petjournal.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/petjournal.lua index 2e124c4..7c43dff 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/petjournal.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/petjournal.lua @@ -294,10 +294,223 @@ local function PetJournalStyle() button:SetStylePanel("Button") end end +end + +local function CollectionsJournalStyle() + if PLUGIN.db.blizzard.enable ~= true or PLUGIN.db.blizzard.mounts ~= true then return end + + PLUGIN:ApplyWindowStyle(CollectionsJournal) + + CollectionsJournalPortrait:Hide() + PLUGIN:ApplyTabStyle(CollectionsJournalTab1) + PLUGIN:ApplyTabStyle(CollectionsJournalTab2) + PLUGIN:ApplyCloseButtonStyle(CollectionsJournalCloseButton) + + MountJournal:RemoveTextures() + MountJournal.LeftInset:RemoveTextures() + MountJournal.RightInset:RemoveTextures() + MountJournal.MountDisplay:RemoveTextures() + MountJournal.MountDisplay.ShadowOverlay:RemoveTextures() + MountJournal.MountCount:RemoveTextures() + MountJournalListScrollFrame:RemoveTextures() + MountJournalMountButton:RemoveTextures() + MountJournalMountButton:SetStylePanel("Button") + MountJournalSearchBox:SetStylePanel("Editbox") + + PLUGIN:ApplyScrollFrameStyle(MountJournalListScrollFrameScrollBar) + MountJournal.MountDisplay:SetStylePanel("!_Frame", "Model") + + local buttons = MountJournal.ListScrollFrame.buttons + for i = 1, #buttons do + local button = buttons[i] + if(button) then + PLUGIN:ApplyItemButtonStyle(button, nil, true, true) + local bar = _G["SVUI_MountSelectBar"..i] + if(bar) then bar:SetParent(button.Panel) end + if(button.favorite) then + local fg = CreateFrame("Frame", nil, button) + fg:SetAllPoints(favorite) + fg:SetFrameLevel(button:GetFrameLevel() + 30) + button.favorite:SetParent(fg) + button.favorite:SetTexture([[Interface\Addons\SVUI\assets\artwork\Icons\GENERIC-STAR]]) + end + end + end + + hooksecurefunc("MountJournal_UpdateMountList", PetJournal_UpdateMounts) + MountJournalListScrollFrame:HookScript("OnVerticalScroll", PetJournal_UpdateMounts) + MountJournalListScrollFrame:HookScript("OnMouseWheel", PetJournal_UpdateMounts) + PetJournalSummonButton:RemoveTextures() + PetJournalFindBattle:RemoveTextures() + PetJournalSummonButton:SetStylePanel("Button") + PetJournalFindBattle:SetStylePanel("Button") + PetJournalRightInset:RemoveTextures() + PetJournalLeftInset:RemoveTextures() + + for i = 1, 3 do + local button = _G["PetJournalLoadoutPet" .. i .. "HelpFrame"] + button:RemoveTextures() + end + + PetJournalTutorialButton:Die() + PetJournal.PetCount:RemoveTextures() + PetJournalSearchBox:SetStylePanel("Editbox") + PetJournalFilterButton:RemoveTextures(true) + PetJournalFilterButton:SetStylePanel("Button") + PetJournalListScrollFrame:RemoveTextures() + PLUGIN:ApplyScrollFrameStyle(PetJournalListScrollFrameScrollBar) + + for i = 1, #PetJournal.listScroll.buttons do + local button = _G["PetJournalListScrollFrameButton" .. i] + local favorite = _G["PetJournalListScrollFrameButton" .. i .. "Favorite"] + PLUGIN:ApplyItemButtonStyle(button, false, true) + if(favorite) then + local fg = CreateFrame("Frame", nil, button) + fg:SetAllPoints(favorite) + fg:SetFrameLevel(button:GetFrameLevel() + 30) + favorite:SetParent(fg) + button.dragButton.favorite:SetParent(fg) + favorite:SetTexture([[Interface\Addons\SVUI\assets\artwork\Icons\GENERIC-STAR]]) + favorite:SetTexCoord(0,1,0,1) + end + + button.dragButton.levelBG:SetAlpha(0) + button.dragButton.level:SetParent(button) + button.petTypeIcon:SetParent(button.Panel) + end + + hooksecurefunc('PetJournal_UpdatePetList', PetJournal_UpdatePets) + PetJournalListScrollFrame:HookScript("OnVerticalScroll", PetJournal_UpdatePets) + PetJournalListScrollFrame:HookScript("OnMouseWheel", PetJournal_UpdatePets) + PetJournalAchievementStatus:DisableDrawLayer('BACKGROUND') + PLUGIN:ApplyItemButtonStyle(PetJournalHealPetButton, true) + PetJournalHealPetButton.texture:SetTexture([[Interface\Icons\spell_magic_polymorphrabbit]]) + PetJournalLoadoutBorder:RemoveTextures() + + for b = 1, 3 do + local pjPet = _G['PetJournalLoadoutPet'..b] + pjPet:RemoveTextures() + pjPet.petTypeIcon:SetPoint('BOTTOMLEFT', 2, 2) + pjPet.dragButton:SetAllPointsOut(_G['PetJournalLoadoutPet'..b..'Icon']) + pjPet.hover = true; + pjPet.pushed = true; + pjPet.checked = true; + PLUGIN:ApplyItemButtonStyle(pjPet, nil, nil, true) + pjPet.setButton:RemoveTextures() + _G['PetJournalLoadoutPet'..b..'HealthFrame'].healthBar:RemoveTextures() + _G['PetJournalLoadoutPet'..b..'HealthFrame'].healthBar:SetStylePanel("Frame", 'Default') + _G['PetJournalLoadoutPet'..b..'HealthFrame'].healthBar:SetStatusBarTexture(SV.Media.bar.default) + _G['PetJournalLoadoutPet'..b..'XPBar']:RemoveTextures() + _G['PetJournalLoadoutPet'..b..'XPBar']:SetStylePanel("Frame", 'Default') + _G['PetJournalLoadoutPet'..b..'XPBar']:SetStatusBarTexture([[Interface\AddOns\SVUI\assets\artwork\Template\DEFAULT]]) + _G['PetJournalLoadoutPet'..b..'XPBar']:SetFrameLevel(_G['PetJournalLoadoutPet'..b..'XPBar']:GetFrameLevel()+2) + for v = 1, 3 do + local s = _G['PetJournalLoadoutPet'..b..'Spell'..v] + PLUGIN:ApplyItemButtonStyle(s) + s.FlyoutArrow:SetTexture([[Interface\Buttons\ActionBarFlyoutButton]]) + _G['PetJournalLoadoutPet'..b..'Spell'..v..'Icon']:SetAllPointsIn(s) + s.Panel:SetFrameLevel(s:GetFrameLevel() + 1) + _G['PetJournalLoadoutPet'..b..'Spell'..v..'Icon']:SetParent(s.Panel) + end + end + + PetJournalSpellSelect:RemoveTextures() + + for b = 1, 2 do + local Q = _G['PetJournalSpellSelectSpell'..b] + PLUGIN:ApplyItemButtonStyle(Q) + _G['PetJournalSpellSelectSpell'..b..'Icon']:SetAllPointsIn(Q) + _G['PetJournalSpellSelectSpell'..b..'Icon']:SetDrawLayer('BORDER') + end + + PetJournalPetCard:RemoveTextures() + PLUGIN:ApplyItemButtonStyle(PetJournalPetCard, nil, nil, true) + PetJournalPetCardInset:RemoveTextures() + PetJournalPetCardPetInfo.levelBG:SetAlpha(0) + PetJournalPetCardPetInfoIcon:SetTexCoord(0.1, 0.9, 0.1, 0.9) + PLUGIN:ApplyItemButtonStyle(PetJournalPetCardPetInfo, nil, true, true) + + local fg = CreateFrame("Frame", nil, PetJournalPetCardPetInfo) + fg:SetSize(40,40) + fg:SetPoint("TOPLEFT", PetJournalPetCardPetInfo, "TOPLEFT", -1, 1) + fg:SetFrameLevel(PetJournalPetCardPetInfo:GetFrameLevel() + 30) + + PetJournalPetCardPetInfo.favorite:SetParent(fg) + PetJournalPetCardPetInfo.Panel:SetAllPointsOut(PetJournalPetCardPetInfoIcon) + PetJournalPetCardPetInfoIcon:SetParent(PetJournalPetCardPetInfo.Panel) + PetJournalPetCardPetInfo.level:SetParent(PetJournalPetCardPetInfo.Panel) + + local R = PetJournalPrimaryAbilityTooltip;R.Background:SetTexture(0,0,0,0) + if R.Delimiter1 then + R.Delimiter1:SetTexture(0,0,0,0) + R.Delimiter2:SetTexture(0,0,0,0) + end + + R.BorderTop:SetTexture(0,0,0,0) + R.BorderTopLeft:SetTexture(0,0,0,0) + R.BorderTopRight:SetTexture(0,0,0,0) + R.BorderLeft:SetTexture(0,0,0,0) + R.BorderRight:SetTexture(0,0,0,0) + R.BorderBottom:SetTexture(0,0,0,0) + R.BorderBottomRight:SetTexture(0,0,0,0) + R.BorderBottomLeft:SetTexture(0,0,0,0) + R:SetStylePanel("!_Frame", "Transparent", true) + + for b = 1, 6 do + local S = _G['PetJournalPetCardSpell'..b] + S:SetFrameLevel(S:GetFrameLevel() + 2) + S:DisableDrawLayer('BACKGROUND') + S:SetStylePanel("Frame", 'Transparent') + S.Panel:SetAllPoints() + S.icon:SetTexCoord(0.1, 0.9, 0.1, 0.9) + S.icon:SetAllPointsIn(S.Panel) + end + + PetJournalPetCardHealthFrame.healthBar:RemoveTextures() + PetJournalPetCardHealthFrame.healthBar:SetStylePanel("Frame", 'Default') + PetJournalPetCardHealthFrame.healthBar:SetStatusBarTexture([[Interface\AddOns\SVUI\assets\artwork\Template\DEFAULT]]) + PetJournalPetCardXPBar:RemoveTextures() + PetJournalPetCardXPBar:SetStylePanel("Frame", 'Default') + PetJournalPetCardXPBar:SetStatusBarTexture([[Interface\AddOns\SVUI\assets\artwork\Template\DEFAULT]]) + + PLUGIN:ApplyTabStyle(CollectionsJournalTab3) + PLUGIN:ApplyTabStyle(CollectionsJournalTab4) + + ToyBox:RemoveTextures() + ToyBoxSearchBox:SetStylePanel("Editbox") + ToyBoxFilterButton:RemoveTextures() + ToyBoxFilterButton:SetStylePanel("Button") + ToyBoxIconsFrame:RemoveTextures() + ToyBoxIconsFrame:SetStylePanel("!_Frame", 'Model') + + ToyBoxProgressBar:RemoveTextures() + ToyBoxProgressBar:SetStatusBarTexture([[Interface\BUTTONS\WHITE8X8]]) + ToyBoxProgressBar:SetStylePanel("Frame", "Bar", true) + ToyBoxNextPageButton:RemoveTextures() + PLUGIN:ApplyPaginationStyle(ToyBoxNextPageButton) + ToyBoxPrevPageButton:RemoveTextures() + PLUGIN:ApplyPaginationStyle(ToyBoxPrevPageButton) + + MountJournalFilterButton:RemoveTextures() + MountJournalFilterButton:SetStylePanel("Button") + + MountJournal.SummonRandomFavoriteButton:RemoveTextures() + MountJournal.SummonRandomFavoriteButton:SetStylePanel("Slot", 2, 0, 0, 0.5) + MountJournal.SummonRandomFavoriteButton.texture:SetTexture([[Interface\ICONS\ACHIEVEMENT_GUILDPERK_MOUNTUP]]) + MountJournal.SummonRandomFavoriteButton.texture:SetTexCoord(0.1, 0.9, 0.1, 0.9) + + for i = 1, 18 do + local gName = ("ToySpellButton%d"):format(i) + local button = _G[gName] + if(button) then + button:SetStylePanel("Button") + end + end end --[[ ########################################################## PLUGIN LOADING ########################################################## ]]-- -PLUGIN:SaveBlizzardStyle("Blizzard_PetJournal", PetJournalStyle) \ No newline at end of file +PLUGIN:SaveBlizzardStyle("Blizzard_PetJournal", PetJournalStyle) +PLUGIN:SaveBlizzardStyle("Blizzard_Collections", CollectionsJournalStyle) \ No newline at end of file diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/system.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/system.lua index 1f9dbb4..9c64279 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/system.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/system.lua @@ -681,33 +681,36 @@ local function SystemPanelQue() Graphics_RightQuality:SetBackdrop(nil) Graphics_RightQuality:Die() - MacOptionsFrame:RemoveTextures() - MacOptionsFrame:SetStylePanel("!_Frame") - MacOptionsButtonCompress:SetStylePanel("Button") - MacOptionsButtonKeybindings:SetStylePanel("Button") - MacOptionsFrameDefaults:SetStylePanel("Button") - MacOptionsFrameOkay:SetStylePanel("Button") - MacOptionsFrameCancel:SetStylePanel("Button") - MacOptionsFrameMovieRecording:RemoveTextures() - MacOptionsITunesRemote:RemoveTextures() - MacOptionsFrameMisc:RemoveTextures() - PLUGIN:ApplyDropdownStyle(MacOptionsFrameResolutionDropDown) - PLUGIN:ApplyDropdownStyle(MacOptionsFrameFramerateDropDown) - PLUGIN:ApplyDropdownStyle(MacOptionsFrameCodecDropDown) - PLUGIN:ApplyScrollBarStyle(MacOptionsFrameQualitySlider) - for i = 1, 11 do - local this = _G["MacOptionsFrameCheckButton"..i] - if(this) then - this:SetStylePanel("Checkbox", true) + if(MacOptionsFrame) then + MacOptionsFrame:RemoveTextures() + MacOptionsFrame:SetStylePanel("!_Frame") + MacOptionsButtonCompress:SetStylePanel("Button") + MacOptionsButtonKeybindings:SetStylePanel("Button") + MacOptionsFrameDefaults:SetStylePanel("Button") + MacOptionsFrameOkay:SetStylePanel("Button") + MacOptionsFrameCancel:SetStylePanel("Button") + MacOptionsFrameMovieRecording:RemoveTextures() + MacOptionsITunesRemote:RemoveTextures() + MacOptionsFrameMisc:RemoveTextures() + PLUGIN:ApplyDropdownStyle(MacOptionsFrameResolutionDropDown) + PLUGIN:ApplyDropdownStyle(MacOptionsFrameFramerateDropDown) + PLUGIN:ApplyDropdownStyle(MacOptionsFrameCodecDropDown) + PLUGIN:ApplyScrollBarStyle(MacOptionsFrameQualitySlider) + for i = 1, 11 do + local this = _G["MacOptionsFrameCheckButton"..i] + if(this) then + this:SetStylePanel("Checkbox", true) + end end + MacOptionsButtonKeybindings:ClearAllPoints() + MacOptionsButtonKeybindings:SetPoint("LEFT", MacOptionsFrameDefaults, "RIGHT", 2, 0) + MacOptionsFrameOkay:ClearAllPoints() + MacOptionsFrameOkay:SetPoint("LEFT", MacOptionsButtonKeybindings, "RIGHT", 2, 0) + MacOptionsFrameCancel:ClearAllPoints() + MacOptionsFrameCancel:SetPoint("LEFT", MacOptionsFrameOkay, "RIGHT", 2, 0) + MacOptionsFrameCancel:SetWidth(MacOptionsFrameCancel:GetWidth() - 6) end - MacOptionsButtonKeybindings:ClearAllPoints() - MacOptionsButtonKeybindings:SetPoint("LEFT", MacOptionsFrameDefaults, "RIGHT", 2, 0) - MacOptionsFrameOkay:ClearAllPoints() - MacOptionsFrameOkay:SetPoint("LEFT", MacOptionsButtonKeybindings, "RIGHT", 2, 0) - MacOptionsFrameCancel:ClearAllPoints() - MacOptionsFrameCancel:SetPoint("LEFT", MacOptionsFrameOkay, "RIGHT", 2, 0) - MacOptionsFrameCancel:SetWidth(MacOptionsFrameCancel:GetWidth() - 6) + ReportCheatingDialog:RemoveTextures() ReportCheatingDialogCommentFrame:RemoveTextures() ReportCheatingDialogReportButton:SetStylePanel("Button")