- Added an option to show a stopwatch on the title text showing the elapsed time of an encounter.

- Window title text now shrinks correctly when isn't enough space for it.
This commit is contained in:
Tercio
2015-07-14 17:24:17 -03:00
parent b2698005fb
commit e8b0b5687a
8 changed files with 150 additions and 28 deletions
+3
View File
@@ -379,6 +379,7 @@
_detalhes:SendEvent ("COMBAT_PLAYER_ENTER", nil, _detalhes.tabela_vigente, _detalhes.encounter_table and _detalhes.encounter_table.id)
_detalhes:CheckSwitchToCurrent()
_detalhes:CheckForTextTimeCounter (true)
end
function _detalhes:DelayedSyncAlert()
@@ -727,6 +728,8 @@
_detalhes:SendEvent ("COMBAT_PLAYER_LEAVE", nil, _detalhes.tabela_vigente)
end
_detalhes:CheckForTextTimeCounter()
end
function _detalhes:GetPlayersInArena()
+1 -1
View File
@@ -206,7 +206,7 @@
if (is_in_instance and _detalhes.remove_realm_from_name) then
esta_classe.displayName = nome:gsub (("%-.*"), "")
elseif (_detalhes.remove_realm_from_name) then
esta_classe.displayName = nome:gsub (("%-.*"), "%*")
esta_classe.displayName = nome:gsub (("%-.*"), "") --%*
else
esta_classe.displayName = nome
end
-2
View File
@@ -3145,8 +3145,6 @@
_detalhes.encounter_table.index = boss_index
end
--print ("Combat Start 2")
end
function _detalhes.parser_functions:ENCOUNTER_END (...)
+10 -14
View File
@@ -62,9 +62,6 @@
self.proximo_update = 0
end
-- /run print( _detalhes:GetInstance(1).rowframe:GetParent():GetName())
-- /run print (DetailsBarra_1_1:GetParent():GetName())
function _detalhes:fazer_animacoes (amt_barras)
--aqui
@@ -1259,7 +1256,6 @@
if (not boss_repeated [encounterId]) then
local encounter, instance = _detalhes:GetBossEncounterDetailsFromEncounterId (_, encounterId)
if (encounter) then
--print ("encounter found", encounter.boss, encounter.name, instance)
tinsert (boss_list, {value = encounterId, label = encounter.boss, icon = icon, onclick = on_boss_select})
boss_repeated [encounterId] = true
@@ -2501,19 +2497,19 @@
local text = panel.editbox:GetText()
--text = text:gsub ("\n", "")
local test = text
--local test = text
local function errorhandler(err)
return geterrorhandler()(err)
end
--local function errorhandler(err)
-- return geterrorhandler()(err)
--end
local code = [[local str = "STR"; str = _detalhes.string.replace (str, 100, 50, 75, {nome = "you", total = 10, total_without_pet = 5, damage_taken = 7, last_dps = 1, friendlyfire_total = 6, totalover = 2, totalabsorb = 4, totalover_without_pet = 6, healing_taken = 1, heal_enemy_amt = 2});]]
code = code:gsub ("STR", test)
--local code = [[local str = "STR"; str = _detalhes.string.replace (str, 100, 50, 75, {nome = "you", total = 10, total_without_pet = 5, damage_taken = 7, last_dps = 1, friendlyfire_total = 6, totalover = 2, totalabsorb = 4, totalover_without_pet = 6, healing_taken = 1, heal_enemy_amt = 2});]]
--code = code:gsub ("STR", test)
local f = loadstring (code)
if (not f) then
print (f)
end
--local f = loadstring (code)
--if (not f) then
-- print ("loadstring failed:", f)
--end
--local err, two = xpcall (f, errorhandler)
--if (not err) then
-- return