diff --git a/Altoholic/Altoholic.lua b/Altoholic/Altoholic.lua index 012f338..334d134 100644 --- a/Altoholic/Altoholic.lua +++ b/Altoholic/Altoholic.lua @@ -338,7 +338,7 @@ function addon:OnEnable() -- CoA: use a Lua constant, not GetAddOnMetadata — TOC metadata is cached at game launch -- and does NOT refresh on /reload, so the .toc version looked stale ("still .18"). A Lua -- constant re-evaluates on every /reload, giving a truthful loaded-code version. Bump with the .toc. - AltoholicFrameName:SetText("Altoholic |cFFFFFFFF3.3.002b-coa.24|r") + AltoholicFrameName:SetText("Altoholic |cFFFFFFFF3.3.002b-coa.25|r") local realm = GetRealmName() local player = UnitName("player") diff --git a/Altoholic/Altoholic.toc b/Altoholic/Altoholic.toc index ce64f22..ca0944f 100644 --- a/Altoholic/Altoholic.toc +++ b/Altoholic/Altoholic.toc @@ -13,7 +13,7 @@ ## Author: Thaoky, Telkar-RG ## X-Edited-By: Exiles (Sub-Net) — florian.berthold@sub-net.at -## Version: 3.3.002b-coa.24 +## Version: 3.3.002b-coa.25 ## X-Category: Inventory, Tradeskill, Mail ## X-Localizations: enUS, frFR, zhCN, zhTW, deDE, koKR, esES, esMX, ruRU ## X-Website: http://wow.curse.com/downloads/wow-addons/details/altoholic.aspx diff --git a/Altoholic/Frames/Skills.lua b/Altoholic/Frames/Skills.lua index 413a2d3..d1c74f5 100644 --- a/Altoholic/Frames/Skills.lua +++ b/Altoholic/Frames/Skills.lua @@ -76,27 +76,37 @@ function ns:Update() local item = items[i + offset] if item then _G[e.."Collapse"]:Hide() - _G[e.."Level"]:SetText("") _G[e.."Skill1NormalText"]:SetText("") _G[e.."CookingNormalText"]:SetText("") _G[e.."FirstAidNormalText"]:SetText("") _G[e.."FishingNormalText"]:SetText("") _G[e.."RidingNormalText"]:SetText("") - _G[e.."Name"]:SetWidth(680) - _G[e.."Name"]:SetPoint("TOPLEFT", 15, 0) - _G[e.."NameNormalText"]:SetWidth(680) if item.kind == "header" then + -- character header: colored name + (class) across the row, no rank column + _G[e.."Name"]:SetPoint("TOPLEFT", 15, 0) + _G[e.."Name"]:SetWidth(420) + _G[e.."NameNormalText"]:SetWidth(420) local locClass, engClass = DS:GetCharacterClass(item.character) local className = Altoholic:GetCoAClassName(engClass) or locClass or "" -- CoA: PROPHET->Venomancer, MONK->Templar, … - _G[e.."NameNormalText"]:SetText( (DS:GetColoredCharacterName(item.character) or "?") .. " " .. WHITE .. "(" .. className .. ")" ) + _G[e.."NameNormalText"]:SetText( (DS:GetColoredCharacterName(item.character) or "?") .. " " .. WHITE .. "(" .. className .. ")" ) + _G[e.."Level"]:SetText("") else + -- profession row: [icon] name in the Name cell (indented), rank/max in its own column local iconEsc = "" if item.spellID then iconEsc = addon:TextureToFontstring2(addon:GetSpellIcon(item.spellID), size, size, inset, inset, inset, inset) .. " " end + _G[e.."Name"]:SetPoint("TOPLEFT", 38, 0) + _G[e.."Name"]:SetWidth(200) + _G[e.."NameNormalText"]:SetWidth(200) + _G[e.."NameNormalText"]:SetText( iconEsc .. WHITE .. item.name ) + local cap = (item.maxRank > 0) and item.maxRank or 450 - _G[e.."NameNormalText"]:SetText( " " .. iconEsc .. WHITE .. item.name .. " " .. ns:GetColor(item.rank, cap) .. item.rank .. "/" .. item.maxRank .. "|r" ) + _G[e.."Level"]:SetPoint("TOPLEFT", 250, 0) + _G[e.."Level"]:SetWidth(120) + _G[e.."Level"]:SetJustifyH("LEFT") + _G[e.."Level"]:SetText( ns:GetColor(item.rank, cap) .. item.rank .. " / " .. item.maxRank ) end btn.coaItem = item btn:SetID(item.viewLine or 0)