WoWInterface SVN UrbanAchiever

Compare Revisions

  • This comparison shows the changes necessary to convert path 
    /trunk
    from Rev 150 to Rev 151
    ↔ Reverse comparison
  •

Rev 150 → Rev 151

Main.lua
839,10 → 839,10
self.frame.achSort.name = self:CreateAchievementSortButton("$parentSortNameButton", 190, self.frame, UASORT_Name, "name")
self.frame.achSort.name:SetPoint("BOTTOMLEFT", self.frame.achButtons[1], "TOPLEFT", 10, 1)
 
self.frame.achSort.points = self:CreateAchievementSortButton("$parentSortPointsButton", 48, self.frame, UASORT_Points, "points")
self.frame.achSort.points = self:CreateAchievementSortButton("$parentSortPointsButton", 36, self.frame, UASORT_Points, "points")
self.frame.achSort.points:SetPoint("LEFT", self.frame.achSort.name, "RIGHT", 1, 0)
 
self.frame.achSort.completed = self:CreateAchievementSortButton("$parentSortCompletedButton", 50, self.frame, UASORT_Date, "completed")
self.frame.achSort.completed = self:CreateAchievementSortButton("$parentSortCompletedButton", 62, self.frame, UASORT_Date, "completed")
self.frame.achSort.completed:SetPoint("LEFT", self.frame.achSort.points, "RIGHT", 1, 0)
 
self.frame.achSort.comparison = self:CreateAchievementSortButton("$parentSortComparisonButton", 70, self.frame, UASORT_Compare, "compare")
1052,6 → 1052,7
 
--Display Reward
self.frame.display.reward = self.frame.display:CreateFontString("$parentReward", "ARTWORK", "GameFontNormal")
self.frame.display.reward:SetWidth(270)
self.frame.display.reward:SetPoint("TOP", self.frame.display, "TOP", 0, -127)
self.frame.display.reward:SetTextColor(1,1,1)
 
1179,6 → 1180,20
categoryFrame:SetScript("OnHide", function(self)
AchievementFrameSummaryCategory_OnHide(self)
end)
local button = loadstring("return categoryStatusBar" .. id .. "Button")()
button:SetScript("OnClick", function(self)
local id = self:GetParent():GetID();
UrbanAchiever.currentCat = id
for _,v in next, UrbanAchiever.categories[UrbanAchiever.currentTab] do
if v.id == id then
v.collapsed = not v.collapsed
break
end
end
UrbanAchiever.achOffset = 0
UrbanAchiever:RefreshCategoryButtons()
UrbanAchiever:RefreshAchievementButtons()
end)
categoryFrame:SetWidth(200)
categoryFrame:SetHeight(21)
categoryFrame.text:ClearAllPoints()
1375,30 → 1390,31
 
button.name = button:CreateFontString("$parentNameText","BORDER", "GameFontNormal")
button.name:SetPoint("TOPLEFT", button.background)
button.name:SetWidth(200)
button.name:SetWidth(190)
button.name:SetHeight(16)
button.name:SetJustifyH("LEFT")
button.name:SetJustifyV("TOP")
button.name:SetTextColor(1,1,1)
 
button.points = button:CreateFontString("$parentPointsText","BORDER", "GameFontNormal")
button.points:SetPoint("TOPLEFT", button, "TOPLEFT", 217, 0)
button.points:SetWidth(20)
button.points:SetJustifyH("LEFT")
button.points:SetPoint("LEFT", button.name, "RIGHT", 2, 0)
button.points:SetWidth(36)
button.points:SetHeight(16)
button.points:SetJustifyH("CENTER")
button.points:SetJustifyV("TOP")
button.points:SetTextColor(1,1,1)
 
button.completed = button:CreateFontString("$parentCompletedText","BORDER", "GameFontNormal")
button.completed:SetPoint("TOPLEFT", button.points, "TOPRIGHT", 2, 0)
button.completed:SetWidth(60)
button.completed:SetPoint("LEFT", button.points, "RIGHT", 2, 0)
button.completed:SetWidth(62)
button.completed:SetHeight(16)
button.completed:SetJustifyH("LEFT")
button.completed:SetJustifyH("CENTER")
button.completed:SetJustifyV("TOP")
button.completed:SetTextColor(1,1,1)
 
button.stat = button:CreateFontString("$parentStatText","BORDER", "GameFontNormal")
button.stat:SetPoint("TOPLEFT", button, "TOPLEFT", 217, 0)
button.stat:SetPoint("TOPRIGHT", button.background, "TOPRIGHT")
button.stat:SetPoint("LEFT", button.name, "RIGHT", 2, 0)
--button.stat:SetPoint("TOPRIGHT", button.background, "TOPRIGHT")
button.stat:SetJustifyH("LEFT")
button.stat:SetJustifyV("TOP")
button.stat:SetTextColor(1,1,1)
1986,7 → 2002,7
self.frame.display.compareBar:Hide()
 
for a = self.criteriaOffset + 1, min(#self.frame.display.criteriaButtons + self.criteriaOffset, GetAchievementNumCriteria(self.currentAch)) do
self.frame.display.criteriaButtons[buttonNum]:Show()
self.frame.display.criteriaButtons[buttonNum]:Hide()
self.frame.display.criteriaButtons[buttonNum].icon:Hide()
self.frame.display.criteriaButtons[buttonNum].comparison:Hide()
offset = 1
2018,10 → 2034,12
if (bit.band(criteriaFlags, 1) == 1) then
--Its a progress bar
offset = 1
--self.frame.display.criteriaButtons[buttonNum]:Hide()
str = ""
numStatusBar = numStatusBar+1
 
self.frame.display.bar:ClearAllPoints()
self.frame.display.bar:SetPoint("CENTER", self.frame.display, 0, 60)
 
self.frame.display.bar:Show()
self.frame.display.bar:SetMinMaxValues(0,criteriaReqQuantity)
self.frame.display.bar:SetValue(criteriaQuantity)
2055,8 → 2073,8
self.frame.display.criteriaButtons[buttonNumCurrent].text:SetText('')
self.frame.display.criteriaButtons[buttonNumCurrent].offset:SetWidth(1)
end
buttonNum = buttonNumEnd+1
else
self.frame.display.criteriaButtons[buttonNum]:Show()
if month then
self.frame.display.criteriaButtons[buttonNum].date = string.format(SHORTDATE, day, month, year);
else
2075,13 → 2093,18
end
self.frame.criteriaScroll:SetMinMaxValues(0,math.max(GetAchievementNumCriteria(self.currentAch)-#self.frame.display.criteriaButtons, 0))
 
if numStatusBar and buttonNum > 1 then
self.frame.display.compareBar:ClearAllPoints()
self.frame.display.bar:SetPoint("TOP", self.frame.display.criteriaButtons[buttonNum-1],"BOTTOM", 0, -15)
end
 
if GetAchievementNumCriteria(self.currentAch)-#self.frame.display.criteriaButtons > 0 then
self.frame.criteriaScroll:Show()
else
self.frame.criteriaScroll:Hide()
end
 
for a = GetAchievementNumCriteria(self.currentAch) + 1 + (numStatusBar*2), #self.frame.display.criteriaButtons do
for a = GetAchievementNumCriteria(self.currentAch) + 1, #self.frame.display.criteriaButtons do
self.frame.display.criteriaButtons[a]:Hide()
end
end