WoWInterface SVN zz_Infoclock

Compare Revisions

  • This comparison shows the changes necessary to convert path 
    /
    from Rev 54 to Rev 55
    ↔ Reverse comparison
  •

Rev 54 → Rev 55

trunk/zz_Infoclock/core.lua
122,29 → 122,29
tip:AddLine(childName)
local col = toggleColor(col,"ffffff","00ff00")
if(db['expert']) then
tip:AddLine(addon['colorize'](d,col))
tip:AddLine(addon:colorize(d,col))
else
tip:AddLine(addon['colorize'](format("%s, %s.%s",L[date("%A")],date("%d"),L[date("%B")]),col))
tip:AddLine(addon:colorize(format("%s, %s.%s",L[date("%A")],date("%d"),L[date("%B")]),col))
end
col = toggleColor(col,"ffffff","00ff00")
if(db["12-Hours"]) then
tip:AddDoubleLine(addon['colorize'](L['Time'],col),addon['colorize'](date("%I:%M:%S"),toggleColor(col,"ffffff","00ff00")))
tip:AddDoubleLine(addon:colorize(L['Time'],col),addon:colorize(date("%I:%M:%S"),toggleColor(col,"ffffff","00ff00")))
else
tip:AddDoubleLine(addon['colorize'](L['Time'],col),addon['colorize'](date("%H:%M:%S"),toggleColor(col,"ffffff","00ff00")))
tip:AddDoubleLine(addon:colorize(L['Time'],col),addon:colorize(date("%H:%M:%S"),toggleColor(col,"ffffff","00ff00")))
end
col = toggleColor(col,"ffffff","00ff00")
tip:AddDoubleLine(addon['colorize'](L['Latency'],col),addon['colorize'](format("%s ms",select(3,GetNetStats())),toggleColor(col,"ffffff","00ff00")))
tip:AddDoubleLine(addon:colorize(L['Latency'],col),addon:colorize(format("%s ms",select(3,GetNetStats())),toggleColor(col,"ffffff","00ff00")))
col = toggleColor(col,"ffffff","00ff00")
tip:AddDoubleLine(addon['colorize'](L['FPS'],col),addon['colorize'](format("%i fps",floor(GetFramerate())),toggleColor(col,"ffffff","00ff00")))
tip:AddDoubleLine(addon:colorize(L['FPS'],col),addon:colorize(format("%i fps",floor(GetFramerate())),toggleColor(col,"ffffff","00ff00")))
col = toggleColor(col,"ffffff","00ff00")
tip:AddDoubleLine(addon['colorize'](L['AddOn Memory'],col),addon['colorize'](format("%i MB",floor(collectgarbage('count')/1024)),toggleColor(col,"ffffff","00ff00")))
tip:AddDoubleLine(addon:colorize(L['AddOn Memory'],col),addon:colorize(format("%i MB",floor(collectgarbage('count')/1024)),toggleColor(col,"ffffff","00ff00")))
tip:AddLine(" ")
tip:AddLine(L["AddOns"])
sort(ainfo,sortTab)
local sum,cnt = 0,0
for _, v in ipairs(ainfo) do
if(cnt<9) then
tip:AddDoubleLine(addon['colorize'](v['name'],"00ffff"),format(L["%i kB"],v['mem']))
tip:AddDoubleLine(addon:colorize(v['name'],"00ffff"),format(L["%i kB"],v['mem']))
cnt = cnt + 1
end
sum = sum + v['mem']
156,7 → 156,7
sum,cnt = 0,0
for _, v in ipairs(ainfo) do
if(cnt<5) then
tip:AddDoubleLine(addon['colorize'](v['name'],"00ffff"),format(L["%i ms"],v['cpu']))
tip:AddDoubleLine(addon:colorize(v['name'],"00ffff"),format(L["%i ms"],v['cpu']))
cnt = cnt + 1
end
sum = sum + v['cpu']
169,7 → 169,7
end
 
local function OnText(message)
addon['OnText'](childName, message)
addon:OnText(childName, message)
end
 
local function OnButton(self, button)
187,7 → 187,7
end
end
elseif(IsControlKeyDown()) then
addon['Print'](L["garbagecollected"])
addon:Print(L["garbagecollected"])
collectgarbage("collect")
else
GameTimeFrame_OnClick(_G["GameTimeFrame"])
199,17 → 199,17
if(db['expert']) then
local c,d,l,f = compute()
line = db['ldbstring']
line = line:gsub("%%clock", addon['colorize'](c,db['clockcolor']))
line = line:gsub("%%date", addon['colorize'](d,db['datecolor']))
line = line:gsub("%%fps", addon['colorize'](f,db['fpscolor']))
line = line:gsub("%%latency", addon['colorize'](l,db['latencycolor']))
line = line:gsub("%%clock", addon:colorize(c,db['clockcolor']))
line = line:gsub("%%date", addon:colorize(d,db['datecolor']))
line = line:gsub("%%fps", addon:colorize(f,db['fpscolor']))
line = line:gsub("%%latency", addon:colorize(l,db['latencycolor']))
else
line = ''
if(db["showClock"]) then
line = format("%s%s ", line, db["12-Hours"] and date("%I:%M") or date("%H:%M"))
end
if(db["showLatency"]) then
line = format("%s%s",line,addon['colorize'](format("%s ms ",select(3,GetNetStats())),"ffff00"))
line = format("%s%s",line,addon:colorize(format("%s ms ",select(3,GetNetStats())),"ffff00"))
end
if(db["showFPS"]) then
line = format("%s%s fps", line, floor(GetFramerate()))
232,7 → 232,7
end
 
local function setPref(pref,value,g,b)
db[pref[#pref]] = cols[pref[#pref]] and addon['RGB2Hex'](value*255,g*255,b*255) or value
db[pref[#pref]] = cols[pref[#pref]] and addon:RGB2Hex(value*255,g*255,b*255) or value
end
local function expertMode()
return not db['expert']
312,4 → 312,4
C_Timer.After(db['update'], OnDataUpdate)
end
 
addon['startup'](addon, name, childName, init, true, defaults)
\ No newline at end of file +addon:startup(name, childName, init, true, defaults) \ No newline at end of file