diff --git a/Interface/AddOns/SVUI/packages/map/SVMap.lua b/Interface/AddOns/SVUI/packages/map/SVMap.lua index 54d3358..3a4db7b 100644 --- a/Interface/AddOns/SVUI/packages/map/SVMap.lua +++ b/Interface/AddOns/SVUI/packages/map/SVMap.lua @@ -364,52 +364,24 @@ local function SetLargeWorldMap() WorldMapFrameSizeDownButton:Show() end -local function SetQuestWorldMap() - if InCombatLockdown() then return end - - if SV.db.SVMap.tinyWorldMap == true then - WorldMapFrame:SetParent(SV.UIParent) - WorldMapFrame:EnableMouse(false) - WorldMapFrame:EnableKeyboard(false) - if WorldMapFrame:GetAttribute('UIPanelLayout-area') ~= 'center'then - SetUIPanelAttribute(WorldMapFrame, "area", "center") - end - if WorldMapFrame:GetAttribute('UIPanelLayout-allowOtherPanels') ~= true then - SetUIPanelAttribute(WorldMapFrame, "allowOtherPanels", true) - end - end - - WorldMapFrameSizeUpButton:Hide() - WorldMapFrameSizeDownButton:Show() -end - local function SetSmallWorldMap() if InCombatLockdown() then return end - WorldMapLevelDropDown:ClearAllPoints() - WorldMapLevelDropDown:Point("TOPLEFT", WorldMapDetailFrame, "TOPLEFT", -10, -4) WorldMapFrameSizeUpButton:Show() WorldMapFrameSizeDownButton:Hide() end local function AdjustMapSize() - if InCombatLockdown() then return end + if InCombatLockdown() then return end + + if WORLDMAP_SETTINGS.size == WORLDMAP_FULLMAP_SIZE then + SetLargeWorldMap() + elseif WORLDMAP_SETTINGS.size == WORLDMAP_WINDOWED_SIZE then + SetSmallWorldMap() + end + if SV.db.SVMap.tinyWorldMap == true then - if WORLDMAP_SETTINGS.size == WORLDMAP_FULLMAP_SIZE then - SetLargeWorldMap() - elseif WORLDMAP_SETTINGS.size == WORLDMAP_WINDOWED_SIZE then - SetSmallWorldMap() - elseif WORLDMAP_SETTINGS.size == WORLDMAP_QUESTLIST_SIZE then - SetQuestWorldMap() - end BlackoutWorld:SetTexture(0,0,0,0) else - if WORLDMAP_SETTINGS.size == WORLDMAP_FULLMAP_SIZE then - WorldMapFrame_SetFullMapView() - elseif WORLDMAP_SETTINGS.size == WORLDMAP_WINDOWED_SIZE then - WorldMap_ToggleSizeDown() - elseif WORLDMAP_SETTINGS.size == WORLDMAP_QUESTLIST_SIZE then - WorldMapFrame_SetQuestMapView() - end BlackoutWorld:SetTexture(0, 0, 0, 1) end @@ -426,10 +398,6 @@ local function UpdateWorldMapConfig() if(not MOD.WorldMapHooked) then NewHook("WorldMap_ToggleSizeUp", AdjustMapSize) NewHook("WorldMap_ToggleSizeDown", SetSmallWorldMap) - if(SV.GameVersion < 60000) then - NewHook("WorldMapFrame_SetFullMapView", SetLargeWorldMap) - NewHook("WorldMapFrame_SetQuestMapView", SetQuestWorldMap) - end MOD.WorldMapHooked = true end @@ -874,14 +842,6 @@ function MOD:Load() PetJournalParent:SetAttribute("UIPanelLayout-defined", true); SV.Mentalo:Add(mapHolder, L["Minimap"]) - if(SV.GameVersion < 60000) then - WorldMapShowDropDown:Point('BOTTOMRIGHT',WorldMapPositioningGuide,'BOTTOMRIGHT',-2,-4) - WorldMapZoomOutButton:Point("LEFT",WorldMapZoneDropDown,"RIGHT",0,4) - WorldMapLevelUpButton:Point("TOPLEFT",WorldMapLevelDropDown,"TOPRIGHT",-2,8) - WorldMapLevelDownButton:Point("BOTTOMLEFT",WorldMapLevelDropDown,"BOTTOMRIGHT",-2,2) - WorldMapZoneDropDownButton:HookScript('OnClick', _hook_WorldMapZoneDropDownButton_OnClick) - end - if(SV.db.SVMap.tinyWorldMap) then setfenv(WorldMapFrame_OnShow, setmetatable({ UpdateMicroButtons = SV.fubar }, { __index = _G })) WorldMapFrame:SetParent(SV.UIParent) diff --git a/Interface/AddOns/SVUI/system/credits.lua b/Interface/AddOns/SVUI/system/credits.lua index cb13528..e9285d7 100644 --- a/Interface/AddOns/SVUI/system/credits.lua +++ b/Interface/AddOns/SVUI/system/credits.lua @@ -63,6 +63,7 @@ local donations = { "Penguinsane", "Moondoggy", "Necroo", + "Chief Pullin", "Other Silent Partners.. (Let me know if I have forgotten you)" }; diff --git a/Interface/AddOns/SVUI_ConfigOMatic/components/dock.lua b/Interface/AddOns/SVUI_ConfigOMatic/components/dock.lua index 4d218e2..a1fe33d 100644 --- a/Interface/AddOns/SVUI_ConfigOMatic/components/dock.lua +++ b/Interface/AddOns/SVUI_ConfigOMatic/components/dock.lua @@ -141,7 +141,7 @@ SV.Options.args.SVDock.args["leftDockGroup"] = { local acceptableDocklets = { ["alDamageMeter"] = L["alDamageMeter"], - ["Skada"] = L["Skada"], + --["Skada"] = L["Skada"], ["Recount"] = L["Recount"], ["TinyDPS"] = L["TinyDPS"], ["Omen"] = L["Omen"] @@ -152,12 +152,13 @@ local function GetLiveDockletsA() local t = {["None"] = L["None"]}; for n,l in pairs(acceptableDocklets) do if IsAddOnLoaded(n) or IsAddOnLoaded(l) then - if n == "Skada" and _G.Skada then - for index,window in pairs(_G.Skada:GetWindows()) do - local key = window.db.name - t["Skada"..key] = (key=="Skada") and "Skada - Main" or "Skada - "..key; - end - elseif (test ~= n and test ~= l) then + -- if n == "Skada" and _G.Skada then + -- for index,window in pairs(_G.Skada:GetWindows()) do + -- local key = window.db.name + -- t["Skada"..key] = (key=="Skada") and "Skada - Main" or "Skada - "..key; + -- end + -- end + if (test ~= n and test ~= l) then t[n] = l; end end @@ -170,12 +171,13 @@ local function GetLiveDockletsB() local t = {["None"] = L["None"]}; for n,l in pairs(acceptableDocklets) do if IsAddOnLoaded(n) or IsAddOnLoaded(l) then - if n == "Skada" and _G.Skada then - for index,window in pairs(_G.Skada:GetWindows()) do - local key = window.db.name - t["Skada"..key] = (key=="Skada") and "Skada - Main" or "Skada - "..key; - end - elseif (test ~= n and test ~= l) then + -- if n == "Skada" and _G.Skada then + -- for index,window in pairs(_G.Skada:GetWindows()) do + -- local key = window.db.name + -- t["Skada"..key] = (key=="Skada") and "Skada - Main" or "Skada - "..key; + -- end + -- end + if (test ~= n and test ~= l) then t[n] = l; end end diff --git a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/worldmap.lua b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/worldmap.lua index 84f48e2..676ab2f 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/worldmap.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/components/blizzard/worldmap.lua @@ -47,50 +47,11 @@ end local function WorldMap_FullView() local WorldMapFrame = _G.WorldMapFrame; WorldMapFrame.Panel:ClearAllPoints() - - if(SV.GameVersion >= 60000) then - WorldMapFrame.Panel:Point("TOPLEFT", WorldMapDetailFrame, "TOPLEFT", -12, 74) - WorldMapFrame.Panel:Point("BOTTOMRIGHT", WorldMapDetailFrame, "BOTTOMRIGHT", 12, -24) - else - WorldMapFrame.Panel:Point("TOPLEFT", WorldMapDetailFrame, "TOPLEFT", -12, 74) - WorldMapFrame.Panel:Point("BOTTOMRIGHT", WorldMapShowDropDown, "BOTTOMRIGHT", 4, -4) - end + WorldMapFrame.Panel:Point("TOPLEFT", WorldMapDetailFrame, "TOPLEFT", -12, 74) + WorldMapFrame.Panel:Point("BOTTOMRIGHT", WorldMapDetailFrame, "BOTTOMRIGHT", 12, -24) WorldMapFrame.Panel.Panel:SetAllPoints(SV.UIParent) end -local function WorldMap_QuestView() - WorldMap_FullView() - if not WorldMapQuestDetailScrollFrame.Panel then - WorldMapQuestDetailScrollFrame:SetFixedPanelTemplate("Inset") - WorldMapQuestDetailScrollFrame.Panel:Point("TOPLEFT", -22, 2) - WorldMapQuestDetailScrollFrame.Panel:Point("BOTTOMRIGHT", WorldMapShowDropDown, 4, -4) - WorldMapQuestDetailScrollFrame.spellTex = WorldMapQuestDetailScrollFrame:CreateTexture(nil, 'ARTWORK') - WorldMapQuestDetailScrollFrame.spellTex:SetTexture([[Interface\QuestFrame\QuestBG]]) - WorldMapQuestDetailScrollFrame.spellTex:SetPoint("TOPLEFT", WorldMapQuestDetailScrollFrame.Panel, 'TOPLEFT', 2, -2) - WorldMapQuestDetailScrollFrame.spellTex:Size(586, 310) - WorldMapQuestDetailScrollFrame.spellTex:SetTexCoord(0, 1, 0.02, 1) - end - if not WorldMapQuestRewardScrollFrame.Panel then - WorldMapQuestRewardScrollFrame:SetPanelTemplate("Inset") - WorldMapQuestRewardScrollFrame.Panel:Point("BOTTOMRIGHT", 22, -4) - WorldMapQuestRewardScrollFrame.spellTex = WorldMapQuestRewardScrollFrame:CreateTexture(nil, 'ARTWORK') - WorldMapQuestRewardScrollFrame.spellTex:SetTexture([[Interface\QuestFrame\QuestBG]]) - WorldMapQuestRewardScrollFrame.spellTex:SetPoint("TOPLEFT", WorldMapQuestRewardScrollFrame.Panel, 'TOPLEFT', 2, -2) - WorldMapQuestRewardScrollFrame.spellTex:Size(585, 310) - WorldMapQuestRewardScrollFrame.spellTex:SetTexCoord(0, 1, 0.02, 1) - end - if not WorldMapQuestScrollFrame.Panel then - WorldMapQuestScrollFrame:SetPanelTemplate("Inset") - WorldMapQuestScrollFrame.Panel:Point("TOPLEFT", 0, 2) - WorldMapQuestScrollFrame.Panel:Point("BOTTOMRIGHT", 25, -3) - WorldMapQuestScrollFrame.spellTex = WorldMapQuestScrollFrame:CreateTexture(nil, 'ARTWORK') - WorldMapQuestScrollFrame.spellTex:SetTexture([[Interface\QuestFrame\QuestBG]]) - WorldMapQuestScrollFrame.spellTex:SetPoint("TOPLEFT", WorldMapQuestScrollFrame.Panel, 'TOPLEFT', 2, -2) - WorldMapQuestScrollFrame.spellTex:Size(520, 1033) - WorldMapQuestScrollFrame.spellTex:SetTexCoord(0, 1, 0.02, 1) - end -end - local function StripQuestMapFrame() local WorldMapFrame = _G.WorldMapFrame; @@ -127,6 +88,11 @@ local function StripQuestMapFrame() QuestMapFrame.DetailsFrame.RewardsFrame:SetPanelColor("dark") QuestScrollFrame:RemoveTextures(true) + QuestScrollFrame:SetFixedPanelTemplate("Paper") + QuestScrollFrame:SetPanelColor("special") + + QuestScrollFrame.ViewAll:RemoveTextures(true) + QuestScrollFrame.ViewAll:SetButtonTemplate() local w,h = WorldMapFrame.UIElementsFrame:GetSize() local underlay = CreateFrame("Frame", nil, WorldMapFrame) @@ -142,33 +108,22 @@ local function StripQuestMapFrame() QuestMapFrame.DetailsFrame:SetWidth(detailWidth) WorldMapFrameNavBar:ClearAllPoints() - WorldMapFrameNavBar:Point("TOPLEFT", WorldMapFrame.Panel, "TOPLEFT", 12, -22) - WorldMapFrameNavBar:SetPanelTemplate("Blackout") + WorldMapFrameNavBar:Point("TOPLEFT", WorldMapFrame.Panel, "TOPLEFT", 12, -26) + WorldMapFrameTutorialButton:ClearAllPoints() + WorldMapFrameTutorialButton:Point("LEFT", WorldMapFrameNavBar.Panel, "RIGHT", -50, 0) end local function WorldMap_OnShow() local WorldMapFrame = _G.WorldMapFrame; - if(SV.GameVersion >= 60000) then - --StripQuestMapFrame() - if WORLDMAP_SETTINGS.size == WORLDMAP_FULLMAP_SIZE then - WorldMap_FullView() - elseif WORLDMAP_SETTINGS.size == WORLDMAP_WINDOWED_SIZE then - WorldMap_SmallView() - end - else - WorldMapFrame:RemoveTextures() - if WORLDMAP_SETTINGS.size == WORLDMAP_FULLMAP_SIZE then - WorldMap_FullView() - elseif WORLDMAP_SETTINGS.size == WORLDMAP_WINDOWED_SIZE then - WorldMap_SmallView() - elseif WORLDMAP_SETTINGS.size == WORLDMAP_QUESTLIST_SIZE then - WorldMap_QuestView() - end + if WORLDMAP_SETTINGS.size == WORLDMAP_FULLMAP_SIZE then + WorldMap_FullView() + elseif WORLDMAP_SETTINGS.size == WORLDMAP_WINDOWED_SIZE then + WorldMap_SmallView() end if not SV.db.SVMap.tinyWorldMap then - BlackoutWorld:SetTexture(0, 0, 0, 1) + BlackoutWorld:SetTexture(0,0,0,1) else BlackoutWorld:SetTexture(0,0,0,0) end @@ -220,18 +175,17 @@ local function WorldMapStyle() STYLE:ApplyDropdownStyle(WorldMapZoneDropDown) STYLE:ApplyDropdownStyle(WorldMapShowDropDown) - if(SV.GameVersion < 60000) then - WorldMapZoomOutButton:SetButtonTemplate() - WorldMapTrackQuest:SetCheckboxTemplate(true) - hooksecurefunc("WorldMapFrame_SetFullMapView", WorldMap_FullView) - hooksecurefunc("WorldMapFrame_SetQuestMapView", WorldMap_QuestView) - else - StripQuestMapFrame() - end + StripQuestMapFrame() WorldMapFrame:HookScript("OnShow", WorldMap_OnShow) hooksecurefunc("WorldMap_ToggleSizeUp", WorldMap_OnShow) BlackoutWorld:SetParent(WorldMapFrame.Panel.Panel) + + WorldMapFrameNavBar:ClearAllPoints() + WorldMapFrameNavBar:Point("TOPLEFT", WorldMapFrame.Panel, "TOPLEFT", 12, -26) + WorldMapFrameNavBar:SetPanelTemplate("Blackout") + WorldMapFrameTutorialButton:ClearAllPoints() + WorldMapFrameTutorialButton:Point("LEFT", WorldMapFrameNavBar.Panel, "RIGHT", -50, 0) end --[[ ##########################################################