diff --git a/Interface/AddOns/SVUI/Bindings.xml b/Interface/AddOns/SVUI/Bindings.xml index 0293f5f..844e72f 100644 --- a/Interface/AddOns/SVUI/Bindings.xml +++ b/Interface/AddOns/SVUI/Bindings.xml @@ -1,11 +1,11 @@ <Bindings> - <Binding name="Raid Marker" header="SVUI" runOnUp="true"> + <Binding name="RaidMarker" description="Raid Marker" header="SVUI" runOnUp="true"> RaidMark_HotkeyPressed(keystate) </Binding> - <Binding name="Toggle Docks" runOnUp="false"> + <Binding name="ToggleDocks" description="Toggle Docks" header="SVUI" runOnUp="false"> HideSuperDocks() </Binding> - <Binding name="Lets Ride" runOnUp="false"> + <Binding name="LetsRide" description="Lets Ride" header="SVUI" runOnUp="false"> SVUILetsRide() </Binding> </Bindings> \ No newline at end of file diff --git a/Interface/AddOns/SVUI/SVUI.toc b/Interface/AddOns/SVUI/SVUI.toc index 6956c4f..a228e48 100644 --- a/Interface/AddOns/SVUI/SVUI.toc +++ b/Interface/AddOns/SVUI/SVUI.toc @@ -1,4 +1,4 @@ -## Interface: 50400 +## Interface: 60000 ## Author: Munglunch ## Version: 4.082 ## Title: |cffFF9900SVUI|r diff --git a/Interface/AddOns/SVUI/libs/oUF_Plugins/oUF_Friendship/oUF_Friendship.lua b/Interface/AddOns/SVUI/libs/oUF_Plugins/oUF_Friendship/oUF_Friendship.lua index f37e03f..8b10b13 100644 --- a/Interface/AddOns/SVUI/libs/oUF_Plugins/oUF_Friendship/oUF_Friendship.lua +++ b/Interface/AddOns/SVUI/libs/oUF_Plugins/oUF_Friendship/oUF_Friendship.lua @@ -24,7 +24,6 @@ local friendships = { [GetFactionInfoByID(1281)] = 1281, [GetFactionInfoByID(1282)] = 1282, [GetFactionInfoByID(1283)] = 1283, - [GetFactionInfoByID(1357)] = 1357, [GetFactionInfoByID(1358)] = 1358, } diff --git a/Interface/AddOns/SVUI/packages/actionbar/SVBar.lua b/Interface/AddOns/SVUI/packages/actionbar/SVBar.lua index e4ddda8..54796ab 100644 --- a/Interface/AddOns/SVUI/packages/actionbar/SVBar.lua +++ b/Interface/AddOns/SVUI/packages/actionbar/SVBar.lua @@ -109,16 +109,18 @@ local function RefreshMicrobar() for i=1,13 do local data = ICON_DATA[i] local button = _G[data[1]] - button:ClearAllPoints() - button:Size(buttonSize, buttonSize + 28) - button._fade = MOD.db.Micro.mouseover - if lastParent == SVUI_MicroBar then - button:SetPoint("BOTTOMLEFT",lastParent,"BOTTOMLEFT",1,1) - else - button:SetPoint('LEFT',lastParent,'RIGHT',spacing,0) - end - lastParent = button; - button:Show() + if(button) then + button:ClearAllPoints() + button:Size(buttonSize, buttonSize + 28) + button._fade = MOD.db.Micro.mouseover + if lastParent == SVUI_MicroBar then + button:SetPoint("BOTTOMLEFT",lastParent,"BOTTOMLEFT",1,1) + else + button:SetPoint('LEFT',lastParent,'RIGHT',spacing,0) + end + lastParent = button; + button:Show() + end end end @@ -154,7 +156,8 @@ local SVUIMicroButtonsParent = function(self) end for i=1,13 do local data = ICON_DATA[i] - _G[data[1]]:SetParent(SVUI_MicroBar) + local mButton = _G[data[1]] + if(mButton) then _G[data[1]]:SetParent(SVUI_MicroBar) end end end @@ -1314,38 +1317,40 @@ CreateMicroBar = function(self) for i=1,13 do local data = ICON_DATA[i] local button = _G[data[1]] - button:SetParent(SVUI_MicroBar) - button:Size(buttonSize, buttonSize + 28) - button.Flash:SetTexture(0,0,0,0) - if button.SetPushedTexture then - button:SetPushedTexture("") - end - if button.SetNormalTexture then - button:SetNormalTexture("") - end - if button.SetDisabledTexture then - button:SetDisabledTexture("") - end - if button.SetHighlightTexture then - button:SetHighlightTexture("") - end - button:Formula409() - - local buttonMask = NewFrame("Frame",nil,button) - buttonMask:SetPoint("TOPLEFT",button,"TOPLEFT",0,-28) - buttonMask:SetPoint("BOTTOMRIGHT",button,"BOTTOMRIGHT",0,0) - buttonMask:SetFramedButtonTemplate() - buttonMask:SetPanelColor() - buttonMask.icon = buttonMask:CreateTexture(nil,"OVERLAY",nil,2) - buttonMask.icon:FillInner(buttonMask,2,2) - buttonMask.icon:SetTexture(ICON_FILE) - buttonMask.icon:SetTexCoord(data[2],data[3],data[4],data[5]) - buttonMask.icon:SetGradient("VERTICAL", 0.5, 0.53, 0.55, 0.8, 0.8, 1) - button.overlay = buttonMask; - button._fade = self.db.Micro.mouseover - button:HookScript('OnEnter', MicroButton_OnEnter) - button:HookScript('OnLeave', MicroButton_OnLeave) - button:Show() + if(button) then + button:SetParent(SVUI_MicroBar) + button:Size(buttonSize, buttonSize + 28) + button.Flash:SetTexture(0,0,0,0) + if button.SetPushedTexture then + button:SetPushedTexture("") + end + if button.SetNormalTexture then + button:SetNormalTexture("") + end + if button.SetDisabledTexture then + button:SetDisabledTexture("") + end + if button.SetHighlightTexture then + button:SetHighlightTexture("") + end + button:Formula409() + + local buttonMask = NewFrame("Frame",nil,button) + buttonMask:SetPoint("TOPLEFT",button,"TOPLEFT",0,-28) + buttonMask:SetPoint("BOTTOMRIGHT",button,"BOTTOMRIGHT",0,0) + buttonMask:SetFramedButtonTemplate() + buttonMask:SetPanelColor() + buttonMask.icon = buttonMask:CreateTexture(nil,"OVERLAY",nil,2) + buttonMask.icon:FillInner(buttonMask,2,2) + buttonMask.icon:SetTexture(ICON_FILE) + buttonMask.icon:SetTexCoord(data[2],data[3],data[4],data[5]) + buttonMask.icon:SetGradient("VERTICAL", 0.5, 0.53, 0.55, 0.8, 0.8, 1) + button.overlay = buttonMask; + button._fade = self.db.Micro.mouseover + button:HookScript('OnEnter', MicroButton_OnEnter) + button:HookScript('OnLeave', MicroButton_OnLeave) + button:Show() + end end MicroButtonPortrait:ClearAllPoints() diff --git a/Interface/AddOns/SVUI/packages/bag/SVBag.lua b/Interface/AddOns/SVUI/packages/bag/SVBag.lua index f722b2b..364ecfb 100644 --- a/Interface/AddOns/SVUI/packages/bag/SVBag.lua +++ b/Interface/AddOns/SVUI/packages/bag/SVBag.lua @@ -238,7 +238,6 @@ function MOD:RefreshSlot(bag, slotID) local itemLink = GetContainerItemLink(bag, slotID); local key; slot:Show() - slot.questIcon:Hide() slot.name, slot.rarity = nil, nil; local start, duration, enable = GetContainerItemCooldown(bag, slotID) CooldownFrame_SetTimer(slot.cooldown, start, duration, enable) @@ -258,7 +257,6 @@ function MOD:RefreshSlot(bag, slotID) local z, A, C = GetContainerItemQuestInfo(bag, slotID) if A and not isActive then slot:SetBackdropBorderColor(1.0, 0.3, 0.3) - slot.questIcon:Show() elseif A or z then slot:SetBackdropBorderColor(1.0, 0.3, 0.3) elseif slot.rarity and slot.rarity>1 then @@ -438,14 +436,7 @@ function MOD:Layout(isBank) f.Bags[bagID][slotID]:SetSlotTemplate(true, 2, 0, 0, true); if(_G[f.Bags[bagID][slotID]:GetName().."NewItemTexture"]) then _G[f.Bags[bagID][slotID]:GetName().."NewItemTexture"]:Hide() - end - f.Bags[bagID][slotID].count:ClearAllPoints(); - f.Bags[bagID][slotID].count:Point("BOTTOMRIGHT", 0, 2); - f.Bags[bagID][slotID].questIcon = _G[f.Bags[bagID][slotID]:GetName().."IconQuestTexture"]; - f.Bags[bagID][slotID].questIcon:SetTexture(TEXTURE_ITEM_QUEST_BANG); - f.Bags[bagID][slotID].questIcon:FillInner(f.Bags[bagID][slotID]); - f.Bags[bagID][slotID].questIcon:SetTexCoord(0.1, 0.9, 0.1, 0.9 ); - f.Bags[bagID][slotID].questIcon:Hide(); + end f.Bags[bagID][slotID].iconTexture = _G[f.Bags[bagID][slotID]:GetName().."IconTexture"]; f.Bags[bagID][slotID].iconTexture:FillInner(f.Bags[bagID][slotID]); f.Bags[bagID][slotID].iconTexture:SetTexCoord(0.1, 0.9, 0.1, 0.9 ); diff --git a/Interface/AddOns/SVUI/packages/map/SVMap.lua b/Interface/AddOns/SVUI/packages/map/SVMap.lua index 26a53d4..4b1211c 100644 --- a/Interface/AddOns/SVUI/packages/map/SVMap.lua +++ b/Interface/AddOns/SVUI/packages/map/SVMap.lua @@ -282,24 +282,7 @@ local function SetLargeWorldMap() end WorldMapFrameSizeUpButton:Hide() WorldMapFrameSizeDownButton:Show() -end - -local function SetQuestWorldMap() - if InCombatLockdown() then return end - if MOD.db.tinyWorldMap == true then - WorldMapFrame:SetParent(SuperVillain.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 +end local function SetSmallWorldMap() if InCombatLockdown() then return end @@ -325,17 +308,13 @@ local function AdjustMapSize() 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() + WorldMap_ToggleSizeUp() 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 @@ -406,8 +385,6 @@ local function UpdateWorldMapConfig() if(not MOD.WorldMapHooked) then NewHook("WorldMap_ToggleSizeUp", AdjustMapSize) NewHook("WorldMap_ToggleSizeDown", SetSmallWorldMap) - NewHook("WorldMapFrame_SetFullMapView", SetLargeWorldMap) - NewHook("WorldMapFrame_SetQuestMapView", SetQuestWorldMap) MOD.WorldMapHooked = true end @@ -427,11 +404,6 @@ local function UpdateWorldMapConfig() AdjustMapSize() end -local ResetDropDownList_Hook = function(self) - DropDownList1:ClearAllPoints() - DropDownList1:Point("TOPRIGHT",self,"BOTTOMRIGHT",-17,-4) -end - local WorldMapFrameOnShow_Hook = function() MOD:RegisterEvent("PLAYER_REGEN_DISABLED"); if InCombatLockdown()then return end @@ -759,10 +731,7 @@ end local function LoadWorldMap() setfenv(WorldMapFrame_OnShow, setmetatable({ UpdateMicroButtons = SuperVillain.fubar }, { __index = _G })) - 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) + --[[MISC WORLDMAP STYLINGS REMOVED HERE]]-- WorldMapFrame:SetParent(SuperVillain.UIParent) WorldMapFrame:SetFrameLevel(4) @@ -771,7 +740,6 @@ local function LoadWorldMap() WorldMapFrame:HookScript('OnShow', WorldMapFrameOnShow_Hook) WorldMapFrame:HookScript('OnHide', WorldMapFrameOnHide_Hook) - WorldMapZoneDropDownButton:HookScript('OnClick', ResetDropDownList_Hook) local CoordsHolder = CreateFrame('Frame', 'SVUI_WorldMapCoords', WorldMapFrame) CoordsHolder:SetFrameLevel(WorldMapDetailFrame:GetFrameLevel()+1) diff --git a/Interface/AddOns/SVUI/packages/tip/SVTip.lua b/Interface/AddOns/SVUI/packages/tip/SVTip.lua index 93b156c..ee1c7ea 100644 --- a/Interface/AddOns/SVUI/packages/tip/SVTip.lua +++ b/Interface/AddOns/SVUI/packages/tip/SVTip.lua @@ -799,10 +799,12 @@ function MOD:Load() alpha = 0.5 end + tooltip:SetFrameLevel(tooltip:GetFrameLevel() + 1) + local mask = CreateFrame("Frame", nil, tooltip) mask:SetPoint("TOPLEFT", tooltip, "TOPLEFT", 0, 0) mask:SetPoint("BOTTOMRIGHT", tooltip, "BOTTOMRIGHT", 0, barOffset) - mask:SetFrameLevel(tooltip:GetFrameLevel() - 1) + mask:SetFrameLevel(0) mask.ToggleHeight = barOffset mask.ToggleAlpha = alpha diff --git a/Interface/AddOns/SVUI/scripts/questwatch.lua b/Interface/AddOns/SVUI/scripts/questwatch.lua index e62a98c..2249de9 100644 --- a/Interface/AddOns/SVUI/scripts/questwatch.lua +++ b/Interface/AddOns/SVUI/scripts/questwatch.lua @@ -58,7 +58,7 @@ local QuestDocklet = CreateFrame("Frame", "SVQuestFrameEventListener", UIParent) LOCAL VARS ########################################################## ]]-- -local WatchFrame = _G["WatchFrame"]; +local ObjectiveTrackerFrame = _G["ObjectiveTrackerFrame"]; local SuperDockWindowRight; local currentQuestItems = {}; local QuestDockletFrame, QuestDockletFrameTitle, QuestDockletFrameList, QuestDockletFrameSlider; @@ -68,241 +68,16 @@ local ICON_FILE = [[Interface\AddOns\SVUI\assets\artwork\Icons\DOCK-QUESTS]] PRE VARS/FUNCTIONS ########################################################## ]]-- -local IsTrackingCompletedQuests = function() - return band(WATCHFRAME_FILTER_TYPE, WATCHFRAME_FILTER_COMPLETED_QUESTS) == WATCHFRAME_FILTER_COMPLETED_QUESTS or false; -end; -local IsTrackingRemoteQuests = function() - return ( band(WATCHFRAME_FILTER_TYPE, WATCHFRAME_FILTER_REMOTE_ZONES) == WATCHFRAME_FILTER_REMOTE_ZONES ) or false; -end; -local IsTrackingAchievements = function() - return ( band(WATCHFRAME_FILTER_TYPE, WATCHFRAME_FILTER_ACHIEVEMENTS) == WATCHFRAME_FILTER_ACHIEVEMENTS ) or false; -end; -local IsUsingFilters = function() - if ( WATCHFRAME_FILTER_COMPLETED_QUESTS == nil ) then return false; end - return true; -end; ---[[ -QUEST ITEM MACRO -/target [@mouseover] -/click WatchFrameItem1 -/click WatchFrameItem2 -/click WatchFrameItem3 -/click WatchFrameItem4 -/click WatchFrameItem5 -/click WatchFrameItem6 -]]-- - --- poiWatchFrameLines1_1 --- poiWatchFrameLines2_1 --- poiWatchFrameLines3_1 --- poiButton:SetPoint("TOPRIGHT", questTitle, "TOPLEFT", 0, 5) - -local function QWQuestItems() - for i=1, WATCHFRAME_NUM_ITEMS do - local button = _G["WatchFrameItem"..i] - if button then - local point, relativeTo, relativePoint, xOffset, yOffset = button:GetPoint(1) - button:SetFrameStrata("LOW") - button:SetPoint("TOPRIGHT", relativeTo, "TOPLEFT", -31, -2); - if not button.styled then - button:SetSlotTemplate() - button:SetBackdropColor(0,0,0,0) - _G["WatchFrameItem"..i.."NormalTexture"]:SetAlpha(0) - _G["WatchFrameItem"..i.."IconTexture"]:FillInner() - _G["WatchFrameItem"..i.."IconTexture"]:SetTexCoord(0.1,0.9,0.1,0.9) - SuperVillain:AddCD(_G["WatchFrameItem"..i.."Cooldown"]) - button.styled = true - end - end - end -end; +-- DO STUFF -local function QWCheckTimers() - local lstTimers = GetQuestTimers(); - local numTimers = 0; - local filterOK = false; - if ( lstTimers ) then - filterOK = true; - numTimers = 1; - else - numTimers = 0; - end - return filterOK,numTimers; -end; - -local function QWCheckQuests() - local numQuestWatches = GetNumQuestWatches(); - local playerMoney = GetMoney(); - local numQuests = QuestMapUpdateAllQuests(); - local currentMapZone = GetCurrentMapZone(); - local questIndex = 0; - local numCurrentMapQuests = 0; - local numLocalQuests = 0; - local numToShow = 0; - local filterOK = false; - local usingFilters = IsUsingFilters(); - if ( not usingFilters ) then - filterOK = true; - return filterOK, numQuestWatches or 0; - elseif ( numQuestWatches == 0 ) then - return filterOK, numQuestWatches or 0; - end - local trackingCompleted = IsTrackingCompletedQuests(); - local trackingRemote = IsTrackingRemoteQuests(); - local localQuests = {}; - local currentMapQuests = {}; - twipe(currentQuestItems); - localQuests["zone"] = currentMapZone; - for i = 1, numQuests do - local questId = QuestPOIGetQuestIDByVisibleIndex(i); - currentMapQuests[questId] = i; - numCurrentMapQuests = numCurrentMapQuests + 1; - end - for id in pairs(currentMapQuests) do - localQuests[id] = true; - numLocalQuests = numLocalQuests + 1; - end - for i = 1, numQuestWatches do - questIndex = GetQuestIndexForWatch(i); - if ( questIndex ) then - local questTitle, level, questTag, suggestedGroup, isHeader, isCollapsed, isComplete, isDaily, questID = GetQuestLogTitle(questIndex); - local requiredMoney = GetQuestLogRequiredMoney(questIndex); - local numObjectives = GetNumQuestLeaderBoards(questIndex); - local itemLink,itemIcon,itemCharges = GetQuestLogSpecialItemInfo(questIndex); - if ( isComplete and isComplete < 0 ) then - isComplete = false; - elseif ( numObjectives == 0 and playerMoney >= requiredMoney ) then - isComplete = true; - end - if ( itemLink ) then - local _,itemID,_,_,_,_,_,_,_,_,_,_ = split(":", itemLink) - local itemName = GetItemInfo(itemLink) - currentQuestItems[itemName] = { ['id'] = itemID, ['icon'] = itemIcon, ['charge'] = itemCharges, ['macro'] = "/use item:"..itemID }; - end - local isLocal = localQuests[questID]; - filterOK = true; - if ( isComplete and not trackingCompleted ) then - filterOK = false; - elseif ( not isLocal and not trackingRemote ) then - filterOK = false; - end - if ( filterOK ) then - numToShow = numToShow + 1; - end - end - end - filterOK = false; - if ( numToShow > 0 ) then - filterOK = true; - end - return filterOK, numQuestWatches or 0; -end; - -local function QWSetAllLevels() - local i = 1 - local scrollOffset = HybridScrollFrame_GetOffset(QuestLogScrollFrame) - for i,button in pairs(QuestLogScrollFrame.buttons) do - local questIndex = i + scrollOffset - local questTitle, level, questTag, suggestedGroup, isHeader, isCollapsed, isComplete, isDaily, questID = GetQuestLogTitle(questIndex) - if ( not isHeader ) and questTitle then - local newTitle = string.format("[%d] %s", level or "?", questTitle) - button:SetText(newTitle) - QuestLogTitleButton_Resize(button) - end - i = i + 1 - end -end - -local function QWCheckAchievements() - local numAchievementWatches = GetNumTrackedAchievements(); - local lstAchievementWatches = GetTrackedAchievements(); - local filterOK = false; - local usingFilters = IsUsingFilters(); - if ( not usingFilters ) then - filterOK = true; - return filterOK, numAchievementWatches or 0; - end - local trackingAchievements = IsTrackingAchievements(); - filterOK = false; - if ( numAchievementWatches > 0 and trackingAchievements ) then - filterOK = true; - end - return filterOK, numAchievementWatches or 0; -end; - -local function QWSetWatchFrameTitle() - local _, numQuests, numAchievements, numTimers - _, numQuests = QWCheckQuests() - _, numAchievements = QWCheckAchievements() - _, numTimers = QWCheckTimers() - local numTracked = numQuests + numAchievements + numTimers; - if WatchFrameTitle then - WatchFrameTitle:SetText(OBJECTIVES_TRACKER_LABEL.." ("..numTracked ..")") - end; -end; - -local function QWCheckAutoShow(self) - if not self then return end; - if self:IsShown() then - if WatchFrameHeader then - WatchFrameHeader:Show() - end; - WatchFrameTitle:Show() - WatchFrameCollapseExpandButton:Show() - WatchFrameLines:Show() - end -end; - -local function SetQuestDockEvents() - WatchFrame:HookScript("OnEvent", QWQuestItems) - WatchFrame.ScrollListUpdate = function() - QWSetWatchFrameTitle(); - WATCHFRAME_MAXLINEWIDTH = WatchFrame:GetWidth(); - if QuestDockletFrameList then - WATCHFRAME_MAXLINEWIDTH = QuestDockletFrameList:GetWidth() - 62 - end; - end; - WatchFrame.OnUpdate = function() - WATCHFRAME_MAXLINEWIDTH = WatchFrame:GetWidth() - if QuestDockletFrameList then - WATCHFRAME_MAXLINEWIDTH = QuestDockletFrameList:GetWidth() - 62 - end; - QWQuestItems(); - --QWSetAllLevels() - WatchFrame.ScrollListUpdate() - end; - WatchFrame.OnShow = function() - Collapsed = (WatchFrame.collapsed or false); - if WatchFrameHeader == nil then - WatchFrame.userCollapsed = true - end; - UserCollapsed = (WatchFrame.userCollapsed or false); - if Collapsed then - WatchFrame_Collapse(WatchFrame) - WatchFrame.userCollapsed=UserCollapsed - else - WatchFrame_Expand(WatchFrame) - end; - WatchFrame.OnUpdate(); - end; - WatchFrame.OnShow() - - hooksecurefunc("QuestLog_Update", WatchFrame.OnUpdate) -end; --[[ ########################################################## CORE FUNCTIONS ########################################################## ]]-- local QuestDocklet_OnEvent = function(self, event) - if event == "CVAR_UPDATE" then - if action == "WATCH_FRAME_WIDTH_TEXT"then - if WatchFrame then - WatchFrame.OnUpdate() - end - end - elseif event == "QUEST_AUTOCOMPLETE" then + if event == "QUEST_AUTOCOMPLETE" then if SuperDockWindowRight.FrameName and _G[SuperDockWindowRight.FrameName] and _G[SuperDockWindowRight.FrameName]:IsShown() then return end; local button = _G["QuestDockletFrame_ToolBarButton"] if not QuestDockletFrame:IsShown() then @@ -322,21 +97,22 @@ end local function CreateQuestDocklet() SuperDockWindowRight = _G["SuperDockWindowRight"] + if(not ObjectiveTrackerFrame) then return end if(not SuperVillain.db.system.questWatch) then local frame = CreateFrame("Frame", "SVUI_QuestFrame", UIParent); - frame:SetSize(200, WatchFrame:GetHeight()); + frame:SetSize(200, ObjectiveTrackerFrame:GetHeight()); frame:SetPoint("RIGHT", UIParent, "RIGHT", -100, 0); - WatchFrame:ClearAllPoints() - WatchFrame:SetClampedToScreen(false) - WatchFrame:SetParent(SVUI_QuestFrame) - WatchFrame:SetAllPoints(SVUI_QuestFrame) - WatchFrame:SetFrameLevel(SVUI_QuestFrame:GetFrameLevel() + 1) - WatchFrame.ClearAllPoints = SuperVillain.fubar; - WatchFrame.SetPoint = SuperVillain.fubar; - WatchFrame.SetAllPoints = SuperVillain.fubar; - WatchFrameLines.ClearAllPoints = SuperVillain.fubar; - WatchFrameLines.SetPoint = SuperVillain.fubar; - WatchFrameLines.SetAllPoints = SuperVillain.fubar; + ObjectiveTrackerFrame:ClearAllPoints() + ObjectiveTrackerFrame:SetClampedToScreen(false) + ObjectiveTrackerFrame:SetParent(SVUI_QuestFrame) + ObjectiveTrackerFrame:SetAllPoints(SVUI_QuestFrame) + ObjectiveTrackerFrame:SetFrameLevel(SVUI_QuestFrame:GetFrameLevel() + 1) + ObjectiveTrackerFrame.ClearAllPoints = SuperVillain.fubar; + ObjectiveTrackerFrame.SetPoint = SuperVillain.fubar; + ObjectiveTrackerFrame.SetAllPoints = SuperVillain.fubar; + ObjectiveTrackerFrameLines.ClearAllPoints = SuperVillain.fubar; + ObjectiveTrackerFrameLines.SetPoint = SuperVillain.fubar; + ObjectiveTrackerFrameLines.SetAllPoints = SuperVillain.fubar; SuperVillain:SetSVMovable(frame, "Quest Watch"); else local bgTex = [[Interface\BUTTONS\WHITE8X8]] @@ -381,62 +157,14 @@ local function CreateQuestDocklet() QuestDockletFrameTitle:Point("TOPLEFT", QuestDockletFrameList, "BOTTOMLEFT", 0, 0); QuestDockletFrameTitle:Point("TOPRIGHT", QuestDockletFrameList, "BOTTOMRIGHT", 0, 0); QuestDockletFrameTitle:SetHeight(18) - - WatchFrame:ClearAllPoints() - WatchFrame:SetClampedToScreen(false) - WatchFrame:SetParent(QuestDockletFrameList) - WatchFrame:SetHeight(500) - WatchFrame:SetPoint("TOPRIGHT", QuestDockletFrameList, "TOPRIGHT", -31, 0) - WatchFrame:SetFrameLevel(QuestDockletFrameList:GetFrameLevel() + 1) - if QuestDockletFrameList then - WATCHFRAME_MAXLINEWIDTH = (QuestDockletFrameList:GetWidth() - 100); - WATCHFRAME_EXPANDEDWIDTH = (QuestDockletFrameList:GetWidth() - 100); - else - WATCHFRAME_MAXLINEWIDTH = (WatchFrame:GetWidth() - 100); - WATCHFRAME_EXPANDEDWIDTH = (WatchFrame:GetWidth() - 100); - end; - WatchFrame:SetWidth(WATCHFRAME_MAXLINEWIDTH) - WatchFrameHeader:SetParent(QuestDockletFrame) - WatchFrameHeader:ClearAllPoints() - WatchFrameHeader:FillInner(QuestDockletFrameTitle) - WatchFrameHeader:SetFrameLevel(2) - - WatchFrameTitle:SetParent(QuestDockletFrame) - WatchFrameTitle:ClearAllPoints() - WatchFrameTitle:FillInner(QuestDockletFrameTitle) - - WatchFrameCollapseExpandButton:SetParent(QuestDockletFrame) - WatchFrameCollapseExpandButton:ClearAllPoints() - WatchFrameCollapseExpandButton:SetPoint("TOPRIGHT", UIParent, "BOTTOMRIGHT", 0, 0) - WatchFrameCollapseExpandButton:Hide() - - QuestDockletFrameList:SetScrollChild(WatchFrame) + QuestDockletFrameList:SetScrollChild(ObjectiveTrackerFrame) QuestDockletFrameSlider:SetScript("OnValueChanged", function(self, argValue) QuestDockletFrameList:SetVerticalScroll(argValue) end) QuestDockletFrameSlider:ClearAllPoints() QuestDockletFrameSlider:SetPoint("TOPRIGHT", QuestDockletFrame, "TOPRIGHT", -3, 0) - WatchFrameLines:Formula409(true) - WatchFrameLines:SetPoint("TOPLEFT", WatchFrame, "TOPLEFT", 87, 0) - WatchFrameLines:SetPoint("BOTTOMLEFT", WatchFrame, "BOTTOMLEFT", 87, 0) - WatchFrameLines:SetWidth(WATCHFRAME_MAXLINEWIDTH - 100) - --[[Lets murder some internals to prevent overriding]]-- - WatchFrame.ClearAllPoints = SuperVillain.fubar; - WatchFrame.SetPoint = SuperVillain.fubar; - WatchFrame.SetAllPoints = SuperVillain.fubar; - WatchFrameLines.ClearAllPoints = SuperVillain.fubar; - WatchFrameLines.SetPoint = SuperVillain.fubar; - WatchFrameLines.SetAllPoints = SuperVillain.fubar; - WatchFrameLines.SetWidth = SuperVillain.fubar; - WatchFrameCollapseExpandButton.ClearAllPoints = SuperVillain.fubar; - WatchFrameCollapseExpandButton.SetPoint = SuperVillain.fubar; - WatchFrameCollapseExpandButton.SetAllPoints = SuperVillain.fubar; - - SetQuestDockEvents() - - QuestDocklet:RegisterEvent("CVAR_UPDATE") QuestDocklet:RegisterEvent("QUEST_AUTOCOMPLETE") QuestDocklet:SetScript("OnEvent", QuestDocklet_OnEvent) end diff --git a/Interface/AddOns/SVUI_AnsweringService/SVUI_AnsweringService.toc b/Interface/AddOns/SVUI_AnsweringService/SVUI_AnsweringService.toc index 6f20a66..1fc61ea 100644 --- a/Interface/AddOns/SVUI_AnsweringService/SVUI_AnsweringService.toc +++ b/Interface/AddOns/SVUI_AnsweringService/SVUI_AnsweringService.toc @@ -1,4 +1,4 @@ -## Interface: 50400 +## Interface: 60000 ## Author: Munglunch ## Version: 1.081 ## Title: |cffFF9900SVUI |r|cffFFEF00Answering Service|r diff --git a/Interface/AddOns/SVUI_ArtOfWar/Bindings.xml b/Interface/AddOns/SVUI_ArtOfWar/Bindings.xml index f0778e8..05e6324 100644 --- a/Interface/AddOns/SVUI_ArtOfWar/Bindings.xml +++ b/Interface/AddOns/SVUI_ArtOfWar/Bindings.xml @@ -1,5 +1,5 @@ <Bindings> - <Binding name="Call Out Incoming" header="SVUIAOW" runOnUp="false"> + <Binding name="SayIncoming" description="Call Out Incoming" header="SVUIAOW" runOnUp="false"> SVUISayIncoming() </Binding> </Bindings> \ No newline at end of file diff --git a/Interface/AddOns/SVUI_ArtOfWar/SVUI_ArtOfWar.toc b/Interface/AddOns/SVUI_ArtOfWar/SVUI_ArtOfWar.toc index 2f2e7c8..b217231 100644 --- a/Interface/AddOns/SVUI_ArtOfWar/SVUI_ArtOfWar.toc +++ b/Interface/AddOns/SVUI_ArtOfWar/SVUI_ArtOfWar.toc @@ -1,4 +1,4 @@ -## Interface: 50400 +## Interface: 60000 ## Author: Munglunch ## Version: 1.081 ## Title: |cffFF9900SVUI |r|cffFFEF00Art of War|r diff --git a/Interface/AddOns/SVUI_ConfigOMatic/SVUI_ConfigOMatic.toc b/Interface/AddOns/SVUI_ConfigOMatic/SVUI_ConfigOMatic.toc index c09a1e2..65841e1 100644 --- a/Interface/AddOns/SVUI_ConfigOMatic/SVUI_ConfigOMatic.toc +++ b/Interface/AddOns/SVUI_ConfigOMatic/SVUI_ConfigOMatic.toc @@ -1,4 +1,4 @@ -## Interface: 50400 +## Interface: 60000 ## Author: Munglunch, Elv ## Version: 4.082 ## Title: |cffFF9900SVUI |r|cffFFEF00Config O Matic|r diff --git a/Interface/AddOns/SVUI_Laborer/Bindings.xml b/Interface/AddOns/SVUI_Laborer/Bindings.xml index b126d31..3b81fd2 100644 --- a/Interface/AddOns/SVUI_Laborer/Bindings.xml +++ b/Interface/AddOns/SVUI_Laborer/Bindings.xml @@ -1,14 +1,14 @@ <Bindings> - <Binding name="Fishing Mode" header="SVUILABORER" runOnUp="false"> + <Binding name="FishingMode" description="Fishing Mode" header="SVUILABORER" runOnUp="false"> SVUIFishingMode() </Binding> - <Binding name="Farming Mode" runOnUp="false"> + <Binding name="FarmingMode" description="Farming Mode" header="SVUILABORER" runOnUp="false"> SVUIFarmingMode() </Binding> - <Binding name="Archaeology Mode" runOnUp="false"> + <Binding name="ArchaeologyMode" description="Archaeology Mode" header="SVUILABORER" runOnUp="false"> SVUIArchaeologyMode() </Binding> - <Binding name="Cooking Mode" runOnUp="false"> + <Binding name="CookingMode" description="Cooking Mode" header="SVUILABORER" runOnUp="false"> SVUICookingMode() </Binding> </Bindings> \ No newline at end of file diff --git a/Interface/AddOns/SVUI_Laborer/SVUI_Laborer.toc b/Interface/AddOns/SVUI_Laborer/SVUI_Laborer.toc index 15c2a3b..42d5838 100644 --- a/Interface/AddOns/SVUI_Laborer/SVUI_Laborer.toc +++ b/Interface/AddOns/SVUI_Laborer/SVUI_Laborer.toc @@ -1,4 +1,4 @@ -## Interface: 50400 +## Interface: 60000 ## Author: Munglunch ## Version: 1.081 ## Title: |cffFF9900SVUI |r|cffFFEF00Laborer|r diff --git a/Interface/AddOns/SVUI_LogOMatic/SVUI_LogOMatic.lua b/Interface/AddOns/SVUI_LogOMatic/SVUI_LogOMatic.lua index 92a5aa8..b2a0e4e 100644 --- a/Interface/AddOns/SVUI_LogOMatic/SVUI_LogOMatic.lua +++ b/Interface/AddOns/SVUI_LogOMatic/SVUI_LogOMatic.lua @@ -98,7 +98,6 @@ local RefreshLoggedSlot = function(self, bag, slotID, save) local itemLink = GetContainerItemLink(bag, slotID); local key; slot:Show() - slot.questIcon:Hide() slot.name, slot.rarity = nil, nil; local start, duration, enable = GetContainerItemCooldown(bag, slotID) CooldownFrame_SetTimer(slot.cooldown, start, duration, enable) @@ -118,7 +117,6 @@ local RefreshLoggedSlot = function(self, bag, slotID, save) local z, A, C = GetContainerItemQuestInfo(bag, slotID) if A and not isActive then slot:SetBackdropBorderColor(1.0, 0.3, 0.3) - slot.questIcon:Show() elseif A or z then slot:SetBackdropBorderColor(1.0, 0.3, 0.3) elseif slot.rarity and slot.rarity>1 then diff --git a/Interface/AddOns/SVUI_LogOMatic/SVUI_LogOMatic.toc b/Interface/AddOns/SVUI_LogOMatic/SVUI_LogOMatic.toc index a0a9371..5ccb4a4 100644 --- a/Interface/AddOns/SVUI_LogOMatic/SVUI_LogOMatic.toc +++ b/Interface/AddOns/SVUI_LogOMatic/SVUI_LogOMatic.toc @@ -1,4 +1,4 @@ -## Interface: 50400 +## Interface: 60000 ## Author: Munglunch ## Version: 1.081 ## Title: |cffFF9900SVUI |r|cffFFEF00Log O Matic|r diff --git a/Interface/AddOns/SVUI_StyleOMatic/SVUI_StyleOMatic.toc b/Interface/AddOns/SVUI_StyleOMatic/SVUI_StyleOMatic.toc index 5705bc8..191e60d 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/SVUI_StyleOMatic.toc +++ b/Interface/AddOns/SVUI_StyleOMatic/SVUI_StyleOMatic.toc @@ -1,4 +1,4 @@ -## Interface: 50400 +## Interface: 60000 ## Author: Munglunch, Azilroka, Sortokk ## Version: 4.082 ## Title: |cffFF9900SVUI |r|cffFFEF00Style O Matic|r diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/auctionhouse.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/auctionhouse.lua index 329d689..cfb8d78 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/auctionhouse.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/auctionhouse.lua @@ -95,6 +95,7 @@ local function AuctionStyle() STYLE:ApplyScrollStyle(BrowseScrollFrameScrollBar) IsUsableCheckButton:SetCheckboxTemplate(true) ShowOnPlayerCheckButton:SetCheckboxTemplate(true) + ExactMatchCheckButton:SetCheckboxTemplate(true) SideDressUpFrame:Formula409(true) SideDressUpFrame:SetPanelTemplate("Halftone") SideDressUpFrame:Point("TOPLEFT", AuctionFrame, "TOPRIGHT", 7, 0) @@ -142,8 +143,6 @@ local function AuctionStyle() BrowseBuyoutButton:Point("RIGHT", BrowseCloseButton, "LEFT", -4, 0) BrowseBidButton:Point("RIGHT", BrowseBuyoutButton, "LEFT", -4, 0) - BrowseResetButton:Point("TOPLEFT", AuctionFrameBrowse, "TOPLEFT", 81, -74) - BrowseSearchButton:Point("TOPRIGHT", AuctionFrameBrowse, "TOPRIGHT", 25, -34) AuctionsItemButton:Formula409() AuctionsItemButton:SetButtonTemplate() diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/friends.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/friends.lua index 265edb6..7bfe94d 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/friends.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/friends.lua @@ -48,17 +48,6 @@ local FriendsFrameList1 = { "AddFriendFrame", "AddFriendNoteFrame" }; -local FriendsFrameList2 = { - "FriendsFrameBroadcastInputLeft", - "FriendsFrameBroadcastInputRight", - "FriendsFrameBroadcastInputMiddle", - "ChannelFrameDaughterFrameChannelNameLeft", - "ChannelFrameDaughterFrameChannelNameRight", - "ChannelFrameDaughterFrameChannelNameMiddle", - "ChannelFrameDaughterFrameChannelPasswordLeft", - "ChannelFrameDaughterFrameChannelPasswordRight", - "ChannelFrameDaughterFrameChannelPasswordMiddle" -}; local FriendsFrameButtons = { "FriendsFrameAddFriendButton", "FriendsFrameSendMessageButton", @@ -140,9 +129,6 @@ local function FriendsFrameStyle() for c, e in pairs(FriendsFrameButtons)do _G[e]:SetButtonTemplate() end; - for c, texture in pairs(FriendsFrameList2)do - _G[texture]:MUNG() - end; for c, V in pairs(FriendsFrameList1)do _G[V]:Formula409() end; diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/help.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/help.lua index 0fe3c18..d73de09 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/help.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/help.lua @@ -44,7 +44,7 @@ local function NavBarHelper(button) local i = button.navList[d] local j = button.navList[d-1] if i and j then - i:SetFrameLevel(j:GetFrameLevel()-2) + i:SetFrameLevel(0) end end end; diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/keybinding.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/keybinding.lua index 85fafa8..289bf1f 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/keybinding.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/keybinding.lua @@ -20,30 +20,28 @@ local STYLE = _G.StyleVillain; KEYBINDING STYLER ########################################################## ]]-- +local BindButtons = { + "KeyBindingFrameDefaultButton", + "KeyBindingFrameUnbindButton", + "KeyBindingFrameOkayButton", + "KeyBindingFrameCancelButton" +} + local function BindingStyle() - if SuperVillain.db.SVStyle.blizzard.enable ~= true or SuperVillain.db.SVStyle.blizzard.binding ~= true then return end; - local buttons = {"KeyBindingFrameDefaultButton", "KeyBindingFrameUnbindButton", "KeyBindingFrameOkayButton", "KeyBindingFrameCancelButton"} - for l, m in pairs(buttons)do - _G[m]:Formula409()_G[m]:SetFixedPanelTemplate("Default") - end; + if SuperVillain.db.SVStyle.blizzard.enable ~= true or SuperVillain.db.SVStyle.blizzard.binding ~= true then return end + + for _, gName in pairs(BindButtons)do + local btn = _G[gName] + if(btn) then + btn:Formula409() + btn:SetFixedPanelTemplate("Default") + end + end + STYLE:ApplyScrollStyle(KeyBindingFrameScrollFrameScrollBar) - KeyBindingFrameCharacterButton:SetCheckboxTemplate(true) - KeyBindingFrameHeaderText:ClearAllPoints() - KeyBindingFrameHeaderText:Point("TOP", KeyBindingFrame, "TOP", 0, -4) KeyBindingFrame:Formula409() KeyBindingFrame:SetPanelTemplate("Halftone") - for b = 1, KEY_BINDINGS_DISPLAYED do - local n = _G["KeyBindingFrameBinding"..b.."Key1Button"] - local o = _G["KeyBindingFrameBinding"..b.."Key2Button"] - n:Formula409(true) - n:SetButtonTemplate() - n:SetFixedPanelTemplate("Default") - o:Formula409(true) - o:SetButtonTemplate() - o:SetFixedPanelTemplate("Default") - end; - KeyBindingFrameUnbindButton:Point("RIGHT", KeyBindingFrameOkayButton, "LEFT", -3, 0)KeyBindingFrameOkayButton:Point("RIGHT", KeyBindingFrameCancelButton, "LEFT", -3, 0) -end; +end --[[ ########################################################## STYLE LOADING diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/lfd.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/lfd.lua index 37f4541..c2635ac 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/lfd.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/lfd.lua @@ -244,13 +244,7 @@ local function LFDFrameStyle() end) STYLE:ApplyDropdownStyle(LFDQueueFrameTypeDropDown) - FlexRaidFrameScrollFrame:Formula409() - FlexRaidFrameBottomInset:Formula409() - hooksecurefunc("FlexRaidFrame_Update", function() - FlexRaidFrame.ScrollFrame.Background:SetTexture(0,0,0,0) - end) - STYLE:ApplyDropdownStyle(FlexRaidFrameSelectionDropDown) - FlexRaidFrameStartRaidButton:SetButtonTemplate() + RaidFinderFrame:Formula409() RaidFinderFrameBottomInset:Formula409() RaidFinderFrameRoleInset:Formula409() @@ -364,7 +358,7 @@ local function LFDFrameStyle() LFDQueueFrameRandomScrollFrame:SetFixedPanelTemplate("Inset") ScenarioQueueFrameRandomScrollFrame:SetFixedPanelTemplate("Inset") RaidFinderQueueFrameScrollFrame:SetFixedPanelTemplate("Inset") - FlexRaidFrameScrollFrame:SetFixedPanelTemplate("Inset") + for u = 1, NUM_LFD_CHOICE_BUTTONS do local box = _G["LFDQueueFrameSpecificListButton"..u.."EnableButton"] if(box and (not box.Panel)) then diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/pvp.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/pvp.lua index 3156060..356c60b 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/pvp.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/pvp.lua @@ -28,7 +28,6 @@ local function PVPFrameStyle() end; PVPUIFrame:Formula409() PVPUIFrame:SetPanelTemplate("Action") - PVPUIFrame.Shadows:Formula409() STYLE:ApplyCloseButtonStyle(PVPUIFrameCloseButton) for g = 1, 2 do STYLE:ApplyTabStyle(_G["PVPUIFrameTab"..g]) @@ -59,11 +58,7 @@ local function PVPFrameStyle() HonorFrame.BonusFrame.RandomBGButton:SetButtonTemplate() HonorFrame.BonusFrame.RandomBGButton.SelectedTexture:FillInner() HonorFrame.BonusFrame.RandomBGButton.SelectedTexture:SetTexture(1, 1, 0, 0.1) - HonorFrame.BonusFrame.CallToArmsButton:Formula409() - HonorFrame.BonusFrame.CallToArmsButton:SetFixedPanelTemplate("Button") - HonorFrame.BonusFrame.CallToArmsButton:SetButtonTemplate() - HonorFrame.BonusFrame.CallToArmsButton.SelectedTexture:FillInner() - HonorFrame.BonusFrame.CallToArmsButton.SelectedTexture:SetTexture(1, 1, 0, 0.1) + HonorFrame.BonusFrame.DiceButton:DisableDrawLayer("ARTWORK") HonorFrame.BonusFrame.DiceButton:SetHighlightTexture("") HonorFrame.RoleInset:Formula409() @@ -81,14 +76,7 @@ local function PVPFrameStyle() n.bg:SetDesaturated(true) end end) - for g = 1, 2 do - local I = HonorFrame.BonusFrame["WorldPVP"..g.."Button"] - I:Formula409() - I:SetFixedPanelTemplate("Button", true) - I:SetButtonTemplate() - I.SelectedTexture:FillInner() - I.SelectedTexture:SetTexture(1, 1, 0, 0.1) - end; + ConquestFrame.Inset:Formula409() ConquestPointsBarLeft:MUNG() ConquestPointsBarRight:MUNG() @@ -116,7 +104,7 @@ local function PVPFrameStyle() STYLE:ApplyScrollStyle(WarGamesFrameScrollFrameScrollBar) STYLE:ApplyScrollStyle(WarGamesFrameInfoScrollFrameScrollBar) WarGamesFrame.HorizontalBar:Formula409() - PVPUIFrame.LeftInset:Formula409() + PVPReadyDialog:Formula409() PVPReadyDialog:SetPanelTemplate("Pattern") PVPReadyDialogEnterBattleButton:SetButtonTemplate() diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/quest.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/quest.lua index 0fa3b3b..24d2911 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/quest.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/quest.lua @@ -83,30 +83,14 @@ local function QuestFrameStyle() STYLE:ApplyScrollStyle(QuestLogScrollFrameScrollBar, 5) STYLE:ApplyScrollStyle(QuestProgressScrollFrameScrollBar) STYLE:ApplyScrollStyle(QuestRewardScrollFrameScrollBar) - QuestLogScrollFrame:Formula409() - QuestLogFrame:Formula409() - QuestLogFrame:SetPanelTemplate("Halftone") - QuestLogCount:Formula409() - QuestLogCount:SetFixedPanelTemplate("Default") - EmptyQuestLogFrame:Formula409() - QuestLogDetailFrameInset:MUNG() - STYLE:ApplyScrollStyle(QuestDetailScrollFrameScrollBar) - QuestProgressScrollFrame:Formula409() - QuestLogFrameShowMapButton:Formula409() - QuestLogFrameShowMapButton:SetButtonTemplate() - QuestLogFrameShowMapButton.text:ClearAllPoints() - QuestLogFrameShowMapButton.text:SetPoint("CENTER") - QuestLogFrameShowMapButton:Size(QuestLogFrameShowMapButton:GetWidth()-30, QuestLogFrameShowMapButton:GetHeight(), -40) + + --[[MISC STYLINGS REMOVED HERE]]-- + QuestGreetingScrollFrame:Formula409() STYLE:ApplyScrollStyle(QuestGreetingScrollFrameScrollBar) - QuestLogFrameInset:MUNG() - QuestLogFrameCompleteButton:Formula409() - for _,i in pairs(QuestFrameList)do - _G[i]:SetButtonTemplate() - _G[i]:SetFrameLevel(_G[i]:GetFrameLevel() + 2) - end; - QuestLogFramePushQuestButton:Point("LEFT", QuestLogFrameAbandonButton, "RIGHT", 2, 0) - QuestLogFramePushQuestButton:Point("RIGHT", QuestLogFrameTrackButton, "LEFT", -2, 0) + + --[[MISC STYLINGS REMOVED HERE]]-- + for j = 1, MAX_NUM_ITEMS do local cLvl = _G["QuestInfoItem"..j]:GetFrameLevel() + 1 _G["QuestInfoItem"..j]:Formula409() @@ -141,27 +125,9 @@ local function QuestFrameStyle() QuestInfoItemHighlight:ClearAllPoints() QuestInfoItemHighlight:SetAllPoints(k) end) - QuestLogFrame:HookScript("OnShow", function() - if not QuestLogScrollFrame.spellTex then - QuestLogScrollFrame:SetFixedPanelTemplate("Default") - QuestLogScrollFrame.spellTex = QuestLogScrollFrame:CreateTexture(nil, 'ARTWORK') - QuestLogScrollFrame.spellTex:SetTexture([[Interface\QuestFrame\QuestBookBG]]) - QuestLogScrollFrame.spellTex:SetPoint("TOPLEFT", 2, -2) - QuestLogScrollFrame.spellTex:Size(514, 616) - QuestLogScrollFrame.spellTex:SetTexCoord(0, 1, 0.02, 1) - QuestLogScrollFrame.spellTex2 = QuestLogScrollFrame:CreateTexture(nil, 'BORDER') - QuestLogScrollFrame.spellTex2:SetTexture([[Interface\FrameGeneral\UI-Background-Rock]]) - QuestLogScrollFrame.spellTex2:FillInner() - end - end) - QuestLogDetailScrollFrame:HookScript('OnShow', function(k) - if not QuestLogDetailScrollFrame.Panel then - QuestLogDetailScrollFrame:SetPanelTemplate("Default") - QuestScrollHelper(QuestLogDetailScrollFrame, 509, 630, false) - QuestLogDetailScrollFrame:Height(k:GetHeight() - 2) - end; - QuestLogDetailScrollFrame.spellTex:Height(k:GetHeight() + 217) - end) + + --[[MISC STYLINGS REMOVED HERE]]-- + QuestRewardScrollFrame:HookScript('OnShow', function(k) if not k.Panel then k:SetPanelTemplate("Default") diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/system.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/system.lua index 1a1f7f2..e03744f 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/system.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/system.lua @@ -855,9 +855,9 @@ local function SystemPanelQue() end) GuildInviteFrame:Formula409() GuildInviteFrame:SetFixedPanelTemplate('Transparent') - GuildInviteFrameLevel:Formula409() - GuildInviteFrameLevel:ClearAllPoints() - GuildInviteFrameLevel:Point('TOP', GuildInviteFrame, 'CENTER', -15, -25) + + --[[MISC STYLINGS REMOVED HERE]]-- + GuildInviteFrameJoinButton:SetButtonTemplate() GuildInviteFrameDeclineButton:SetButtonTemplate() GuildInviteFrame:Height(225) @@ -867,7 +867,7 @@ local function SystemPanelQue() GuildInviteFrameWarningText:MUNG() BattleTagInviteFrame:Formula409() BattleTagInviteFrame:SetFixedPanelTemplate('Transparent') - BattleTagInviteFrameScrollFrame:SetEditboxTemplate() + for i=1, BattleTagInviteFrame:GetNumChildren() do local child = select(i, BattleTagInviteFrame:GetChildren()) if child:GetObjectType() == 'Button' then diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/worldmap.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/worldmap.lua index b68b500..976d7c5 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/worldmap.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/worldmap.lua @@ -28,13 +28,15 @@ local function AdjustMapLevel() WorldMapArchaeologyDigSites:SetFrameLevel(6) WorldMapArchaeologyDigSites:SetFrameStrata('DIALOG') end + local function WorldMap_SmallView() WorldMapFrame.Panel:ClearAllPoints() WorldMapFrame.Panel:SetAllPoints(WorldMapFrame) WorldMapFrame.backdrop:ClearAllPoints() WorldMapFrame.backdrop:Point("TOPLEFT", WorldMapFrame.Panel, 2, 2) WorldMapFrame.backdrop:Point("BOTTOMRIGHT", WorldMapFrame.Panel, 2, -2) -end +end + local function WorldMap_FullView() WorldMapFrame.Panel:ClearAllPoints() WorldMapFrame.Panel:Point("TOPLEFT", WorldMapDetailFrame, "TOPLEFT", -12, 70) @@ -43,38 +45,8 @@ local function WorldMap_FullView() WorldMapFrame.backdrop:Point("TOPLEFT", WorldMapFrame.Panel, 2, 2) WorldMapFrame.backdrop:Point("BOTTOMRIGHT", WorldMapFrame.Panel, 2, -2) 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 WorldMap_OnShow() WorldMapFrame:Formula409() if not SuperVillain.db.SVMap.tinyWorldMap then @@ -86,8 +58,6 @@ local function WorldMap_OnShow() WorldMap_FullView() elseif WORLDMAP_SETTINGS.size == WORLDMAP_WINDOWED_SIZE then WorldMap_SmallView() - elseif WORLDMAP_SETTINGS.size == WORLDMAP_QUESTLIST_SIZE then - WorldMap_QuestView() end WorldMapFrameAreaLabel:SetFontTemplate(nil, 50, "OUTLINE") WorldMapFrameAreaLabel:SetShadowOffset(2, -2) @@ -137,11 +107,13 @@ local function WorldMapQuestStyle() STYLE:ApplyDropdownStyle(WorldMapContinentDropDown) STYLE:ApplyDropdownStyle(WorldMapZoneDropDown) STYLE:ApplyDropdownStyle(WorldMapShowDropDown) - WorldMapZoomOutButton:SetButtonTemplate() - WorldMapTrackQuest:SetCheckboxTemplate(true) + + --[[MISC STYLINGS REMOVED HERE]]-- + WorldMapFrame:HookScript("OnShow", WorldMap_OnShow) - hooksecurefunc("WorldMapFrame_SetFullMapView", WorldMap_FullView) - hooksecurefunc("WorldMapFrame_SetQuestMapView", WorldMap_QuestView) + + --[[MISC STYLINGS REMOVED HERE]]-- + hooksecurefunc("WorldMap_ToggleSizeUp", WorldMap_OnShow) BlackoutWorld:SetParent(WorldMapFrame.backdrop) end