WoWInterface SVN WhoFramedWatcherWabbit

Compare Revisions

  • This comparison shows the changes necessary to convert path 
    /
    from Rev 27 to Rev 28
    ↔ Reverse comparison
  •

Rev 27 → Rev 28

trunk/Who Framed Watcher Wabbit/wfww.lua
5,9 → 5,11
--rActionButtonStyler texture lines (or see about how to register these buttons with rABS???)
 
local ObjectiveTrackerFrame = ObjectiveTrackerFrame
local otfHeader = ObjectiveTrackerFrame.HeaderMenu
local minimizeButton = ObjectiveTrackerFrame.HeaderMenu.MinimizeButton
local otfHeader = ObjectiveTrackerFrame.HeaderMenu
local otfTitle = ObjectiveTrackerFrame.HeaderMenu.Title
local otfQuests = ObjectiveTrackerBlocksFrame.QuestHeader
local _, questTitle = ObjectiveTrackerBlocksFrame.QuestHeader:GetRegions()
local otfAchievements = ObjectiveTrackerBlocksFrame.AchievementHeader
local otfScenarios = ObjectiveTrackerBlocksFrame.ScenarioHeader
local otfBonus = BONUS_OBJECTIVE_TRACKER_MODULE.Header
24,6 → 26,7
local WFWWSkinnedHeaders = {}
local WFWWSkinnedLines = {}
local tinsert = tinsert
local strformat = string.format
local MoveObjectiveTracker, SetSize, Appearance, FontChanges
 
local OTFContainer = CreateFrame("ScrollFrame", "OTFContainer", UIParent, "UIPanelScrollFrameTemplate")
55,6 → 58,7
instance = false,
petBattle = false,
scrolling = true,
showNum = true,
keybind = "",
}
 
470,6 → 474,31
end,
order = 15.6,
},
showNum = {
name = "Show Number of Quests",
desc = "Display on the tracker the number of quests in your quest log.",
type = "toggle",
get = function() return db.showNum end,
set = function()
db.showNum = not db.showNum
if db.showNum then
OTFContainer:RegisterEvent("QUEST_ACCEPTED")
OTFContainer:RegisterEvent("QUEST_TURNED_IN")
OTFContainer:RegisterEvent("QUEST_REMOVED")
local _, numQuests = GetNumQuestLogEntries()
otfTitle:SetText(strformat("%s (%d)", TRACKER_HEADER_OBJECTIVE, numQuests))
questTitle:SetText(strformat("%s (%d)", TRACKER_HEADER_QUESTS, numQuests))
else
OTFContainer:UnregisterEvent("QUEST_ACCEPTED")
OTFContainer:UnregisterEvent("QUEST_TURNED_IN")
OTFContainer:UnregisterEvent("QUEST_REMOVED")
otfTitle:SetText(TRACKER_HEADER_OBJECTIVE)
questTitle:SetText(TRACKER_HEADER_QUESTS)
 
end
end,
order = 15.7,
},
keybind = {
name = "Keybinding",
desc = "Key to minimize/maximize the tracker.",
482,7 → 511,7
end
db.keybind = key
end,
order = 15.7,
order = 15.8,
},
spacer4 = {
name = " ",
552,6 → 581,7
ObjectiveTrackerFrame:SetHeight(db.scrolling and 980 or db.height - 20)
end
 
local scrollPosition
local function ExpandObjectiveTracker()
if ObjectiveTrackerFrame.collapsed then
OTFContainer:SetHeight(db.height)
566,6 → 596,7
else
OTFContainerBG:SetSize(280, db.height + 13)
end
OTFContainer:SetVerticalScroll(scrollPosition or 0)
ObjectiveTracker_MinimizeButton_OnClick() --default function called by OnClick
end
 
586,6 → 617,8
OTFContainerScrollBar:SetAlpha(0)
OTFContainerScrollBar:Hide(0)
OTFContainer:EnableMouseWheel(false)
scrollPosition = OTFContainer:GetVerticalScroll() or 0
OTFContainer:SetVerticalScroll(0)
ObjectiveTracker_MinimizeButton_OnClick() --default function called by OnClick
end
end
759,6 → 792,7
InterfaceOptionsFrame_OpenToCategory("Who Framed Watcher Wabbit?")
elseif btn == "RightButton" then
ToggleFrame(WorldMapFrame)
QuestMapFrameViewAllButton_OnClick()
else
if not WFWWPCDB.collapsed then --if the container's not collapsed, collapse it
CollapseObjectiveTracker()
847,6 → 881,15
OTFContainer:RegisterEvent("QUEST_AUTOCOMPLETE")
OTFContainer:RegisterEvent("QUEST_WATCH_LIST_CHANGED")
OTFContainer:RegisterEvent("TRACKED_ACHIEVEMENT_LIST_CHANGED")
if db.showNum then
OTFContainer:RegisterEvent("QUEST_ACCEPTED")
OTFContainer:RegisterEvent("QUEST_TURNED_IN")
OTFContainer:RegisterEvent("QUEST_REMOVED")
local _, numQuests = GetNumQuestLogEntries()
otfTitle:SetText(strformat("%s (%d)", TRACKER_HEADER_OBJECTIVE, numQuests))
questTitle:SetText(strformat("%s (%d)", TRACKER_HEADER_QUESTS, numQuests))
end
 
local notCollapsed
OTFContainer:SetScript("OnEvent", function(_, event, ...)
if event == "PLAYER_ENTERING_WORLD" then
886,6 → 929,11
end
end
end
if db.showNum then
local _, numQuests = GetNumQuestLogEntries()
otfTitle:SetText(strformat("%s (%d)", TRACKER_HEADER_OBJECTIVE, numQuests))
questTitle:SetText(strformat("%s (%d)", TRACKER_HEADER_QUESTS, numQuests))
end
end
end)
 
trunk/Who Framed Watcher Wabbit/Who Framed Watcher Wabbit.toc
1,6 → 1,6
## Interface: 60000
## Interface: 60200
## Name: Who Framed Watcher Wabbit?
## Version: 2.1.1
## Version: 2.2
## Notes: Various tweaks to improve the quest watch frame
## SavedVariables: WFWWDB
## SavedVariablesPerCharacter: WFWWPCDB