WoWInterface SVN UrbanAchiever

Compare Revisions

  • This comparison shows the changes necessary to convert path 
    /
    from Rev 30 to Rev 31
    ↔ Reverse comparison
  •

Rev 30 → Rev 31

trunk/Main.lua
681,6 → 681,24
self.frame.display.compareDate:SetText("Syzgyn Completed: 12/12/12")
self.frame.display.compareDate:Hide()
 
--Display Bar
self.frame.display.bar = CreateFrame("StatusBar", "$parentBar", self.frame.display, "AchievementProgressBarTemplate")
self.frame.display.bar.text:SetFontObject("GameFontHighlight")
self.frame.display.bar.text:SetWidth(200)
self.frame.display.bar:SetPoint("CENTER", self.frame.display, 0, 60)
 
--Display Comparison Bar
self.frame.display.compareBar = CreateFrame("StatusBar", "$parentCompareBar", self.frame.display, "AchievementProgressBarTemplate")
self.frame.display.compareBar.text:SetFontObject("GameFontHighlight")
self.frame.display.compareBar.text:SetWidth(200)
self.frame.display.compareBar:ClearAllPoints()
self.frame.display.compareBar:SetPoint("TOP", self.frame.display.bar, "BOTTOM", 0, -25)
 
--Display Comparison Bar Name Text
self.frame.display.compareBar.nameText = self.frame.display.compareBar:CreateFontString("$parentNameText", "ARTWORK", "GameFontNormal")
self.frame.display.compareBar.nameText:SetTextColor(1,1,1)
self.frame.display.compareBar.nameText:SetPoint("BOTTOM", self.frame.display.compareBar, "TOP", 0, 5)
 
self.frame.display.criteriaButtons = {}
 
--Criteria Buttons
950,24 → 968,6
button.comparison:SetHeight(16)
button.comparison:SetPoint("LEFT", button.offset)
 
button.bar = CreateFrame("StatusBar", "$parentBar", button, "AchievementProgressBarTemplate")
button.bar.text:SetFontObject("GameFontHighlight")
button.bar.text:SetWidth(200)
 
button.compareBar = CreateFrame("StatusBar", "$parentCompareBar", button, "AchievementProgressBarTemplate")
button.compareBar.text:SetFontObject("GameFontHighlight")
button.compareBar.text:SetWidth(200)
button.compareBar:ClearAllPoints()
button.compareBar:SetPoint("TOP", button.bar, "BOTTOM", 0, -5)
--getglobal(button.bar:GetName() .. "Border"):SetDrawLayer("ARTWORK")
--button.bar:SetWidth(200)
--button.bar:SetHeight(16)
--button.bar:SetPoint("TOP")
--button.bar:SetOrientation("HORIZONTAL")
--button.bar:SetStatusBarColor(1,1,1)
--button.bar:SetMinMaxValues(0,1)
--button.bar:SetValue(15)
 
--button:SetNormalTexture("Interface/FriendsFrame/UI-FriendsFrame-HighlightBar")
 
local highlightTexture = button:CreateTexture()
1464,13 → 1464,15
compDone = GetAchievementComparisonInfo(self.currentAch,1)
end
 
 
self.frame.display.bar:Hide()
self.frame.display.compareBar:Hide()
 
for a = 1, GetAchievementNumCriteria(self.currentAch) do
if buttonNum <= #self.frame.display.criteriaButtons and a > self.criteriaOffset then
 
self.frame.display.criteriaButtons[buttonNum]:Show()
self.frame.display.criteriaButtons[buttonNum].icon:Hide()
self.frame.display.criteriaButtons[buttonNum].bar:Hide()
self.frame.display.criteriaButtons[buttonNum].compareBar:Hide()
self.frame.display.criteriaButtons[buttonNum].comparison:Hide()
offset = 1
 
1509,28 → 1511,31
elseif (bit.band(criteriaFlags, ACHIEVEMENT_CRITERIA_PROGRESS_BAR) == ACHIEVEMENT_CRITERIA_PROGRESS_BAR) then
--Its a progress bar
offset = 1
self.frame.display.criteriaButtons[buttonNum].comparison:Hide()
self.frame.display.criteriaButtons[buttonNum]:Hide()
str = ""
--self.frame.display.criteriaButtons[buttonNum]:Hide()
 
self.frame.display.criteriaButtons[buttonNum].bar:Show()
self.frame.display.criteriaButtons[buttonNum].bar:SetMinMaxValues(0,criteriaReqQuantity)
self.frame.display.criteriaButtons[buttonNum].bar:SetValue(criteriaQuantity)
self.frame.display.criteriaButtons[buttonNum].bar.text:SetText(quantityStr)
self.frame.display.bar:Show()
self.frame.display.bar:SetMinMaxValues(0,criteriaReqQuantity)
self.frame.display.bar:SetValue(criteriaQuantity)
self.frame.display.bar.text:SetText(quantityStr)
 
if self.isComparing and compCriteriaText then
self.frame.display.criteriaButtons[buttonNum].compareBar:Show()
self.frame.display.criteriaButtons[buttonNum].compareBar:SetMinMaxValues(0, criteriaReqQuantity)
if compDone then
self.frame.display.criteriaButtons[buttonNum].compareBar:SetValue(criteriaReqQuantity)
self.frame.display.criteriaButtons[buttonNum].compareBar.text:SetText(criteriaReqQuantity .. " / " .. criteriaReqQuantity)
self.frame.display.compareBar:Show()
self.frame.display.compareBar:SetMinMaxValues(0, criteriaReqQuantity)
if compDone then --This will never trigger, I think.
self.frame.display.compareBar:SetValue(criteriaReqQuantity)
self.frame.display.compareBar.text:SetText(criteriaReqQuantity .. " / " .. criteriaReqQuantity)
else
local _,_,min, max = string.find(compCriteriaText, "(%d+)/(%d+)")
self.frame.display.criteriaButtons[buttonNum].compareBar:SetValue(min)
self.frame.display.criteriaButtons[buttonNum].compareBar.text:SetText(min .. " / " .. criteriaReqQuantity)
self.frame.display.compareBar:SetValue(min)
self.frame.display.compareBar.text:SetText(min .. " / " .. criteriaReqQuantity)
self.frame.display.compareBar.nameText:SetText(self.comparisonUnitName .. ":")
end
 
end
--If theres a progress bar, theres no other achievements
break
end
 
self.frame.display.criteriaButtons[buttonNum].text:SetText(str)