diff --git a/lua/GRID.lua b/lua/GRID.lua
index 6a2849b..484c19f 100644
--- a/lua/GRID.lua
+++ b/lua/GRID.lua
@@ -62,7 +62,7 @@ function RT.GRID_Create_Character(k)
-- label for character name
RT.UI.GRID_WD[k].label = WINDOW_MANAGER:CreateControl("RT_GRID_"..k.."_label",RT.UI.GRID_WD[k].panel,CT_LABEL)
- RT.UI.GRID_WD[k].label:SetFont("ZoFontGame")
+ RT.UI.GRID_WD[k].label:SetFont(RT.font)
RT.UI.GRID_WD[k].label:SetDimensions(width,20)
RT.UI.GRID_WD[k].label:SetAnchor(TOPLEFT,RT.UI.GRID_WD[k].panel,TOPLEFT,0,0)
RT.UI.GRID_WD[k].label:SetHorizontalAlignment(1)
@@ -83,7 +83,7 @@ function RT.GRID_Create_Character(k)
RT.UI.GRID_WD[k][0][0]["BS_Text"] = WINDOW_MANAGER:CreateControl("RT_GRID_"..k.."_0_text",RT.UI.GRID_WD[k].panel,CT_LABEL)
RT.UI.GRID_WD[k][0][0]["BS_Text"]:SetHidden(false)
- RT.UI.GRID_WD[k][0][0]["BS_Text"]:SetFont("ZoFontGame")
+ RT.UI.GRID_WD[k][0][0]["BS_Text"]:SetFont(RT.font)
RT.UI.GRID_WD[k][0][0]["BS_Text"]:SetDimensions(width/3,20)
RT.UI.GRID_WD[k][0][0]["BS_Text"]:SetAnchor(TOPLEFT,RT.UI.GRID_WD[k][0][0]["BS_Icon"],TOPRIGHT,0,0) -- Side by the previous
RT.UI.GRID_WD[k][0][0]["BS_Text"]:SetText(RT.L["Loading"])
@@ -100,7 +100,7 @@ function RT.GRID_Create_Character(k)
RT.UI.GRID_WD[k][1][0]["CL_Text"] = WINDOW_MANAGER:CreateControl("RT_GRID_"..k.."_1_text",RT.UI.GRID_WD[k].panel,CT_LABEL)
RT.UI.GRID_WD[k][1][0]["CL_Text"]:SetHidden(false)
- RT.UI.GRID_WD[k][1][0]["CL_Text"]:SetFont("ZoFontGame")
+ RT.UI.GRID_WD[k][1][0]["CL_Text"]:SetFont(RT.font)
RT.UI.GRID_WD[k][1][0]["CL_Text"]:SetDimensions(width/3,20)
RT.UI.GRID_WD[k][1][0]["CL_Text"]:SetAnchor(TOPLEFT,RT.UI.GRID_WD[k][1][0]["CL_Icon"],TOPRIGHT,0,0)
RT.UI.GRID_WD[k][1][0]["CL_Text"]:SetText(RT.L["Loading"])
@@ -117,7 +117,7 @@ function RT.GRID_Create_Character(k)
RT.UI.GRID_WD[k][2][0]["WO_Text"] = WINDOW_MANAGER:CreateControl("RT_GRID_"..k.."_2_text",RT.UI.GRID_WD[k].panel,CT_LABEL)
RT.UI.GRID_WD[k][2][0]["WO_Text"]:SetHidden(false)
- RT.UI.GRID_WD[k][2][0]["WO_Text"]:SetFont("ZoFontGame")
+ RT.UI.GRID_WD[k][2][0]["WO_Text"]:SetFont(RT.font)
RT.UI.GRID_WD[k][2][0]["WO_Text"]:SetDimensions(width,20)
RT.UI.GRID_WD[k][2][0]["WO_Text"]:SetAnchor(TOPLEFT,RT.UI.GRID_WD[k][2][0]["WO_Icon"],TOPRIGHT,0,0)
RT.UI.GRID_WD[k][2][0]["WO_Text"]:SetText(RT.L["Loading"])
@@ -154,7 +154,7 @@ function RT.GRID_Create_Character(k)
-- text
RT.UI.GRID_WD[k][id_craft][simcraft]["text"] = WINDOW_MANAGER:CreateControl("RT_GRID_"..k.."_"..id_craft.."_"..simcraft.."_text",RT.UI.GRID_WD[k].panel,CT_LABEL)
RT.UI.GRID_WD[k][id_craft][simcraft]["text"]:SetHidden(true)
- RT.UI.GRID_WD[k][id_craft][simcraft]["text"]:SetFont("ZoFontGame")
+ RT.UI.GRID_WD[k][id_craft][simcraft]["text"]:SetFont(RT.font)
RT.UI.GRID_WD[k][id_craft][simcraft]["text"]:SetDimensions(360,20)
RT.UI.GRID_WD[k][id_craft][simcraft]["text"]:SetAnchor(TOPLEFT,prevcontrol,TOPRIGHT,0,0) --to right
@@ -205,12 +205,10 @@ function RT.GRID_Update(timestamp)
RT.UI.GRID_WD[k][id_craft][simcraft]["trait_icon"]:SetTexture(RT.SV.data.Craft[k][id_craft].doing[simcraft]["Trait_icon"])
local currenttimer = RT.SV.data.Craft[k][id_craft].doing[simcraft]["EndTimeStamp"] - timestamp - 1
-
+ RT.UI.GRID_WD[k][id_craft][simcraft]["text"]:SetHidden(false)
if (currenttimer > 0) then
- RT.UI.GRID_WD[k][id_craft][simcraft]["text"]:SetHidden(false)
RT.UI.GRID_WD[k][id_craft][simcraft]["text"]:SetText(RT.Converthms(currenttimer))
else
- RT.UI.GRID_WD[k][id_craft][simcraft]["text"]:SetHidden(false)
RT.UI.GRID_WD[k][id_craft][simcraft]["text"]:SetText(RT.L["Finished"])
RT.UI.GRID_WD[k].label:SetText("|cFF0000" .. string.upper(k) .."|r" )
end
@@ -231,5 +229,5 @@ function RT.GRID_Sort()
RT.UI.GRID_WD[v].panel:SetAnchor(TOPLEFT,RT.UI.GRID_TLW,TOPLEFT,0,panelheight*(k-1))
end
- RT.UI.GRID_TLW:SetHeight(table.getn(RT.CharsInOrder) * panelheight
+ RT.UI.GRID_TLW:SetHeight(table.getn(RT.CharsInOrder) * panelheight)
end
diff --git a/lua/ResearchTimer.lua b/lua/ResearchTimer.lua
index c3f2d71..d5bc3cf 100644
--- a/lua/ResearchTimer.lua
+++ b/lua/ResearchTimer.lua
@@ -11,8 +11,8 @@ RT = {
width = 100,
height = 80,
UI = {},
- SV={},
- collect=0
+ SV={}
+-- collect=0
}
@@ -138,7 +138,6 @@ function RT.Init(eventCode, addOnName)
local timestamp = GetTimeStamp()
RT.SV.data.Craft[RT.playername] = {}
- RT.SV.data.Craft[RT.playername]["Start"] = true
RT.Collect_Data()
RT.GRID_Create()